Adjust scripts and workflows

Author: MartinZikmund

.github/workflows/build.yml

@@ -111,21 +111,26 @@ jobs:
         with:
           global-json-file: tooling/global.json
 
+      - name: Install .NET workloads
+        run: dotnet workload install wasm-tools
+
       - name: .NET Info (if diagnostics)
         if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
         run: dotnet --info
 
       - name: Copy props files to root
         shell: pwsh
         working-directory: ./
-        run: copy ./tooling/.github/workflows/config/* ./
+        run: |
+          copy ./tooling/.github/workflows/config/* ./
+          copy ./tooling/global.json ./
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2
 
       - name: Add project heads to ProjectTemplate
         working-directory: ./${{ env.PROJECT_DIRECTORY }}
-        run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}
+        run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -IncludeUnoSdkHead -componentPath ${{ github.workspace }}/${{ env.PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}
 
       # Build and use template for creating new experiments
       - name: Build ProjectTemplate
@@ -177,6 +182,10 @@ jobs:
         with:
           global-json-file: tooling/global.json
 
+      - name: Install .NET workloads
+        if: ${{ matrix.multitarget == 'wasm' }}
+        run: dotnet workload install wasm-tools
+
       - name: .NET Info (if diagnostics)
         if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
         run: dotnet --info
@@ -186,6 +195,7 @@ jobs:
         working-directory: ./
         run: |
           copy ./tooling/.github/workflows/config/* ./
+          copy ./tooling/global.json ./
           mkdir ./.config
           copy ./tooling/.config/dotnet-tools.json ./.config/dotnet-tools.json
           mkdir ./components
@@ -209,12 +219,29 @@ jobs:
 
       - name: Add project heads to ${{ env.TEST_PROJECT_NAME }}
         working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
-        run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -MultiTargets ${{ matrix.multitarget }} -winui ${{ matrix.winui }} -componentPath "${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}"
+        run: >-
+          ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1
+          -MultiTargets ${{ matrix.multitarget }}
+          -winui ${{ matrix.winui }}
+          -componentPath "${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}"
+          ${{ matrix.multitarget == 'wasm' && matrix.winui == 3 && ' -IncludeUnoSdkHead' || '' }}
+          ${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}
 
       - name: MSBuild
+        if: ${{ matrix.multitarget != 'wasm' || matrix.winui == 2 }}
         working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
         run: msbuild.exe ${{ env.TEST_PROJECT_NAME }}.sln /restore /nowarn:MSB4011 -p:Configuration=Release
 
+      - name: Build Uno head (browserwasm)
+        if: ${{ matrix.multitarget == 'wasm' && matrix.winui == 3 }}
+        working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
+        run: dotnet build heads/Uno/${{ env.TEST_PROJECT_NAME }}.Uno.csproj -f net9.0-browserwasm -p:Configuration=Release
+
+      - name: Build Uno head (desktop)
+        if: ${{ matrix.multitarget == 'wasm' && matrix.winui == 3 }}
+        working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
+        run: dotnet build heads/Uno/${{ env.TEST_PROJECT_NAME }}.Uno.csproj -f net9.0-desktop -p:Configuration=Release
+
       # Run tests
       - name: Setup VSTest Path
         uses: darenm/setup-vstest@3a16d909a1f3bbc65b52f8270d475d905e7d3e44
@@ -241,10 +268,11 @@ jobs:
           name: new-experiment-logs
           path: ./**/*.*log
 
-  wasm-linux:
-    runs-on: ubuntu-latest
+  uno-linux:
+    runs-on: windows-2022
     env:
       HEADS_DIRECTORY: tooling/ProjectHeads
+      PROJECT_DIRECTORY: tooling/ProjectTemplate
       TEST_PROJECT_NAME: CiTestExp
 
     steps:
@@ -259,6 +287,9 @@ jobs:
         with:
           global-json-file: tooling/global.json
 
+      - name: Install .NET workloads
+        run: dotnet workload install android ios maui wasm-tools
+
       - name: .NET Info (if diagnostics)
         if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
         run: dotnet --info
