Sample.Gtk: build SourceGen separately

.github/workflows/build-gtk.yml

@@ -0,0 +1,53 @@
+name: Build Controls.Sample.Gtk
+on: [push, pull_request]
+
+jobs:
+  build_and_test:
+    name: Build & Test
+    runs-on: ubuntu-22.04
+    env:
+      GtkSharpVersion: 3.24.24.77-develop
+      DotnetVersion: 6.0.300
+    steps:
+      - name: Checkout MAUI repo
+        uses: actions/checkout@v2
+      # We also tested using 6.0.111 for both projects
+      # but MAUI failed to build on this version with this error:
+      # Could not load file or assembly 'Microsoft.CodeAnalysis, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
+      # So instead we use 6.0.300
+      - name: Setup .NET SDK ${{ env.DotnetVersion }}
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: ${{ env.DotnetVersion }}
+      - name: Install gtk workload
+        run: |
+            dotnet nuget add source --username ${{ github.repository_owner }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/GtkSharp/index.json"
+            # For some reason automatic workload manifest detection doesn't work (see https://github.com/GtkSharp/GtkSharp/issues/355#issuecomment-1446262239), so download and uzip mainfest file manually
+            wget --user ${{ github.repository_owner }} --password ${{ secrets.GITHUB_TOKEN }} https://nuget.pkg.github.com/GtkSharp/download/gtksharp.net.sdk.gtk.manifest-${{ env.DotnetVersion }}/$GtkSharpVersion/gtksharp.net.sdk.gtk.manifest-${{ env.DotnetVersion }}.nupkg
+            DOTNET_DIR=/home/runner/.dotnet
+            WORKLOAD_MANIFEST_DIR=$DOTNET_DIR/sdk-manifests/${{ env.DotnetVersion }}/gtksharp.net.sdk.gtk
+            unzip -j gtksharp.net.sdk.gtk.manifest-${{ env.DotnetVersion }}.nupkg "data/*" -d $WORKLOAD_MANIFEST_DIR/
+            rm gtksharp.net.sdk.gtk.manifest-${{ env.DotnetVersion }}.nupkg
+
+            # otherwise we get System.UnauthorizedAccessException: Access to the path '/home/runner/.dotnet/sdk-manifests/6.0.300/gtksharp.net.sdk.gtk/WorkloadManifest.json' is denied.
+            chmod 764 $WORKLOAD_MANIFEST_DIR/*
+
+            dotnet workload search
+            dotnet workload install gtk --skip-manifest-update
+      - name: Build MAUI
+        run: |
+            dotnet build src/Controls/src/SourceGen/Controls.SourceGen.csproj
+            dotnet build Microsoft.Maui.Gtk.slnf
+
+  dotnet-format:
+    needs: build_and_test
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Run dotnet format
+        run: |
+          dotnet format whitespace ./src --folder --exclude Templates/src
+          git diff --exit-code
+

Microsoft.Maui.Gtk.slnf

@@ -0,0 +1,17 @@
+{
+  "solution": {
+    "path": "Microsoft.Maui.sln",
+    "projects": [
+      "src\\Graphics\\src\\Graphics\\Graphics.csproj",
+      "src\\Graphics\\src\\Graphics.Gtk\\Graphics.Gtk.csproj",
+      "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj",
+      "src\\Essentials\\src\\Essentials.csproj",
+      "src\\Controls\\src\\Core\\Controls.Core.csproj",
+      "src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
+      "src\\Core\\src\\Core.csproj",
+      "src\\Compatibility\\Core\\src\\Compatibility.csproj",
+      "src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj",
+      "src\\Controls\\samples\\Controls.Sample.Gtk\\Controls.Sample.Gtk.csproj"
+    ]
+  }
+}

eng/Version.Details.xml

@@ -1,6 +1,6 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.401-servicing.22419.11" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.300" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>b98928971106bd301a7827962ff6d46fb7c28fc1</Sha>
     </Dependency>

eng/Versions.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- dotnet/installer -->
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.401-servicing.22419.11</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.300</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
     <MicrosoftNETCoreAppRefPackageVersion>6.0.9</MicrosoftNETCoreAppRefPackageVersion>
     <!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
@@ -66,12 +66,12 @@
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
-    <GtkSharpPackageVersion>3.24.24.64</GtkSharpPackageVersion>
+    <GtkSharpPackageVersion>3.24.24.77-develop</GtkSharpPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Match the first three version numbers and append 00 -->
     <!-- <DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `^\d+\.\d+\.\d`))00</DotNetVersionBand> -->
-    <DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">6.0.400</DotNetVersionBand>
+    <DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">6.0.300</DotNetVersionBand>
     <DotNetMauiManifestVersionBand>6.0.400</DotNetMauiManifestVersionBand>
     <DotNetMonoManifestVersionBand>6.0.300</DotNetMonoManifestVersionBand>
     <DotNetEmscriptenManifestVersionBand>6.0.300</DotNetEmscriptenManifestVersionBand>

global.json

@@ -7,7 +7,7 @@
     "Microsoft.Build.NoTargets": "3.3.0"
   },
   "sdk": {
-    "version": "6.0.400",
+    "version": "6.0.300",
     "allowPrerelease": true,
     "rollForward": "latestMinor"
   }

src/BlazorWebView/src/Maui/Gtk/BlazorWebViewHandler.cs

@@ -16,7 +16,7 @@ public partial class BlazorWebViewHandler : ViewHandler<IBlazorWebView, Gtk.Widg
 		public virtual IFileProvider CreateFileProvider(string contentRootDir) => throw new NotSupportedException();
 
 		private void StartWebViewCoreIfPossible() { }
-		
+
 #pragma warning disable CS0649
 		private WebViewManager? _webviewManager;
 #pragma warning restore CS0649

src/Controls/samples/Controls.Sample.Gtk/SimpleSampleApp/ExamplePage.cs

@@ -150,7 +150,10 @@ void SetupMauiLayoutButtonSpacing()
 
 			var button2 = new Button
 			{
-				Padding = new Thickness(10), Text = "Change the button!", BackgroundColor = Colors.Green, TextColor = Colors.Yellow,
+				Padding = new Thickness(10),
+				Text = "Change the button!",
+				BackgroundColor = Colors.Green,
+				TextColor = Colors.Yellow,
 			};
 
 			button2.Clicked += (sender, args) =>
@@ -247,7 +250,10 @@ void SetupMauiLayout()
 
 			var labelG = new Label
 			{
-				Text = "this has gradient", Background = new RadialGradientBrush(new GradientStopCollection { new(Colors.Aqua, 0), new(Colors.Green, 10), }), Padding = new Thickness(30), Margin = new Thickness(10),
+				Text = "this has gradient",
+				Background = new RadialGradientBrush(new GradientStopCollection { new(Colors.Aqua, 0), new(Colors.Green, 10), }),
+				Padding = new Thickness(30),
+				Margin = new Thickness(10),
 			};
 
 			verticalStack.Add(labelG);
@@ -269,7 +275,10 @@ void SetupMauiLayout()
 
 			var button2 = new Button()
 			{
-				TextColor = Colors.Green, Text = "Hello I'm a button", BackgroundColor = Colors.Purple, Margin = new Thickness(12),
+				TextColor = Colors.Green,
+				Text = "Hello I'm a button",
+				BackgroundColor = Colors.Purple,
+				Margin = new Thickness(12),
 			};
 
 			horizontalStack.Add(button);

src/Controls/samples/Controls.Sample.Gtk/SimpleSampleApp/SimpleSampleGtkApplication.cs

@@ -25,7 +25,6 @@ Widget OnTopContainerOverride(Widget nativePage)
 		{
 			var b = new Box(Orientation.Vertical, 0)
 			{
-				Fill = true,
 				Expand = true,
 				Margin = 5,
 

src/Controls/src/Core/Compatibility/Gtk/FontNamedSizeService.cs

@@ -0,0 +1,42 @@
+using System;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
+
+#pragma warning disable CS0612 // Type or member is obsolete
+[assembly: Microsoft.Maui.Controls.Dependency(typeof(Microsoft.Maui.Controls.Compatibility.Platform.Gtk.FontNamedSizeService))]
+// Type or member is obsolete
+
+namespace Microsoft.Maui.Controls.Compatibility.Platform.Gtk
+{
+	public class FontNamedSizeService : IFontNamedSizeService
+	{
+		public double GetNamedSize(NamedSize size, Type targetElementType, bool useOldSizes)
+		{
+			switch (size)
+			{
+				case NamedSize.Default:
+					return 11;
+				case NamedSize.Micro:
+				case NamedSize.Caption:
+					return 12;
+				case NamedSize.Medium:
+					return 17;
+				case NamedSize.Large:
+					return 22;
+				case NamedSize.Small:
+				case NamedSize.Body:
+					return 14;
+				case NamedSize.Header:
+					return 46;
+				case NamedSize.Subtitle:
+					return 20;
+				case NamedSize.Title:
+					return 24;
+				default:
+					throw new ArgumentOutOfRangeException(nameof(size));
+			}
+		}
+	}
+}
+
+#pragma warning restore CS0612

src/Controls/src/Core/Handlers/Shapes/Path/PathHandler.Gtk.cs

@@ -5,8 +5,15 @@ namespace Microsoft.Maui.Controls.Handlers
 {
 	public partial class PathHandler
 	{
-		public static void MapShape(IShapeViewHandler handler, Path path) { }
-		public static void MapData(IShapeViewHandler handler, Path path) { }
+		public static void MapShape(IShapeViewHandler handler, Path path)
+		{
+			handler.PlatformView?.UpdateShape(path);
+		}
+
+		public static void MapData(IShapeViewHandler handler, Path path)
+		{
+			handler.PlatformView?.UpdateShape(path);
+		}
 		public static void MapRenderTransform(IShapeViewHandler handler, Path path) { }
 	}
 }

src/Controls/src/Core/NavigationPage.cs

@@ -53,7 +53,7 @@ public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, I
 
 		partial void Init();
 
-#if WINDOWS || ANDROID || TIZEN
+#if WINDOWS || ANDROID || TIZEN || GTK
 		const bool UseMauiHandler = true;
 #else
 		const bool UseMauiHandler = false;