From 05ee136e87a9c84b9d29fa36ad6756865e4086e7 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Tue, 31 Mar 2020 11:54:00 +0100 Subject: [PATCH] Rename site.css to app.css. Fixes #19779 --- .../test/BuildIntegrationTests/PublishIntegrationTest.cs | 2 +- .../standalone/LinkToWebRoot/css/{site.css => app.css} | 0 .../Build/testassets/standalone/standalone.csproj | 4 ++-- .../testassets/standalone/wwwroot/css/{site.css => app.css} | 0 .../Build/testassets/standalone/wwwroot/index.html | 2 +- .../StandaloneApp/wwwroot/css/{site.css => app.css} | 0 .../WebAssembly/testassets/StandaloneApp/wwwroot/index.html | 2 +- .../wwwroot/css/{site.css => app.css} | 0 .../Wasm.Authentication.Client/wwwroot/index.html | 2 +- .../test/testassets/ComponentsApp.Server/Pages/_Host.cshtml | 2 +- .../ComponentsApp.Server/wwwroot/css/{site.css => app.css} | 0 .../Client/wwwroot/css/{site.css => app.css} | 0 .../ComponentsWebAssembly-CSharp/Client/wwwroot/index.html | 2 +- .../Server/Pages/Shared/_Layout.cshtml | 2 +- src/ProjectTemplates/test/template-baselines.json | 6 +++--- 15 files changed, 12 insertions(+), 12 deletions(-) rename src/Components/WebAssembly/Build/testassets/standalone/LinkToWebRoot/css/{site.css => app.css} (100%) rename src/Components/WebAssembly/Build/testassets/standalone/wwwroot/css/{site.css => app.css} (100%) rename src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/css/{site.css => app.css} (100%) rename src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/css/{site.css => app.css} (100%) rename src/Components/test/testassets/ComponentsApp.Server/wwwroot/css/{site.css => app.css} (100%) rename src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/css/{site.css => app.css} (100%) diff --git a/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs b/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs index 32eaa82167..691a17b69b 100644 --- a/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs +++ b/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs @@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build // Verify link item assets are in the publish directory Assert.FileExists(result, blazorPublishDirectory, "js", "LinkedScript.js"); - var cssFile = Assert.FileExists(result, blazorPublishDirectory, "css", "site.css"); + var cssFile = Assert.FileExists(result, blazorPublishDirectory, "css", "app.css"); Assert.FileContains(result, cssFile, ".publish"); Assert.FileDoesNotExist(result, "dist", "Fake-License.txt"); diff --git a/src/Components/WebAssembly/Build/testassets/standalone/LinkToWebRoot/css/site.css b/src/Components/WebAssembly/Build/testassets/standalone/LinkToWebRoot/css/app.css similarity index 100% rename from src/Components/WebAssembly/Build/testassets/standalone/LinkToWebRoot/css/site.css rename to src/Components/WebAssembly/Build/testassets/standalone/LinkToWebRoot/css/app.css diff --git a/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj b/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj index d3890882a9..8fc5d5cfb8 100644 --- a/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj +++ b/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj @@ -24,10 +24,10 @@ - + - + diff --git a/src/Components/WebAssembly/Build/testassets/standalone/wwwroot/css/site.css b/src/Components/WebAssembly/Build/testassets/standalone/wwwroot/css/app.css similarity index 100% rename from src/Components/WebAssembly/Build/testassets/standalone/wwwroot/css/site.css rename to src/Components/WebAssembly/Build/testassets/standalone/wwwroot/css/app.css diff --git a/src/Components/WebAssembly/Build/testassets/standalone/wwwroot/index.html b/src/Components/WebAssembly/Build/testassets/standalone/wwwroot/index.html index 85994d6e89..bbfa66c41a 100644 --- a/src/Components/WebAssembly/Build/testassets/standalone/wwwroot/index.html +++ b/src/Components/WebAssembly/Build/testassets/standalone/wwwroot/index.html @@ -7,7 +7,7 @@ standalone - + diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/css/site.css b/src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/css/app.css similarity index 100% rename from src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/css/site.css rename to src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/css/app.css diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/index.html b/src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/index.html index 646ea2f3da..8828febac2 100644 --- a/src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/index.html +++ b/src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/index.html @@ -7,7 +7,7 @@ Blazor standalone - + Loading... diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/css/site.css b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/css/app.css similarity index 100% rename from src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/css/site.css rename to src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/css/app.css diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/index.html b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/index.html index d3ab357ca5..1797efb1bf 100644 --- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/index.html +++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/index.html @@ -7,7 +7,7 @@ Wasm.Authentication.Client - + diff --git a/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml b/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml index 9aa4ff85ad..5e34a117a5 100644 --- a/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml +++ b/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml @@ -9,7 +9,7 @@ Razor Components - + diff --git a/src/Components/test/testassets/ComponentsApp.Server/wwwroot/css/site.css b/src/Components/test/testassets/ComponentsApp.Server/wwwroot/css/app.css similarity index 100% rename from src/Components/test/testassets/ComponentsApp.Server/wwwroot/css/site.css rename to src/Components/test/testassets/ComponentsApp.Server/wwwroot/css/app.css diff --git a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/css/site.css b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/css/app.css similarity index 100% rename from src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/css/site.css rename to src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/css/app.css diff --git a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/index.html b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/index.html index 8a06e7dcd0..7e39788a58 100644 --- a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/index.html +++ b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Client/wwwroot/index.html @@ -7,7 +7,7 @@ ComponentsWebAssembly-CSharp - + diff --git a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Shared/_Layout.cshtml b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Shared/_Layout.cshtml index 5242a4f51d..a3695776cc 100644 --- a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Shared/_Layout.cshtml +++ b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Shared/_Layout.cshtml @@ -6,7 +6,7 @@ @ViewBag.Title - + diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index ab81c6f678..bdb38fa9d6 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -24,7 +24,7 @@ "wwwroot/css/open-iconic/FONT-LICENSE", "wwwroot/css/open-iconic/ICON-LICENSE", "wwwroot/css/open-iconic/README.md", - "wwwroot/css/site.css", + "wwwroot/css/app.css", "wwwroot/favicon.ico", "wwwroot/index.html", "wwwroot/sample-data/weather.json", @@ -55,7 +55,7 @@ "Client/wwwroot/css/open-iconic/FONT-LICENSE", "Client/wwwroot/css/open-iconic/ICON-LICENSE", "Client/wwwroot/css/open-iconic/README.md", - "Client/wwwroot/css/site.css", + "Client/wwwroot/css/app.css", "Client/wwwroot/favicon.ico", "Client/wwwroot/index.html", "Client/_Imports.razor", @@ -95,7 +95,7 @@ "wwwroot/css/open-iconic/FONT-LICENSE", "wwwroot/css/open-iconic/ICON-LICENSE", "wwwroot/css/open-iconic/README.md", - "wwwroot/css/site.css", + "wwwroot/css/app.css", "wwwroot/favicon.ico", "wwwroot/icon-512.png", "wwwroot/index.html",