Skip to content

Commit 0f6b66c

Browse files
committed
Merge branch 'develop'
2 parents 2b994c0 + e15a04c commit 0f6b66c

File tree

664 files changed

+52020
-62289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

664 files changed

+52020
-62289
lines changed

.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"cake.tool": {
6+
"version": "2.3.0",
7+
"commands": [
8+
"dotnet-cake"
9+
]
10+
}
11+
}
12+
}

.github/workflows/ci.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: ci
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- develop
8+
pull_request:
9+
branches:
10+
- develop
11+
12+
jobs:
13+
windows-latest:
14+
name: windows-latest
15+
runs-on: windows-latest
16+
steps:
17+
- uses: actions/checkout@v1
18+
- name: Setup .NET
19+
uses: actions/setup-dotnet@v1
20+
with:
21+
dotnet-version: |
22+
6.x
23+
8.x
24+
- name: Install Windows SDK version (default is 18362)
25+
uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
26+
- name: List dotnet sdks
27+
run: dotnet --info
28+
- name: Run the Cake script
29+
uses: cake-build/cake-action@v1
30+
with:
31+
cake-version: 2.3.0
32+
verbosity: Normal
33+
script-path: build.cake
34+
target: ci
35+
env:
36+
azure-key-vault-url: ${{ secrets.AZURE_KEY_VAULT_URL }}
37+
azure-key-vault-client-id: ${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }}
38+
azure-key-vault-tenant-id: ${{ secrets.AZURE_KEY_VAULT_TENANT_ID }}
39+
azure-key-vault-client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
40+
azure-key-vault-certificate: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE }}

GitVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
assembly-versioning-scheme: Major
22
assembly-file-versioning-scheme: MajorMinorPatchTag
3-
next-version: 4.11.0
3+
next-version: 5.0.0
44
mode: ContinuousDeployment
55
branches:
66
master:

README.md

Lines changed: 48 additions & 48 deletions
Large diffs are not rendered by default.

XamlStyler/Options/MahApps.Metro.XAMLStyler.json renamed to Settings.XAMLStyler

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"IndentSize": 4,
33
"AttributesTolerance": 2,
44
"KeepFirstAttributeOnSameLine": true,
5-
"MaxAttributeCharatersPerLine": 0,
5+
"MaxAttributeCharactersPerLine": 0,
66
"MaxAttributesPerLine": 1,
7-
"NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, MultiTrigger, DataTrigger, MultiDataTrigger, Condition, Setter, SolidColorBrush",
7+
"NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, MultiTrigger, DataTrigger, MultiDataTrigger, Condition, Setter, SolidColorBrush, Pen",
88
"SeparateByGroups": false,
99
"AttributeIndentation": 0,
1010
"AttributeIndentationStyle": 1,
@@ -15,6 +15,7 @@
1515
"xmlns, xmlns:x",
1616
"xmlns:*",
1717
"x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
18+
"TargetType, BasedOn",
1819
"Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
1920
"Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
2021
"Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",

XamlStyler/CommandLine.dll

-57 KB
Binary file not shown.

XamlStyler/CommandLine.xml

Lines changed: 0 additions & 1390 deletions
This file was deleted.

XamlStyler/Irony.dll

-140 KB
Binary file not shown.

XamlStyler/Irony.xml

Lines changed: 0 additions & 753 deletions
This file was deleted.

XamlStyler/Newtonsoft.Json.dll

-511 KB
Binary file not shown.

0 commit comments

Comments
 (0)