Skip to content

Commit 1cb164c

Browse files
committed
Merge branch 'release/7.0.0-rc1'
2 parents b2f6cff + 89b7309 commit 1cb164c

File tree

386 files changed

+8831
-10372
lines changed

Some content is hidden

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

386 files changed

+8831
-10372
lines changed

.gitignore

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ _ReSharper.Papercut
66
Papercut.suo
77
Papercut.*.suo
88
Papercut.ncrunchsolution
9-
Papercut.ncrunchsolution.*
10-
/.hg
11-
/packages
9+
Papercut.ncrunchsolution.*
1210
*.hgignore
1311
*.ide
1412
deploy/
@@ -18,5 +16,11 @@ graphics/
1816
/build/tools
1917
/tools
2018
out/
21-
/.vscode
19+
.vscode/
20+
.idea/
2221
*.msi
22+
node_modules/
23+
src/Papercut.UI/publish
24+
src/Papercut.UI/Releases
25+
publish
26+
Releases

Directory.Build.props

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Company>Changemaker Studios</Company>
4+
<Description>Standalone SMTP server designed for viewing received messages</Description>
5+
<Copyright>Copyright © 2008 - 2024 Ken Robertson &amp; Jaben Cargman</Copyright>
6+
<Platforms>AnyCPU;x86;x64</Platforms>
7+
<DebugType>portable</DebugType>
8+
<Nullable>enable</Nullable>
9+
<ImplicitUsings>enable</ImplicitUsings>
10+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
11+
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
16+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
17+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<Compile Include="..\GlobalAssemblyInfo.cs">
22+
<Link>Properties\GlobalAssemblyInfo.cs</Link>
23+
</Compile>
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<Using Include="System.Text" />
28+
<Using Include="Serilog" />
29+
<Using Include="JetBrains.Annotations" />
30+
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
31+
<PackageReference Include="Serilog" Version="3.1.1" />
32+
</ItemGroup>
33+
</Project>

GitVersion.yml

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

0 commit comments

Comments
 (0)