build: Update to net8.0 to fix canary

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

@@ -16,7 +16,7 @@ on:
 jobs:
   build_and_deploy_job:
     env:
-      DIST_PATH: src/samples/UWP/Uno.Themes.Samples.Wasm/bin/Release/net7.0/dist
+      DIST_PATH: src/samples/UWP/Uno.Themes.Samples.Wasm/bin/Release/net8.0/dist
 
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
@@ -40,14 +40,14 @@ jobs:
           useConfigFile: true
           configFilePath: gitversion.yml
 
-      - name: Setup dotnet 7.0.302
+      - name: Setup dotnet 8.0.300
         uses: actions/[email protected]
         with:
-          dotnet-version: '7.0.302'
+          dotnet-version: '8.0.300'
 
       - run: |
           cd src/samples/UWP/Uno.Themes.Samples.Wasm
-          dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}" /p:TargetFrameworkOverride=net7.0
+          dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}" /p:TargetFrameworkOverride=net8.0
 
       - uses: actions/upload-artifact@v2
         with:

PlatformItemGroups.props

@@ -30,7 +30,7 @@
 		<_IsNet Condition="'$(TargetFramework)'=='net461'">true</_IsNet>
 
 		<_IsNetCore>false</_IsNetCore>
-		<_IsNetCore Condition="'$(TargetFramework)'=='net5.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net7.0'">true</_IsNetCore>
+		<_IsNetCore Condition="'$(TargetFramework)'=='net5.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net8.0'">true</_IsNetCore>
 
 		<_IsNetStd>false</_IsNetStd>
 		<_IsNetStd Condition="'$(TargetFramework)'=='netstandard2.0' or $(_IsNetCore)">true</_IsNetStd>

build/stage-build-android.yml

@@ -29,8 +29,8 @@ jobs:
 
   - script: |
       cd $(build.sourcesdirectory)/src/samples/$(Lineage)/$(ProjectName).Mobile
-      dotnet build -f net7.0-android -c Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:AndroidKeyStore=false /bl:$(build.artifactstagingdirectory)/themes-build-$(ArtifactName).binlog
-    displayName: Build project for Release - (net7.0-android)
+      dotnet build -f net8.0-android -c Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:AndroidKeyStore=false /bl:$(build.artifactstagingdirectory)/themes-build-$(ArtifactName).binlog
+    displayName: Build project for Release - (net8.0-android)
 
   - task: CopyFiles@2
     displayName: 'Publish Binaries'

build/stage-build-ios.yml

@@ -35,8 +35,8 @@ jobs:
 
   - bash: |
       cd $(build.sourcesdirectory)/src/samples/$(Lineage)/$(ProjectName).Mobile
-      dotnet build -f net7.0-ios -c Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" "/bl:$(build.artifactstagingdirectory)/themes-build-$(ArtifactName).binlog"
-    displayName: Build project for Release - (net7.0-ios)
+      dotnet build -f net8.0-ios -c Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" "/bl:$(build.artifactstagingdirectory)/themes-build-$(ArtifactName).binlog"
+    displayName: Build project for Release - (net8.0-ios)
 
   - task: PublishBuildArtifacts@1
     retryCountOnTaskFailure: 3

build/stage-build-skia-gtk.yml

@@ -34,13 +34,13 @@ jobs:
   - template: templates/canary-updater.yml
   - template: templates/gitversion.yml
 
-  - powershell: dotnet msbuild src/samples/$(Lineage)/$(ProjectName).Skia.Gtk/$(ProjectName).Skia.Gtk.csproj /r /m /p:Configuration=Release /p:TargetFrameworkOverride=net7.0 /detailedsummary /m /bl:$(build.artifactstagingdirectory)\themes-build-$(ArtifactName).binlog
+  - powershell: dotnet msbuild src/samples/$(Lineage)/$(ProjectName).Skia.Gtk/$(ProjectName).Skia.Gtk.csproj /r /m /p:Configuration=Release /p:TargetFrameworkOverride=net8.0 /detailedsummary /m /bl:$(build.artifactstagingdirectory)\themes-build-$(ArtifactName).binlog
     displayName: Build GTK Head
 
   - task: CopyFiles@2
     displayName: 'Publish Skia.GTK Binaries'
     inputs:
