Skip to content

Commit 35941bb

Browse files
mattleibowmattleibow
authored
Building using .NET MAUI RC 2 (#2004)
1 parent 486317a commit 35941bb

File tree

17 files changed

+574
-48
lines changed

17 files changed

+574
-48
lines changed

‎VERSIONS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ System.IO.UnmanagedMemoryStream release 4.3.0
2222
System.Drawing.Common release 4.5.1
2323
SharpVk release 0.4.2
2424
Uno.UI release 4.0.8
25-
Microsoft.WindowsAppSDK release 1.0.0
25+
Microsoft.WindowsAppSDK release 1.0.2
2626
Microsoft.Maui.Graphics release 6.0.200-preview.12.852
2727
Microsoft.Windows.SDK.NET.Ref release 10.0.18362.22
2828
Microsoft.AspNetCore.Components.Web release 6.0.0

‎nuget/SkiaSharp.Views.WinUI.nuspec

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
2929
<dependencies>
3030
<group targetFramework="net5.0-windows10.0.18362">
3131
<dependency id="SkiaSharp" version="1.0.0" />
32-
<dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
32+
<dependency id="Microsoft.WindowsAppSDK" version="1.0.2" />
3333
</group>
3434
<group targetFramework="net6.0-windows10.0.18362">
3535
<dependency id="SkiaSharp" version="1.0.0" />
36-
<dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
36+
<dependency id="Microsoft.WindowsAppSDK" version="1.0.2" />
37+
</group>
38+
<group targetFramework="net6.0-windows10.0.19041">
39+
<dependency id="SkiaSharp" version="1.0.0" />
40+
<dependency id="Microsoft.WindowsAppSDK" version="1.0.2" />
3741
</group>
3842
</dependencies>
3943

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

5158
<!-- legal -->
5259
<file src="LICENSE.txt" />

‎samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net6.0-ios;net6.0-maccatalyst;net6.0-android</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<UseMaui>true</UseMaui>
88
<SingleProject>true</SingleProject>

‎samples/Basic/WinUI/Msix/SkiaSharpSample.sln

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,74 @@ EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1414
Debug|Any CPU = Debug|Any CPU
15+
Debug|arm64 = Debug|arm64
16+
Debug|x64 = Debug|x64
17+
Debug|x86 = Debug|x86
1518
Release|Any CPU = Release|Any CPU
19+
Release|arm64 = Release|arm64
20+
Release|x64 = Release|x64
21+
Release|x86 = Release|x86
1622
EndGlobalSection
1723
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19-
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.Build.0 = Debug|Any CPU
20-
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
21-
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|Any CPU.ActiveCfg = Release|Any CPU
22-
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|Any CPU.Build.0 = Release|Any CPU
23-
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|Any CPU.Deploy.0 = Release|Any CPU
24+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.ActiveCfg = Debug|x64
25+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.Build.0 = Debug|x64
26+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|Any CPU.Deploy.0 = Debug|x64
27+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|arm64.ActiveCfg = Debug|arm64
28+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|arm64.Build.0 = Debug|arm64
29+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|arm64.Deploy.0 = Debug|arm64
30+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x64.ActiveCfg = Debug|x64
31+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x64.Build.0 = Debug|x64
32+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x64.Deploy.0 = Debug|x64
33+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x86.ActiveCfg = Debug|x86
34+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x86.Build.0 = Debug|x86
35+
{71668276-ECDD-49EC-9406-27A9D2676139}.Debug|x86.Deploy.0 = Debug|x86
36+
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|Any CPU.ActiveCfg = Release|x86
37+
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|arm64.ActiveCfg = Release|arm64
38+
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|arm64.Build.0 = Release|arm64
39+
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|x64.ActiveCfg = Release|x64
40+
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|x64.Build.0 = Release|x64
41+
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|x86.ActiveCfg = Release|x86
42+
{71668276-ECDD-49EC-9406-27A9D2676139}.Release|x86.Build.0 = Release|x86
2443
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2544
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|Any CPU.Build.0 = Debug|Any CPU
45+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|arm64.ActiveCfg = Debug|Any CPU
46+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|arm64.Build.0 = Debug|Any CPU
47+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|x64.ActiveCfg = Debug|Any CPU
48+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|x64.Build.0 = Debug|Any CPU
49+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|x86.ActiveCfg = Debug|Any CPU
50+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Debug|x86.Build.0 = Debug|Any CPU
2651
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|Any CPU.ActiveCfg = Release|Any CPU
2752
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|arm64.ActiveCfg = Release|Any CPU
54+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|arm64.Build.0 = Release|Any CPU
55+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|x64.ActiveCfg = Release|Any CPU
56+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|x64.Build.0 = Release|Any CPU
57+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|x86.ActiveCfg = Release|Any CPU
58+
{EA2AC287-6FEF-415D-BD33-01287DD11574}.Release|x86.Build.0 = Release|Any CPU
2859
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2960
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|Any CPU.Build.0 = Debug|Any CPU
3061
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
62+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|arm64.ActiveCfg = Debug|Any CPU
63+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|arm64.Build.0 = Debug|Any CPU
64+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|arm64.Deploy.0 = Debug|Any CPU
65+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x64.ActiveCfg = Debug|Any CPU
66+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x64.Build.0 = Debug|Any CPU
67+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x64.Deploy.0 = Debug|Any CPU
68+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x86.ActiveCfg = Debug|Any CPU
69+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x86.Build.0 = Debug|Any CPU
70+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Debug|x86.Deploy.0 = Debug|Any CPU
3171
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|Any CPU.ActiveCfg = Release|Any CPU
3272
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|Any CPU.Build.0 = Release|Any CPU
3373
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|Any CPU.Deploy.0 = Release|Any CPU
74+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|arm64.ActiveCfg = Release|Any CPU
75+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|arm64.Build.0 = Release|Any CPU
76+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|arm64.Deploy.0 = Release|Any CPU
77+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x64.ActiveCfg = Release|Any CPU
78+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x64.Build.0 = Release|Any CPU
79+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x64.Deploy.0 = Release|Any CPU
80+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x86.ActiveCfg = Release|Any CPU
81+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x86.Build.0 = Release|Any CPU
82+
{B9E319D8-0A0E-471C-BD01-8015655FBD99}.Release|x86.Deploy.0 = Release|Any CPU
3483
EndGlobalSection
3584
GlobalSection(SolutionProperties) = preSolution
3685
HideSolutionNode = FALSE

‎samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
<RootNamespace>SkiaSharpSample</RootNamespace>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
10+
<Platforms>x86;x64;arm64</Platforms>
1011
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
15+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.2" />
1516
<Manifest Include="$(ApplicationManifest)" />
1617
</ItemGroup>
1718

‎samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</ProjectReference>
6565
</ItemGroup>
6666
<ItemGroup>
67-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0]">
67+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.2]">
6868
<IncludeAssets>build</IncludeAssets>
6969
</PackageReference>
7070
</ItemGroup>

