Update demo projects. Client side OK

Tewr · Apr 24, 2019 · 56943be · 56943be
1 parent 4a88996
commit 56943be
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 84 deletions.
diff --git a/...Demo/Components/Pages/_ViewImports.cshtml → ...azor.Demo/Components/Pages/_imports.razor b/...Demo/Components/Pages/_ViewImports.cshtml → ...azor.Demo/Components/Pages/_imports.razor
diff --git a/...lazor.Demo/Components/_ViewImports.cshtml → ...SideBlazor.Demo/Components/_imports.razor b/...lazor.Demo/Components/_ViewImports.cshtml → ...SideBlazor.Demo/Components/_imports.razor
diff --git a/src/Blazor.FileReader.ServerSideBlazor.Demo/Pages/Index.cshtml b/src/Blazor.FileReader.ServerSideBlazor.Demo/Pages/Index.cshtml
@@ -1,4 +1,4 @@
-@page "{*clientPath}"
+@page "/"
 <!DOCTYPE html>
 <html>
 <head>
@@ -21,7 +21,7 @@
 <body>
     <app>@(await Html.RenderComponentAsync<App>())</app>
 
-    <script src="_framework/components.server.js"></script>
+    <script src="_framework/blazor.server.js"></script>
     <script src="FileReaderComponent.js"></script>
 </body>
 </html>
diff --git a/...SideBlazor.Demo/Pages/_ViewImports.cshtml → ...erverSideBlazor.Demo/Pages/_imports.razor b/...SideBlazor.Demo/Pages/_ViewImports.cshtml → ...erverSideBlazor.Demo/Pages/_imports.razor
@@ -1,3 +1,2 @@
 @using Blazor.FileReader.ServerSideBlazor.Demo.Components
 @namespace Blazor.FileReader.ServerSideBlazor.Demo.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Blazor.FileReader.ServerSideBlazor.Demo/Services/WeatherForecast.cs b/src/Blazor.FileReader.ServerSideBlazor.Demo/Services/WeatherForecast.cs
diff --git a/src/Blazor.FileReader.ServerSideBlazor.Demo/Services/WeatherForecastService.cs b/src/Blazor.FileReader.ServerSideBlazor.Demo/Services/WeatherForecastService.cs
diff --git a/src/Blazor.FileReader.ServerSideBlazor.Demo/Startup.cs b/src/Blazor.FileReader.ServerSideBlazor.Demo/Startup.cs
@@ -39,14 +39,16 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
                 app.UseHsts();
             }
-
+            app.UseRouting();
             app.UseHttpsRedirection();
             app.UseStaticFiles();
 
-            app.UseRouting(routes =>
+            app.UseEndpoints(routes =>
             {
                 routes.MapRazorPages();
-                routes.MapComponentHub<App>("app");
+                routes.MapBlazorHub<App>("app");
+                routes.MapFallbackToPage("/");
+                routes.MapDefaultControllerRoute();
             });
         }
     }

diff --git a/src/Blazor.FileReader.Wasm.Demo/App.cshtml → src/Blazor.FileReader.Wasm.Demo/App.razor b/src/Blazor.FileReader.Wasm.Demo/App.cshtml → src/Blazor.FileReader.Wasm.Demo/App.razor
diff --git a/src/Blazor.FileReader.Wasm.Demo/Blazor.FileReader.Wasm.Demo.csproj b/src/Blazor.FileReader.Wasm.Demo/Blazor.FileReader.Wasm.Demo.csproj
@@ -2,14 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RunCommand>dotnet</RunCommand>
-    <RunArguments>blazor serve</RunArguments>
     <LangVersion>7.3</LangVersion>
     <Configurations>Debug;Release;Ghpages</Configurations>
     <AssemblyVersion>1.0.0.1</AssemblyVersion>
     <FileVersion>1.0.0.1</FileVersion>
     <Version>1.0.0.1</Version>
     <BlazorLinkOnBuild>true</BlazorLinkOnBuild>
