feat: Updated to net8.0.

HavenDV · Dec 18, 2023 · 65035de · 65035de
1 parent 4d3561f
commit 65035de
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 211 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -9,7 +9,7 @@ jobs:
     name: Build, test and publish
     uses: HavenDV/workflows/.github/workflows/dotnet_build-test-publish.yml@main
     with:
-      os: windows-2022
+      os: windows-latest
       project-path: 
         /target:libs\Mvvm_CommonInteractions_Core
         /target:libs\Mvvm_CommonInteractions_Uno
@@ -20,18 +20,17 @@ jobs:
         /target:libs\Mvvm_CommonInteractions_Maui
         /target:libs\Mvvm_CommonInteractions_Avalonia
       use-msbuild: true
-      workloads: maui android ios maccatalyst macos
+      workloads: maui
       install-tizen: true
       windows-sdk-version: 18362
     secrets:
       nuget-key: ${{ secrets.NUGET_KEY }}
 
-  WebAssembly:
-    uses: HavenDV/workflows/.github/workflows/dotnet_build-test-publish.yml@main
-    with:
-      os: windows-2022
-      project-path: src/apps/Uno/Mvvm.Apps.Uno.WebAssembly
-      additional-dotnet-version: 6.0.x
-      deploy-web-assembly-path: src/apps/Uno/Mvvm.Apps.Uno.WebAssembly/bin/Release/net6.0/dist
-      generate-build-number: false
-      workloads: android ios maccatalyst macos
+#  WebAssembly:
+#    uses: HavenDV/workflows/.github/workflows/dotnet_build-test-publish.yml@main
+#    with:
+#      os: windows-latest
+#      project-path: src/apps/Mvvm.Apps.Uno
+#      deploy-web-assembly-path: src/apps/Mvvm.Apps.Uno/bin/Release/net8.0-webassembly/dist
+#      generate-build-number: false
+#      workloads: maui
diff --git a/Mvvm.CommonInteractions.sln b/Mvvm.CommonInteractions.sln
@@ -41,24 +41,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvvm.Apps.Core", "src\apps\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvvm.Apps.Avalonia", "src\apps\Mvvm.Apps.Avalonia\Mvvm.Apps.Avalonia.csproj", "{2F17A5A4-B5CD-470D-9711-F9B1E24EA1AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvvm.Apps.Uwp", "src\apps\Mvvm.Apps.Uwp\Mvvm.Apps.Uwp.csproj", "{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvvm.Apps.WinUI", "src\apps\Mvvm.Apps.WinUI\Mvvm.Apps.WinUI.csproj", "{70B22142-13ED-444F-B6A7-4583505EC8DB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvvm.Apps.Wpf", "src\apps\Mvvm.Apps.Wpf\Mvvm.Apps.Wpf.csproj", "{E84AFC6C-DF9C-44C6-8878-52560A351EC3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{962AF663-1913-4273-A8FE-33483FE32178}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvvm.Apps.Uno.WebAssembly", "src\apps\Uno\Mvvm.Apps.Uno.WebAssembly\Mvvm.Apps.Uno.WebAssembly.csproj", "{1674F114-4BB0-4A0C-814F-336EF6638A22}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvvm.Apps.Uno.Skia.Wpf", "src\apps\Uno\Mvvm.Apps.Uno.Skia.Wpf\Mvvm.Apps.Uno.Skia.Wpf.csproj", "{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Mvvm.Apps.Shared", "src\apps\Mvvm.Apps.Shared\Mvvm.Apps.Shared.shproj", "{B2C9A032-9670-421E-A413-7C7F504F5B55}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Mvvm.Apps.Uno.Shared", "src\apps\Mvvm.Apps.Uno.Shared\Mvvm.Apps.Uno.Shared.shproj", "{418D1399-62C8-481B-A954-517B189ECA70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvvm.Apps.Uno.Core", "src\apps\Uno\Mvvm.Apps.Uno.Core\Mvvm.Apps.Uno.Core.csproj", "{90A2F0B0-6630-4403-ACBD-1FA89208FB71}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvvm.CommonInteractions.Maui", "src\libs\Mvvm.CommonInteractions.Maui\Mvvm.CommonInteractions.Maui.csproj", "{41636DB3-9F07-47F0-9C4E-44C5DECE1119}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvvm.Apps.Maui", "src\apps\Mvvm.Apps.Maui\Mvvm.Apps.Maui.csproj", "{2B9BACA3-7166-4276-BC84-BF38536F6165}"
@@ -241,57 +229,6 @@ Global
 		{2F17A5A4-B5CD-470D-9711-F9B1E24EA1AC}.Release|x64.Build.0 = Release|Any CPU
 		{2F17A5A4-B5CD-470D-9711-F9B1E24EA1AC}.Release|x86.ActiveCfg = Release|Any CPU
 		{2F17A5A4-B5CD-470D-9711-F9B1E24EA1AC}.Release|x86.Build.0 = Release|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|Any CPU.Build.0 = Debug|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|ARM.ActiveCfg = Debug|ARM
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|ARM.Build.0 = Debug|ARM
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|ARM.Deploy.0 = Debug|ARM
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|arm64.Deploy.0 = Debug|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|x64.ActiveCfg = Debug|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|x64.Build.0 = Debug|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|x64.Deploy.0 = Debug|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|x86.ActiveCfg = Debug|x86
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|x86.Build.0 = Debug|x86
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Debug|x86.Deploy.0 = Debug|x86
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|ARM.ActiveCfg = Release|ARM
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|ARM.Build.0 = Release|ARM
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|ARM.Deploy.0 = Release|ARM
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|arm64.Build.0 = Release|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|arm64.Deploy.0 = Release|Any CPU
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|x64.ActiveCfg = Release|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|x64.Build.0 = Release|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|x64.Deploy.0 = Release|x64
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|x86.ActiveCfg = Release|x86
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|x86.Build.0 = Release|x86
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4}.Release|x86.Deploy.0 = Release|x86
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|Any CPU.Build.0 = Debug|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|ARM.ActiveCfg = Debug|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|ARM.Build.0 = Debug|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|arm64.ActiveCfg = Debug|arm64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|arm64.Build.0 = Debug|arm64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|x64.ActiveCfg = Debug|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|x64.Build.0 = Debug|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|x86.ActiveCfg = Debug|x86
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Debug|x86.Build.0 = Debug|x86
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|Any CPU.ActiveCfg = Release|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|Any CPU.Build.0 = Release|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|ARM.ActiveCfg = Release|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|ARM.Build.0 = Release|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|arm64.ActiveCfg = Release|arm64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|arm64.Build.0 = Release|arm64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|x64.ActiveCfg = Release|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|x64.Build.0 = Release|x64
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|x86.ActiveCfg = Release|x86
-		{70B22142-13ED-444F-B6A7-4583505EC8DB}.Release|x86.Build.0 = Release|x86
 		{E84AFC6C-DF9C-44C6-8878-52560A351EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E84AFC6C-DF9C-44C6-8878-52560A351EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E84AFC6C-DF9C-44C6-8878-52560A351EC3}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -312,66 +249,6 @@ Global
 		{E84AFC6C-DF9C-44C6-8878-52560A351EC3}.Release|x64.Build.0 = Release|Any CPU
 		{E84AFC6C-DF9C-44C6-8878-52560A351EC3}.Release|x86.ActiveCfg = Release|Any CPU
 		{E84AFC6C-DF9C-44C6-8878-52560A351EC3}.Release|x86.Build.0 = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|ARM.Build.0 = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|x64.Build.0 = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Debug|x86.Build.0 = Debug|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|ARM.ActiveCfg = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|ARM.Build.0 = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|arm64.Build.0 = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|x64.ActiveCfg = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|x64.Build.0 = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|x86.ActiveCfg = Release|Any CPU
-		{1674F114-4BB0-4A0C-814F-336EF6638A22}.Release|x86.Build.0 = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|ARM.Build.0 = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|x64.Build.0 = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Debug|x86.Build.0 = Debug|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|ARM.ActiveCfg = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|ARM.Build.0 = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|arm64.Build.0 = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|x64.ActiveCfg = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|x64.Build.0 = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|x86.ActiveCfg = Release|Any CPU
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1}.Release|x86.Build.0 = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|ARM.Build.0 = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|arm64.Build.0 = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|x64.Build.0 = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Debug|x86.Build.0 = Debug|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|ARM.ActiveCfg = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|ARM.Build.0 = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|arm64.ActiveCfg = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|arm64.Build.0 = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|x64.ActiveCfg = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|x64.Build.0 = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|x86.ActiveCfg = Release|Any CPU
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71}.Release|x86.Build.0 = Release|Any CPU
 		{41636DB3-9F07-47F0-9C4E-44C5DECE1119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41636DB3-9F07-47F0-9C4E-44C5DECE1119}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41636DB3-9F07-47F0-9C4E-44C5DECE1119}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -427,15 +304,9 @@ Global
 		{F497B163-E46E-4EA6-9E41-BB0C25CA6272} = {A81088C2-A6AF-4CB6-8F36-DF8C0E6D45B3}
 		{A5ED6C75-E468-4819-A513-EEBE49B7DAF4} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
 		{2F17A5A4-B5CD-470D-9711-F9B1E24EA1AC} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
-		{2B65E186-B9E6-4CEF-9AE6-478C6DE59BC4} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
-		{70B22142-13ED-444F-B6A7-4583505EC8DB} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
 		{E84AFC6C-DF9C-44C6-8878-52560A351EC3} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
-		{962AF663-1913-4273-A8FE-33483FE32178} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
-		{1674F114-4BB0-4A0C-814F-336EF6638A22} = {962AF663-1913-4273-A8FE-33483FE32178}
-		{50CCAE34-90B0-44D9-975B-F892EDCFF9F1} = {962AF663-1913-4273-A8FE-33483FE32178}
 		{B2C9A032-9670-421E-A413-7C7F504F5B55} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
 		{418D1399-62C8-481B-A954-517B189ECA70} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
-		{90A2F0B0-6630-4403-ACBD-1FA89208FB71} = {962AF663-1913-4273-A8FE-33483FE32178}
 		{41636DB3-9F07-47F0-9C4E-44C5DECE1119} = {A81088C2-A6AF-4CB6-8F36-DF8C0E6D45B3}
 		{2B9BACA3-7166-4276-BC84-BF38536F6165} = {464A41EC-E4D1-4BC3-93BD-A48E3449A4BD}
 	EndGlobalSection

diff --git a/src/apps/Mvvm.Apps.Core/Mvvm.Apps.Core.csproj b/src/apps/Mvvm.Apps.Core/Mvvm.Apps.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Label="GlobalUsings">

diff --git a/src/apps/Mvvm.Apps.Maui/Mvvm.Apps.Maui.csproj b/src/apps/Mvvm.Apps.Maui/Mvvm.Apps.Maui.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.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);net7.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>Mvvm.Apps.Maui</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -49,6 +49,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>
 

diff --git a/src/apps/Mvvm.Apps.WinUI/Mvvm.Apps.WinUI.csproj b/src/apps/Mvvm.Apps.WinUI/Mvvm.Apps.WinUI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.18362.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.18362.0</TargetFramework>
     <Platforms>x86;x64;arm64</Platforms>
     <UseWinUI>true</UseWinUI>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>

diff --git a/src/apps/Mvvm.Apps.Wpf/Mvvm.Apps.Wpf.csproj b/src/apps/Mvvm.Apps.Wpf/Mvvm.Apps.Wpf.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net7.0-windows;net4.8</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows;net4.8</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <DefineConstants>$(DefineConstants);HAS_WPF</DefineConstants>

diff --git a/src/libs/Mvvm.CommonInteractions.Avalonia/Mvvm.CommonInteractions.Avalonia.csproj b/src/libs/Mvvm.CommonInteractions.Avalonia/Mvvm.CommonInteractions.Avalonia.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net4.6.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);HAS_AVALONIA</DefineConstants>
     <NoWarn>$(NoWarn);CA5394;CA1822</NoWarn>
   </PropertyGroup>

