Using PolySharp to allow use of C#13

.editorconfig

@@ -29,10 +29,12 @@ resharper_csharp_wrap_parameters_style = chop_always
 # C# files
 [*.cs]
 
+# Use concrete types when possible for improved performance
+dotnet_diagnostic.CA1859.severity = suggestion
+
 #### Core EditorConfig Options ####
 
-# We can't do this until C# 9.
-csharp_style_implicit_object_creation_when_type_is_apparent = false
+csharp_style_implicit_object_creation_when_type_is_apparent = true
 
 # Indentation and spacing
 indent_size = 4
@@ -341,6 +343,9 @@ csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_unused_value_expression_statement_preference = unused_local_variable:none
 resharper_for_simple_types = use_var
 
+# CA1860: Avoid using 'Enumerable.Any()' extension method
+dotnet_diagnostic.CA1860.severity = suggestion
+
 # CA1707: Identifiers should not contain underscores
 dotnet_diagnostic.ca1707.severity = none
 
@@ -362,3 +367,5 @@ dotnet_diagnostic.ca1014.severity = none
 csharp_style_var_elsewhere = false:warning
 csharp_style_var_for_built_in_types = false:warning
 csharp_style_var_when_type_is_apparent = true:warning
+dotnet_diagnostic.IDE0007.severity = none
+dotnet_diagnostic.IDE0008.severity = none

.github/workflows/build-pull-requests.yml

@@ -63,7 +63,6 @@ jobs:
         with:
           name: Nuget Packages ReleaseWithDocs
           path: |
-            Yubico.DotNetPolyfills/src/bin/ReleaseWithDocs/*.nupkg
             Yubico.Core/src/bin/ReleaseWithDocs/*.nupkg
             Yubico.YubiKey/src/bin/ReleaseWithDocs/*.nupkg
 
@@ -72,6 +71,5 @@ jobs:
         with:
           name: Assemblies ReleaseWithDocs
           path: |
-            Yubico.DotNetPolyfills/src/bin/ReleaseWithDocs/**/*.dll
             Yubico.Core/src/bin/ReleaseWithDocs/**/*.dll
             Yubico.YubiKey/src/bin/ReleaseWithDocs/**/*.dll

.github/workflows/build.yml

@@ -71,8 +71,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          global-json-file: global.json
-
+          global-json-file: "./global.json"
       - name: Add local NuGet repository
         run: dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/Yubico/index.json"
 
@@ -81,7 +80,6 @@ jobs:
         run: |
           $file = gci ./build/Versions.props
           $versionProp = [xml](gc $file.FullName)
-          $versionProp.Project.PropertyGroup.YubicoDotNetPolyfillsVersion = "${{ github.event.inputs.version }}"
           $versionProp.Project.PropertyGroup.YubicoCoreVersion = "${{ github.event.inputs.version }}"
           $versionProp.Project.PropertyGroup.YubicoYubiKeyVersion = "${{ github.event.inputs.version }}"
           $versionProp.Save($file.FullName)
@@ -102,7 +100,6 @@ jobs:
         with:
           name: Nuget Packages
           path: |
-            Yubico.DotNetPolyfills/src/bin/ReleaseWithDocs/*.nupkg
             Yubico.Core/src/bin/ReleaseWithDocs/*.nupkg
             Yubico.YubiKey/src/bin/ReleaseWithDocs/*.nupkg
 
@@ -111,7 +108,6 @@ jobs:
         with:
           name: Symbols Packages
           path: |
-            Yubico.DotNetPolyfills/src/bin/ReleaseWithDocs/*.snupkg
             Yubico.Core/src/bin/ReleaseWithDocs/*.snupkg
             Yubico.YubiKey/src/bin/ReleaseWithDocs/*.snupkg
 
@@ -120,21 +116,17 @@ jobs:
         with:
           name: Assemblies
           path: |
-            Yubico.DotNetPolyfills/src/bin/ReleaseWithDocs/**/*.dll
             Yubico.Core/src/bin/ReleaseWithDocs/**/*.dll
             Yubico.YubiKey/src/bin/ReleaseWithDocs/**/*.dll
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v2
         with:
           subject-path: |
