chore: Remove PlatformItemGroups and move its content accordingly

1ac79890 · Youssef Victor · cdbaa2d4 · 1ac79890 · cdbaa2d4 · 1ac79890
Showing with 48 addition and 55 deletion

src/Directory.Build.props src/Directory.Build.props +15 -0

src/PlatformItemGroups.props src/PlatformItemGroups.props +0 -54

src/Uno.CrossTargetting.targets src/Uno.CrossTargetting.targets +33 -1

未找到文件。
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -199,6 +199,21 @@
 		or '$(TargetFramework)'=='net6.0-macos'
 		or '$(TargetFramework)'=='net7.0-macos'
 		">true</IsMacOS>
+
+	<IsCatalyst>false</IsCatalyst>
+	<IsCatalyst Condition="'$(TargetFramework)'=='net6.0-maccatalyst' or '$(TargetFramework)'=='net7.0-maccatalyst'">true</IsCatalyst>
+
+	<IsIOSOrCatalyst>false</IsIOSOrCatalyst>
+	<IsIOSOrCatalyst Condition="$(IsIOS) or $(IsCatalyst)">true</IsIOSOrCatalyst>
+
+	<_IsNet>false</_IsNet>
+	<_IsNet Condition="'$(TargetFramework)'=='net461'">true</_IsNet>
+
+	<_IsNetCore>false</_IsNetCore>
+	<_IsNetCore Condition="'$(TargetFramework)'=='net5.0' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">true</_IsNetCore>
+
+	<_IsNetStd>false</_IsNetStd>
+	<_IsNetStd Condition="'$(TargetFramework)'=='netstandard2.0' or $(_IsNetCore)">true</_IsNetStd>
  </PropertyGroup>

  <PropertyGroup>

--- a/src/PlatformItemGroups.props
+++ b/src/PlatformItemGroups.props
-<Project ToolsVersion="15.0">
-
-	<PropertyGroup>
-		<IsCatalyst>false</IsCatalyst>
-		<IsCatalyst Condition="'$(TargetFramework)'=='net6.0-maccatalyst' or '$(TargetFramework)'=='net7.0-maccatalyst'">true</IsCatalyst>
-
-		<IsIOSOrCatalyst>false</IsIOSOrCatalyst>
-		<IsIOSOrCatalyst Condition="$(IsIOS) or $(IsCatalyst)">true</IsIOSOrCatalyst>
-
-		<_IsNet>false</_IsNet>
-		<_IsNet Condition="'$(TargetFramework)'=='net461'">true</_IsNet>
-
-		<_IsNetCore>false</_IsNetCore>
-		<_IsNetCore Condition="'$(TargetFramework)'=='net5.0' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">true</_IsNetCore>
-
-		<_IsNetStd>false</_IsNetStd>
-		<_IsNetStd Condition="'$(TargetFramework)'=='netstandard2.0' or $(_IsNetCore)">true</_IsNetStd>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<AndroidResource Include="Resources\**\*.xml" Condition="$(IsAndroid)" />
-
-		<None Include="**\*.netstd.cs" Exclude="bin\**\*.netstd.cs;obj\**\*.netstd.cs" Condition="!$(_IsNetStd)" />
-		<Compile Remove="**\*.netstd.cs" Condition="!$(_IsNetStd)" />
-
-		<None Include="**\*.wasm.cs" Exclude="bin\**\*.wasm.cs;obj\**\*.wasm.cs" Condition="'$(UnoRuntimeIdentifier)'!='WebAssembly'" />
-		<Compile Remove="**\*.wasm.cs" Condition="'$(UnoRuntimeIdentifier)'!='WebAssembly'" />
-
-		<None Include="**\*.skia.cs" Exclude="bin\**\*.skia.cs;obj\**\*.skia.cs" Condition="'$(UnoRuntimeIdentifier)'!='Skia'" />
-		<Compile Remove="**\*.skia.cs" Condition="'$(UnoRuntimeIdentifier)'!='Skia'" />
-
-		<None Include="**\*.netstdref.cs" Exclude="bin\**\*.netstdref.cs;obj\**\*.netstdref.cs" Condition="!$(_IsNetStd) or '$(UnoRuntimeIdentifier)'!='Reference'" />
-		<Compile Remove="**\*.netstdref.cs" Condition="!$(_IsNetStd) or '$(UnoRuntimeIdentifier)'!='Reference'" />
-
-		<None Include="**\*.iOS.cs" Exclude="bin\**\*.iOS.cs;obj\**\*.iOS.cs" Condition="!$(IsIOSOrCatalyst)" />
-		<Compile Remove="**\*.iOS.cs" Condition="!$(IsIOSOrCatalyst)" />
-
-		<None Include="**\*.macOS.cs" Exclude="bin\**\*.macOS.cs;obj\**\*.macOS.cs" Condition="!$(IsMacOS)" />
-		<Compile Remove="**\*.macOS.cs" Condition="!$(IsMacOS)" />
-
-		<None Include="**\*.iOSmacOS.cs" Exclude="bin\**\*.iOSmacOS.cs;obj\**\*.iOSmacOS.cs" Condition="!$(IsMacOS) and !$(IsIOSOrCatalyst)" />
-		<Compile Remove="**\*.iOSmacOS.cs" Condition="!$(IsMacOS) and !$(IsIOSOrCatalyst)" />
-
-		<None Include="**\*.Android.cs" Exclude="bin\**\*.Android.cs;obj\**\*.Android.cs" Condition="!$(IsAndroid)" />
-		<Compile Remove="**\*.Android.cs" Condition="!$(IsAndroid)" />
-
-		<None Include="**\*.Xamarin.cs" Exclude="bin\**\*.Xamarin.cs;obj\**\*.Xamarin.cs" Condition="!$(IsAndroid) and !$(IsIOSOrCatalyst) and !$(IsMacOS)" />
-		<Compile Remove="**\*.Xamarin.cs" Condition="!$(IsAndroid) and !$(IsIOSOrCatalyst) and !$(IsMacOS)" />
-
-		<None Include="**\*.net.cs" Exclude="bin\**\*.net.cs;obj\**\*.net.cs" Condition="'$(TargetFramework)'!='net461'" />
-		<Compile Remove="**\*.net.cs" Condition="'$(TargetFramework)'!='net461'" />
-	</ItemGroup>
-
-</Project>
--- a/src/Uno.CrossTargetting.targets
+++ b/src/Uno.CrossTargetting.targets
 <Project ToolsVersion="15.0">

