Merge branch 'upgrade/blazor080'

jsakamoto · Feb 10, 2019 · c919bbe · c919bbe
2 parents 7f58d5b + 354bd17
commit c919bbe
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 332 deletions.
diff --git a/SampleSites/ClientSideBlazorSampleSite/App.cshtml b/SampleSites/ClientSideBlazorSampleSite/App.cshtml
@@ -1 +1 @@
-<Router AppAssembly=typeof(Program).Assembly />
+<Router AppAssembly="typeof(Program).Assembly" />
diff --git a/SampleSites/ClientSideBlazorSampleSite/ClientSideBlazorSampleSite.csproj b/SampleSites/ClientSideBlazorSampleSite/ClientSideBlazorSampleSite.csproj
@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0-preview1-final" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0-preview1-final" PrivateAssets="all" />
-    <PackageReference Include="Toolbelt.Blazor.Gamepad" Version="1.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="0.8.0-preview-19104-04" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.8.0-preview-19104-04" PrivateAssets="all" />
+    <PackageReference Include="Toolbelt.Blazor.Gamepad" Version="2.0.0" />
 
-    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.7.0-preview1-final" />
+    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.8.0-preview-19104-04" />
   </ItemGroup>
 
 </Project>
diff --git a/SampleSites/ClientSideBlazorSampleSite/Startup.cs b/SampleSites/ClientSideBlazorSampleSite/Startup.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Blazor.Builder;
+using Microsoft.AspNetCore.Components.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Toolbelt.Blazor.Extensions.DependencyInjection;
 
@@ -11,7 +11,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddGamepadList();
         }
 
-        public void Configure(IBlazorApplicationBuilder app)
+        public void Configure(IComponentsApplicationBuilder app)
         {
             app.AddComponent<App>("app");
         }

diff --git a/SampleSites/ClientSideBlazorSampleSite/_ViewImports.cshtml b/SampleSites/ClientSideBlazorSampleSite/_ViewImports.cshtml
@@ -1,5 +1,5 @@
 @using System.Net.Http
-@using Microsoft.AspNetCore.Blazor.Layouts
-@using Microsoft.AspNetCore.Blazor.Routing
+@using Microsoft.AspNetCore.Components.Layouts
+@using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
 @using ClientSideBlazorSampleSite
diff --git a/SampleSites/ClientSideBlazorSampleSite/wwwroot/index.html b/SampleSites/ClientSideBlazorSampleSite/wwwroot/index.html
@@ -2,13 +2,13 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width" />
     <title>SampleSite</title>
     <base href="/" />
 </head>
 <body>
     <app>Loading...</app>
 
-    <script src="_framework/blazor.webassembly.js"></script>
+    <script src="_framework/components.webassembly.js"></script>
 </body>
 </html>
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/About.cshtml b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/About.cshtml
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/App.cshtml b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/App.cshtml
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/Home.cshtml b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/Home.cshtml
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/Program.cs b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/Program.cs
diff --git a/.../ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/Properties/launchSettings.json b/.../ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/Properties/launchSettings.json
diff --git a/...SideBlazorSampleSite/ServerSideBlazorSampleSite.App/ServerSideBlazorSampleSite.App.csproj b/...SideBlazorSampleSite/ServerSideBlazorSampleSite.App/ServerSideBlazorSampleSite.App.csproj
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/Startup.cs b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/Startup.cs
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/_ViewImports.cshtml b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/_ViewImports.cshtml
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/wwwroot/index.html b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.App/wwwroot/index.html
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.Server/Program.cs b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.Server/Program.cs
diff --git a/...rverSideBlazorSampleSite/ServerSideBlazorSampleSite.Server/Properties/launchSettings.json b/...rverSideBlazorSampleSite/ServerSideBlazorSampleSite.Server/Properties/launchSettings.json
diff --git a/...azorSampleSite/ServerSideBlazorSampleSite.Server/ServerSideBlazorSampleSite.Server.csproj b/...azorSampleSite/ServerSideBlazorSampleSite.Server/ServerSideBlazorSampleSite.Server.csproj
diff --git a/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.Server/Startup.cs b/SampleSites/ServerSideBlazorSampleSite/ServerSideBlazorSampleSite.Server/Startup.cs
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<Router AppAssembly=typeof(Program).Assembly />
		<Router AppAssembly="typeof(Program).Assembly" />