Skip to content

Commit b295002

Browse files
JerichoJericho
authored
Merge pull request #27 from GitTools/develop
Pull from upstream
2 parents f753585 + 70ac1e4 commit b295002

30 files changed

+517
-356
lines changed

‎.editorconfig

+16-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ indent_style = space
1515
tab_width = 4
1616

1717
# New line preferences
18-
end_of_line = crlf
18+
end_of_line = unset
1919
insert_final_newline = false
2020
trim_trailing_whitespace = true
2121

@@ -24,9 +24,18 @@ end_of_line = lf
2424

2525
[*.sln]
2626
# Visual studio defaults
27+
end_of_line = crlf
2728
insert_final_newline = true
2829
indent_style = tab
2930

31+
[*.csproj]
32+
# Visual studio defaults
33+
end_of_line = crlf
34+
insert_final_newline = true
35+
indent_style = space
36+
tab_width = 4
37+
indent_size = 4
38+
3039
[*.md]
3140
trim_trailing_whitespace = false
3241
insert_final_newline = true # Conflicts with markdownlint when false
@@ -36,10 +45,15 @@ indent_size = 2 # Incorrect indentation happens when this is not 2
3645
indent_size = 2 # Incorrect indentation happens when this is not 2
3746

3847
[*.ps1]
48+
end_of_line = crlf
3949
charset = utf-8-bom
4050
indent_style = space
4151
indent_size = 2
4252

4353
[*.js]
4454
indent_style = tab
45-
indent_size = 2
55+
indent_size = 2
56+
57+
[*.{bat,cmd}]
58+
end_of_line = crlf
59+
charset = latin1

‎.gitattributes

+104-29
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,104 @@
1-
* text eol=crlf whitespace=tab-in-indent,tabwidth=4
2-
3-
*.sh text eol=lf
4-
5-
*.md text whitespace=-blank-at-eol
6-
7-
# Custom for Visual Studio
8-
*.cs text diff=csharp
9-
*.sln merge=union whitespace=-tab-in-indent,-blank-at-eof,indent-with-non-tab
10-
*.csproj merge=union
11-
*.vbproj merge=union
12-
*.fsproj merge=union
13-
*.dbproj merge=union
14-
15-
# Standard to msysgit
16-
*.doc diff=astextplain
17-
*.DOC diff=astextplain
18-
*.docx diff=astextplain
19-
*.DOCX diff=astextplain
20-
*.dot diff=astextplain
21-
*.DOT diff=astextplain
22-
*.pdf diff=astextplain
23-
*.PDF diff=astextplain
24-
*.rtf diff=astextplain
25-
*.RTF diff=astextplain
26-
27-
*.png binary
28-
29-
.editorconfig text whitespace=-blank-at-eol
1+
# Common settings that generally should always be used with your language specific settings
2+
3+
# Auto detect text files and perform LF normalization
4+
* text=auto
5+
6+
#
7+
# The above will handle all files NOT found below
8+
#
9+
10+
# Documents
11+
*.bibtex text diff=bibtex
12+
*.doc diff=astextplain
13+
*.DOC diff=astextplain
14+
*.docx diff=astextplain
15+
*.DOCX diff=astextplain
16+
*.dot diff=astextplain
17+
*.DOT diff=astextplain
18+
*.pdf diff=astextplain
19+
*.PDF diff=astextplain
20+
*.rtf diff=astextplain
21+
*.RTF diff=astextplain
22+
*.md text diff=markdown
23+
*.mdx text diff=markdown
24+
*.tex text diff=tex
25+
*.adoc text
26+
*.textile text
27+
*.mustache text
28+
*.csv text eol=crlf
29+
*.tab text
30+
*.tsv text
31+
*.txt text
32+
*.sql text
33+
*.epub diff=astextplain
34+
35+
# Graphics
36+
*.png binary
37+
*.jpg binary
38+
*.jpeg binary
39+
*.gif binary
40+
*.tif binary
41+
*.tiff binary
42+
*.ico binary
43+
# SVG treated as text by default.
44+
*.svg text
45+
# If you want to treat it as binary,
46+
# use the following line instead.
47+
# *.svg binary
48+
*.eps binary
49+
50+
# Scripts
51+
*.bash text eol=lf
52+
*.fish text eol=lf
53+
*.ksh text eol=lf
54+
*.sh text eol=lf
55+
*.zsh text eol=lf
56+
# These are explicitly windows files and should use crlf
57+
*.bat text eol=crlf
58+
*.cmd text eol=crlf
59+
*.ps1 text eol=crlf
60+
61+
# Serialisation
62+
*.json text
63+
*.toml text
64+
*.xml text
65+
*.yaml text
66+
*.yml text
67+
68+
# Archives
69+
*.7z binary
70+
*.bz binary
71+
*.bz2 binary
72+
*.bzip2 binary
73+
*.gz binary
74+
*.lz binary
75+
*.lzma binary
76+
*.rar binary
77+
*.tar binary
78+
*.taz binary
79+
*.tbz binary
80+
*.tbz2 binary
81+
*.tgz binary
82+
*.tlz binary
83+
*.txz binary
84+
*.xz binary
85+
*.Z binary
86+
*.zip binary
87+
*.zst binary
88+
89+
# Text files where line endings should be preserved
90+
*.patch -text
91+
92+
*.cs text diff=csharp
93+
*.cshtml text diff=html
94+
*.csx text diff=csharp
95+
*.sln text eol=crlf
96+
*.csproj text eol=crlf
97+
98+
#
99+
# Exclude files from exporting
100+
#
101+
102+
.gitattributes export-ignore
103+
.gitignore export-ignore
104+
.gitkeep export-ignore

