Merge pull request #2295 from unoplatform/dev/jela/sdk-maui-embedding
fix: Only override the EnableMsixTooling for libraries
This commit is contained in:
Коммит
4919dca542
|
@ -20,12 +20,4 @@
|
|||
<IncludeXamlNamespaces Include="not_maui" />
|
||||
<ExcludeXamlNamespaces Include="maui" />
|
||||
</ItemGroup>
|
||||
|
||||
<Choose>
|
||||
<When Condition="$(TargetFramework.Contains('windows10'))">
|
||||
<PropertyGroup Condition=" '$(OutputType)' != 'WinExe' AND '$(OutputType)' != 'Exe' ">
|
||||
<EnableMsixTooling>false</EnableMsixTooling>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
</Choose>
|
||||
</Project>
|
||||
|
|
|
@ -11,6 +11,14 @@
|
|||
<Using Remove="@(Using->HasMetadata('Sdk')->WithMetadataValue('Sdk', 'Maui'))"/>
|
||||
</ItemGroup>
|
||||
|
||||
<Choose>
|
||||
<When Condition="$(TargetFramework.Contains('windows10'))">
|
||||
<PropertyGroup Condition=" '$(UsingUnoSdk)' != 'true' AND '$(OutputType)' != 'WinExe' AND '$(OutputType)' != 'Exe' ">
|
||||
<EnableMsixTooling>false</EnableMsixTooling>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
</Choose>
|
||||
|
||||
<ItemGroup>
|
||||
<Using Remove="Microsoft.Maui.*" />
|
||||
<Analyzer Remove="Microsoft.Maui.Controls.SourceGen" />
|
||||
|
|
Загрузка…
Ссылка в новой задаче