build: Move build to net8.0/net9.0 instead of net8.0/net7.0

.github/workflows/uwp-autoconvert.yml

@@ -10,8 +10,8 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  UnoCheck_Version: '1.18.1'
-  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3728e150e4e148789302dcc00baaeae63e0c7eae/manifests/uno.ui.manifest.json'
+  UnoCheck_Version: '1.20.2'
+  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/bd121b30a0044fd80df18618dd7915fe8ccf4503/manifests/uno.ui.manifest.json'
 
   # Only convert using NetPrevious
   UnoDisableNetCurrentMobile: true
@@ -29,7 +29,7 @@ jobs:
 
     - name: Pin .NET Version
       run: |
-        cp build/ci/net7/global.json global.json
+        cp build/ci/net8/global.json global.json
 
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v3

build/Uno.UI.Build.csproj

@@ -109,7 +109,7 @@
 	<Target Name="BuildCIReference">
 
 		<MSBuild
-			Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
+			Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
 			Projects="filters\Uno.UI-packages-reference.slnf"
 			Targets="Restore;Build"
 			RebaseOutputs="false"
@@ -132,9 +132,9 @@
 		<MSBuild Properties="Configuration=Release;Platform=x86" Projects="..\src\Uno.UWPSyncGenerator.Reference\Uno.UWPSyncGenerator.Reference.csproj" Targets="Build" />
 
 		<ItemGroup>
-			<MixinTargetFrameworks Include="net7.0-ios" />
-			<MixinTargetFrameworks Include="net7.0-android" />
-			<MixinTargetFrameworks Include="net7.0-macos" />
+			<MixinTargetFrameworks Include="net8.0-ios17.0" />
+			<MixinTargetFrameworks Include="net8.0-android" />
+			<MixinTargetFrameworks Include="net8.0-macos14.0" />
 		</ItemGroup>
 
 		<MSBuild
@@ -302,12 +302,12 @@
 		<!-- Adjust build props file for Windows targets -->
 		<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.16299\uno.winui.props']/@target" Value="buildTransitive\uap10.0.16299\$(PackageNamePrefix).props" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
 		<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.19041\uno.winui.props']/@target" Value="buildTransitive\uap10.0.19041\$(PackageNamePrefix).props" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
-		<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\net7.0-windows\uno.winui.props']/@target" Value="buildTransitive\net7.0-windows\$(PackageNamePrefix).props" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
+		<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\net8.0-windows\uno.winui.props']/@target" Value="buildTransitive\net8.0-windows\$(PackageNamePrefix).props" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
 
 		<!-- Adjust build targets file for Windows targets -->
 		<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.16299\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.16299\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
 		<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.19041\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.19041\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
-		<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\net7.0-windows\uno.winui.targets']/@target" Value="buildTransitive\net7.0-windows\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
+		<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\net8.0-windows\uno.winui.targets']/@target" Value="buildTransitive\net8.0-windows\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
 
 		<!-- Skia GTK targets/props-->
 		<Move SourceFiles=".\nuget\Uno.WinUI.Skia.Gtk.targets" DestinationFiles=".\nuget\$(PackageNamePrefix).Skia.Gtk.targets" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
@@ -388,14 +388,14 @@
 			<NuSpecProperties>NoWarn=NU5100,NU5105,NU5131;branch=$(GITVERSION_BranchName);commitid=$(GitVersion_Sha)</NuSpecProperties>
 
 			<NuSpecProperties Condition="'$(UNO_UWP_BUILD)'=='true'">$(NuSpecProperties);winuisourcepath=uap10.0.19041;winuitargetpath=UAP</NuSpecProperties>
-			<NuSpecProperties Condition="'$(UNO_UWP_BUILD)'!='true'">$(NuSpecProperties);winuisourcepath=net7.0-windows10.0.19041.0;winuitargetpath=net7.0-windows10.0.19041.0</NuSpecProperties>
+			<NuSpecProperties Condition="'$(UNO_UWP_BUILD)'!='true'">$(NuSpecProperties);winuisourcepath=net8.0-windows10.0.19041.0;winuitargetpath=net8.0-windows10.0.19041.0</NuSpecProperties>
 		</PropertyGroup>
 
 		<!-- Pre-validation of contents to be packed -->
 		<Error Text="The Uno.UI.Toolkit PRI file is not present in src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Windows\Release"
 					 Condition="'$(UNO_UWP_BUILD)'=='true' and !exists('..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Windows\Release\uap10.0.19041\Uno.UI.Toolkit.pri')" />
 		<Error Text="The Uno.UI.Toolkit PRI file is not present in src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Windows\Release"
