diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj index 6975bb0f19..942482234b 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj @@ -4,14 +4,16 @@ netstandard2.0 Exe - https://dotnet.myget.org/f/blazor-dev/api/v3/index.json; + https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; + https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; 7.3 - - + + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs index 0a53a7bafe..459d0050c2 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Components.Hosting; +using Microsoft.AspNetCore.Blazor.Hosting; namespace BlazorHosted_CSharp.Client { diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj index d60d4c2874..b572454c3d 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj @@ -1,17 +1,17 @@  - netcoreapp2.1 + netcoreapp3.0 - https://dotnet.myget.org/f/blazor-dev/api/v3/index.json; + https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; + https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; 7.3 - - - + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs index 0c62dfd1ca..43701fe55a 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs @@ -1,11 +1,9 @@ -using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.ResponseCompression; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json.Serialization; using System.Linq; -using System.Net.Mime; namespace BlazorHosted_CSharp.Server { @@ -16,15 +14,7 @@ namespace BlazorHosted_CSharp.Server public void ConfigureServices(IServiceCollection services) { services.AddMvc(); - - services.AddResponseCompression(options => - { - options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[] - { - MediaTypeNames.Application.Octet, - WasmMediaTypeNames.Application.Wasm, - }); - }); + services.AddResponseCompression(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -43,6 +33,7 @@ namespace BlazorHosted_CSharp.Server }); app.UseBlazor(); + app.UseBlazorDebugging(); } } } diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj index a8920bb89d..8cbc0774a0 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj @@ -1,12 +1,11 @@ - + netstandard2.0 - Library true - false - https://dotnet.myget.org/f/blazor-dev/api/v3/index.json; + https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; + https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; 7.3 @@ -19,8 +18,8 @@ - - + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj index 50222ec319..c1c9e18273 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj @@ -5,14 +5,16 @@ dotnet blazor serve - https://dotnet.myget.org/f/blazor-dev/api/v3/index.json; + https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; + https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; 7.3 - - + + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs index 3c8cb66f7f..dd72b78e52 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Components.Hosting; +using Microsoft.AspNetCore.Blazor.Hosting; namespace BlazorStandalone_CSharp { diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props index 0b2b1789a4..3b45f74eaf 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props @@ -2,4 +2,8 @@ + + + true + diff --git a/src/Components/build/dependencies.props b/src/Components/build/dependencies.props index ac2a0ed17d..9e3ba7f2cf 100644 --- a/src/Components/build/dependencies.props +++ b/src/Components/build/dependencies.props @@ -12,14 +12,15 @@ 3.0.0-alpha1-10605 3.0.0-alpha1-10605 3.0.0-alpha1-10605 + 3.0.0-preview-19057-06 0.10.1 3.0.0-alpha1-10605 - 0.8.0-preview1-20181122.3 + 0.8.0-preview-19064-0339 + 3.0.0-preview-19064-0339 2.1.2 - 3.0.0-alpha1-10605 0.8.0-preview1-20181126.1 - 0.8.0-preview1-20181126.1 + 0.8.0-preview1-20181126.4 diff --git a/src/Components/build/sources.props b/src/Components/build/sources.props index fd0526f6dc..9215df9751 100644 --- a/src/Components/build/sources.props +++ b/src/Components/build/sources.props @@ -8,7 +8,6 @@ https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - https://dotnet.myget.org/f/blazor-dev/api/v3/index.json; $(RestoreSources); diff --git a/src/Templating/build/dependencies.props b/src/Templating/build/dependencies.props index ea9c1db1b3..54615c9179 100644 --- a/src/Templating/build/dependencies.props +++ b/src/Templating/build/dependencies.props @@ -9,7 +9,7 @@ 3.0.0-alpha1-10742 3.0.0-alpha1-10742 3.0.0-alpha1-10742 - 3.0.0-preview-18606-0103 + 3.0.0-preview-19064-0342 3.0.0-alpha1-10742 3.0.0-alpha1-10742 3.0.0-alpha1-10742 @@ -22,7 +22,7 @@ 3.0.0-preview-181109-02 3.0.0-preview-181113-11 3.0.0-preview1-26907-05 - 3.0.0-preview-18579-0056 + 3.0.0-preview-19057-06 15.6.1 3.12.1 17.17134.0 diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index 23b0ab922d..9115ba2ce1 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -40,6 +40,7 @@ MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion); MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion); MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); + MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion); diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.App.csproj.in b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.App.csproj.in index 3a4fb6a872..fa2964e06a 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.App.csproj.in +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.App.csproj.in @@ -1,19 +1,16 @@ - + netstandard2.0 - Exe 7.3 RazorComponentsWeb_CSharp.App - - - false + diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.Server.csproj.in b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.Server.csproj.in index 5d74b1ef7a..f9b7bf3d1b 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.Server.csproj.in +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.Server.csproj.in @@ -14,9 +14,6 @@ - - - diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/App.cshtml b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/App.cshtml index 59be8326e1..a79d4152e9 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/App.cshtml +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/App.cshtml @@ -2,4 +2,4 @@ Configuring this here is temporary. Later we'll move the app config into Program.cs, and it won't be necessary to specify AppAssembly. --> - + diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Program.cs b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Program.cs deleted file mode 100644 index d9ec2c621d..0000000000 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Program.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Microsoft.AspNetCore.Components.Hosting; - -namespace RazorComponentsWeb_CSharp.App -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) => - BlazorWebAssemblyHost.CreateDefaultBuilder() - .UseBlazorStartup(); - } -} diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/Startup.cs b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/Startup.cs index e31090556f..2698185f3a 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/Startup.cs +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/Startup.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net.Mime; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.ResponseCompression; using Microsoft.Extensions.DependencyInjection; namespace RazorComponentsWeb_CSharp.Server @@ -18,17 +15,7 @@ namespace RazorComponentsWeb_CSharp.Server // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { - // Adds the Server-Side Blazor services, and those registered by the app project's startup. - services.AddServerSideBlazor(); - - services.AddResponseCompression(options => - { - options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[] - { - MediaTypeNames.Application.Octet, - WasmMediaTypeNames.Application.Wasm, - }); - }); + services.AddRazorComponents(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -39,8 +26,8 @@ namespace RazorComponentsWeb_CSharp.Server app.UseDeveloperExceptionPage(); } - // Use component registrations and static files from the app project. - app.UseServerSideBlazor(); + app.UseStaticFiles(); + app.UseRazorComponents(); } } } diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css.map b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css.map rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/FONT-LICENSE b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/FONT-LICENSE rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/ICON-LICENSE b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/ICON-LICENSE rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/README.md b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/README.md similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/README.md rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/README.md diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/site.css b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/site.css similarity index 100% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/css/site.css rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/css/site.css diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/index.html b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/index.html similarity index 85% rename from src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/index.html rename to src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/index.html index 872e5a515e..f3719772e3 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/wwwroot/index.html +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/index.html @@ -11,6 +11,6 @@ Loading... - +