Merge pull request #7230 from dotnet/darc-main-a1f09893-2290-4391-a17…

…a-7b9bf46250ce [main] Update dependencies from dotnet/arcade
dotnet · Nov 8, 2023 · fc97c47 · fc97c47
2 parents 0a9a73a + b63512f
commit fc97c47
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -6,7 +6,6 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-385d77b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-385d77bd/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--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" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -29,14 +29,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23531.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23556.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
+      <Sha>21c8b7373b7e4845f7df0ad15654529c1f41b66d</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23531.4">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23556.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
+      <Sha>21c8b7373b7e4845f7df0ad15654529c1f41b66d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
@@ -341,7 +341,12 @@ function InitializeBuildTool {
   # return values
   _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
   _InitializeBuildToolCommand="msbuild"
-  _InitializeBuildToolFramework="net8.0"
+  # use override if it exists - commonly set by source-build
+  if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
+    _InitializeBuildToolFramework="net8.0"
+  else
+    _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
+  fi
 }
 
 # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116

diff --git a/global.json b/global.json
@@ -8,6 +8,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.4"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23556.4"
   }
 }