Skip to content

Commit c035701

Browse files
authored
Merge pull request #38 from nventive/dev/thla/chore-dotnet8
chore!: Dotnet 8
2 parents 8b406a2 + f6e4a75 commit c035701

File tree

7 files changed

+21
-9
lines changed

7 files changed

+21
-9
lines changed

BREAKING_CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Breaking Changes
22

3+
## 3.0.0
4+
- Added support for .NET 8.
5+
- Removed support for .NET 7.
6+
37
## 2.0.0
48
* Added Support for .NET 7
59
* Updated Uno.WinUI to 5.0.19.

build/stage-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
2-
DotNetVersion: '7.0.102'
3-
UnoCheck_Version: '1.11.0'
4-
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
2+
DotNetVersion: '8.0.401'
3+
UnoCheck_Version: '1.30.1'
4+
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/0ca039bef4097295fc6c2c5c282ae18a797160c1/manifests/uno.ui.manifest.json'
55

66
steps:
77
- task: gitversion/setup@0

src/BackButtonManager.Abstractions/BackButtonManager.Abstractions.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<LangVersion>12.0</LangVersion>
45
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
56
<Authors>nventive</Authors>
67
<Company>nventive</Company>

src/BackButtonManager.Tests/BackButtonManager.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net472</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<LangVersion>12.0</LangVersion>
56
<IsPackable>false</IsPackable>
67
<AssemblyName>Chinook.BackButtonManager.Tests</AssemblyName>
78
<RootNamespace>BackButtonManager.Tests</RootNamespace>

src/BackButtonManager.Uno.WinUI/BackButtonManager.Uno.WinUI.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0;net7.0-ios;net7.0-maccatalyst;net7.0-macos;net7.0-android;net7.0-windows10.0.19041;</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net8.0-ios;net8.0-maccatalyst;net8.0-macos;net8.0-android;net8.0-windows10.0.19041;</TargetFrameworks>
4+
<LangVersion>12.0</LangVersion>
45
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
56
<GenerateLibraryLayout>true</GenerateLibraryLayout>
67
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
@@ -34,17 +35,21 @@
3435
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
3536
</ItemGroup>
3637

37-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.19041'">
38+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
3839
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.3" />
3940
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
4041
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
4142
</ItemGroup>
4243

43-
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
44+
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
45+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
46+
</PropertyGroup>
47+
48+
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
4449
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
4550
</PropertyGroup>
4651

47-
<ItemGroup Condition="'$(TargetFramework)'!='net7.0-windows10.0.19041'">
52+
<ItemGroup Condition="'$(TargetFramework)'!='net8.0-windows10.0.19041'">
4853
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
4954
<Compile Update="**\*.xaml.cs">
5055
<DependentUpon>%(Filename)</DependentUpon>

src/BackButtonManager.Uno.WinUI/winappsdk-workaround.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Workaround to avoid including Uno.Toolkit.UI XBFs in the PRI file:
44
> C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\Microsoft.Common.CurrentVersion.targets(5097,5):
5-
> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net7.0-windows10.0.19041\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
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.
66
> [D:\a\1\s\src\Uno.Toolkit.RuntimeTests\Uno.Toolkit.RuntimeTests.WinUI.csproj]
77
Just <Import /> this file into the winui project appearing in the `[]` bracket.
88
-->

src/BackButtonManager/BackButtonManager.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<LangVersion>12.0</LangVersion>
45
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
56
<Authors>nventive</Authors>
67
<Company>nventive</Company>

0 commit comments

Comments
 (0)