From 48761c2dcca7e8bf91254bd5571bda11368651c5 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Tue, 13 May 2025 17:33:48 +0200 Subject: [PATCH 1/9] GenerateRuntimeConfigurationFiles --- .../Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets index 5921ae4ce6a4..e31de85966e1 100644 --- a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets +++ b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets @@ -62,8 +62,8 @@ Copyright (c) .NET Foundation. All rights reserved. false false - - false + + false false From aa1435a51682e21945dd2f9a52ff8adb45ea95fe Mon Sep 17 00:00:00 2001 From: Pavel Savara Date: Tue, 13 May 2025 18:28:01 +0200 Subject: [PATCH 2/9] Update src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets index e31de85966e1..a950810eca7d 100644 --- a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets +++ b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets @@ -63,7 +63,7 @@ Copyright (c) .NET Foundation. All rights reserved. false - false + false false From 4b22297c5e349c5ed0e29e096cbfc04416efc98d Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Wed, 14 May 2025 09:44:59 +0200 Subject: [PATCH 3/9] fix ? --- .../WasmBuildIncrementalismTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs index 69aa7d6c2a60..b05011c29371 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs @@ -27,7 +27,8 @@ public void Build_IsIncremental() var filesToIgnore = new[] { Path.Combine(buildOutputDirectory, "RazorClassLibrary.staticwebassets.endpoints.json"), - Path.Combine(buildOutputDirectory, "blazorwasm.staticwebassets.endpoints.json") + Path.Combine(buildOutputDirectory, "blazorwasm.staticwebassets.endpoints.json"), + Path.Combine(buildOutputDirectory, "blazorwasm.runtimeconfig.json") }; // Act From 439f55c04e6a2b84656f4cb8eb25abdd2f2cbc9f Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Wed, 14 May 2025 18:22:36 +0200 Subject: [PATCH 4/9] better --- .../WasmBuildIncrementalismTest.cs | 9 ++++++--- .../Utilities/FileThumbPrint.cs | 9 ++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs index b05011c29371..4d8211f8e85b 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIncrementalismTest.cs @@ -27,8 +27,7 @@ public void Build_IsIncremental() var filesToIgnore = new[] { Path.Combine(buildOutputDirectory, "RazorClassLibrary.staticwebassets.endpoints.json"), - Path.Combine(buildOutputDirectory, "blazorwasm.staticwebassets.endpoints.json"), - Path.Combine(buildOutputDirectory, "blazorwasm.runtimeconfig.json") + Path.Combine(buildOutputDirectory, "blazorwasm.staticwebassets.endpoints.json") }; // Act @@ -44,7 +43,11 @@ public void Build_IsIncremental() newThumbPrint.Count.Should().Be(thumbPrint.Count); for (var j = 0; j < thumbPrint.Count; j++) { - thumbPrint[j].Equals(newThumbPrint[j]).Should().BeTrue(); + var first = thumbPrint[j]; + var actual = newThumbPrint[j]; + actual.Path.Equals(first.Path).Should().BeTrue($"because {actual.Path} should match {first.Path}"); + actual.Hash.Equals(first.Hash).Should().BeTrue($"because {actual.Hash} should match {first.Hash} for {first.Path}"); + actual.LastWriteTimeUtc.Equals(first.LastWriteTimeUtc).Should().BeTrue($"because {actual.LastWriteTimeUtc} should match {first.LastWriteTimeUtc} for {first.Path}"); } } } diff --git a/test/Microsoft.NET.TestFramework/Utilities/FileThumbPrint.cs b/test/Microsoft.NET.TestFramework/Utilities/FileThumbPrint.cs index 8f188989dce9..1e81e139f856 100644 --- a/test/Microsoft.NET.TestFramework/Utilities/FileThumbPrint.cs +++ b/test/Microsoft.NET.TestFramework/Utilities/FileThumbPrint.cs @@ -61,7 +61,14 @@ public bool Equals(FileThumbPrint? other) string.Equals(Hash, other.Hash, StringComparison.Ordinal); } - public override int GetHashCode() => LastWriteTimeUtc.GetHashCode(); + public override int GetHashCode() + { +#if NET + return HashCode.Combine(Path, LastWriteTimeUtc, Hash); +#else + return Path.GetHashCode() ^ LastWriteTimeUtc.GetHashCode() ^ Hash.GetHashCode(); +#endif + } private string GetDebuggerDisplay() { From 15c147a64a805631c97e3fd8d0c093441f41e3fa Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 15 May 2025 23:05:29 +0200 Subject: [PATCH 5/9] fix --- .../targets/Microsoft.PackageDependencyResolution.targets | 2 +- .../WasmBuildIncrementalismTest.cs | 6 +++--- .../BlazorWasmWithLibrary/blazorwasm/blazorwasm.csproj | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets index dc048fde8e68..66cf58e9b03c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets @@ -20,7 +20,7 @@ Copyright (c) .NET Foundation. All rights reserved. - $(MSBuildProjectExtensionsPath)/project.assets.json + $(MSBuildProjectExtensionsPath)project.assets.json $([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))