Skip to content

Commit 7b841d0

Browse files
author
Thomas Labrecque
committed
chore!: update dotnet 10
1 parent 45e822c commit 7b841d0

6 files changed

Lines changed: 41 additions & 22 deletions

File tree

‎BREAKING_CHANGES.md‎

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

3+
## 3.0.0
4+
5+
* Updated .NET from 7 to 10.
6+
* Updated Uno from 5 to 6.
7+
* Removed support for Mac.
8+
39
## 2.0.0
410

511
* Added support for .NET 7.

‎build/azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ variables:
1616
value: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
1717
# Pool names
1818
- name: windowsHostedAgentImage
19-
value: 'windows-2022'
19+
value: 'windows-2025'
2020

2121
stages:
2222
- stage: Build

‎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: '10.0.100'
3+
UnoCheck_Version: '1.33.1'
4+
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3bd81468f842eb34fe4760d1694baf8e4ba6edba/manifests/uno.ui.manifest.json'
55

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

‎src/MessageDialog.Tests/MessageDialog.Tests.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
12-
<PackageReference Include="Moq" Version="4.13.1" />
13-
<PackageReference Include="FluentAssertions" Version="5.9.0" />
14-
<PackageReference Include="xunit" Version="2.4.1" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
12+
<PackageReference Include="Moq" Version="4.20.72" />
13+
<PackageReference Include="FluentAssertions" Version="7.2.0" />
14+
<PackageReference Include="xunit" Version="2.9.3" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
1619
</ItemGroup>
1720
</Project>

‎src/MessageDialog.Uno.WinUI/MessageDialog.Uno.WinUI.csproj‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0;net7.0-windows10.0.19041;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
4-
<LangVersion>11.0</LangVersion>
3+
<TargetFrameworks>net10.0;net10.0-windows10.0.22621.0;net10.0-android;net10.0-ios</TargetFrameworks>
4+
<LangVersion>14</LangVersion>
55
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
66
<GenerateLibraryLayout>true</GenerateLibraryLayout>
77
<RootNamespace>MessageDialogService</RootNamespace>
@@ -17,33 +17,43 @@
1717
<PackageProjectUrl>https://github.com/nventive/MessageDialogService</PackageProjectUrl>
1818
<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
1919

20+
<!--
21+
Needed to use unsafe code for interop with WinRT.
22+
23+
WinRT.SourceGenerator\Generator.WinRTAotSourceGenerator\WinRTGenericInstantiation.g.cs(450,31,450,48):
24+
error CS0227: Unsafe code may only appear if compiling with /unsafe
25+
-->
26+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
27+
2028
<!--Needed for Source Link support -->
2129
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2230
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2331
<IncludeSymbols>true</IncludeSymbols>
2432
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2533
</PropertyGroup>
2634

27-
<ItemGroup>
28-
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
35+
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.22621.0'">
36+
<PackageReference Include="Uno.WinUI" Version="6.3.62" />
2937
</ItemGroup>
3038

3139
<ItemGroup>
3240
<!--Microsoft.SourceLink.GitHub is needed for Source Link support -->
33-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
41+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3442
</ItemGroup>
3543

36-
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
44+
<PropertyGroup Condition="'$(TargetFramework)'=='net10.0'">
3745
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
3846
</PropertyGroup>
3947

40-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.19041'">
41-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
42-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
43-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
48+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.22621.0'">
49+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
4450
</ItemGroup>
4551

46-
<ItemGroup Condition="'$(TargetFramework)'!='net7.0-windows10.0.19041'">
52+
<PropertyGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.22621.0'">
53+
<WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
54+
</PropertyGroup>
55+
56+
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.22621'">
4757
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
4858
<Compile Update="**\*.xaml.cs">
4959
<DependentUpon>%(Filename)</DependentUpon>

‎src/MessageDialog/MessageDialog.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<ItemGroup>
3232
<!--Microsoft.SourceLink.GitHub is needed for Source Link support -->
33-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
33+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3434
</ItemGroup>
3535

3636
</Project>

0 commit comments

Comments
 (0)