diff --git a/.gitattributes b/.gitattributes index 2130271..205ec87 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,5 @@ * text=auto eol=lf -*.cs text diff=csharp -*.csproj text merge=union -*.sln text merge=union - # DO NOT EDIT: csharp convention *.cs text diff=csharp # END DO NOT EDIT diff --git a/.github/conventions.yml b/.github/conventions.yml index 5e5cf36..8e1acfd 100644 --- a/.github/conventions.yml +++ b/.github/conventions.yml @@ -1,10 +1,6 @@ # applied automatically by https://github.com/Faithlife/RepoConventionsApplier (DO NOT REMOVE THIS LINE) conventions: - - path: Faithlife/CodingGuidelines/conventions/faithlife-auto-apply-conventions - - path: Faithlife/CodingGuidelines/conventions/dotnet-common - - path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library-build - - path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library-workflow - - path: Faithlife/CodingGuidelines/conventions/faithlife-license-mit + - path: Faithlife/CodingGuidelines/conventions/faithlife-dotnet-library pull-request: reviewers: diff --git a/.gitignore b/.gitignore index a2ad192..7ec75c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,21 @@ -.vs/ -.idea/ +# DO NOT EDIT: gitignore-common convention +.DS_Store +Thumbs.db +*.log +# END DO NOT EDIT + +# DO NOT EDIT: gitignore-dotnet convention artifacts/ bin/ obj/ release/ +# END DO NOT EDIT +# DO NOT EDIT: gitignore-ide convention +.vs/ +.idea/ *.cache -*.log -*.ncrunchproject -*.ncrunchsolution *.user -launchSettings.json -nCrunchTemp* +*.userprefs _ReSharper* -.DS_Store +# END DO NOT EDIT diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8ab1646..2bf2bb6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,19 @@ + + # Contributing ## Publishing -* To publish the library, update the `` in [`Directory.Build.props`](Directory.Build.props), add a corresponding section to the top of [`ReleaseNotes.md`](ReleaseNotes.md), commit, and push. +To publish an official release: + +* Update the `` in [`Directory.Build.props`](Directory.Build.props). +* Add a corresponding section to the top of [`ReleaseNotes.md`](ReleaseNotes.md). +* Push or create a PR for review. + +### Prereleases + +Certain changes can be hard to unit test and are better tested in a real consumer project. In this case, you can publish a beta version of the library for testing. -## Template +To publish a beta, add a `` below `` in [`Directory.Build.props`](Directory.Build.props), e.g., `beta.1`. Publish as above. -* This repository uses the [`faithlife-build`](https://github.com/Faithlife/CSharpTemplate/tree/faithlife-build) template of [`Faithlife/CSharpTemplate`](https://github.com/Faithlife/CSharpTemplate). +When beta testing is done, delete the `` and publish again. diff --git a/Directory.Build.props b/Directory.Build.props index ebe49ee..5a1e25e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,24 +1,26 @@ - 1.4.0 - 13.0 + 1.4.1 + $(NoWarn);1591;1998;NU1507;NU5105 + Faithlife + FindReplaceCode + + + + + 14.0 enable enable true - $(NoWarn);1591;1998;NU1507;NU5105 en-US embedded - Faithlife - FindReplaceCode MIT https://github.com/$(GitHubOrganization)/$(RepositoryName) https://github.com/$(GitHubOrganization)/$(RepositoryName)/blob/master/ReleaseNotes.md https://github.com/$(GitHubOrganization)/$(RepositoryName).git Faithlife Copyright $(Authors) - true - true true latest-all true @@ -27,11 +29,13 @@ false false true + true + true + true + true + all + low - - - $(VersionPrefix).$(BuildNumber) - true - + diff --git a/Directory.Packages.props b/Directory.Packages.props index 43d943a..835e524 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,16 +1,22 @@ + true + true + true + + - - - + + + + \ No newline at end of file diff --git a/FindReplaceCode.slnx b/FindReplaceCode.slnx index 98f35d9..9dd12ba 100644 --- a/FindReplaceCode.slnx +++ b/FindReplaceCode.slnx @@ -1,19 +1,4 @@ - - - - - - - - - - - - - - - diff --git a/ReleaseNotes.md b/ReleaseNotes.md index dc8b491..5c682e8 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,9 @@ # Release Notes +## 1.4.1 + +* Update package README. + ## 1.4.0 * Find and replace `.sql` and `.mysql` files. diff --git a/nuget.config b/nuget.config index 6873eb9..da2f86d 100644 --- a/nuget.config +++ b/nuget.config @@ -1,6 +1,6 @@ - + - + diff --git a/src/FindReplaceCode/FindReplaceCode.csproj b/src/FindReplaceCode/FindReplaceCode.csproj index 704a25d..4af426b 100644 --- a/src/FindReplaceCode/FindReplaceCode.csproj +++ b/src/FindReplaceCode/FindReplaceCode.csproj @@ -3,11 +3,13 @@ Exe net8.0 + Finds and replaces code patterns from the command line. true true findreplacecode Faithlife.FindReplaceCode.Tool README.md + true