diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 789399c52..9ee1379b9 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23226.1", + "version": "1.1.0-beta.23307.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b61a0f0a4..31e0c32e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,26 +193,26 @@ - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + a178d756de78f9fd55339cb92665e791a3ba6535 - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + a178d756de78f9fd55339cb92665e791a3ba6535 - + https://github.com/dotnet/arcade - 234e0726c7384ee84bf08550f2d16a1ff2d5c543 + a178d756de78f9fd55339cb92665e791a3ba6535 - + https://github.com/dotnet/arcade-services - cdd8256f08d1e0c0495e29986b4c9b107697a9ce + 8d74e150b7a10da89b7d15171cc5662f79b8affb - + https://github.com/dotnet/arcade-services - cdd8256f08d1e0c0495e29986b4c9b107697a9ce + 8d74e150b7a10da89b7d15171cc5662f79b8affb https://github.com/dotnet/runtime @@ -228,9 +228,9 @@ 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 - + https://github.com/dotnet/xliff-tasks - 8fd12314c3e648c03a4189ba0bd1c3b09f5d6a01 + d033e96327903618482de22f76c971c7fe91e8f4 diff --git a/eng/Versions.props b/eng/Versions.props index 54603cc17..7cd6afda1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,11 +36,11 @@ - 8.0.0-beta.23302.3 + 8.0.0-beta.23307.2 - 1.1.0-beta.23226.1 + 1.1.0-beta.23307.2 diff --git a/global.json b/global.json index 8d4d65c0e..4eca81913 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23302.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23302.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23307.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23307.2" } } diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index 92b3d120e..e38e77b24 100644 --- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/SourceBuild/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj index 1878d0b79..5a7f45c32 100644 --- a/src/SourceBuild/content/repo-projects/nuget-client.proj +++ b/src/SourceBuild/content/repo-projects/nuget-client.proj @@ -21,6 +21,8 @@ $(StandardSourceBuildArgs) $(ProjectDirectory)eng/source-build/build$(ShellExtension) $(BuildCommandArgs) + + DependenciesOnly diff --git a/src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch b/src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch new file mode 100644 index 000000000..96725b832 --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch @@ -0,0 +1,47 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Wed, 7 Jun 2023 03:03:22 +0000 +Subject: [PATCH] Add dependencies for PVP flow + +Backport: https://github.com/NuGet/NuGet.Client/pull/5207 +--- + eng/Version.Details.xml | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index ff6bc71b5..bbadad4c0 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -5,4 +5,31 @@ + See https://github.com/dotnet/arcade/issues/2396 for details. + See https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#details-file for schema. + --> ++ ++ ++ ++ ++ https://github.com/dotnet/msbuild ++ 80f618ad45d38475773fd1a6eaa059f118a0ad5a ++ ++ ++ https://github.com/dotnet/runtime ++ 8470979eb44c2218025515234d3e01138bd74afb ++ ++ ++ https://github.com/dotnet/runtime ++ 8470979eb44c2218025515234d3e01138bd74afb ++ ++ ++ https://github.com/aspnet/xdt ++ d4d088b6a9c793525b1a27a119cb66ba4587bb39 ++ ++ ++ https://github.com/dotnet/corefx ++ 30ab651fcb4354552bd4891619a0bdd81e0ebdbf ++ ++ + +\ No newline at end of file diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 781d32d0e..09ab72b1c 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -31,6 +31,7 @@ + @@ -56,6 +57,9 @@ Recursive="true" VmrPath="$(VmrDir)" TmpPath="$(TmpDir)" + InstallerPath="$(RepoRoot)" + ReadmeTemplatePath="$(MSBuildThisFileDirectory)/README.template.md" + TpnTemplatePath="$(MSBuildThisFileDirectory)/THIRD-PARTY-NOTICES.template.txt" SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" /> diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index c8c614620..eae76d532 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -40,6 +40,12 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask public string PackageVersion { get; set; } + public string InstallerPath { get; set; } + + public string ReadmeTemplatePath { get; set; } + + public string TpnTemplatePath { get; set; } + public bool Recursive { get; set; } public VirtualMonoRepo_Initialize() @@ -54,6 +60,10 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask VmrPath = Path.GetFullPath(VmrPath); TmpPath = Path.GetFullPath(TmpPath); + var additionalRemotes = InstallerPath == null + ? Array.Empty() + : new[] { new AdditionalRemote("installer", InstallerPath) }; + var vmrInitializer = _serviceProvider.Value.GetRequiredService(); await vmrInitializer.InitializeRepository( Repository, @@ -61,7 +71,9 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask PackageVersion, Recursive, new NativePath(SourceMappingsPath), - Array.Empty(), + additionalRemotes, + ReadmeTemplatePath, + TpnTemplatePath, _cancellationToken.Token); return true; }