merge: main into benchmark

skarllot · Oct 5, 2024 · d0e2bab · d0e2bab
2 parents dd08276 + fc2c3c7
commit d0e2bab
Show file tree

Hide file tree

Showing 31 changed files with 1,600 additions and 209 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -42,12 +42,12 @@ jobs:
 
     steps:
     - name: 🛡️ Harden Runner
-      uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
+      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
       with:
         egress-policy: audit
 
     - name: 🛒 Checkout repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         fetch-depth: 0
 
@@ -65,7 +65,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: 🛠️ Initialize CodeQL
-      uses: github/codeql-action/init@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
+      uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -82,6 +82,6 @@ jobs:
       run: dotnet build --no-restore -c Release
 
     - name: 🔍 Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
+      uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/create-tag.yml b/.github/workflows/create-tag.yml
@@ -20,12 +20,12 @@ jobs:
 
     steps:
     - name: 🛡️ Harden Runner
-      uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
+      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
       with:
         egress-policy: audit
 
     - name: 🛒 Checkout
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         fetch-depth: 0
 

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -24,12 +24,12 @@ jobs:
 
     steps:
     - name: 🛡️ Harden Runner
-      uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
+      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
       with:
         egress-policy: audit
 
     - name: 🛒 Checkout
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         fetch-depth: 0
 
@@ -55,6 +55,6 @@ jobs:
       run: dotnet test --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
 
     - name: ☂️ Upload coverage reports to Codecov
-      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -19,12 +19,12 @@ jobs:
 
     steps:
       - name: 🛡️ Harden Runner
-        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 
       - name: 🛒 Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           persist-credentials: false
 
@@ -64,14 +64,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
+        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         with:
           sarif_file: results.sarif
diff --git a/gen/EnumUtilities.Generators/CodeWriters/EnumFactoryWriter.cs b/gen/EnumUtilities.Generators/CodeWriters/EnumFactoryWriter.cs
@@ -4676,7 +4676,7 @@ private void WriteMiscellaneousBlock()
         #line hidden
 
         #line 16 "C:\Users\skarl\source\repos\github\skarllot\EnumUtilities\gen\EnumUtilities.Generators\CodeWriters\Factory\MiscellaneousBlock.ttinclude"
-this.Write(")");
+this.Write(")(");
 
 
         #line default
@@ -4690,7 +4690,7 @@ private void WriteMiscellaneousBlock()
         #line hidden
 
         #line 16 "C:\Users\skarl\source\repos\github\skarllot\EnumUtilities\gen\EnumUtilities.Generators\CodeWriters\Factory\MiscellaneousBlock.ttinclude"
-this.Write(",\r\n");
+this.Write("),\r\n");
 
 
         #line default

