Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#19342)
Browse files Browse the repository at this point in the history
[main] Update dependencies from dotnet/arcade


 - Delete src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch
  • Loading branch information
dotnet-maestro[bot] authored Apr 8, 2024
1 parent 962083e commit 0bfd2dd
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 39 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
1 change: 1 addition & 0 deletions eng/common/internal/NuGet.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
Expand Down
1 change: 1 addition & 0 deletions eng/common/loc/P22DotNetHtmlLocalization.lss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0"?>
<LS_SETTINGS_FILE>
<LS_SETTINGS_DESCRIPTION>
<![CDATA[]]>
Expand Down
3 changes: 2 additions & 1 deletion eng/common/sdl/NuGet.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<configuration>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
Expand Down
1 change: 1 addition & 0 deletions eng/common/sdl/packages.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
</packages>
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
25 changes: 0 additions & 25 deletions src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch

This file was deleted.

0 comments on commit 0bfd2dd

Please sign in to comment.