Skip to content

Commit 75aa3f8

Browse files
pomianowskipomianowski
authored
Bump version, add migration instructions for WPF UI v3 and v4 and update package configuration (#1353)
1 parent a8917ca commit 75aa3f8

File tree

22 files changed

+259
-116
lines changed

22 files changed

+259
-116
lines changed

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<Version>4.0.0</Version>
9+
<Version>4.0.1</Version>
1010
<AssemblyVersion>4.0.0</AssemblyVersion>
1111
</PropertyGroup>
1212

‎Wpf.Ui.sln

+30-66
Large diffs are not rendered by default.

‎docs/migration/v2-migration.md

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# Migration plan
2+
3+
This page outlines key changes and important details to consider when migrating. It highlights what’s new, what’s changed, and any steps you need to take to ensure a smooth transition. This isn’t a full step-by-step guide but a quick reference to help you navigate the most critical parts of the migration process.
4+
5+
## Key changes in v2
6+
7+
### Global namespace change
8+
9+
In version 2.0 the namespace has been changed from `WPF-UI` to the more .NET compatible `Wpf.Ui`. The package name has not been changed to maintain branding and consistency.
10+
11+
### Navigation
12+
13+
The navigation control has been rewritten yet again, making it almost completely incompatible.
14+
15+
All navigation controls inherit from `Wpf.Ui.Controls.Navigation.NavigationBase` base class.
16+
17+
```xml
18+
<ui:NavigationStore
19+
Frame="{Binding ElementName=RootFrame}"
20+
Precache="False"
21+
SelectedPageIndex="-1"
22+
TransitionDuration="200"
23+
TransitionType="FadeInWithSlide">
24+
<ui:NavigationStore.Items>
25+
<ui:NavigationItem
26+
Cache="True"
27+
Content="Home"
28+
Icon="Home24"
29+
PageTag="dashboard"
30+
PageType="{x:Type pages:Dashboard}" />
31+
<ui:NavigationSeparator />
32+
</ui:NavigationStore.Items>
33+
<ui:NavigationStore.Footer>
34+
<ui:NavigationItem
35+
Click="NavigationButtonTheme_OnClick"
36+
Content="Theme"
37+
Icon="DarkTheme24" />
38+
</ui:NavigationStore.Footer>
39+
</ui:NavigationStore>
40+
```
41+
42+
```xml
43+
<ui:NavigationFluent
44+
Frame="{Binding ElementName=RootFrame}"
45+
Precache="False"
46+
SelectedPageIndex="-1"
47+
TransitionDuration="200"
48+
TransitionType="FadeInWithSlide">
49+
<ui:NavigationFluent.Items>
50+
<ui:NavigationItem
51+
Cache="True"
52+
Content="Home"
53+
Icon="Home24"
54+
PageTag="dashboard"
55+
PageType="{x:Type pages:Dashboard}" />
56+
<ui:NavigationSeparator />
57+
</ui:NavigationFluent.Items>
58+
<ui:NavigationFluent.Footer>
59+
<ui:NavigationItem
60+
Click="NavigationButtonTheme_OnClick"
61+
Content="Theme"
62+
Icon="DarkTheme24" />
63+
</ui:NavigationFluent.Footer>
64+
</ui:NavigationFluent>
65+
```
66+
67+
```xml
68+
<ui:NavigationCompact
69+
Frame="{Binding ElementName=RootFrame}"
70+
Precache="False"
71+
SelectedPageIndex="-1"
72+
TransitionDuration="200"
73+
TransitionType="FadeInWithSlide">
74+
<ui:NavigationCompact.Items>
75+
<ui:NavigationItem
76+
Cache="True"
77+
Content="Home"
78+
Icon="Home24"
79+
PageTag="dashboard"
80+
PageType="{x:Type pages:Dashboard}" />
81+
<ui:NavigationSeparator />
82+
</ui:NavigationCompact.Items>
83+
<ui:NavigationCompact.Footer>
84+
<ui:NavigationItem
85+
Click="NavigationButtonTheme_OnClick"
86+
Content="Theme"
87+
Icon="DarkTheme24" />
88+
</ui:NavigationCompact.Footer>
89+
</ui:NavigationCompact>
90+
```
91+
92+
### Titlebar
93+
94+
The titlebar control has been rewritten yet again, making it almost completely incompatible.

‎docs/migration/v3-migration.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Migration plan
2+
3+
This page outlines key changes and important details to consider when migrating. It highlights what’s new, what’s changed, and any steps you need to take to ensure a smooth transition. This isn’t a full step-by-step guide but a quick reference to help you navigate the most critical parts of the migration process.
4+
5+
## Navigation
6+
7+
All navigation controls have been merged into one `NavigationView`, inspired by Win UI.
8+
9+
## Icons
10+
11+
All icons are based on the new `IconElement` control. They replaced icons in `TitleBar`, `NavigationView`, `Button` and other controls.
12+
13+
## Control Gallery
14+
15+
Inspired by **Win UI Controls Gallery**, a new application for testing and browsing controls was created -** WPF UI Gallery**. It replaced the Demo app.
16+
17+
## Dialogs
18+
19+
`ContentDialog`, `MessageBox` and `Snackbar` have been modified, their interfaces are not fully compatible.

‎docs/migration/v4-migration.md

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Migration plan
2+
3+
This page outlines key changes and important details to consider when migrating. It highlights what’s new, what’s changed, and any steps you need to take to ensure a smooth transition. This isn’t a full step-by-step guide but a quick reference to help you navigate the most critical parts of the migration process.
4+
5+
## Abstractions package
6+
7+
Some WPF UI interfaces have been moved to a standalone package **WPF-UI.Abstractions**. You don't need to reference it, it will always be added automatically with **WPF-UI** NuGet package.
8+
9+
## Navigation interfaces
10+
11+
Navigation interfaces have been moved to a standalone **WPF-UI.Abstractions** package. This way, if you have models, views or other business services in another project, not related to WPF, you can develop them together for multiple applications.
12+
13+
### New namespaces
14+
15+
`INavigationAware` and `INavigableView` have beed moved to `Wpf.Ui.Abstractions.Controls` namespace.
16+
17+
### Dependency injection based page creation
18+
19+
`IPageService` have been renamed to `INavigationViewPageProvider`.
20+
21+
Its default implementation is in the new **Wpf.Ui.DependencyInjection** package. You just need to use the `services.AddNavigationViewPageProvider()` extension and then indicate in the navigation that you want to use this interface. Then `NavigationView` will use DI container for pages creation.
22+
23+
**Program.cs**
24+
```csharp
25+
var builder = Host.CreateDefaultBuilder();
26+
builder.Services.AddNavigationViewPageProvider();
27+
```
28+
29+
**MyWindow.xaml.cs**
30+
```csharp
31+
var pageProvider = serviceProvider.GetRequiredService<INavigationViewPageProvider>();
32+
33+
// NavigationControl is x:Name of our NavigationView defined in XAML.
34+
NavigationControl.SetPageProviderService(pageProvider)
35+
```
36+
37+
### Navigation service
38+
39+
The `INavigationService` defined in the main package (**WPF-UI**) makes navigation management easy. You can use it for convenient injection between view models. We **HIGHLY** recommend it to be Singleton.
40+
41+
```csharp
42+
var builder = Host.CreateDefaultBuilder();
43+
builder.Services.AddNavigationViewPageProvider();
44+
builder.Services.AddSingleton<INavigationService, NavigationService>();
45+
```

‎docs/toc.yml

+9
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,14 @@ items:
2828
href: documentation/releases.md
2929
- name: API v4.0
3030
href: api/
31+
- name: Migration
32+
href: /migration
33+
items:
34+
- name: Key changes in v4
35+
href: migration/v4-migration.md
36+
- name: Key changes in v3
37+
href: migration/v3-migration.md
38+
- name: Key changes in v2
39+
href: migration/v2-migration.md
3140
- name: Support plans
3241
href: https://lepo.co/support

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
5+
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
66
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
77
<UseWPF>true</UseWPF>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<ApplicationIcon>applicationIcon.ico</ApplicationIcon>
10-
<Platforms>AnyCPU;x64</Platforms>
1110
<NoWarn>$(NoWarn);SA1601</NoWarn>
1211
</PropertyGroup>
1312

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
5+
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
66
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
77
<UseWPF>true</UseWPF>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<ApplicationIcon>applicationIcon.ico</ApplicationIcon>
10-
<Platforms>AnyCPU;x64</Platforms>
1110
<NoWarn>$(NoWarn);SA1601</NoWarn>
1211
</PropertyGroup>
1312

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
5+
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
66
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
77
<UseWPF>true</UseWPF>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<ApplicationIcon>applicationIcon.ico</ApplicationIcon>
10-
<Platforms>AnyCPU;x64</Platforms>
1110
<NoWarn>$(NoWarn);SA1601</NoWarn>
1211
</PropertyGroup>
1312

‎src/Wpf.Ui.Extension.Template.Blank/Wpf.Ui.Blank.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="WPF-UI" Version="4.0.0" />
18+
<PackageReference Include="WPF-UI" Version="4.0.1" />
19+
<PackageReference Include="WPF-UI.DependencyInjection" Version="4.0.1" />
1920
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
2021
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0 "/>
2122
</ItemGroup>

‎src/Wpf.Ui.Extension.Template.Compact/Wpf.Ui.Compact.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="WPF-UI" Version="4.0.0" />
19-
<PackageReference Include="WPF-UI.DependencyInjection" Version="4.0.0" />
18+
<PackageReference Include="WPF-UI" Version="4.0.1" />
19+
<PackageReference Include="WPF-UI.DependencyInjection" Version="4.0.1" />
2020
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
2121
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0 "/>
2222
</ItemGroup>

‎src/Wpf.Ui.Extension.Template.Fluent/Wpf.Ui.Fluent.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="WPF-UI" Version="4.0.0" />
19-
<PackageReference Include="WPF-UI.DependencyInjection" Version="4.0.0" />
18+
<PackageReference Include="WPF-UI" Version="4.0.1" />
19+
<PackageReference Include="WPF-UI.DependencyInjection" Version="4.0.1" />
2020
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
2121
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0 "/>
2222
</ItemGroup>

‎src/Wpf.Ui.Gallery.Package/Wpf.Ui.Gallery.Package.wapproj

+27-16
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,13 @@
2020
<Configuration>Release</Configuration>
2121
<Platform>x64</Platform>
2222
</ProjectConfiguration>
23-
<ProjectConfiguration Include="Debug|ARM">
23+
<ProjectConfiguration Include="Debug|arm64">
2424
<Configuration>Debug</Configuration>
25-
<Platform>ARM</Platform>
25+
<Platform>arm64</Platform>
2626
</ProjectConfiguration>
27-
<ProjectConfiguration Include="Release|ARM">
27+
<ProjectConfiguration Include="Release|arm64">
2828
<Configuration>Release</Configuration>
29-
<Platform>ARM</Platform>
30-
</ProjectConfiguration>
31-
<ProjectConfiguration Include="Debug|ARM64">
32-
<Configuration>Debug</Configuration>
33-
<Platform>ARM64</Platform>
34-
</ProjectConfiguration>
35-
<ProjectConfiguration Include="Release|ARM64">
36-
<Configuration>Release</Configuration>
37-
<Platform>ARM64</Platform>
29+
<Platform>arm64</Platform>
3830
</ProjectConfiguration>
3931
<ProjectConfiguration Include="Debug|AnyCPU">
4032
<Configuration>Debug</Configuration>
@@ -51,18 +43,37 @@
5143
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
5244
<PropertyGroup>
5345
<ProjectGuid>50c713c3-555e-491f-87ee-c806bec0579f</ProjectGuid>
54-
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
55-
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
46+
<TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
47+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
5648
<DefaultLanguage>en-US</DefaultLanguage>
5749
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
5850
<NoWarn>$(NoWarn);NU1701;NU1702</NoWarn>
5951
<EntryPointProjectUniqueName>..\Wpf.Ui.Gallery\Wpf.Ui.Gallery.csproj</EntryPointProjectUniqueName>
6052
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
6153
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
62-
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
54+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
6355
<GenerateTestArtifacts>True</GenerateTestArtifacts>
64-
<AppxBundlePlatforms>x86</AppxBundlePlatforms>
56+
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
6557
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
58+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
59+
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
61+
<AppxBundle>Always</AppxBundle>
62+
</PropertyGroup>
63+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
64+
<AppxBundle>Always</AppxBundle>
65+
</PropertyGroup>
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67+
<AppxBundle>Always</AppxBundle>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
70+
<AppxBundle>Always</AppxBundle>
71+
</PropertyGroup>
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
73+
<AppxBundle>Always</AppxBundle>
74+
</PropertyGroup>
75+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
76+
<AppxBundle>Always</AppxBundle>
6677
</PropertyGroup>
6778
<ItemGroup>
6879
<AppxManifest Include="Package.appxmanifest">

‎src/Wpf.Ui.Gallery/Controllers/MonacoController.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public void DispatchScript(string script)
7575
return;
7676
}
7777

78-
_ = Application.Current.Dispatcher.InvokeAsync(async () => await _webView!.ExecuteScriptAsync(script));
78+
_ = Application.Current.Dispatcher.InvokeAsync(
79+
async () => await _webView!.ExecuteScriptAsync(script)
80+
);
7981
}
8082
}

‎src/Wpf.Ui.Gallery/Controls/GalleryNavigationPresenter.xaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
</ui:CardAction.Icon>
3939
<StackPanel>
4040
<ui:TextBlock
41+
FontSize="16"
4142
FontTypography="BodyStrong"
4243
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
4344
Text="{Binding Name, Mode=OneTime}"
44-
TextWrapping="Wrap"
45-
FontSize="16"/>
45+
TextWrapping="Wrap" />
4646
<ui:TextBlock
4747
Appearance="Secondary"
48+
FontSize="12"
4849
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
4950
Text="{Binding Description, Mode=OneTime}"
50-
TextWrapping="Wrap"
51-
FontSize="12"/>
51+
TextWrapping="Wrap" />
5252
</StackPanel>
5353
</ui:CardAction>
5454
</DataTemplate>

‎src/Wpf.Ui.Gallery/Wpf.Ui.Gallery.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<RootNamespace>Wpf.Ui.Gallery</RootNamespace>
55
<OutputType>WinExe</OutputType>
6-
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
6+
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
77
<SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
88
<UseWPF>true</UseWPF>
99
<EnableWindowsTargeting>true</EnableWindowsTargeting>
1010
<ApplicationIcon>wpfui.ico</ApplicationIcon>
1111
<ApplicationManifest>app.manifest</ApplicationManifest>
1212
<NoWarn>$(NoWarn);SA1601</NoWarn>
1313
<GenerateDocumentationFile>True</GenerateDocumentationFile>
14+
<Platforms>AnyCPU;x86;x64;arm64</Platforms>
1415
</PropertyGroup>
1516

1617
<ItemGroup>

‎src/Wpf.Ui/Controls/Arc/Arc.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ static Arc()
5757
// Modify the metadata of the StrokeStartLineCap dependency property.
5858
StrokeStartLineCapProperty.OverrideMetadata(
5959
typeof(Arc),
60-
new PropertyMetadata(PenLineCap.Round, PropertyChangedCallback));
60+
new PropertyMetadata(PenLineCap.Round, PropertyChangedCallback)
61+
);
6162
}
6263

6364
/// <summary>

0 commit comments

Comments
 (0)