Migration to .net 8 #286

rungwiroon · Dec 15, 2023 · a272f1b · a272f1b
1 parent a468053
commit a272f1b
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 29 deletions.
diff --git a/BlazorGoogleMaps.sln b/BlazorGoogleMaps.sln
@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientSideDemoNet7", "ClientSideDemoNet7\ClientSideDemoNet7.csproj", "{101D4021-9338-498D-834D-0335F6B8175B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientSideDemoNet8", "ClientSideDemoNet7\ClientSideDemoNet8.csproj", "{101D4021-9338-498D-834D-0335F6B8175B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/ClientSideDemoNet7/App.razor b/ClientSideDemoNet7/App.razor
@@ -1,4 +1,4 @@
-@using ClientSideDemoNet7
+@using ClientSideDemoNet8
 <Router AppAssembly="@typeof(Startup).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />

diff --git a/ClientSideDemoNet7/ClientSideDemoNet7.csproj → ClientSideDemoNet7/ClientSideDemoNet8.csproj b/ClientSideDemoNet7/ClientSideDemoNet7.csproj → ClientSideDemoNet7/ClientSideDemoNet8.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>8.0</LangVersion>
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/ClientSideDemoNet7/Pages/MapMarker.razor b/ClientSideDemoNet7/Pages/MapMarker.razor
@@ -1,8 +1,6 @@
 @page "/mapMarker"
 @using GoogleMapsComponents
 @using GoogleMapsComponents.Maps
-@using System.Diagnostics
-@using ClientSideDemoNet7.Shared
 
 <h1>Google Map Markers</h1>
 

diff --git a/ClientSideDemoNet7/Startup.cs b/ClientSideDemoNet7/Startup.cs
@@ -1,7 +1,7 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using System.Threading.Tasks;
 
-namespace ClientSideDemoNet7
+namespace ClientSideDemoNet8
 {
     public class Startup
     {

diff --git a/ClientSideDemoNet7/_Imports.razor b/ClientSideDemoNet7/_Imports.razor
@@ -3,5 +3,5 @@
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
-@using ClientSideDemoNet7
-@using ClientSideDemoNet7.Shared
+@using ClientSideDemoNet8
+@using ClientSideDemoNet8.Shared
diff --git a/GoogleMapsComponents/GoogleMapsComponents.csproj b/GoogleMapsComponents/GoogleMapsComponents.csproj
@@ -8,17 +8,14 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<IsPackable>true</IsPackable>
-		<RestoreAdditionalProjectSources>
-			https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-			https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
-		</RestoreAdditionalProjectSources>
+
 		<LangVersion>latest</LangVersion>
 		<RazorLangVersion>3.0</RazorLangVersion>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<PackageId>BlazorGoogleMaps</PackageId>
-		<Version>3.3.2</Version>
+		<Version>4.0.0</Version>
 		<Authors>Rungwiroon</Authors>
 		<Company>QueueStack Solution</Company>
 		<Product>BlazorGoogleMaps</Product>
@@ -53,11 +50,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.32" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.32" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+		<PackageReference Include="Microsoft.JSInterop" Version="8.0.0" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageReference Include="OneOf" Version="3.0.263" />
-		<PackageReference Include="System.Text.Json" Version="7.0.3" />
+		<PackageReference Include="System.Text.Json" Version="8.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/ServerSideDemo/Pages/GMap.razor.cs b/ServerSideDemo/Pages/GMap.razor.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using GoogleMapsComponents.Maps;
+using GoogleMapsComponents.Maps;
 using Microsoft.AspNetCore.Components;
+using System;
+using System.Threading.Tasks;
 
 namespace ServerSideDemo.Pages;
 
@@ -85,16 +85,16 @@ protected async Task RemoveMarker(Marker TheMarker)
     public async Task MapInitialized()
     {
 #if DEBUG
-            Console.WriteLine("GMap Initialized:");
-            Console.WriteLine($"\t Height: {Height}");
-            Console.WriteLine($"\t Zoom: {Options.Zoom}");
-            Console.WriteLine($"\t Center: ({Options.Center.Lat}, {Options.Center.Lng})");
+        Console.WriteLine("GMap Initialized:");
+        Console.WriteLine($"\t Height: {Height}");
+        Console.WriteLine($"\t Zoom: {Options.Zoom}");
+        Console.WriteLine($"\t Center: ({Options.Center.Lat}, {Options.Center.Lng})");
 #endif
         if (MeMarker != null)
         {
 #if DEBUG
-                var pos = await MeMarker.GetPosition();
-                Console.WriteLine($"\t Me: ({pos.Lat}, {pos.Lng})");
+            var pos = await MeMarker.GetPosition();
+            Console.WriteLine($"\t Me: ({pos.Lat}, {pos.Lng})");
 #endif
             await AddMeMarker();
         }

diff --git a/ServerSideDemo/ServerSideDemo.csproj b/ServerSideDemo/ServerSideDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>