Update NaturalStringExtensions to support .NET 7 (#72)

augustoproiete · web-flow · commit 8d58b3b16392 · 2022-11-15T01:20:41.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,34 +26,32 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - os: ubuntu-18.04
-            build: ./build.sh
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             build: ./build.sh
             push: true
-          - os: windows-2019
-            build: ./build.cmd
           - os: windows-2022
             build: ./build.cmd
-          - os: macos-10.15
-            build: ./build.sh
-          - os: macos-11
+          - os: macos-12
             build: ./build.sh
     name: ${{ matrix.job.os }}
     runs-on: ${{ matrix.job.os }}
     steps:
       - name: Setup netcoreapp3.1
         uses: actions/setup-dotnet@v3.0.3
         with:
-          dotnet-version: "3.1.415"
+          dotnet-version: "3.1.425"
       - name: Setup net5.0
         uses: actions/setup-dotnet@v3.0.3
         with:
           dotnet-version: "5.0.403"
       - name: Setup net6.0
         uses: actions/setup-dotnet@v3.0.3
         with:
-          dotnet-version: "6.0.100"
+          dotnet-version: "6.0.403"
+      - name: Setup net7.0
+        uses: actions/setup-dotnet@v3.0.3
+        with:
+          dotnet-version: "7.0.100"
       - name: Run dotnet --info
         run: dotnet --info
       - uses: actions/checkout@v3.1.0
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);NU5048;CS8032</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 C. Augusto Proiete & Contributors
+   Copyright 2021-2022 C. Augusto Proiete & Contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
@@ -147,4 +147,4 @@ Click on the [Releases](https://github.com/augustoproiete/NaturalStringExtension
 
 ---
 
-_Copyright &copy; 2021 C. Augusto Proiete & Contributors - Provided under the [Apache License, Version 2.0](LICENSE). `NaturalStringExtensions` logo is a derivative of work by [Benjamin STAWARZ](https://www.iconfinder.com/bensta) ([original](https://www.iconfinder.com/icons/6138342/desc_direction_down_numeric_sort_filter_icon))._
+_Copyright &copy; 2021-2022 C. Augusto Proiete & Contributors - Provided under the [Apache License, Version 2.0](LICENSE). `NaturalStringExtensions` logo is a derivative of work by [Benjamin STAWARZ](https://www.iconfinder.com/bensta) ([original](https://www.iconfinder.com/icons/6138342/desc_direction_down_numeric_sort_filter_icon))._
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
     "allowPrerelease": false,
-    "version": "6.0.100",
+    "version": "7.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/sample/SampleConsole/LibraryVersion.cs b/sample/SampleConsole/LibraryVersion.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/sample/SampleConsole/Program.cs b/sample/SampleConsole/Program.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/sample/SampleConsole/SampleConsole.csproj b/sample/SampleConsole/SampleConsole.csproj
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
+    <TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NaturalStringExtensions/IComparerOfStringExtensions.cs b/src/NaturalStringExtensions/IComparerOfStringExtensions.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/NaturalStringExtensions/IEnumerableExtensions.cs b/src/NaturalStringExtensions/IEnumerableExtensions.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/NaturalStringExtensions/INaturalStringComparer.cs b/src/NaturalStringExtensions/INaturalStringComparer.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/NaturalStringExtensions/NaturalStringComparer.cs b/src/NaturalStringExtensions/NaturalStringComparer.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/NaturalStringExtensions/NaturalStringExtensions.csproj b/src/NaturalStringExtensions/NaturalStringExtensions.csproj
@@ -1,12 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net5.0;netstandard2.0;net461</TargetFrameworks>
 
     <AssemblyName>NaturalStringExtensions</AssemblyName>
     <AssemblyVersion>0.0.1.0</AssemblyVersion>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
     <GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -20,9 +18,7 @@
 
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../asset/natural-string-extensions.snk</AssemblyOriginatorKeyFile>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
 
-    <NoWarn>$(NoWarn);NU5048</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />
   </PropertyGroup>
@@ -34,7 +30,7 @@
     <Authors>C. Augusto Proiete &amp; Contributors</Authors>
     <Company>augustoproiete.net</Company>
     <Description>Extensions for sorting strings using natural sort order i.e. Alphabetical order for humans.</Description>
-    <Copyright>Copyright 2021 C. Augusto Proiete &amp; Contributors - Provided under the Apache License, Version 2.0</Copyright>
+    <Copyright>Copyright 2021-2022 C. Augusto Proiete &amp; Contributors - Provided under the Apache License, Version 2.0</Copyright>
     <PackageTags>natural;sort;order;string;extensions</PackageTags>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageIcon>images\icon.png</PackageIcon>
diff --git a/src/NaturalStringExtensions/StringComparisonExtensions.cs b/src/NaturalStringExtensions/StringComparisonExtensions.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/NaturalStringExtensions.Tests/IComparerOfStringExtensionsTests.cs b/test/NaturalStringExtensions.Tests/IComparerOfStringExtensionsTests.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/NaturalStringExtensions.Tests/IEnumerableExtensionsTests.cs b/test/NaturalStringExtensions.Tests/IEnumerableExtensionsTests.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/NaturalStringExtensions.Tests/NaturalStringComparerTests.cs b/test/NaturalStringExtensions.Tests/NaturalStringComparerTests.cs
@@ -1,4 +1,4 @@
-#region Copyright 2021 C. Augusto Proiete & Contributors
+#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/NaturalStringExtensions.Tests/NaturalStringExtensions.Tests.csproj b/test/NaturalStringExtensions.Tests/NaturalStringExtensions.Tests.csproj
@@ -1,9 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
+    <TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/NaturalStringExtensions.Tests/StringComparisonExtensionsTests.cs b/test/NaturalStringExtensions.Tests/StringComparisonExtensionsTests.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/NaturalStringExtensions.Tests/Support/StrCmpLogicalWStringComparer.cs b/test/NaturalStringExtensions.Tests/Support/StrCmpLogicalWStringComparer.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -147,4 +147,4 @@ Click on the [Releases](https://github.com/augustoproiete/NaturalStringExtension`
`147`	`147`
`148`	`148`	`---`
`149`	`149`
`150`		-_Copyright © 2021 C. Augusto Proiete & Contributors - Provided under the [Apache License, Version 2.0](LICENSE). `NaturalStringExtensions` logo is a derivative of work by [Benjamin STAWARZ](https://www.iconfinder.com/bensta) ([original](https://www.iconfinder.com/icons/6138342/desc_direction_down_numeric_sort_filter_icon))._
	`150`	+_Copyright © 2021-2022 C. Augusto Proiete & Contributors - Provided under the [Apache License, Version 2.0](LICENSE). `NaturalStringExtensions` logo is a derivative of work by [Benjamin STAWARZ](https://www.iconfinder.com/bensta) ([original](https://www.iconfinder.com/icons/6138342/desc_direction_down_numeric_sort_filter_icon))._
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`	`3`	`"allowPrerelease": false,`
`4`		`- "version": "6.0.100",`
	`4`	`+ "version": "7.0.100",`
`5`	`5`	`"rollForward": "latestFeature"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#region Copyright 2021 C. Augusto Proiete & Contributors`
	`1`	`+#region Copyright 2021-2022 C. Augusto Proiete & Contributors`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`