Skip to content

Commit

Permalink
Merge pull request #930 from lepoco/development
Browse files Browse the repository at this point in the history
Release 3.0.0
  • Loading branch information
pomianowski committed Feb 4, 2024
2 parents 7fcc2d8 + fef4028 commit baaf749
Show file tree
Hide file tree
Showing 235 changed files with 3,200 additions and 1,447 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/wpf-ui-cd-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:
run: docfx docs/docfx.json

- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: docs/_site/

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v3
uses: actions/deploy-pages@v4
4 changes: 2 additions & 2 deletions .github/workflows/wpf-ui-cd-extension.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: microsoft/setup-msbuild@v1.3
with:
msbuild-architecture: x64
- uses: nuget/setup-nuget@v1
- uses: nuget/setup-nuget@v2
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}

Expand All @@ -24,7 +24,7 @@ jobs:
- name: Build the solution
run: msbuild src\Wpf.Ui.Extension\Wpf.Ui.Extension.csproj /t:Rebuild -p:Configuration=Release -p:RestorePackages=false -p:Platform="x64" -p:GITHUB_ACTIONS=True

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wpf-ui-vs22-extension
path: src\Wpf.Ui.Extension\bin\x64\Release\Wpf.Ui.Extension.vsix
2 changes: 1 addition & 1 deletion .github/workflows/wpf-ui-cd-nuget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: microsoft/setup-msbuild@v1.3
with:
msbuild-architecture: x64
- uses: nuget/setup-nuget@v1
- uses: nuget/setup-nuget@v2
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
- name: Setup .NET Core SDK 8.x
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wpf-ui-pr-validator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: microsoft/setup-msbuild@v1.3
with:
msbuild-architecture: x64
- uses: nuget/setup-nuget@v1
- uses: nuget/setup-nuget@v2
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
- name: Setup .NET Core SDK 8.x
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<Version>3.0.0-preview.13</Version>
<Version>3.0.0</Version>
<LangVersion>12.0</LangVersion>
<Deterministic>true</Deterministic>
</PropertyGroup>
Expand All @@ -16,7 +16,7 @@
<PropertyGroup>
<Authors>lepo.co</Authors>
<Company>lepo.co</Company>
<Copyright>Copyright (C) 2021-2023 Leszek Pomianowski and WPF UI Contributors</Copyright>
<Copyright>Copyright (C) 2021-2024 Leszek Pomianowski and WPF UI Contributors</Copyright>
</PropertyGroup>

