Merge in 'release/7.0' changes

dotnet · Feb 14, 2024 · 2aef67c · 2aef67c
2 parents f4b6c8d + 52cc10e
commit 2aef67c
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 70 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "7.0.0-prerelease.24054.3",
+      "version": "7.0.0-prerelease.24073.2",
       "commands": [
         "xharness"
       ]

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -58,77 +58,77 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
     <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.24108.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -246,21 +246,21 @@
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>53b3303c57b3fe659500fb362a0eef12991c1197</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.24054.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.24073.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>d4bda077bfbe30e25c4569591e8c5c6221e24cc0</Sha>
+      <Sha>068c593390bc20675e70d0dff8e99fc473715cf1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.24054.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.24073.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>d4bda077bfbe30e25c4569591e8c5c6221e24cc0</Sha>
+      <Sha>068c593390bc20675e70d0dff8e99fc473715cf1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.24054.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.24073.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>d4bda077bfbe30e25c4569591e8c5c6221e24cc0</Sha>
+      <Sha>068c593390bc20675e70d0dff8e99fc473715cf1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.24059.5">
+    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.24114.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -53,22 +53,22 @@
     <!-- SDK dependencies -->
     <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>7.0.0-beta.24059.5</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.24059.5</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>7.0.0-beta.24059.5</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.24059.5</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24059.5</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24059.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.24059.5</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.24059.5</MicrosoftDotNetVersionToolsTasksVersion>
-    <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.24059.5</MicrosoftDotNetPackageTestingVersion>
+    <MicrosoftDotNetApiCompatVersion>7.0.0-beta.24114.2</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.24114.2</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>7.0.0-beta.24114.2</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.24114.2</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24114.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24114.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.24114.2</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.24114.2</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.24114.2</MicrosoftDotNetPackageTestingVersion>
     <!-- NuGet dependencies -->
     <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
     <!-- Installer dependencies -->
@@ -154,9 +154,9 @@
     <!-- Testing -->
     <MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
     <MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessCLIVersion>
     <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.24060.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <XUnitVersion>2.4.2</XUnitVersion>
     <XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>

diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
     # Set default versions
     if [[ -z "$majorVersion" ]]; then
         # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
+        if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
         elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
 
         for version in "${versions[@]}"; do

diff --git a/global.json b/global.json
@@ -1,16 +1,16 @@
 {
   "sdk": {
-    "version": "7.0.115",
+    "version": "7.0.116",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "7.0.115"
+    "dotnet": "7.0.116"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24059.5",
-    "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.24059.5",
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.2",
+    "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.24114.2",
     "Microsoft.Build.NoTargets": "3.5.0",
     "Microsoft.Build.Traversal": "3.1.6",
     "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"