Skip to content

Commit

Permalink
Merge pull request #135 from unoplatform/Youssef1313/ci-update-sdk
Browse files Browse the repository at this point in the history
ci: Build with .NET 7 SDK
  • Loading branch information
jeromelaban authored Nov 8, 2023
2 parents 89aae0c + ad3599a commit de82876
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 33 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
- release/**

env:
UnoCheck_Version: '1.5.4'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui-preview.manifest.json'
UnoCheck_Version: '1.14.1'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'

jobs:
build:
Expand All @@ -26,10 +26,10 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET Core v6
- name: Setup .NET 7
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.401'
dotnet-version: '7.0.403'

- name: Setup GitVersion
uses: gittools/actions/gitversion/[email protected]
Expand Down Expand Up @@ -86,10 +86,10 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET Core v6
- name: Setup .NET 7
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.100'
dotnet-version: '7.0.403'

- run: |
& dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
Expand Down
4 changes: 2 additions & 2 deletions src/UWP/TestLibrary/TestLibrary.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Please see https://github.com/unoplatform/uno/issues/3909 for more details.
-->
<PropertyGroup>
<TargetFrameworks>uap10.0.19041;netstandard2.0;net6.0-ios;net6.0-macos;net6.0-maccatalyst;net6.0-android</TargetFrameworks>
<TargetFrameworks>uap10.0.19041;netstandard2.0;net7.0-ios;net7.0-macos;net7.0-maccatalyst;net7.0-android</TargetFrameworks>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
</PropertyGroup>
Expand Down Expand Up @@ -56,4 +56,4 @@
<UndefineProperties>TargetFramework</UndefineProperties>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Please see https://github.com/unoplatform/uno/issues/3909 for more details.
-->
<PropertyGroup>
<TargetFrameworks>uap10.0.19041;netstandard2.0;net6.0-ios;net6.0-macos;net6.0-maccatalyst;net6.0-android</TargetFrameworks>
<TargetFrameworks>uap10.0.19041;netstandard2.0;net7.0-ios;net7.0-macos;net7.0-maccatalyst;net7.0-android</TargetFrameworks>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
</PropertyGroup>
Expand Down Expand Up @@ -63,4 +63,4 @@

<Error Condition="!exists('$(OutputPath)\$(AssemblyName)\Generated\mergedpages.xaml')" Text="Missing generated file" />
</Target>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Uno.XamlMerge.Tests/Uno.XamlMerge.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net461</TargetFrameworks>
<TargetFrameworks>net7.0;net461</TargetFrameworks>
<LangVersion>10</LangVersion>
<Nullable>enable</Nullable>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>

<!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401-->
<!--
<TargetFrameworks>$(TargetFrameworks);net6.0-macos</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net7.0-macos</TargetFrameworks>
-->
<SingleProject>true</SingleProject>
<OutputType>Exe</OutputType>
<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
<!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
<!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 -->
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>-->
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net7.0-maccatalyst' and '$(TargetFramework)' != 'net7.0-macos'">True</UseInterpreter>-->
<IsUnoHead>true</IsUnoHead>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion>
<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>
</PropertyGroup>
<PropertyGroup Condition="'$(RuntimeIdentifier)'==''">
<!-- Default values for command line builds -->
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>
<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>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="4.6.19" />
Expand All @@ -33,7 +33,7 @@
<PackageReference Include="Uno.WinUI.Lottie" Version="4.6.19" />
</ItemGroup>
<Choose>
<When Condition="'$(TargetFramework)'=='net6.0-android'">
<When Condition="'$(TargetFramework)'=='net7.0-android'">
<ItemGroup>
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
Expand All @@ -42,8 +42,8 @@
<AndroidEnvironment Include="Android/environment.conf" />
</ItemGroup>
</When>
<When Condition="'$(TargetFramework)'=='net6.0-ios'">
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
<When Condition="'$(TargetFramework)'=='net7.0-ios'">
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
Expand All @@ -54,7 +54,7 @@
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
</ItemGroup>
</When>
<When Condition="'$(TargetFramework)'=='net6.0-maccatalyst'">
<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
<PropertyGroup>
<!-- Configure the GC -->
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
Expand All @@ -69,7 +69,7 @@
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
</ItemGroup>
</When>
<When Condition="'$(TargetFramework)'=='net6.0-macos'">
<When Condition="'$(TargetFramework)'=='net7.0-macos'">
<PropertyGroup>
</PropertyGroup>
</When>
Expand All @@ -91,4 +91,4 @@

<Import Project="..\..\Uno.XamlMerge.Task\build\Uno.XamlMerge.Task.targets" />

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup Condition="exists('..\XamlMergeWinUITest.Windows')">
<EmbeddedResource Include="..\XamlMergeWinUITest.Windows\Package.appxmanifest" LogicalName="Package.appxmanifest" />
Expand Down Expand Up @@ -34,4 +34,4 @@
</ItemGroup>

<Import Project="..\..\Uno.XamlMerge.Task\build\Uno.XamlMerge.Task.targets" />
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<NoWarn>NU1701</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
Expand Down Expand Up @@ -62,4 +62,4 @@
</ItemGroup>

<Import Project="..\..\Uno.XamlMerge.Task\build\Uno.XamlMerge.Task.targets" />
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>7.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
<RootNamespace>XamlMergeWinUITest</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand Down

0 comments on commit de82876

Please sign in to comment.