diff --git a/.github/workflows/build-net40.yml b/.github/workflows/build-net40.yml index 52a0d9ba..8bf4ec04 100644 --- a/.github/workflows/build-net40.yml +++ b/.github/workflows/build-net40.yml @@ -43,5 +43,8 @@ jobs: uses: actions/upload-artifact@v4 with: name: wpfdevelopers-net40 - path: OutPut/**/WPFDevelopers.dll + path: | + OutPut/**/WPFDevelopers.dll + OutPut/**/en-US/WPFDevelopers.resources.dll + OutPut/**/ko-KR/WPFDevelopers.resources.dll if-no-files-found: error diff --git a/.github/workflows/build-net45x.yml b/.github/workflows/build-net45x.yml index 7c773fcd..fc5a6c48 100644 --- a/.github/workflows/build-net45x.yml +++ b/.github/workflows/build-net45x.yml @@ -54,9 +54,33 @@ jobs: } } + - name: Rename windows folders to windows7 + shell: pwsh + run: | + if (-not (Test-Path OutPut)) { + exit 0 + } + + Get-ChildItem OutPut -Directory | + Where-Object { $_.Name -match '^net\d+\.\d+-windows$' } | + ForEach-Object { + $source = $_.FullName + $alias = Join-Path $_.Parent.FullName ($_.Name + '7') + + if (Test-Path $alias) { + Remove-Item $alias -Recurse -Force + } + + Move-Item $source $alias + Write-Host "Renamed folder: $source -> $alias" + } + - name: Upload artifacts uses: actions/upload-artifact@v4 with: name: wpfdevelopers-net45x - path: OutPut/**/WPFDevelopers.dll + path: | + OutPut/**/WPFDevelopers.dll + OutPut/**/en-US/WPFDevelopers.resources.dll + OutPut/**/ko-KR/WPFDevelopers.resources.dll if-no-files-found: error diff --git a/README.md b/README.md index d47ca0a1..ebaadbc5 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,16 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers" `xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"` +---------- +### MarkdownViewer + + + +---------- +### SwitchTheme + + + ---------- ### CircleMenu diff --git a/docs/en/getting-started.md b/docs/en/getting-started.md index 1b41409c..506aa3b6 100644 --- a/docs/en/getting-started.md +++ b/docs/en/getting-started.md @@ -98,6 +98,24 @@ Then use WD controls: ``` +### MarkdownViewer Example + +`wd:MarkdownViewer` is used to render Markdown content (headings, lists, quotes, code blocks, tables, links, and images). + +```xml + + + +``` + +You can find the complete sample here: + +- `src/WPFDevelopers.Samples.Shared/ExampleViews/MarkdownViewerExample.xaml` +- `src/WPFDevelopers.Samples.Shared/ExampleViews/MarkdownViewerExample.xaml.cs` + --- ## Three Usage Patterns diff --git a/docs/zh/getting-started.md b/docs/zh/getting-started.md index e7cc2d99..691920e5 100644 --- a/docs/zh/getting-started.md +++ b/docs/zh/getting-started.md @@ -98,6 +98,24 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers" ``` +### MarkdownViewer 示例 + +`wd:MarkdownViewer` 用于渲染 Markdown 内容(标题、列表、引用、代码块、表格、链接、图片等)。 + +```xml + + + +``` + +完整示例可参考: + +- `src/WPFDevelopers.Samples.Shared/ExampleViews/MarkdownViewerExample.xaml` +- `src/WPFDevelopers.Samples.Shared/ExampleViews/MarkdownViewerExample.xaml.cs` + --- ## 三种使用方式 diff --git a/src/Package.props b/src/Package.props index 89725a14..b5e56924 100644 --- a/src/Package.props +++ b/src/Package.props @@ -7,10 +7,10 @@ true snupkg Copyright © WPFDevelopersOrg 2026 - 0.1.0.0 - 0.1.0.0 - 0.1.0.0 + 0.2.0.0 + 0.2.0.0 + 0.2.0.0 https://github.com/WPFDevelopersOrg/WPFDevelopers Debug;Release;Debug-.NET40;Release-.NET40 - \ No newline at end of file + diff --git a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj index e5b3510a..89c3cb42 100644 --- a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj +++ b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj @@ -3,7 +3,6 @@ PackageReference net40 - True @@ -23,4 +22,4 @@ - \ No newline at end of file + diff --git a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj index ce8fd42d..d1305be6 100644 --- a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj +++ b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj @@ -3,7 +3,6 @@ true - True @@ -17,4 +16,4 @@ - \ No newline at end of file + diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Basics/ThemeExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Basics/ThemeExample.xaml index cec219f2..640780d7 100644 --- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Basics/ThemeExample.xaml +++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Basics/ThemeExample.xaml @@ -55,13 +55,32 @@ FontSize="20" Text="Light | Dark" /> - - - + + + + + + + + + + - - - - -