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

Jump to bottom

build: Update to net8.0 to fix canary #1111

Merged
merged 9 commits into from
Jun 5, 2024
Merged

build: Update to net8.0 to fix canary #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
124d0b2
build: Update to net8.0 to fix canary
Youssef1313 May 20, 2024
72a2a20
chore: Adjust
Youssef1313 May 21, 2024
fde12f2
chore: Adjust
Youssef1313 May 21, 2024
9aab2f9
chore: Adjust Xcode
Youssef1313 May 23, 2024
047e0f0
chore: Update azure-pipelines.yml
Youssef1313 May 23, 2024
ad3f147
chore: Adjust android version
Youssef1313 Jun 1, 2024
6f740b8
chore: Adjust Android version
Youssef1313 Jun 1, 2024
a183760
chore: increase timeout
Youssef1313 Jun 2, 2024
028476a
ci: Disable iOS tests
jeromelaban Jun 5, 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
4 changes: 2 additions & 2 deletions .github/workflows/azure-static-webapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
build_and_deploy_job:
env:
DIST_PATH: Uno.Gallery/Uno.Gallery.Wasm/bin/Release/net7.0/dist
DIST_PATH: Uno.Gallery/Uno.Gallery.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 @@ -41,7 +41,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: '7.0.402'
dotnet-version: '8.0.100'

- run: |
cd Uno.Gallery/Uno.Gallery.Wasm
Expand Down
7 changes: 3 additions & 4 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageVersion Include="Microsoft.TypeScript.Compiler" Version="3.1.5" />
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="4.6.4" />
Expand All @@ -25,8 +24,8 @@
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
<PackageVersion Include="Svg.Skia" Version="1.0.0.1" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200" />
<PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
Expand Down Expand Up @@ -60,4 +59,4 @@
<PackageVersion Include="Xamarin.UITest" Version="4.1.4" />
<PackageVersion Include="Xamarin.TestCloud.Agent" Version="0.23.2" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions Uno.Gallery/Uno.Gallery.Mobile/Android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nventive.uno.ui.demo" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="33" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
<application android:label="Uno.Gallery"></application>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
Expand Down Expand Up @@ -29,4 +29,4 @@
<data android:scheme="https" />
</intent>
</queries>
</manifest>
</manifest>
38 changes: 19 additions & 19 deletions Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-macos</TargetFrameworks>
<SingleProject>true</SingleProject>
<OutputType>Exe</OutputType>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
<InvariantGlobalization Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">true</InvariantGlobalization>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-ios'">iossimulator-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-macos'">osx-x64</RuntimeIdentifier>
<InvariantGlobalization Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">true</InvariantGlobalization>
<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
<!-- Required for C# Hot Reload -->

<!-- https://github.com/dotnet/runtime/issues/68808 -->
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>-->
<IsUnoHead>true</IsUnoHead>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net8.0-macos'">10.14</SupportedOSPlatformVersion>
<NoWarn>CA1416;Uno0001</NoWarn>
<AndroidManifest>Android\AndroidManifest.xml</AndroidManifest>
</PropertyGroup>
Expand Down Expand Up @@ -61,9 +61,9 @@
<IsUiAutomationMappingEnabled>True</IsUiAutomationMappingEnabled>
<DefineConstants>$(DefineConstants);USE_UITESTS</DefineConstants>
</PropertyGroup>

<Choose>
<When Condition="'$(TargetFramework)'=='net7.0-android'">
<When Condition="'$(TargetFramework)'=='net8.0-android'">
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$(System_PullRequest_IsFork)'!='True' and '$(IsUiAutomationMappingEnabled)'==''">
<AndroidKeyStore>true</AndroidKeyStore>
<AndroidSigningKeyStore>..\Gallery.Droid\calc-prod.keystore</AndroidSigningKeyStore>
Expand All @@ -84,7 +84,7 @@
<RunAOTCompilation>true</RunAOTCompilation>
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)'=='net7.0-ios'">
<When Condition="'$(TargetFramework)'=='net8.0-ios'">
<ItemGroup Condition="'$(Configuration)'=='Release'">
<TrimmableAssembly Include="CommunityToolkit.WinUI.UI" />
</ItemGroup>
Expand All @@ -93,7 +93,7 @@

<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>

<InvariantGlobalization>false</InvariantGlobalization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$(System_PullRequest_IsFork)'!='True'">
Expand All @@ -110,17 +110,17 @@
<TrimmableAssembly Include="Microsoft.Toolkit.Uwp.UI" />
</ItemGroup>
</When>
<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
<When Condition="'$(TargetFramework)'=='net8.0-maccatalyst'">
<PropertyGroup>
<!-- https://github.com/xamarin/xamarin-macios/issues/14686 -->
<_LibMonoLinkMode>static</_LibMonoLinkMode>
<_LibXamarinLinkMode>static</_LibXamarinLinkMode>

<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static --dsym=true</MtouchExtraArgs>

<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>

<InvariantGlobalization>false</InvariantGlobalization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$(System_PullRequest_IsFork)'!='True'">
Expand All @@ -141,6 +141,6 @@
</PropertyGroup>
</When>
</Choose>

