Skip to content

Commit

Permalink
fix: Only override the EnableMsixTooling for libraries
Browse files Browse the repository at this point in the history
This change will ensure that the EnableMsixTooling property is modified properly, in the targets file (when OutputType is set) and only when we're not using the Uno.Sdk (which sets this value properly by itself).
  • Loading branch information
jeromelaban authored May 15, 2024
1 parent b9087d7 commit 68d9240
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/Uno.Extensions.Maui.UI/build/Package.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 8 additions & 0 deletions src/Uno.Extensions.Maui.UI/build/Package.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down

0 comments on commit 68d9240

Please sign in to comment.