Skip to content

Commit a27769f

Browse files
[main] Source code updates from dotnet/dotnet (#16549)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
1 parent 31161de commit a27769f

3 files changed

Lines changed: 9 additions & 9 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="18089f4b324825f5720bd722d24d6a8847f8b5d9" BarId="302589" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="29e27492f3c22a11530e45fcf3707987125b7edf" BarId="303682" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>

src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateMD5SumsFile.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public override bool Execute()
4141
string relativePath = file.ItemSpec.Substring(RootDirectory.Length).TrimStart(Path.DirectorySeparatorChar).Replace('\\', '/');
4242
// Always use Linux line-endings
4343
#if NET
44-
writer.Write($"{Convert.ToHexString(hash)} {relativePath}\n");
44+
writer.Write($"{Convert.ToHexStringLower(hash)} {relativePath}\n");
4545
#else
46-
writer.Write($"{BitConverter.ToString(hash).Replace("-", "")} {relativePath}\n");
46+
writer.Write($"{BitConverter.ToString(hash).Replace("-", "").ToLower()} {relativePath}\n");
4747
#endif
4848
}
4949

src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,18 +441,18 @@ private void ValidateProducedDebContent(
441441

442442
using MD5 md5 = MD5.Create();
443443
using FileStream fileStream = File.OpenRead(layoutFilePath);
444-
string newHash = Convert.ToHexString(md5.ComputeHash(fileStream));
444+
string newHash = Convert.ToHexStringLower(md5.ComputeHash(fileStream));
445445

446446
if (signableFiles.Contains(targetSystemFilePath))
447447
{
448448
newHash.Should().NotBe(originalHash);
449-
md5sumsContents.Should().Contain($"{newHash} {targetSystemFilePath}");
450-
md5sumsContents.Should().NotContain($"{originalHash} {targetSystemFilePath}");
449+
md5sumsContents.Should().Contain($"{newHash} {targetSystemFilePath}");
450+
md5sumsContents.Should().NotContain($"{originalHash} {targetSystemFilePath}");
451451
}
452452
else
453453
{
454454
newHash.Should().Be(originalHash);
455-
md5sumsContents.Should().Contain($"{originalHash} {targetSystemFilePath}");
455+
md5sumsContents.Should().Contain($"{originalHash} {targetSystemFilePath}");
456456
}
457457
}
458458

@@ -1993,8 +1993,8 @@ public void CheckDebSigning()
19931993

19941994
var expectedFilesOriginalHashes = new (string, string)[]
19951995
{
1996-
("usr/local/bin/hello", "644981BBD6F4ED1B3CF68CD0F47981AA"),
1997-
("usr/local/bin/mscorlib.dll", "B80EEBA2B8616B7C37E49B004D69BBB7")
1996+
("usr/local/bin/hello", "644981bbd6f4ed1b3cf68cd0f47981aa"),
1997+
("usr/local/bin/mscorlib.dll", "b80eeba2b8616b7c37e49b004d69bbb7")
19981998
};
19991999
string[] signableFiles = ["usr/local/bin/mscorlib.dll"];
20002000
string expectedControlFileContent = "Package: test\nVersion: 1.0\nSection: base\nPriority: optional\nArchitecture: all\n";

0 commit comments

Comments
 (0)