jcasale · jcasale · Dec 21, 2025 · Dec 20, 2025 · Dec 21, 2025 · Dec 21, 2025
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -49,13 +49,15 @@ jobs:
           echo "informationalVersion=$informationalVersion" >> $env:GITHUB_OUTPUT
 
       - name: Run tests
-        run: dotnet.exe test .\src\PSDataProtection.sln --configuration Release --runtime win-x64
+        run: |
+          cd .\src
+          dotnet.exe test --project .\Tests\Tests.csproj --configuration Debug --output Detailed
 
       - name: Clean solution
-        run: dotnet.exe clean .\src\PSDataProtection.sln --configuration Release
+        run: dotnet.exe clean .\src\PSDataProtection.slnx --configuration Release
 
       - name: Build project
-        run: dotnet.exe publish .\src\PSDataProtection\PSDataProtection.csproj --configuration Release --runtime win-x64 --output .\publish
+        run: dotnet.exe publish .\src\PSDataProtection\PSDataProtection.csproj --configuration Release --output .\publish
 
       - name: Prepare release
         run: Remove-Item ./publish/* -Include *.pdb,*.xml -ErrorAction Stop

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -7,4 +7,15 @@
     <Copyright>Copyright (c) Joseph L. Casale. All rights reserved.</Copyright>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Meziantou.Analyzer">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="StyleCop.Analyzers.Unstable">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Meziantou.Analyzer" Version="2.0.264" />
+    <PackageVersion Include="Microsoft.PowerShell.5.1.ReferenceAssemblies" Version="1.0.0" />
+    <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.1" />
+    <PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
+  </ItemGroup>
+</Project>
diff --git a/src/PSDataProtection.sln b/src/PSDataProtection.sln
diff --git a/src/PSDataProtection.slnx b/src/PSDataProtection.slnx
@@ -0,0 +1,10 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="../.editorconfig" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="global.json" />
+  </Folder>
+  <Project Path="PSDataProtection/PSDataProtection.csproj" />
+  <Project Path="Tests/Tests.csproj" />
+</Solution>
diff --git a/src/PSDataProtection/NewDataProtectionSecretCommand.cs b/src/PSDataProtection/NewDataProtectionSecretCommand.cs
@@ -10,7 +10,7 @@ namespace PSDataProtection;
 [OutputType(typeof(string))]
 public class NewDataProtectionSecretCommand : PSCmdlet
 {
-    private readonly System.Text.UTF8Encoding encoding = new();
+    private readonly System.Text.UTF8Encoding _encoding = new();
 
     [Parameter(
         Position = 0,
@@ -35,15 +35,16 @@ protected override void ProcessRecord()
         IntPtr bString;
         try
         {
-            bString = Marshal.SecureStringToBSTR(this.SecureString);
+            bString = Marshal.SecureStringToBSTR(SecureString);
         }
         catch (Exception e)
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                e,
-                "SecureStringToBinaryStringError",
-                ErrorCategory.InvalidData,
-                null));
+            ThrowTerminatingError(
+                new(
+                    e,
+                    "SecureStringToBinaryStringError",
+                    ErrorCategory.InvalidData,
+                    null));
 
             return;
         }
@@ -55,11 +56,12 @@ protected override void ProcessRecord()
         }
         catch (Exception e)
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                e,
-                "BinaryStringToManagedStringError",
-                ErrorCategory.InvalidData,
-                null));
+            ThrowTerminatingError(
+                new(
+                    e,
+                    "BinaryStringToManagedStringError",
+                    ErrorCategory.InvalidData,
+                    null));
 
             return;
         }
@@ -70,43 +72,46 @@ protected override void ProcessRecord()
 
         if (string.IsNullOrWhiteSpace(insecurePassword))
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                new InvalidOperationException("The secure string was empty."),
-                "EmptyPassword",
-                ErrorCategory.InvalidData,
-                null));
+            ThrowTerminatingError(
+                new(
+                    new InvalidOperationException("The secure string was empty."),
+                    "EmptyPassword",
+                    ErrorCategory.InvalidData,
+                    null));
 
             return;
         }
 
         byte[] bytes;
         try
         {
-            bytes = this.encoding.GetBytes(insecurePassword);
+            bytes = _encoding.GetBytes(insecurePassword);
         }
         catch (Exception e)
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                e,
-                "BinaryEncodingError",
-                ErrorCategory.InvalidData,
-                null));
+            ThrowTerminatingError(
+                new(
+                    e,
+                    "BinaryEncodingError",
+                    ErrorCategory.InvalidData,
+                    null));
 
             return;
         }
 
         byte[] secret;
         try
         {
-            secret = ProtectedData.Protect(bytes, null, this.Scope!.Value);
+            secret = ProtectedData.Protect(bytes, null, Scope!.Value);
         }
         catch (Exception e)
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                e,
-                "ProtectionError",
-                ErrorCategory.NotSpecified,
-                null));
+            ThrowTerminatingError(
+                new(
+                    e,
+                    "ProtectionError",
+                    ErrorCategory.NotSpecified,
+                    null));
 
             return;
         }
@@ -118,15 +123,16 @@ protected override void ProcessRecord()
         }
         catch (Exception e)
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                e,
-                "Base64EncodingError",
-                ErrorCategory.NotSpecified,
-                null));
+            ThrowTerminatingError(
+                new(
+                    e,
+                    "Base64EncodingError",
+                    ErrorCategory.NotSpecified,
+                    null));
 
             return;
         }
 
-        this.WriteObject(encoded);
+        WriteObject(encoded);
     }
 }
diff --git a/src/PSDataProtection/PSDataProtection.csproj b/src/PSDataProtection/PSDataProtection.csproj
@@ -2,15 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>net462</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AssemblyName>PSDataProtection</AssemblyName>
     <LangVersion>preview</LangVersion>
     <AnalysisLevel>preview-All</AnalysisLevel>
     <NoWarn>CA1031</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.PowerShell.5.1.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.PowerShell.5.1.ReferenceAssemblies" PrivateAssets="All" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" PrivateAssets="All" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/PSDataProtection/ReadDataProtectionSecretCommand.cs b/src/PSDataProtection/ReadDataProtectionSecretCommand.cs
@@ -10,10 +10,10 @@ namespace PSDataProtection;
 [OutputType(typeof(SecureString), ParameterSetName = [SecureStringParameterSetName])]
 public class ReadDataProtectionSecretCommand : PSCmdlet
 {
-    private readonly System.Text.UTF8Encoding encoding = new();
+    private const string StringParameterSetName = "StringOutput";
+    private const string SecureStringParameterSetName = "SecureStringOutput";
 
-    public const string StringParameterSetName = "StringOutput";
-    public const string SecureStringParameterSetName = "SecureStringOutput";
+    private readonly System.Text.UTF8Encoding _encoding = new();
 
     [Parameter(
         Position = 0,
@@ -43,54 +43,57 @@ protected override void ProcessRecord()
         byte[] bytes;
         try
         {
-            bytes = Convert.FromBase64String(this.Protected);
+            bytes = Convert.FromBase64String(Protected);
         }
         catch (Exception e)
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                e,
-                "Base64DecodingError",
-                ErrorCategory.InvalidData,
-                null));
+            ThrowTerminatingError(
+                new(
+                    e,
+                    "Base64DecodingError",
+                    ErrorCategory.InvalidData,
+                    null));
 
             return;
         }
 
         byte[] secret;
         try
         {
-            secret = ProtectedData.Unprotect(bytes, null, this.Scope!.Value);
+            secret = ProtectedData.Unprotect(bytes, null, Scope!.Value);
         }
         catch (Exception e)
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                e,
-                "DecryptionError",
-                ErrorCategory.NotSpecified,
-                null));
+            ThrowTerminatingError(
+                new(
+                    e,
+                    "DecryptionError",
+                    ErrorCategory.NotSpecified,
+                    null));
 
             return;
         }
 
         string decoded;
         try
         {
-            decoded = this.encoding.GetString(secret);
+            decoded = _encoding.GetString(secret);
         }
         catch (Exception e)
         {
-            this.ThrowTerminatingError(new ErrorRecord(
-                e,
-                "DecodingError",
-                ErrorCategory.NotSpecified,
-                null));
+            ThrowTerminatingError(
+                new(
+                    e,
+                    "DecodingError",
+                    ErrorCategory.NotSpecified,
+                    null));
 
             return;
         }
 
         object result;
 
-        switch (this.ParameterSetName)
+        switch (ParameterSetName)
         {
             case StringParameterSetName:
 
@@ -118,9 +121,9 @@ protected override void ProcessRecord()
 
             default:
 
-                throw new InvalidOperationException($"Unknown parameter set name: \"{this.ParameterSetName}\".");
+                throw new InvalidOperationException($"Unknown parameter set name: \"{ParameterSetName}\".");
         }
 
-        this.WriteObject(result);
+        WriteObject(result);
     }
 }