Merge pull request #7 from jcasale/dev

Dev
jcasale · Nov 13, 2024 · 53de688 · 53de688
2 parents 298b3a3 + 836f982
commit 53de688
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 55 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,7 +27,14 @@ jobs:
         with:
           global-json-file: src/global.json
 
-      - run: echo '${{ steps.setup-dotnet.outputs.dotnet-version }}'
+      - name: Set dotnet version
+        id: dotnet-version
+        run: |
+          $version = [version]::new('${{ steps.setup-dotnet.outputs.dotnet-version }}')
+          $label = 'net{0}{1}' -f $version.Major, $version.Minor
+          echo $label
+          
+          "label=$label" >> $env:GITHUB_OUTPUT
 
       - name: Run tests
         run: dotnet.exe test .\src\UserRights.sln --configuration Release --runtime win-x64
@@ -41,12 +48,12 @@ jobs:
       - name: Archive runtime-dependent release
         run: |
           cd ./publish
-          Get-ChildItem . -Exclude *.pdb,*.xml -Recurse |Compress-Archive -DestinationPath ../UserRights-net80-x64.zip
+          Get-ChildItem . -Exclude *.pdb,*.xml -Recurse |Compress-Archive -DestinationPath ../UserRights-${{ steps.dotnet-version.outputs.label }}-x64.zip
 
       - name: Upload runtime-dependent release
         uses: actions/upload-artifact@v4
         with:
-            name: UserRights-net80-x64
+            name: UserRights-${{ steps.dotnet-version.outputs.label }}-x64
             path: publish
             if-no-files-found: error
 
@@ -59,12 +66,12 @@ jobs:
       - name: Archive self-contained release
         run: |
           cd ./publish-packed
-          Compress-Archive -Path ./UserRights.exe -DestinationPath ../UserRights-net80-x64-self-contained.zip
+          Compress-Archive -Path ./UserRights.exe -DestinationPath ../UserRights-${{ steps.dotnet-version.outputs.label }}-x64-self-contained.zip
 
       - name: Upload self-contained release
         uses: actions/upload-artifact@v4
         with:
-            name: UserRights-net80-x64-self-contained
+            name: UserRights-${{ steps.dotnet-version.outputs.label }}-x64-self-contained
             path: publish-packed
             if-no-files-found: error
 
@@ -76,14 +83,14 @@ jobs:
 
           Compiled with .NET SDK ${{ steps.setup-dotnet.outputs.dotnet-version }}
 
-          ## UserRights-net80-x64-self-contained.zip
+          ## UserRights-${{ steps.dotnet-version.outputs.label }}-x64-self-contained.zip
 
           Self-contained release for Windows x64
 
-          ## UserRights-net80-x64.zip
+          ## UserRights-${{ steps.dotnet-version.outputs.label }}-x64.zip
 
           Framework-dependent release for Windows x64
-          '@ |gh.exe release create ${{ github.ref }} --title ${{ github.ref_name }} --notes-file - UserRights-net80-x64.zip UserRights-net80-x64-self-contained.zip
+          '@ |gh.exe release create ${{ github.ref }} --title ${{ github.ref_name }} --notes-file - UserRights-${{ steps.dotnet-version.outputs.label }}-x64.zip UserRights-${{ steps.dotnet-version.outputs.label }}-x64-self-contained.zip
         env:
           # Requires a personal access token with a fine-grained permission of contents:read/write.
           GH_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
diff --git a/src/StyleCop.ruleset b/src/StyleCop.ruleset
@@ -16,6 +16,7 @@
     <Rule Id="CA1014" Action="None" />
     <Rule Id="CA1016" Action="None" />
     <Rule Id="CA1031" Action="None" />
+    <Rule Id="CA1515" Action="None" />
     <Rule Id="CA1819" Action="None" />
     <Rule Id="CA1848" Action="None" />
     <Rule Id="CA1859" Action="None" />

diff --git a/src/Tests.Application/Tests.Application.csproj b/src/Tests.Application/Tests.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AnalysisLevel>latest-All</AnalysisLevel>
@@ -11,15 +11,15 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.0.1" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Tests.Application/UserRightsManagerListTests.cs b/src/Tests.Application/UserRightsManagerListTests.cs
@@ -70,9 +70,9 @@ public async Task SerializingToCsvShouldWork()
         var policy = new MockLsaUserRights(database);
         policy.Connect("SystemName");
 
-        Assert.Equal(new[] { PrincipalSid1, PrincipalSid2 }, policy.LsaEnumerateAccountsWithUserRight().Order());
-        Assert.Equal(new[] { Privilege1, Privilege2 }, policy.LsaEnumerateAccountRights(PrincipalSid1));
-        Assert.Equal(new[] { Privilege1, Privilege2 }, policy.LsaEnumerateAccountRights(PrincipalSid2));
+        Assert.Equal([PrincipalSid1, PrincipalSid2], policy.LsaEnumerateAccountsWithUserRight().Order());
+        Assert.Equal([Privilege1, Privilege2], policy.LsaEnumerateAccountRights(PrincipalSid1));
+        Assert.Equal([Privilege1, Privilege2], policy.LsaEnumerateAccountRights(PrincipalSid2));
 
         var manager = this.ServiceProvider.GetRequiredService<IUserRightsManager>();
         var userRights = manager.GetUserRights(policy).ToArray();