-					 Condition="'$(UNO_UWP_BUILD)'!='true' and !exists('..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Windows\Release\net7.0-windows10.0.19041.0\Uno.UI.Toolkit.pri')" />
+					 Condition="'$(UNO_UWP_BUILD)'!='true' and !exists('..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Windows\Release\net8.0-windows10.0.19041.0\Uno.UI.Toolkit.pri')" />
 
 		<!-- Create the packages -->
 		<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />

build/ci/.azure-devops-android-tests.yml

@@ -41,7 +41,7 @@ jobs:
   - checkout: self
     clean: true
 
-  - template: templates/dotnet7-mobile-install-mac.yml
+  - template: templates/dotnet-mobile-install-mac.yml
 
   - template: templates/nuget-cache.yml
     parameters:
@@ -51,12 +51,12 @@ jobs:
 
   - bash: |
       cd $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.netcoremobile
-      dotnet publish -f net7.0-android -c Release -p:UnoTargetFrameworkOverride=net7.0-android /bl:$(build.artifactstagingdirectory)/android-netcoremobile-sampleapp.binlog
+      dotnet publish -f net8.0-android -c Release -p:UnoTargetFrameworkOverride=net8.0-android /bl:$(build.artifactstagingdirectory)/android-netcoremobile-sampleapp.binlog
     displayName: Build Android samples app
 
   - task: CopyFiles@2
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.netcoremobile/bin/Release/net7.0-android/publish
+      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.netcoremobile/bin/Release/net8.0-android/publish
       Contents: 'uno.platform.unosampleapp-Signed.apk'
       TargetFolder: $(build.artifactstagingdirectory)/android
       CleanTargetFolder: false
@@ -95,35 +95,35 @@ jobs:
       #  UITEST_TEST_MODE_NAME: Automated
 
       ${{ each testBucket in parameters.automatedTestsBuckets }}:
-        Android_9.0_Group_${{ testBucket }}_net7:
+        Android_9.0_Group_${{ testBucket }}_net8:
           ANDROID_SIMULATOR_APILEVEL: 28
           UITEST_TEST_MODE_NAME: Automated
           UNO_UITEST_BUCKET_ID: ${{ testBucket }} ## Note: Align with UNO_UITEST_BUCKET_COUNT
           SAMPLEAPP_ARTIFACT_NAME: uitests-android-netcoremobile-build
-          TARGETPLATFORM_NAME: net7
+          TARGETPLATFORM_NAME: net8
           FAILBUILD_ON_FAILURE: true
           ALLOW_RERUN: true
           UITEST_TEST_TIMEOUT: '270s'
 
       ${{ each testGroup in parameters.runtimeTestsGroups }}:
-        Android_9.0_RuntimeTests_${{ testGroup }}_net7:
+        Android_9.0_RuntimeTests_${{ testGroup }}_net8:
           ANDROID_SIMULATOR_APILEVEL: 28
           UITEST_TEST_MODE_NAME: RuntimeTests
           UNO_UITEST_BUCKET_ID: RuntimeTests
           UITEST_RUNTIME_TEST_GROUP: ${{ testGroup }}
           UITEST_RUNTIME_TEST_GROUP_COUNT: 5
           SAMPLEAPP_ARTIFACT_NAME: uitests-android-netcoremobile-build
-          TARGETPLATFORM_NAME: net7
+          TARGETPLATFORM_NAME: net8
           FAILBUILD_ON_FAILURE: true
           ALLOW_RERUN: false
           UITEST_TEST_TIMEOUT: '2600s'
 
