Merge pull request #350 from michael-hawker/llama/winui-package-fix

Use slngen and remove UWP target from WinUI packages

Author: Arlodotexe

.config/dotnet-tools.json

@@ -13,6 +13,12 @@
       "commands": [
         "xstyler"
       ]
+    },
+    "microsoft.visualstudio.slngen.tool": {
+      "version": "9.5.1",
+      "commands": [
+        "slngen"
+      ]
     }
   }
 }

.github/workflows/build.yml

@@ -51,6 +51,11 @@ jobs:
       matrix:
         platform: [WinUI2, WinUI3]
 
+    env:
+      # faux-ternary expression to select which platforms to build for each platform vs. duplicating step below.
+      TARGET_PLATFORMS: ${{ matrix.platform != 'WinUI3' && 'all' || 'all-uwp' }}
+      TEST_PLATFORM: ${{ matrix.platform != 'WinUI3' && 'UWP' || 'WinAppSdk' }}
+
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Install .NET 6 SDK
@@ -72,12 +77,13 @@ jobs:
       - name: Add msbuild to PATH
         uses: microsoft/[email protected]
 
-      - name: Enable all TargetFrameworks
+      - name: Enable ${{ env.TARGET_PLATFORMS }} TargetFrameworks
         working-directory: ./common/Scripts/
-        run: powershell -version 5.1 -command "./UseTargetFrameworks.ps1 all" -ErrorAction Stop
+        run: powershell -version 5.1 -command "./UseTargetFrameworks.ps1 ${{ env.TARGET_PLATFORMS }}" -ErrorAction Stop
 
-      - name: Generate solution
-        run: powershell -version 5.1 -command "./GenerateAllSolution.ps1" -ErrorAction Stop
+      - name: Generate solution w/ ${{ env.TEST_PLATFORM }} Tests
+        working-directory: ./
+        run: powershell -version 5.1 -command "./common/GenerateAllSolution.ps1 -IncludeHeads ${{ env.TEST_PLATFORM }}" -ErrorAction Stop
 
       - name: Enable Uno.WinUI (in WinUI3 matrix only)
         working-directory: ./common/Scripts/
@@ -94,11 +100,11 @@ jobs:
 
       # Push Packages to our DevOps Artifacts Feed
       - name: Add source
-        if: ${{github.ref == 'refs/heads/main'}}
+        if: ${{ github.ref == 'refs/heads/main' }}
         run: dotnet nuget add source "https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" --name LabsFeed --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }}
 
       - name: Push packages
-        if: ${{github.ref == 'refs/heads/main'}}
+        if: ${{ github.ref == 'refs/heads/main' }}
         run: dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate
 
       # Run tests
@@ -114,18 +120,21 @@ jobs:
         id: test-generator
         run: vstest.console.exe ./common/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests/bin/Release/net6.0/CommunityToolkit.Labs.Core.SourceGenerators.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx"
 
-      - name: Run experiment tests against UWP
-        id: test-uwp
-        run:  vstest.console.exe ./tests/**/CommunityToolkit.Labs.Tests.UWP.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=UWP.trx"
-
-      - name: Run experiment tests against WinAppSDK
-        id: test-winappsdk
-        run:  vstest.console.exe ./tests/**/CommunityToolkit.Labs.Tests.WinAppSdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=WinAppSdk.trx"
+      - name: Run experiment tests against ${{ env.TEST_PLATFORM }}
+        id: test-platform
+        run:  vstest.console.exe ./tests/**/CommunityToolkit.Labs.Tests.${{ env.TEST_PLATFORM }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PLATFORM }}.trx"
 
       - name: Create test reports
         run: |
           testspace '[${{ matrix.platform }}]./TestResults/*.trx'
-        if: ${{ always() && (steps.test-generator.conclusion == 'success' || steps.test-uwp.conclusion == 'success' || steps.test-winappsdk.conclusion == 'success') }}
+        if: ${{ always() && (steps.test-generator.conclusion == 'success' || steps.test-platform.conclusion == 'success') }}
+
+      #- name: Artifact - Slngen Logs
+      #  uses: actions/upload-artifact@v3
+      #  if: success() || failure()
+      #  with:
+      #    name: slngen-logs
+      #    path: ./**/slngen.*log
 
   # Test job to build a single experiment to ensure our changes work for both our main types of solutions at the moment
   new-experiment:
@@ -199,9 +208,14 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
 
+      # Restore Tools from Manifest list in the Repository
+      - name: Restore dotnet tools
+        run: dotnet tool restore
+
       - name: Generate solution
         shell: pwsh
-        run: ./GenerateAllSolution.ps1
+        working-directory: ./
+        run: ./common/GenerateAllSolution.ps1
 
       - name: Install ninja for WASM native dependencies
         run: sudo apt-get install ninja-build
@@ -213,3 +227,10 @@ jobs:
         run: dotnet build /r /bl /p:UnoSourceGeneratorUseGenerationHost=true /p:UnoSourceGeneratorUseGenerationController=false
 
       # TODO: Do we want to run tests here? Can we do that on linux easily?
+
+      #- name: Artifact - Slngen Logs
+      #  uses: actions/upload-artifact@v3
+      #  if: success() || failure()
+      #  with:
+      #    name: slngen-logs
+      #    path: ./**/slngen.*log

.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "generateAllSolution",
             "type": "shell",
-            "command": "pwsh ./GenerateAllSolution.ps1",
+            "command": "pwsh ./common/GenerateAllSolution.ps1",
             "group": "build"
         }
     ]

Directory.Build.targets

@@ -18,4 +18,11 @@
     <None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" />
   </ItemGroup>-->
 
+  <ItemGroup>
+    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory).editorconfig" />
+    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory)settings.xamlstyler" />
+    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory)*.md" />
+    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory)common\GlobalUsings*.cs" />
+  </ItemGroup>
+
 </Project>

GenerateAllSolution.bat

@@ -0,0 +1,5 @@
+@ECHO OFF
+SET "IncludeHeads=%1"
+IF "%IncludeHeads%"=="" SET "IncludeHeads=all"
+
+powershell .\common\GenerateAllSolution.ps1 -IncludeHeads %IncludeHeads%