Merge PR dotnet#28 from webwarrior-ws/fix-linux-maui-94-mali

knocte · web-flow · commit c1564edff3b8 · 2024-11-25T20:54:03.000+08:00
Build nuget packages in CI and push to nuget.
diff --git a/.github/workflows/build-gtk.yml b/.github/workflows/build-gtk.yml
@@ -0,0 +1,47 @@
+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.117-develop
+      GtkSharpManifestVersion: 8.0.200
+      DotnetVersion: 8.0.200
+      PROJECTS_TO_PACK: |
+        src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.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/Controls/Foldable/src/Controls.Foldable.csproj
+        src/Graphics/src/Graphics/Graphics.csproj
+    steps:
+      - name: Checkout MAUI repo
+        uses: actions/checkout@v2
+      - name: Setup .NET SDK ${{ env.DotnetVersion }}
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: ${{ env.DotnetVersion }}
+      - name: Install gtk workload
+        run: ./install_gtk_workload.sh
+      - name: Generate pre-release version suffix
+        run: dotnet fsi nugetPreRelease.fsx "" > PreReleaseVersionSuffix.txt
+      - name: Build MAUI
+        run: |
+            mv Directory.Build.Override.props.in Directory.Build.Override.props
+            dotnet build Microsoft.Maui.BuildTasks.slnf
+            echo "$PROJECTS_TO_PACK" | while read -r project; do
+              [ -z "$project" ] && continue  # Skip if empty
+              dotnet build -c Release "$project"
+            done
+      - name: Pack MAUI
+        run: ./pack_mali.sh
+      - name: Upload binaries to nuget (if tag or main branch, and nugetKey is present)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NUGET_KEY: ${{ secrets.NUGET_KEY }}
+        if: ${{ env.NUGET_KEY != ''  && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) }}
+        run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
diff --git a/Directory.Build.Override.props.in b/Directory.Build.Override.props.in
@@ -6,14 +6,15 @@
     -->
     <_IncludeWindows></_IncludeWindows>
     <_IncludeTizen></_IncludeTizen>
+    <_IncludeGtk>true</_IncludeGtk>
     <_IncludeAndroid></_IncludeAndroid>
     <_IncludeIos></_IncludeIos>
     <_IncludeMacCatalyst></_IncludeMacCatalyst>
     <_IncludeMacOS></_IncludeMacOS>
   </PropertyGroup>
 
   <PropertyGroup>
-    <_SpecificPlatformRequested Condition="'$(_IncludeAndroid)' == 'true' OR '$(_IncludeWindows)' == 'true' OR '$(_IncludeTizen)' == 'true' OR '$(_IncludeIos)' == 'true' OR '$(_IncludeMacCatalyst)' == 'true' OR '$(_IncludeMacOS)' == 'true'">true</_SpecificPlatformRequested>
+    <_SpecificPlatformRequested Condition="'$(_IncludeAndroid)' == 'true' OR '$(_IncludeWindows)' == 'true' OR '$(_IncludeTizen)' == 'true' OR '$(_IncludeGtk)' == true OR '$(_IncludeIos)' == 'true' OR '$(_IncludeMacCatalyst)' == 'true' OR '$(_IncludeMacOS)' == 'true'">true</_SpecificPlatformRequested>
     <IncludeAndroidTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeAndroid)' != 'true'">false</IncludeAndroidTargetFrameworks>
     <IncludeWindowsTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeWindows)' != 'true'">false</IncludeWindowsTargetFrameworks>
     <IncludeTizenTargetFrameworks Condition="'$(_SpecificPlatformRequested)' == 'true' AND '$(_IncludeTizen)' != 'true'">false</IncludeTizenTargetFrameworks>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -129,6 +129,8 @@
     <_MauiBuildTasksLocation Condition="'$(_MauiBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).buildtasks\</_MauiBuildTasksLocation>
     <_MauiAOTProfileLocation>$(MauiSrcDirectory)Controls\src\Build.Tasks\nuget\buildTransitive\netstandard2.0\</_MauiAOTProfileLocation>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+    <WarningsNotAsErrors>NU1605</WarningsNotAsErrors>
     <DebugType>portable</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -44,7 +44,7 @@
     <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
     <SystemMemoryPackageVersion>4.5.5</SystemMemoryPackageVersion>
     <SystemBuffersPackageVersion>4.5.1</SystemBuffersPackageVersion>
-    <SystemTextJsonPackageVersion>7.0.2</SystemTextJsonPackageVersion>
+    <SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
     <SystemTextEncodingsWebPackageVersion>7.0.0</SystemTextEncodingsWebPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>7.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <SystemIOUnmanagedMemoryStreamPackageVersion>4.3.0</SystemIOUnmanagedMemoryStreamPackageVersion>
@@ -64,7 +64,7 @@
        - Feed URI in the nuget.config
        - Native assets build and sha
     -->
-    <_SkiaSharpVersion>2.88.2</_SkiaSharpVersion>
+    <_SkiaSharpVersion>2.88.6</_SkiaSharpVersion>
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
diff --git a/eng/Versions.targets b/eng/Versions.targets
@@ -64,13 +64,13 @@
 
       <VersionMetadata Include="sha.$(GitCommit)"/>
 
