Skip to content

Commit 66d2874

Browse files
committed
Consolidated GlobalUsings and introduced EnableGlobalUsings property. Respects HasWinUI.
1 parent 884fcf7 commit 66d2874

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

MultiTarget/GlobalUsings.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ItemGroup>
3+
<Compile Condition="'$(EnableGlobalUsings)' != 'false' AND '$(HasWinUI)' == 'true'" Include="$(ToolingDirectory)\GlobalUsings_WinUI.cs" />
4+
<Compile Condition="'$(EnableGlobalUsings)' != 'false'" Include="$(ToolingDirectory)\GlobalUsings.cs" />
5+
</ItemGroup>
6+
</Project>

MultiTarget/Library.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<!-- Enable project identifiers -->
1717
<Import Project="$(ToolingDirectory)\MultiTarget\MultiTargetIdentifiers.props" />
1818
<Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
19+
<Import Project="$(ToolingDirectory)\MultiTarget\GlobalUsings.props" />
1920

2021
<!-- Add platform package dependencies -->
2122
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Uno.props" Condition="$(IsUno) == 'true'" />

MultiTarget/WinUI.Extra.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
<NoWarn>$(NoWarn);WMC1006;CS8034;</NoWarn>
4949
</PropertyGroup>
5050

51-
<ItemGroup>
52-
<Compile Include="$(ToolingDirectory)\GlobalUsings_WinUI.cs" />
53-
</ItemGroup>
54-
5551
<!-- Workaround for Mac: https://developercommunity.visualstudio.com/t/XamarinMac-binaries-are-missing-in-173/10164443#T-N10164676 10/6/22 -->
5652
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinmac')) ">
5753
<Reference Include="Xamarin.Mac">

0 commit comments

Comments
 (0)