Merge branch 'master' into dev/suess/Prism.Avalonia

PrismLibrary · Aug 22, 2024 · 9baea1a · 9baea1a
2 parents 0d3985e + 66b1ab3
commit 9baea1a
Show file tree

Hide file tree

Showing 573 changed files with 634 additions and 31,846 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -13,7 +13,3 @@ global.json @dansiegel
 /src/Wpf/ @brianlagunas
 /tests/Wpf/ @brianlagunas
 /e2e/Wpf/ @brianlagunas
-
-# Xamarin.Forms
-/src/Forms/ @dansiegel
-/tests/Forms/ @dansiegel
diff --git a/.github/workflows/build_core.yml b/.github/workflows/build_core.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   build-prism-core:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Core
       solution-path: PrismLibrary_Core.slnf
diff --git a/.github/workflows/build_forms.yml b/.github/workflows/build_forms.yml
diff --git a/.github/workflows/build_maui.yml b/.github/workflows/build_maui.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   build-prism-maui:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Maui
       solution-path: PrismLibrary_Maui.slnf

diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
@@ -21,12 +21,14 @@ on:
 
 jobs:
   build-prism-uno:
-    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
-      dotnet-version: 8.0.x
-      uno-check: true
+      dotnet-version: 8.0.300
+      install-workload: ios android macos maccatalyst wasm-tools
+      uno-check: false
+      uno-check-version: 1.25.1
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
diff --git a/.github/workflows/build_wpf.yml b/.github/workflows/build_wpf.yml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   build-prism-wpf:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Wpf
       solution-path: PrismLibrary_Wpf.slnf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,23 +2,30 @@ name: Prism CI
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - 'releases/**'
     paths:
       - .github/workflows/ci.yml
       - Directory.Build.props
       - Directory.Build.targets
       - Directory.Packages.props
       - xunit.runner.json
+      - version.json
+      - LICENSE
+      - global.json
       - 'src/**'
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - 'releases/**'
     paths:
       - .github/workflows/ci.yml
   workflow_dispatch:
 
 jobs:
   build-prism-core:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Core
       solution-path: PrismLibrary_Core.slnf
@@ -32,7 +39,7 @@ jobs:
       codeSignCertificate: ${{ secrets.CodeSignCertificate }}
 
   build-prism-wpf:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Wpf
       solution-path: PrismLibrary_Wpf.slnf
@@ -45,28 +52,16 @@ jobs:
       codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
       codeSignCertificate: ${{ secrets.CodeSignCertificate }}
 
-  build-prism-forms:
-    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
-    with:
-      name: Build Prism.Forms
-      solution-path: PrismLibrary_Forms.slnf
-      code-sign: true
-      artifact-name: Forms
-      jdk-version: 13
-    secrets:
-      codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
-      codeSignClientId: ${{ secrets.CodeSignClientId }}
-      codeSignTenantId: ${{ secrets.CodeSignTenantId }}
-      codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
-      codeSignCertificate: ${{ secrets.CodeSignCertificate }}
-
   build-prism-uno:
-    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
-      uno-check: true
+      dotnet-version: 8.0.300
+      install-workload: ios android macos maccatalyst wasm-tools
+      uno-check: false
+      uno-check-version: 1.24.0
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
       code-sign: true
@@ -79,7 +74,7 @@ jobs:
       codeSignCertificate: ${{ secrets.CodeSignCertificate }}
 
   build-prism-maui:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Maui
       solution-path: PrismLibrary_Maui.slnf
@@ -94,7 +89,7 @@ jobs:
       codeSignCertificate: ${{ secrets.CodeSignCertificate }}
 
   generate-consolidated-artifacts:
-    needs: [build-prism-core, build-prism-wpf, build-prism-forms, build-prism-uno, build-prism-maui]
+    needs: [build-prism-core, build-prism-wpf, build-prism-uno, build-prism-maui]
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -112,12 +107,6 @@ jobs:
           name: Wpf
           path: artifacts\Wpf
 
-      - name: Download Forms
-        uses: actions/download-artifact@v3
-        with:
-          name: Forms
-          path: artifacts\Forms
-
       - name: Download Uno
         uses: actions/download-artifact@v3
         with:
@@ -141,7 +130,7 @@ jobs:
           path: .\artifacts\nuget
 
   deploy-internal:
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
     needs: generate-consolidated-artifacts
     if: ${{ github.event_name == 'push' }}
     with:
@@ -151,21 +140,11 @@ jobs:
       apiKey: ${{ secrets.IN_HOUSE_API_KEY }}
 
   deploy-commercial-plus:
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
     needs: generate-consolidated-artifacts
     if: ${{ github.event_name == 'push' }}
     with:
       name: Deploy Commercial Plus
     secrets:
       feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
       apiKey: ${{ secrets.PRISM_NUGET_TOKEN }}