‎samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
14+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.2" />
1515
<Manifest Include="$(ApplicationManifest)" />
1616
</ItemGroup>
1717

‎scripts/azure-pipelines-tests.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ trigger: none
33
pr: none
44

55
parameters:
6-
- name: buildExternals
7-
displayName: 'The specific native artifacts to use for this build.'
8-
type: number
9-
default: 0
106
- name: VM_IMAGE_WINDOWS
117
type: object
128
default:
@@ -45,7 +41,6 @@ stages:
4541
- template: azure-templates-stages.yml
4642
parameters:
4743
isBuildPipeline: false
48-
buildExternals: ${{ parameters.buildExternals }}
4944
VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }}
5045
VM_IMAGE_WINDOWS_NATIVE: ${{ parameters.VM_IMAGE_WINDOWS }}
5146
VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }}

‎scripts/azure-pipelines-variables.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ variables:
1414
MONO_VERSION_LINUX: ''
1515
XCODE_VERSION: 13.2.1
1616
VISUAL_STUDIO_VERSION: '17/pre'
17-
DOTNET_VERSION_PREVIEW: '6.0.300-preview.22179.2'
18-
DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.300/rc.1.json'
17+
DOTNET_VERSION_PREVIEW: '6.0.300-preview.22207.16'
18+
DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.300/rc.2.json'
1919
CONFIGURATION: 'Release'
2020
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2121
THROW_ON_TEST_FAILURE: true

‎scripts/install-dotnet-workloads.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ $previewRuntime = 'https://api.nuget.org/v3/index.json'
1111
$previewEmscripten = 'https://api.nuget.org/v3/index.json'
1212
if ($IsPreview) {
1313
$previewFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
14-
$previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-323bf2dd/nuget/v3/index.json'
15-
$previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-572aeedc/nuget/v3/index.json'
14+
$previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-bd261ea4/nuget/v3/index.json'
15+
$previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f-3/nuget/v3/index.json'
1616
}
1717

1818
Write-Host "Installing workloads..."
@@ -22,6 +22,7 @@ Write-Host "Installing workloads..."
2222
--source https://api.nuget.org/v3/index.json `
2323
--source $previewFeed `
2424
--source $previewRuntime `
25-
--source $previewEmscripten
25+
--source $previewEmscripten `
26+
--skip-sign-check
2627

2728
exit $LASTEXITCODE

0 commit comments

Comments
 (0)