-      <VersionMetadata Condition="$(CI)"
+      <VersionMetadata Condition="$(CI) and '$(BUILD_BUILDID)' != ''"
                        Include="azdo.$(BUILD_BUILDID)"/>
     </ItemGroup>
-
+    
     <PropertyGroup>
       <VersionMetadataLabel>@(VersionMetadata -> '%(Identity)', '-')</VersionMetadataLabel>
-      <VersionMetadataPlusLabel Condition="'$(VersionMetadataLabel)' != ''">+$(VersionMetadataLabel)</VersionMetadataPlusLabel>
+      <VersionMetadataPlusLabel Condition="'$(VersionMetadataLabel)' != ''">0+$(VersionMetadataLabel)</VersionMetadataPlusLabel>
       <Version>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)</Version>
       <PackageReferenceVersion>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(GitSemVerDashLabel)</PackageReferenceVersion>
       <PackageReferenceVersion Condition="$(CI) and '$(GitSemVerDashLabel)' != ''">$(GitSemVerMajor).$(GitSemVerMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel).$(BUILDVERSION)</PackageReferenceVersion>
@@ -79,6 +79,11 @@
       <VSComponentVersion Condition="$(CI) and '$(GitSemVerDashLabel)' != ''">$(GitSemVerMajor).$(GitSemVerMinor).$(GitBaseVersionPatch).$(BUILDVERSION)</VSComponentVersion>
       <VSComponentVersion Condition="$(CI) and '$(GitSemVerDashLabel)' == ''">$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch).0</VSComponentVersion>
       <PackageVersion>$(PackageReferenceVersion)$(VersionMetadataPlusLabel)</PackageVersion>
+      <!-- Generate stable release package for tags -->
+      <PackageVersion Condition=" '$(GitTag)' != '' ">$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)</PackageVersion>
+      <!-- Pre-release version for other cases -->
+      <PreReleaseVersionSuffix>$([System.IO.File]::ReadAllText($(MSBuildThisFileDirectory)../PreReleaseVersionSuffix.txt))</PreReleaseVersionSuffix>
+      <PackageVersion Condition="$(CI) and '$(GitTag)' == '' ">$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(PreReleaseVersionSuffix)</PackageVersion>
     </PropertyGroup>
 
     <PropertyGroup>