<Import Project="..\Uno.Gallery.Shared\Uno.Gallery.Shared.projitems" Label="Shared" />
</Project>
4 changes: 2 additions & 2 deletions Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.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)'=='Release'">WinExe</OutputType>
<OutputType Condition="'$(Configuration)'=='Debug' or '$(IsCanaryBranch)'=='true'">Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>$(NoWarn);NU1701</NoWarn>
</PropertyGroup>

Expand All @@ -27,7 +27,7 @@
<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" />
<PackageReference Include="Uno.Toolkit.Skia.WinUI" />
<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" />
<PackageReference Include="Uno.Toolkit.WinUI.Material" />
<PackageReference Include="Uno.Toolkit.WinUI.Material" />
<PackageReference Include="Uno.WinUI.Lottie" />
<PackageReference Include="Uno.WinUI.Skia.Gtk" />
<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
Expand Down
2 changes: 1 addition & 1 deletion Uno.Gallery/Uno.Gallery.UITest/Uno.Gallery.UITest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Uno.Gallery.UITests</RootNamespace>
</PropertyGroup>

Expand Down
13 changes: 5 additions & 8 deletions Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>NU1701</NoWarn>
<WasmHead>true</WasmHead>
<DefineConstants>__WASM__</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<UnoUIUseRoslynSourceGenerators>false</UnoUIUseRoslynSourceGenerators>
<WasmShellWebAppBasePath>/</WasmShellWebAppBasePath>
</PropertyGroup>
Expand All @@ -26,7 +26,7 @@
<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
<UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming>
<WasmShellObfuscateAssemblies>true</WasmShellObfuscateAssemblies>

<!--
Uncomment this block to generate a profile
<WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile>
Expand All @@ -35,7 +35,7 @@
<WasmShellEnableJiterpreter>false</WasmShellEnableJiterpreter>
-->
</PropertyGroup>

<PropertyGroup>
<WasmShellAOTProfileExcludedMethods>System\.IO;AsyncTaskMethodBuilder;AsyncValueTaskMethodBuilder</WasmShellAOTProfileExcludedMethods>
</PropertyGroup>
Expand All @@ -54,7 +54,7 @@
<ItemGroup Condition="'$(Configuration)'=='Release' and '$(WasmShellMonoRuntimeExecutionMode)'=='InterpreterAndAOT'">
<WasmShellEnableAotProfile Condition="'$(IsUiAutomationMappingEnabled)'==''" Include="aot.profile" />

<!--Use smaller profile for UI tests to avoid the browser's memory
<!--Use smaller profile for UI tests to avoid the browser's memory
use to go higher than the Ci agent's availability-->

<WasmShellEnableAotProfile Condition="'$(IsUiAutomationMappingEnabled)'=='True'" Include="aot-uitests.profile" />
Expand Down Expand Up @@ -131,9 +131,6 @@
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
<PackageReference Include="Uno.Core.Extensions.Disposables" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" />

<!-- Use ILLink package to improve XAML trimming performance -->
<PackageReference Include="Microsoft.NET.ILLink.Tasks" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...erties/PublishProfiles/win10-arm64.pubxml → ...operties/PublishProfiles/win-arm64.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<PublishProtocol>FileSystem</PublishProtocol>
<Platform>ARM64</Platform>
<RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
<!--
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
-->
</PropertyGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions ...operties/PublishProfiles/win10-x64.pubxml → ...Properties/PublishProfiles/win-x64.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<PublishProtocol>FileSystem</PublishProtocol>
<Platform>x64</Platform>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
<!--
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
-->
</PropertyGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions ...operties/PublishProfiles/win10-x86.pubxml → ...Properties/PublishProfiles/win-x86.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<PublishProtocol>FileSystem</PublishProtocol>
<Platform>x86</Platform>
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
<!--
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
-->
</PropertyGroup>
</Project>
</Project>
16 changes: 8 additions & 8 deletions Uno.Gallery/Uno.Gallery.Windows/Uno.Gallery.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows10.0.19041</TargetFramework>
<TargetFramework>net8.0-windows10.0.19041</TargetFramework>
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
<RootNamespace>Uno.Gallery.Windows</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
<EnableMsixTooling>true</EnableMsixTooling>
Expand All @@ -16,7 +16,7 @@
<IncludeXamlNamespaces Include="not_mobile" Visible="False" />
<ExcludeXamlNamespaces Include="mobile" Visible="False" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.WinUI.Lottie" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" />
Expand Down Expand Up @@ -54,7 +54,7 @@
<ProjectReference Include="..\..\Uno.Gallery.SourceGenerators\Uno.Gallery.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" SetPlatform="Platform=AnyCPU" />
</ItemGroup>

<!--
<!--
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
Tools extension to be activated for this project even if the Windows App SDK Nuget
package has not yet been restored.
Expand All @@ -63,9 +63,9 @@
<ProjectCapability Include="Msix" />
</ItemGroup>

<!--
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
Explorer "Package and Publish" context menu entry to be enabled for this project even if
<!--
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
Explorer "Package and Publish" context menu entry to be enabled for this project even if
the Windows App SDK Nuget package has not yet been restored.
-->
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
Expand Down
Loading
Loading