-            Yubico.DotNetPolyfills/src/bin/ReleaseWithDocs/*.nupkg
             Yubico.Core/src/bin/ReleaseWithDocs/*.nupkg
             Yubico.YubiKey/src/bin/ReleaseWithDocs/*.nupkg
-            Yubico.DotNetPolyfills/src/bin/ReleaseWithDocs/*.snupkg
             Yubico.Core/src/bin/ReleaseWithDocs/*.snupkg
             Yubico.YubiKey/src/bin/ReleaseWithDocs/*.snupkg
-            Yubico.DotNetPolyfills/src/bin/ReleaseWithDocs/**/*.dll
             Yubico.Core/src/bin/ReleaseWithDocs/**/*.dll
             Yubico.YubiKey/src/bin/ReleaseWithDocs/**/*.dll
 
@@ -179,10 +171,8 @@ jobs:
         with:
           name: Nuget Packages
       - run: |
-          $polyfills = (Get-ChildItem -Recurse Yubico.DotnetPolyfills/*.nupkg)[0].FullName
           $core = (Get-ChildItem -Recurse Yubico.Core/*.nupkg)[0].FullName
           $yubikey = (Get-ChildItem -Recurse Yubico.YubiKey/*.nupkg)[0].FullName
           dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/Yubico/index.json"
-          dotnet nuget push $polyfills --source "github" --api-key ${{ secrets.GITHUB_TOKEN }}
           dotnet nuget push $core --source "github" --api-key ${{ secrets.GITHUB_TOKEN }}
           dotnet nuget push $yubikey --source "github" --api-key ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test-macos.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          global-json-file: global.json
+          global-json-file: "./global.json"
 
       - name: Add local NuGet repository
         run: dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/Yubico/index.json"

.github/workflows/test-ubuntu.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          global-json-file: global.json
+          global-json-file: "./global.json"
 
       - name: Add local NuGet repository
         run: dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/Yubico/index.json"

.github/workflows/test-windows.yml

@@ -30,7 +30,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          global-json-file: global.json
+          global-json-file: "./global.json"
+
       - name: Add local NuGet repository
         run: dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/Yubico/index.json"
 

.github/workflows/verify-code-style.yml

@@ -36,7 +36,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          global-json-file: global.json
+          global-json-file: "./global.json"
+
       - name: Add local NuGet repository
         run: dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/Yubico/index.json"
       #- name: Build Yubico.NET.SDK.sln

CONTRIBUTING.md

@@ -210,5 +210,5 @@ The following rules must be followed for PRs that include files from another pro
 - The contribution is correctly attributed, as needed (generally in LICENSE.txt or NOTICE.txt in
   project root).
 
-See [CborTag.cs](./Yubico.DotNetPolyfills/src/System.Formats.Cbor/CborTag.cs) for an example of a
+See [CryptographicOperations.cs](./Yubico.Core/src/System.Security.Cryptography/CryptographicOperations.cs) for an example of a
 file copied from another project and attributed in the [LICENSE.txt](./LICENSE.txt) file.

LICENSE.txt

@@ -200,41 +200,10 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-
-
-==================================================
-The following license applies to
-\Yubico.DotNetPolyfills\src\Contrib.Bcl.Ranges\Range.cs
-\Yubico.DotNetPolyfills\src\Contrib.Bcl.Ranges\Index.cs
-
-MIT License
-
-Copyright (c) 2019 Stuart Lang
-Copyright (c) .NET Foundation and Contributors
-
-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
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ==================================================
 The following license applies to
 \CONTRIBUTING.md
-\Yubico.DotNetPolyfills\src\System.Security.Cryptography\CryptographicOperations.cs
+\Yubico.Core\src\System.Security.Cryptography\CryptographicOperations.cs
 \Yubico.YubiKey\src\Yubico\YubiKey\Cryptography\RandomNumberGeneratorExt.cs
 
 The MIT License (MIT)

README.md

@@ -24,13 +24,23 @@ limitations under the License. -->
 Enterprise-grade cross-platform SDK for YubiKey integration, built on .NET.
 
 ## Table of Contents
-- [Quick Start](#quick-start)
-- [Documentation](#documentation)
-- [SDK Support](#sdk-support)
-- [SDK Packages](#sdk-packages)
-- [Project Structure](#project-structure)
-- [Contributing](#contributing)
-- [Security](#security)
+- [.NET YubiKey SDK](#net-yubikey-sdk)
+  - [Table of Contents](#table-of-contents)
+  - [Quick Start](#quick-start)
+    - [Installation](#installation)
+    - [Basic Usage](#basic-usage)
+  - [Documentation](#documentation)
+  - [SDK Support](#sdk-support)
+  - [SDK Packages](#sdk-packages)
+    - [Public Assemblies](#public-assemblies)
+      - [Yubico.YubiKey](#yubicoyubikey)
+      - [Yubico.Core](#yubicocore)
+    - [Internal Assemblies](#internal-assemblies)
+      - [Yubico.NativeShims](#yubiconativeshims)
+  - [Project Structure](#project-structure)
+  - [Contributing](#contributing)
+    - [Building the Project](#building-the-project)
+  - [Connect with us](#connect-with-us)
 
 ## Quick Start
 
@@ -44,7 +54,7 @@ dotnet add package Yubico.YubiKey
 using Yubico.YubiKey;
 
 // Chooses the first YubiKey found on the computer.
-IYubiKeyDevice? SampleChooseYubiKey()
+IYubiKeyDevice? GetFirstYubiKey()
 {
     IEnumerable<IYubiKeyDevice> list = YubiKeyDevice.FindAll();
     return list.First();
@@ -83,10 +93,6 @@ Platform abstraction layer (PAL) providing:
 
 ### Internal Assemblies
 
-#### Yubico.DotNetPolyfills
-> ⚠️ **Not for public use**  
-> Backports BCL features needed by the SDK.
-
 #### Yubico.NativeShims
 > ⚠️ **Not for public use**  
 > 🔧 **Unmanaged Library**  

Yubico.DotNetPolyfills/src/System.Security.Cryptography/CryptographicOperations.cs → Yubico.Core/src/System.Security.Cryptography/CryptographicOperations.cs

@@ -5,7 +5,7 @@
 
 using System.Runtime.CompilerServices;
 
-#if !NETSTANDARD2_0
+#if NETSTANDARD2_1_OR_GREATER
 [assembly: TypeForwardedTo(typeof(System.Security.Cryptography.CryptographicOperations))]
 
 #else

Yubico.Core/src/Yubico.Core.csproj

@@ -109,16 +109,26 @@ limitations under the License. -->
 
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <!-- Before updating PolySharp, we should do some due dilligence on the update -->
+    <PackageReference Include="PolySharp" Version="1.15.0" AllowUpdates="false">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
     <!-- The wildcard version tag allows us to include the latest minor and pre-release versions -->
     <PackageReference Include="Yubico.NativeShims" Version="1.*-*" />
-    <ProjectReference Include="..\..\Yubico.DotNetPolyfills\src\Yubico.DotNetPolyfills.csproj" />
   </ItemGroup>
 
   <ItemGroup Label="Expose internal test hooks to Unit Test projects">

Yubico.Core/src/Yubico/Core/Buffers/MultiString.cs

@@ -24,6 +24,8 @@ namespace Yubico.Core.Buffers
     /// </summary>
     public static class MultiString
     {
+        private static readonly char[] _separator = ['\0'];
+
         /// <summary>
         /// Converts the byte array representing a multi-null-terminated string and return them as
         /// .NET strings.
@@ -40,7 +42,7 @@ public static string[] GetStrings(byte[] value, Encoding encoding)
 
             return encoding
                 .GetString(value)
-                .Split(new char[] { '\0' }, StringSplitOptions.RemoveEmptyEntries);
+                .Split(_separator, StringSplitOptions.RemoveEmptyEntries);
         }
 
         /// <summary>

Yubico.Core/src/Yubico/Core/Devices/Hid/WindowsHidDevice.cs

@@ -76,7 +76,10 @@ private void ResolveIdsFromInstancePath(string instancePath)
             // 012345678901234567890123456789
             //             ^---     ^---
 
+            // Disable string comparison warning for this method as it needs to compile for both net47, netstandard 2.0 and 2.1
+#pragma warning disable CA1862
             if (instancePath.ToUpperInvariant().Contains("VID") && instancePath.ToUpperInvariant().Contains("HID"))
+#pragma warning restore CA1862
             {
                 // If this fails, vendorId will be 0.
                 _ = TryGetHexShort(instancePath, 12, 4, out ushort vendorId);

Yubico.Core/src/Yubico/Core/Devices/SmartCard/DesktopSmartCardDeviceListener.cs

@@ -106,6 +106,7 @@ private void ListenForReaderChanges()
         #region IDisposable Support
 
         private bool _disposedValue; // To detect redundant calls
+        internal static readonly string[] readerNames = new[] { "\\\\?\\Pnp\\Notifications" };
 
         /// <summary>
         /// Disposes the objects.
@@ -192,7 +193,7 @@ private bool CheckForUpdates(int timeout, bool usePnpWorkaround)
                 SCARD_READER_STATE[] removedReaderStates = newStates.Except(eventStateList, new ReaderStateComparer()).ToArray();
 
                 // Don't get status changes if there are no updates in state list.
-                if (!addedReaderStates.Any() && !removedReaderStates.Any())
+                if (addedReaderStates.Length == 0 && removedReaderStates.Length == 0)
                 {
                     break;
                 }
@@ -214,7 +215,7 @@ private bool CheckForUpdates(int timeout, bool usePnpWorkaround)
                 // Only call get status change if a new reader was added. If nothing was added,
                 // we would otherwise hang / timeout here because all changes (in SCard's mind)
                 // have been dealt with.
-                if (addedReaderStates.Any())
+                if (addedReaderStates.Length != 0)
                 {
                     _log.LogInformation("Additional smart card readers were found. Calling GetStatusChange for more information.");
                     getStatusChangeResult = SCardGetStatusChange(_context, 0, updatedStates, updatedStates.Length);
@@ -280,7 +281,7 @@ private bool CheckForUpdates(int timeout, bool usePnpWorkaround)
         // us of the change.
         private bool UsePnpWorkaround()
         {
-            SCARD_READER_STATE[] testState = SCARD_READER_STATE.CreateFromReaderNames(new[] { "\\\\?\\Pnp\\Notifications" });
+            SCARD_READER_STATE[] testState = SCARD_READER_STATE.CreateFromReaderNames(readerNames);
             _ = SCardGetStatusChange(_context, 0, testState, testState.Length);
             bool usePnpWorkaround = testState[0].EventState.HasFlag(SCARD_STATE.UNKNOWN);
             return usePnpWorkaround;

Yubico.Core/src/Yubico/PlatformInterop/Desktop/SCard/SCardIORequest.cs

@@ -42,7 +42,7 @@ internal struct SCARD_IO_REQUEST
         public SCARD_IO_REQUEST(SCARD_PROTOCOL protocol)
         {
             Protocol = protocol;
-            PciLength = Marshal.SizeOf(typeof(SCARD_IO_REQUEST));
+            PciLength = Marshal.SizeOf<SCARD_IO_REQUEST>();
         }
     }
 }

Yubico.Core/src/Yubico/PlatformInterop/Desktop/SCard/SCardReaderStates.cs

@@ -23,28 +23,24 @@ namespace Yubico.PlatformInterop
 {
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     // Justification: Fields are read/write via interop. Readonly might not have any effect there, but it may give
-    // maintainers a falls impression about the true nature of these fields.
+    // maintainers a false impression about the true nature of these fields.
     [SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Local")]
     [SuppressMessage("Style", "IDE0044:Add readonly modifier")]
     internal struct SCARD_READER_STATE
     {
-        [MarshalAs(UnmanagedType.LPStr)]
-        private string _readerName;
         private IntPtr _userData;
         private uint _currentState;
         private uint _eventState;
         private uint _atrLength;
+
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 36)]
         private byte[] _answerToReset;
 
         private const uint SequenceMask = 0xFFFF_0000;
         private const uint StateMask = 0x0000_FFFF;
 
-        public string ReaderName
-        {
-            get => _readerName;
-            set => _readerName = value;
-        }
+        [field: MarshalAs(UnmanagedType.LPStr)]
+        public string ReaderName { get; set; }
 
         public SCARD_STATE CurrentState => (SCARD_STATE)(_currentState & StateMask);
         public SCARD_STATE EventState => (SCARD_STATE)(_eventState & StateMask);