Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
pomianowski authored Feb 1, 2025
2 parents 500f985 + 0fc9208 commit dc3fcfa
Show file tree
Hide file tree
Showing 488 changed files with 8,107 additions and 13,462 deletions.
16 changes: 16 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "WPF UI Docs Dev Container",
"image": "mcr.microsoft.com/dotnet/sdk:9.0",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "20"
}
},
"postCreateCommand": "./.devcontainer/post-create.sh",
"forwardPorts": [
8080
],
"remoteEnv": {
"NODE_ENV": "development"
}
}
14 changes: 14 additions & 0 deletions .devcontainer/post-create.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh

apt-get update
apt-get install -y openssh-client

cd docs/templates
npm ci
npm run build
dotnet tool install -g docfx

export PATH="$PATH:/root/.dotnet/tools"

cd ../
docfx docfx.json --serve
30 changes: 23 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ file_header_template = This Source Code Form is subject to the terms of the MIT
#### .NET Coding Conventions ####

# this. and Me. preferences
dotnet_style_qualification_for_event = false:warning
dotnet_style_qualification_for_field = false:warning
dotnet_style_qualification_for_method = false:warning
dotnet_style_qualification_for_property = false:warning
dotnet_style_qualification_for_event = false:silent
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_property = false:silent

# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true:warning
Expand Down Expand Up @@ -95,8 +95,8 @@ dotnet_style_readonly_field = true:warning

# var preferences
csharp_style_var_elsewhere = false:warning
csharp_style_var_for_built_in_types = false:warning
csharp_style_var_when_type_is_apparent = false:warning
csharp_style_var_for_built_in_types = false:none
csharp_style_var_when_type_is_apparent = false:none

# Expression-bodied members
csharp_style_expression_bodied_accessors = false:silent
Expand Down Expand Up @@ -388,7 +388,7 @@ dotnet_diagnostic.SA1633.severity = none
dotnet_diagnostic.SA1634.severity = none
dotnet_diagnostic.SA1652.severity = none

dotnet_diagnostic.IDE0009.severity = none


# Additional Stylecop Analyzers
dotnet_diagnostic.SA1111.severity = none
Expand All @@ -397,3 +397,19 @@ dotnet_diagnostic.SA1204.severity = none
dotnet_diagnostic.SA1208.severity = none
dotnet_diagnostic.SA1518.severity = none
dotnet_diagnostic.SA1615.severity = none
dotnet_diagnostic.SA1502.severity = none
dotnet_diagnostic.SA1010.severity = none # Opening square brackets should not be preceded by a space
# conflicts with collection expressions and IDE0028

# Suppress some ValueConverter warnings
dotnet_diagnostic.WPF0073.severity = none # Add ValueConversion attribute (unknown types)
dotnet_diagnostic.WPF0071.severity = none # Add ValueConversion attribute
dotnet_diagnostic.WPF0070.severity = none # Add default field to converter

# Suppress some IDE warnings
dotnet_diagnostic.IDE0290.severity = none # Use primary constructor
dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member
# 15000+ warnings in the solution
dotnet_diagnostic.CA1510.severity = none # Use ArgumentNullException throw helper
# doesn't work with older versions of .NET

4 changes: 4 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ themes:
- changed-files:
- any-glob-to-any-file: 'src/Wpf.Ui/Appearance/**'

titlebar:
- changed-files:
- any-glob-to-any-file: 'src/Wpf.Ui/Controls/TitleBar/**'

tray:
- changed-files:
- any-glob-to-any-file: 'src/Wpf.Ui.Tray/**'
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/top-issues-dashboard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: wpf-ui-top-issues-dashboard
on:
schedule:
- cron: '0 0 */1 * *'

jobs:
ShowAndLabelTopIssues:
name: Display and label top issues.
runs-on: ubuntu-latest
steps:
- name: Top Issues action
uses: rickstaa/[email protected]
env:
github_token: ${{ secrets.GITHUB_TOKEN }}
with:
top_list_size: 10
label: true
dashboard: true
dashboard_show_total_reactions: true
top_issues: true
top_bugs: true
top_features: true
feature_label: feature
top_pull_requests: true
6 changes: 3 additions & 3 deletions .github/workflows/wpf-ui-cd-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v4
uses: actions/configure-pages@v5
- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: 18.x
- name: Setup .NET Core SDK 8.x
- name: Setup .NET Core SDK 9.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x
dotnet-version: 9.x

- name: Install docfx
run: dotnet tool update -g docfx
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/wpf-ui-cd-extension.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: wpf-ui-cd-extension
on:
push:
branches: [main]
paths:
- 'src/Wpf.Ui.Extension**'

workflow_dispatch:

Expand All @@ -11,7 +13,7 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: microsoft/setup-msbuild@v1.3
- uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64
- uses: nuget/setup-nuget@v2
Expand All @@ -22,9 +24,17 @@ jobs:
run: nuget restore Wpf.Ui.sln

- 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
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

- name: Build the solution
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

- uses: actions/upload-artifact@v4
with:
name: wpf-ui-vs22-extension
name: wpf-ui-vs22-extension-x64
path: src\Wpf.Ui.Extension\bin\x64\Release\Wpf.Ui.Extension.vsix

- uses: actions/upload-artifact@v4
with:
name: wpf-ui-vs22-extension-arm64
path: src\Wpf.Ui.Extension\bin\arm64\Release\Wpf.Ui.Extension.vsix
35 changes: 29 additions & 6 deletions .github/workflows/wpf-ui-cd-nuget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: wpf-ui-cd-nuget

on:
push:
branches: [main]
branches:
- main
- release/*
paths:
- 'src/**'

workflow_dispatch:

Expand All @@ -11,28 +15,47 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: microsoft/setup-msbuild@v1.3
- uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64
- uses: nuget/setup-nuget@v2
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
- name: Setup .NET Core SDK 8.x
- name: Setup .NET Core SDK 9.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x
dotnet-version: 9.x

- name: Fetch the certificate
run: |
$signing_keys_payload = [System.Convert]::FromBase64String("${{ secrets.STRONG_NAME_KEY }}")
$currentDirectory = Get-Location
$certificatePath = Join-Path -Path $currentDirectory -ChildPath "src/lepo.snk"
[IO.File]::WriteAllBytes("$certificatePath", $signing_keys_payload)
- name: Install dependencies
run: dotnet restore

- name: Build
run: dotnet build src\Wpf.Ui\Wpf.Ui.csproj --configuration Release --no-restore
run: dotnet build src\Wpf.Ui\Wpf.Ui.csproj --configuration Release --no-restore -p:SourceLinkEnabled=true

- name: Build
run: dotnet build src\Wpf.Ui.Abstractions\Wpf.Ui.Abstractions.csproj --configuration Release --no-restore -p:SourceLinkEnabled=true

- name: Build
run: dotnet build src\Wpf.Ui.Tray\Wpf.Ui.Tray.csproj --configuration Release --no-restore
run: dotnet build src\Wpf.Ui.DependencyInjection\Wpf.Ui.DependencyInjection.csproj --configuration Release --no-restore -p:SourceLinkEnabled=true

- name: Build
run: dotnet build src\Wpf.Ui.Tray\Wpf.Ui.Tray.csproj --configuration Release --no-restore -p:SourceLinkEnabled=true

- name: Publish the package to NuGet.org
run: nuget push **\*.nupkg -NonInteractive -SkipDuplicate -Source 'https://api.nuget.org/v3/index.json'

- name: Publish the symbols to NuGet.org
run: nuget push **\*.snupkg -NonInteractive -SkipDuplicate -Source 'https://api.nuget.org/v3/index.json'

- name: Upload NuGet packages as artifacts
uses: actions/upload-artifact@v4
with:
name: nuget-packages
path: '**\*.nupkg'
22 changes: 11 additions & 11 deletions .github/workflows/wpf-ui-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ name: wpf-ui-lock

on:
schedule:
- cron: "0 0 * * *"
- cron: '0 0 * * 0'
workflow_dispatch:

permissions:
issues: write
pull-requests: write
discussions: write

concurrency:
group: lock-threads

jobs:
lock:
action:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v5
with:
# https://github.com/dessant/lock-threads
github-token: ${{ github.token }}
issue-inactive-days: "90"
exclude-issue-created-before: ""
exclude-any-issue-labels: "keep-unlocked, status:awaiting response"
add-issue-labels: "locked-due-to-inactivity"
issue-comment: ""
issue-lock-reason: "resolved"
10 changes: 4 additions & 6 deletions .github/workflows/wpf-ui-pr-validator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: wpf-ui-pr-validator

on:
pull_request:
branches: [development]
push:
branches: [development]
branches: [main]

workflow_dispatch:

Expand All @@ -13,16 +11,16 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: microsoft/setup-msbuild@v1.3
- uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64
- uses: nuget/setup-nuget@v2
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
- name: Setup .NET Core SDK 8.x
- name: Setup .NET Core SDK 9.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x
dotnet-version: 9.x

- name: Install dependencies
run: dotnet restore
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
## files generated by popular Visual Studio add-ons.
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

# Strong Name Key files
src/lepo.snk

# DocFX
docs/api/

# Desktop service store
.DS_Store

# User-specific files
*.rsuser
*.suo
Expand Down
Loading

0 comments on commit dc3fcfa

Please sign in to comment.