Skip to content

Commit aefb1e0

Browse files
committed
Merge branch 'develop'
2 parents f737ca3 + 4295fe8 commit aefb1e0

File tree

472 files changed

+24582
-26868
lines changed

Some content is hidden

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

472 files changed

+24582
-26868
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": "4.0.0",
7+
"commands": [
8+
"dotnet-cake"
9+
]
10+
}
11+
}
12+
}

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ indent_size = 2
1717
[*.cs]
1818
# WPF0011: Containing type should be used as registered owner.
1919
dotnet_diagnostic.WPF0011.severity = error
20+
21+
# WPF0132: Use PART prefix.
22+
dotnet_diagnostic.WPF0132.severity = suggestion

.github/workflows/ci.yml

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

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,3 @@ src/MahApps.Metro/Styles/Themes/*.xaml
265265

266266
# cake
267267
tools/*
268-
!tools/packages.config
269-
270-
# XamlStyler
271-
!XamlStyler/

GitVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
assembly-versioning-scheme: Major
22
assembly-file-versioning-scheme: MajorMinorPatchTag
33
mode: ContinuousDeployment
4-
next-version: 2.4.0
4+
next-version: 3.0.0
55
branches:
66
master:
77
regex: ^main

NuGet.Config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,9 @@
2323
<!-- <add key="CI.XamlColorSchemeGenerator" value="C:\DEV\OSS_Own\XamlColorSchemeGenerator\bin\Release" /> -->
2424
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
2525
</activePackageSource>
26+
<packageSourceMapping>
27+
<packageSource key="nuget.org">
28+
<package pattern="*" />
29+
</packageSource>
30+
</packageSourceMapping>
2631
</configuration>

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

Lines changed: 2 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,

XamlStyler/CommandLine.dll

-57 KB
Binary file not shown.

0 commit comments

Comments
 (0)