Skip to content

Commit 0e90413

Browse files
ArlodotexeArlodotexe
committed
Move non-WinUI props into separate file
1 parent 0266011 commit 0e90413

File tree

3 files changed

+41
-54
lines changed

3 files changed

+41
-54
lines changed

‎MultiTarget/Extra.props

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Project>
2+
<PropertyGroup Condition="'$(IsWinAppSdk)' == 'true' OR '$(IsUwp)' == 'true'">
3+
<!--
4+
For net5.0+ targets, TargetPlatformMinVersion was renamed to SupportedOSPlatformVersion. See https://github.com/dotnet/designs/pull/157
5+
6+
The dotnet SDK uses the TargetPlatformVersion property to provide a default SupportedOSPlatformVersion value if none is explicitly provided.
7+
See https://github.com/dotnet/designs/blob/bba3216250cb29b0063bac3ebb57a542ee21ad4f/accepted/2020/minimum-os-version/minimum-os-version.md?plain=1#L73C27-L73C48
8+
-->
9+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
10+
<SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
11+
<TargetPlatformVersion Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">10.0.26100.0</TargetPlatformVersion>
12+
<TargetPlatformVersion Condition="'$(MultiTargetPlatformIdentifier)' != 'windows'">10.0.19041.0</TargetPlatformVersion>
13+
</PropertyGroup>
14+
15+
<!-- Workaround, improved error message when consuming from Uno projects with mismatched TFMs -->
16+
<!-- See https://github.com/CommunityToolkit/Windows/issues/388 -->
17+
<ItemGroup>
18+
<None PackagePath="lib/net9.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
19+
<None PackagePath="lib/net8.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
20+
<None PackagePath="lib/net7.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
21+
</ItemGroup>
22+
23+
<PropertyGroup Condition="'$(IsUwp)' == 'true'">
24+
<Platforms>x86;x64;arm64</Platforms>
25+
26+
<WindowsSdkPackageVersion Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">10.0.26100.54</WindowsSdkPackageVersion>
27+
<RuntimeIdentifiers Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
28+
</PropertyGroup>
29+
30+
<PropertyGroup Condition="'$(IsWinAppSdk)' == 'true'">
31+
<!-- See https://github.com/microsoft/WindowsAppSDK/issues/3842 -->
32+
<UseRidGraph>true</UseRidGraph>
33+
34+
<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
35+
<RuntimeIdentifiers Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
36+
37+
<!--- Workaround for ADO 53865998 - See https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/215 - Don't include extraneous WebView2 dll -->
38+
<WebView2NeverCopyLoaderDllToOutputDirectory>true</WebView2NeverCopyLoaderDllToOutputDirectory>
39+
</PropertyGroup>
40+
</Project>

‎MultiTarget/Library.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<!-- Configure WinUI -->
2828
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.AutoIncludeXamlPages.props" Condition="$(HasWinUI) == 'true'" />
2929
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.Extra.props" Condition="$(HasWinUI) == 'true'" />
30+
<Import Project="$(ToolingDirectory)\MultiTarget\Extra.props" />
3031

3132
<!-- Import Uno and native dependencies for all multitargeted library projects. -->
3233
<Import Project="$(MSBuildProjectDirectory)\Dependencies.props" Condition="Exists('$(MSBuildProjectDirectory)\Dependencies.props')" />

‎MultiTarget/WinUI.Extra.props

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,45 +8,6 @@
88
<EnableDefaultPageItems>false</EnableDefaultPageItems>
99
</PropertyGroup>
1010

11-
<PropertyGroup Condition="'$(IsWinAppSdk)' == 'true' OR '$(IsUwp)' == 'true'">
12-
<!--
13-
For net5.0+ targets, TargetPlatformMinVersion was renamed to SupportedOSPlatformVersion. See https://github.com/dotnet/designs/pull/157
14-
15-
The dotnet SDK uses the TargetPlatformVersion property to provide a default SupportedOSPlatformVersion value if none is explicitly provided.
16-
See https://github.com/dotnet/designs/blob/bba3216250cb29b0063bac3ebb57a542ee21ad4f/accepted/2020/minimum-os-version/minimum-os-version.md?plain=1#L73C27-L73C48
17-
-->
18-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
19-
<SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
20-
<TargetPlatformVersion Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">10.0.26100.0</TargetPlatformVersion>
21-
<TargetPlatformVersion Condition="'$(MultiTargetPlatformIdentifier)' != 'windows'">10.0.19041.0</TargetPlatformVersion>
22-
</PropertyGroup>
23-
24-
<!-- Workaround, improved error message when consuming from Uno projects with mismatched TFMs -->
25-
<!-- See https://github.com/CommunityToolkit/Windows/issues/388 -->
26-
<ItemGroup>
27-
<None PackagePath="lib/net9.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
28-
<None PackagePath="lib/net8.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
29-
<None PackagePath="lib/net7.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
30-
</ItemGroup>
31-
32-
<PropertyGroup Condition="'$(IsUwp)' == 'true'">
33-
<Platforms>x86;x64;arm64</Platforms>
34-
35-
<WindowsSdkPackageVersion Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">10.0.26100.54</WindowsSdkPackageVersion>
36-
<RuntimeIdentifiers Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
37-
</PropertyGroup>
38-
39-
<PropertyGroup Condition="'$(IsWinAppSdk)' == 'true'">
40-
<!-- See https://github.com/microsoft/WindowsAppSDK/issues/3842 -->
41-
<UseRidGraph>true</UseRidGraph>
42-
43-
<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
44-
<RuntimeIdentifiers Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
45-
46-
<!--- Workaround for ADO 53865998 - See https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/215 - Don't include extraneous WebView2 dll -->
47-
<WebView2NeverCopyLoaderDllToOutputDirectory>true</WebView2NeverCopyLoaderDllToOutputDirectory>
48-
</PropertyGroup>
49-
5011
<PropertyGroup Condition="'$(IsUno)' == 'true'">
5112
<!-- Xaml Trimming: https://platform.uno/docs/articles/features/resources-trimming.html -->
5213
<UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming>
@@ -56,19 +17,4 @@
5617
<!-- These suppressions are for references between generated assemblies and that VS can keep in the Error List once resolved -->
5718
<NoWarn>$(NoWarn);WMC1006;CS8034;</NoWarn>
5819
</PropertyGroup>
59-
60-
<!-- Disable warnings for 'This call site is reachable on all platforms.' caused by underlying platform. -->
61-
<PropertyGroup Condition="'$(IsUwp)' == 'true' AND '$(MultiTargetPlatformIdentifier)' == 'windows'">
62-
<NoWarn>$(NoWarn);CA1416;</NoWarn>
63-
</PropertyGroup>
64-
65-
<!-- Workaround for Mac: https://developercommunity.visualstudio.com/t/XamarinMac-binaries-are-missing-in-173/10164443#T-N10164676 10/6/22 -->
66-
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinmac')) ">
67-
<Reference Include="Xamarin.Mac">
68-
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
69-
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
70-
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
71-
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
72-
</Reference>
73-
</ItemGroup>
7420
</Project>

0 commit comments

Comments
 (0)