Skip to content

Commit 0266011

Browse files
committed
Consolidated GlobalUsings and introduced EnableGlobalUsings property. Respects HasWinUI.
1 parent 441dc4e commit 0266011

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
@@ -17,6 +17,7 @@
1717
<Import Project="$(ToolingDirectory)\MultiTarget\MultiTargetIdentifiers.props" />
1818
<Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
1919
<Import Project="$(ToolingDirectory)\MultiTarget\NoWarn.props"/>
20+
<Import Project="$(ToolingDirectory)\MultiTarget\GlobalUsings.props" />
2021

2122
<!-- Add platform package dependencies -->
2223
<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
@@ -62,10 +62,6 @@
6262
<NoWarn>$(NoWarn);CA1416;</NoWarn>
6363
</PropertyGroup>
6464

65-
<ItemGroup>
66-
<Compile Include="$(ToolingDirectory)\GlobalUsings_WinUI.cs" />
67-
</ItemGroup>
68-
6965
<!-- Workaround for Mac: https://developercommunity.visualstudio.com/t/XamarinMac-binaries-are-missing-in-173/10164443#T-N10164676 10/6/22 -->
7066
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinmac')) ">
7167
<Reference Include="Xamarin.Mac">

0 commit comments

Comments
 (0)