From 798cd3c705c390c2e02c6745ff2a0277abc13977 Mon Sep 17 00:00:00 2001 From: agneszitte Date: Tue, 21 May 2024 15:53:44 -0400 Subject: [PATCH] build: Update to net8.0 to fix canary --- .github/workflows/azure-static-webapp.yml | 8 ++++---- PlatformItemGroups.props | 2 +- build/stage-build-android.yml | 4 ++-- build/stage-build-ios.yml | 4 ++-- build/stage-build-skia-gtk.yml | 4 ++-- build/stage-build-wasm.yml | 4 ++-- build/stage-build-windows.yml | 4 ++-- build/templates/dotnet-install-macos.yml | 4 ++-- build/templates/dotnet-install-windows.yml | 4 ++-- build/templates/dotnet-install.yml | 4 ++-- crosstargeting_override.props.sample | 14 +++++++------- .../Uno.Cupertino/Uno.Cupertino.WinUI.csproj | 1 + .../Uno.Material.WinUI.Markup.csproj | 1 + src/library/Uno.Material/Uno.Material.WinUI.csproj | 1 + .../Uno.Themes.WinUI.Markup.csproj | 1 + src/library/Uno.Themes/Uno.Themes.WinUI.csproj | 1 + src/library/tfm-common-uwp.props | 8 ++++---- src/library/tfm-common-winui.props | 10 +++++----- src/samples/Directory.Packages.props | 6 +++--- .../Uno.Themes.Samples.Mobile.csproj | 2 +- .../Uno.Themes.Samples.Skia.Gtk.csproj | 2 +- .../Uno.Themes.Samples.Wasm.csproj | 2 +- src/samples/WinUI/Directory.Build.props | 2 +- 23 files changed, 49 insertions(+), 44 deletions(-) diff --git a/.github/workflows/azure-static-webapp.yml b/.github/workflows/azure-static-webapp.yml index 9e764ccf8..b2a6bad27 100644 --- a/.github/workflows/azure-static-webapp.yml +++ b/.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/setup-dotnet@v1.7.2 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: diff --git a/PlatformItemGroups.props b/PlatformItemGroups.props index 56125f9de..33fbd342b 100644 --- a/PlatformItemGroups.props +++ b/PlatformItemGroups.props @@ -30,7 +30,7 @@ <_IsNet Condition="'$(TargetFramework)'=='net461'">true <_IsNetCore>false - <_IsNetCore Condition="'$(TargetFramework)'=='net5.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net7.0'">true + <_IsNetCore Condition="'$(TargetFramework)'=='net5.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net8.0'">true <_IsNetStd>false <_IsNetStd Condition="'$(TargetFramework)'=='netstandard2.0' or $(_IsNetCore)">true diff --git a/build/stage-build-android.yml b/build/stage-build-android.yml index cf91d62c2..344e49604 100644 --- a/build/stage-build-android.yml +++ b/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' diff --git a/build/stage-build-ios.yml b/build/stage-build-ios.yml index e725e9a39..c4fbd796d 100644 --- a/build/stage-build-ios.yml +++ b/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 diff --git a/build/stage-build-skia-gtk.yml b/build/stage-build-skia-gtk.yml index 279b8063e..d9bfb772f 100644 --- a/build/stage-build-skia-gtk.yml +++ b/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 diff --git a/build/stage-build-wasm.yml b/build/stage-build-wasm.yml index bb377414c..6c6390f47 100644 --- a/build/stage-build-wasm.yml +++ b/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 diff --git a/build/stage-build-windows.yml b/build/stage-build-windows.yml index 31027311c..d10832c74 100644 --- a/build/stage-build-windows.yml +++ b/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 diff --git a/build/templates/dotnet-install-macos.yml b/build/templates/dotnet-install-macos.yml index 905e7b871..34b5608cb 100644 --- a/build/templates/dotnet-install-macos.yml +++ b/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' diff --git a/build/templates/dotnet-install-windows.yml b/build/templates/dotnet-install-windows.yml index 5ca8a3fdc..e205bf477 100644 --- a/build/templates/dotnet-install-windows.yml +++ b/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: diff --git a/build/templates/dotnet-install.yml b/build/templates/dotnet-install.yml index 354745691..7e30cc096 100644 --- a/build/templates/dotnet-install.yml +++ b/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 diff --git a/crosstargeting_override.props.sample b/crosstargeting_override.props.sample index e285d75f9..67020dea6 100644 --- a/crosstargeting_override.props.sample +++ b/crosstargeting_override.props.sample @@ -17,15 +17,15 @@ - + - - - - + + + + - - net7.0;$(TargetFrameworkOverride) + + net8.0;$(TargetFrameworkOverride) true WINUI + win-x86;win-x64;win-arm64 diff --git a/src/library/Uno.Material/Uno.Material.WinUI.csproj b/src/library/Uno.Material/Uno.Material.WinUI.csproj index c0aa17917..535dd5d28 100644 --- a/src/library/Uno.Material/Uno.Material.WinUI.csproj +++ b/src/library/Uno.Material/Uno.Material.WinUI.csproj @@ -6,6 +6,7 @@ true $(DefineConstants);WinUI $(DefineConstants);WinUI_Desktop + win-x86;win-x64;win-arm64 Uno.Material.WinUI Uno.Material.WinUI WinUI diff --git a/src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj b/src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj index bb6acbe7a..ec36ffb43 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj +++ b/src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj @@ -10,6 +10,7 @@ true WINUI + win-x86;win-x64;win-arm64 diff --git a/src/library/Uno.Themes/Uno.Themes.WinUI.csproj b/src/library/Uno.Themes/Uno.Themes.WinUI.csproj index 1136745f5..12528e085 100644 --- a/src/library/Uno.Themes/Uno.Themes.WinUI.csproj +++ b/src/library/Uno.Themes/Uno.Themes.WinUI.csproj @@ -7,6 +7,7 @@ Uno.Themes.WinUI $(DefineConstants);WinUI $(DefineConstants);WinUI_Desktop + win-x86;win-x64;win-arm64 WinUI true diff --git a/src/library/tfm-common-uwp.props b/src/library/tfm-common-uwp.props index 6692484d2..0f6b11ee7 100644 --- a/src/library/tfm-common-uwp.props +++ b/src/library/tfm-common-uwp.props @@ -3,10 +3,10 @@ $(TargetFrameworkOverride) - $(TargetFrameworks);net7.0; - $(TargetFrameworks);net7.0-ios - $(TargetFrameworks);net7.0-macos;net7.0-maccatalyst - $(TargetFrameworks);net7.0-android + $(TargetFrameworks);net8.0; + $(TargetFrameworks);net8.0-ios + $(TargetFrameworks);net8.0-macos;net8.0-maccatalyst + $(TargetFrameworks);net8.0-android $(TargetFrameworks);uap10.0.19041 \ No newline at end of file diff --git a/src/library/tfm-common-winui.props b/src/library/tfm-common-winui.props index ab887c6ff..c7959bac2 100644 --- a/src/library/tfm-common-winui.props +++ b/src/library/tfm-common-winui.props @@ -3,10 +3,10 @@ $(TargetFrameworkOverride) - $(TargetFrameworks);net7.0; - $(TargetFrameworks);net7.0-ios - $(TargetFrameworks);net7.0-macos;net7.0-maccatalyst - $(TargetFrameworks);net7.0-android - $(TargetFrameworks);net7.0-windows10.0.19041 + $(TargetFrameworks);net8.0; + $(TargetFrameworks);net8.0-ios + $(TargetFrameworks);net8.0-macos;net8.0-maccatalyst + $(TargetFrameworks);net8.0-android + $(TargetFrameworks);net8.0-windows10.0.19041 \ No newline at end of file diff --git a/src/samples/Directory.Packages.props b/src/samples/Directory.Packages.props index e996fe385..9c988975e 100644 --- a/src/samples/Directory.Packages.props +++ b/src/samples/Directory.Packages.props @@ -30,9 +30,9 @@ - - - + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj index 6424b7fed..1b9116653 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj @@ -1,6 +1,6 @@ - net7.0-ios;net7.0-maccatalyst;net7.0-android + net8.0-ios;net8.0-maccatalyst;net8.0-android true Exe diff --git a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj index 1e192ef72..12ebfcee4 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj @@ -3,7 +3,7 @@ WinExe Exe - net7.0 + net8.0 diff --git a/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj b/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj index 39d5fac28..c72b2f54b 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 True NU1701 diff --git a/src/samples/WinUI/Directory.Build.props b/src/samples/WinUI/Directory.Build.props index e270d51f3..1bf8bca5f 100644 --- a/src/samples/WinUI/Directory.Build.props +++ b/src/samples/WinUI/Directory.Build.props @@ -1,6 +1,6 @@ - net7.0 + net8.0 enable enable true