diff --git a/gen/EnumUtilities.Generators/CodeWriters/Factory/MiscellaneousBlock.ttinclude b/gen/EnumUtilities.Generators/CodeWriters/Factory/MiscellaneousBlock.ttinclude
@@ -13,7 +13,7 @@
         foreach (var curr in Model.UniqueValues)
         {
 #>
-            (<#= Model.RefName #>)<#= curr.MemberValue #>,
+            (<#= Model.RefName #>)(<#= curr.MemberValue #>),
 <#+
         }
 #>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.401",
+    "version": "8.0.402",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }

diff --git a/...numUtilities.Generators.IntegrationTests/EnumUtilities.Generators.IntegrationTests.csproj b/...numUtilities.Generators.IntegrationTests/EnumUtilities.Generators.IntegrationTests.csproj
@@ -22,8 +22,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.33" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
   </ItemGroup>

diff --git a/...sGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.CategoriesFactory.g.cs b/...sGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.CategoriesFactory.g.cs
@@ -356,12 +356,12 @@ public static Categories[] GetValues()
         {
             return new[]
             {
-                (Categories)0,
-                (Categories)1,
-                (Categories)2,
-                (Categories)3,
-                (Categories)4,
-                (Categories)5,
+                (Categories)(0),
+                (Categories)(1),
+                (Categories)(2),
+                (Categories)(3),
+                (Categories)(4),
+                (Categories)(5),
             };
         }
 

diff --git a/...tiesGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.ColoursFactory.g.cs b/...tiesGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.ColoursFactory.g.cs
@@ -356,9 +356,9 @@ public static Colours[] GetValues()
         {
             return new[]
             {
-                (Colours)1,
-                (Colours)2,
-                (Colours)4,
+                (Colours)(1),
+                (Colours)(2),
+                (Colours)(4),
             };
         }
 

diff --git a/...Generator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.HumanStatesFactory.g.cs b/...Generator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.HumanStatesFactory.g.cs
@@ -368,11 +368,11 @@ public static HumanStates[] GetValues()
         {
             return new[]
             {
-                (HumanStates)1,
-                (HumanStates)2,
-                (HumanStates)3,
-                (HumanStates)4,
-                (HumanStates)5,
+                (HumanStates)(1),
+                (HumanStates)(2),
+                (HumanStates)(3),
+                (HumanStates)(4),
+                (HumanStates)(5),
             };
         }
 

diff --git a/...tiesGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.MyEnum1Factory.g.cs b/...tiesGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.MyEnum1Factory.g.cs
@@ -341,9 +341,9 @@ public static NestedInClass.MyEnum1[] GetValues()
         {
             return new[]
             {
-                (NestedInClass.MyEnum1)0,
-                (NestedInClass.MyEnum1)1,
-                (NestedInClass.MyEnum1)2,
+                (NestedInClass.MyEnum1)(0),
+                (NestedInClass.MyEnum1)(1),
+                (NestedInClass.MyEnum1)(2),
             };
         }
 

diff --git a/...tiesGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.MyEnum2Factory.g.cs b/...tiesGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.MyEnum2Factory.g.cs
@@ -818,10 +818,10 @@ public static NestedInClass.MyEnum2[] GetValues()
         {
             return new[]
             {
-                (NestedInClass.MyEnum2)0,
-                (NestedInClass.MyEnum2)1,
-                (NestedInClass.MyEnum2)2,
-                (NestedInClass.MyEnum2)3,
+                (NestedInClass.MyEnum2)(0),
+                (NestedInClass.MyEnum2)(1),
+                (NestedInClass.MyEnum2)(2),
+                (NestedInClass.MyEnum2)(3),
             };
         }
 

diff --git a/...tiesGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.MyEnum3Factory.g.cs b/...tiesGenerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.MyEnum3Factory.g.cs
@@ -502,13 +502,13 @@ public static NestedInClass.MyEnum3[] GetValues()
         {
             return new[]
             {
-                (NestedInClass.MyEnum3)0,
-                (NestedInClass.MyEnum3)1,
-                (NestedInClass.MyEnum3)2,
-                (NestedInClass.MyEnum3)3,
-                (NestedInClass.MyEnum3)4,
-                (NestedInClass.MyEnum3)5,
-                (NestedInClass.MyEnum3)6,
+                (NestedInClass.MyEnum3)(0),
+                (NestedInClass.MyEnum3)(1),
+                (NestedInClass.MyEnum3)(2),
+                (NestedInClass.MyEnum3)(3),
+                (NestedInClass.MyEnum3)(4),
+                (NestedInClass.MyEnum3)(5),
+                (NestedInClass.MyEnum3)(6),
             };
         }
 

diff --git a/...nerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.PaymentMethodFactory.g.cs b/...nerator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.PaymentMethodFactory.g.cs
@@ -818,10 +818,10 @@ public static PaymentMethod[] GetValues()
         {
             return new[]
             {
-                (PaymentMethod)0,
-                (PaymentMethod)1,
-                (PaymentMethod)2,
-                (PaymentMethod)3,
+                (PaymentMethod)(0),
+                (PaymentMethod)(1),
+                (PaymentMethod)(2),
+                (PaymentMethod)(3),
             };
         }
 

diff --git a/...erator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.SlimCategoriesFactory.g.cs b/...erator/Raiqub.Generators.EnumUtilities.IntegrationTests.Models.SlimCategoriesFactory.g.cs
@@ -356,12 +356,12 @@ public static SlimCategories[] GetValues()
         {
             return new[]
             {
-                (SlimCategories)0,
-                (SlimCategories)1,
-                (SlimCategories)2,
-                (SlimCategories)3,
-                (SlimCategories)4,
-                (SlimCategories)5,
+                (SlimCategories)(0),
+                (SlimCategories)(1),
+                (SlimCategories)(2),
+                (SlimCategories)(3),
+                (SlimCategories)(4),
+                (SlimCategories)(5),
             };
         }