Update to arcade with WiX fix (225814)

dotnet · May 17, 2024 · 7f14a22 · 7f14a22
1 parent 82feecf
commit 7f14a22
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 25 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -6,6 +6,10 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-97d8f4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-97d8f4c-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-97d8f4c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-97d8f4c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-97d8f4c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,6 +23,10 @@
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-97d8f4c-1" value="true" />
+    <add key="darc-int-dotnet-runtime-97d8f4c-2" value="true" />
+    <add key="darc-int-dotnet-runtime-97d8f4c-3" value="true" />
+    <add key="darc-int-dotnet-runtime-97d8f4c-4" value="true" />
     <add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -83,25 +83,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
+      <Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24204.4">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24266.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
+      <Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24266.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
+      <Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24204.4">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24266.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
+      <Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24204.4">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24266.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
+      <Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -56,9 +56,9 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
-    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.24204.4</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24204.4</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.24204.4</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.24266.4</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24266.4</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.24266.4</MicrosoftDotNetGenAPIVersion>
   </PropertyGroup>
   <!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
   <!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
 parameters:
   runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20210614.1
+  sourceIndexPackageVersion: 1.0.1-20240320.1
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
   preSteps: []
@@ -32,10 +32,10 @@ jobs:
     - ${{ preStep }}
 
   - task: UseDotNet@2
-    displayName: Use .NET Core sdk 3.1
+    displayName: Use .NET 8 SDK
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 8.0.x
       installationPath: $(Agent.TempDirectory)/dotnet
       workingDirectory: $(Agent.TempDirectory)
 

diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml
@@ -14,7 +14,7 @@ parameters:
   # This is the default platform provided by Arcade, intended for use by a managed-only repo.
   defaultManagedPlatform:
     name: 'Managed'
-    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
+    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
 
   # Defines the platforms on which to run build jobs. One job is created for each platform, and the
   # object in this array is sent to the job template as 'platform'. If no platforms are specified,

diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
 parameters:
   runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20210614.1
+  sourceIndexPackageVersion: 1.0.1-20240320.1
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
   preSteps: []
@@ -30,10 +30,10 @@ jobs:
     - ${{ preStep }}
 
   - task: UseDotNet@2
-    displayName: Use .NET Core sdk 3.1
+    displayName: Use .NET 8 SDK
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 8.0.x
       installationPath: $(Agent.TempDirectory)/dotnet
       workingDirectory: $(Agent.TempDirectory)
 

diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml
@@ -14,7 +14,7 @@ parameters:
   # This is the default platform provided by Arcade, intended for use by a managed-only repo.
   defaultManagedPlatform:
     name: 'Managed'
-    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
+    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
 
   # Defines the platforms on which to run build jobs. One job is created for each platform, and the
   # object in this array is sent to the job template as 'platform'. If no platforms are specified,

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.128",
+    "dotnet": "6.0.130",
     "runtimes": {
       "dotnet": [
         "2.1.7",
@@ -12,11 +12,11 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24266.4"
   },
   "sdk": {
-    "version": "6.0.128"
+    "version": "6.0.130"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",