diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index 050dabf28..a3aa4bb01 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -14,6 +14,8 @@ $(BuildCommandArgs) -v $(LogVerbosity) $(StandardSourceBuildCommand) $(BuildCommandArgs) + + DependenciesOnly diff --git a/src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch b/src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch new file mode 100644 index 000000000..d87fa3002 --- /dev/null +++ b/src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch @@ -0,0 +1,143 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Thu, 8 Jun 2023 22:21:02 +0000 +Subject: [PATCH] Add dependencies needed for source-build PVP flow + +Backport: https://github.com/dotnet/sdk/pull/33039 +--- + eng/Version.Details.xml | 68 +++++++++++++++++++++++++++++++++++++++++ + eng/Versions.props | 28 ++++++++--------- + 2 files changed, 82 insertions(+), 14 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 2bf363fc70..a242f463ee 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -112,15 +112,83 @@ + https://github.com/dotnet/aspnetcore + 8dea0b8d3bf5852fe61b2d98b94ae190f68b9768 + ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ + + https://github.com/nuget/nuget.client + 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 + ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ ++ ++ https://github.com/nuget/nuget.client ++ 1f85d874ef0bc82affad2c2175fdd47c5b4bb387 ++ + + https://github.com/microsoft/vstest + 8381658bfb847e67b4f41a997411e8a804e1ecb4 + + ++ ++ https://github.com/microsoft/vstest ++ 8381658bfb847e67b4f41a997411e8a804e1ecb4 ++ ++ ++ https://github.com/microsoft/vstest ++ 8381658bfb847e67b4f41a997411e8a804e1ecb4 ++ + + https://github.com/dotnet/runtime + 54dab738de58291ebefc8ff0569a799efaff5d82 +diff --git a/eng/Versions.props b/eng/Versions.props +index dfa5c80636..ee10eec2d2 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -61,25 +61,25 @@ + + + 6.7.0-preview.3.57 +- $(NuGetBuildTasksPackageVersion) ++ 6.7.0-preview.3.57 + 6.0.0-rc.278 +- $(NuGetBuildTasksPackageVersion) +- $(NuGetBuildTasksPackageVersion) +- $(NuGetBuildTasksPackageVersion) +- $(NuGetBuildTasksPackageVersion) +- $(NuGetBuildTasksPackageVersion) +- $(NuGetBuildTasksPackageVersion) +- $(NuGetBuildTasksPackageVersion) +- $(NuGetBuildTasksPackageVersion) +- $(NuGetBuildTasksPackageVersion) +- $(NuGetPackagingPackageVersion) +- $(NuGetProjectModelPackageVersion) ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 ++ 6.7.0-preview.3.57 + + + + 17.7.0-preview.23307.1 +- $(MicrosoftNETTestSdkPackageVersion) +- $(MicrosoftNETTestSdkPackageVersion) ++ 17.7.0-preview.23307.1 ++ 17.7.0-preview.23307.1 + + + diff --git a/src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch b/src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch new file mode 100644 index 000000000..bd5c6af1d --- /dev/null +++ b/src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Mon, 12 Jun 2023 16:08:48 +0000 +Subject: [PATCH 2/2] Additional dependencies for PVP flow + +Backport: https://github.com/dotnet/sdk/pull/33179 +--- + eng/Version.Details.xml | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index a242f463ee..645c3720c9 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -381,6 +381,21 @@ + 27e584661980ee6d82c419a2a471ae505b7d122e + + ++ ++ ++ https://github.com/dotnet/runtime ++ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 ++ ++ ++ ++ https://github.com/dotnet/runtime ++ 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 ++ ++ ++ ++ https://github.com/dotnet/runtime ++ d099f075e45d2aa6007a22b71b45a08758559f80 ++ + + +