Manual update for .net8 sdk and workloads (#11387)

* Manual update for .net8 sdk and workloads * Update iOS net8 * Update the rest of iOS bits * Update yaml triggers * Update GitInfo * Bump .net maui version * Don't build tizen * Remove GraphicsTester.Skia.Tizen from the sln * Bump to XCODE 14.1 * Disable `$(AndroidEnableMarshalMethods)` This is a new feature in .NET 8: 8bc7a3e84f * Skip `tizen` workload install * Add Tizen back * Add net8 to test framework * Fix android tests versions and other variables and provisioning * Update more dotnet versions * Really disable ResizetizeImages to fix MacCatalyst issue * Auto-format source code * Fix provisioning * Revert "Auto-format source code" This reverts commit d6b570ae5b. * Don't be net6 templates for now * Revert "Remove GraphicsTester.Skia.Tizen from the sln" This reverts commit 1d1f303ca0. * Revert "Really disable ResizetizeImages to fix MacCatalyst issue" This reverts commit 09935d9260. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
2022-11-24 15:46:27 +00:00 · 2022-11-24 15:46:27 +00:00 · cba2b90f67
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -2,7 +2,7 @@
  <Import Project="eng\Versions.props" />

  <PropertyGroup>
-    <_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">7</_MauiDotNetVersionMajor>
+    <_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">8</_MauiDotNetVersionMajor>
    <_MauiDotNetVersionMinor Condition="'$(_MauiDotNetVersionMinor)' == ''">0</_MauiDotNetVersionMinor>
    <_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor)</_MauiDotNetVersion>
    <_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion)</_MauiDotNetTfm>
@ -157,5 +157,7 @@
    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
    <!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
    <DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
+    <!-- TODO: temporarily disable this to get past Android build error in Release builds -->
+    <AndroidEnableMarshalMethods>false</AndroidEnableMarshalMethods>
  </PropertyGroup>
 </Project>
--- a/GitInfo.txt
+++ b/GitInfo.txt
@ -1 +1 @@
-7.0.0-ci.net7
+8.0.0-ci.net8
--- a/NuGet.config
+++ b/NuGet.config
@ -4,11 +4,8 @@
    <clear />
    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-pub-dotnet-aspnetcore-d50065c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-d50065c4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-aspnetcore-d50065c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-d50065c4-1/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-aspnetcore -->
    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-pub-dotnet-runtime-cd2d837" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cd2d8379/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-runtime -->
    <!--  Begin: Package sources from dotnet-windowsdesktop -->
    <!--  End: Package sources from dotnet-windowsdesktop -->
@ -20,6 +17,7 @@
    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
    <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
+    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
    <add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
    <add key="wasdk-internal" value="https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
    <!-- Added manually for dotnet/runtime 6.0.11 -->
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -1,40 +1,36 @@
 <Dependencies>
  <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22519.39" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.22526.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
      <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>e6dd91c290b808f971a1ac69c2fb29395bbf1051</Sha>
+      <Sha>8c1708f37899815bc298ab30e5f2561ec47f1929</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22511.4" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22524.5" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d25158d0dffd699340cedcfd43324c87a809a214</Sha>
+      <Sha>5108757b997c59ab8ba1fc5309ab0d4e730e2b77</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.4">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.1.50">
      <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
+      <Sha>8a2080306210302d5caca50ab9906240282825f4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.2372">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.1.585-net8-p1">
      <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>754abbf6a3563f6267e5717ae832b4ac25b1f2fb</Sha>
+      <Sha>df0151d09a23a1630022ad653036d11ce4b396b8</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.2372">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="13.0.1140-net8-p1">
      <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>754abbf6a3563f6267e5717ae832b4ac25b1f2fb</Sha>
+      <Sha>df0151d09a23a1630022ad653036d11ce4b396b8</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.1478">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.1.585-net8-p1">
      <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>7e129d7643d1d820e9eb20c102d7ab6ad06f7937</Sha>
+      <Sha>df0151d09a23a1630022ad653036d11ce4b396b8</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.1478">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.585-net8-p1">
      <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>7e129d7643d1d820e9eb20c102d7ab6ad06f7937</Sha>
+      <Sha>df0151d09a23a1630022ad653036d11ce4b396b8</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22510.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
      <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>daca2015ce74956591df9c9dc7ee732af7863b42</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
