[main] Update dependencies from dotnet/arcade (#19342)

[main] Update dependencies from dotnet/arcade - Delete src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch
dotnet · Apr 8, 2024 · 0bfd2dd · 0bfd2dd
1 parent 962083e
commit 0bfd2dd
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 39 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -238,17 +238,17 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24205.14">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24207.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
+      <Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24205.14">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24207.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
+      <Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24205.14">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24207.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
+      <Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -258,14 +258,14 @@
       <Uri>https://github.com/dotnet/arcade-services</Uri>
       <Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24205.14">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24207.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
+      <Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24205.14">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24207.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
+      <Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -39,7 +39,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24205.14</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->

diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <clear />

diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <LS_SETTINGS_FILE>
   <LS_SETTINGS_DESCRIPTION>
     <![CDATA[]]>

diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config
@@ -1,4 +1,5 @@
-<configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
   </solution>

diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
 </packages>
diff --git a/global.json b/global.json
@@ -11,8 +11,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14",
-    "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24205.14",
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1",
+    "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24207.1",
     "Microsoft.Build.NoTargets": "3.7.0"
   }
 }
diff --git a/src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch b/src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch