Skip to content
Open
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

## 3.0.0

* Updated .NET from 7 to 10.
* Updated Uno from 5 to 6.

## 2.0.0

* Added 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/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
# Pool names
- name: windowsHostedAgentImage
value: 'windows-2022'
value: 'windows-2025'

stages:
- stage: Build
Expand Down
8 changes: 4 additions & 4 deletions build/stage-build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
DotNetVersion: '7.0.102'
UnoCheck_Version: '1.11.0'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/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 Expand Up @@ -31,7 +31,7 @@ steps:

- powershell: |
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
& uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --skip androidsdk --skip androidemulator --manifest ${{ parameters.UnoCheck_Manifest }}
& uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip dotnetnewunotemplates --skip unosdk --skip vsmac
displayName: Install .NET Workloads | Uno-check
errorActionPreference: continue
ignoreLASTEXITCODE: true
Expand Down
13 changes: 8 additions & 5 deletions src/MessageDialog.Tests/MessageDialog.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="FluentAssertions" Version="5.9.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<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>
</ItemGroup>
</Project>
34 changes: 22 additions & 12 deletions src/MessageDialog.Uno.WinUI/MessageDialog.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>net7.0;net7.0-windows10.0.19041;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
<LangVersion>11.0</LangVersion>
<TargetFrameworks>net10.0;net10.0-windows10.0.22621.0;net10.0-android;net10.0-ios;net10.0-maccatalyst;net10.0-macos</TargetFrameworks>
<LangVersion>14</LangVersion>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<RootNamespace>MessageDialogService</RootNamespace>
Expand All @@ -17,33 +17,43 @@
<PackageProjectUrl>https://github.com/nventive/MessageDialogService</PackageProjectUrl>
<DefineConstants>$(DefineConstants);WINUI</DefineConstants>

<!--
Needed to use unsafe code for interop with WinRT.

WinRT.SourceGenerator\Generator.WinRTAotSourceGenerator\WinRTGenericInstantiation.g.cs(450,31,450,48):
error CS0227: Unsafe code may only appear if compiling with /unsafe
-->
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!--Needed for Source Link support -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.22621.0'">
<PackageReference Include="Uno.WinUI" Version="6.3.62" />
</ItemGroup>

<ItemGroup>
<!--Microsoft.SourceLink.GitHub is 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>

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

<ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.19041'">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
<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 Condition="'$(TargetFramework)'=='net10.0-windows10.0.22621.0'">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'!='net7.0-windows10.0.19041'">
<PropertyGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.22621.0'">
<WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.22621.0'">
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
<Compile Update="**\*.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon>
Expand Down
2 changes: 1 addition & 1 deletion src/MessageDialog/MessageDialog.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<!--Microsoft.SourceLink.GitHub is 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>
Loading