-      <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>daca2015ce74956591df9c9dc7ee732af7863b42</Sha>
+      <Sha>aecb1c71c70f6db44035602a879c57fa495d37e8</Sha>
    </Dependency>
    <Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
      <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -3,25 +3,25 @@
    <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.547</MicrosoftMauiPreviousDotNetReleasedVersion>
    <!-- dotnet/installer -->
-    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.22526.2</MicrosoftDotnetSdkInternalPackageVersion>
    <!-- dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rtm.22511.4</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22524.5</MicrosoftNETCoreAppRefPackageVersion>
    <!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
    <MicrosoftExtensionsPackageVersion>7.0.0</MicrosoftExtensionsPackageVersion>
    <MicrosoftExtensionsServicingPackageVersion>7.0.0</MicrosoftExtensionsServicingPackageVersion>
    <SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
    <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.1.50</MicrosoftAndroidSdkWindowsPackageVersion>
    <!-- xamarin/xamarin-macios -->
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.2372</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.2372</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>16.0.1478</MicrosoftiOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>16.0.1478</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>16.1.585-net8-p1</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>13.0.1140-net8-p1</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.1.585-net8-p1</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.1.585-net8-p1</MicrosofttvOSSdkPackageVersion>
    <!-- Samsung/Tizen.NET -->
-    <SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
+    <SamsungTizenSdkPackageVersion>7.0.104</SamsungTizenSdkPackageVersion>
    <!-- emsdk -->
-    <MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rtm.22504.3</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
-    <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
+    <MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion>8.0.0-alpha.1.22510.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion>
+    <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
    <!-- wasdk -->
    <MicrosoftWindowsAppSDKPackageVersion>1.1.5</MicrosoftWindowsAppSDKPackageVersion>
    <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.1</MicrosoftWindowsSDKBuildToolsPackageVersion>
@ -69,13 +69,13 @@
    <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
-    <DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">7.0.100</DotNetVersionBand>
-    <DotNetSdkManifestsFolder>$(DotNetVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc).\d+`))</DotNetSdkManifestsFolder>
+    <DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">8.0.100</DotNetVersionBand>
+    <DotNetSdkManifestsFolder>$(DotNetVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`))</DotNetSdkManifestsFolder>
    <DotNetMauiManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetMauiManifestVersionBand>
    <DotNetMonoManifestVersionBand>$(DotNetVersionBand)</DotNetMonoManifestVersionBand>
    <DotNetEmscriptenManifestVersionBand>$(DotNetVersionBand)</DotNetEmscriptenManifestVersionBand>
    <DotNetAndroidManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetAndroidManifestVersionBand>
    <DotNetMaciOSManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetMaciOSManifestVersionBand>
-    <DotNetTizenManifestVersionBand>7.0.100</DotNetTizenManifestVersionBand>
+    <DotNetTizenManifestVersionBand>$(DotNetSdkManifestsFolder)</DotNetTizenManifestVersionBand>
  </PropertyGroup>
 </Project>
--- a/eng/cake/dotnet.cake
+++ b/eng/cake/dotnet.cake
@ -24,7 +24,7 @@ ProcessTFMSwitches();
 // Tasks for CI

 Task("dotnet")
