NET7 and small cleanup (#266)

* NET7 and small cleanup

* editorconfig

Author: sungam3r

.editorconfig

@@ -0,0 +1,36 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# Create portable, custom editor settings with EditorConfig
+# https://docs.microsoft.com/en-us/visualstudio/ide/create-portable-custom-editor-options
+
+# .NET coding convention settings for EditorConfig
+# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+
+# Language conventions
+# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-language-conventions
+
+# Formatting conventions
+# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-formatting-conventions
+
+# .NET naming conventions for EditorConfig
+# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-naming-conventions
+
+# Top-most EditorConfig file
+root = true
+
+# Editor default newlines with a newline ending every file
+[*]
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.cs]
+indent_size = 4
+
+# Code files
+[*.{cs,vb}]
+
+csharp_prefer_simple_using_statement = true:warning
+csharp_style_prefer_switch_expression = true:warning

.github/workflows/ci-cd.yml

@@ -15,21 +15,15 @@ jobs:
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 5.0.403
+          dotnet-version: 7.0.102
 
       # Build and test validation
 
       - name: Restore solution
-        shell: pwsh
-        run: |
-          dotnet restore Microsoft.IO.RecyclableMemoryStream.sln
+        run: dotnet restore
 
       - name: Build solution
-        shell: pwsh
-        run: |
-          dotnet build Microsoft.IO.RecyclableMemoryStream.sln `
-          --configuration Debug `
-          --no-restore
+        run: dotnet build --configuration Debug --no-restore
 
       - name: Run unit tests
         shell: pwsh

.github/workflows/codeql-analysis.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 5.0.203
+          dotnet-version: 7.0.102
 
       - name: Checkout repository
         uses: actions/checkout@v3

CHANGES.md

@@ -10,7 +10,7 @@ Bug Fix:
 # Version 2.2.0
 
 API changes:
-* Add an override for `GetStream` that takes a `ReadOnlySpan<byte>`. This supercedes the versions of `GetStream` that take `Memory<byte>`, which were marked as `[Obsolete]`.
+* Add an override for `GetStream` that takes a `ReadOnlySpan<byte>`. This supersedes the versions of `GetStream` that take `Memory<byte>`, which were marked as `[Obsolete]`.
 
 Bug Fixes:
 * Fixed: `GetReadOnlySequence()` throws `ArgumentOutOfRangeException`
@@ -22,7 +22,7 @@ Performance Improvements:
 * Use `GC.AllocateUninitializedArray` in an additional spot, for better performance in .NET 5+.
 
 Documentation:
-* Improved documentation, standardized puncutation, fixed code formatting.
+* Improved documentation, standardized punctuation, fixed code formatting.
 
 # Version 2.1.3
 
@@ -37,7 +37,7 @@ Bug Fixes:
 
 # Version 2.1.0
 
-* Added `RecyclableMemoryStreamManager` constructor overloads that take parameters for specifying the maximum free pool sizes. Updated IntelliSense documentation to make clear that these values need to be explciitly set to avoid unbounded pool growth.
+* Added `RecyclableMemoryStreamManager` constructor overloads that take parameters for specifying the maximum free pool sizes. Updated IntelliSense documentation to make clear that these values need to be explicitly set to avoid unbounded pool growth.
 * Buffers are now allocated using `GC.AllocateUninitializedArray` in .NET 5.
 * net462 and netstandard2.0 targets can now support the `Span`-related APIs via a dependency on System.Memory.
 * Updated documentation to fix typos and clarify language in some parts.

Microsoft.IO.RecyclableMemoryStream.sln

@@ -1,20 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.156
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IO.RecyclableMemoryStream", "src\Microsoft.IO.RecyclableMemoryStream.csproj", "{4B52F0CE-5F4C-43E7-A054-50CA0A502CF3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{419C9F3D-71CC-4F95-8324-E15CD0D1E754}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DF4A161A-7C52-46A2-A0ED-427C1C6F29AA}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		CHANGES.md = CHANGES.md
 		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{937E12C6-9E9E-438A-86C2-102E1D0C6826}"
+	ProjectSection(SolutionItems) = preProject
+		.github\dependabot.yml = .github\dependabot.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{0ED3EBE5-1575-4649-A1F9-3D24BFFC4A9B}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\ci-cd.yml = .github\workflows\ci-cd.yml
+		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +45,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{937E12C6-9E9E-438A-86C2-102E1D0C6826} = {DF4A161A-7C52-46A2-A0ED-427C1C6F29AA}
+		{0ED3EBE5-1575-4649-A1F9-3D24BFFC4A9B} = {937E12C6-9E9E-438A-86C2-102E1D0C6826}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D5E147AF-721B-469D-AD77-A00A290340AC}
 	EndGlobalSection

NuGet.config

@@ -14,7 +14,7 @@
     <clear />
     <add
       key="OSS_All"
-      value="https://api.nuget.org/v3/index.json" 
+      value="https://api.nuget.org/v3/index.json"
     />
   </packageSources>
 </configuration>

README.md

@@ -45,7 +45,7 @@ Supported build targets in v2.0 are: net462, netstandard2.0, netstandard2.1, and
 ## Testing
 
 A minimum of .NET 5.0 is required for executing the unit tests. Requirements:
-- NUnit test adaptor (VS Extension)
+- NUnit test adapter (VS Extension)
 - Be sure to set the default processor architecture for tests to x64 (or the giant allocation test will fail)
 
 ## Change Log

UnitTests/RecyclableMemoryStreamEventListener.cs

@@ -1,17 +1,17 @@
 // The MIT License (MIT)
-// 
+//
 // Copyright (c) 2015-2016 Microsoft
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,7 +29,7 @@ public class RecyclableMemoryStreamEventListener : EventListener
     {
         private const int MemoryStreamDisposed = 2;
         private const int MemoryStreamDoubleDispose = 3;
-        
+
         private const int NumEvents = 12;
 
         public int[] EventCounts { get; } = new int[NumEvents];