-      Android_9.0_Snapshots_net7:
+      Android_9.0_Snapshots_net8:
         ANDROID_SIMULATOR_APILEVEL: 28
         UITEST_TEST_MODE_NAME: Snapshots
         UNO_UITEST_BUCKET_ID: Snapshots
         SAMPLEAPP_ARTIFACT_NAME: uitests-android-netcoremobile-build
-        TARGETPLATFORM_NAME: net7
+        TARGETPLATFORM_NAME: net8
         FAILBUILD_ON_FAILURE: true
         ALLOW_RERUN: true
         UITEST_TEST_TIMEOUT: '270s'

build/ci/.azure-devops-ios-tests-run.yml

@@ -48,7 +48,7 @@ jobs:
         artifactName: uitests-failure-results
         downloadPath: '$(build.sourcesdirectory)/build'
 
-  - template: templates/dotnet-install.yml
+  - template: templates/dotnet7-mobile-install-mac.yml
 
   - template: templates/nuget-cache.yml
     parameters:
@@ -95,6 +95,7 @@ jobs:
       UITEST_RUNTIME_TEST_GROUP_COUNT: "${{ parameters.UITEST_RUNTIME_TEST_GROUP_COUNT }}"
       UITEST_TEST_TIMEOUT: "${{ parameters.UITEST_TEST_TIMEOUT }}"
       UNO_UITEST_IOSBUNDLE_PATH: "$(build.sourcesdirectory)/build/ios-uitest-build/SamplesApp.app"
+      UnoTargetFrameworkOverride: "net7.0-ios"
 
   - task: PublishTestResults@2
     condition: always()
@@ -124,6 +125,7 @@ jobs:
       UITEST_RUNTIME_TEST_GROUP_COUNT: "${{ parameters.UITEST_RUNTIME_TEST_GROUP_COUNT }}"
       UITEST_TEST_TIMEOUT: "${{ parameters.UITEST_TEST_TIMEOUT }}"
       UNO_UITEST_IOSBUNDLE_PATH: "$(build.sourcesdirectory)/build/ios-uitest-build/SamplesApp.app"
+      UnoTargetFrameworkOverride: "net7.0-ios"
 
   - task: PublishTestResults@2
     condition: eq(variables.UITEST_ALLOW_RERUN, 'true')

build/ci/.azure-devops-ios-tests.yml

@@ -168,7 +168,6 @@ jobs:
         -r:ios-arm64 \
         -p:BuildForTestFlight=true \
         -p:UnoTargetFrameworkOverride=net7.0-ios \
-        -p:UnoUIDisableNet8Build=true \
         /bl:$(build.artifactstagingdirectory)/ios-netcoremobile-sampleapp-testflight.binlog
 
     displayName: Build iOS App for TestFlight

build/ci/.azure-devops-macos.yml

@@ -24,7 +24,7 @@ jobs:
   - checkout: self
     clean: true
 
-  - template: templates/dotnet7-mobile-install-mac.yml
+  - template: templates/dotnet-mobile-install-mac.yml
 
   - template: templates/nuget-cache.yml
     parameters:
@@ -37,13 +37,13 @@ jobs:
 
   - script: |
       cd src/SamplesApp/SamplesApp.netcoremobile
-      dotnet build -f net7.0-macos -r osx-x64 -c Release -p:UnoTargetFrameworkOverride=net7.0-macos -p:CreatePackage=true -p:EnableCodeSigning=false /bl:$BUILD_ARTIFACTSTAGINGDIRECTORY/macos-netcoremobile-sampleapp.binlog
+      dotnet build -r osx-x64 -c Release -p:UnoTargetFrameworkOverride=net8.0-macos -p:CreatePackage=true -p:EnableCodeSigning=false /bl:$BUILD_ARTIFACTSTAGINGDIRECTORY/macos-netcoremobile-sampleapp.binlog
     displayName: 'Build Sample app'
 
   - task: CopyFiles@2
     displayName: 'Copy macOS artifacts'
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.netcoremobile/bin/Release/net7.0-macos/osx-x64
+      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.netcoremobile/bin/Release/net8.0-macos14.0/osx-x64
       Contents: '**/*.pkg'
       TargetFolder: $(build.artifactstagingdirectory)
       CleanTargetFolder: false

build/ci/.azure-devops-package-netcoremobile.yml

