chore: build errors

unoplatform · Nov 19, 2024 · ecbec0d · ecbec0d
1 parent 5c7ae5f
commit ecbec0d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 25 deletions.
diff --git a/src/Uno.UWP/Uno.Reference.csproj b/src/Uno.UWP/Uno.Reference.csproj
@@ -30,12 +30,16 @@
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.Reference.csproj" />
 	</ItemGroup>
 
+	<PropertyGroup>
+		<_UnoUIPrefix>..\Uno.UI\UI</_UnoUIPrefix>
+		<_UnoUIPrefix Condition="'$(UNO_UWP_BUILD)'=='true'">..\Uno.UI\Microsoft\UI</_UnoUIPrefix>
+	</PropertyGroup>
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
-		<Compile Include="..\Uno.UI\UI\Colors.cs" />
-		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+		<Compile Include="$(_UnoUIPrefix)\PointerPoint.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerPointProperties.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerPointPropertiesExtensions.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerUpdateKind.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Colors.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Text\FontWeights.cs" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.UWP/Uno.Skia.csproj b/src/Uno.UWP/Uno.Skia.csproj
@@ -31,14 +31,18 @@
 		<ProjectReference Include="..\Uno.Foundation\Uno.Foundation.Skia.csproj" />
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.Skia.csproj" />
 	</ItemGroup>
-
+
+	<PropertyGroup>
+		<_UnoUIPrefix>..\Uno.UI\UI</_UnoUIPrefix>
+		<_UnoUIPrefix Condition="'$(UNO_UWP_BUILD)'=='true'">..\Uno.UI\Microsoft\UI</_UnoUIPrefix>
+	</PropertyGroup>
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
-		<Compile Include="..\Uno.UI\UI\Colors.cs" />
-		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+		<Compile Include="$(_UnoUIPrefix)\PointerPoint.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerPointProperties.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerPointPropertiesExtensions.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerUpdateKind.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Colors.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Text\FontWeights.cs" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.UWP/Uno.Tests.csproj b/src/Uno.UWP/Uno.Tests.csproj
@@ -27,12 +27,16 @@
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.Tests.csproj" />
 	</ItemGroup>
 
+	<PropertyGroup>
+		<_UnoUIPrefix>..\Uno.UI\UI</_UnoUIPrefix>
+		<_UnoUIPrefix Condition="'$(UNO_UWP_BUILD)'=='true'">..\Uno.UI\Microsoft\UI</_UnoUIPrefix>
+	</PropertyGroup>
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
-		<Compile Include="..\Uno.UI\UI\Colors.cs" />
-		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+		<Compile Include="$(_UnoUIPrefix)\PointerPoint.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerPointProperties.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerPointPropertiesExtensions.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerUpdateKind.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Colors.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Text\FontWeights.cs" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.UWP/Uno.netcoremobile.csproj b/src/Uno.UWP/Uno.netcoremobile.csproj
@@ -42,12 +42,16 @@
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.netcoremobile.csproj" />
 	</ItemGroup>
 
+	<PropertyGroup>
+		<_UnoUIPrefix>..\Uno.UI\UI</_UnoUIPrefix>
+		<_UnoUIPrefix Condition="'$(UNO_UWP_BUILD)'=='true'">..\Uno.UI\Microsoft\UI</_UnoUIPrefix>
+	</PropertyGroup>
 	<ItemGroup>
-		<Compile Include="..\Uno.UI\UI\Input\PointerPoint.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointProperties.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerPointPropertiesExtensions.cs" />
-		<Compile Include="..\Uno.UI\UI\Input\PointerUpdateKind.cs" />
-		<Compile Include="..\Uno.UI\UI\Colors.cs" />
-		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+		<Compile Include="$(_UnoUIPrefix)\PointerPoint.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerPointProperties.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerPointPropertiesExtensions.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Input\PointerUpdateKind.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Colors.cs" />
+		<Compile Include="$(_UnoUIPrefix)\Text\FontWeights.cs" />
 	</ItemGroup>
 </Project>