-      SourceFolder: $(Build.SourcesDirectory)/src/samples/$(Lineage)/$(ProjectName).Skia.Gtk/bin/Release/net7.0
+      SourceFolder: $(Build.SourcesDirectory)/src/samples/$(Lineage)/$(ProjectName).Skia.Gtk/bin/Release/net8.0
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/skia-gtk-build
       CleanTargetFolder: false

build/stage-build-wasm.yml

@@ -33,13 +33,13 @@ jobs:
   - template: templates/gitversion.yml
 
   - script: |
-      dotnet build src/samples/$(Lineage)/$(ProjectName).Wasm/$(ProjectName).Wasm.csproj /p:Configuration=Release /p:TargetFrameworkOverride=net7.0 "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:GeneratePackageOnBuild=false /detailedsummary /bl:$(build.artifactstagingdirectory)/themes-build-$(ArtifactName).binlog
+      dotnet build src/samples/$(Lineage)/$(ProjectName).Wasm/$(ProjectName).Wasm.csproj /p:Configuration=Release /p:TargetFrameworkOverride=net8.0 "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:GeneratePackageOnBuild=false /detailedsummary /bl:$(build.artifactstagingdirectory)/themes-build-$(ArtifactName).binlog
     displayName: Build Wasm Head
 
   - task: CopyFiles@2
     displayName: 'Publish Wasm Binaries'
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/samples/$(Lineage)/$(ProjectName).Wasm/bin/Release/net7.0/dist
+      SourceFolder: $(build.sourcesdirectory)/src/samples/$(Lineage)/$(ProjectName).Wasm/bin/Release/net8.0/dist
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/Wasm
       CleanTargetFolder: false

build/stage-build-windows.yml

@@ -36,7 +36,7 @@ jobs:
     displayName: 'Use .NET'
     inputs:
       packageType: 'sdk'
-      version: '7.0.400'
+      version: '8.0.300'
 
   - template: templates/install-windows-sdk.yml
     parameters:
@@ -61,7 +61,7 @@ jobs:
     inputs:
       solution: src/samples/$(Lineage)/$(ProjectName).$(AppName)/$(ProjectName).$(AppName).csproj
       msbuildArchitecture: x64
-      msbuildArguments: /m /v:m /r /p:Platform=x64 /p:Configuration=Release /p:TargetFrameworkOverride=net7.0-windows10.0.19041 /p:AppxPackageDir="Packages/" /p:AppxBundle=Never /p:UapAppxPackageBuildMode=SideloadOnly /p:GenerateAppxPackageOnBuild=true "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /detailedsummary /bl:$(build.artifactstagingdirectory)/themes-build-$(ArtifactName).binlog
+      msbuildArguments: /m /v:m /r /p:Platform=x64 /p:Configuration=Release /p:TargetFrameworkOverride=net8.0-windows10.0.19041 /p:AppxPackageDir="Packages/" /p:AppxBundle=Never /p:UapAppxPackageBuildMode=SideloadOnly /p:GenerateAppxPackageOnBuild=true "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /detailedsummary /bl:$(build.artifactstagingdirectory)/themes-build-$(ArtifactName).binlog
       clean: false
       maximumCpuCount: true
       restoreNugetPackages: false

build/templates/dotnet-install-macos.yml

@@ -1,6 +1,6 @@
 parameters:
-  DotNetVersion: '7.0.302'
-  UnoCheck_Version: '1.18.1'
+  DotNetVersion: '8.0.300'
+  UnoCheck_Version: '1.23.0'
   UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/8a14128754833984a0c83398e7dda6d995199e1b/manifests/uno.ui.manifest.json'
   Dotnet_Root: '/usr/local/share/dotnet/'
   Dotnet_Tools: '~/.dotnet/tools'

build/templates/dotnet-install-windows.yml

@@ -1,6 +1,6 @@
 parameters:
