Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge development branch #721

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 8 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,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 = true:warning
csharp_style_var_when_type_is_apparent = true:warning

# Expression-bodied members
csharp_style_expression_bodied_accessors = false:silent
Expand Down Expand Up @@ -361,6 +361,12 @@ dotnet_diagnostic.CA2240.severity = warning
dotnet_diagnostic.CA2241.severity = warning
dotnet_diagnostic.CA2242.severity = warning

# Stylecop Analyzers
dotnet_diagnostic.SA1111.severity = none
dotnet_diagnostic.SA1121.severity = none
dotnet_diagnostic.SA1208.severity = none
dotnet_diagnostic.SA1518.severity = none

# Require file header OR A source file contains a header that does not match the required text
dotnet_diagnostic.IDE0073.severity = error

Expand Down
33 changes: 16 additions & 17 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@
version: 2

updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
target-branch: "development"
directory: "/"
schedule:
interval: "daily"
labels:
- "Actions"

# Maintain dependencies for nuget
- package-ecosystem: "nuget"
target-branch: "development"
directory: "src"
schedule:
interval: "daily"
labels:
- "NuGet"
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
target-branch: "development"
directory: "/"
schedule:
interval: "daily"
labels:
- "Actions"
# Maintain dependencies for nuget
- package-ecosystem: "nuget"
target-branch: "development"
directory: "src"
schedule:
interval: "daily"
labels:
- "NuGet"
15 changes: 0 additions & 15 deletions .github/workflows/labeler.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/lock.yml

This file was deleted.

65 changes: 65 additions & 0 deletions .github/workflows/wpf-ui-cd-docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: wpf-ui-cd-docs

on:
push:
branches: [main]

workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
deploy_docs:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
- name: Setup .NET Core SDK 7.x
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.x

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

- name: Install dependencies
run: dotnet restore

- name: Install template dependencies
run: npm Install
working-directory: docs/templates

- name: Build docfx template
run: npm run build
working-directory: docs/templates

- name: docfx Build
run: docfx docs/docfx.json

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

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
30 changes: 30 additions & 0 deletions .github/workflows/wpf-ui-cd-extension.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: wpf-ui-cd-extension

on:
push:
branches: [main]

workflow_dispatch:

jobs:
deploy_extension:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: microsoft/[email protected]
with:
msbuild-architecture: x64
- uses: nuget/setup-nuget@v1
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}

- name: Restore dependencies
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

- uses: actions/upload-artifact@v3
with:
name: wpf-ui-vs22-extension
path: src\Wpf.Ui.Extension\bin\x64\Release\Wpf.Ui.Extension.vsix
38 changes: 38 additions & 0 deletions .github/workflows/wpf-ui-cd-nuget.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: wpf-ui-cd-nuget

on:
push:
branches: [main]

workflow_dispatch:

jobs:
deploy_nuget:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: microsoft/[email protected]
with:
msbuild-architecture: x64
- uses: nuget/setup-nuget@v1
with:
nuget-api-key: ${{ secrets.NUGET_API_KEY }}
- name: Setup .NET Core SDK 7.x
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.x

- name: Install dependencies
run: dotnet restore

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

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

- 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'
50 changes: 0 additions & 50 deletions .github/workflows/wpf-ui-docs.yaml

This file was deleted.

15 changes: 15 additions & 0 deletions .github/workflows/wpf-ui-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: wpf-ui-labeler

on:
- pull_request_target

jobs:
triage:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
20 changes: 20 additions & 0 deletions .github/workflows/wpf-ui-lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: wpf-ui-lock

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

jobs:
lock:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v4
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"
31 changes: 0 additions & 31 deletions .github/workflows/wpf-ui-pr-deploy.yaml

This file was deleted.

Loading
Loading