@@ -268,10 +299,14 @@ jobs:
         working-directory: ./
         run: |
           copy ./tooling/.github/workflows/config/* ./
+          copy ./tooling/global.json ./
           mkdir ./.config
           copy ./tooling/.config/dotnet-tools.json ./.config/dotnet-tools.json
           mkdir ./components
 
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+
       # Restore Tools from Manifest list in the Repository
       - name: Restore dotnet tools
         working-directory: ./
@@ -289,20 +324,36 @@ jobs:
       - name: Generate solution
         shell: pwsh
         working-directory: ./
-        run: ./tooling/GenerateAllSolution.ps1${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} -MultiTargets wasm
+        run: ./tooling/GenerateAllSolution.ps1 -IncludeUnoSdkHead${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }} -MultiTargets wasm
 
       - name: dotnet build
         shell: pwsh
         working-directory: ./
         run: ./tooling/Build-Toolkit-Components.ps1 -Release -MultiTargets wasm ${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -BinlogOutput ./ -EnableBinLogs' || '' }}
-  
-      # TODO: Do we want to run tests here? Can we do that on linux easily?
+
+      - name: Build Uno head (browserwasm)
+        shell: pwsh
+        working-directory: ./
+        run: >-
+          dotnet build
+          tooling/ProjectHeads/AllComponents/Uno/CommunityToolkit.App.Uno.csproj
+          -f net9.0-browserwasm
+          -p:Configuration=Release
+
+      - name: Build Uno head (desktop)
+        shell: pwsh
+        working-directory: ./
+        run: >-
+          dotnet build
+          tooling/ProjectHeads/AllComponents/Uno/CommunityToolkit.App.Uno.csproj
+          -f net9.0-desktop
+          -p:Configuration=Release
 
       - name: Artifact - Diagnostic Logs
         uses: actions/upload-artifact@v4
         if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
         with:
-          name: linux-logs
+          name: uno-linux-logs
           path: ./**/*.*log
 
 

GenerateAllSolution.ps1

