Bump Maui to RC 2 / P9 (#1815)

mono · Sep 28, 2021 · 7533b54 · 7533b54
1 parent 37a8113
commit 7533b54
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 23 deletions.
diff --git a/samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs b/samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs
@@ -1,4 +1,5 @@
 using Microsoft.Maui;
+using Microsoft.Maui.Hosting;
 using Microsoft.Maui.Controls.Hosting;
 using SkiaSharp.Views.Maui.Controls.Hosting;
 

diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/Android/MainApplication.cs b/samples/Basic/Maui/SkiaSharpSample/Platforms/Android/MainApplication.cs
@@ -2,6 +2,7 @@
 using Android.App;
 using Android.Runtime;
 using Microsoft.Maui;
+using Microsoft.Maui.Hosting;
 
 namespace SkiaSharpSample
 {

diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/AppDelegate.cs b/samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/AppDelegate.cs
@@ -1,5 +1,6 @@
 using Foundation;
 using Microsoft.Maui;
+using Microsoft.Maui.Hosting;
 
 namespace SkiaSharpSample
 {

diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/Windows/App.xaml.cs b/samples/Basic/Maui/SkiaSharpSample/Platforms/Windows/App.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.Maui;
+using Microsoft.Maui.Hosting;
 using Microsoft.UI.Xaml;
 
 namespace SkiaSharpSample.WinUI

diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/AppDelegate.cs b/samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/AppDelegate.cs
@@ -1,5 +1,6 @@
 using Foundation;
 using Microsoft.Maui;
+using Microsoft.Maui.Hosting;
 
 namespace SkiaSharpSample
 {

diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
@@ -10,8 +10,8 @@
     <RootNamespace>SkiaSharpSample</RootNamespace>
     <ApplicationTitle>SkiaSharpSample</ApplicationTitle>
     <ApplicationId>com.companyname.SkiaSharpSample</ApplicationId>
-    <ApplicationVersion>1.0</ApplicationVersion>
-    <AndroidVersionCode>1</AndroidVersionCode>
+    <ApplicationVersion>1</ApplicationVersion>
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <LangVersion>9.0</LangVersion>
     <UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>
   </PropertyGroup>

diff --git a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj
@@ -16,8 +16,7 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>5FC604ABEDFB78C8B4E57214FEB937949F44ABE4</PackageCertificateThumbprint>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

diff --git a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
@@ -16,8 +16,7 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>5FC604ABEDFB78C8B4E57214FEB937949F44ABE4</PackageCertificateThumbprint>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
@@ -16,8 +16,7 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>5FC604ABEDFB78C8B4E57214FEB937949F44ABE4</PackageCertificateThumbprint>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj
@@ -16,8 +16,7 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>5FC604ABEDFB78C8B4E57214FEB937949F44ABE4</PackageCertificateThumbprint>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

diff --git a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
@@ -16,8 +16,7 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>5FC604ABEDFB78C8B4E57214FEB937949F44ABE4</PackageCertificateThumbprint>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
@@ -16,8 +16,7 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>5FC604ABEDFB78C8B4E57214FEB937949F44ABE4</PackageCertificateThumbprint>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
@@ -26,8 +26,8 @@ variables:
   XCODE_VERSION: 12.4
   DOTNET_VERSION_PREVIOUS: 3.1.412
   DOTNET_VERSION: 5.0.400
-  DOTNET_VERSION_PREVIEW: 6.0.100-rc.1.21426.23
-  DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/rc1/index.json'
+  DOTNET_VERSION_PREVIEW: 6.0.100-rc.2.21465.13
+  DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.101/preview.9.json'
   VS_VERSION_PREVIEW: 16/pre
   CONFIGURATION: 'Release'
   VM_IMAGE_WINDOWS: windows-2019

diff --git a/scripts/install-dotnet-workloads.ps1 b/scripts/install-dotnet-workloads.ps1
@@ -12,12 +12,14 @@ Write-Host "Checking current workloads..."
 & dotnet workload search
 
 Write-Host "Installing workloads..."
-& dotnet workload install android-aot --source "$SourceUrl"
-& dotnet workload install ios --source "$SourceUrl"
-& dotnet workload install tvos --source "$SourceUrl"
-& dotnet workload install macos --source "$SourceUrl"
-& dotnet workload install maccatalyst --source "$SourceUrl"
-& dotnet workload install wasm-tools --source "$SourceUrl"
-& dotnet workload install maui --source "$SourceUrl"
+Invoke-WebRequest -Uri $SourceUrl -OutFile rollback.json
+& dotnet workload update --from-rollback-file rollback.json --source https://aka.ms/dotnet6/nuget/index.json
+& dotnet workload install android-aot --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
+& dotnet workload install ios --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
+& dotnet workload install tvos --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
+& dotnet workload install macos --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
+& dotnet workload install maccatalyst --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
+& dotnet workload install wasm-tools --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
+& dotnet workload install maui --skip-manifest-update --source https://aka.ms/dotnet6/nuget/index.json
 
 exit $LASTEXITCODE