-	<Import Project="PlatformItemGroups.props" />
+	<ItemGroup>
+		<AndroidResource Include="Resources\**\*.xml" Condition="$(IsAndroid)" />
+
+		<None Include="**\*.netstd.cs" Exclude="bin\**\*.netstd.cs;obj\**\*.netstd.cs" Condition="!$(_IsNetStd)" />
+		<Compile Remove="**\*.netstd.cs" Condition="!$(_IsNetStd)" />
+
+		<None Include="**\*.wasm.cs" Exclude="bin\**\*.wasm.cs;obj\**\*.wasm.cs" Condition="'$(UnoRuntimeIdentifier)'!='WebAssembly'" />
+		<Compile Remove="**\*.wasm.cs" Condition="'$(UnoRuntimeIdentifier)'!='WebAssembly'" />
+
+		<None Include="**\*.skia.cs" Exclude="bin\**\*.skia.cs;obj\**\*.skia.cs" Condition="'$(UnoRuntimeIdentifier)'!='Skia'" />
+		<Compile Remove="**\*.skia.cs" Condition="'$(UnoRuntimeIdentifier)'!='Skia'" />
+
+		<None Include="**\*.netstdref.cs" Exclude="bin\**\*.netstdref.cs;obj\**\*.netstdref.cs" Condition="!$(_IsNetStd) or '$(UnoRuntimeIdentifier)'!='Reference'" />
+		<Compile Remove="**\*.netstdref.cs" Condition="!$(_IsNetStd) or '$(UnoRuntimeIdentifier)'!='Reference'" />
+
+		<None Include="**\*.iOS.cs" Exclude="bin\**\*.iOS.cs;obj\**\*.iOS.cs" Condition="!$(IsIOSOrCatalyst)" />
+		<Compile Remove="**\*.iOS.cs" Condition="!$(IsIOSOrCatalyst)" />
+
+		<None Include="**\*.macOS.cs" Exclude="bin\**\*.macOS.cs;obj\**\*.macOS.cs" Condition="!$(IsMacOS)" />
+		<Compile Remove="**\*.macOS.cs" Condition="!$(IsMacOS)" />
+
+		<None Include="**\*.iOSmacOS.cs" Exclude="bin\**\*.iOSmacOS.cs;obj\**\*.iOSmacOS.cs" Condition="!$(IsMacOS) and !$(IsIOSOrCatalyst)" />
+		<Compile Remove="**\*.iOSmacOS.cs" Condition="!$(IsMacOS) and !$(IsIOSOrCatalyst)" />
+
+		<None Include="**\*.Android.cs" Exclude="bin\**\*.Android.cs;obj\**\*.Android.cs" Condition="!$(IsAndroid)" />
+		<Compile Remove="**\*.Android.cs" Condition="!$(IsAndroid)" />
+
+		<None Include="**\*.Xamarin.cs" Exclude="bin\**\*.Xamarin.cs;obj\**\*.Xamarin.cs" Condition="!$(IsAndroid) and !$(IsIOSOrCatalyst) and !$(IsMacOS)" />
+		<Compile Remove="**\*.Xamarin.cs" Condition="!$(IsAndroid) and !$(IsIOSOrCatalyst) and !$(IsMacOS)" />
+
+		<None Include="**\*.net.cs" Exclude="bin\**\*.net.cs;obj\**\*.net.cs" Condition="'$(TargetFramework)'!='net461'" />
+		<Compile Remove="**\*.net.cs" Condition="'$(TargetFramework)'!='net461'" />
+	</ItemGroup>

 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<!-- Add 0105 - WinUI build step tends to introduce duplicate usings where there were none in authored code -->