Skip to content

Commit 70a4e59

Browse files
Merge branch 'feature/v5.4.1'
2 parents 440395b + 99238a6 commit 70a4e59

File tree

4 files changed

+39
-15
lines changed

4 files changed

+39
-15
lines changed

.gitignore

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,25 @@
1313
# User-specific files (MonoDevelop/Xamarin Studio)
1414
*.userprefs
1515

16+
# Mono auto generated files
17+
mono_crash.*
18+
1619
# Build results
1720
[Dd]ebug/
1821
[Dd]ebugPublic/
1922
[Rr]elease/
2023
[Rr]eleases/
2124
x64/
2225
x86/
26+
[Ww][Ii][Nn]32/
2327
[Aa][Rr][Mm]/
2428
[Aa][Rr][Mm]64/
2529
bld/
2630
[Bb]in/
2731
[Oo]bj/
32+
[Oo]ut/
2833
[Ll]og/
34+
[Ll]ogs/
2935

3036
# Visual Studio 2015/2017 cache/options directory
3137
.vs/
@@ -39,9 +45,10 @@ Generated\ Files/
3945
[Tt]est[Rr]esult*/
4046
[Bb]uild[Ll]og.*
4147

42-
# NUNIT
48+
# NUnit
4349
*.VisualState.xml
4450
TestResult.xml
51+
nunit-*.xml
4552

4653
# Build Results of an ATL Project
4754
[Dd]ebugPS/
@@ -56,6 +63,9 @@ project.lock.json
5663
project.fragment.lock.json
5764
artifacts/
5865

66+
# ASP.NET Scaffolding
67+
ScaffoldingReadMe.txt
68+
5969
# StyleCop
6070
StyleCopReport.xml
6171

@@ -122,9 +132,6 @@ _ReSharper*/
122132
*.[Rr]e[Ss]harper
123133
*.DotSettings.user
124134

125-
# JustCode is a .NET coding add-in
126-
.JustCode
127-
128135
# TeamCity is a build add-in
129136
_TeamCity*
130137

@@ -135,6 +142,11 @@ _TeamCity*
135142
.axoCover/*
136143
!.axoCover/settings.json
137144

145+
# Coverlet is a free, cross platform Code Coverage Tool
146+
coverage*.json
147+
coverage*.xml
148+
coverage*.info
149+
138150
# Visual Studio code coverage results
139151
*.coverage
140152
*.coveragexml
@@ -182,6 +194,8 @@ PublishScripts/
182194

183195
# NuGet Packages
184196
*.nupkg
197+
# NuGet Symbol Packages
198+
*.snupkg
185199
# The packages folder can be ignored because of Package Restore
186200
**/[Pp]ackages/*
187201
# except build/, which is used as an MSBuild target.
@@ -206,6 +220,8 @@ BundleArtifacts/
206220
Package.StoreAssociation.xml
207221
_pkginfo.txt
208222
*.appx
223+
*.appxbundle
224+
*.appxupload
209225

210226
# Visual Studio cache files
211227
# files ending in .cache can be ignored
@@ -255,7 +271,9 @@ ServiceFabricBackup/
255271
*.bim.layout
256272
*.bim_*.settings
257273
*.rptproj.rsuser
258-
*- Backup*.rdl
274+
*- [Bb]ackup.rdl
275+
*- [Bb]ackup ([0-9]).rdl
276+
*- [Bb]ackup ([0-9][0-9]).rdl
259277

260278
# Microsoft Fakes
261279
FakesAssemblies/
@@ -291,10 +309,6 @@ paket-files/
291309
# FAKE - F# Make
292310
.fake/
293311

294-
# JetBrains Rider
295-
.idea/
296-
*.sln.iml
297-
298312
# CodeRush personal settings
299313
.cr/personal
300314

@@ -337,4 +351,13 @@ ASALocalRun/
337351
.localhistory/
338352

339353
# BeatPulse healthcheck temp database
340-
healthchecksdb
354+
healthchecksdb
355+
356+
# Backup folder for Package Reference Convert tool in Visual Studio 2017
357+
MigrationBackup/
358+
359+
# Ionide (cross platform F# VS Code tools) working folder
360+
.ionide/
361+
362+
# Fody - auto-generated XML schema
363+
FodyWeavers.xsd

Sources/ReCommendedExtension.Tests/ReCommendedExtension.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="JetBrains.Lifetimes" Version="2020.3.2" />
21-
<PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.3.3">
21+
<PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.3.4">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2424
</PackageReference>
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
2626
<PackageReference Include="NUnit" Version="3.10.1" />
2727
</ItemGroup>
2828

Sources/ReCommendedExtension/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

16-
[assembly: AssemblyVersion("5.4.0.0")]
17-
[assembly: AssemblyFileVersion("5.4.0")]
16+
[assembly: AssemblyVersion("5.4.1.0")]
17+
[assembly: AssemblyFileVersion("5.4.1")]

Sources/ReCommendedExtension/ReCommendedExtension.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
24-
<PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.3.3">
24+
<PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.3.4">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2727
</PackageReference>
28+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
2829
</ItemGroup>
2930

3031
<ItemGroup>

0 commit comments

Comments
 (0)