Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
cYCL157 committed Jan 10, 2024
2 parents 69ce3c9 + dfc89ae commit 853216a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Release 6.2

* Update and cleanup nuget dependencies to latest stable versions
* Remove any direct serilog references to break Serilog coupling, needed for making cortside libraries easier to multitarget net6.0 and net8.0
* Include README.md in nuget pagckage in attempt to make changes more evident


|Commit|Date|Author|Message|
|---|---|---|---|
| b58632a | <span style="white-space:nowrap;">2023-11-08</span> | <span style="white-space:nowrap;">Cort Schaefer</span> | update version
Expand Down
3 changes: 3 additions & 0 deletions format.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# install/update latest version
dotnet tool update -g dotnet-format --version "8.*" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json

# Format code to match editorconfig settings
#dotnet format --verbosity normal .\src

Expand Down
6 changes: 5 additions & 1 deletion src/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ trim_trailing_whitespace = true
insert_final_newline = true

[*.json]
indent_size = 4
indent_size = 2

# XML Configuration Files
[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
Expand Down Expand Up @@ -241,3 +241,7 @@ dotnet_diagnostic.RCS1021.severity = none

# PH_P013: Discouraged EntityFramework Method
dotnet_diagnostic.PH_P013.severity = none

# for dotnet-format to help cleanup IDE0005 unnecessary import warnings
[*.{cs,vb}]
dotnet_diagnostic.IDE0005.severity = warning
2 changes: 1 addition & 1 deletion update-targetframework.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using namespace System.Collections.Generic # for List<T>

$dir = "." # points to "repository root"
$targetVersion = "net6.0"
$targetVersion = "net8.0"

$projFiles = Get-ChildItem $dir -Recurse -Filter *.csproj

Expand Down

0 comments on commit 853216a

Please sign in to comment.