‎.github/dependabot.yml

+21
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,28 @@
11
version: 2
22
updates:
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
labels:
6+
- "Build"
7+
schedule:
8+
interval: daily
39
- package-ecosystem: nuget
410
directory: "/src"
11+
labels:
12+
- "Build"
13+
groups:
14+
analyzers:
15+
patterns:
16+
- "*Analyzers"
17+
serilog:
18+
patterns:
19+
- "Serilog.*"
20+
tests:
21+
patterns:
22+
- "NUnit.*"
23+
- "Microsoft.NET.Test.Sdk"
24+
- "NSubstitute"
25+
- "coverlet.msbuild"
526
schedule:
627
interval: daily
728
open-pull-requests-limit: 10

‎.github/workflows/build.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ jobs:
3535
WYAM_DEPLOY_REMOTE: https://github.com/GitTools/GitReleaseManager
3636
CODECOV_REPO_TOKEN: ${{ secrets.CODECOV_REPO_TOKEN }}
3737
GPR_USER: gittools-bot
38-
GPR_PASSWORD: ${{ secrets.GPR_PASSWORD }}
38+
GPR_PASSWORD: ${{ secrets.NUGET_GITHUB_TOKEN }}
3939
steps:
4040
- name: Checkout the repository
41-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
4242

4343
- name: Fetch all tags and branches
4444
run: git fetch --prune --unshallow
4545

4646
- name: Install .NET SDK 2.1.x, 3.1.x, 5.0.x, and 6.0.x
47-
uses: actions/setup-dotnet@v3
47+
uses: actions/setup-dotnet@v4
4848
with:
4949
dotnet-version: |
5050
2.1.x
@@ -53,28 +53,28 @@ jobs:
5353
6.0.x
5454
5555
- name: Cache Tools
56-
uses: actions/cache@v2
56+
uses: actions/cache@v4
5757
with:
5858
path: tools
5959
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
6060

6161
- name: Build project
62-
uses: cake-build/cake-action@v1
62+
uses: cake-build/cake-action@v2
6363
with:
6464
script-path: recipe.cake
6565
target: CI
6666
verbosity: Normal
6767
cake-version: tool-manifest
6868