-  DotNetVersion: '7.0.302'
-  UnoCheck_Version: '1.18.1'
+  DotNetVersion: '8.0.300'
+  UnoCheck_Version: '1.23.0'
   UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/8a14128754833984a0c83398e7dda6d995199e1b/manifests/uno.ui.manifest.json'
 
 steps:

build/templates/dotnet-install.yml

@@ -1,7 +1,7 @@
 steps:
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.302'
+    displayName: 'Use .NET Core SDK 8.0.300'
     inputs:
       packageType: sdk
-      version: 7.0.302
+      version: 8.0.300

crosstargeting_override.props.sample

@@ -17,15 +17,15 @@
 		<!-- Uncomment each line for each platform that you want to build: -->
 
 		<!-- <TargetFrameworkOverride Condition="''!='hint: UWP'">uap10.0.19041;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
-		<!-- <TargetFrameworkOverride Condition="''!='hint: WinUI'">net7.0-windows10.0.19041;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
+		<!-- <TargetFrameworkOverride Condition="''!='hint: WinUI'">net8.0-windows10.0.19041;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
 		<!-- <TargetFrameworkOverride Condition="''!='hint: WASM, Skia'">netstandard2.0;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
-		<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 7.0 iOS'">net7.0-ios;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
-		<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 7.0 Android'">net7.0-android;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
-		<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 7.0 macOS Catalyst'">net7.0-maccatalyst;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
-		<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 7.0 macOS AppKit'">net7.0-macos;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
+		<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 8.0 iOS'">net8.0-ios;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
+		<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 8.0 Android'">net8.0-android;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
+		<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 8.0 macOS Catalyst'">net8.0-maccatalyst;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
+		<!-- <TargetFrameworkOverride Condition="''!='hint: .NET 8.0 macOS AppKit'">net8.0-macos;$(TargetFrameworkOverride)</TargetFrameworkOverride> -->
 
-		<!-- DO NOT COMMENT OUT: net7.0 is a required tfm in all cases -->
-		<TargetFrameworkOverride Condition="'$(TargetFrameworkOverride)'!='' AND !$(TargetFrameworkOverride.Contains('net7.0;'))">net7.0;$(TargetFrameworkOverride)</TargetFrameworkOverride>
+		<!-- DO NOT COMMENT OUT: net8.0 is a required tfm in all cases -->
+		<TargetFrameworkOverride Condition="'$(TargetFrameworkOverride)'!='' AND !$(TargetFrameworkOverride.Contains('net8.0;'))">net8.0;$(TargetFrameworkOverride)</TargetFrameworkOverride>
 
 		<!--
 

src/library/Uno.Cupertino/Uno.Cupertino.WinUI.csproj

@@ -5,6 +5,7 @@
 	<PropertyGroup>
 		<DefineConstants>$(DefineConstants);WinUI</DefineConstants>
 		<DefineConstants Condition="$(_IsWinUI)">$(DefineConstants);WinUI_Desktop</DefineConstants>
+		<RuntimeIdentifiers Condition="$(_IsWinUI)">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<PackageId>Uno.Cupertino.WinUI</PackageId>
 		<AssemblyName>Uno.Cupertino.WinUI</AssemblyName>
 		<FrameworkLineage>WinUI</FrameworkLineage>

src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj

@@ -10,6 +10,7 @@
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<DefineConstants>WINUI</DefineConstants>
+		<RuntimeIdentifiers Condition="$(_IsWinUI)">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Uno.Material\Uno.Material.WinUI.csproj" />

src/library/Uno.Material/Uno.Material.WinUI.csproj

@@ -6,6 +6,7 @@
 		<UseWinUI>true</UseWinUI>
 		<DefineConstants>$(DefineConstants);WinUI</DefineConstants>
 		<DefineConstants Condition="$(_IsWinUI)">$(DefineConstants);WinUI_Desktop</DefineConstants>
+		<RuntimeIdentifiers Condition="$(_IsWinUI)">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<PackageId>Uno.Material.WinUI</PackageId>
 		<AssemblyName>Uno.Material.WinUI</AssemblyName>
 		<FrameworkLineage>WinUI</FrameworkLineage>

src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj

