Upgrade ServiceStack and Blazor to preview 7

nukedbit · nukedbit · commit b44af611e7e4 · 2021-08-19T12:09:02.000+02:00
diff --git a/MyApp.Client/Components/StackBaseComponent.cs b/MyApp.Client/Components/StackBaseComponent.cs
@@ -16,7 +16,7 @@ public abstract class StackBaseComponent : ComponentBase
         [Inject]
         private JsonHttpClient Client {get;set;}
 
-        protected async Task<JsonHttpClient> GetClient() {
+        protected async Task<JsonHttpClient> GetClientAsync() {
             var state = await AuthenticationStateTask;
             if(state.User is ClaimsPrincipal principal && principal.Identity.IsAuthenticated){
                 Client.BearerToken = principal.Claims.Where(c => c.Type == "token").FirstOrDefault()?.Value;
diff --git a/MyApp.Client/MyApp.Client.csproj b/MyApp.Client/MyApp.Client.csproj
@@ -3,13 +3,13 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-  <PackageReference Include="ServiceStack.HttpClient" Version="5.11.1" />
+  <PackageReference Include="ServiceStack.HttpClient" Version="5.12.1" />
   <PackageReference Include="Blazored.LocalStorage" Version="4.1.2" />
   <PackageReference Include="Blazor.Extensions.Logging" Version="2.0.4" /> 
-  <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.0-preview.5.21301.17" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0-preview.5.21301.17" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0-preview.5.21301.17" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0-preview.5.21301.5" />
+  <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.0-preview.7.21378.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0-preview.7.21378.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0-preview.7.21378.6" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0-preview.7.21377.19" />
     <ProjectReference Include="..\MyApp.ServiceModel\MyApp.ServiceModel.csproj" />
   </ItemGroup>
 
diff --git a/MyApp.Client/Pages/CallHello.razor b/MyApp.Client/Pages/CallHello.razor
@@ -17,7 +17,7 @@
     private async Task CallHelloService()
     {
 
-        var client = await GetClient();
+        var client = await GetClientAsync();
         var response = await client.GetAsync(new ServiceModel.Hello() {
             Name = "World"
         });
diff --git a/MyApp.Client/Pages/Counter.razor b/MyApp.Client/Pages/Counter.razor
@@ -16,6 +16,6 @@
     {
         currentCount++;
 
-        var client = await GetClient();
+        var client = await GetClientAsync();
     }
 }
diff --git a/MyApp.ServiceInterface/MyApp.ServiceInterface.csproj b/MyApp.ServiceInterface/MyApp.ServiceInterface.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ServiceStack" Version="5.11.1" />
+    <PackageReference Include="ServiceStack" Version="5.12.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MyApp.ServiceModel/MyApp.ServiceModel.csproj b/MyApp.ServiceModel/MyApp.ServiceModel.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ServiceStack.Interfaces" Version="5.11.1" />
+    <PackageReference Include="ServiceStack.Interfaces" Version="5.12.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MyApp.Tests/MyApp.Tests.csproj b/MyApp.Tests/MyApp.Tests.csproj
@@ -12,9 +12,9 @@
 
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="ServiceStack" Version="5.11.1" />
-    <PackageReference Include="ServiceStack.Kestrel" Version="5.11.1" />
+    <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" />
   </ItemGroup>
 
 </Project>
diff --git a/MyApp/MyApp.csproj b/MyApp/MyApp.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0-preview.5.21301.17" />
-    <PackageReference Include="ServiceStack" Version="5.11.1" />
-    <PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.11.1" />
-    <PackageReference Include="ServiceStack.Server" Version="5.11.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0-preview.7.21378.6" />
+    <PackageReference Include="ServiceStack" Version="5.12.1" />
+    <PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.12.1" />
+    <PackageReference Include="ServiceStack.Server" Version="5.12.1" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`private async Task CallHelloService()`
`18`	`18`	`{`
`19`	`19`
`20`		`- var client = await GetClient();`
	`20`	`+ var client = await GetClientAsync();`
`21`	`21`	`var response = await client.GetAsync(new ServiceModel.Hello() {`
`22`	`22`	`Name = "World"`
`23`	`23`	`});`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`{`
`17`	`17`	`currentCount++;`
`18`	`18`
`19`		`- var client = await GetClient();`
	`19`	`+ var client = await GetClientAsync();`
`20`	`20`	`}`
`21`	`21`	`}`