@@ -12,14 +12,14 @@ jobs:
 
   strategy:
     matrix:
-      NET8:
+      NET9:
         UnoDisableNetPreviousMobile: true
-        ZipFileTargetFramework: net8
+        ZipFileTargetFramework: net9
 
-      NET7:
+      NET8:
         UnoDisableNetCurrentMobile: true
         UnoDisableNetCurrent: true
-        ZipFileTargetFramework: net7
+        ZipFileTargetFramework: net8
 
   variables:
     CombinedConfiguration: Release|Any CPU
@@ -76,7 +76,7 @@ jobs:
       restoreNugetPackages: false
       logProjectEvents: false
       createLogFile: false
-    condition: and(succeeded(), eq(variables['ZipFileTargetFramework'], 'net7'))
+    condition: and(succeeded(), eq(variables['ZipFileTargetFramework'], 'net8'))
     displayName: Building WinAppSDK/UWP package binaries
 
   - template: templates/copy-package-assets.yml

build/ci/.azure-devops-project-template-tests.yml

@@ -16,7 +16,8 @@ jobs:
     - Generate_Packages
 
   variables:
-    UnoDisableNetPreviousMobile: true
+    UnoDisableNetCurrentMobile: true
+    UnoDisableNetCurrent: true
 
   steps:
   - task: DownloadBuildArtifacts@0
@@ -40,6 +41,14 @@ jobs:
       BUILD_SOURCESDIRECTORY: $(BUILD.SOURCESDIRECTORY)
       GITVERSION_SemVer: $(GITVERSION.SemVer)
 
+  - task: PublishBuildArtifacts@1
+    retryCountOnTaskFailure: 3
+    condition: always()
+    inputs:
+      PathtoPublish: $(build.sourcesdirectory)/src/SolutionTemplate/binlogs
+      ArtifactName: template-tests-binlogs-windows
+      ArtifactType: Container
+
 - job: Dotnet_Template_Tests_NetCoreMobile_macos
   displayName: 'Run .NET Templates Tests macOS'
   timeoutInMinutes: 90
@@ -51,7 +60,8 @@ jobs:
     - Generate_Packages
 
   variables:
-    UnoDisableNetPreviousMobile: true
+    UnoDisableNetCurrent: true
+    UnoDisableNetCurrentMobile: true
 
   steps:
   - task: DownloadBuildArtifacts@0
@@ -80,14 +90,23 @@ jobs:
       BUILD_SOURCESDIRECTORY: $(BUILD.SOURCESDIRECTORY)
       GITVERSION_SemVer: $(GITVERSION.SemVer)
 
+  - task: PublishBuildArtifacts@1
+    retryCountOnTaskFailure: 3
+    condition: always()
+    inputs:
+      PathtoPublish: $(build.sourcesdirectory)/src/SolutionTemplate/binlogs
+      ArtifactName: template-tests-binlogs-macos
+      ArtifactType: Container
+
 - job: Dotnet_Template_Tests_net7_Linux
   displayName: 'Run dotnet new Templates Tests - Linux (net7)'
 
   dependsOn:
     - Generate_Packages
 
   variables:
-    UnoDisableNetPreviousMobile: true
+    UnoDisableNetCurrent: true
+    UnoDisableNetCurrentMobile: true
 
   pool: ${{ parameters.vmPoolLinux }}
 
@@ -116,3 +135,11 @@ jobs:
     env:
       BUILD_SOURCESDIRECTORY: $(BUILD.SOURCESDIRECTORY)
       GITVERSION_SemVer: $(GITVERSION.SemVer)
+
+  - task: PublishBuildArtifacts@1
+    retryCountOnTaskFailure: 3
+    condition: always()
+    inputs:
+      PathtoPublish: $(build.sourcesdirectory)/src/SolutionTemplate/binlogs
+      ArtifactName: template-tests-binlogs-net7-linux
+      ArtifactType: Container

build/ci/.azure-devops-skia-tests.yml

@@ -55,7 +55,7 @@ jobs:
     retryCountOnTaskFailure: 3
     condition: always()
     inputs:
-      PathtoPublish: $(Build.SourcesDirectory)\src\SamplesApp\SamplesApp.Skia.Gtk\bin\Release\net7.0
+      PathtoPublish: $(Build.SourcesDirectory)\src\SamplesApp\SamplesApp.Skia.Gtk\bin\Release\net8.0
       ArtifactName: skia-gtk-samples-app-$(XAML_FLAVOR_BUILD)
       ArtifactType: Container
 
@@ -66,18 +66,18 @@ jobs:
     retryCountOnTaskFailure: 3
     condition: always()
     inputs:
-      PathtoPublish: $(Build.SourcesDirectory)\src\SamplesApp\UnoIslandsSamplesApp.Skia.WPF\bin\Release\net7.0-windows
+      PathtoPublish: $(Build.SourcesDirectory)\src\SamplesApp\UnoIslandsSamplesApp.Skia.WPF\bin\Release\net8.0-windows
       ArtifactName: uno-islands-skia-wpf-samples-app-$(XAML_FLAVOR_BUILD)
       ArtifactType: Container
 
-  - powershell: dotnet publish src/SamplesApp/SamplesApp.Skia.Generic/SamplesApp.Skia.Generic.csproj -c Release -f net7.0 /bl:$(build.artifactstagingdirectory)\build-x11.binlog
+  - powershell: dotnet publish src/SamplesApp/SamplesApp.Skia.Generic/SamplesApp.Skia.Generic.csproj -c Release -f net8.0 /bl:$(build.artifactstagingdirectory)\build-x11.binlog
     displayName: Build Generic Skia Head
 
   - task: PublishBuildArtifacts@1
     retryCountOnTaskFailure: 3
     condition: always()
     inputs:
-      PathtoPublish: $(Build.SourcesDirectory)\src\SamplesApp\SamplesApp.Skia.Generic\bin\Release\net7.0
+      PathtoPublish: $(Build.SourcesDirectory)\src\SamplesApp\SamplesApp.Skia.Generic\bin\Release\net8.0
       ArtifactName: skia-generic-samples-app-$(XAML_FLAVOR_BUILD)
       ArtifactType: Container
 

build/ci/.azure-devops-wasdk.yml

@@ -8,7 +8,7 @@ jobs:
   pool: ${{ parameters.poolName }}
 
   variables:
-    CombinedConfiguration: Release|Any CPU
+    CombinedConfiguration: Release|AnyCPU
     CI_Build: true
 
     # Use pre-defined local nuget cache for restore
@@ -37,7 +37,15 @@ jobs:
       msbuildLocationMethod: version
       msbuildVersion: latest
       msbuildArchitecture: x86
-      msbuildArguments: /r /t:Publish /m /v:m /p:Configuration=Release /p:RuntimeIdentifier=win10-x64 /p:GenerateAppxPackageOnBuild=true /detailedsummary /bl:$(build.artifactstagingdirectory)/build-wasdk.binlog
+      # Using x64 to workaround this error:
+      # ---
+      # Microsoft.Build.Msix.Packaging.targets(1036,5): Error : Packaged .NET applications with an
+      # app host exe cannot be ProcessorArchitecture neutral. Please specify a RuntimeIdentifier
+      # or a Platform other than AnyCPU.
+      # ---
+      # NOTE: The error says to specify a RuntimeIdentifier *OR* platform other than AnyCPU.
+      # We already specify RuntimeIdentifier=win-x64 in the build below. Still, the error pops up.
+      msbuildArguments: /r /t:Publish /m /v:m /p:Configuration=Release /p:Platform=x64 /p:RuntimeIdentifier=win-x64 /p:GenerateAppxPackageOnBuild=true /detailedsummary /bl:$(build.artifactstagingdirectory)/build-wasdk.binlog
       clean: false
       restoreNugetPackages: false
       logProjectEvents: false
@@ -46,7 +54,7 @@ jobs:
   - task: CopyFiles@2
     condition: always()
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.Windows/bin/Release/net7.0-windows10.0.19041.0/win10-x64/AppPackages
+      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.Windows/bin/x64/Release/net8.0-windows10.0.19041.0/win-x64/AppPackages
       Contents: '**'
       TargetFolder: $(build.artifactstagingdirectory)
       CleanTargetFolder: false