Skip to content
This repository has been archived by the owner on Sep 17, 2023. It is now read-only.

Commit

Permalink
Upgrades NuGet packages (#205)
Browse files Browse the repository at this point in the history
* Simplifies cleaning when working with repo

* Upgrades NuGet packages

  - Ensure.That
  - Newtonsoft.Json
  - Microsoft.NET.Test.Sdk

* Minor editor tweaks
  • Loading branch information
danielwertheim authored Jul 3, 2021
1 parent def6365 commit e76f9f7
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 23 deletions.
24 changes: 21 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
# top-most EditorConfig file
root = true

# Baseline
[*]
end_of_line = crlf
charset = utf-8
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
max_line_length = 160

[*.{yml,json}]
indent_size = 2

[*.props, *.csproj, *.yml, *.json]
# Xml files (data, config, projects)
[*.{xml,props,targets,config,csproj}]
indent_size = 2

# Xml project files
[*.{csproj}]
indent_size = 2

# Shell scripts
[*.sh]
end_of_line = lf

# C#
[*.cs]
indent_size = 4
dotnet_sort_system_directives_first = true
27 changes: 14 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,6 @@
*.suo
*.cache

.env
*.local
*.local.json
*.local.ini

# misc
*~
*.swp
*.sdf
*.orig
*.pfx

# rider
.idea

Expand All @@ -36,5 +24,18 @@ _ReSharper.*
*.[Rr]e[Ss]harper.user
*.DotSettings.user

# env config etc
.env
*.local
*.local.json
*.local.ini

# misc
*~
*.swp
*.sdf
*.orig
*.pfx

#windows stuff
Thumbs.db
Thumbs.db
4 changes: 2 additions & 2 deletions source/projects/MyCouch/MyCouch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Ensure.That" Version="9.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Ensure.That" Version="10.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions source/tests/IntegrationTests/IntegrationTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion source/tests/Testing/Testing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions source/tests/UnitTests/UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
Expand Down

0 comments on commit e76f9f7

Please sign in to comment.