Update to .Net7

wolfgangschneider · Dec 30, 2022 · 5c1e612 · 5c1e612
1 parent 8b38001
commit 5c1e612
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 22 deletions.
diff --git a/BlazorEverywhere/src/HostingModels/BlazorHybrid/MauiProgram.cs b/BlazorEverywhere/src/HostingModels/BlazorHybrid/MauiProgram.cs
@@ -1,4 +1,5 @@
-using Tpl.Core.Services;
+using Microsoft.Extensions.Logging;
+using Tpl.Core.Services;
 using Tpl.Maui.InterfacesIpl;
 using Tpl.Core.Interfaces;
 
@@ -17,18 +18,16 @@ public static MauiApp CreateMauiApp()
 			});
 
 		builder.Services.AddMauiBlazorWebView();
-		#if DEBUG
+#if DEBUG
 		builder.Services.AddBlazorWebViewDeveloperTools();
+        builder.Logging.AddDebug();
 #endif
         builder.Services.AddHttpClient("Test", configureClient => configureClient.BaseAddress = new Uri(@"https://localhost:7257"/*builder.HostEnvironment.BaseAddress*/));
 
         builder.Services.AddSingleton<WeatherForecastService>();
         builder.Services.AddSingleton<WeatherForecastServiceApi>();
 
-        //unfortunately it seams there is an Error in Maui net6 lo load JS Isolation 
-        //https://github.com/dotnet/maui/discussions/6468
-        //builder.Services.AddSingleton<IHardWhare, Core.InterfacesIpl.HardWhare>();
-        //but luckily we can provide a an IHardWhare Maui Implementation
+        //builder.Services.AddScoped<IHardWhare, Core.InterfacesIpl.HardWhare>();
         builder.Services.AddSingleton<IHardWhare, MauiHardWhare>();
 
         return builder.Build();

diff --git a/BlazorEverywhere/src/HostingModels/BlazorHybrid/Tpl.Maui.csproj b/BlazorEverywhere/src/HostingModels/BlazorHybrid/Tpl.Maui.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-maccatalyst;net6.0-ios;net6.0-android</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+        <TargetFrameworks>net7.0-maccatalyst;net7.0-ios;net7.0-android</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
         <!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
@@ -71,4 +71,8 @@
       </MauiXaml>
     </ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+	</ItemGroup>
+
 </Project>
diff --git a/BlazorEverywhere/src/HostingModels/BlazorServer/Tpl.BlazorServer.csproj b/BlazorEverywhere/src/HostingModels/BlazorServer/Tpl.BlazorServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/BlazorEverywhere/src/HostingModels/BlazorWasm/Client/Tpl.BlazorWasm.Client.csproj b/BlazorEverywhere/src/HostingModels/BlazorWasm/Client/Tpl.BlazorWasm.Client.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.8" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BlazorEverywhere/src/HostingModels/BlazorWasm/Server/Tpl.BlazotWasm.Server.csproj b/BlazorEverywhere/src/HostingModels/BlazorWasm/Server/Tpl.BlazotWasm.Server.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BlazorEverywhere/src/Tpl.Core/Tpl.Core.csproj b/BlazorEverywhere/src/Tpl.Core/Tpl.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.8" />
-	  <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.1" />
+	  <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BlazorEverywhere/src/Tpl.WebApi/Tpl.WebApi.csproj b/BlazorEverywhere/src/Tpl.WebApi/Tpl.WebApi.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+	<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
 
   <Import Project="..\Tpl.WebApi.Shared.Data\Tpl.WebApi.Shared.Data.projitems" Label="Shared" />

diff --git a/CreateNugetPackage.csproj b/CreateNugetPackage.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net7</TargetFramework>
     <Language>C#</Language>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -25,7 +25,7 @@
     <Summary>A ready-to-use template for one BlazorApp hosted in Blazor-Server Blazor-WASM and Blazor-Hybrid</Summary>
     <PackageType>Template</PackageType>
     <ReleaseNotes>Initial Release</ReleaseNotes>
-    <Version>1.0.4-preview.6</Version>
+    <Version>7.0.0</Version>
     <PackageId>blazor-everywhere</PackageId>
     <Title>Blazor Everywhere Template</Title>
     <Company>EasyByte.at</Company>