Merge branch 'release/8.0.1xx' into release/8.0.2xx

.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

@@ -218,13 +218,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>a57022b44f3ff23de925530ea1d27da9701aed57</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

@@ -13,7 +13,7 @@
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
     <!-- Enable to remove prerelease label. -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <!-- Calculate prerelease label -->
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
@@ -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 -->

eng/pipelines/source-build-license-scan.yml

@@ -1,12 +1,13 @@
 # Pipeline documentation at https://github.com/dotnet/dotnet/blob/main/docs/license-scanning.md
 
 schedules:
-- cron: "0 7 * * 1-5"
+- cron: "0 7 * * 1"
-  displayName: Run on weekdays at 7am UTC
+  displayName: Run on Mondays at 7am UTC
   branches:
     include:
     - main
-    - release/*
+    - release/*.0.1xx*
+    - internal/release/*.0.1xx*
 
 pr: none
 trigger: none

eng/pipelines/source-build-sdk-diff-tests.yml

@@ -4,7 +4,8 @@ schedules:
   branches:
     include:
     - main
-    - release/*
+    - release/*.0.1xx*
+    - internal/release/*.0.1xx*
 
 pr: none
 trigger: none

eng/pipelines/templates/jobs/vmr-build.yml

@@ -90,7 +90,10 @@ jobs:
   steps:
   - template: ../steps/vmr-prepare.yml
     parameters:
-      vmrBranch: ${{ parameters.vmrBranch }}
+      ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+        vmrBranch: $(System.PullRequest.TargetBranch)
+      ${{ else }}:
+        vmrBranch: ${{ parameters.vmrBranch }}
       isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
       skipComponentGovernanceDetection: true
 

eng/pipelines/templates/steps/vmr-prepare.yml

@@ -28,11 +28,11 @@ steps:
     path: vmr
     clean: true
 
-- ${{ if or(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal')) }}:
+- script: |
-  - script: |
+    git checkout --track origin/${{ parameters.vmrBranch }}
-      git switch -c ${{ parameters.vmrBranch }}
+    echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}"
-    displayName: Checkout ${{ parameters.vmrBranch }}
+  displayName: Check out ${{ parameters.vmrBranch }}
-    workingDirectory: $(Agent.BuildDirectory)/vmr
+  workingDirectory: $(Agent.BuildDirectory)/vmr
 
 # TODO (https://github.com/dotnet/arcade/issues/11332): Allow full CG?
 # Currently, we ignore dirs of individual repos - they have been scanned before

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

@@ -22,6 +22,13 @@ 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 }}"

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/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs

@@ -58,7 +58,8 @@ public class SourceBuiltArtifactsTests : SdkTests
             string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath));
             string expectedSdkVersion = sdkVersionLines[1];
 
-            Assert.Equal(expectedSdkVersion, sdkVersion);
+            // Disable due to https://github.com/dotnet/source-build/issues/3693
+            // Assert.Equal(expectedSdkVersion, sdkVersion);
         }
         finally
         {

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff

@@ -48,7 +48,6 @@ index ------------
  ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll
  ./sdk-manifests/
  ./sdk-manifests/x.y.z/
--./sdk-manifests/x.y.z/
 -./sdk-manifests/x.y.z/
  ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/
  ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/

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();
 }