Merge pull request #99 from webwarrior-ws/fix-linux-maui-94

Build nuget packages in CI and push to nuget.org

Author: jsuarezruiz

.github/workflows/build-gtk.yml

@@ -31,11 +31,21 @@ jobs:
             chmod 764 $WORKLOAD_MANIFEST_DIR/*
             dotnet workload search
             dotnet workload install gtk --skip-manifest-update
+      - name: Generate pre-release version suffix
+        run: dotnet fsi nugetPreRelease.fsx "" > PreReleaseVersionSuffix.txt
       - name: Build MAUI
         run: |
             sed -i 's/_IncludeAndroid>true/_IncludeAndroid>/g' Directory.Build.Override.props
             dotnet build Microsoft.Maui.BuildTasks.slnf
-            dotnet build Microsoft.Maui.Gtk.slnf
+            dotnet build -c Release Microsoft.Maui.Gtk.slnf
+      - name: Pack MAUI
+        run: dotnet pack Microsoft.Maui.Gtk.Packages.slnf
+      - 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        
 
   dotnet-format:
     needs: build_and_test

Microsoft.Maui.Gtk.Packages.slnf

@@ -0,0 +1,21 @@
+{
+  "solution": {
+    "path": "Microsoft.Maui.sln",
+    "projects": [
+      "src\\BlazorWebView\\src\\Gtk\\Microsoft.AspNetCore.Components.WebView.Gtk.csproj",
+      "src\\BlazorWebView\\src\\Maui\\Microsoft.AspNetCore.Components.WebView.Maui.csproj",
+      "src\\Compatibility\\Core\\src\\Compatibility.csproj",
+      "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj",
+      "src\\Controls\\src\\Core\\Controls.Core.csproj",
+      "src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
+      "src\\Core\\src\\Core.csproj",
+      "src\\Essentials\\src\\Essentials.csproj",
+      "src\\Graphics\\src\\Graphics.Gtk\\Graphics.Gtk.csproj",
+      "src\\Graphics\\src\\Graphics.Skia.GtkSharp\\Graphics.Skia.GtkSharp.csproj",
+      "src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
+      "src\\Graphics\\src\\Graphics\\Graphics.csproj",
+      "src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
+      "src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj"
+    ]
+  }
+}

eng/Versions.targets

@@ -48,6 +48,7 @@
   </Target>
   <Target Name="SetVersions" BeforeTargets="$(SetVersionsBefore)" DependsOnTargets="$(SetVersionsDependsOn)" Returns="$(Version)">
     <PropertyGroup>
+      <GitTag Condition="$(GITHUB_REF_TYPE) == 'tag'">$(GITHUB_REF_NAME)</GitTag>
       <SemVerLabel>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), $(RegexTag)))</SemVerLabel>
       <GitDefaultBranch>main</GitDefaultBranch>
       <GitIgnoreBranchVersion>true</GitIgnoreBranchVersion>
@@ -64,13 +65,17 @@
 
       <VersionMetadata Condition="'$(GitCommit)' != ''"  Include="sha.$(GitCommit)"/>
 
-      <VersionMetadata Condition="$(CI)"
+      <VersionMetadata Condition="$(CI) and '$(BUILD_BUILDID)' != ''"
                        Include="azdo.$(BUILD_BUILDID)"/>
     </ItemGroup>
 
+    <Error Text="Git tag ($(GitTag)) != version extracted from GitInfo.txt ($(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch))"
+           Condition="'$(GitTag)' != '' and '$(GitTag)' != '$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)'">
+    </Error>
+    
     <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 +84,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>

nugetPreRelease.fsx

@@ -0,0 +1,6 @@
+#r "nuget: Fsdk, Version=0.6.0"
+
+let args = fsi.CommandLineArgs
+
+Fsdk.Network.GetNugetPrereleaseVersionFromBaseVersion args.[1]
+|> System.Console.WriteLine

src/BlazorWebView/samples/BlazorGtkApp/BlazorGtkApp.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <Import Project="..\..\src\Gtk\build\Microsoft.AspNetCore.Components.WebView.Gtk.props"/>
+  <Import Project="..\..\src\Gtk\build\GtkSharp.Maui.AspNetCore.Components.WebView.Gtk.props"/>
 
   <PropertyGroup>
     <TargetFrameworks>$(_MauiDotNetTfm)-gtk</TargetFrameworks>
@@ -14,7 +14,7 @@
     <ProjectReference Include="..\WebViewAppShared\WebViewAppShared.csproj"/>
   </ItemGroup>
 
-  <Import Project="..\..\src\Gtk\build\Microsoft.AspNetCore.Components.WebView.Gtk.targets"/>
+  <Import Project="..\..\src\Gtk\build\GtkSharp.Maui.AspNetCore.Components.WebView.Gtk.targets"/>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console"/>

src/BlazorWebView/src/Gtk/Microsoft.AspNetCore.Components.WebView.Gtk.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>$(_MauiDotNetTfm)-gtk</TargetFrameworks>
     <SupportedOSPlatformVersion>3.24</SupportedOSPlatformVersion>
     <Description>Build Gtk applications with Blazor and WebKit</Description>
+    <PackageId>GtkSharp.Maui.AspNetCore.Components.WebView.Gtk</PackageId>
     <DefineConstants>$(DefineConstants);WEBKIT_GTK</DefineConstants>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/BlazorWebView/src/Gtk/build/Microsoft.AspNetCore.Components.WebView.Gtk.props renamed to src/BlazorWebView/src/Gtk/build/GtkSharp.Maui.AspNetCore.Components.WebView.Gtk.props

@@ -10,10 +10,10 @@
   <PropertyGroup>
     <!-- NuGet package information -->
     <IsPackable>true</IsPackable>
-    <PackageId>Microsoft.AspNetCore.Components.WebView.Maui</PackageId>
+    <PackageId>GtkSharp.Maui.AspNetCore.Components.WebView</PackageId>
     <PackageTags>$(DefaultPackageTags);blazor;webview;aspnet</PackageTags>
     <PackageIconFile>$(MauiRootDirectory)Assets\aspnet-icon.png</PackageIconFile>
-    <Description>Build .NET Multi-platform App UI (.NET MAUI) apps with Blazor web UI in the BlazorWebView control.</Description>
+    <Description>(MauiLinux is a fork of MAUI) Build .NET Multi-platform App UI (.NET MAUI) apps with Blazor web UI in the BlazorWebView control.</Description>
   </PropertyGroup>
 
   <Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
@@ -40,7 +40,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'gtk' ">
-    <Compile Include="..\Gtk.SharedSource\**\*.cs" Link="Gtk\SharedSource\%(Filename)%(Extension)"/>
+    <Compile Include="..\Gtk.SharedSource\**\*.cs" Link="Gtk\SharedSource\%(Filename)%(Extension)" />
   </ItemGroup>