diff --git a/src/Tests.Application/UserRightsManagerPrivilegeTests.cs b/src/Tests.Application/UserRightsManagerPrivilegeTests.cs
@@ -100,16 +100,16 @@ public void GrantAndRevokeOthersShouldWork()
         Assert.Equal(new[] { Privilege1 }, policy.LsaEnumerateAccountRights(PrincipalSid1));
         Assert.Equal(new[] { Privilege1, Privilege2 }.Order(StringComparer.OrdinalIgnoreCase), policy.LsaEnumerateAccountRights(PrincipalSid2).Order(StringComparer.OrdinalIgnoreCase));
         Assert.Equal(new[] { PrincipalSid1, PrincipalSid2 }.Order(), policy.LsaEnumerateAccountsWithUserRight(Privilege1).Order());
-        Assert.Equal(new[] { PrincipalSid2 }, policy.LsaEnumerateAccountsWithUserRight(Privilege2));
+        Assert.Equal([PrincipalSid2], policy.LsaEnumerateAccountsWithUserRight(Privilege2));
 
         var manager = this.ServiceProvider.GetRequiredService<IUserRightsManager>();
         manager.ModifyPrivilege(policy, Privilege2, [PrincipalName1], [], false, true, null!, false);
 
         Assert.Equal(new[] { PrincipalSid1, PrincipalSid2 }.Order(), policy.LsaEnumerateAccountsWithUserRight().Order());
         Assert.Equal(new[] { Privilege1, Privilege2 }.Order(StringComparer.OrdinalIgnoreCase), policy.LsaEnumerateAccountRights(PrincipalSid1).Order(StringComparer.OrdinalIgnoreCase));
-        Assert.Equal(new[] { Privilege1 }, policy.LsaEnumerateAccountRights(PrincipalSid2));
+        Assert.Equal([Privilege1], policy.LsaEnumerateAccountRights(PrincipalSid2));
         Assert.Equal(new[] { PrincipalSid1, PrincipalSid2 }.Order(), policy.LsaEnumerateAccountsWithUserRight(Privilege1).Order());
-        Assert.Equal(new[] { PrincipalSid1 }, policy.LsaEnumerateAccountsWithUserRight(Privilege2));
+        Assert.Equal([PrincipalSid1], policy.LsaEnumerateAccountsWithUserRight(Privilege2));
     }
 
     /// <summary>
@@ -191,8 +191,8 @@ public void GrantAndRevokePatternShouldWork()
 
         Assert.Equal(new[] { PrincipalSid1, PrincipalSid2, PrincipalSid3 }.Order(), policy.LsaEnumerateAccountsWithUserRight().Order());
         Assert.Equal(new[] { Privilege1, Privilege2 }.Order(StringComparer.OrdinalIgnoreCase), policy.LsaEnumerateAccountRights(PrincipalSid1).Order(StringComparer.OrdinalIgnoreCase));
-        Assert.Equal(new[] { Privilege1, Privilege2 }, policy.LsaEnumerateAccountRights(PrincipalSid2).Order(StringComparer.OrdinalIgnoreCase));
-        Assert.Equal(new[] { Privilege1, Privilege2 }, policy.LsaEnumerateAccountRights(PrincipalSid3).Order(StringComparer.OrdinalIgnoreCase));
+        Assert.Equal([Privilege1, Privilege2], policy.LsaEnumerateAccountRights(PrincipalSid2).Order(StringComparer.OrdinalIgnoreCase));
+        Assert.Equal([Privilege1, Privilege2], policy.LsaEnumerateAccountRights(PrincipalSid3).Order(StringComparer.OrdinalIgnoreCase));
     }
 
     /// <summary>
@@ -364,8 +364,8 @@ public void RevokePatternForAllButBuiltinAndVirtualShouldWork()
         policy.Connect("SystemName");
 
         Assert.Equal(new[] { PrincipalSidCurrent, PrincipalSid1, PrincipalSid2, PrincipalSid3 }.Order(), policy.LsaEnumerateAccountsWithUserRight().Order());
-        Assert.Equal(new[] { Privilege1 }, policy.LsaEnumerateAccountRights(PrincipalSidCurrent));
-        Assert.Equal(new[] { Privilege2 }, policy.LsaEnumerateAccountRights(PrincipalSid1));
+        Assert.Equal([Privilege1], policy.LsaEnumerateAccountRights(PrincipalSidCurrent));
+        Assert.Equal([Privilege2], policy.LsaEnumerateAccountRights(PrincipalSid1));
         Assert.Equal(new[] { Privilege1, Privilege2 }.Order(StringComparer.OrdinalIgnoreCase), policy.LsaEnumerateAccountRights(PrincipalSid2).Order(StringComparer.OrdinalIgnoreCase));
         Assert.Equal(new[] { Privilege1, Privilege2 }.Order(StringComparer.OrdinalIgnoreCase), policy.LsaEnumerateAccountRights(PrincipalSid3).Order(StringComparer.OrdinalIgnoreCase));
 
