Building using .NET MAUI RC 2 (#2004)
This commit is contained in:
Matthew Leibowitz
GitHub
Родитель
486317a7d5
Коммит
35941bbf68
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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..."
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,481 @@
|
|||
<!-- Workarounds for WinUI -->
|
||||
<Project>
|
||||
|
||||
<!--
|
||||
BEGIN: Workaround for https://dev.azure.com/microsoft/OS/_workitems/edit/38897015
|
||||
-->
|
||||
|
||||
<PropertyGroup>
|
||||
<PriInitialPath Condition="'$(PriInitialPath)'==''">$(TargetName)</PriInitialPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="_GenerateProjectPriConfigurationFiles"
|
||||
Inputs="$(MSBuildAllProjects);@(_PriFile);$(AppxPriConfigXmlDefaultSnippetPath);@(PriOutputs)"
|
||||
Outputs="$(_PriConfigXmlPath);$(_UnfilteredLayoutResfilesPath);$(_FilteredLayoutResfilesPath);$(_ExcludedLayoutResfilesPath);$(_ResourcesResfilesPath);$(_PriResfilesPath)"
|
||||
DependsOnTargets="_GetDefaultResourceLanguage;_CopyOutOfDateSourceItemsToOutputDirectory">
|
||||
<ItemGroup>
|
||||
<_LayoutFileSource Include="@(PriOutputs)" Condition="'%(PriOutputs.OutputGroup)' == 'ContentFilesProjectOutputGroup' and '%(PriOutputs.ProjectName)' == '$(ProjectName)'" />
|
||||
<_LayoutFileSource Include="@(PriOutputs)" Condition="'%(PriOutputs.OutputGroup)' == 'CustomOutputGroupForPackaging' and '%(PriOutputs.ProjectName)' == '$(ProjectName)'" />
|
||||
<_LayoutFile Include="@(_LayoutFileSource)" Exclude="@(_AppxLayoutAssetPackageFiles)" />
|
||||
<_EmbedFile Include="@(PriOutputs)" Condition="'%(PriOutputs.OutputGroup)' == 'EmbedOutputGroupForPackaging' and '%(PriOutputs.ProjectName)' == '$(ProjectName)'"/>
|
||||
<_EmbedFileCopy Include="@(_EmbedFile->'$(IntermediateOutputPath)$(AppxSubfolderWithFilesToBeEmbedded)\%(TargetPath)')" />
|
||||
|
||||
<!-- If we have the .xbf we don't need the .xaml file-->
|
||||
<_LayoutFileXbfXaml Include="$([System.IO.Path]::ChangeExtension('%(_EmbedFile.Identity)','.xaml'))" Condition="'%(Extension)' == '.xbf'" />
|
||||
<_LayoutFile Remove="@(_LayoutFileXbfXaml)" />
|
||||
</ItemGroup>
|
||||
|
||||
<WinAppSdkGeneratePriConfigurationFiles
|
||||
UnfilteredLayoutResfilesPath="$(_UnfilteredLayoutResfilesPath)"
|
||||
FilteredLayoutResfilesPath="$(_FilteredLayoutResfilesPath)"
|
||||
ExcludedLayoutResfilesPath="$(_ExcludedLayoutResfilesPath)"
|
||||
ResourcesResfilesPath="$(_ResourcesResfilesPath)"
|
||||
PriResfilesPath="$(_PriResfilesPath)"
|
||||
EmbedFileResfilePath="$(_EmbedFileResfilePath)"
|
||||
LayoutFiles="@(_LayoutFile)"
|
||||
PRIResourceFiles="@(PRIResource)"
|
||||
PriFiles="@(_PriFile)"
|
||||
EmbedFiles="@(_EmbedFile)"
|
||||
IntermediateExtension="$(AppxIntermediateExtension)"
|
||||
UnprocessedResourceFiles_OtherLanguages="@(_UnprocessedReswFiles_OtherLanguages)"
|
||||
VsTelemetrySession="$(VsTelemetrySession)">
|
||||
<Output TaskParameter="AdditionalResourceResFiles" ItemName="_AdditionalResourceResFiles" />
|
||||
</WinAppSdkGeneratePriConfigurationFiles>
|
||||
|
||||
<WinAppSdkCreatePriConfigXmlForFullIndex
|
||||
PriConfigXmlPath="$(_PriConfigXmlPath)"
|
||||
LayoutResfilesPath="$(_FilteredLayoutResfilesPath)"
|
||||
ResourcesResfilesPath="$(_ResourcesResfilesPath)"
|
||||
PriResfilesPath="$(_PriResfilesPath)"
|
||||
EmbedFileResfilePath="$(_EmbedFileResfilePath)"
|
||||
PriInitialPath="$(AppxPriInitialPath)"
|
||||
DefaultResourceLanguage="$(DefaultResourceLanguage)"
|
||||
DefaultResourceQualifiers="$(AppxDefaultResourceQualifiers)"
|
||||
IntermediateExtension="$(AppxIntermediateExtension)"
|
||||
PriConfigXmlDefaultSnippetPath="$(AppxPriConfigXmlDefaultSnippetPath)"
|
||||
TargetPlatformIdentifier="$(TargetPlatformIdentifier)"
|
||||
TargetPlatformVersion="$(TargetPlatformResourceVersion)"
|
||||
AdditionalResourceResFiles="@(_AdditionalResourceResFiles)"
|
||||
VsTelemetrySession="$(VsTelemetrySession)" />
|
||||
|
||||
<MakeDir Directories="$(IntermediateOutputPath)$(AppxSubfolderWithFilesToBeEmbedded)" />
|
||||
|
||||
<Copy SourceFiles="@(_EmbedFile)" DestinationFiles="@(_EmbedFileCopy)" SkipUnchangedFiles='true' />
|
||||
|
||||
<Message Text="$(MSBuildProjectName) -> $(_PriConfigXmlPath)" />
|
||||
<Message Text="$(MSBuildProjectName) -> $(_UnfilteredLayoutResfilesPath)" />
|
||||
<Message Text="$(MSBuildProjectName) -> $(_FilteredLayoutResfilesPath)" />
|
||||
<Message Text="$(MSBuildProjectName) -> $(_ExcludedLayoutResfilesPath)" />
|
||||
<Message Text="$(MSBuildProjectName) -> $(_ResourcesResfilesPath)" />
|
||||
<Message Text="$(MSBuildProjectName) -> $(_PriResfilesPath)" />
|
||||
<Message Text="$(MSBuildProjectName) -> $(_AdditionalResourceResFiles)" />
|
||||
<Message Condition="'$(_SupportEmbedFileResources)' == 'true'" Text="$(MSBuildProjectName) -> $(_EmbedFileResfilePath)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GetPackagingOutputs" Returns="@(PackagingOutputs)" DependsOnTargets="$(GetPackagingOutputsDependsOn)">
|
||||
<PropertyGroup>
|
||||
<!--
|
||||
For .NET applications, we always need to include publish items output group, because this includes the exe. We ignore libraries since publish
|
||||
is an application verb and library projects are built for AnyCPU, so including publish output groups will include native assets for every platform
|
||||
instead of just the one being built for.
|
||||
-->
|
||||
<IncludePublishItemsOutputGroup Condition="'$(IncludePublishItemsOutputGroup)'=='' and '$(UsingMicrosoftNETSdk)'=='true' and '$(OutputType)'=='WinExe' ">true</IncludePublishItemsOutputGroup>
|
||||
<IncludeBuiltProjectOutputGroup Condition="'$(IncludeBuiltProjectOutputGroup)' == ''">true</IncludeBuiltProjectOutputGroup>
|
||||
<IncludeCopyLocalFilesOutputGroup Condition="'$(IncludeCopyLocalFilesOutputGroup)' == ''">true</IncludeCopyLocalFilesOutputGroup>
|
||||
<IncludeContentFilesProjectOutputGroup Condition="'$(IncludeContentFilesProjectOutputGroup)' == ''">true</IncludeContentFilesProjectOutputGroup>
|
||||
|
||||
<IncludeDebugSymbolsProjectOutputGroup Condition="'$(IncludeDebugSymbolsProjectOutputGroup)' == ''">true</IncludeDebugSymbolsProjectOutputGroup>
|
||||
<IncludeDocumentationProjectOutputGroup Condition="'$(IncludeDocumentationProjectOutputGroup)' == ''">false</IncludeDocumentationProjectOutputGroup>
|
||||
<IncludeSatelliteDllsProjectOutputGroup Condition="'$(IncludeSatelliteDllsProjectOutputGroup)' == ''">false</IncludeSatelliteDllsProjectOutputGroup>
|
||||
<IncludeSourceFilesProjectOutputGroup Condition="'$(IncludeSourceFilesProjectOutputGroup)' == ''">false</IncludeSourceFilesProjectOutputGroup>
|
||||
<IncludeSGenFilesOutputGroup Condition="'$(IncludeSGenFilesOutputGroup)' == ''">false</IncludeSGenFilesOutputGroup>
|
||||
<IncludeOptionalProjectsOutputGroup Condition="'$(IncludeOptionalProjectsOutputGroup)' == ''">true</IncludeOptionalProjectsOutputGroup>
|
||||
<IncludeGetCopyToOutputDirectoryItemsOutputGroup Condition="'$(IncludeGetCopyToOutputDirectoryItemsOutputGroup)' == ''">true</IncludeGetCopyToOutputDirectoryItemsOutputGroup>
|
||||
<IncludeComFilesOutputGroup Condition="'$(IncludeComFilesOutputGroup)' == ''">false</IncludeComFilesOutputGroup>
|
||||
<IncludeCustomOutputGroupForPackaging Condition="'$(IncludeCustomOutputGroupForPackaging)' == ''">false</IncludeCustomOutputGroupForPackaging>
|
||||
<IncludeCopyWinmdArtifactsOutputGroup Condition="'$(IncludeCopyWinmdArtifactsOutputGroup)' == ''">true</IncludeCopyWinmdArtifactsOutputGroup>
|
||||
<IncludeSDKRedistOutputGroup Condition="'$(IncludeSDKRedistOutputGroup)' == ''">true</IncludeSDKRedistOutputGroup>
|
||||
<IncludeGetResolvedSDKReferences Condition="'$(IncludeGetResolvedSDKReferences)' == ''">true</IncludeGetResolvedSDKReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<CallTarget Targets="BuiltProjectOutputGroup" Condition="'$(IncludeBuiltProjectOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_BuiltProjectOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup Condition="'$(PublishReadyToRun)'!='true'">
|
||||
<_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)">
|
||||
<TargetPath>%(_BuiltProjectOutputGroupOutput.TargetPath)</TargetPath>
|
||||
<OutputGroup>BuiltProjectOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Ignore .dll files when PublishReadyToRun is set to true, otherwise we will get payload duplicate errors -->
|
||||
<ItemGroup Condition="'$(PublishReadyToRun)'=='true'">
|
||||
<_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)" Condition="'%(Extension)'!='.dll'">
|
||||
<TargetPath>%(_BuiltProjectOutputGroupOutput.TargetPath)</TargetPath>
|
||||
<OutputGroup>BuiltProjectOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="__GetPublishItems" Condition="'$(IncludePublishItemsOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_PublishItemsOutputGroupOutput" />
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="@(_PublishItemsOutputGroupOutput)">
|
||||
<OutputGroup>PublishItemsOutputGroupOutput</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="DebugSymbolsProjectOutputGroup" Condition="'$(IncludeDebugSymbolsProjectOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_DebugSymbolsProjectOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="%(_DebugSymbolsProjectOutputGroupOutput.FinalOutputPath)">
|
||||
<OutputGroup>DebugSymbolsProjectOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="DocumentationProjectOutputGroup" Condition="'$(IncludeDocumentationProjectOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_DocumentationProjectOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="@(_DocumentationProjectOutputGroupOutput)">
|
||||
<OutputGroup>DocumentationProjectOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="SatelliteDllsProjectOutputGroup" Condition="'$(IncludeSatelliteDllsProjectOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_SatelliteDllsProjectOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="@(_SatelliteDllsProjectOutputGroupOutput)">
|
||||
<OutputGroup>SatelliteDllsProjectOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="SourceFilesProjectOutputGroup" Condition="'$(IncludeSourceFilesProjectOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_SourceFilesProjectOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="@(_SourceFilesProjectOutputGroupOutput)">
|
||||
<OutputGroup>SourceFilesProjectOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="SGenFilesOutputGroup" Condition="'$(IncludeSGenFilesOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_SGenFilesOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="@(_SGenFilesOutputGroupOutput)">
|
||||
<OutputGroup>SGenFilesOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="CopyLocalFilesOutputGroup" Condition="'$(IncludeCopyLocalFilesOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_CopyLocalFilesOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup Condition="'$(PublishReadyToRun)' != 'true'">
|
||||
<_PackagingOutputsUnexpanded Include="@(_CopyLocalFilesOutputGroupOutput)" Condition="'%(Extension)'!='.pri'">
|
||||
<OutputGroup>CopyLocalFilesOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Ignore .dll files when PublishReadyToRun is set to true, otherwise we will get payload duplicate errors -->
|
||||
<ItemGroup Condition="'$(PublishReadyToRun)' == 'true'">
|
||||
<_PackagingOutputsUnexpanded Include="@(_CopyLocalFilesOutputGroupOutput)" Condition="'%(Extension)'!='.pri' and '%(Extension)'!='.dll'">
|
||||
<OutputGroup>CopyLocalFilesOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Include transitive items from ProjectReferences. See _GetCopyToOutputDirectoryItemsFromTransitiveProjectReferences. -->
|
||||
<CallTarget Targets="GetCopyToOutputDirectoryItemsOutputGroup" Condition="'$(IncludeGetCopyToOutputDirectoryItemsOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_GetCopyToOutputDirectoryItemsOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup Condition="'$(IncludeGetCopyToOutputDirectoryItemsOutputGroup)' == 'true'">
|
||||
<!-- If both XBF and XAML files are present, add only the XBF file to the package. -->
|
||||
<_RedundantXaml Include="@(_GetCopyToOutputDirectoryItemsOutputGroupOutput->'%(RootDir)%(Directory)%(Filename).xaml')"
|
||||
Condition="'%(Extension)'=='.xbf'" />
|
||||
<_GetCopyToOutputDirectoryItemsOutputGroupOutput Remove="@(_RedundantXaml)" />
|
||||
|
||||
<_PackagingOutputsUnexpanded Include="@(_GetCopyToOutputDirectoryItemsOutputGroupOutput)">
|
||||
<OutputGroup>GetCopyToOutputDirectoryItemsOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="ComFilesOutputGroup" Condition="'$(IncludeComFilesOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_ComFilesOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="@(_ComFilesOutputGroupOutput)">
|
||||
<OutputGroup>ComFilesOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="CopyWinmdArtifactsOutputGroup" Condition="'$(IncludeCopyWinmdArtifactsOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_CopyWinmdArtifactsOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="@(_CopyWinmdArtifactsOutputGroupOutput)">
|
||||
<OutputGroup>CopyWinmdArtifactsOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="SDKRedistOutputGroup" Condition="'$(IncludeSDKRedistOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_SDKRedistOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup Condition="'$(AppxExcludeXbfFromSdkPayloadWhenXamlIsPresent)' == 'true'">
|
||||
<!-- If extension SDK contains both XAML and XBF files, do not package XBF files from SDK -->
|
||||
<_SDKRedistRedundantXBF Include="@(_SDKRedistOutputGroupOutput->'%(RootDir)%(Directory)%(Filename).xbf')"
|
||||
Condition="'%(Extension)'=='.xaml'" />
|
||||
<_SDKRedistOutputGroupOutput Remove="@(_SDKRedistRedundantXBF)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsUnexpanded Include="@(_SDKRedistOutputGroupOutput)">
|
||||
<OutputGroup>SDKRedistOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
<_PackagingOutputsUnexpanded Remove="@(RemoveSdkFilesFromAppxPackage)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(DisableEmbeddedXbf)' != 'true'">
|
||||
<_PackagingOutputsUnexpanded Include="@(_CustomOutputGroupForPackagingOutput)" Condition="'%(_CustomOutputGroupForPackagingOutput.ReferenceSourceTarget)' == 'ExpandSDKReference'">
|
||||
<OutputGroup>SDKRedistOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
<TargetPath Condition="'$(AppxPackage)' != 'true' and '$(AppxPriInitialPath)' != ''">$(AppxPriInitialPath)\%(_CustomOutputGroupForPackagingOutput.TargetPath)</TargetPath>
|
||||
</_PackagingOutputsUnexpanded>
|
||||
<_CustomOutputGroupForPackagingOutput Remove="@(_CustomOutputGroupForPackagingOutput)" Condition="'%(_CustomOutputGroupForPackagingOutput.ReferenceSourceTarget)' == 'ExpandSDKReference'"/>
|
||||
</ItemGroup>
|
||||
|
||||
<WinAppSdkExpandPayloadDirectories Inputs="@(_PackagingOutputsUnexpanded)" VsTelemetrySession="$(VsTelemetrySession)">
|
||||
<Output TaskParameter="Expanded" ItemName="_PackagingOutputsExpanded" />
|
||||
</WinAppSdkExpandPayloadDirectories>
|
||||
|
||||
<CallTarget Targets="GetResolvedSDKReferences" Condition="'$(IncludeGetResolvedSDKReferences)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_GetResolvedSDKReferencesOutputWithoutMetadata"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_GetResolvedSDKReferencesOutput Include="@(_GetResolvedSDKReferencesOutputWithoutMetadata)">
|
||||
<OutputGroup>GetResolvedSDKReferences</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_GetResolvedSDKReferencesOutput>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="_GetProjectArchitecture">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_ProjectArchitecture" />
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_ProjectArchitectureItem Include="@(_ProjectArchitecture)">
|
||||
<OutputGroup>_GetProjectArchitecture</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_ProjectArchitectureItem>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<_ContinueOnError Condition="'$(BuildingProject)' == 'true'">false</_ContinueOnError>
|
||||
<_ContinueOnError Condition="'$(BuildingProject)' != 'true'">true</_ContinueOnError>
|
||||
</PropertyGroup>
|
||||
|
||||
<MSBuild
|
||||
Projects="@(ProjectReferenceWithConfiguration)"
|
||||
Targets="GetPackagingOutputs"
|
||||
BuildInParallel="$(BuildInParallel)"
|
||||
Properties="%(ProjectReferenceWithConfiguration.SetConfiguration); %(ProjectReferenceWithConfiguration.SetPlatform)"
|
||||
Condition="'@(ProjectReferenceWithConfiguration)' != ''
|
||||
and '%(ProjectReferenceWithConfiguration.BuildReference)' == 'true'
|
||||
and '%(ProjectReferenceWithConfiguration.ReferenceOutputAssembly)' == 'true'"
|
||||
ContinueOnError="$(_ContinueOnError)">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_PackagingOutputsFromOtherProjects"/>
|
||||
</MSBuild>
|
||||
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsOutsideLayout Include="@(ProjectPriFile)" />
|
||||
<_PackagingOutputsOutsideLayout Include="@(_PackagingOutputsExpanded)" />
|
||||
<_PackagingOutputsOutsideLayout Include="@(PriOutputs)" />
|
||||
<_PackagingOutputsOutsideLayout Include="@(_GetResolvedSDKReferencesOutput)" />
|
||||
<!-- Exclude any PRIOutputs that come from other projects so we avoid duplicates -->
|
||||
<_PackagingOutputsOutsideLayout Include="@(_PackagingOutputsFromOtherProjects)" Exclude="@(PriOutputs)"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PathsToExcludeFromLayoutOutputGroup Include="@(_PackagingOutputsOutsideLayout->'%(TargetPath)')" />
|
||||
<PathsToExcludeFromLayoutOutputGroup Include="$(AppxManifestTargetPath)" />
|
||||
<PathsToExcludeFromLayoutOutputGroup Include="$(DeploymentRecipeTargetPath)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<DirsToExcludeFromLayoutOutputGroup Include="$(WinMetadataDir)" />
|
||||
<DirsToExcludeFromLayoutOutputGroup Include="$(EntryPointDir)" />
|
||||
</ItemGroup>
|
||||
|
||||
<WinAppSdkExpandPayloadDirectories Condition="'$(IncludeLayoutFilesInPackage)' == 'true'" Inputs="$(LayoutDir)" TargetDirsToExclude="@(DirsToExcludeFromLayoutOutputGroup)" TargetFilesToExclude="@(PathsToExcludeFromLayoutOutputGroup)" VsTelemetrySession="$(VsTelemetrySession)">
|
||||
<Output TaskParameter="Expanded" ItemName="_PackagingOutputsFromLayout" />
|
||||
</WinAppSdkExpandPayloadDirectories>
|
||||
|
||||
<ItemGroup>
|
||||
<PackagingOutputs Include="@(_PackagingOutputsFromLayout)">
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
<OutputGroup>LayoutOutputGroup</OutputGroup>
|
||||
</PackagingOutputs>
|
||||
<PackagingOutputs Include="@(_PackagingOutputsOutsideLayout)" />
|
||||
<PackagingOutputs Include="@(_ProjectArchitectureItem)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Remove all .xaml files from the payload that correlate with a .xbf file -->
|
||||
<ItemGroup>
|
||||
<_PackagingOutputsXbfXaml Include="$([System.IO.Path]::ChangeExtension('%(PackagingOutputs.Identity)','.xaml'))" Condition="'%(Extension)' == '.xbf'" />
|
||||
<PackagingOutputs Remove="@(_PackagingOutputsXbfXaml)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="GetPriOutputs"
|
||||
Condition="'$(AppxGeneratePriEnabled)'=='true'"
|
||||
Returns="@(PriOutputs);@(ProjectPriFile)"
|
||||
DependsOnTargets="$(GetPriOutputsDependsOn)">
|
||||
<PropertyGroup>
|
||||
<IncludePriFilesOutputGroup Condition="'$(IncludePriFilesOutputGroup)' == ''">true</IncludePriFilesOutputGroup>
|
||||
<IncludeProjectPriFile Condition="'$(IncludeProjectPriFile)' == ''">true</IncludeProjectPriFile>
|
||||
<IncludeCopyLocalFilesOutputGroup Condition="'$(IncludeCopyLocalFilesOutputGroup)' == ''">true</IncludeCopyLocalFilesOutputGroup>
|
||||
<IncludeContentFilesProjectOutputGroup Condition="'$(IncludeContentFilesProjectOutputGroup)' == ''">true</IncludeContentFilesProjectOutputGroup>
|
||||
<IncludeCustomOutputGroupForPackaging Condition="'$(IncludeCustomOutputGroupForPackaging)' == ''">false</IncludeCustomOutputGroupForPackaging>
|
||||
</PropertyGroup>
|
||||
<CallTarget Targets="PriFilesOutputGroup" Condition="'$(IncludePriFilesOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_PriFilesOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<CallTarget Targets="CopyLocalFilesOutputGroup" Condition="'$(IncludeCopyLocalFilesOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_CopyLocalFilesOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PriOutputsUnexpanded Include="@(_CopyLocalFilesOutputGroupOutput)" Condition="'%(Extension)'=='.pri'">
|
||||
<OutputGroup>CopyLocalFilesOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PriOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_PriOutputsUnexpanded Include="@(_PriFilesOutputGroupOutput)">
|
||||
<OutputGroup>PriFilesOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
</_PriOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="ContentFilesProjectOutputGroup" Condition="'$(IncludeContentFilesProjectOutputGroup)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_ContentFilesProjectOutputGroupOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PriOutputsUnexpanded Include="@(_ContentFilesProjectOutputGroupOutput)">
|
||||
<OutputGroup>ContentFilesProjectOutputGroup</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
<TargetPath Condition="'$(AppxPackage)' != 'true' and '$(AppxPriInitialPath)' != ''">$(AppxPriInitialPath)\%(_ContentFilesProjectOutputGroupOutput.TargetPath)</TargetPath>
|
||||
</_PriOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<CallTarget Targets="CustomOutputGroupForPackaging" Condition="'$(IncludeCustomOutputGroupForPackaging)' == 'true'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_CustomOutputGroupForPackagingOutput"/>
|
||||
</CallTarget>
|
||||
|
||||
<ItemGroup>
|
||||
<_PriOutputsUnexpanded Include="@(_CustomOutputGroupForPackagingOutput)" Condition="'%(Extension)' != '.xbf'">
|
||||
<OutputGroup>CustomOutputGroupForPackaging</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
<TargetPath Condition="'$(AppxPackage)' != 'true' and '$(AppxPriInitialPath)' != ''">$(AppxPriInitialPath)\%(_CustomOutputGroupForPackagingOutput.TargetPath)</TargetPath>
|
||||
</_PriOutputsUnexpanded>
|
||||
<_PriOutputsUnexpanded Include="@(_CustomOutputGroupForPackagingOutput)" Condition="'%(Extension)' == '.xbf' AND '$(_SupportXbfAsEmbedFileResources)' != 'true'">
|
||||
<OutputGroup>CustomOutputGroupForPackaging</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
<TargetPath Condition="'$(AppxPackage)' != 'true' and '$(AppxPriInitialPath)' != ''">$(AppxPriInitialPath)\%(_CustomOutputGroupForPackagingOutput.TargetPath)</TargetPath>
|
||||
</_PriOutputsUnexpanded>
|
||||
<_PriOutputsUnexpanded Include="@(_CustomOutputGroupForPackagingOutput)" Condition="'%(Extension)' == '.xbf' AND '$(_SupportXbfAsEmbedFileResources)' == 'true'">
|
||||
<OutputGroup>EmbedOutputGroupForPackaging</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
<TargetPath Condition="'$(AppxPackage)' != 'true' and '$(AppxPriInitialPath)' != ''">$(AppxPriInitialPath)\%(_CustomOutputGroupForPackagingOutput.TargetPath)</TargetPath>
|
||||
</_PriOutputsUnexpanded>
|
||||
</ItemGroup>
|
||||
|
||||
<WinAppSdkExpandPayloadDirectories Inputs="@(_PriOutputsUnexpanded)" VsTelemetrySession="$(VsTelemetrySession)">
|
||||
<Output TaskParameter="Expanded" ItemName="_PriOutputsExpanded" />
|
||||
</WinAppSdkExpandPayloadDirectories>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectPriFile Include="$(ProjectPriFullPath)" Condition="'$(IncludeProjectPriFile)' == 'true'">
|
||||
<OutputGroup>ProjectPriFile</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
<TargetPath>$(ProjectPriFileName)</TargetPath>
|
||||
</ProjectPriFile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(BuildAppxUploadPackageForUap)' == 'true'">
|
||||
<ProjectPriUploadFile Include="$(ProjectPriUploadFullPath)" Condition="'$(IncludeProjectPriFile)' == 'true'">
|
||||
<OutputGroup>ProjectPriUploadFile</OutputGroup>
|
||||
<ProjectName>$(ProjectName)</ProjectName>
|
||||
<TargetPath>$(ProjectPriFileName)</TargetPath>
|
||||
</ProjectPriUploadFile>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<_ContinueOnError Condition="'$(BuildingProject)' == 'true'">false</_ContinueOnError>
|
||||
<_ContinueOnError Condition="'$(BuildingProject)' != 'true'">true</_ContinueOnError>
|
||||
</PropertyGroup>
|
||||
|
||||
<MSBuild
|
||||
Projects="@(ProjectReferenceWithConfiguration)"
|
||||
Targets="GetPriOutputs"
|
||||
SkipNonexistentTargets="true"
|
||||
BuildInParallel="$(BuildInParallel)"
|
||||
Properties="%(ProjectReferenceWithConfiguration.SetConfiguration); %(ProjectReferenceWithConfiguration.SetPlatform)"
|
||||
Condition="'@(ProjectReferenceWithConfiguration)' != ''
|
||||
and '%(ProjectReferenceWithConfiguration.BuildReference)' == 'true'
|
||||
and '%(ProjectReferenceWithConfiguration.ReferenceOutputAssembly)' == 'true'"
|
||||
ContinueOnError="$(_ContinueOnError)">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_PriOutputsFromOtherProjects"/>
|
||||
</MSBuild>
|
||||
|
||||
<ItemGroup>
|
||||
<PriOutputs Include="@(_PriOutputsExpanded)" />
|
||||
<PriOutputs Include="@(_PriOutputsFromOtherProjects)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Remove all .xaml files that correlate with a .xbf file -->
|
||||
<ItemGroup>
|
||||
<_PriOutputsXbfXaml Include="$([System.IO.Path]::ChangeExtension('%(PriOutputs.Identity)','.xaml'))" Condition="'%(Extension)' == '.xbf'" />
|
||||
<PriOutputs Remove="@(_PriOutputsXbfXaml)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Message Text="$(ProjectName) : %(PriOutputs.ProjectName).%(PriOutputs.OutputGroup) : %(PriOutputs.Identity) -> %(PriOutputs.TargetPath)" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
END: Workaround for https://dev.azure.com/microsoft/OS/_workitems/edit/38897015
|
||||
-->
|
||||
|
||||
</Project>
|
||||
|
|
@ -262,4 +262,6 @@ internal partial class VersionConstants {
|
|||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Import Project="SkiaSharp.Build.WinUI.NetCore.targets" Condition=" '$(EnablePriGenTooling)' != 'true' and '$(TargetPlatformIdentifier)' == 'windows' and '$(EnablePreviewMsixTooling)' == 'true' and '$(UseMaui)' != 'true' and '$(UseMauiCore)' != 'true' " />
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
<PackagingPlatform Condition="$(TargetFramework.Contains('-windows'))">net6.0-windows</PackagingPlatform>
|
||||
<UseMaui>true</UseMaui>
|
||||
<AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
|
||||
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
|
||||
<WindowsPackageType>None</WindowsPackageType>
|
||||
<WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
<PackagingPlatform Condition="$(TargetFramework.Contains('-windows'))">net6.0-windows</PackagingPlatform>
|
||||
<UseMaui>true</UseMaui>
|
||||
<AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
|
||||
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
|
||||
<WindowsPackageType>None</WindowsPackageType>
|
||||
<WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
|
||||
|
|
|
|||
|
|
@ -9,29 +9,7 @@ namespace SkiaSharp.Views.Maui.Handlers
|
|||
{
|
||||
public partial class SKImageSourceService
|
||||
{
|
||||
public override async Task<IImageSourceServiceResult?> LoadDrawableAsync(
|
||||
IImageSource imageSource,
|
||||
global::Android.Widget.ImageView imageView,
|
||||
CancellationToken cancellationToken = default)
|
||||
{
|
||||
var realResult = await GetDrawableAsync(imageView.Context!, imageSource, cancellationToken);
|
||||
|
||||
if (realResult is null)
|
||||
{
|
||||
imageView.SetImageDrawable(null);
|
||||
return null;
|
||||
}
|
||||
|
||||
imageView.SetImageDrawable(realResult.Value);
|
||||
|
||||
var result = new ImageSourceServiceLoadResult(
|
||||
realResult.IsResolutionDependent,
|
||||
() => realResult.Dispose());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public override Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(Context context, IImageSource imageSource, CancellationToken cancellationToken = default)
|
||||
public override Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IImageSource imageSource, Context context, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var bitmap = imageSource switch
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@
|
|||
<PackagingPlatform Condition="$(TargetFramework.Contains('-windows'))">net6.0-windows</PackagingPlatform>
|
||||
<UseMauiCore>true</UseMauiCore>
|
||||
<AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
|
||||
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
|
||||
<WindowsPackageType>None</WindowsPackageType>
|
||||
<WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net5.0-windows10.0.18362;net6.0-windows10.0.18362</TargetFrameworks>
|
||||
<TargetFrameworks>net5.0-windows10.0.18362;net6.0-windows10.0.18362;net6.0-windows10.0.19041</TargetFrameworks>
|
||||
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
|
||||
<RootNamespace>SkiaSharp.Views.Windows</RootNamespace>
|
||||
<AssemblyName>SkiaSharp.Views.Windows</AssemblyName>
|
||||
<PackagingGroup>SkiaSharp.Views.WinUI</PackagingGroup>
|
||||
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
|
||||
<WindowsPackageType>None</WindowsPackageType>
|
||||
<WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.2" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче