Skip to content

Commit 6a17902

Browse files
[main] Source code updates from dotnet/dotnet (#16393)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 4917b99 commit 6a17902

4 files changed

Lines changed: 4 additions & 2 deletions

File tree

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="29eefe27a350eb8b0bcbababa7863a0d1086295d" BarId="293166" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="d65136bfc1cc606d916ceaa102a4c1925e2b5d59" BarId="294068" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>

src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@
471471

472472
<Copy SourceFiles="$(MangledNuspecFile)" DestinationFiles="$(VsInsertionNuspecFile)" />
473473

474-
<Exec Command="$(DotNetTool) pack &quot;$(VsInsertionNuspecFile)&quot; --property &quot;$(PackProperties)&quot; --version $(Version) -o &quot;$(ArtifactsNonShippingPackagesDir.TrimEnd('\\'))&quot;" StandardOutputImportance="normal" />
474+
<Exec Command="&quot;$(DotNetTool)&quot; pack &quot;$(VsInsertionNuspecFile)&quot; --property &quot;$(PackProperties)&quot; --version $(Version) -o &quot;$(ArtifactsNonShippingPackagesDir.TrimEnd('\\'))&quot;" StandardOutputImportance="normal" />
475475

476476
<Error
477477
Condition="!Exists('$(NupkgOutputFile)')"

src/Microsoft.DotNet.SignTool/src/VerifySignatures.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ private static void DownloadAndConfigurePublicKeys(string tempDir)
263263
string[] keyUrls = new string[]
264264
{
265265
"https://packages.microsoft.com/keys/microsoft.asc", // SHA-1 Microsoft public key
266+
"https://packages.microsoft.com/keys/microsoft-2025.asc", // Microsoft public key for new repos not compatible with SHA-1
266267
"https://packages.microsoft.com/keys/microsoft-rolling.asc", // Non-SHA1 Microsoft public keys for non-Azure Linux distributions
267268
"https://raw.githubusercontent.com/microsoft/azurelinux/3.0/SPECS/azurelinux-repos/MICROSOFT-RPM-GPG-KEY" // Azure linux public key
268269
};

src/SignCheck/Microsoft.SignCheck/Utils.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ public static void DownloadAndConfigurePublicKeys(string tempDir)
200200
string[] keyUrls = new string[]
201201
{
202202
"https://packages.microsoft.com/keys/microsoft.asc", // Microsoft public key
203+
"https://packages.microsoft.com/keys/microsoft-2025.asc", // Microsoft public key for distributions that do not allow SHA1
203204
"https://packages.microsoft.com/keys/microsoft-rolling.asc", // Non-SHA1 Microsoft public keys for non-Azure Linux distributions
204205
"https://raw.githubusercontent.com/microsoft/azurelinux/3.0/SPECS/azurelinux-repos/MICROSOFT-RPM-GPG-KEY" // Azure linux public key
205206
};

0 commit comments

Comments
 (0)