Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-79cbb9db-a7cb-4b97-acdd-a28b0df6375b

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.23416.3",
+      "version": "1.1.0-beta.23551.2",
       "commands": [
         "darc"
       ]

eng/Version.Details.xml

@@ -222,13 +222,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>39042b4048580366d35a7c1c4f4ce8fc0dbea4b4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23416.3">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23551.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>5d63a226d022fda90cae2c239e882ad253baa758</Sha>
+      <Sha>88b0cbb096999d03068ddc9945465a3f5b6ba5da</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23416.3">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23551.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>5d63a226d022fda90cae2c239e882ad253baa758</Sha>
+      <Sha>88b0cbb096999d03068ddc9945465a3f5b6ba5da</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
       <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -8,7 +8,7 @@
     <VersionMajor>8</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionFeature>00</VersionFeature>
+    <VersionFeature>01</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
@@ -44,7 +44,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.23416.3</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.23551.2</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
@@ -145,8 +145,10 @@
       Therefore we stay at last month's version.
       We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
       Instead the indicator is that the incoming SDK version is not RTM or greater yet.
-      Preview releases already use -1 versionining so don't subtract one for that version
+      Preview releases already use -1 versionining so don't subtract one for that version.
+      In public builds, we always use the 2 month old version.
     -->
+    <SubtractOneFromTemplateVersions Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">true</SubtractOneFromTemplateVersions>
     <SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
     <SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
     <AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>

eng/pipelines/templates/steps/vmr-pull-updates.yml

@@ -22,6 +22,19 @@ steps:
   displayName: Clone dotnet/installer
   path: installer
 
+# This step is needed so that when we get a detached HEAD / shallow clone,
+# we still pull the commit into the temporary installer clone to use it during the sync.
+- script: |
+    git branch installer-head
+  displayName: Label PR commit
+  workingDirectory: $(Agent.BuildDirectory)/installer
+
+- script: |
+    git checkout -B ${{ parameters.vmrBranch }}
+    echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}"
+  displayName: Prepare branch ${{ parameters.vmrBranch }}
+  workingDirectory: ${{ parameters.vmrPath }}
+
 - script: >
     ./eng/vmr-sync.sh
     --vmr ${{ parameters.vmrPath }}

eng/vmr-sync.sh

@@ -135,7 +135,7 @@ while [[ $# -gt 0 ]]; do
       recursive=true
       ;;
     --remote)
-      additional_remotes="$additional_remotes,$2"
+      additional_remotes="$additional_remotes $2"
       shift
       ;;
     --readme-template)
@@ -265,9 +265,9 @@ fi
   $azdev_pat                                 \
   --$verbosity                               \
   $recursive_arg                             \
+  $additional_remotes                        \
   --readme-template "$readme_template"       \
   --tpn-template "$tpn_template"             \
-  $additional_remotes                        \
   "$repository"
 
 if [[ $? == 0 ]]; then

src/VirtualMonoRepo/Tasks/GitFileManagerFactory.cs

@@ -1,52 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using Microsoft.DotNet.DarcLib;
-using Microsoft.DotNet.DarcLib.Helpers;
-using Microsoft.DotNet.DarcLib.VirtualMonoRepo;
-using Microsoft.Extensions.Logging;
-
-namespace Microsoft.DotNet.VirtualMonoRepo.Tasks;
-
-public class GitFileManagerFactory : IGitFileManagerFactory
-{
-    private readonly IVmrInfo _vmrInfo;
-    private readonly VmrRemoteConfiguration _remoteConfiguration;
-    private readonly IProcessManager _processManager;
-    private readonly IVersionDetailsParser _versionDetailsParser;
-    private readonly ILoggerFactory _loggerFactory;
-
-    public GitFileManagerFactory(
-        IVmrInfo vmrInfo,
-        VmrRemoteConfiguration remoteConfiguration,
-        IProcessManager processManager,
-        IVersionDetailsParser versionDetailsParser,
-        ILoggerFactory loggerFactory)
-    {
-        _vmrInfo = vmrInfo;
-        _remoteConfiguration = remoteConfiguration;
-        _processManager = processManager;
-        _versionDetailsParser = versionDetailsParser;
-        _loggerFactory = loggerFactory;
-    }
-
-    public IGitFileManager Create(string repoUri)
-        => new GitFileManager(CreateGitRepo(repoUri), _versionDetailsParser, _loggerFactory.CreateLogger<GitFileManager>());
-
-    private IGitRepo CreateGitRepo(string repoUri) => GitRepoTypeParser.ParseFromUri(repoUri) switch
-    {
-        GitRepoType.AzureDevOps => throw new Exception("VMR initialization should not require Azure DevOps repositories"),
-
-        GitRepoType.GitHub => new GitHubClient(
-            _processManager.GitExecutable,
-            _remoteConfiguration.GitHubToken,
-            _loggerFactory.CreateLogger<GitHubClient>(),
-            _vmrInfo.TmpPath,
-            // Caching not in use for Darc local client.
-            null),
-
-        GitRepoType.Local => new LocalGitClient(_processManager.GitExecutable, _loggerFactory.CreateLogger<LocalGitClient>()),
-        _ => throw new ArgumentException("Unknown git repository type", nameof(repoUri)),
-    };
-}

src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs

@@ -74,6 +74,8 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
             additionalRemotes,
             ReadmeTemplatePath,
             TpnTemplatePath,
+            generateCodeowners: false,
+            discardPatches: true,
             _cancellationToken.Token);
         return true;
     }
@@ -82,7 +84,6 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask
 
     private IServiceProvider CreateServiceProvider() => new ServiceCollection()
         .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information))
-        .AddTransient<GitFileManagerFactory>()
+        .AddVmrManagers("git", VmrPath, TmpPath, null, null)
-        .AddVmrManagers(sp => sp.GetRequiredService<GitFileManagerFactory>(), "git", VmrPath, TmpPath, null, null)
         .BuildServiceProvider();
 }