Skip to content

Commit f1a1e5c

Browse files
committed
Merge branch 'release/5.0.1'
2 parents 23e6bcf + 9b6a152 commit f1a1e5c

14 files changed

Lines changed: 516 additions & 344 deletions

File tree

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

.gitignore

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ mono_crash.*
2727
[Rr]eleases/
2828
x64/
2929
x86/
30+
[Ww][Ii][Nn]32/
3031
[Aa][Rr][Mm]/
3132
[Aa][Rr][Mm]64/
3233
bld/
@@ -65,6 +66,9 @@ project.lock.json
6566
project.fragment.lock.json
6667
artifacts/
6768

69+
# ASP.NET Scaffolding
70+
ScaffoldingReadMe.txt
71+
6872
# StyleCop
6973
StyleCopReport.xml
7074

@@ -90,6 +94,7 @@ StyleCopReport.xml
9094
*.tmp_proj
9195
*_wpftmp.csproj
9296
*.log
97+
*.tlog
9398
*.vspscc
9499
*.vssscc
95100
.builds
@@ -142,7 +147,9 @@ _TeamCity*
142147
!.axoCover/settings.json
143148

144149
# Coverlet is a free, cross platform Code Coverage Tool
145-
coverage*[.json, .xml, .info]
150+
coverage*.json
151+
coverage*.xml
152+
coverage*.info
146153

147154
# Visual Studio code coverage results
148155
*.coverage
@@ -203,6 +210,9 @@ PublishScripts/
203210
*.nuget.props
204211
*.nuget.targets
205212

213+
# Nuget personal access tokens and Credentials
214+
nuget.config
215+
206216
# Microsoft Azure Build Output
207217
csx/
208218
*.build.csdef
@@ -315,7 +325,7 @@ __pycache__/
315325

316326
# Cake
317327
tools/**
318-
!tools/packages.config
328+
BuildArtifacts/
319329

320330
# Tabs Studio
321331
*.tss
@@ -356,6 +366,34 @@ MigrationBackup/
356366
# Ionide (cross platform F# VS Code tools) working folder
357367
.ionide/
358368

369+
# Fody - auto-generated XML schema
370+
FodyWeavers.xsd
371+
372+
# VS Code files for those working on multiple tools
373+
.vscode/*
374+
!.vscode/settings.json
375+
!.vscode/tasks.json
376+
!.vscode/launch.json
377+
!.vscode/extensions.json
378+
*.code-workspace
379+
380+
# Local History for Visual Studio Code
381+
.history/
382+
383+
# Windows Installer files from build outputs
384+
*.cab
385+
*.msi
386+
*.msix
387+
*.msm
388+
*.msp
389+
390+
# JetBrains Rider
391+
.idea/
392+
*.sln.iml
393+
394+
### VisualStudio Patch ###
395+
# Additional files built by Visual Studio
396+
359397
# WinMerge
360398
*.bak
361399

GitVersion.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
mode: ContinuousDelivery
22
branches:
3+
master:
4+
regex: (master|main)
5+
mode: ContinuousDelivery
6+
tag:
7+
increment: Patch
8+
prevent-increment-of-merged-branch-version: true
9+
track-merge-target: false
310
feature:
411
regex: feature(s)?[/-]
512
mode: ContinuousDeployment

Source/HttpMultipartParser.Benchmark/HttpMultipartParser.Benchmark.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
9+
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

0 commit comments

Comments
 (0)