Skip to content

Bump Maui to RC 2 / P9 #1815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 11 commits into from
Sep 28, 2021
Merged

Bump Maui to RC 2 / P9 #1815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
70cae7c
Bump Maui to RC 2 / P9
mattleibow Sep 21, 2021
ff5710a
Try this now
mattleibow Sep 22, 2021
15ed238
better
mattleibow Sep 22, 2021
331b20b
6.0.100-rc.2.21465.13
mattleibow Sep 23, 2021
6041998
install it all
mattleibow Sep 24, 2021
adc1a52
new things
mattleibow Sep 24, 2021
a65190a
Merge branch 'main' into dev/maui
mattleibow Sep 25, 2021
a92143a
new ns
mattleibow Sep 25, 2021
0f9ae83
using Microsoft.Maui.Hosting;
mattleibow Sep 26, 2021
aaf3296
build all
mattleibow Sep 27, 2021
397f648
Don't sign
mattleibow Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.Maui;
using Microsoft.Maui.Hosting;
using Microsoft.Maui.Controls.Hosting;
using SkiaSharp.Views.Maui.Controls.Hosting;

Expand Down
1 change: 1 addition & 0 deletions samples/Basic/Maui/SkiaSharpSample/Platforms/Android/MainApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Android.App;
using Android.Runtime;
using Microsoft.Maui;
using Microsoft.Maui.Hosting;

namespace SkiaSharpSample
{
Expand Down
1 change: 1 addition & 0 deletions samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Foundation;
using Microsoft.Maui;
using Microsoft.Maui.Hosting;

namespace SkiaSharpSample
{
Expand Down
1 change: 1 addition & 0 deletions samples/Basic/Maui/SkiaSharpSample/Platforms/Windows/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.Maui;
using Microsoft.Maui.Hosting;
using Microsoft.UI.Xaml;

namespace SkiaSharpSample.WinUI
Expand Down
1 change: 1 addition & 0 deletions samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Foundation;
using Microsoft.Maui;
using Microsoft.Maui.Hosting;

namespace SkiaSharpSample
{
Expand Down
4 changes: 2 additions & 2 deletions samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions scripts/install-dotnet-workloads.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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