Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions BREAKING_CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Breaking Changes

## 4.0.0
- Updated .NET from 8 to 10.
- Updated Uno from 5 to 6.
- Removed support for MacOS target (kept Catalyst).

## 3.0.0
- Added support for .NET 8.
- Removed support for .NET 7.
Expand Down
2 changes: 1 addition & 1 deletion build/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ variables:
value: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/'))]
# Pool names
- name: windowsHostedAgentImage
value: 'windows-2022'
value: 'windows-2025'

stages:
- stage: Build
Expand Down
6 changes: 3 additions & 3 deletions build/stage-build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
DotNetVersion: '8.0.401'
UnoCheck_Version: '1.30.1'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/0ca039bef4097295fc6c2c5c282ae18a797160c1/manifests/uno.ui.manifest.json'
DotNetVersion: '10.0.100'
UnoCheck_Version: '1.33.1'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3bd81468f842eb34fe4760d1694baf8e4ba6edba/manifests/uno.ui.manifest.json'

steps:
- task: gitversion/setup@0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<LangVersion>12.0</LangVersion>
<LangVersion>14.0</LangVersion>
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
<Authors>nventive</Authors>
<Company>nventive</Company>
Expand Down Expand Up @@ -29,11 +29,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
<!-- Needed for Source Link support -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>
</Project>
20 changes: 10 additions & 10 deletions src/BackButtonManager.Tests/BackButtonManager.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12.0</LangVersion>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>14.0</LangVersion>
<IsPackable>false</IsPackable>
<AssemblyName>Chinook.BackButtonManager.Tests</AssemblyName>
<RootNamespace>BackButtonManager.Tests</RootNamespace>
<IsTestProject>True</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="FluentAssertions" Version="7.2.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
32 changes: 17 additions & 15 deletions src/BackButtonManager.Uno.WinUI/BackButtonManager.Uno.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net8.0-ios;net8.0-maccatalyst;net8.0-macos;net8.0-android;net8.0-windows10.0.19041;</TargetFrameworks>
<LangVersion>12.0</LangVersion>
<TargetFrameworks>net10.0;net10.0-ios;net10.0-maccatalyst;net10.0-android;net10.0-windows10.0.20348;</TargetFrameworks>
<LangVersion>14.0</LangVersion>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
Expand All @@ -24,31 +24,33 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
<ProjectReference Include="..\BackButtonManager.Abstractions\BackButtonManager.Abstractions.csproj" />
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.20348'">
<PackageReference Include="Uno.WinUI" Version="6.3.62" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BackButtonManager.Abstractions\BackButtonManager.Abstractions.csproj" />
<!-- Needed for Source Link support -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.3" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.20348'">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.20348'">
<WindowsSdkPackageVersion>10.0.20348.38</WindowsSdkPackageVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
<PropertyGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.20348'">
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
<PropertyGroup Condition="'$(TargetFramework)'=='net10.0'">
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'!='net8.0-windows10.0.19041'">
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.20348'">
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
<Compile Update="**\*.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon>
Expand Down
4 changes: 2 additions & 2 deletions src/BackButtonManager.Uno.WinUI/winappsdk-workaround.targets
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<Project>
<!--
Workaround to avoid including Uno.Toolkit.UI XBFs in the PRI file:
> C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\Microsoft.Common.CurrentVersion.targets(5097,5):
> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net8.0-windows10.0.19041\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net8.0-windows10.0.20348\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
> [D:\a\1\s\src\Uno.Toolkit.RuntimeTests\Uno.Toolkit.RuntimeTests.WinUI.csproj]
Just <Import /> this file into the winui project appearing in the `[]` bracket.
-->
Expand Down
6 changes: 3 additions & 3 deletions src/BackButtonManager/BackButtonManager.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<LangVersion>12.0</LangVersion>
<LangVersion>14.0</LangVersion>
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
<Authors>nventive</Authors>
<Company>nventive</Company>
Expand Down Expand Up @@ -31,11 +31,11 @@

<ItemGroup>
<ProjectReference Include="..\BackButtonManager.Abstractions\BackButtonManager.Abstractions.csproj" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
<!-- Needed for Source Link support -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>
</Project>