@@ -10,6 +10,7 @@
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<DefineConstants>WINUI</DefineConstants>
+		<RuntimeIdentifiers Condition="$(_IsWinUI)">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 	</PropertyGroup>
 
 	<ItemGroup>

src/library/Uno.Themes/Uno.Themes.WinUI.csproj

@@ -7,6 +7,7 @@
 		<AssemblyName>Uno.Themes.WinUI</AssemblyName>
 		<DefineConstants>$(DefineConstants);WinUI</DefineConstants>
 		<DefineConstants Condition="$(_IsWinUI)">$(DefineConstants);WinUI_Desktop</DefineConstants>
+		<RuntimeIdentifiers Condition="$(_IsWinUI)">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<FrameworkLineage>WinUI</FrameworkLineage>
 		<UseWinUI>true</UseWinUI>
 	</PropertyGroup>

src/library/tfm-common-uwp.props

@@ -3,10 +3,10 @@
 		<TargetFrameworks >$(TargetFrameworkOverride)</TargetFrameworks>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(TargetFrameworkOverride)'==''">
-		<TargetFrameworks>$(TargetFrameworks);net7.0;</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Build_iOS)'=='true'">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Build_MacOS)'=='true'">$(TargetFrameworks);net7.0-macos;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Build_Android)'=='true'">$(TargetFrameworks);net7.0-android</TargetFrameworks>
+		<TargetFrameworks>$(TargetFrameworks);net8.0;</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Build_iOS)'=='true'">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Build_MacOS)'=='true'">$(TargetFrameworks);net8.0-macos;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Build_Android)'=='true'">$(TargetFrameworks);net8.0-android</TargetFrameworks>
 		<TargetFrameworks Condition="'$(Build_Windows)'=='true'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
 	</PropertyGroup>
 </Project>

src/library/tfm-common-winui.props

@@ -3,10 +3,10 @@
 		<TargetFrameworks >$(TargetFrameworkOverride)</TargetFrameworks>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(TargetFrameworkOverride)'==''">
-		<TargetFrameworks>$(TargetFrameworks);net7.0;</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Build_iOS)'=='true'">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Build_MacOS)'=='true'">$(TargetFrameworks);net7.0-macos;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Build_Android)'=='true'">$(TargetFrameworks);net7.0-android</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Build_Windows)'=='true'">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
+		<TargetFrameworks>$(TargetFrameworks);net8.0;</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Build_iOS)'=='true'">$(TargetFrameworks);net8.0-ios</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Build_MacOS)'=='true'">$(TargetFrameworks);net8.0-macos;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Build_Android)'=='true'">$(TargetFrameworks);net8.0-android</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Build_Windows)'=='true'">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
 	</PropertyGroup>
 </Project>

src/samples/Directory.Packages.props

@@ -30,9 +30,9 @@
 		<PackageVersion Include="Uno.UI.Skia.Gtk" Version="5.2.0-dev.484" />
 		<PackageVersion Include="Uno.UI.WebAssembly" Version="5.2.0-dev.484" />
 		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.31" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.31" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="7.0.31" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.14" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.14" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="8.0.14" />
 		<PackageVersion Include="Uno.WinUI" Version="5.2.0-dev.484" />
 		<PackageVersion Include="Uno.WinUI.DevServer" Version="5.2.0-dev.484" />
 		<PackageVersion Include="Uno.WinUI.Lottie" Version="5.2.0-dev.484" />

src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-ios;net7.0-maccatalyst;net7.0-android</TargetFrameworks>
+		<TargetFrameworks>net8.0-ios;net8.0-maccatalyst;net8.0-android</TargetFrameworks>
 		<SingleProject>true</SingleProject>
 		<OutputType>Exe</OutputType>
 		<!-- Display name -->

src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Reelase'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>

src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<WasmHead>True</WasmHead>
 		<NoWarn>NU1701</NoWarn>
 	</PropertyGroup>

src/samples/WinUI/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <DotNetVersion>net7.0</DotNetVersion>
+    <DotNetVersion>net8.0</DotNetVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UseWinUI>true</UseWinUI>