Merge remote-tracking branch 'upstream/release/dev17.8' into merges/r…

…elease/dev17.8-to-release/dev17.10
dotnet · Oct 23, 2024 · e4bcdeb · e4bcdeb
2 parents 719e3f2 + af919ba
commit e4bcdeb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -99,11 +99,6 @@
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
-    </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24516.1">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

diff --git a/global.json b/global.json
@@ -22,6 +22,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
-    "Microsoft.Build.NoTargets": "2.0.1"
+    "Yarn.MSBuild": "1.22.10"
   }
 }