Skip to content

Commit

Permalink
Merge pull request #133 from punker76/jk/targetframework-cake
Browse files Browse the repository at this point in the history
Remove net452, net46, .NET Core 3.0, .NET Core 3.1 support
  • Loading branch information
punker76 authored Oct 28, 2023
2 parents 22a76e0 + 5cb58e8 commit 2884489
Show file tree
Hide file tree
Showing 24 changed files with 341 additions and 11,613 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "1.3.0",
"version": "3.1.0",
"commands": [
"dotnet-cake"
]
Expand Down
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ end_of_line = CRLF
indent_style = space
indent_size = 4

[*.{md,yml}]
[*.{md,yml,json}]
indent_style = space
indent_size = 2


[*.cs]
# WPF0011: Containing type should be used as registered owner.
dotnet_diagnostic.WPF0011.severity = error

# WPF0132: Use PART prefix.
dotnet_diagnostic.WPF0132.severity = suggestion
47 changes: 0 additions & 47 deletions .github/workflows/build.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

name: ci

on:
push:
branches:
- main
- develop
pull_request:
branches:
- develop

jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
5.x
6.x
- name: List dotnet sdks
run: dotnet --list-sdks
- name: Run the Cake script
uses: cake-build/cake-action@v1
with:
cake-version: tool-manifest
verbosity: Normal
script-path: build.cake
target: ci
env:
azure-key-vault-url: ${{ secrets.AZURE_KEY_VAULT_URL }}
azure-key-vault-client-id: ${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }}
azure-key-vault-tenant-id: ${{ secrets.AZURE_KEY_VAULT_TENANT_ID }}
azure-key-vault-client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
azure-key-vault-certificate: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE }}
4 changes: 2 additions & 2 deletions XamlStyler/Options/XAMLStyler.json → Settings.XAMLStyler
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"IndentSize": 4,
"AttributesTolerance": 2,
"KeepFirstAttributeOnSameLine": true,
"MaxAttributeCharatersPerLine": 0,
"MaxAttributeCharactersPerLine": 0,
"MaxAttributesPerLine": 1,
"NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, MultiTrigger, DataTrigger, MultiDataTrigger, Condition, Setter, SolidColorBrush",
"NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, MultiTrigger, DataTrigger, MultiDataTrigger, Condition, Setter, SolidColorBrush, Pen",
"SeparateByGroups": false,
"AttributeIndentation": 0,
"AttributeIndentationStyle": 1,
Expand Down
Binary file removed XamlStyler/CommandLine.dll
Binary file not shown.
Loading

0 comments on commit 2884489

Please sign in to comment.