chore: fix the build one more time

unoplatform · Nov 21, 2024 · f53b7bf · f53b7bf
1 parent f6e7f54
commit f53b7bf
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 10 deletions.
diff --git a/src/Uno.UI/UI/ColorHelper.cs b/src/Uno.UI/UI/ColorHelper.cs
@@ -6,17 +6,12 @@
 using WindowsColor = Windows/*Intentional space for WinUI upgrade tool*/.UI.Color;
 
 #if IS_UNO_UI_PROJECT
-namespace Microsoft.UI.Text;
+namespace Microsoft.UI;
 #else
-namespace Windows.UI.Text;
+namespace Windows.UI;
 #endif
 
-#if HAS_UNO_WINUI && !IS_UNO_UI_PROJECT
-internal
-#else
-public
-#endif
-	static partial class ColorHelper
+public static partial class ColorHelper
 {
 	/// <summary>
 	/// Retrieves the display name of the specified color.

diff --git a/src/Uno.UI/UI/Input/PointerPoint.cs b/src/Uno.UI/UI/Input/PointerPoint.cs
@@ -1,4 +1,6 @@
-using System;
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
@@ -110,3 +112,4 @@ public override string ToString()
 			=> $"[{PointerDevice.PointerDeviceType}-{PointerId}] @{Position.ToDebugString()} (raw: {RawPosition.ToDebugString()} | ts: {Timestamp} | props: {Properties} | inContact: {IsInContact})";
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/PointerPointProperties.cs b/src/Uno.UI/UI/Input/PointerPointProperties.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 using System.Text;
 using Windows.Foundation;
 using Uno;
@@ -166,3 +168,4 @@ public override string ToString()
 		}
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/PointerPointPropertiesExtensions.cs b/src/Uno.UI/UI/Input/PointerPointPropertiesExtensions.cs
@@ -1,3 +1,5 @@
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
 #nullable enable
 
 using System;
@@ -50,3 +52,4 @@ static bool HasChanged(bool was, bool @is, PointerUpdateKind pressed, PointerUpd
 		}
 	}
 }
+#endif
diff --git a/src/Uno.UI/UI/Input/PointerUpdateKind.cs b/src/Uno.UI/UI/Input/PointerUpdateKind.cs
@@ -1,4 +1,6 @@
-using System;
+// On the UWP branch, only include this file in Uno.UWP (as public Window.whatever). On the WinUI branch, include it in both Uno.UWP (internal as Windows.whatever) and Uno.UI (public as Microsoft.whatever)
+#if HAS_UNO_WINUI || !IS_UNO_UI_PROJECT
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -56,3 +58,4 @@ public enum PointerUpdateKind
 		XButton2Released = 10,
 	}
 }
+#endif
diff --git a/src/Uno.UWP/Uno.Reference.csproj b/src/Uno.UWP/Uno.Reference.csproj
@@ -30,4 +30,13 @@
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.Reference.csproj" />
 	</ItemGroup>
 
+	<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\ColorHelper.cs" />
+		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+	</ItemGroup>
 </Project>
diff --git a/src/Uno.UWP/Uno.Skia.csproj b/src/Uno.UWP/Uno.Skia.csproj
@@ -31,6 +31,16 @@
 		<ProjectReference Include="..\Uno.Foundation\Uno.Foundation.Skia.csproj" />
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.Skia.csproj" />
 	</ItemGroup>
+
+	<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\ColorHelper.cs" />
+		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+	</ItemGroup>
 
 	<ItemGroup>
 		<PRIResource Include="Storage\Pickers\Strings\**\*.resw" />

diff --git a/src/Uno.UWP/Uno.Tests.csproj b/src/Uno.UWP/Uno.Tests.csproj
@@ -27,4 +27,13 @@
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.Tests.csproj" />
 	</ItemGroup>
 
+	<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\ColorHelper.cs" />
+		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+	</ItemGroup>
 </Project>
diff --git a/src/Uno.UWP/Uno.Wasm.csproj b/src/Uno.UWP/Uno.Wasm.csproj
@@ -26,4 +26,13 @@
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.Wasm.csproj" />
 	</ItemGroup>
 
+	<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\ColorHelper.cs" />
+		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+	</ItemGroup>
 </Project>
diff --git a/src/Uno.UWP/Uno.netcoremobile.csproj b/src/Uno.UWP/Uno.netcoremobile.csproj
@@ -42,4 +42,14 @@
 		<ProjectReference Include="..\Uno.UI.Dispatching\Uno.UI.Dispatching.netcoremobile.csproj" />
 	</ItemGroup>
 
+	<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\ColorHelper.cs" />
+		<Compile Include="..\Uno.UI\UI\Text\FontWeights.cs" />
+	</ItemGroup>
+
 </Project>