Skip to content

Commit 0bfd2dd

Browse files
[main] Update dependencies from dotnet/arcade (#19342)
[main] Update dependencies from dotnet/arcade - Delete src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch
1 parent 962083e commit 0bfd2dd

File tree

8 files changed

+18
-39
lines changed

8 files changed

+18
-39
lines changed

eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,17 @@
238238
</Dependency>
239239
</ProductDependencies>
240240
<ToolsetDependencies>
241-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24205.14">
241+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24207.1">
242242
<Uri>https://github.com/dotnet/arcade</Uri>
243-
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
243+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24205.14">
245+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24207.1">
246246
<Uri>https://github.com/dotnet/arcade</Uri>
247-
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
247+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24205.14">
249+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24207.1">
250250
<Uri>https://github.com/dotnet/arcade</Uri>
251-
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
251+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
252252
</Dependency>
253253
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3">
254254
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -258,14 +258,14 @@
258258
<Uri>https://github.com/dotnet/arcade-services</Uri>
259259
<Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha>
260260
</Dependency>
261-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24205.14">
261+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24207.1">
262262
<Uri>https://github.com/dotnet/arcade</Uri>
263-
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
263+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
264264
</Dependency>
265265
<!-- Intermediate is necessary for source build. -->
266-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24205.14">
266+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24207.1">
267267
<Uri>https://github.com/dotnet/arcade</Uri>
268-
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
268+
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
269269
<SourceBuild RepoName="arcade" ManagedOnly="true" />
270270
</Dependency>
271271
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24205.14</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

eng/common/internal/NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<configuration>
23
<packageSources>
34
<clear />

eng/common/loc/P22DotNetHtmlLocalization.lss

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0"?>
12
<LS_SETTINGS_FILE>
23
<LS_SETTINGS_DESCRIPTION>
34
<![CDATA[]]>

eng/common/sdl/NuGet.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<configuration>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
23
<solution>
34
<add key="disableSourceControlIntegration" value="true" />
45
</solution>

eng/common/sdl/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<packages>
23
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
34
</packages>

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"cmake": "latest"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14",
15-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24205.14",
14+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1",
15+
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24207.1",
1616
"Microsoft.Build.NoTargets": "3.7.0"
1717
}
1818
}

src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch

-25
This file was deleted.

0 commit comments

Comments
 (0)