@@ -374,8 +374,8 @@ public void RevokePatternForAllButBuiltinAndVirtualShouldWork()
         manager.ModifyPrivilege(policy, Privilege1, [], [], false, false, pattern, false);
 
         Assert.Equal(new[] { PrincipalSid1, PrincipalSid2, PrincipalSid3 }.Order(), policy.LsaEnumerateAccountsWithUserRight().Order());
-        Assert.Equal(new[] { Privilege2 }, policy.LsaEnumerateAccountRights(PrincipalSid1));
-        Assert.Equal(new[] { Privilege1, Privilege2 }, policy.LsaEnumerateAccountRights(PrincipalSid2).Order(StringComparer.OrdinalIgnoreCase));
-        Assert.Equal(new[] { Privilege1, Privilege2 }, policy.LsaEnumerateAccountRights(PrincipalSid3).Order(StringComparer.OrdinalIgnoreCase));
+        Assert.Equal([Privilege2], policy.LsaEnumerateAccountRights(PrincipalSid1));
+        Assert.Equal([Privilege1, Privilege2], policy.LsaEnumerateAccountRights(PrincipalSid2).Order(StringComparer.OrdinalIgnoreCase));
+        Assert.Equal([Privilege1, Privilege2], policy.LsaEnumerateAccountRights(PrincipalSid3).Order(StringComparer.OrdinalIgnoreCase));
     }
 }
diff --git a/src/Tests.Cli/Tests.Cli.csproj b/src/Tests.Cli/Tests.Cli.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AnalysisLevel>latest-All</AnalysisLevel>
@@ -11,13 +11,13 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.0.1" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AnalysisLevel>latest-All</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/UserRights.Application/LsaUserRights.cs b/src/UserRights.Application/LsaUserRights.cs
@@ -131,12 +131,11 @@ public unsafe string[] LsaEnumerateAccountRights(SecurityIdentifier accountSid)
 
                 for (var i = 0; i < count; i++)
                 {
-                    var offset = Marshal.SizeOf(typeof(LSA_UNICODE_STRING)) * i;
+                    var offset = Marshal.SizeOf<LSA_UNICODE_STRING>() * i;
                     var ptr = nint.Add((nint)userRights, offset);
-                    var result = Marshal.PtrToStructure(ptr, typeof(LSA_UNICODE_STRING)) ?? throw new InvalidOperationException();
-                    var unicodeString = (LSA_UNICODE_STRING)result;
+                    var result = Marshal.PtrToStructure<LSA_UNICODE_STRING>(ptr);
 
-                    results[i] = new string(unicodeString.Buffer.Value);
+                    results[i] = new string(result.Buffer.Value);
                 }
 
                 return results;
@@ -201,9 +200,9 @@ SecurityIdentifier[] Method(LSA_UNICODE_STRING right)
 
                 for (var i = 0; i < count; i++)
                 {
-                    var offset = Marshal.SizeOf(typeof(LSA_ENUMERATION_INFORMATION)) * i;
-                    var result = Marshal.PtrToStructure(nint.Add((nint)buffer, offset), typeof(LSA_ENUMERATION_INFORMATION)) ?? throw new InvalidOperationException();
-                    var sid = ((LSA_ENUMERATION_INFORMATION)result).Sid;
+                    var offset = Marshal.SizeOf<LSA_ENUMERATION_INFORMATION>() * i;
+                    var result = Marshal.PtrToStructure<LSA_ENUMERATION_INFORMATION>(nint.Add((nint)buffer, offset));
+                    var sid = result.Sid;
 
                     results[i] = new SecurityIdentifier((nint)sid.Value);
                 }

diff --git a/src/UserRights.Application/UserRights.Application.csproj b/src/UserRights.Application/UserRights.Application.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AnalysisLevel>latest-All</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/UserRights.Cli/UserRights.Cli.csproj b/src/UserRights.Cli/UserRights.Cli.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AnalysisLevel>latest-All</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/UserRights.Extensions/UserRights.Extensions.csproj b/src/UserRights.Extensions/UserRights.Extensions.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AnalysisLevel>latest-All</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.0.1" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/UserRights/UserRights.csproj b/src/UserRights/UserRights.csproj
@@ -2,19 +2,19 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AnalysisLevel>latest-All</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Serilog" Version="4.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Serilog" Version="4.1.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageReference Include="Serilog.Enrichers.GlobalLogContext" Version="3.0.0" />
     <PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" />

diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.403",
+    "version": "9.0.100",
     "rollForward": "latestFeature"
   }
 }