Merge branch 'main' into darc-main-35b1ce53-93f3-4548-9141-a67575ca61c3

.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"
       ]

eng/Version.Details.xml

@@ -193,26 +193,26 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23302.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23307.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>234e0726c7384ee84bf08550f2d16a1ff2d5c543</Sha>
+      <Sha>a178d756de78f9fd55339cb92665e791a3ba6535</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23302.3">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23307.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>234e0726c7384ee84bf08550f2d16a1ff2d5c543</Sha>
+      <Sha>a178d756de78f9fd55339cb92665e791a3ba6535</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23302.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23307.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>234e0726c7384ee84bf08550f2d16a1ff2d5c543</Sha>
+      <Sha>a178d756de78f9fd55339cb92665e791a3ba6535</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23226.1">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23307.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>cdd8256f08d1e0c0495e29986b4c9b107697a9ce</Sha>
+      <Sha>8d74e150b7a10da89b7d15171cc5662f79b8affb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23226.1">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23307.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>cdd8256f08d1e0c0495e29986b4c9b107697a9ce</Sha>
+      <Sha>8d74e150b7a10da89b7d15171cc5662f79b8affb</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
@@ -228,9 +228,9 @@
       <Sha>54eb3b811c57f5e94617d31a102fc9cb664ccdd5</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23279.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23305.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>8fd12314c3e648c03a4189ba0bd1c3b09f5d6a01</Sha>
+      <Sha>d033e96327903618482de22f76c971c7fe91e8f4</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

eng/Versions.props

@@ -36,11 +36,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23302.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23307.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.23226.1</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.23307.2</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

global.json

@@ -11,7 +11,7 @@
     "cmake": "3.21.0"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.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.23302.3"
+    "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23307.2"
   }
 }

src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj

@@ -32,7 +32,7 @@
     <RuntimePack Include="Microsoft.NETCore.App.Host" Version="[$(MicrosoftNETCoreAppHostPackageVersion)]" />
     <RuntimePack Include="Microsoft.NETCore.App.Runtime" Version="[$(MicrosoftNETCoreAppRuntimeVersion)]" />
 
-    <PortablePackage Include="Microsoft.DotNet.IlCompiler" Version="[$(MicrosoftDotNetIlCompilerVersion)]" />
+    <PortablePackage Include="Microsoft.DotNet.ILCompiler" Version="[$(MicrosoftDotNetILCompilerVersion)]" />
     <PortablePackage Include="Microsoft.NETCore.DotNetAppHost" Version="[$(MicrosoftNETCoreDotNetAppHostVersion)]" />
     <PortablePackage Include="Microsoft.NETCore.DotNetHost" Version="[$(MicrosoftNETCoreDotNetHostVersion)]" />
     <PortablePackage Include="Microsoft.NETCore.DotNetHostPolicy" Version="[$(MicrosoftNETCoreDotNetHostPolicyVersion)]" />

src/SourceBuild/content/repo-projects/nuget-client.proj

@@ -21,6 +21,8 @@
     <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
 
     <BuildCommand>$(ProjectDirectory)eng/source-build/build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
+
+    <PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
   </PropertyGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

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 <nikolam@microsoft.com>
+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.
+   -->
++
++  <!--
++    Following dependencies are required for PVP flow.
++    PVP flow infra will automatically bump the version to the latest live one.
++  -->
++  <ProductDependencies>
++    <Dependency Name="Microsoft.Build" Version="17.3.1">
++      <Uri>https://github.com/dotnet/msbuild</Uri>
++      <Sha>80f618ad45d38475773fd1a6eaa059f118a0ad5a</Sha>
++    </Dependency>
++    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0">
++      <Uri>https://github.com/dotnet/runtime</Uri>
++      <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha>
++    </Dependency>
++    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0">
++      <Uri>https://github.com/dotnet/runtime</Uri>
++      <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha>
++    </Dependency>
++    <Dependency Name="Microsoft.Web.Xdt" Version="3.0.0">
++      <Uri>https://github.com/aspnet/xdt</Uri>
++      <Sha>d4d088b6a9c793525b1a27a119cb66ba4587bb39</Sha>
++    </Dependency>
++    <Dependency Name="System.ComponentModel.Composition" Version="4.5.0">
++      <Uri>https://github.com/dotnet/corefx</Uri>
++      <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha>
++    </Dependency>
++  </ProductDependencies>
+ </Dependencies>
+\ No newline at end of file

src/VirtualMonoRepo/InitializeVMR.proj

@@ -31,6 +31,7 @@
 
     <Exec WorkingDirectory="$(VmrDir)" Command="git init -b $(VmrDefaultBranch)" />
     <Exec WorkingDirectory="$(VmrDir)" Command="git commit --allow-empty -m 'Initial commit of the VMR%0D%0A%0D%0A[[ commit created by automation ]]'" />
+    <Exec WorkingDirectory="$(VmrDir)" Command="git remote add origin https://github.com/dotnet/dotnet" /> <!-- source link needs this -->
   </Target>
 
   <Target Name="InitializeRepoAndDependentsRecursive">
@@ -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" />
 
     <Message Text=" -> Done initializing individual repositories recursively" Importance="High" />

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<AdditionalRemote>()
+            : new[] { new AdditionalRemote("installer", InstallerPath) };
+
         var vmrInitializer = _serviceProvider.Value.GetRequiredService<IVmrInitializer>();
         await vmrInitializer.InitializeRepository(
             Repository,
@@ -61,7 +71,9 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
             PackageVersion,
             Recursive,
             new NativePath(SourceMappingsPath),
-            Array.Empty<AdditionalRemote>(),
+            additionalRemotes,
+            ReadmeTemplatePath,
+            TpnTemplatePath,
             _cancellationToken.Token);
         return true;
     }