From 7533b54bb17a4dbc0c837e47eb4615b3ff2d26ed Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 28 Sep 2021 02:08:21 +0200 Subject: [PATCH] Bump Maui to RC 2 / P9 (#1815) --- .../Basic/Maui/SkiaSharpSample/MauiProgram.cs | 1 + .../Platforms/Android/MainApplication.cs | 1 + .../Platforms/MacCatalyst/AppDelegate.cs | 1 + .../Platforms/Windows/App.xaml.cs | 1 + .../SkiaSharpSample/Platforms/iOS/AppDelegate.cs | 1 + .../Maui/SkiaSharpSample/SkiaSharpSample.csproj | 4 ++-- .../UWP/SkiaSharpSample/SkiaSharpSample.csproj | 3 +-- .../SkiaSharpSample.UWP.csproj | 3 +-- .../SkiaSharpSample.UWP.csproj | 3 +-- .../UWP/SkiaSharpSample/SkiaSharpSample.csproj | 3 +-- .../SkiaSharpSample.UWP.csproj | 3 +-- samples/Gallery/Xamarin.Forms/UWP/UWP.csproj | 3 +-- scripts/azure-pipelines.yml | 4 ++-- scripts/install-dotnet-workloads.ps1 | 16 +++++++++------- 14 files changed, 24 insertions(+), 23 deletions(-) diff --git a/samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs b/samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs index 471cb2be..a57d7612 100644 --- 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 index 2107ba16..825da1d9 100644 --- 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 index fe213924..def0787c 100644 --- 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 index 874b3e1f..616eb04f 100644 --- 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 index fe213924..def0787c 100644 --- 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 index 093907d8..fc9bee15 100644 --- a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj @@ -10,8 +10,8 @@ SkiaSharpSample SkiaSharpSample com.companyname.SkiaSharpSample - 1.0 - 1 + 1 + 1.0 9.0 True diff --git a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj index 4e10fa6d..7d6a6018 100644 --- a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -16,8 +16,7 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx - 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 + false PackageReference 8.0 diff --git a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 170d733b..46125183 100644 --- a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -16,8 +16,7 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx - 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 + false PackageReference 8.0 diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 9aeab1f1..4072fc56 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -16,8 +16,7 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx - 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 + false PackageReference 8.0 diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index ce217c60..8b9b4ff3 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -16,8 +16,7 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx - 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 + false PackageReference 8.0 diff --git a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 8a09dc80..aa87e396 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -16,8 +16,7 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx - 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 + false PackageReference 8.0 diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 797b85d1..55ca8bfb 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -16,8 +16,7 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx - 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 + false PackageReference 8.0 diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 8a2e620b..13b01ee4 100644 --- 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 index db0c1df0..37e8f17c 100644 --- 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