Skip to content

Building using .NET MAUI RC 2 #2004

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 8 commits into from
Apr 19, 2022
Merged

Building using .NET MAUI RC 2 #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
62df804
Update azure-pipelines-variables.yml
mattleibow Apr 15, 2022
ff44bab
Update install-dotnet-workloads.ps1
mattleibow Apr 16, 2022
dceddd8
Update SKImageSourceService.Android.cs
mattleibow Apr 17, 2022
3e31e0f
Update azure-pipelines.yml
mattleibow Apr 17, 2022
35567c0
Update azure-pipelines-tests.yml
mattleibow Apr 17, 2022
22e64df
Fix targets for winui and dotnet build
mattleibow Apr 18, 2022
96251a3
get this to build for now
mattleibow Apr 19, 2022
1ef256f
Update azure-pipelines.yml
mattleibow Apr 19, 2022
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
2 changes: 1 addition & 1 deletion VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ System.IO.UnmanagedMemoryStream release 4.3.0
System.Drawing.Common release 4.5.1
SharpVk release 0.4.2
Uno.UI release 4.0.8
Microsoft.WindowsAppSDK release 1.0.0
Microsoft.WindowsAppSDK release 1.0.2
Microsoft.Maui.Graphics release 6.0.200-preview.12.852
Microsoft.Windows.SDK.NET.Ref release 10.0.18362.22
Microsoft.AspNetCore.Components.Web release 6.0.0
Expand Down
11 changes: 9 additions & 2 deletions nuget/SkiaSharp.Views.WinUI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependencies>
<group targetFramework="net5.0-windows10.0.18362">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
<dependency id="Microsoft.WindowsAppSDK" version="1.0.2" />
</group>
<group targetFramework="net6.0-windows10.0.18362">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
<dependency id="Microsoft.WindowsAppSDK" version="1.0.2" />
</group>
<group targetFramework="net6.0-windows10.0.19041">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="Microsoft.WindowsAppSDK" version="1.0.2" />
</group>
</dependencies>

Expand All @@ -47,6 +51,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file platform="windows" src="lib/net6.0-windows10.0.18362/SkiaSharp.Views.Windows.dll" />
<file platform="windows" src="lib/net6.0-windows10.0.18362/SkiaSharp.Views.Windows.pdb" />
<file platform="windows" src="lib/net6.0-windows10.0.18362/SkiaSharp.Views.Windows.xml" />
<file platform="windows" src="lib/net6.0-windows10.0.19041/SkiaSharp.Views.Windows.dll" />
<file platform="windows" src="lib/net6.0-windows10.0.19041/SkiaSharp.Views.Windows.pdb" />
<file platform="windows" src="lib/net6.0-windows10.0.19041/SkiaSharp.Views.Windows.xml" />

<!-- legal -->
<file src="LICENSE.txt" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net6.0-ios;net6.0-maccatalyst;net6.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
Expand Down
61 changes: 55 additions & 6 deletions samples/Basic/WinUI/Msix/SkiaSharpSample.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,74 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|arm64 = Debug|arm64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|arm64 = Release|arm64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.Build.0 = Debug|Any CPU
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|Any CPU.ActiveCfg = Release|Any CPU
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|Any CPU.Build.0 = Release|Any CPU
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|Any CPU.Deploy.0 = Release|Any CPU
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.ActiveCfg = Debug|x64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.Build.0 = Debug|x64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.Deploy.0 = Debug|x64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|arm64.ActiveCfg = Debug|arm64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|arm64.Build.0 = Debug|arm64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|arm64.Deploy.0 = Debug|arm64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x64.ActiveCfg = Debug|x64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x64.Build.0 = Debug|x64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x64.Deploy.0 = Debug|x64
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x86.ActiveCfg = Debug|x86
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x86.Build.0 = Debug|x86
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x86.Deploy.0 = Debug|x86
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|Any CPU.ActiveCfg = Release|x86
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|arm64.ActiveCfg = Release|arm64
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|arm64.Build.0 = Release|arm64
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|x64.ActiveCfg = Release|x64
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|x64.Build.0 = Release|x64
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|x86.ActiveCfg = Release|x86
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|x86.Build.0 = Release|x86
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|arm64.ActiveCfg = Debug|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|arm64.Build.0 = Debug|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|x64.ActiveCfg = Debug|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|x64.Build.0 = Debug|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|x86.ActiveCfg = Debug|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|x86.Build.0 = Debug|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|Any CPU.Build.0 = Release|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|arm64.ActiveCfg = Release|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|arm64.Build.0 = Release|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|x64.ActiveCfg = Release|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|x64.Build.0 = Release|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|x86.ActiveCfg = Release|Any CPU
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|x86.Build.0 = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|arm64.ActiveCfg = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|arm64.Build.0 = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|arm64.Deploy.0 = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x64.ActiveCfg = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x64.Build.0 = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x64.Deploy.0 = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x86.ActiveCfg = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x86.Build.0 = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x86.Deploy.0 = Debug|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|Any CPU.Build.0 = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|Any CPU.Deploy.0 = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|arm64.ActiveCfg = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|arm64.Build.0 = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|arm64.Deploy.0 = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x64.ActiveCfg = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x64.Build.0 = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x64.Deploy.0 = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x86.ActiveCfg = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x86.Build.0 = Release|Any CPU
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x86.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
3 changes: 2 additions & 1 deletion samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
<RootNamespace>SkiaSharpSample</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.2" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0]">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.2]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.2" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
5 changes: 0 additions & 5 deletions scripts/azure-pipelines-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ trigger: none
pr: none

parameters:
- name: buildExternals
displayName: 'The specific native artifacts to use for this build.'
type: number
default: 0
- name: VM_IMAGE_WINDOWS
type: object
default:
Expand Down Expand Up @@ -45,7 +41,6 @@ stages:
- template: azure-templates-stages.yml
parameters:
isBuildPipeline: false
buildExternals: ${{ parameters.buildExternals }}
VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }}
VM_IMAGE_WINDOWS_NATIVE: ${{ parameters.VM_IMAGE_WINDOWS }}
VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }}
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ variables:
MONO_VERSION_LINUX: ''
XCODE_VERSION: 13.2.1
VISUAL_STUDIO_VERSION: '17/pre'
DOTNET_VERSION_PREVIEW: '6.0.300-preview.22179.2'
DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.300/rc.1.json'
DOTNET_VERSION_PREVIEW: '6.0.300-preview.22207.16'
DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.300/rc.2.json'
CONFIGURATION: 'Release'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
THROW_ON_TEST_FAILURE: true
Expand Down
7 changes: 4 additions & 3 deletions scripts/install-dotnet-workloads.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ $previewRuntime = 'https://api.nuget.org/v3/index.json'
$previewEmscripten = 'https://api.nuget.org/v3/index.json'
if ($IsPreview) {
$previewFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
$previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-323bf2dd/nuget/v3/index.json'
$previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-572aeedc/nuget/v3/index.json'
$previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-bd261ea4/nuget/v3/index.json'
$previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f-3/nuget/v3/index.json'
}

Write-Host "Installing workloads..."
Expand All @@ -22,6 +22,7 @@ Write-Host "Installing workloads..."
--source https://api.nuget.org/v3/index.json `
--source $previewFeed `
--source $previewRuntime `
--source $previewEmscripten
--source $previewEmscripten `
--skip-sign-check

exit $LASTEXITCODE
Loading