diff --git a/install_gtk_workload.sh b/install_gtk_workload.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+# 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
+dotnet nuget add source --name nuget.org "https://api.nuget.org/v3/index.json"
+wget https://www.nuget.org/api/v2/package/gtksharp.net.sdk.gtk.manifest-$GtkSharpManifestVersion/$GtkSharpVersion -O gtksharp.net.sdk.gtk.manifest-$GtkSharpManifestVersion.nupkg            
+DOTNET_DIR=/home/runner/.dotnet
+WORKLOAD_MANIFEST_DIR=$DOTNET_DIR/sdk-manifests/$DotnetVersion/gtksharp.net.sdk.gtk
+mkdir -p $WORKLOAD_MANIFEST_DIR
+unzip -j gtksharp.net.sdk.gtk.manifest-$GtkSharpManifestVersion.nupkg "data/*" -d $WORKLOAD_MANIFEST_DIR/
+rm gtksharp.net.sdk.gtk.manifest-$GtkSharpManifestVersion.nupkg
+chmod 764 $WORKLOAD_MANIFEST_DIR/*
+dotnet workload search
+dotnet workload install gtk --skip-manifest-update
diff --git a/nugetPreRelease.fsx b/nugetPreRelease.fsx
@@ -0,0 +1,6 @@
+#r "nuget: Fsdk, Version=0.6.0--date20231213-0703.git-d7a5962"
+
+let args = fsi.CommandLineArgs
+
+Fsdk.Network.GetNugetPrereleaseVersionFromBaseVersion args.[1]
+|> System.Console.WriteLine
diff --git a/pack_mali.sh b/pack_mali.sh
@@ -0,0 +1,11 @@
+#!/bin/env bash
+
+# Use PROJECTS_TO_PACK env. var for newline-separated list of projects.
+
+set -euxo pipefail
+
+
+echo "$PROJECTS_TO_PACK" | while read -r project; do
+    [ -z "$project" ] && continue  # Skip if empty
+    dotnet pack "$project" --no-build --no-restore
+done
diff --git a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
+    <PackageId>Mali.AspNetCore.Components.WebView</PackageId>
     <Nullable>enable</Nullable>
     <Description>Build .NET MAUI applications with Blazor web UI in the BlazorWebView control.</Description>
     <DefineConstants>$(DefineConstants);WEBVIEW2_MAUI</DefineConstants>
diff --git a/src/BlazorWebView/src/Maui/build/Mali.AspNetCore.Components.WebView.props b/src/BlazorWebView/src/Maui/build/Mali.AspNetCore.Components.WebView.props
diff --git a/src/BlazorWebView/src/Maui/build/Mali.AspNetCore.Components.WebView.targets b/src/BlazorWebView/src/Maui/build/Mali.AspNetCore.Components.WebView.targets
diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
     <RootNamespace>Microsoft.Maui.Controls.Compatibility</RootNamespace>
     <AssemblyName>Microsoft.Maui.Controls.Compatibility</AssemblyName>
+    <PackageId>Mali.Controls.Compatibility</PackageId>
     <Nullable>disable</Nullable>
     <AndroidRoot>Android\</AndroidRoot>
     <iOSRoot>iOS\</iOSRoot>
diff --git a/src/Controls/Foldable/src/Controls.Foldable.csproj b/src/Controls/Foldable/src/Controls.Foldable.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
     <AssemblyName>Microsoft.Maui.Controls.Foldable</AssemblyName>
     <RootNamespace>Microsoft.Maui.Controls.Foldable</RootNamespace>
+    <PackageId>Mali.Controls.Foldable</PackageId>
     <WarningsNotAsErrors>BI1234</WarningsNotAsErrors>
     <IsTrimmable>false</IsTrimmable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Controls/src/Core/Controls.Core.csproj b/src/Controls/src/Core/Controls.Core.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
     <RootNamespace>Microsoft.Maui.Controls</RootNamespace>
     <AssemblyName>Microsoft.Maui.Controls</AssemblyName>
-    <PackageId>Microsoft.Maui.Controls.Core</PackageId>
+    <PackageId>Mali.Controls.Core</PackageId>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
     <IsTrimmable>false</IsTrimmable>
diff --git a/src/Controls/src/Xaml/Controls.Xaml.csproj b/src/Controls/src/Xaml/Controls.Xaml.csproj
@@ -4,11 +4,11 @@
 		<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
 		<AssemblyName>Microsoft.Maui.Controls.Xaml</AssemblyName>
 		<RootNamespace>Microsoft.Maui.Controls.Xaml</RootNamespace>
+        <PackageId>Mali.Controls.Xaml</PackageId>
 		<IsPackable>true</IsPackable>
 		<IsTrimmable>false</IsTrimmable>
 		<_MauiDesignDllBuild Condition=" '$(OS)' != 'Unix' ">True</_MauiDesignDllBuild>
 		<NoWarn>$(NoWarn);CA2200;CS1591;RS0041</NoWarn>
-		<PackageId>Microsoft.Maui.Controls.Xaml</PackageId>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 
diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
     <RootNamespace>Microsoft.Maui</RootNamespace>
     <AssemblyName>Microsoft.Maui</AssemblyName>
-    <PackageId>Microsoft.Maui.Core</PackageId>
+    <PackageId>Mali.Core</PackageId>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
     <IsTrimmable>false</IsTrimmable>
diff --git a/src/Core/src/nuget/buildTransitive/Mali.Core.After.targets b/src/Core/src/nuget/buildTransitive/Mali.Core.After.targets
diff --git a/src/Core/src/nuget/buildTransitive/Mali.Core.Before.targets b/src/Core/src/nuget/buildTransitive/Mali.Core.Before.targets
diff --git a/src/Core/src/nuget/buildTransitive/Mali.Core.props b/src/Core/src/nuget/buildTransitive/Mali.Core.props
diff --git a/src/Core/src/nuget/buildTransitive/Mali.Core.targets b/src/Core/src/nuget/buildTransitive/Mali.Core.targets
@@ -4,10 +4,10 @@
     <UsingMicrosoftMauiCoreSdk>true</UsingMicrosoftMauiCoreSdk>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Maui.Core.Before.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)Mali.Core.Before.targets" />
 
   <PropertyGroup>
-    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.Maui.Core.After.targets</AfterMicrosoftNETSdkTargets>
+    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Mali.Core.After.targets</AfterMicrosoftNETSdkTargets>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Mali.Core.props b/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Mali.Core.props
@@ -7,6 +7,6 @@
     <WinUISDKReferences Condition=" '$(WinUISDKReferences)' == '' and '$(EnableMsixTooling)' == 'true' ">false</WinUISDKReferences>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.Maui.Core.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\Mali.Core.props" />
 
 </Project>
diff --git a/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Mali.Core.targets b/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Mali.Core.targets
@@ -0,0 +1,5 @@
+<Project>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\Mali.Core.targets" />
+
+</Project>
diff --git a/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.targets b/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.targets
diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
     <AssemblyName>Microsoft.Maui.Essentials</AssemblyName>
     <RootNamespace>Microsoft.Maui.Essentials</RootNamespace>
+    <PackageId>Mali.Essentials</PackageId>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <WarningsNotAsErrors>BI1234</WarningsNotAsErrors>
     <IsPackable>true</IsPackable>
diff --git a/src/Graphics/src/Graphics/Graphics.csproj b/src/Graphics/src/Graphics/Graphics.csproj
@@ -9,7 +9,7 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <AssemblyName>Microsoft.Maui.Graphics</AssemblyName>
     <RootNamespace>Microsoft.Maui.Graphics</RootNamespace>
-    <PackageId>Microsoft.Maui.Graphics</PackageId>
+    <PackageId>Mali.Graphics</PackageId>
     <Product>Microsoft.Maui.Graphics</Product>
     <IsTrimmable>false</IsTrimmable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
