Skip to content

Commit 06853de

Browse files
denis-peshkovdenis-peshkov
committed
small fixes
1 parent 744fb2d commit 06853de

3 files changed

Lines changed: 143 additions & 20 deletions

File tree

‎.gitattributes‎

Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,65 @@
1-
# Auto detect text files and perform LF normalization
2-
* text=auto
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto eol=lf
35

4-
# Custom for Visual Studio
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
513
*.cs diff=csharp
6-
*.sln merge=union
7-
*.csproj merge=union
8-
*.vbproj merge=union
9-
*.fsproj merge=union
10-
*.dbproj merge=union
1114

12-
# Standard to msysgit
13-
*.doc diff=astextplain
14-
*.DOC diff=astextplain
15-
*.docx diff=astextplain
16-
*.DOCX diff=astextplain
17-
*.dot diff=astextplain
18-
*.DOT diff=astextplain
19-
*.pdf diff=astextplain
20-
*.PDF diff=astextplain
21-
*.rtf diff=astextplain
22-
*.RTF diff=astextplain
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.slnx merge=binary
27+
#*.csproj merge=binary
28+
#*.vbproj merge=binary
29+
#*.vcxproj merge=binary
30+
#*.vcproj merge=binary
31+
#*.dbproj merge=binary
32+
#*.fsproj merge=binary
33+
#*.lsproj merge=binary
34+
#*.wixproj merge=binary
35+
#*.modelproj merge=binary
36+
#*.sqlproj merge=binary
37+
#*.wwaproj merge=binary
38+
39+
###############################################################################
40+
# behavior for image files
41+
#
42+
# image files are treated as binary by default.
43+
###############################################################################
44+
*.jpg binary
45+
*.png binary
46+
*.gif binary
47+
*.webp binary
48+
49+
###############################################################################
50+
# diff behavior for common document formats
51+
#
52+
# Convert binary document formats to text before diffing them. This feature
53+
# is only available from the command line. Turn it on by uncommenting the
54+
# entries below.
55+
###############################################################################
56+
#*.doc diff=astextplain
57+
#*.DOC diff=astextplain
58+
#*.docx diff=astextplain
59+
#*.DOCX diff=astextplain
60+
#*.dot diff=astextplain
61+
#*.DOT diff=astextplain
62+
#*.pdf diff=astextplain
63+
#*.PDF diff=astextplain
64+
#*.rtf diff=astextplain
65+
#*.RTF diff=astextplain

‎GitVersion.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
next-version: 1.0.0 #
2+
branches:
3+
master:
4+
regex: ^master$|^main$
5+
mode: ContinuousDelivery
6+
tag: ''
7+
source-branches:
8+
- feature
9+
- hotfix
10+
- release
11+
increment: Inherit
12+
prevent-increment-of-merged-branch-version: true
13+
track-merge-target: true
14+
tracks-release-branches: true
15+
is-release-branch: true
16+
pre-release-weight: 0
17+
release:
18+
regex: ^release(s)?[/-]
19+
mode: ContinuousDelivery
20+
tag: preview
21+
tag-number-pattern: '[/-](?<number>\d+)[-/]'
22+
source-branches:
23+
- master
24+
- dev
25+
- release
26+
increment: Minor
27+
prevent-increment-of-merged-branch-version: false
28+
track-merge-target: true
29+
tracks-release-branches: true
30+
is-release-branch: true
31+
pre-release-weight: 30000
32+
hotfix:
33+
regex: ^hotfix(es)?[/-]
34+
mode: ContinuousDelivery
35+
tag: preview
36+
tag-number-pattern: '[/-](?<number>\d+)[-/]'
37+
source-branches: [ master, hotfix ]
38+
increment: Patch
39+
prevent-increment-of-merged-branch-version: false
40+
track-merge-target: true
41+
tracks-release-branches: true
42+
is-release-branch: true
43+
pre-release-weight: 30000
44+
feature:
45+
regex: ^feature(s)?[/-]
46+
mode: ContinuousDelivery
47+
tag: useBranchName
48+
increment: Inherit
49+
prevent-increment-of-merged-branch-version: false
50+
track-merge-target: false
51+
tracks-release-branches: false
52+
is-release-branch: false
53+
pull-request:
54+
regex: ^(pull|pull\-requests|pr|merge)[/-]
55+
mode: ContinuousDelivery
56+
tag: pr
57+
tag-number-pattern: '[/-](?<number>\d+)[-/]'
58+
source-branches:
59+
- dev
60+
- master
61+
- release
62+
- feature
63+
- support
64+
- hotfix
65+
increment: None
66+
prevent-increment-of-merged-branch-version: false
67+
track-merge-target: false
68+
tracks-release-branches: false
69+
is-release-branch: false
70+
dev:
71+
regex: ^dev(elop)?(ment)?$
72+
mode: ContinuousDeployment
73+
tag: dev
74+
source-branches: [ master ]
75+
increment: Minor
76+
prevent-increment-of-merged-branch-version: false
77+
track-merge-target: true
78+
tracks-release-branches: true
79+
is-release-branch: false
80+
pre-release-weight: 40000

‎README-RIDER.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ dotnet run --project src/TypeScriptDefinitionGenerator.Cli -- path/to/Dto1.cs pa
6868

6969
<ItemGroup>
7070
<None Update="base\ThirdClass.generated.d.ts">
71-
<DependentUpon>base\ThirdClass.cs</DependentUpon>
71+
<DependentUpon>ThirdClass.cs</DependentUpon>
7272
</None>
7373
</ItemGroup>
7474
```

0 commit comments

Comments
 (0)