Skip to content

Commit d686224

Browse files
pomianowskipomianowski
authored
feat: Update to .NET 10, bump version to 4.1.0 (#1575)
* feat: Bump .NET 10 * chore: Bump drawing common * chore: Do not fail on error * ci: Update pipelines * fix: Ignore MC3080 * drop internal for .NET 10
1 parent 9ad1d69 commit d686224

File tree

38 files changed

+175
-179
lines changed

38 files changed

+175
-179
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ dotnet_diagnostic.IDE0073.severity = error
350350

351351
dotnet_diagnostic.IDE0058.severity = silent
352352

353+
dotnet_diagnostic.MC3080.severity = none
354+
353355
# StyleCop Code Analysis
354356

355357
# Closing parenthesis should be spaced correctly: "foo()!"

‎.github/workflows/wpf-ui-cd-docs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
uses: actions/setup-node@v4
3434
with:
3535
node-version: 18.x
36-
- name: Setup .NET Core SDK 9.x
36+
- name: Setup .NET Core SDK 10.x
3737
uses: actions/setup-dotnet@v4
3838
with:
39-
dotnet-version: 9.x
39+
dotnet-version: 10.x
4040

4141
- name: Install docfx
4242
run: dotnet tool update -g docfx

‎.github/workflows/wpf-ui-cd-extension.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
run: nuget restore Wpf.Ui.sln
2525

2626
- name: Build the solution
27-
run: msbuild src\Wpf.Ui.Extension\Wpf.Ui.Extension.csproj /t:Rebuild -p:Configuration=Release -p:RestorePackages=false -p:Platform="x64" -p:ProductArchitecture="amd64" -p:GITHUB_ACTIONS=True
27+
run: msbuild src\Wpf.Ui.Extension\Wpf.Ui.Extension.csproj /t:Rebuild -p:Configuration=Release -p:RestorePackages=false -p:Platform="x64" -p:ProductArchitecture="amd64" -p:GITHUB_ACTIONS=True -p:LangVersion=8.0
2828

2929
- name: Build the solution
30-
run: msbuild src\Wpf.Ui.Extension\Wpf.Ui.Extension.csproj /t:Rebuild -p:Configuration=Release -p:RestorePackages=false -p:Platform="arm64" -p:ProductArchitecture="arm64" -p:GITHUB_ACTIONS=True
30+
run: msbuild src\Wpf.Ui.Extension\Wpf.Ui.Extension.csproj /t:Rebuild -p:Configuration=Release -p:RestorePackages=false -p:Platform="arm64" -p:ProductArchitecture="arm64" -p:GITHUB_ACTIONS=True -p:LangVersion=8.0
3131

3232
- uses: actions/upload-artifact@v4
3333
with:

‎.github/workflows/wpf-ui-cd-nuget.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
- uses: nuget/setup-nuget@v2
2222
with:
2323
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
24-
- name: Setup .NET Core SDK 9.x
24+
- name: Setup .NET Core SDK 10.x
2525
uses: actions/setup-dotnet@v4
2626
with:
27-
dotnet-version: 9.x
27+
dotnet-version: 10.x
2828

2929
- name: Fetch the certificate
3030
run: |
@@ -49,9 +49,11 @@ jobs:
4949
run: dotnet build src\Wpf.Ui.Tray\Wpf.Ui.Tray.csproj --configuration Release --no-restore -p:SourceLinkEnabled=true
5050

5151
- name: Publish the package to NuGet.org
52+
continue-on-error: true
5253
run: nuget push **\*.nupkg -NonInteractive -SkipDuplicate -Source 'https://api.nuget.org/v3/index.json'
5354

5455
- name: Publish the symbols to NuGet.org
56+
continue-on-error: true
5557
run: nuget push **\*.snupkg -NonInteractive -SkipDuplicate -Source 'https://api.nuget.org/v3/index.json'
5658

5759
- name: Upload NuGet packages as artifacts

‎.github/workflows/wpf-ui-pr-validator.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- uses: nuget/setup-nuget@v2
1818
with:
1919
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
20-
- name: Setup .NET Core SDK 9.x
20+
- name: Setup .NET Core SDK 10.x
2121
uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: 9.x
23+
dotnet-version: 10.x
2424

2525
- name: Install dependencies
2626
run: dotnet restore

‎Directory.Build.props‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<BuildToolsDirectory>$(RepositoryDirectory)build\</BuildToolsDirectory>
55
</PropertyGroup>
66
<PropertyGroup>
7-
<Version>4.0.3</Version>
8-
<AssemblyVersion>4.0.0</AssemblyVersion>
7+
<Version>4.1.0</Version>
8+
<AssemblyVersion>4.1.0</AssemblyVersion>
99
</PropertyGroup>
1010
<PropertyGroup>
1111
<Company>lepo.co</Company>
@@ -38,7 +38,7 @@
3838
</PropertyGroup>
3939
<PropertyGroup>
4040
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
41-
<LangVersion>13.0</LangVersion>
41+
<LangVersion>14.0</LangVersion>
4242
<Nullable>enable</Nullable>
4343
<!--
4444
Suppress ref safety warnings in unsafe contexts (see https://github.com/dotnet/csharplang/issues/6476).
@@ -59,7 +59,10 @@
5959
Or '$(TargetFramework)' == 'net481'
6060
Or '$(TargetFramework)' == 'net5.0'
6161
Or '$(TargetFramework)' == 'net6.0'
62-
Or '$(TargetFramework)' == 'net7.0'"
62+
Or '$(TargetFramework)' == 'net7.0'
63+
Or '$(TargetFramework)' == 'net8.0'
64+
Or '$(TargetFramework)' == 'net9.0'
65+
Or '$(TargetFramework)' == 'net10.0'"
6366
>True</IsBelowNet8
6467
>
6568
</PropertyGroup>

‎Directory.Build.targets‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,40 @@
2222
<None Include="$(RepositoryDirectory)LICENSE.md" Pack="true" PackagePath="\LICENSE.md" Visible="False" />
2323
<None Include="$(RepositoryDirectory)README.md" Pack="true" PackagePath="\README.md" Visible="False" />
2424
</ItemGroup>
25+
<ItemGroup Condition="'$(MSBuildProjectExtension)' != '.dcproj' and '$(MSBuildProjectExtension)' != '.sfproj' and '$(VisualStudioTemplateProject)' != 'true' and '$(VisualStudioExtensionProject)' != 'true'">
26+
<PackageReference Include="AsyncFixer">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29+
</PackageReference>
30+
<PackageReference Include="IDisposableAnalyzers">
31+
<PrivateAssets>all</PrivateAssets>
32+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
33+
</PackageReference>
34+
<PackageReference Include="StyleCop.Analyzers">
35+
<PrivateAssets>all</PrivateAssets>
36+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
37+
</PackageReference>
38+
<PackageReference Include="PolySharp" Condition="'$(TargetFramework)' == 'netstandard2.1'">
39+
<PrivateAssets>all</PrivateAssets>
40+
<IncludeAssets>build; analyzers</IncludeAssets>
41+
</PackageReference>
42+
<PackageReference Include="PolySharp" Condition="'$(TargetFramework)' == 'netstandard2.0'">
43+
<PrivateAssets>all</PrivateAssets>
44+
<IncludeAssets>build; analyzers</IncludeAssets>
45+
</PackageReference>
46+
<PackageReference Include="PolySharp" Condition="'$(TargetFramework)' == 'net481'">
47+
<PrivateAssets>all</PrivateAssets>
48+
<IncludeAssets>build; analyzers</IncludeAssets>
49+
</PackageReference>
50+
<PackageReference Include="PolySharp" Condition="'$(TargetFramework)' == 'net472'">
51+
<PrivateAssets>all</PrivateAssets>
52+
<IncludeAssets>build; analyzers</IncludeAssets>
53+
</PackageReference>
54+
<PackageReference Include="PolySharp" Condition="'$(TargetFramework)' == 'net462'">
55+
<PrivateAssets>all</PrivateAssets>
56+
<IncludeAssets>build; analyzers</IncludeAssets>
57+
</PackageReference>
58+
</ItemGroup>
2559
<Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
2660
<ItemGroup>
2761
<AssemblyAttribute

‎Directory.Packages.props‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
11
<Project>
22
<ItemGroup>
3+
<PackageVersion Include="AsyncFixer" Version="1.6.0" />
34
<PackageVersion Include="AwesomeAssertions" Version="9.3.0" />
45
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
56
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
67
<PackageVersion Include="FlaUI.Core" Version="5.0.0" />
78
<PackageVersion Include="FlaUI.UIA3" Version="5.0.0" />
8-
<PackageVersion Include="Lepo.i18n" Version="2.0.0" />
9+
<PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
910
<PackageVersion Include="Lepo.i18n.DependencyInjection" Version="2.0.0" />
1011
<PackageVersion Include="Lepo.i18n.Wpf" Version="2.0.0" />
12+
<PackageVersion Include="Lepo.i18n" Version="2.0.0" />
1113
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
12-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
13-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
14+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
1416
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
1517
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1618
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.2.3194" />
1719
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.12.4039" ExcludeAssets="runtime" />
1820
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069" />
19-
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2957.106" />
21+
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3595.46" />
2022
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.242" />
2123
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
2224
<PackageVersion Include="NativeMethods" Version="0.0.3" />
2325
<PackageVersion Include="NSubstitute" Version="5.3.0" />
2426
<PackageVersion Include="PolySharp" Version="1.15.0" />
25-
<PackageVersion Include="ReflectionEventing" Version="3.1.0" />
2627
<PackageVersion Include="ReflectionEventing.DependencyInjection" Version="3.1.0" />
28+
<PackageVersion Include="ReflectionEventing" Version="3.1.0" />
2729
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
28-
<PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
30+
<PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
2931
<PackageVersion Include="System.Memory" Version="4.6.3" />
3032
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
3133
<PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
3234
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
33-
<PackageVersion Include="xunit" Version="2.9.3" />
3435
<PackageVersion Include="xunit.v3" Version="3.2.0" />
36+
<PackageVersion Include="xunit" Version="2.9.3" />
3537
</ItemGroup>
36-
</Project>
38+
</Project>

‎README.md‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@
77
WPF UI provides the Fluent experience in your known and loved WPF framework. Intuitive design, themes, navigation and new immersive controls. All natively and effortlessly. Library changes the base elements like `Page`, `ToggleButton` or `List`, and also includes additional controls like `Navigation`, `NumberBox`, `Dialog` or `Snackbar`.
88

99
[![Discord](https://img.shields.io/discord/1071051348348514375?label=discord)](https://discord.gg/AR9ywDUwGq) [![GitHub license](https://img.shields.io/github/license/lepoco/wpfui)](https://github.com/lepoco/wpfui/blob/master/LICENSE) [![Nuget](https://img.shields.io/nuget/v/WPF-UI)](https://www.nuget.org/packages/WPF-UI/) [![Nuget](https://img.shields.io/nuget/dt/WPF-UI?label=nuget)](https://www.nuget.org/packages/WPF-UI/)
10+
manitarian aid directly to Ukraine.
1011

11-
![ua](https://user-images.githubusercontent.com/13592821/184498735-d296feb8-0f9b-45df-bc0d-b7f0b6f580ed.png)
12-
13-
### Deliver humanitarian aid directly to Ukraine.
14-
15-
https://bank.gov.ua/en/about/humanitarian-aid-to-ukraine
12+
<https://bank.gov.ua/en/about/humanitarian-aid-to-ukraine>
1613

1714
![ua](https://user-images.githubusercontent.com/13592821/184498735-d296feb8-0f9b-45df-bc0d-b7f0b6f580ed.png)
1815

@@ -33,18 +30,18 @@ Support the development of WPF UI and other innovative projects by becoming a sp
3330
For a starter guide see our [documentation](https://wpfui.lepo.co/documentation/).
3431

3532
**WPF UI Gallery** is a free application available in the _Microsoft Store_, with which you can test all functionalities.
36-
https://apps.microsoft.com/store/detail/wpf-ui/9N9LKV8R9VGM?cid=windows-lp-hero
33+
<https://apps.microsoft.com/store/detail/wpf-ui/9N9LKV8R9VGM?cid=windows-lp-hero>
3734

3835
```powershell
39-
$ winget install 'WPF UI'
36+
winget install 'WPF UI'
4037
```
4138

4239
**WPF UI** is delivered via **NuGet** package manager. You can find the package here:
43-
https://www.nuget.org/packages/wpf-ui/
40+
<https://www.nuget.org/packages/wpf-ui/>
4441

4542
**Visual Studio**
4643
The plugin for **Visual Studio 2022** let you easily create new projects using **WPF UI**.
47-
https://marketplace.visualstudio.com/items?itemName=lepo.wpf-ui
44+
<https://marketplace.visualstudio.com/items?itemName=lepo.wpf-ui>
4845

4946
## 📷 Screenshots
5047

@@ -62,13 +59,13 @@ https://marketplace.visualstudio.com/items?itemName=lepo.wpf-ui
6259

6360
![WPF UI Tray menu in WPF](https://user-images.githubusercontent.com/13592821/166259470-2d48a88e-47ce-4f8f-8f07-c9b110de64a5.png)
6461

65-
## ⚓ Custom Windows 11 SnapLayout available for TitleBar.
62+
## ⚓ Custom Windows 11 SnapLayout available for TitleBar
6663

6764
![WPF UI Snap Layout for WPF](https://user-images.githubusercontent.com/13592821/166259869-e60d37e4-ded4-46bf-80d9-f92c47266f34.png)
6865

6966
## 📖 Documentation
7067

71-
Documentation can be found at https://wpfui.lepo.co/. We also have a [tutorial](#-getting-started) over there for newcomers.
68+
Documentation can be found at <https://wpfui.lepo.co/>. We also have a [tutorial](#-getting-started) over there for newcomers.
7269

7370
## 🚧 Development
7471

‎samples/Wpf.Ui.Demo.Console/Wpf.Ui.Demo.Console.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,4 @@
2727
</None>
2828
</ItemGroup>
2929

30-
<ItemGroup>
31-
<PackageReference Include="PolySharp">
32-
<PrivateAssets>all</PrivateAssets>
33-
<IncludeAssets>build; analyzers</IncludeAssets>
34-
</PackageReference>
35-
</ItemGroup>
36-
3730
</Project>

0 commit comments

Comments
 (0)