[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.2xx' (#17709)

dotnet · Nov 9, 2023 · 79d9738 · 79d9738
2 parents bbbba62 + b7bae3f
commit 79d9738
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 73 deletions.
diff --git 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.23416.3",
+      "version": "1.1.0-beta.23551.2",
       "commands": [
         "darc"
       ]

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -218,13 +218,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</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>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -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 -->

diff --git a/eng/pipelines/source-build-license-scan.yml b/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"
-  displayName: Run on weekdays at 7am UTC
+- cron: "0 7 * * 1"
+  displayName: Run on Mondays at 7am UTC
   branches:
     include:
     - main
-    - release/*
+    - release/*.0.1xx*
+    - internal/release/*.0.1xx*
 
 pr: none
 trigger: none

diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/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

diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/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
 

diff --git a/eng/pipelines/templates/steps/vmr-prepare.yml b/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: |
-      git switch -c ${{ parameters.vmrBranch }}
-    displayName: Checkout ${{ parameters.vmrBranch }}
-    workingDirectory: $(Agent.BuildDirectory)/vmr
+- script: |
+    git checkout --track origin/${{ parameters.vmrBranch }}
+    echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}"
+  displayName: Check out ${{ parameters.vmrBranch }}
+  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

diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/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 }}"

diff --git a/eng/vmr-sync.sh b/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

diff --git a/...ntent/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/...ntent/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/

diff --git a/src/VirtualMonoRepo/Tasks/GitFileManagerFactory.cs b/src/VirtualMonoRepo/Tasks/GitFileManagerFactory.cs
diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs
@@ -74,6 +74,8 @@ await vmrInitializer.InitializeRepository(
             additionalRemotes,
             ReadmeTemplatePath,
             TpnTemplatePath,
+            generateCodeowners: false,
+            discardPatches: true,
             _cancellationToken.Token);
         return true;
     }
@@ -82,7 +84,6 @@ await vmrInitializer.InitializeRepository(
 
     private IServiceProvider CreateServiceProvider() => new ServiceCollection()
         .AddLogging(b => b.AddConsole().AddFilter(l => l >= LogLevel.Information))
-        .AddTransient<GitFileManagerFactory>()
-        .AddVmrManagers(sp => sp.GetRequiredService<GitFileManagerFactory>(), "git", VmrPath, TmpPath, null, null)
+        .AddVmrManagers("git", VmrPath, TmpPath, null, null)
         .BuildServiceProvider();
 }