-    .Description("Provisions .NET 6 into bin/dotnet based on eng/Versions.props")
+    .Description("Provisions .NET 8 into bin/dotnet based on eng/Versions.props")
    .Does(() =>
    {
        if (!localDotnet) 
--- a/eng/devices/android.cake
+++ b/eng/devices/android.cake
@ -12,7 +12,7 @@ string DEVICE_NAME = Argument("skin", EnvironmentVariable("ANDROID_TEST_SKIN") ?
 // optional
 var USE_DOTNET = Argument("dotnet", true);
 var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
-var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net7.0-android" : ""));
+var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net8.0-android" : ""));
 var BINLOG_ARG = Argument("binlog", EnvironmentVariable("ANDROID_TEST_BINLOG") ?? "");
 DirectoryPath BINLOG_DIR = string.IsNullOrEmpty(BINLOG_ARG) && !string.IsNullOrEmpty(PROJECT.FullPath) ? PROJECT.GetDirectory() : BINLOG_ARG;
 var TEST_APP = Argument("app", EnvironmentVariable("ANDROID_TEST_APP") ?? "");
--- a/eng/devices/ios.cake
+++ b/eng/devices/ios.cake
@ -10,7 +10,7 @@ string TEST_DEVICE = Argument("device", EnvironmentVariable("IOS_TEST_DEVICE") ?
 // optional
 var USE_DOTNET = Argument("dotnet", true);
 var DOTNET_PATH = Argument("dotnet-path", EnvironmentVariable("DOTNET_PATH"));
-var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net7.0-ios" : ""));
+var TARGET_FRAMEWORK = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? (USE_DOTNET ? "net8.0-ios" : ""));
 var BINLOG_ARG = Argument("binlog", EnvironmentVariable("IOS_TEST_BINLOG") ?? "");
 DirectoryPath BINLOG_DIR = string.IsNullOrEmpty(BINLOG_ARG) && !string.IsNullOrEmpty(PROJECT.FullPath) ? PROJECT.GetDirectory() : BINLOG_ARG;
 var TEST_APP = Argument("app", EnvironmentVariable("IOS_TEST_APP") ?? "");
--- a/eng/pipelines/common/device-tests.yml
+++ b/eng/pipelines/common/device-tests.yml
@ -1,7 +1,7 @@
 parameters:
  androidPool: { }
  iosPool: { }
-  androidApiLevels: [ 30 ]
+  androidApiLevels: [ 33 ]
  iosVersions: [ 'latest' ]
  provisionatorChannel: 'latest'
  projects:
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@ -4,15 +4,15 @@ variables:
 - name: BuildVersion
  value: $[counter('buildversion-counter', 5000)]
 - name: NUGET_VERSION
-  value: 5.8.1
+  value: 6.4.0
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
  value: true
 - name: DOTNET_VERSION
-  value: 5.0.201
+  value: 6.0.403
 - name: REQUIRED_XCODE
-  value: 14.0.0
+  value: 14.1.0
 - name: DEVICETESTS_REQUIRED_XCODE
-  value: 14.0.0
+  value: 14.1.0
 - name: LocBranchPrefix
  value: 'loc-hb'
 - name: isMainBranch
@ -26,11 +26,11 @@ variables:
 - name: isPullRequest
  value: $[eq(variables['Build.Reason'], 'PullRequest')]
 - name: isLocHandoffBranch
-  value: $[in(variables['Build.SourceBranch'], 'refs/heads/net6.0', 'refs/heads/net7.0', 'refs/heads/main')]
+  value: $[in(variables['Build.SourceBranch'], 'refs/heads/net6.0', 'refs/heads/net7.0', 'refs/heads/net8.0', 'refs/heads/main')]
 - name: signingCondition
  value: $[or(
            eq(variables['Sign'], 'true'),
-            in(variables['Build.SourceBranch'], 'refs/heads/net6.0', 'refs/heads/net7.0', 'refs/heads/main'),
+            in(variables['Build.SourceBranch'], 'refs/heads/net6.0', 'refs/heads/net7.0', 'refs/heads/net8.0', 'refs/heads/main'),
            startsWith(variables['Build.SourceBranch'], 'refs/tags/'),
            startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')
          )]
--- a/eng/pipelines/handlers.yml
+++ b/eng/pipelines/handlers.yml
@ -4,6 +4,7 @@ trigger:
    - main
    - release/*
    - net7.0
+    - net8.0
    - loc
  tags:
    include:
@ -28,6 +29,7 @@ pr:
    - main
    - release/*
    - net7.0
+    - net8.0
  paths:
    include:
    - '*'
@ -104,10 +106,10 @@ parameters:
    default:
      - name: default
        tfm: default
-      - name: net6
-        tfm: net6.0
-      - name: net7
-        tfm: net7.0
+      # - name: net6
+      #   tfm: net6.0
+      - name: net8
+        tfm: net8.0

 resources:
  repositories:
@ -175,12 +177,12 @@ stages:
                inputs:
                  ArtifactName: ${{ BuildPlatform.artifact }}

-  - stage: pack_net6
+  - stage: pack_net
    displayName: Pack .NET MAUI
    dependsOn: []
    jobs:
      - ${{ each PackPlatform in parameters.PackPlatforms }}:
-        - job: pack_net6_${{ PackPlatform.name }}
+        - job: pack_net_${{ PackPlatform.name }}
          workspace:
            clean: all
          displayName: ${{ PackPlatform.name }}
@ -201,9 +203,9 @@ stages:
                provisionatorChannel: ${{ parameters.provisionatorChannel }}
                artifact:  ${{ PackPlatform.artifact }}

-  - stage: samples_net6
+  - stage: samples_net
    displayName: Build .NET MAUI Samples
-    dependsOn: pack_net6
+    dependsOn: pack_net
    jobs:
      - ${{ each BuildPlatform in parameters.BuildPlatforms }}:
        - ${{ each BuildConfiguration in parameters.BuildConfigurations }}:
@ -254,9 +256,9 @@ stages:
                inputs:
                  ArtifactName: ${{ BuildPlatform.artifact }}

-  - stage: templates_net6
+  - stage: templates_net
    displayName: Build .NET MAUI Templates
-    dependsOn: pack_net6
+    dependsOn: pack_net
    jobs:
      - ${{ each BuildPlatform in parameters.BuildPlatforms }}:
        - ${{ each BuildConfiguration in parameters.BuildConfigurations }}:
--- a/eng/provisioning/provisioning.csx
+++ b/eng/provisioning/provisioning.csx
@ -1,98 +1,7 @@
 if (IsMac)
 {
-	System.Net.Http.HttpClient client = new System.Net.Http.HttpClient (new System.Net.Http.HttpClientHandler { AllowAutoRedirect = true });
-	if (!Directory.Exists ("/Library/Frameworks/Mono.framework/Versions/Current/Commands/"))
- 	{
- 		Item ("Mono", "6.12.0.127")
- 			.Source (_ => "https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.107.macos10.xamarin.universal.pkg");
- 	}
 	ForceJavaCleanup();
 	MicrosoftOpenJdk ("11.0.13.8.1");
-
-	string releaseChannel = Environment.GetEnvironmentVariable ("CHANNEL");
-	Console.WriteLine ("ANDROID_SDK_MAC: {0}", Environment.GetEnvironmentVariable ("ANDROID_SDK_MAC"));
-	Console.WriteLine ("IOS_SDK_MAC: {0}", Environment.GetEnvironmentVariable ("IOS_SDK_MAC"));
-	Console.WriteLine ("MONO_SDK_MAC: {0}", Environment.GetEnvironmentVariable ("MONO_SDK_MAC"));
-	Console.WriteLine ("MAC_SDK_MAC: {0}", Environment.GetEnvironmentVariable ("MAC_SDK_MAC"));
-	Console.WriteLine ("releaseChannel: {0}", releaseChannel);
-
-	bool specificSdkSet = false;
-
-	if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("MONO_SDK_MAC")))
-	{
-		await ResolveUrl (Environment.GetEnvironmentVariable ("MONO_SDK_MAC"));
-		specificSdkSet = true;
-	}
-
-	if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("ANDROID_SDK_MAC")))
-	{
-		await ResolveUrl (Environment.GetEnvironmentVariable ("ANDROID_SDK_MAC"));
-		specificSdkSet = true;
-	}
-
-	if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("IOS_SDK_MAC")))
-	{
-		await ResolveUrl (Environment.GetEnvironmentVariable ("IOS_SDK_MAC"));
-		specificSdkSet = true;
-	}
-
-	if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("MAC_SDK_MAC")))
-	{
-		await ResolveUrl (Environment.GetEnvironmentVariable ("MAC_SDK_MAC"));
-		specificSdkSet = true;
-	}
-	
-	if(!specificSdkSet)
-	{
-		if(releaseChannel == "Beta")
-		{
-			Console.WriteLine ("Beta channel doesn't exist on provisionator");
-		}
-		else if(releaseChannel == "Preview")
-		{
-			XamarinChannel("Preview");
-		}
-		else if(releaseChannel == "Stable")
-		{
-			XamarinChannel("Stable");
-		}
-	}
-
-	async System.Threading.Tasks.Task ResolveUrl (string url)
-	{
-		// When downloading a package using the xamci we have to use the following code to 
-		// install updates otherwise provionator can't tell the difference between a new package or an old one
-		try
-		{
-			using (var response = await client.GetAsync (url, System.Net.Http.HttpCompletionOption.ResponseHeadersRead)) {
-				response.EnsureSuccessStatusCode ();
-				Item(response.RequestMessage.RequestUri.ToString());
-			}
-		}
-		catch{
-			Item(url);
-		}
-	}
-}
-else
-{
-
-	if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("ANDROID_SDK_WINDOWS")))
-		Item ("Xamarin.Android")
-      		.Source (_ => Environment.GetEnvironmentVariable ("ANDROID_SDK_WINDOWS"));
-
-	if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("IOS_SDK_WINDOWS")))
-		Item ("Xamarin.iOS")
-      		.Source (_ => Environment.GetEnvironmentVariable ("IOS_SDK_WINDOWS"));
-
-	if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("MONO_SDK_WINDOWS")))
-		Item ("Mono")
-      		.Source (_ => Environment.GetEnvironmentVariable ("MONO_SDK_WINDOWS"));
-
-	if(!String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable ("MAC_SDK_WINDOWS")))
-		Item ("Xamarin.Mac")
-      		.Source (_ => Environment.GetEnvironmentVariable ("MAC_SDK_WINDOWS"));
-
 }

 string ANDROID_API_SDKS = Environment.GetEnvironmentVariable ("ANDROID_API_SDKS");
@ -100,10 +9,11 @@ string ANDROID_API_SDKS = Environment.GetEnvironmentVariable ("ANDROID_API_SDKS"
 if(String.IsNullOrWhiteSpace(ANDROID_API_SDKS))
 {
 	AndroidSdk()
-		.ApiLevel((AndroidApiLevel)21)
-		.ApiLevel((AndroidApiLevel)22)
 		.ApiLevel((AndroidApiLevel)23)
 		.ApiLevel((AndroidApiLevel)24)
+		.ApiLevel((AndroidApiLevel)25)
+		.ApiLevel((AndroidApiLevel)26)
+		.ApiLevel((AndroidApiLevel)27)
 		.ApiLevel((AndroidApiLevel)28)
 		.ApiLevel((AndroidApiLevel)29)
 		.ApiLevel((AndroidApiLevel)30)
@ -158,6 +68,24 @@ if(String.IsNullOrWhiteSpace(ANDROID_API_SDKS))
 			AndroidSystemImageApi.GooglePlayStore,
 			AndroidSystemImageAbi.x86,
 			AndroidVirtualDevice.NEXUS_5X)
+		// .VirtualDevice(
+		// 	"Android_API31",
+		// 	AndroidApiLevel.Android_12,
+		// 	AndroidSystemImageApi.GooglePlayStore,
+		// 	AndroidSystemImageAbi.x86,
+		// 	AndroidVirtualDevice.NEXUS_5X)
+		// .VirtualDevice(
+		// 	"Android_API32",
+		// 	AndroidApiLevel.Android_12sv2,
+		// 	AndroidSystemImageApi.GooglePlayStore,
+		// 	AndroidSystemImageAbi.x86,
+		// 	AndroidVirtualDevice.NEXUS_5X)
+		// .VirtualDevice(
+		// 	"Android_API33",
+		// 	AndroidApiLevel.Android_13,
+		// 	AndroidSystemImageApi.GooglePlayStore,
+		// 	AndroidSystemImageAbi.x86,
+		// 	AndroidVirtualDevice.NEXUS_5X)
 		.SdkManagerPackage ("build-tools;33.0.0");
 }
 else{
--- a/src/DotNet/Dependencies/Workloads.csproj
+++ b/src/DotNet/Dependencies/Workloads.csproj
@ -3,6 +3,7 @@
    <TargetFramework>netstandard2.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
+    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetMonoManifestVersionBand)"   Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(DotNetMonoManifestVersionBand)"   Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(DotNetMonoManifestVersionBand)"   Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
    <PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
--- a/src/DotNet/DotNet.csproj
+++ b/src/DotNet/DotNet.csproj
@ -127,7 +127,7 @@
    <_WorkloadIds Include="macos" />
    <_WorkloadIds Include="ios" />
    <_WorkloadIds Include="tvos" />
-    <_WorkloadIds Include="tizen" />
+    <_WorkloadIds Include="tizen" Condition=" '$(IncludeTizenTargetFrameworks)' == 'true' " />
  </ItemGroup>

  <Target Name="_AcquireWorkloadManifests"