6969
- name: Upload Issues-Report
70-
uses: actions/upload-artifact@v2
70+
uses: actions/upload-artifact@v4
7171
with:
7272
if-no-files-found: warn
7373
name: ${{ matrix.os }} issues
7474
path: BuildArtifacts/report.html
7575

7676
- name: Upload Packages
77-
uses: actions/upload-artifact@v2
77+
uses: actions/upload-artifact@v4
7878
if: runner.os == 'Windows'
7979
with:
8080
if-no-files-found: warn

‎src/Directory.Build.props

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<Project>
2-
<PropertyGroup>
3-
<DebugType>pdbonly</DebugType>
4-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
5-
<NoWarn>CS1591</NoWarn>
6-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
7-
</PropertyGroup>
8-
9-
<ItemGroup>
10-
<CodeAnalysisDictionary Include="$(MSBuildThisFileDirectory)\CustomDictionary.xml">
11-
<Link>CustomDictionary.xml</Link>
12-
</CodeAnalysisDictionary>
13-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" Link="stylecop.json" />
14-
</ItemGroup>
15-
16-
<ItemGroup>
17-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
</PackageReference>
21-
<PackageReference Include="Serilog" Version="3.1.1" />
22-
<PackageReference Include="IDisposableAnalyzers" Version="4.0.7">
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
26-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28-
<PrivateAssets>all</PrivateAssets>
29-
</PackageReference>
30-
<PackageReference Include="Roslynator.Analyzers" Version="4.12.4">
31-
<PrivateAssets>All</PrivateAssets>
32-
</PackageReference>
33-
</ItemGroup>
1+
<Project>
2+
<PropertyGroup>
3+
<DebugType>pdbonly</DebugType>
4+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
5+
<NoWarn>CS1591</NoWarn>
6+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<CodeAnalysisDictionary Include="$(MSBuildThisFileDirectory)\CustomDictionary.xml">
11+
<Link>CustomDictionary.xml</Link>
12+
</CodeAnalysisDictionary>
13+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" Link="stylecop.json" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
18+
<PrivateAssets>all</PrivateAssets>
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
</PackageReference>
21+
<PackageReference Include="Serilog" />
22+
<PackageReference Include="IDisposableAnalyzers">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
26+
<PackageReference Include="StyleCop.Analyzers">
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
<PrivateAssets>all</PrivateAssets>
29+
</PackageReference>
30+
<PackageReference Include="Roslynator.Analyzers">
31+
<PrivateAssets>All</PrivateAssets>
32+
</PackageReference>
33+
</ItemGroup>
3434
</Project>

‎src/Directory.Packages.props

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
<NoWarn>$(NoWarn);NU1507</NoWarn>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageVersion Include="ApprovalTests" Version="6.0.0" />
9+
<PackageVersion Include="AutoMapper" Version="13.0.1" />
10+
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
11+
<PackageVersion Include="coverlet.msbuild" Version="6.0.3" />
12+
<PackageVersion Include="Destructurama.Attributed" Version="5.1.0" />
13+
<PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
17+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
18+
<PackageVersion Include="NGitLab" Version="7.1.0" />
19+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
20+
<PackageVersion Include="NUnit" Version="4.3.2" />
21+
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
22+
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
23+
<PackageVersion Include="Octokit" Version="14.0.0" />
24+
<PackageVersion Include="Roslynator.Analyzers" Version="4.12.10" />
25+
<PackageVersion Include="Scriban" Version="5.12.1" />
26+
<PackageVersion Include="Serilog" Version="4.2.0" />
27+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
28+
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
29+
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
30+
<PackageVersion Include="seriloganalyzer" Version="0.15.0" />
31+
<PackageVersion Include="Shouldly" Version="4.2.1" />
32+
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
33+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
34+
<PackageVersion Include="TextCopy" Version="6.2.1" />
35+
<PackageVersion Include="YamlDotNet" Version="13.7.1" />
36+
</ItemGroup>
37+
</Project>

0 commit comments

Comments
 (0)