-
-  deploy-sponsors:
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
-    needs: generate-consolidated-artifacts
-    if: ${{ github.event_name == 'push' }}
-    with:
-      name: Deploy Sponsor Connect
-    secrets:
-      feedUrl: ${{ secrets.SPONSOR_CONNECT_NUGET_FEED }}
-      apiKey: ${{ secrets.SPONSOR_CONNECT_TOKEN }}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -6,24 +6,13 @@ on:
 
 jobs:
   publish-internal:
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
     secrets:
       feedUrl: ${{ secrets.IN_HOUSE_NUGET_FEED }}
       apiKey: ${{ secrets.IN_HOUSE_API_KEY }}
 
   publish-commercial-plus:
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
     secrets:
       feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
       apiKey: ${{ secrets.PRISM_NUGET_TOKEN }}
-
-  publish-nuget:
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
-    secrets:
-      apiKey: ${{ secrets.NUGET_API_KEY }}
-
-  publish-sponsors:
-    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@master
-    secrets:
-      feedUrl: ${{ secrets.SPONSOR_CONNECT_NUGET_FEED }}
-      apiKey: ${{ secrets.SPONSOR_CONNECT_TOKEN }}
diff --git a/.github/workflows/start-release.yml b/.github/workflows/start-release.yml
@@ -5,12 +5,13 @@ on:
 
 jobs:
   build-prism-core:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Core
       solution-path: PrismLibrary_Core.slnf
       code-sign: true
       artifact-name: Core
+      build-args: /p:OfficialRelease=true
     secrets:
       codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
       codeSignClientId: ${{ secrets.CodeSignClientId }}
@@ -19,27 +20,13 @@ jobs:
       codeSignCertificate: ${{ secrets.CodeSignCertificate }}
 
   build-prism-wpf:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Wpf
       solution-path: PrismLibrary_Wpf.slnf
       code-sign: true
       artifact-name: Wpf
-    secrets:
-      codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
-      codeSignClientId: ${{ secrets.CodeSignClientId }}
-      codeSignTenantId: ${{ secrets.CodeSignTenantId }}
-      codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
-      codeSignCertificate: ${{ secrets.CodeSignCertificate }}
-
-  build-prism-forms:
-    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
-    with:
-      name: Build Prism.Forms
-      solution-path: PrismLibrary_Forms.slnf
-      code-sign: true
-      artifact-name: Forms
-      jdk-version: 13
+      build-args: /p:OfficialRelease=true
     secrets:
       codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
       codeSignClientId: ${{ secrets.CodeSignClientId }}
@@ -48,16 +35,20 @@ jobs:
       codeSignCertificate: ${{ secrets.CodeSignCertificate }}
 
   build-prism-uno:
-    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
       windows-sdk-version: 18362
-      uno-check: true
+      dotnet-version: 8.0.300
+      install-workload: ios android macos maccatalyst wasm-tools
+      uno-check: false
+      uno-check-version: 1.25.1
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
       run-tests: false
       code-sign: true
       artifact-name: Uno
+      build-args: /p:OfficialRelease=true
     secrets:
       codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
       codeSignClientId: ${{ secrets.CodeSignClientId }}
@@ -66,14 +57,15 @@ jobs:
       codeSignCertificate: ${{ secrets.CodeSignCertificate }}
 
   build-prism-maui:
-    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
     with:
       name: Build Prism.Maui
       solution-path: PrismLibrary_Maui.slnf
       dotnet-version: 8.0.x
       install-workload: maui maui-tizen
       code-sign: true
       artifact-name: Maui
+      build-args: /p:OfficialRelease=true
     secrets:
       codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
       codeSignClientId: ${{ secrets.CodeSignClientId }}
@@ -82,7 +74,7 @@ jobs:
       codeSignCertificate: ${{ secrets.CodeSignCertificate }}
 
   generate-consolidated-artifacts:
-    needs: [build-prism-core, build-prism-wpf, build-prism-forms, build-prism-uno]
+    needs: [build-prism-core, build-prism-wpf, build-prism-uno]
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -100,12 +92,6 @@ jobs:
           name: Wpf
           path: artifacts\Wpf
 
-      - name: Download Forms
-        uses: actions/download-artifact@v3
-        with:
-          name: Forms
-          path: artifacts\Forms
-
       - name: Download Uno
         uses: actions/download-artifact@v3
         with:
@@ -129,7 +115,7 @@ jobs:
           path: .\artifacts\nuget
 
   release:
-    uses: avantipoint/workflow-templates/.github/workflows/generate-release.yml@master
+    uses: avantipoint/workflow-templates/.github/workflows/generate-release.yml@v1
     needs: [generate-consolidated-artifacts]
     permissions:
       contents: write

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -89,7 +89,7 @@
 
   <!-- Versioning -->
   <PropertyGroup>
-    <PackageReleaseNotes>https://github.com/PrismLibrary/Prism/releases/tag/v$(Version)</PackageReleaseNotes>
+    <PackageReleaseNotes Condition="$(OfficialRelease) == 'true'">https://github.com/PrismLibrary/Prism/releases/tag/$(Version)</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">