diff --git a/.editorconfig b/.editorconfig index b49721f..fbd00a0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,6 +13,9 @@ resharper_comment_typo_highlighting = none resharper_identifier_typo_highlighting = none resharper_string_literal_typo_highlighting = none +[Directory.Packages.props] +insert_final_newline = false + [dotnet-tools.json] insert_final_newline = false @@ -83,6 +86,7 @@ csharp_style_prefer_local_over_anonymous_function = true : suggestion csharp_style_prefer_not_pattern = true : suggestion csharp_style_prefer_null_check_over_type_check = true : suggestion csharp_style_prefer_pattern_matching = true : suggestion +csharp_style_prefer_primary_constructors = true : suggestion csharp_style_prefer_range_operator = true : suggestion csharp_style_prefer_switch_expression = true : suggestion csharp_style_prefer_tuple_swap = true : warning @@ -199,6 +203,7 @@ dotnet_diagnostic.IDE0160.severity = suggestion dotnet_diagnostic.IDE0161.severity = suggestion dotnet_diagnostic.IDE0170.severity = suggestion dotnet_diagnostic.IDE0180.severity = warning +dotnet_diagnostic.IDE0290.severity = suggestion dotnet_diagnostic.IDE1005.severity = suggestion dotnet_diagnostic.SA0001.severity = none dotnet_diagnostic.SA1003.severity = none @@ -322,6 +327,7 @@ resharper_arrange_missing_parentheses_highlighting = hint resharper_arrange_trailing_comma_in_multiline_lists_highlighting = warning resharper_comment_typo_highlighting = none resharper_compare_of_floats_by_equality_operator_highlighting = suggestion +resharper_convert_to_primary_constructor_highlighting = hint resharper_csharp_align_first_arg_by_paren = false resharper_csharp_align_linq_query = false resharper_csharp_align_multiline_argument = false diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ec17733..5e1e243 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,18 +1,20 @@ name: Build + on: - workflow_dispatch: push: - branches: - - 'master' - tags-ignore: - - '**' + branches: [master] + tags-ignore: ['**'] pull_request: + workflow_dispatch: + env: DOTNET_NOLOGO: 1 DOTNET_CLI_TELEMETRY_OPTOUT: 1 + defaults: run: shell: pwsh + jobs: build: runs-on: ${{ matrix.os }} @@ -20,10 +22,8 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macos-latest] steps: - - name: Set up .NET 7 + - name: Install .NET uses: actions/setup-dotnet@v3 - with: - dotnet-version: 7.0.x - name: Check out code uses: actions/checkout@v3 - name: Restore diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index 8ead174..f2e15ed 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -11,10 +11,8 @@ jobs: publish-docs: runs-on: windows-latest steps: - - name: Set up .NET 7 + - name: Install .NET uses: actions/setup-dotnet@v3 - with: - dotnet-version: 7.0.x - name: Check out code uses: actions/checkout@v3 - name: Publish Docs diff --git a/.gitignore b/.gitignore index e3008f1..a2ad192 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,16 @@ +.vs/ +.idea/ +artifacts/ bin/ obj/ release/ -.vs/ -.idea/ -Thumbs.db + *.cache -*.user -*.userprefs +*.log *.ncrunchproject *.ncrunchsolution +*.user +launchSettings.json nCrunchTemp* _ReSharper* .DS_Store diff --git a/Directory.Build.props b/Directory.Build.props index 9e8b03d..9906d40 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,11 +2,13 @@ 0.0.0 - 11.0 + 0.0.0 + 12.0 enable enable true - $(NoWarn);1591;1998;NU5105 + $(NoWarn);1591;1998;NU1507;NU5105 + en-US embedded Faithlife RepoName @@ -19,11 +21,16 @@ true true true - AllEnabledByDefault + latest-all true true false false + false + true + true + true + true @@ -31,10 +38,4 @@ true - - - - - - diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..5c6392d --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,16 @@ + + + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/RepoName.sln b/RepoName.sln index f1962f4..9417ee4 100644 --- a/RepoName.sln +++ b/RepoName.sln @@ -3,56 +3,57 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectName", "src\ProjectName\ProjectName.csproj", "{E1BF8BA1-9E9D-4E27-83FC-777B8D14F806}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectName", "src\ProjectName\ProjectName.csproj", "{1F75E8CE-F59A-4738-81EC-17B71C125A06}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectName.Tests", "tests\ProjectName.Tests\ProjectName.Tests.csproj", "{DF559AD1-5287-43B1-AB47-61B6F342B0FE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectName.Tests", "tests\ProjectName.Tests\ProjectName.Tests.csproj", "{3506DA15-B470-42E7-B897-D436451CBC32}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{028A6C6D-8F8F-4A91-A063-45FFCF892109}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.csproj", "{9BB3C85C-100E-4128-A9AF-8F697D753538}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocGen", "tools\XmlDocGen\XmlDocGen.csproj", "{0A5C4B36-610E-4451-BD56-86E5C8A52C42}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A21957E2-3EB8-4CA5-8537-04F60C9F98D5}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig .gitattributes = .gitattributes .gitignore = .gitignore build.ps1 = build.ps1 - .github\workflows\build.yaml = .github\workflows\build.yaml + CONTRIBUTING.md = CONTRIBUTING.md Directory.Build.props = Directory.Build.props - dotnet-tools.json = dotnet-tools.json + Directory.Packages.props = Directory.Packages.props + global.json = global.json LICENSE = LICENSE nuget.config = nuget.config README.md = README.md ReleaseNotes.md = ReleaseNotes.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.csproj", "{CBD807B4-F49F-4DD1-BC9A-359E90EA913F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocGen", "tools\XmlDocGen\XmlDocGen.csproj", "{EC2B2484-B209-41A2-94E5-4203A9740983}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E1BF8BA1-9E9D-4E27-83FC-777B8D14F806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1BF8BA1-9E9D-4E27-83FC-777B8D14F806}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1BF8BA1-9E9D-4E27-83FC-777B8D14F806}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1BF8BA1-9E9D-4E27-83FC-777B8D14F806}.Release|Any CPU.Build.0 = Release|Any CPU - {DF559AD1-5287-43B1-AB47-61B6F342B0FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF559AD1-5287-43B1-AB47-61B6F342B0FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF559AD1-5287-43B1-AB47-61B6F342B0FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF559AD1-5287-43B1-AB47-61B6F342B0FE}.Release|Any CPU.Build.0 = Release|Any CPU - {CBD807B4-F49F-4DD1-BC9A-359E90EA913F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBD807B4-F49F-4DD1-BC9A-359E90EA913F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBD807B4-F49F-4DD1-BC9A-359E90EA913F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBD807B4-F49F-4DD1-BC9A-359E90EA913F}.Release|Any CPU.Build.0 = Release|Any CPU - {EC2B2484-B209-41A2-94E5-4203A9740983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC2B2484-B209-41A2-94E5-4203A9740983}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC2B2484-B209-41A2-94E5-4203A9740983}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC2B2484-B209-41A2-94E5-4203A9740983}.Release|Any CPU.Build.0 = Release|Any CPU + {1F75E8CE-F59A-4738-81EC-17B71C125A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F75E8CE-F59A-4738-81EC-17B71C125A06}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F75E8CE-F59A-4738-81EC-17B71C125A06}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F75E8CE-F59A-4738-81EC-17B71C125A06}.Release|Any CPU.Build.0 = Release|Any CPU + {3506DA15-B470-42E7-B897-D436451CBC32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3506DA15-B470-42E7-B897-D436451CBC32}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3506DA15-B470-42E7-B897-D436451CBC32}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3506DA15-B470-42E7-B897-D436451CBC32}.Release|Any CPU.Build.0 = Release|Any CPU + {9BB3C85C-100E-4128-A9AF-8F697D753538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BB3C85C-100E-4128-A9AF-8F697D753538}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BB3C85C-100E-4128-A9AF-8F697D753538}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BB3C85C-100E-4128-A9AF-8F697D753538}.Release|Any CPU.Build.0 = Release|Any CPU + {0A5C4B36-610E-4451-BD56-86E5C8A52C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A5C4B36-610E-4451-BD56-86E5C8A52C42}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A5C4B36-610E-4451-BD56-86E5C8A52C42}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A5C4B36-610E-4451-BD56-86E5C8A52C42}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6D621D28-8AB2-41C2-AA99-AE2225542E17} + SolutionGuid = {28CD7BF1-0965-4088-8597-4C08C20C814C} EndGlobalSection EndGlobal diff --git a/global.json b/global.json new file mode 100644 index 0000000..391ba3c --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "8.0.100", + "rollForward": "latestFeature" + } +} diff --git a/nuget.config b/nuget.config index 325a275..6873eb9 100644 --- a/nuget.config +++ b/nuget.config @@ -1,3 +1,4 @@ + diff --git a/src/ProjectName/ProjectName.csproj b/src/ProjectName/ProjectName.csproj index a8952ff..c3bc384 100644 --- a/src/ProjectName/ProjectName.csproj +++ b/src/ProjectName/ProjectName.csproj @@ -5,6 +5,7 @@ ProjectName class library. true + true README.md diff --git a/tests/ProjectName.Tests/PlaceholderTests.cs b/tests/ProjectName.Tests/PlaceholderTests.cs new file mode 100644 index 0000000..698bb3c --- /dev/null +++ b/tests/ProjectName.Tests/PlaceholderTests.cs @@ -0,0 +1,11 @@ +using NUnit.Framework; + +namespace ProjectName.Tests; + +internal sealed class PlaceholderTests +{ + [Test] + public void PlaceholderTest() + { + } +} diff --git a/tests/ProjectName.Tests/ProjectName.Tests.csproj b/tests/ProjectName.Tests/ProjectName.Tests.csproj index 1844790..a9028f5 100644 --- a/tests/ProjectName.Tests/ProjectName.Tests.csproj +++ b/tests/ProjectName.Tests/ProjectName.Tests.csproj @@ -1,13 +1,13 @@ - net7.0 + net8.0 - - - + + + diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj index 3fda495..94c9978 100644 --- a/tools/Build/Build.csproj +++ b/tools/Build/Build.csproj @@ -2,11 +2,11 @@ Exe - net7.0 + net8.0 - + diff --git a/tools/XmlDocGen/XmlDocGen.csproj b/tools/XmlDocGen/XmlDocGen.csproj index 121930a..bdd5561 100644 --- a/tools/XmlDocGen/XmlDocGen.csproj +++ b/tools/XmlDocGen/XmlDocGen.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 @@ -10,7 +10,7 @@ - +