Merge pull request #197 from unoplatform/dev/jela/net8

feat: Update to .NET 8.0.100

Author: jeromelaban

.github/workflows/ci.yml

@@ -25,20 +25,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-      
-    - name: Setup .NET Core v5
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
-    
     - name: Setup .NET Core v6
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.100'
+        dotnet-version: '8.0.100'
 
     - name: Setup GitVersion
       uses: gittools/actions/gitversion/[email protected]
@@ -148,7 +138,7 @@ jobs:
          - manifest: 'manifests/uno.ui.manifest.json'
            manifest_name: Stable
            os: macos-11
-           dotnet_version: 7.0.102
+           dotnet_version: 7.0.403
 
          - manifest: 'manifests/uno.ui-preview.manifest.json'
            manifest_name: Preview
@@ -157,12 +147,12 @@ jobs:
            os: macos-11
            dotnet_version: 7.0.403
 
-         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
-           manifest_name: Preview net8
-           previous_tool_version: ''
-           previous_tool_params: ''
-           os: macos-11
-           dotnet_version: 8.0.100-preview.1.23115.2
+        #  - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+        #    manifest_name: Preview net8
+        #    previous_tool_version: ''
+        #    previous_tool_params: ''
+        #    os: macos-11
+        #    dotnet_version: 8.0.100
 
          - manifest: 'manifests/uno.ui.manifest.json'
            manifest_name: Stable Upgrade
@@ -178,12 +168,12 @@ jobs:
            os: macos-11
            dotnet_version: 7.0.403
 
-         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
-           manifest_name: Preview Upgrade net8
-           previous_tool_version: 1.4.2
-           previous_tool_params: '--pre'
-           os: macos-11
-           dotnet_version: 8.0.100-preview.1.23115.2
+        #  - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+        #    manifest_name: Preview Upgrade net8
+        #    previous_tool_version: 1.4.2
+        #    previous_tool_params: '--pre'
+        #    os: macos-11
+        #    dotnet_version: 8.0.100
 
          - manifest: 'manifests/uno.ui.manifest.json'
            manifest_name: Stable
@@ -197,12 +187,12 @@ jobs:
            os: macos-12
            dotnet_version: 7.0.403
 
-         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
-           manifest_name: Preview net8
-           previous_tool_version: ''
-           previous_tool_params: ''
-           os: macos-12
-           dotnet_version: 8.0.100-preview.1.23115.2
+        #  - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+        #    manifest_name: Preview net8
+        #    previous_tool_version: ''
+        #    previous_tool_params: ''
+        #    os: macos-12
+        #    dotnet_version: 8.0.100
 
          - manifest: 'manifests/uno.ui.manifest.json'
            manifest_name: Stable Upgrade
@@ -218,12 +208,12 @@ jobs:
            os: macos-12
            dotnet_version: 7.0.403
 
-         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
-           manifest_name: Preview Upgrade net8
-           previous_tool_version: 1.4.2
-           previous_tool_params: '--pre'
-           os: macos-12
-           dotnet_version: 8.0.100-preview.1.23115.2
+        #  - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+        #    manifest_name: Preview Upgrade net8
+        #    previous_tool_version: 1.4.2
+        #    previous_tool_params: '--pre'
+        #    os: macos-12
+        #    dotnet_version: 8.0.100
 
     runs-on: ${{ matrix.os }}
 
@@ -249,6 +239,11 @@ jobs:
         with:
           dotnet-version: '${{ matrix.dotnet_version }}'
 
+      # - name: MANUAL WORKLOAD INSTALL
+      #   shell: pwsh
+      #   run: |
+      #     dotnet workload install android ios maccatalyst maui tvos macos --source https://api.nuget.org/v3/index.json
+
       - name: Setup GitVersion
         uses: gittools/actions/gitversion/[email protected]
         with:

UnoCheck/Checkups/DotNetSentinelCheckup.cs

@@ -32,8 +32,6 @@ public DotNetWorkloadManager(string sdkRoot, string sdkVersion, params string[]
 			SdkVersion = sdkVersion;
 			NuGetPackageSources = nugetPackageSources;
 
-			CleanEmptyWorkloadDirectories(sdkRoot, sdkVersion);
-
 			DotNetCliWorkingDir = Path.Combine(Path.GetTempPath(), "maui-check-" + Guid.NewGuid().ToString("N").Substring(0, 8));
 			Directory.CreateDirectory(DotNetCliWorkingDir);
 
@@ -232,30 +230,6 @@ async Task CliRepair()
 				throw new Exception("Workload Repair failed: `dotnet " + string.Join(' ', args) + "`");
 		}
 
-		void CleanEmptyWorkloadDirectories(string sdkRoot, string sdkVersion)
-		{
-			if (NuGetVersion.TryParse(sdkVersion, out var v))
-			{
-				var sdkBand = $"{v.Major}.{v.Minor}.{v.Patch}";
-
-				var manifestsDir = Path.Combine(sdkRoot, "sdk-manifests", sdkBand);
-
-				if (Directory.Exists(manifestsDir))
-				{
-					foreach (var dir in Directory.GetDirectories(manifestsDir))
-					{
-						var manifestFile = Path.Combine(dir, "WorkloadManifest.json");
-
-						if (!File.Exists(manifestFile))
-						{
-							try { Util.Delete(dir, false); }
-							catch { }
-						}
-					}
-				}
-			}
-		}
-
 		string GetInstalledWorkloadMetadataDir()
 		{
 			int last2DigitsTo0(int versionBuild)

UnoCheck/Checkups/DotNetWorkloadDuplicatesCheckup.cs

@@ -28,22 +28,21 @@ static Task<int> Main(string[] args)
 				new VSWinWorkloadsCheckup(),
 				new AndroidSdkPackagesCheckup(),
 				new XCodeCheckup(),
-				new DotNetCheckup(),
-				new DotNetWorkloadDuplicatesCheckup(),
-                new DotNetNewUnoTemplatesCheckup(),
-                new EdgeWebView2Checkup());
+				new DotNetCheckup()
+			);
 
 			CheckupManager.RegisterCheckupContributors(
 				new DotNetSdkCheckupContributor());
 
 			CheckupManager.RegisterCheckups(
-				new DotNetSentinelCheckup(),
 				new WSLCheckup(),
 				new GTK3Checkup(),
 				new WindowsPythonInstallationCheckup(),
 				new WindowsLongPathCheckup(),
 				new LinuxNinjaPresenceCheckup(),
-				new HyperVCheckup()
+				new HyperVCheckup(),
+                new DotNetNewUnoTemplatesCheckup(),
+                new EdgeWebView2Checkup()
 			);
 
 			var app = new CommandApp();