#310 - Upgrade blazor to net5.0-rc1.

maraf · Sep 17, 2020 · 00f4ac3 · 00f4ac3
1 parent 5a7500d
commit 00f4ac3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/src/Money.Blazor.Host/Money.Blazor.Host.csproj b/src/Money.Blazor.Host/Money.Blazor.Host.csproj
@@ -1,27 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <RootNamespace>Money</RootNamespace>
     <VersionPrefix>1.13.0.0</VersionPrefix>
-
     <PublishDomain>app.money.neptuo.com</PublishDomain>
-
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <RestoreAdditionalProjectSources>
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
-    </RestoreAdditionalProjectSources>
+    <TargetFramework>net5.0</TargetFramework>
+    <UseBlazorWebAssembly>true</UseBlazorWebAssembly>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="3.0.0" />
     <PackageReference Include="Blazored.SessionStorage" Version="1.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.0-rc.1.20451.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0-rc.1.20451.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0-rc.1.20451.17" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.0-rc.1.20451.17" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,16 +26,6 @@
     <ProjectReference Include="..\Neptuo\Neptuo.csproj" />
   </ItemGroup>
 
-  <!-- PWA -->
-  <PropertyGroup>
-    <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
-  </PropertyGroup>
-  <ItemGroup Condition="'$(DesignTimeBuild)' != 'true'">
-    <!-- When publishing, swap service-worker.published.js in place of service-worker.js -->
-    <Content Remove="wwwroot\service-worker.js" />
-    <Content Update="wwwroot\service-worker.published.js" Link="wwwroot\service-worker.js" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Update="wwwroot\index.html" CopyToOutputDirectory="PreserveNewest" />
     <Content Remove="**\*.svg" />
@@ -51,6 +34,15 @@
     <Watch Include="**\*.razor" />
   </ItemGroup>
 
+  <!-- PWA -->
+  <PropertyGroup>
+    <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
+  </PropertyGroup>
+  <ItemGroup>
+	<ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+  </ItemGroup>
+
+  <!-- GitHubPages publish -->
   <Target Name="PublishGitHubFiles" AfterTargets="ComputeFilesToPublish">
     <!-- Declare -->
     <PropertyGroup>

diff --git a/src/Money.Blazor.Host/global.json b/src/Money.Blazor.Host/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "5.0.100-rc.1.20452.10"
+  }
+}