From 1f0be73d93dc3e8ca36ce717e6ba4c4207a78cd7 Mon Sep 17 00:00:00 2001 From: Nicolas Musset Date: Mon, 20 Nov 2023 17:55:21 +0100 Subject: [PATCH 1/4] [Build] Move Directory.Packages.props --- build/Stride.sln | 2 +- samples/Tests/Stride.Samples.Tests.csproj | 1 + Directory.Packages.props => sources/Directory.Packages.props | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename Directory.Packages.props => sources/Directory.Packages.props (100%) diff --git a/build/Stride.sln b/build/Stride.sln index c8a6789e46..1340930402 100644 --- a/build/Stride.sln +++ b/build/Stride.sln @@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "20-StrideRuntime", "20-Stri EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}" ProjectSection(SolutionItems) = preProject - ..\Directory.Packages.props = ..\Directory.Packages.props + ..\sources\Directory.Packages.props = ..\sources\Directory.Packages.props ..\sources\targets\Stride.Core.CompilerServices.props = ..\sources\targets\Stride.Core.CompilerServices.props ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets = ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets ..\sources\targets\Stride.Core.props = ..\sources\targets\Stride.Core.props diff --git a/samples/Tests/Stride.Samples.Tests.csproj b/samples/Tests/Stride.Samples.Tests.csproj index 307abc8e8d..8e0f786843 100644 --- a/samples/Tests/Stride.Samples.Tests.csproj +++ b/samples/Tests/Stride.Samples.Tests.csproj @@ -1,4 +1,5 @@ + diff --git a/Directory.Packages.props b/sources/Directory.Packages.props similarity index 100% rename from Directory.Packages.props rename to sources/Directory.Packages.props From c5bff0d320e895170c57d6c6c614617fef1a4842 Mon Sep 17 00:00:00 2001 From: Nicolas Musset Date: Fri, 8 Dec 2023 14:48:54 +0100 Subject: [PATCH 2/4] Add nuget.config --- nuget.config | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 nuget.config diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000000..b19c30f01d --- /dev/null +++ b/nuget.config @@ -0,0 +1,11 @@ + + + + + + + + + + + From 6f2df39c5a2e79cdcccd823b4adf32bd5a91b946 Mon Sep 17 00:00:00 2001 From: Nicolas Musset Date: Fri, 8 Dec 2023 14:49:51 +0100 Subject: [PATCH 3/4] [Build] Don't use central package management for Stride.Samples.Tests It is confused by nuget configurations. --- samples/Tests/Stride.Samples.Tests.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/Tests/Stride.Samples.Tests.csproj b/samples/Tests/Stride.Samples.Tests.csproj index 8e0f786843..46bbd96d2c 100644 --- a/samples/Tests/Stride.Samples.Tests.csproj +++ b/samples/Tests/Stride.Samples.Tests.csproj @@ -1,8 +1,8 @@ - + false $(StrideEditorTargetFramework) win-x64 true @@ -11,8 +11,8 @@ true - - + + From 78cf1cad8f53ea2ad946f90caa51442a3d1f48ac Mon Sep 17 00:00:00 2001 From: Nicolas Musset Date: Fri, 8 Dec 2023 14:55:10 +0100 Subject: [PATCH 4/4] Add nuget.config to Stride.sln --- build/Stride.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Stride.sln b/build/Stride.sln index 1340930402..7181eb24d2 100644 --- a/build/Stride.sln +++ b/build/Stride.sln @@ -11,6 +11,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}" ProjectSection(SolutionItems) = preProject ..\sources\Directory.Packages.props = ..\sources\Directory.Packages.props + ..\nuget.config = ..\nuget.config ..\sources\targets\Stride.Core.CompilerServices.props = ..\sources\targets\Stride.Core.CompilerServices.props ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets = ..\sources\targets\Stride.Core.PostSettings.Dependencies.targets ..\sources\targets\Stride.Core.props = ..\sources\targets\Stride.Core.props