mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
[main] Update dependencies from dotnet/arcade


 - Delete src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch
This commit is contained in:
dotnet-maestro[bot] 2024-04-08 11:40:36 +00:00 committed by GitHub
parent 962083ecff
commit 0bfd2dd757
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 18 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -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">

2
eng/Versions.props
View file

@ -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 -->

1
eng/common/internal/NuGet.config
View file

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />

1
eng/common/loc/P22DotNetHtmlLocalization.lss
View file

@ -1,3 +1,4 @@
<?xml version="1.0"?>
<LS_SETTINGS_FILE>
<LS_SETTINGS_DESCRIPTION>
<![CDATA[]]>

3
eng/common/sdl/NuGet.config
View file

@ -1,4 +1,5 @@
<configuration>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>

1
eng/common/sdl/packages.config
View file

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
</packages>

4
global.json
View file

@ -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
src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch
View file

@ -1,25 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 16:33:22 +0000
Subject: [PATCH] Disable CA2022 error
Backport: https://github.com/dotnet/arcade/issues/14668
---
src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
index 764a87fa6..e20f70ff4 100644
--- a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
+++ b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
@@ -30,8 +30,10 @@ public static void Decompress(string sourceFile, string destinationFile)
byte[] properties = new byte[5];
byte[] fileLengthBytes = new byte[8];
+#pragma warning disable CA2022 // Avoid inexact read
inFile.Read(properties, 0, 5);
inFile.Read(fileLengthBytes, 0, 8);
+#pragma warning restore CA2022
long fileLength = BitConverter.ToInt64(fileLengthBytes, 0);
decoder.SetDecoderProperties(properties);