From 22d4310b697e23383b2dc489c40429fc83626cf2 Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Mon, 9 Oct 2023 12:34:40 -0400 Subject: [PATCH] trim whitespace. (#2915) --- src/Misc/contentHash/dotnetRuntime/linux-arm | 2 +- .../contentHash/dotnetRuntime/linux-arm64 | 2 +- src/Misc/contentHash/dotnetRuntime/linux-x64 | 2 +- src/Misc/contentHash/dotnetRuntime/osx-arm64 | 2 +- src/Misc/contentHash/dotnetRuntime/osx-x64 | 2 +- src/Misc/contentHash/dotnetRuntime/win-arm64 | 2 +- src/Misc/contentHash/dotnetRuntime/win-x64 | 2 +- src/Test/L0/PackagesTrimL0.cs | 24 +++++++++++++++++++ 8 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm b/src/Misc/contentHash/dotnetRuntime/linux-arm index 9a6e4a641d6..9c49686d8db 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm @@ -1 +1 @@ -7539d33c35b0bc94ee67e3c0de1a6bac5ef89ce8e8efaa110131fa0520a54fb4 +7539d33c35b0bc94ee67e3c0de1a6bac5ef89ce8e8efaa110131fa0520a54fb4 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/linux-arm64 b/src/Misc/contentHash/dotnetRuntime/linux-arm64 index 990265baf36..b249cc0c3d8 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-arm64 @@ -1 +1 @@ -d71a31f9a17e1a41d6e1edea596edfa68a0db5948ed160e86f2154a547f4dd10 +d71a31f9a17e1a41d6e1edea596edfa68a0db5948ed160e86f2154a547f4dd10 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/linux-x64 b/src/Misc/contentHash/dotnetRuntime/linux-x64 index f9b75a56756..bfadedbc0e4 100644 --- a/src/Misc/contentHash/dotnetRuntime/linux-x64 +++ b/src/Misc/contentHash/dotnetRuntime/linux-x64 @@ -1 +1 @@ -3c2f700d8a995efe7895614ee07d9c7880f872d214b45983ad6163e1931870ab +3c2f700d8a995efe7895614ee07d9c7880f872d214b45983ad6163e1931870ab \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/osx-arm64 b/src/Misc/contentHash/dotnetRuntime/osx-arm64 index 2778fe18ddb..05dd69b3049 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-arm64 @@ -1 +1 @@ -b2d85c95ecad13d352f4c7d31c64dbb0d9c6381b48fa5874c4c72a43a025a8a1 +b2d85c95ecad13d352f4c7d31c64dbb0d9c6381b48fa5874c4c72a43a025a8a1 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/osx-x64 b/src/Misc/contentHash/dotnetRuntime/osx-x64 index ae844f7a2fb..d6b3f380ede 100644 --- a/src/Misc/contentHash/dotnetRuntime/osx-x64 +++ b/src/Misc/contentHash/dotnetRuntime/osx-x64 @@ -1 +1 @@ -417d835c1a108619886b4bb5d25988cb6c138eb7b4c00320b1d9455c5630bff9 +417d835c1a108619886b4bb5d25988cb6c138eb7b4c00320b1d9455c5630bff9 \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/win-arm64 b/src/Misc/contentHash/dotnetRuntime/win-arm64 index f7eba158d4a..d9ab17e2639 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-arm64 +++ b/src/Misc/contentHash/dotnetRuntime/win-arm64 @@ -1 +1 @@ -8f35aaecfb53426ea10816442e23065142bab9dd0fb712a29e0fc471d13c44ac +8f35aaecfb53426ea10816442e23065142bab9dd0fb712a29e0fc471d13c44ac \ No newline at end of file diff --git a/src/Misc/contentHash/dotnetRuntime/win-x64 b/src/Misc/contentHash/dotnetRuntime/win-x64 index c54e4467791..0c85041b651 100644 --- a/src/Misc/contentHash/dotnetRuntime/win-x64 +++ b/src/Misc/contentHash/dotnetRuntime/win-x64 @@ -1 +1 @@ -811c7debdfc54d074385b063b83c997e5360c8a9160cd20fe777713968370063 +811c7debdfc54d074385b063b83c997e5360c8a9160cd20fe777713968370063 \ No newline at end of file diff --git a/src/Test/L0/PackagesTrimL0.cs b/src/Test/L0/PackagesTrimL0.cs index da3a44a0c26..e71afd27787 100644 --- a/src/Test/L0/PackagesTrimL0.cs +++ b/src/Test/L0/PackagesTrimL0.cs @@ -273,5 +273,29 @@ public async Task RunnerLayoutParts_CheckExternalsHash() Assert.True(string.Equals(hashResult, File.ReadAllText(externalsHashFile).Trim()), $"Hash mismatch for externals. You might need to update `Misc/contentHash/externals/{BuildConstants.RunnerPackage.PackageName}` or check if `hashFiles.ts` ever changed recently."); } } + + [Fact] + [Trait("Level", "L0")] + [Trait("Category", "Common")] + public Task RunnerLayoutParts_ContentHashFilesNoNewline() + { + using (TestHostContext hc = new(this)) + { + Tracing trace = hc.GetTrace(); + + var dotnetRuntimeHashFile = Path.Combine(TestUtil.GetSrcPath(), $"Misc/contentHash/dotnetRuntime/{BuildConstants.RunnerPackage.PackageName}"); + var dotnetRuntimeHash = File.ReadAllText(dotnetRuntimeHashFile); + trace.Info($"Current hash: {dotnetRuntimeHash}"); + + var externalsHashFile = Path.Combine(TestUtil.GetSrcPath(), $"Misc/contentHash/externals/{BuildConstants.RunnerPackage.PackageName}"); + var externalsHash = File.ReadAllText(externalsHashFile); + trace.Info($"Current hash: {externalsHash}"); + + Assert.False(externalsHash.Any(x => char.IsWhiteSpace(x)), $"Found whitespace in externals hash file."); + Assert.False(dotnetRuntimeHash.Any(x => char.IsWhiteSpace(x)), $"Found whitespace in dotnet runtime hash file."); + + return Task.CompletedTask; + } + } } }