Merged PR 37385: [internal/release/7.0] Merge from public

Merge from public release/7.0 to internal/release/7.0 and resolve conflicts if necessary

Author: vseanreesermsft

NuGet.config

@@ -6,6 +6,9 @@
     <!--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-dff486f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-567edaf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-567edaf-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-567edaf-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-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" />
@@ -22,6 +25,9 @@
     <!--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-dff486f" value="true" />
+    <add key="darc-int-dotnet-runtime-567edaf-1" value="true" />
+    <add key="darc-int-dotnet-runtime-567edaf-2" value="true" />
+    <add key="darc-int-dotnet-runtime-567edaf" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>

eng/Version.Details.xml

@@ -75,25 +75,25 @@
     </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.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</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.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</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.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</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.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</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.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
+      <Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -49,8 +49,8 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
-    <MicrosoftDotNetApiCompatVersion>7.0.0-beta.24059.5</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.24059.5</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetApiCompatVersion>7.0.0-beta.24114.4</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.24114.4</MicrosoftDotNetCodeAnalysisPackageVersion>
   </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 -->

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

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "7.0.115",
+    "dotnet": "7.0.116",
     "runtimes": {
       "dotnet": [
         "2.1.7",
@@ -12,11 +12,11 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24059.5"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.4"
   },
   "sdk": {
-    "version": "7.0.115"
+    "version": "7.0.116"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",