diff --git a/src/libs/Mvvm.CommonInteractions.Core/Mvvm.CommonInteractions.Core.csproj b/src/libs/Mvvm.CommonInteractions.Core/Mvvm.CommonInteractions.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net4.6.2;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <RootNamespace>Mvvm.CommonInteractions</RootNamespace>
     <NoWarn>$(NoWarn);CA1819;CA1014;CS8002</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -11,10 +11,6 @@
     <Using Remove="System.Net.Http" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net4.6.2' ">
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="IsExternalInit" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/libs/Mvvm.CommonInteractions.Maui/Mvvm.CommonInteractions.Maui.csproj b/src/libs/Mvvm.CommonInteractions.Maui/Mvvm.CommonInteractions.Maui.csproj
@@ -1,26 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-windows10.0.19041.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TF_BUILD)' == 'true'">$(TargetFrameworks);net7.0-tizen</TargetFrameworks>
+    <TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TF_BUILD)' == 'true'">$(TargetFrameworks);net8.0-tizen</TargetFrameworks>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <SignAssembly>false</SignAssembly>
     <DefineConstants>$(DefineConstants);HAS_MAUI</DefineConstants>
-    <NoWarn>$(NoWarn);CA5394;CA1822</NoWarn>
-
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-    <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
-
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <NoWarn>$(NoWarn);CA5394;CA1822;CA1418</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
     <PackageReference Include="DependencyPropertyGenerator" Version="1.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>