From 9bb8940ad699f7a8c60dad8dab2a8e0bb20b1cc6 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Sun, 26 Mar 2023 20:53:28 -0700 Subject: [PATCH 1/9] Update off-by-default analyzers to account for rename --- global.json | 2 +- .../Microsoft.NET.Sdk.FrameworkReferenceResolution.targets | 2 +- .../Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 3c209918bf48..cdd24520b171 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23067.5", + "dotnet": "8.0.100-preview.4.23174.9", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets index 0e4b073c06ae..95b7dee3f13d 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets @@ -421,7 +421,7 @@ Copyright (c) .NET Foundation. All rights reserved. - diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs index c5990756b9cb..a9220bf92d50 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs @@ -75,7 +75,7 @@ private void VerifyRequestDelegateGeneratorIsUsed(TestAsset asset, bool? expectE var analyzers = command.GetValues(); - Assert.Equal(expectEnabled ?? false, analyzers.Any(analyzer => analyzer.Contains("Microsoft.AspNetCore.Http.Generators.dll"))); + Assert.Equal(expectEnabled ?? false, analyzers.Any(analyzer => analyzer.Contains("Microsoft.AspNetCore.Http.RequestDelegateGenerator.dll"))); } [Theory] From a31a53e6fd51e04b9ebb30a76e126378c59bf94d Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 27 Mar 2023 11:07:54 -0700 Subject: [PATCH 2/9] Add Blazor WASM baselines --- ...ootJsonManifest.Build.staticwebassets.json | 34 ------------- ...iesAreCopiedToBuildOutput.Build.files.json | 4 -- ...edToBuildOutput.Build.staticwebassets.json | 34 ------------- ...duleTargetPaths.Build.staticwebassets.json | 34 ------------- ...izeBlazorInitialization.Publish.files.json | 9 ---- ...nitialization.Publish.staticwebassets.json | 51 ------------------- ...tBuildAndPublishModules.Publish.files.json | 9 ---- ...ublishModules.Publish.staticwebassets.json | 51 ------------------- ...izeBlazorInitialization.Publish.files.json | 6 --- ...nitialization.Publish.staticwebassets.json | 51 ------------------- ...nBlazorBootJsonManifest.Publish.files.json | 9 ---- ...tJsonManifest.Publish.staticwebassets.json | 51 ------------------- ...Assets_BuildMinimal_Works.Build.files.json | 4 -- ...ldMinimal_Works.Build.staticwebassets.json | 34 ------------- ...Assets_Build_Hosted_Works.Build.files.json | 2 - ...ld_Hosted_Works.Build.staticwebassets.json | 34 ------------- ...ts_PublishMinimal_Works.Publish.files.json | 9 ---- ...Minimal_Works.Publish.staticwebassets.json | 51 ------------------- ...mentationFiles_AsAssets.Publish.files.json | 6 --- ...iles_AsAssets.Publish.staticwebassets.json | 51 ------------------- ...ts_Publish_Hosted_Works.Publish.files.json | 6 --- ..._Hosted_Works.Publish.staticwebassets.json | 51 ------------------- 22 files changed, 591 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json index b2abfd2c5de9..606f5225cb15 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json @@ -3314,23 +3314,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm-minimal", @@ -6731,23 +6714,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.wasm.gz", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json index 798daf4ebe55..1ba73db330dc 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json @@ -203,7 +203,6 @@ "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.CSharp.resources.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", - "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\es-ES\\classlibrarywithsatelliteassemblies.resources.dll", "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\es\\Microsoft.CodeAnalysis.CSharp.resources.dll", @@ -438,7 +437,6 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\de\\Microsoft.CodeAnalysis.CSharp.resources.dll.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\de\\Microsoft.CodeAnalysis.resources.dll.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.js.gz", - "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.timezones.blat.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\es-ES\\classlibrarywithsatelliteassemblies.resources.dll.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\es\\Microsoft.CodeAnalysis.CSharp.resources.dll.gz", @@ -881,8 +879,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\es-ES\\classlibrarywithsatelliteassemblies.resources.dll", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json index 14b1d5d7ed74..1a3fa25df5e4 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json @@ -3548,23 +3548,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm", @@ -7543,23 +7526,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.wasm.gz", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json index 01cbf2224a1f..f035649e35c9 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json @@ -3395,23 +3395,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm", @@ -6846,23 +6829,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.wasm.gz", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json index 2d084bb0d6cb..b140df6d4761 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json @@ -201,9 +201,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", @@ -227,7 +224,6 @@ "${OutputPath}\\wwwroot\\index.html", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", @@ -370,8 +366,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\blazorwasm-minimal.dll.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.js.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\icudt.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\icudt.dat.gz", @@ -650,9 +644,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json index 7212e09243ed..b714acf4dfa4 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json @@ -50,23 +50,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm-minimal", @@ -2481,40 +2464,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json index eacef659aec6..ea3854005ff5 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json @@ -198,9 +198,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", @@ -224,7 +221,6 @@ "${OutputPath}\\wwwroot\\index.html", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", @@ -365,8 +361,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\blazorwasm-minimal.dll.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.js.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\icudt.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\icudt.dat.gz", @@ -641,9 +635,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json index ed78c31b7361..992b85bcac58 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json @@ -50,23 +50,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm-minimal", @@ -2447,40 +2430,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json index ea470e4ae656..63847197746e 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json @@ -208,9 +208,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", @@ -445,9 +442,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json index 3bdd8d4823a6..8916265688a6 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json @@ -114,23 +114,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm", @@ -2596,40 +2579,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.br" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json index eacef659aec6..ea3854005ff5 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json @@ -198,9 +198,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", @@ -224,7 +221,6 @@ "${OutputPath}\\wwwroot\\index.html", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", @@ -365,8 +361,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\blazorwasm-minimal.dll.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.js.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\icudt.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\icudt.dat.gz", @@ -641,9 +635,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json index 09d54d0eb618..d7442953f885 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json @@ -50,23 +50,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm-minimal", @@ -2447,40 +2430,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json index ed04725a8861..9b47365e7606 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json @@ -193,7 +193,6 @@ "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.dll", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazorwasm-minimal.pdb", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", @@ -394,7 +393,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\blazorwasm-minimal.pdb.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.js.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.timezones.blat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\icudt.dat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\icudt_CJK.dat.gz", @@ -793,8 +791,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\icudt.dat", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json index 5cc6c5efea22..595bc7cf499b 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json @@ -3314,23 +3314,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm-minimal", @@ -6731,23 +6714,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.gz" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.wasm.gz", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json index 39221c49205b..31f14a605dbd 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.files.json @@ -390,8 +390,6 @@ "${OutputPath}\\wwwroot\\_framework\\blazorwasm.pdb.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\icudt.dat", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json index 1cfb920ae1ab..6498d0555964 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json @@ -3378,23 +3378,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\native\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm", @@ -6829,23 +6812,6 @@ "CopyToPublishDirectory": "Never", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.gz" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Build", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "PreserveNewest", - "CopyToPublishDirectory": "Never", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\_framework\\dotnet.wasm.gz", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json index 3e5bb199f5c0..925df560685b 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json @@ -198,9 +198,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", @@ -227,7 +224,6 @@ "${OutputPath}\\wwwroot\\index.html", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\blazor.webassembly.js", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js", - "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", @@ -368,8 +364,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\blazorwasm-minimal.dll.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\blazorwasm-minimal.dll.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.js.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\icudt.dat.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\icudt.dat.gz", @@ -646,9 +640,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json index 901bbe953163..8cc1f37906e9 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json @@ -50,23 +50,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm-minimal", @@ -2447,40 +2430,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.br" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.br" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "SourceId": "blazorwasm-minimal", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json index 5b7afc1b7d94..f1d6ca0ef1dd 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json @@ -205,9 +205,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", @@ -437,9 +434,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json index b8fac183f1df..098a6296537b 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json @@ -97,23 +97,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm", @@ -2545,40 +2528,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.br" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "SourceId": "blazorwasm", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json index 5b7afc1b7d94..f1d6ca0ef1dd 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json @@ -205,9 +205,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", @@ -437,9 +434,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.js", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json index b8fac183f1df..098a6296537b 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json @@ -97,23 +97,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.js" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "RelatedAsset": "", - "AssetTraitName": "BlazorWebAssemblyResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat" - }, { "Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm", "SourceId": "blazorwasm", @@ -2545,40 +2528,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.js.br" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.br" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.timezones.blat.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/dotnet.timezones.blat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.timezones.blat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.timezones.blat.gz" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compress\\_framework\\dotnet.wasm.br", "SourceId": "blazorwasm", From 88db6570165fc332e65bc42d0516619b43f7e217 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 27 Mar 2023 11:25:02 -0700 Subject: [PATCH 3/9] Update baselines for dotnet new commands --- ...tNewCompleteTests.CanDoTabCompletion.Linux.verified.txt | 3 +++ ...netNewCompleteTests.CanDoTabCompletion.OSX.verified.txt | 5 ++++- ...ewCompleteTests.CanDoTabCompletion.Windows.verified.txt | 3 +++ ...cTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt | 7 +++++-- ...sicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt | 7 +++++-- ...est_WhenLegacyCommandIsUsed_common.Windows.verified.txt | 3 +++ ...ests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt | 7 +++++-- ...tTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt | 7 +++++-- ...ts.BasicTest_WhenListCommandIsUsed.Windows.verified.txt | 3 +++ 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt index d5838eb7e98c..da215bb12bea 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt @@ -1,5 +1,6 @@ angular api +apicontroller blazorserver blazorserver-empty blazorwasm @@ -15,6 +16,7 @@ grpc mstest mstest-playwright mvc +mvccontroller nugetconfig nunit nunit-playwright @@ -26,6 +28,7 @@ razorcomponent react sln tool-manifest +view viewimports viewstart web diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt index f2389b49d1c5..da215bb12bea 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt @@ -1,5 +1,6 @@ angular api +apicontroller blazorserver blazorserver-empty blazorwasm @@ -15,6 +16,7 @@ grpc mstest mstest-playwright mvc +mvccontroller nugetconfig nunit nunit-playwright @@ -26,6 +28,7 @@ razorcomponent react sln tool-manifest +view viewimports viewstart web @@ -56,4 +59,4 @@ install list search uninstall -update +update \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt index 6fecb8f2aee2..c51fffec2c2c 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt @@ -1,5 +1,6 @@ angular api +apicontroller blazorserver blazorserver-empty blazorwasm @@ -15,6 +16,7 @@ grpc mstest mstest-playwright mvc +mvccontroller nugetconfig nunit nunit-playwright @@ -26,6 +28,7 @@ razorcomponent react sln tool-manifest +view viewimports viewstart web diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index 5a8ab40bda81..d6082549af29 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -6,6 +6,7 @@ These templates matched your input: Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- -------------------------------- +API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core API api [C#] Web/API ASP.NET Core Empty web [C#],F# Web/Empty ASP.NET Core gRPC Service grpc [C#] Web/gRPC @@ -28,6 +29,7 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config @@ -38,7 +40,8 @@ Protocol Buffer File proto Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index 5a8ab40bda81..d6082549af29 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -6,6 +6,7 @@ These templates matched your input: Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- -------------------------------- +API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core API api [C#] Web/API ASP.NET Core Empty web [C#],F# Web/Empty ASP.NET Core gRPC Service grpc [C#] Web/gRPC @@ -28,6 +29,7 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config @@ -38,7 +40,8 @@ Protocol Buffer File proto Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index dd772a162a05..5970e0891214 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -6,6 +6,7 @@ These templates matched your input: Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- -------------------------------- +API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core API api [C#] Web/API ASP.NET Core Empty web [C#],F# Web/Empty ASP.NET Core gRPC Service grpc [C#] Web/gRPC @@ -28,6 +29,7 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config @@ -38,6 +40,7 @@ Protocol Buffer File proto Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution Web Config webconfig Config Windows Forms App winforms [C#],VB Common/WinForms diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index e0b07a1af591..3c760136b033 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -2,6 +2,7 @@ Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- -------------------------------- +API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core API api [C#] Web/API ASP.NET Core Empty web [C#],F# Web/Empty ASP.NET Core gRPC Service grpc [C#] Web/gRPC @@ -24,6 +25,7 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config @@ -34,7 +36,8 @@ Protocol Buffer File proto Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index e0b07a1af591..3c760136b033 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -2,6 +2,7 @@ Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- -------------------------------- +API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core API api [C#] Web/API ASP.NET Core Empty web [C#],F# Web/Empty ASP.NET Core gRPC Service grpc [C#] Web/gRPC @@ -24,6 +25,7 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config @@ -34,7 +36,8 @@ Protocol Buffer File proto Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index 4de0a5b346b6..262f1b2b1ea6 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -2,6 +2,7 @@ Template Name Short Name Language Tags -------------------------------------------- -------------------------- ---------- -------------------------------- +API Controller apicontroller [C#] Web/ASP.NET ASP.NET Core API api [C#] Web/API ASP.NET Core Empty web [C#],F# Web/Empty ASP.NET Core gRPC Service grpc [C#] Web/gRPC @@ -24,6 +25,7 @@ MSBuild Directory.Build.props file buildprops MSBuild Directory.Build.targets file buildtargets MSBuild/props MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig,nuget.config Config @@ -34,6 +36,7 @@ Protocol Buffer File proto Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution Web Config webconfig Config Windows Forms App winforms [C#],VB Common/WinForms From b0a0ea46156145624d74794d8c3cc942e5da4e75 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 27 Mar 2023 12:41:21 -0700 Subject: [PATCH 4/9] Remove dotnet.timezones.blat assertion --- .../WasmBuildIntegrationTest.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs index ee17d3cb3e60..17be296f25b1 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs @@ -40,7 +40,6 @@ public void BuildMinimal_Works() new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "blazor.boot.json")).Should().Exist(); new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "blazor.webassembly.js")).Should().Exist(); new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.wasm")).Should().Exist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.timezones.blat")).Should().Exist(); new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.wasm.gz")).Should().Exist(); new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "blazorwasm-minimal.dll")).Should().Exist(); } @@ -289,7 +288,6 @@ public void Build_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationData bootJsonData.icuDataMode.Should().Be(ICUDataMode.Invariant); var runtime = bootJsonData.resources.runtime; runtime.Should().ContainKey("dotnet.wasm"); - runtime.Should().ContainKey("dotnet.timezones.blat"); runtime.Should().NotContainKey("icudt.dat"); runtime.Should().NotContainKey("icudt_EFIGS.dat"); @@ -329,7 +327,6 @@ public void Publish_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationDa bootJsonData.icuDataMode.Should().Be(ICUDataMode.Invariant); var runtime = bootJsonData.resources.runtime; runtime.Should().ContainKey("dotnet.wasm"); - runtime.Should().ContainKey("dotnet.timezones.blat"); runtime.Should().NotContainKey("icudt.dat"); runtime.Should().NotContainKey("icudt_EFIGS.dat"); @@ -369,7 +366,6 @@ public void Build_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsICUDataMode( var runtime = bootJsonData.resources.runtime; runtime.Should().ContainKey("dotnet.wasm"); - runtime.Should().ContainKey("dotnet.timezones.blat"); runtime.Should().ContainKey("icudt.dat"); runtime.Should().ContainKey("icudt_EFIGS.dat"); @@ -409,7 +405,6 @@ public void Publish_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsICUDataMod var runtime = bootJsonData.resources.runtime; runtime.Should().ContainKey("dotnet.wasm"); - runtime.Should().ContainKey("dotnet.timezones.blat"); runtime.Should().ContainKey("icudt.dat"); runtime.Should().ContainKey("icudt_EFIGS.dat"); From 5d0214b16291e9283f5fc620ee02e1b2832b366a Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 27 Mar 2023 13:50:07 -0700 Subject: [PATCH 5/9] Fix whitespace in baselines --- ...asicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt | 4 ++-- ...stTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index d6082549af29..78a755e21411 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -42,6 +42,6 @@ Razor Component razorcomponent [C#] Razor Page page [C#] Web/ASP.NET Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index 3c760136b033..583580047187 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -38,6 +38,6 @@ Razor Component razorcomponent [C#] Razor Page page [C#] Web/ASP.NET Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file From 51fd96da2bc88289737863a38124bb17615de899 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 27 Mar 2023 13:53:06 -0700 Subject: [PATCH 6/9] Fix new tests after merge --- .../WasmBuildIntegrationTest.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs index a2d3c700cd89..d674ef6f2d67 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs @@ -368,7 +368,6 @@ public void Build_WithBlazorWebAssemblyLoadCustomGlobalizationData_SetsICUDataMo var runtime = bootJsonData.resources.runtime; runtime.Should().ContainKey("dotnet.wasm"); - runtime.Should().ContainKey("dotnet.timezones.blat"); runtime.Should().ContainKey(customIcuFilename); runtime.Should().NotContainKey("icudt.dat"); runtime.Should().NotContainKey("icudt_CJK.dat"); @@ -411,7 +410,6 @@ public void Publish_WithBlazorWebAssemblyLoadCustomGlobalizationData_SetsICUData var runtime = bootJsonData.resources.runtime; runtime.Should().ContainKey("dotnet.wasm"); - runtime.Should().ContainKey("dotnet.timezones.blat"); runtime.Should().ContainKey(customIcuFilename); runtime.Should().NotContainKey("icudt.dat"); runtime.Should().NotContainKey("icudt_CJK.dat"); From f9f317abd072f64bbd53de0be04593a40ab29f12 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 27 Mar 2023 15:12:40 -0700 Subject: [PATCH 7/9] Fix whitespace in Darwin baselines --- ....BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt | 4 ++-- ...ListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index d6082549af29..78a755e21411 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -42,6 +42,6 @@ Razor Component razorcomponent [C#] Razor Page page [C#] Web/ASP.NET Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index 3c760136b033..583580047187 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -38,6 +38,6 @@ Razor Component razorcomponent [C#] Razor Page page [C#] Web/ASP.NET Razor View view [C#] Web/ASP.NET Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file From fc28af4e36af4d548ecfc459ff693c62b80a8563 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 28 Mar 2023 08:34:11 -0700 Subject: [PATCH 8/9] Skip failing WASM AOT tests --- .../WasmAoTPublishIntegrationTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs index 54fb6f6c4d0d..a02f3ce55a71 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs @@ -22,7 +22,7 @@ public class WasmAoTPublishIntegrationTest : WasmPublishIntegrationTestBase { public WasmAoTPublishIntegrationTest(ITestOutputHelper log) : base(log) { } - [RequiresMSBuildVersionFact("17.0.0")] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/31491")] public void AoT_Publish_InRelease_Works() { // Arrange @@ -54,11 +54,11 @@ public void AoT_Publish_InRelease_Works() }; publishDirectory.Should().HaveFiles(expectedFiles); - + new FileInfo(Path.Combine(blazorPublishDirectory, "css", "app.css")).Should().Contain(".publish"); } - [RequiresMSBuildVersionFact("17.0.0")] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/31491")] public void AoT_Publish_WithExistingWebConfig_Works() { // Arrange @@ -78,7 +78,7 @@ public void AoT_Publish_WithExistingWebConfig_Works() new FileInfo(Path.Combine(publishDirectory.ToString(), "..", "web.config")).Should().Contain(webConfigContents); } - [RequiresMSBuildVersionFact("17.0.0")] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/31491")] public void AoT_Publish_HostedAppWithScopedCss_VisualStudio() { // Simulates publishing the same way VS does by setting BuildProjectReferences=false. From e5a4734482db653baf114bfed720978551df935c Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 28 Mar 2023 09:59:09 -0700 Subject: [PATCH 9/9] Remove another unneeded assertion --- .../VanillaWasmTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/VanillaWasmTests.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/VanillaWasmTests.cs index 0a81b17dcf84..0bb90c470676 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/VanillaWasmTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/VanillaWasmTests.cs @@ -37,7 +37,6 @@ public void Build_Works() new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "blazor.boot.json")).Should().Exist(); new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "blazor.webassembly.js")).Should().NotExist(); new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.wasm")).Should().Exist(); - new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.timezones.blat")).Should().Exist(); } } }