Templatize baselines further

Author: javiercn

src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmBaselineTests.cs

@@ -33,7 +33,10 @@ private string TemplatizeCompressedAssets(StaticWebAsset asset, string originalV
                 return null;
             }
 
-            return Path.Combine(Path.GetDirectoryName(asset.Identity), "[[" + asset.RelativePath + "]]");
+            var result = Path.Combine(Path.GetDirectoryName(asset.Identity), "[[" + asset.RelativePath + "]]");
+            return !GenerateBaselines ?
+                result.Replace("${RuntimeVersion}", RuntimeVersion).Replace("${PackageVersion}", DefaultPackageVersion) :
+                result.Replace(RuntimeVersion, "${RuntimeVersion}").Replace(DefaultPackageVersion, "${PackageVersion}");
         }
 
         protected override string EmbeddedResourcePrefix => string.Join('.', "Microsoft.NET.Sdk.BlazorWebAssembly.Tests", "StaticWebAssetsBaselines");

src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json

@@ -7459,7 +7459,7 @@
       "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\net6.0\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll"
     },
     {
-      "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.0-rc.1.21401.3.js.gz]]",
+      "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.js.gz]]",
       "SourceId": "blazorwasm",
       "SourceType": "Computed",
       "ContentRoot": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\blazor\\",

src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json

@@ -6647,7 +6647,7 @@
       "OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\net6.0\\wwwroot\\_framework\\blazorwasm-minimal.pdb"
     },
     {
-      "Identity": "${ProjectRoot}\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.0-rc.1.21401.3.js.gz]]",
+      "Identity": "${ProjectRoot}\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.js.gz]]",
       "SourceId": "blazorwasm-minimal",
       "SourceType": "Computed",
       "ContentRoot": "${ProjectRoot}\\obj\\Debug\\net6.0\\blazor\\",

src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json

@@ -6745,7 +6745,7 @@
       "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\net6.0\\wwwroot\\_framework\\blazorwasm.pdb"
     },
     {
-      "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.0-rc.1.21401.3.js.gz]]",
+      "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.js.gz]]",
       "SourceId": "blazorwasm",
       "SourceType": "Project",
       "ContentRoot": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\blazor\\",

src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_HostedApp_ReferencingNetStandardLibrary_Works.Build.files.json

@@ -0,0 +1 @@
+[]

src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_HostedApp_ReferencingNetStandardLibrary_Works.Build.staticwebassets.json

@@ -204,7 +204,7 @@
       "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\net6.0\\build-gz\\[[_framework\\[[_framework/blazorwasm-minimal.pdb.gz]]"
     },
     {
-      "Identity": "${ProjectRoot}\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.0-rc.1.21401.3.js.gz]]",
+      "Identity": "${ProjectRoot}\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.js.gz]]",
       "SourceId": "blazorwasm-minimal",
       "SourceType": "Computed",
       "ContentRoot": "${ProjectRoot}\\bin\\Debug\\net6.0\\publish\\wwwroot\\",
@@ -2465,7 +2465,7 @@
       "OriginalItemSpec": "${ProjectRoot}\\obj\\Debug\\net6.0\\linked\\blazorwasm-minimal.dll"
     },
     {
-      "Identity": "${ProjectRoot}\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.6.0.0-rc.1.21401.3.js.br]]",
+      "Identity": "${ProjectRoot}\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.${RuntimeVersion}.js.br]]",
       "SourceId": "blazorwasm-minimal",
       "SourceType": "Computed",
       "ContentRoot": "${ProjectRoot}\\bin\\Debug\\net6.0\\publish\\wwwroot\\",

src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json

@@ -268,7 +268,7 @@
       "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\build-gz\\[[_framework\\[[_framework/blazorwasm.pdb.gz]]"
     },
     {
-      "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.0-rc.1.21401.3.js.gz]]",
+      "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.${RuntimeVersion}.js.gz]]",
       "SourceId": "blazorwasm",
       "SourceType": "Project",
       "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\net6.0\\publish\\wwwroot\\",
@@ -2563,7 +2563,7 @@
       "OriginalItemSpec": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\linked\\blazorwasm.dll"
     },
     {
-      "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.6.0.0-rc.1.21401.3.js.br]]",
+      "Identity": "${ProjectRoot}\\blazorwasm\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.${RuntimeVersion}.js.br]]",
       "SourceId": "blazorwasm",
       "SourceType": "Project",
       "ContentRoot": "${ProjectRoot}\\blazorwasm\\bin\\Debug\\net6.0\\publish\\wwwroot\\",