@@ -54,8 +54,10 @@ Param (
     [string[]]$ExcludeComponents,
 
     [switch]$UseDiagnostics = $false,
-    
-    [bool]$Launch = $true
+
+    [bool]$Launch = $true,
+
+    [switch]$IncludeUnoSdkHead = $false
 )
 
 if ($MultiTargets.Contains('all')) {
@@ -155,6 +157,11 @@ foreach ($componentName in $Components) {
 # Once we have that, just do a transform on the csproj filename inside this loop to decide the same csproj for those separate MultiTargets.
 # ===
 foreach ($multitarget in $allUsedMultiTargetPrefs) {
+    # When using Uno.Sdk head, skip the traditional Wasm head (Uno SDK covers wasm for WinUI 3)
+    if ($multitarget -eq 'wasm' -and $IncludeUnoSdkHead) {
+        continue
+    }
+
     # capitalize first letter, avoid case sensitivity issues on linux
     $csprojFileNamePartForMultiTarget = $multitarget.substring(0,1).ToUpper() + $multitarget.Substring(1).ToLower()
 
@@ -168,6 +175,15 @@ foreach ($multitarget in $allUsedMultiTargetPrefs) {
     }
 }
 
+if ($IncludeUnoSdkHead) {
+    $unoHeadPath = "./tooling/ProjectHeads/AllComponents/Uno/CommunityToolkit.App.Uno.csproj"
+    if (Test-Path $unoHeadPath) {
+        [void]$projects.Add($unoHeadPath)
+    } else {
+        Write-Warning "Uno.Sdk head project not found at $unoHeadPath."
+    }
+}
+
 if ($UseDiagnostics.IsPresent)
 {
     $sdkoptions = "-d"

GenerateSingleSolution.ps1

@@ -49,7 +49,9 @@ Param (
     [string]$componentPath,
 
     [Parameter(HelpMessage = "Add extra diagnostic output to slngen generator.")]
-    [switch]$UseDiagnostics = $false
+    [switch]$UseDiagnostics = $false,
+
+    [switch]$IncludeUnoSdkHead = $false
 )
 
 if ($null -ne $Env:Path -and $Env:Path.ToLower().Contains("msbuild") -eq $false) {
@@ -185,6 +187,11 @@ Write-Output "Generating solution for $componentName in $generatedSolutionFilePa
 # TODO: this handles separate project heads, but won't directly handle the unified Skia head from Uno.
 # Once we have that, just do a transform on the csproj filename inside this loop to decide the same csproj for those separate MultiTargets.
 foreach ($multitarget in $MultiTargets) {
+    # When using Uno.Sdk head, skip the traditional Wasm head (Uno SDK covers wasm for WinUI 3)
+    if ($multitarget -eq 'wasm' -and $IncludeUnoSdkHead) {
+        continue
+    }
+
     # capitalize first letter, avoid case sensitivity issues on linux
     $csprojFileNamePartForMultiTarget = $multitarget.substring(0,1).ToUpper() + $multitarget.Substring(1).ToLower()
 
@@ -202,6 +209,17 @@ foreach ($multitarget in $MultiTargets) {
     }
 }
 
+if ($IncludeUnoSdkHead) {
+    $unoHeadPath = "$outputHeadsDir\Uno\*Uno.csproj"
+    if (Test-Path $unoHeadPath) {
+        foreach ($foundItem in Get-ChildItem $unoHeadPath) {
+            $projects = $projects + $foundItem.FullName
+        }
+    } else {
+        Write-Warning "Uno.Sdk head project not found at $unoHeadPath."
+    }
+}
+
 # Include common dependencies required for solution to build
 $projects = $projects + "$PSScriptRoot\CommunityToolkit.App.Shared\**\*.*proj"
 $projects = $projects + "$PSScriptRoot\CommunityToolkit.Tests.Shared\**\*.*proj"

GenerateVSCodeLaunchConfig.ps1

@@ -9,7 +9,7 @@ function CreateVsCodeLaunchConfigJson {
   )
 
   return "{
-    `"name`": `"$projectName`",
+    `"name`": `"$projectName (Wasm)`",
     `"type`": `"coreclr`",
     `"request`": `"launch`",
     `"program`": `"dotnet`",
@@ -29,6 +29,32 @@ function CreateVsCodeLaunchConfigJson {
   }";
 }
 
+function CreateUnoVsCodeLaunchConfigJson {
+  param (
+    [string]$projectName
+  )
+
+  return "{
+    `"name`": `"$projectName (Uno)`",
+    `"type`": `"coreclr`",
+    `"request`": `"launch`",
+    `"program`": `"dotnet`",
+    `"args`": [
+      `"run`",
+      `"build`",
+      `"/r`",
+      `"/p:UnoSourceGeneratorUseGenerationHost=true`",
+      `"/p:UnoSourceGeneratorUseGenerationController=false`",
+      `"/p:UnoRemoteControlPort=443`",
+      `"--project=`$`{workspaceFolder`}/components/$projectName/heads/Uno/$projectName.Uno.csproj`"
+    ],
+    `"presentation`": {
+      `"group`": `"2`"
+    },
+    `"cwd`": `"`$`{workspaceFolder`}/components/$projectName/heads/Uno`"
+  }";
+}
+
 $launchConfigJson = Get-Content -Path "$PSScriptRoot/../.vscode/launch.json" -ErrorAction Stop;
 $launchConfig = $launchConfigJson | ConvertFrom-Json;
 
@@ -46,8 +72,11 @@ foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/
 
   $configJson = CreateVsCodeLaunchConfigJson $projectName;
   $config = $configJson | ConvertFrom-Json;
-
   $launchConfig.configurations += $config;
+
+  $unoConfigJson = CreateUnoVsCodeLaunchConfigJson $projectName;
+  $unoConfig = $unoConfigJson | ConvertFrom-Json;
+  $launchConfig.configurations += $unoConfig;
 }
 
 if ($allowGitChanges.IsPresent) {

MultiTarget/UseUnoWinUI.ps1

@@ -11,14 +11,12 @@ function ApplyWinUISwap([string] $filePath) {
         $fileContents = $fileContents -replace '<WinUIMajorVersion>2</WinUIMajorVersion>', '<WinUIMajorVersion>3</WinUIMajorVersion>';
         $fileContents = $fileContents -replace '<PackageIdVariant>Uwp</PackageIdVariant>', '<PackageIdVariant>WinUI</PackageIdVariant>';
         $fileContents = $fileContents -replace '<DependencyVariant>Uwp</DependencyVariant>', '<DependencyVariant>WinUI</DependencyVariant>';
-        $fileContents = $fileContents -replace 'Uno.UI', 'Uno.WinUI';
     }
 
     if ($winUIMajorVersion -eq "2") {
         $fileContents = $fileContents -replace '<WinUIMajorVersion>3</WinUIMajorVersion>', '<WinUIMajorVersion>2</WinUIMajorVersion>';
         $fileContents = $fileContents -replace '<PackageIdVariant>WinUI</PackageIdVariant>', '<PackageIdVariant>Uwp</PackageIdVariant>';
         $fileContents = $fileContents -replace '<DependencyVariant>WinUI</DependencyVariant>', '<DependencyVariant>Uwp</DependencyVariant>';
-        $fileContents = $fileContents -replace 'Uno.WinUI', 'Uno.UI';
     }
 
     Set-Content -Force -Path $filePath -Value $fileContents;
@@ -27,7 +25,6 @@ function ApplyWinUISwap([string] $filePath) {
 
 Write-Output "Switching Uno to WinUI $winUIMajorVersion";
 
-ApplyWinUISwap $PSScriptRoot/../ProjectHeads/App.Head.Uno.props
 ApplyWinUISwap $PSScriptRoot/PackageReferences/Uno.props
 ApplyWinUISwap $PSScriptRoot/WinUI.TargetVersion.props
 

global.json

@@ -3,8 +3,9 @@
     "version": "9.0.310",
     "rollForward": "latestFeature"
   },
-  "msbuild-sdks": 
+  "msbuild-sdks":
   {
-    "MSBuild.Sdk.Extras":"3.0.23"
+    "MSBuild.Sdk.Extras":"3.0.23",
+    "Uno.Sdk": "6.4.58"
   }
 }