Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build!: Update to net8.0 to fix canary #1410

Merged
merged 2 commits into from
May 23, 2024
Merged

build!: Update to net8.0 to fix canary #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a6bde1
build!: Update to net8.0 to fix canary
agneszitte May 22, 2024
9f5115d
chore: Update to latest xcode
jeromelaban May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/azure-static-webapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions PlatformItemGroups.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -47,13 +47,13 @@

<PropertyGroup Condition="$(_IsIOS)">
<DefineConstants>$(DefineConstants);IOS1_0;XAMARIN;XAMARIN_IOS;XAMARIN_IOS_UNIFIED</DefineConstants>
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion>11.0</SupportedOSPlatformVersion>
<TargetPlatformVersion>15.4</TargetPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="$(_IsMacOS)">
<DefineConstants>$(DefineConstants);XAMARIN</DefineConstants>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion>11.0</SupportedOSPlatformVersion>
<TargetPlatformVersion>12.3</TargetPlatformVersion>
</PropertyGroup>

Expand All @@ -65,6 +65,6 @@
<PropertyGroup Condition="$(_IsAndroid)">
<DefineConstants>$(DefineConstants);__ANDROID__;XAMARIN;MONOANDROID5_0;XAMARIN_ANDROID</DefineConstants>
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
<TargetPlatformVersion>33.0</TargetPlatformVersion>
<TargetPlatformVersion>34.0</TargetPlatformVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pr:
variables:
# Path where packages (nuget or app packages) will be copied to.
PackageOutputPath: $(Build.ArtifactStagingDirectory)
XCODE_ROOT: '/Applications/Xcode_14.3.1.app'
XCODE_ROOT: '/Applications/Xcode_15.2.app'
# For Application.Building.Light optimizations
IsLightBuild: $[eq(variables['Build.Reason'], 'PullRequest')]

Expand Down
4 changes: 2 additions & 2 deletions build/stage-build-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions build/stage-build-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/stage-build-skia-gtk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/stage-build-wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/stage-build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
7 changes: 3 additions & 4 deletions build/templates/dotnet-install-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
parameters:
DotNetVersion: '7.0.302'
UnoCheck_Version: '1.18.1'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/8a14128754833984a0c83398e7dda6d995199e1b/manifests/uno.ui.manifest.json'
agneszitte marked this conversation as resolved.
Show resolved Hide resolved
DotNetVersion: '8.0.300'
UnoCheck_Version: '1.23.0'
Dotnet_Root: '/usr/local/share/dotnet/'
Dotnet_Tools: '~/.dotnet/tools'

Expand Down Expand Up @@ -32,6 +31,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
7 changes: 3 additions & 4 deletions build/templates/dotnet-install-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
parameters:
DotNetVersion: '7.0.302'
UnoCheck_Version: '1.18.1'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/8a14128754833984a0c83398e7dda6d995199e1b/manifests/uno.ui.manifest.json'
agneszitte marked this conversation as resolved.
Show resolved Hide resolved
DotNetVersion: '8.0.300'
UnoCheck_Version: '1.23.0'

steps:

Expand All @@ -24,7 +23,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 androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }}
& uno-check -v --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
Expand Down
4 changes: 2 additions & 2 deletions build/templates/dotnet-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions crosstargeting_override.props.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<!--

Expand Down
1 change: 1 addition & 0 deletions src/library/Uno.Cupertino/Uno.Cupertino.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions src/library/Uno.Material/Uno.Material.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/library/Uno.Themes.WinUI.Markup/Uno.Themes.WinUI.Markup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/library/Uno.Themes/Uno.Themes.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/library/tfm-common-uwp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
agneszitte marked this conversation as resolved.
Show resolved Hide resolved
<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>
10 changes: 5 additions & 5 deletions src/library/tfm-common-winui.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions src/samples/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/samples/WinUI/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<DotNetVersion>net7.0</DotNetVersion>
<DotNetVersion>net8.0</DotNetVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UseWinUI>true</UseWinUI>
Expand Down
Loading