<PropertyGroup>
Expand Down
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,19 @@ First, your application needs to load custom styles, add in the **MyApp\App.xaml
</Application>
```

If your application does not have **MyApp\App.xaml** file, use `ApplicationThemeManager.Apply(frameworkElement)` to apply/update the theme resource in the `frameworkElement`.

```C#
public partial class MainWindow
{
public MainWindow()
{
InitializeComponent();
ApplicationThemeManager.Apply(this);
}
}
```

Now you can create fantastic apps, e.g. with one button:

```xml
Expand Down
26 changes: 23 additions & 3 deletions Wpf.Ui.sln
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wpf.Ui.ToastNotifications",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wpf.Ui.Tray", "src\Wpf.Ui.Tray\Wpf.Ui.Tray.csproj", "{073BF126-377B-49CD-838A-E8B779EB4862}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.Ui.SyntaxHighlight", "src\Wpf.Ui.SyntaxHighlight\Wpf.Ui.SyntaxHighlight.csproj", "{07F7A65A-6061-4606-ACA2-F8D1A3D0E19A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wpf.Ui.SyntaxHighlight", "src\Wpf.Ui.SyntaxHighlight\Wpf.Ui.SyntaxHighlight.csproj", "{07F7A65A-6061-4606-ACA2-F8D1A3D0E19A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wpf.Ui.Demo.Console", "src\Wpf.Ui.Demo.Console\Wpf.Ui.Demo.Console.csproj", "{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -72,8 +74,8 @@ Global
{E55BFB14-9DA6-434A-8153-BFE124D71818}.Release|arm64.Build.0 = Release|Any CPU
{E55BFB14-9DA6-434A-8153-BFE124D71818}.Release|x64.ActiveCfg = Release|x64
{E55BFB14-9DA6-434A-8153-BFE124D71818}.Release|x64.Build.0 = Release|x64
{E55BFB14-9DA6-434A-8153-BFE124D71818}.Release|x86.ActiveCfg = Release|Any CPU
{E55BFB14-9DA6-434A-8153-BFE124D71818}.Release|x86.Build.0 = Release|Any CPU
{E55BFB14-9DA6-434A-8153-BFE124D71818}.Release|x86.ActiveCfg = Release|x86
{E55BFB14-9DA6-434A-8153-BFE124D71818}.Release|x86.Build.0 = Release|x86
{1ADC87D1-8963-4100-845A-18477824718E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1ADC87D1-8963-4100-845A-18477824718E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1ADC87D1-8963-4100-845A-18477824718E}.Debug|arm64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -151,6 +153,8 @@ Global
{50C713C3-555E-491F-87EE-C806BEC0579F}.Release|arm64.Build.0 = Release|ARM64
{50C713C3-555E-491F-87EE-C806BEC0579F}.Release|arm64.Deploy.0 = Release|ARM64
{50C713C3-555E-491F-87EE-C806BEC0579F}.Release|x64.ActiveCfg = Release|x64
{50C713C3-555E-491F-87EE-C806BEC0579F}.Release|x64.Build.0 = Release|x64
{50C713C3-555E-491F-87EE-C806BEC0579F}.Release|x64.Deploy.0 = Release|x64
{50C713C3-555E-491F-87EE-C806BEC0579F}.Release|x86.ActiveCfg = Release|x86
{50C713C3-555E-491F-87EE-C806BEC0579F}.Release|x86.Build.0 = Release|x86
{50C713C3-555E-491F-87EE-C806BEC0579F}.Release|x86.Deploy.0 = Release|x86
Expand Down Expand Up @@ -298,6 +302,22 @@ Global
{07F7A65A-6061-4606-ACA2-F8D1A3D0E19A}.Release|x64.Build.0 = Release|Any CPU
{07F7A65A-6061-4606-ACA2-F8D1A3D0E19A}.Release|x86.ActiveCfg = Release|Any CPU
{07F7A65A-6061-4606-ACA2-F8D1A3D0E19A}.Release|x86.Build.0 = Release|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Debug|arm64.ActiveCfg = Debug|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Debug|arm64.Build.0 = Debug|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Debug|x64.ActiveCfg = Debug|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Debug|x64.Build.0 = Debug|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Debug|x86.ActiveCfg = Debug|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Debug|x86.Build.0 = Debug|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Release|Any CPU.Build.0 = Release|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Release|arm64.ActiveCfg = Release|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Release|arm64.Build.0 = Release|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Release|x64.ActiveCfg = Release|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Release|x64.Build.0 = Release|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Release|x86.ActiveCfg = Release|Any CPU
{1FB6D1C2-B2E7-48F5-B5BA-9F0CA4F1B826}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 2 additions & 2 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0scripts\build_demo.ps1""""
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""""
@REM powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0scripts\build_extension.ps1""""
exit /b %ErrorLevel%
exit /b %ErrorLevel%
36 changes: 36 additions & 0 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
$wingetVersion = & winget --version 2>$null

if ($wingetVersion -eq $null) {
Write-Output "winget is not installed. Starting installation..."

Invoke-WebRequest -Uri "https://github.com/microsoft/winget-cli/releases/download/v1.6.3482/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle" -OutFile "$env:TEMP\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"

Add-AppxPackage -Path "$env:TEMP\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"

Write-Output "winget has been installed."
}

$dotnetVersion = & dotnet --version 2>$null

if ($dotnetVersion -eq $null) {
Write-Output ".NET SDK is not installed."

winget install Microsoft.DotNet.SDK.8
} else {
$majorVersion = $dotnetVersion.Split('.')[0]

if ($majorVersion -ge 8) {
Write-Output ".NET SDK version is $dotnetVersion, which is 8.0.0 or newer."
} else {
Write-Output ".NET SDK version is $dotnetVersion, which is older than 8.0.0."

winget install Microsoft.DotNet.SDK.8
}
}

if ($env:PROCESSOR_ARCHITECTURE -eq "AMD64") {
dotnet restore Wpf.Ui.sln /tl
dotnet build src\Wpf.Ui.Gallery\Wpf.Ui.Gallery.csproj --configuration Release --no-restore --verbosity quiet /tl
} else {
Write-Host "Not in the x64 desktop environment."
}
2 changes: 1 addition & 1 deletion docs/documentation/extension.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ https://marketplace.visualstudio.com/items?itemName=lepo.wpf-ui

After creating a project, you can familiarize yourself with its structure and proceed to further steps.

- [WPF UI - Getting started](/tutorial/getting-started.html)
- [WPF UI - Getting started](/documentation/getting-started)
- [Introduction to the MVVM Toolkit](https://learn.microsoft.com/en-us/windows/communitytoolkit/mvvm/introduction)
- [.NET Generic Host in ASP.NET Core](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/host/generic-host?view=aspnetcore-6.0)
1 change: 0 additions & 1 deletion etc/build_demo.ps1

This file was deleted.

1 change: 0 additions & 1 deletion etc/build_extension.ps1

This file was deleted.

1 change: 0 additions & 1 deletion etc/build_library.ps1

This file was deleted.

127 changes: 0 additions & 127 deletions etc/dotnet_build.ps1

This file was deleted.

Loading

0 comments on commit baaf749

Please sign in to comment.