diff --git a/MyApp.Client/MyApp.Client.csproj b/MyApp.Client/MyApp.Client.csproj index 229a72e..0a9298b 100644 --- a/MyApp.Client/MyApp.Client.csproj +++ b/MyApp.Client/MyApp.Client.csproj @@ -1,15 +1,15 @@ - + - net5.0 + net6.0 - - + + - - - - + + + + diff --git a/MyApp.Client/Program.cs b/MyApp.Client/Program.cs index 8f18958..0f20778 100644 --- 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(s => s.GetRequiredService()); - builder.Services.AddScoped(_ => BlazorClient.Create("https://localhost:5001")); + builder.Services.AddScoped(_ => BlazorClient.Create(builder.HostEnvironment.BaseAddress)); builder.Services.AddScoped(); diff --git a/MyApp.ServiceInterface/MyApp.ServiceInterface.csproj b/MyApp.ServiceInterface/MyApp.ServiceInterface.csproj index b391e7e..5066368 100644 --- a/MyApp.ServiceInterface/MyApp.ServiceInterface.csproj +++ b/MyApp.ServiceInterface/MyApp.ServiceInterface.csproj @@ -1,11 +1,11 @@ - net5.0 + net6.0 - + diff --git a/MyApp.ServiceModel/MyApp.ServiceModel.csproj b/MyApp.ServiceModel/MyApp.ServiceModel.csproj index d32c012..7babe58 100644 --- a/MyApp.ServiceModel/MyApp.ServiceModel.csproj +++ b/MyApp.ServiceModel/MyApp.ServiceModel.csproj @@ -1,11 +1,11 @@ - net5.0 + net6.0 - + diff --git a/MyApp.Tests/MyApp.Tests.csproj b/MyApp.Tests/MyApp.Tests.csproj index a06c36c..feb6a0b 100644 --- a/MyApp.Tests/MyApp.Tests.csproj +++ b/MyApp.Tests/MyApp.Tests.csproj @@ -1,7 +1,7 @@ - + - net5.0 + net6.0 portable Library @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/MyApp.sln b/MyApp.sln index df024f5..4b69fc1 100644 --- 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 index f9a6b56..eed5f93 100644 --- a/MyApp/MyApp.csproj +++ b/MyApp/MyApp.csproj @@ -1,17 +1,17 @@  - net5.0 + net6.0 MyApp Exe MyApp - - - - + + + + diff --git a/MyApp/Properties/launchSettings.json b/MyApp/Properties/launchSettings.json index 4c85652..5e13bc5 100644 --- 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 index c5e784b..389a14e 100644 --- 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/)