Merge pull request #4 from nukedbit/net-6-preview

Update to .net 6 rtm and latest ServiceStack release
nukedbit · Nov 22, 2021 · d62d3ed · d62d3ed
2 parents a9ddf6e + 5a44028
commit d62d3ed
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/MyApp.Client/MyApp.Client.csproj b/MyApp.Client/MyApp.Client.csproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-  <PackageReference Include="ServiceStack.HttpClient" Version="5.12.1" />
-  <PackageReference Include="Blazored.LocalStorage" Version="4.1.2" />
+  <PackageReference Include="ServiceStack.HttpClient" Version="5.13.3" />
+  <PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
   <PackageReference Include="Blazor.Extensions.Logging" Version="2.0.4" /> 
-  <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.9" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+  <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
     <ProjectReference Include="..\MyApp.ServiceModel\MyApp.ServiceModel.csproj" />
   </ItemGroup>
 

diff --git a/MyApp.Client/Program.cs b/MyApp.Client/Program.cs
@@ -32,7 +32,7 @@ public static async Task Main(string[] args)
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddScoped<AuthenticationStateProvider>(s => s.GetRequiredService<ServiceStackStateProvider>());
 
-            builder.Services.AddScoped(_ => BlazorClient.Create("https://localhost:5001"));
+            builder.Services.AddScoped(_ => BlazorClient.Create(builder.HostEnvironment.BaseAddress));
             builder.Services.AddScoped<ServiceStackStateProvider>();
 
 

diff --git a/MyApp.ServiceInterface/MyApp.ServiceInterface.csproj b/MyApp.ServiceInterface/MyApp.ServiceInterface.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ServiceStack" Version="5.12.1" />
+    <PackageReference Include="ServiceStack" Version="5.13.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MyApp.ServiceModel/MyApp.ServiceModel.csproj b/MyApp.ServiceModel/MyApp.ServiceModel.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ServiceStack.Interfaces" Version="5.12.1" />
+    <PackageReference Include="ServiceStack.Interfaces" Version="5.13.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MyApp.Tests/MyApp.Tests.csproj b/MyApp.Tests/MyApp.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-     <TargetFramework>net5.0</TargetFramework>
+     <TargetFramework>net6.0</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
   </PropertyGroup>
@@ -11,10 +11,10 @@
     <ProjectReference Include="..\MyApp.ServiceModel\MyApp.ServiceModel.csproj" />
 
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="ServiceStack" Version="5.12.1" />
-    <PackageReference Include="ServiceStack.Kestrel" Version="5.12.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="ServiceStack" Version="5.13.3" />
+    <PackageReference Include="ServiceStack.Kestrel" Version="5.13.3" />
   </ItemGroup>
 
 </Project>
diff --git a/MyApp.sln b/MyApp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31606.5
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31320.298
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyApp", "MyApp\MyApp.csproj", "{5F817400-1A3A-48DF-98A6-E7E5A3DC762F}"
 EndProject

diff --git a/MyApp/MyApp.csproj b/MyApp/MyApp.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>MyApp</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MyApp</PackageId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.9" />
-    <PackageReference Include="ServiceStack" Version="5.12.1" />
-    <PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.12.1" />
-    <PackageReference Include="ServiceStack.Server" Version="5.12.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0" />
+    <PackageReference Include="ServiceStack" Version="5.13.3" />
+    <PackageReference Include="ServiceStack.OrmLite.Sqlite.Cil" Version="5.13.3" />
+    <PackageReference Include="ServiceStack.Server" Version="5.13.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MyApp/Properties/launchSettings.json b/MyApp/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "dotnetRunMessages": "true",
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "applicationUrl": "https://localhost:5003;http://localhost:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
 [![](blazor-wasm-servicestack.png)](https://github.com/nukedbit/blazor-wasm-servicestack)
 
-# Blazor WASM & ServiceStack for .NET 5.0 RTM
+# Blazor WASM & ServiceStack for .NET 6.0 RTM
+
+This template integrate ServiceStack with Blazor on .NET 6 RTM and [ServiceStack 5.13](https://docs.servicestack.net/releases/v5.13).
 
-This template integrate ServiceStack with Blazor on .NET 5 RTM and [ServiceStack 5.12](https://docs.servicestack.net/releases/v5.12).
 
 The blazor wasm app is served through the main ServiceStack web host so you can deploy a single package with both api and client ux.
 
@@ -60,7 +61,7 @@ Check the following links for more info
     $ x new nukedbit/blazor-wasm-servicestack Acme
     $ cd Acme\Acme
     $ dotnet public -c Release
-    $ cd bin\Release\net5.0\publish
+    $ cd bin\Release\net6.0\publish
     $ app Acme.dll
 
 When it will launch this is the end result.
@@ -78,6 +79,5 @@ You can also create a Windows Desktop Shortcut.
 
 * https://docs.servicestack.net 
 * https://servicestack.net 
-* [Announcing ASP.NET Core in .NET 5](https://devblogs.microsoft.com/aspnet/announcing-asp-net-core-in-net-5/)