+      <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Ghpages|AnyCPU'">
@@ -19,6 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview4-19216-03" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ileReader.Wasm.Demo/Pages/Assembly.cshtml → ...FileReader.Wasm.Demo/Pages/Assembly.razor b/...ileReader.Wasm.Demo/Pages/Assembly.cshtml → ...FileReader.Wasm.Demo/Pages/Assembly.razor
diff --git a/...r.FileReader.Wasm.Demo/Pages/Index.cshtml → ...or.FileReader.Wasm.Demo/Pages/Index.razor b/...r.FileReader.Wasm.Demo/Pages/Index.cshtml → ...or.FileReader.Wasm.Demo/Pages/Index.razor
diff --git a/....FileReader.Wasm.Demo/Pages/SHA256.cshtml → ...r.FileReader.Wasm.Demo/Pages/SHA256.razor b/....FileReader.Wasm.Demo/Pages/SHA256.cshtml → ...r.FileReader.Wasm.Demo/Pages/SHA256.razor
diff --git a/...eader.Wasm.Demo/Pages/_ViewImports.cshtml → ...FileReader.Wasm.Demo/Pages/_imports.razor b/...eader.Wasm.Demo/Pages/_ViewImports.cshtml → ...FileReader.Wasm.Demo/Pages/_imports.razor
diff --git a/...Reader.Wasm.Demo/Shared/MainLayout.cshtml → ...eReader.Wasm.Demo/Shared/MainLayout.razor b/...Reader.Wasm.Demo/Shared/MainLayout.cshtml → ...eReader.Wasm.Demo/Shared/MainLayout.razor
diff --git a/...ileReader.Wasm.Demo/Shared/NavMenu.cshtml → ...FileReader.Wasm.Demo/Shared/NavMenu.razor b/...ileReader.Wasm.Demo/Shared/NavMenu.cshtml → ...FileReader.Wasm.Demo/Shared/NavMenu.razor
diff --git a/....FileReader.Wasm.Demo/_ViewImports.cshtml → ...lazor.FileReader.Wasm.Demo/_imports.razor b/....FileReader.Wasm.Demo/_ViewImports.cshtml → ...lazor.FileReader.Wasm.Demo/_imports.razor
@@ -6,4 +6,3 @@
 @using Blazor.FileReader.Wasm.Demo
 @using Blazor.FileReader.Wasm.Demo.Shared
 @using Blazor.FileReader
-@addTagHelper *, Blazor.FileReader
diff --git a/src/Blazor.FileReader.Wasm.Demo/wwwroot/index.html b/src/Blazor.FileReader.Wasm.Demo/wwwroot/index.html
@@ -149,7 +149,7 @@
         }
       }(window.location))
     </script>
-    <script src="_framework/components.webassembly.js"></script>
+    <script src="_framework/blazor.webassembly.js"></script>
     <script src="FileReaderComponent.js"></script>
 </body>
 </html>
diff --git a/src/Blazor.FileReader.Wasm/Blazor.FileReader.Wasm.csproj b/src/Blazor.FileReader.Wasm/Blazor.FileReader.Wasm.csproj
@@ -1,35 +1,35 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.9.0-preview-13032019</Version>
-    <PackageId>Tewr.Blazor.FileReader.Wasm</PackageId>
-    <Authors>Tor Knutsson</Authors>
-    <Description>Small helper library that helps setting up IoC for BlazorFileReader by exposing the extension method AddFileReader on Microsoft.Extensions.DependencyInjection.IServiceCollection.
-
-For use with Blazor WebAssembly projects only. Not necessary nor compatible with Server-side / RazorComponents projects.</Description>
-    <PackageProjectUrl>https://github.com/Tewr/BlazorFileReader</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/Tewr/BlazorFileReader</RepositoryUrl>
-    <PackageTags>blazor blazor-component stream filestream file-stream read-file</PackageTags>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <RootNamespace>Blazor.FileReader</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>C:\Users\Tor\source\repos\BlazorFileReader\src\Blazor.FileReader.Wasm\Blazor.FileReader.Wasm.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\LICENSE">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>3.0.19112</Version>
+    <PackageId>Tewr.Blazor.FileReader.Wasm</PackageId>
+    <Authors>Tor Knutsson</Authors>
+    <Description>Small helper library that helps setting up IoC for BlazorFileReader by exposing the extension method AddFileReader on Microsoft.Extensions.DependencyInjection.IServiceCollection.
+
+For use with Blazor WebAssembly projects only. Not necessary nor compatible with Server-side / RazorComponents projects.</Description>
+    <PackageProjectUrl>https://github.com/Tewr/BlazorFileReader</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Tewr/BlazorFileReader</RepositoryUrl>
+    <PackageTags>blazor blazor-component stream filestream file-stream read-file</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <RootNamespace>Blazor.FileReader</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>C:\Users\Tor\source\repos\BlazorFileReader\src\Blazor.FileReader.Wasm\Blazor.FileReader.Wasm.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Blazor.FileReader\Blazor.FileReader.csproj" />
-  </ItemGroup>
-</Project>
+  </ItemGroup>
+</Project>
diff --git a/src/Blazor.FileReader/Blazor.FileReader.csproj b/src/Blazor.FileReader/Blazor.FileReader.csproj
@@ -8,7 +8,7 @@
     <TypeScriptToolsVersion>2.8</TypeScriptToolsVersion>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>3.0.0-preview4-19216-03</Version>
+    <Version>3.0.19112</Version>
     <Authors>Tor Knutsson</Authors>
     <PackageProjectUrl>https://github.com/Tewr/BlazorFileReader</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/Tewr/BlazorFileReader/blob/master/LICENSE</PackageLicenseUrl>
@@ -19,6 +19,7 @@
     <PackageId>Tewr.Blazor.FileReader</PackageId>
     <PackageReleaseNotes>
 </PackageReleaseNotes>
+    <AssemblyVersion>3.0.19112.0</AssemblyVersion>
 
   </PropertyGroup>