Updates project to target .NET 8 (#555)

Blazored · Feb 20, 2024 · f277b1c · f277b1c
1 parent c9b2118
commit f277b1c
Show file tree

Hide file tree

Showing 120 changed files with 697 additions and 2,212 deletions.
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -7,7 +7,7 @@ on:
     types: [published]
 
 env:
-  NETCORE_VERSION: "6.0.x"
+  NETCORE_VERSION: "8.0.x"
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   PROJECT_NAME: Modal

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -6,7 +6,7 @@ on:
 
 env:
     PROJECT_NAME: Blazored.Modal
-    NETCORE_VERSION: '6.0.x'
+    NETCORE_VERSION: '8.0.x'
 
 jobs:
   build:

diff --git a/Blazored.Modal.sln b/Blazored.Modal.sln
@@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.Modal", "src\Blazo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{AC842EAA-F630-4597-A0FC-6758FE9F6268}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebAssembly", "samples\BlazorWebAssembly\BlazorWebAssembly.csproj", "{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "samples\BlazorServer\BlazorServer.csproj", "{6290EEF7-69B6-43D0-8FA9-999045336637}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E8AD9151-AB7E-4531-A1DF-8952B1D5580D}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
@@ -23,6 +19,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{DF45C5D5
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.Modal.Tests", "tests\Blazored.Modal.Tests\Blazored.Modal.Tests.csproj", "{14B17729-C172-4F0C-90FF-65479AF6408F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveWebAssembly", "samples\InteractiveWebAssembly\InteractiveWebAssembly.csproj", "{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveServer", "samples\InteractiveServer\InteractiveServer.csproj", "{393CCD7E-66D0-4BB5-A087-425F1B643EAF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,30 +45,6 @@ Global
 		{997CB0B4-2B3F-4625-9259-A560CD82AC8C}.Release|x64.Build.0 = Release|Any CPU
 		{997CB0B4-2B3F-4625-9259-A560CD82AC8C}.Release|x86.ActiveCfg = Release|Any CPU
 		{997CB0B4-2B3F-4625-9259-A560CD82AC8C}.Release|x86.Build.0 = Release|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Debug|x64.Build.0 = Debug|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Debug|x86.Build.0 = Debug|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Release|x64.ActiveCfg = Release|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Release|x64.Build.0 = Release|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Release|x86.ActiveCfg = Release|Any CPU
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D}.Release|x86.Build.0 = Release|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Debug|x64.Build.0 = Debug|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Debug|x86.Build.0 = Debug|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Release|x64.ActiveCfg = Release|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Release|x64.Build.0 = Release|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Release|x86.ActiveCfg = Release|Any CPU
-		{6290EEF7-69B6-43D0-8FA9-999045336637}.Release|x86.Build.0 = Release|Any CPU
 		{14B17729-C172-4F0C-90FF-65479AF6408F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14B17729-C172-4F0C-90FF-65479AF6408F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{14B17729-C172-4F0C-90FF-65479AF6408F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -81,14 +57,38 @@ Global
 		{14B17729-C172-4F0C-90FF-65479AF6408F}.Release|x64.Build.0 = Release|Any CPU
 		{14B17729-C172-4F0C-90FF-65479AF6408F}.Release|x86.ActiveCfg = Release|Any CPU
 		{14B17729-C172-4F0C-90FF-65479AF6408F}.Release|x86.Build.0 = Release|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Debug|x86.Build.0 = Debug|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Release|x64.Build.0 = Release|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454}.Release|x86.Build.0 = Release|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Debug|x64.Build.0 = Debug|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Debug|x86.Build.0 = Debug|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Release|x64.ActiveCfg = Release|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Release|x64.Build.0 = Release|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Release|x86.ActiveCfg = Release|Any CPU
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{4ECB8E84-B0FF-4DC0-9929-D0BE5922E97D} = {AC842EAA-F630-4597-A0FC-6758FE9F6268}
-		{6290EEF7-69B6-43D0-8FA9-999045336637} = {AC842EAA-F630-4597-A0FC-6758FE9F6268}
 		{14B17729-C172-4F0C-90FF-65479AF6408F} = {DF45C5D5-16E0-47FC-A764-08ED8AF713E2}
+		{E2C5884F-4FE4-4A5B-B9A3-046E9C546454} = {AC842EAA-F630-4597-A0FC-6758FE9F6268}
+		{393CCD7E-66D0-4BB5-A087-425F1B643EAF} = {AC842EAA-F630-4597-A0FC-6758FE9F6268}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FB2D90F4-21CF-4118-82E7-479E89C15FB3}

diff --git a/samples/BlazorServer/BlazorServer.csproj b/samples/BlazorServer/BlazorServer.csproj
diff --git a/samples/BlazorServer/Pages/Error.cshtml b/samples/BlazorServer/Pages/Error.cshtml
diff --git a/samples/BlazorServer/Pages/Error.cshtml.cs b/samples/BlazorServer/Pages/Error.cshtml.cs
diff --git a/samples/BlazorServer/Pages/_Host.cshtml b/samples/BlazorServer/Pages/_Host.cshtml
diff --git a/samples/BlazorServer/Pages/_Layout.cshtml b/samples/BlazorServer/Pages/_Layout.cshtml
diff --git a/samples/BlazorServer/Shared/MainLayout.razor b/samples/BlazorServer/Shared/MainLayout.razor
diff --git a/samples/BlazorServer/Shared/MainLayout.razor.css b/samples/BlazorServer/Shared/MainLayout.razor.css
diff --git a/samples/BlazorServer/Shared/NavMenu.razor.css b/samples/BlazorServer/Shared/NavMenu.razor.css
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ on: @@
     env:
         PROJECT_NAME: Blazored.Modal
-        NETCORE_VERSION: '6.0.x'
+        NETCORE_VERSION: '8.0.x'
     jobs:
       build:
@@ Expand Down @@