Address change requests for Generic Package upload from ubisoft/NGitLab#524

.editorconfig

@@ -143,7 +143,7 @@ csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = false
 csharp_using_directive_placement = outside_namespace:silent
 csharp_prefer_simple_using_statement = true:suggestion
-csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_namespace_declarations = file_scoped:warning
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
 csharp_style_expression_bodied_methods = false:silent
@@ -260,6 +260,9 @@ dotnet_diagnostic.SA1101.severity = none
 # SA1116: Split parameters should start on line after declaration
 dotnet_diagnostic.SA1116.severity = silent
 
+# SA1118: Parameter should not span multiple lines
+dotnet_diagnostic.SA1118.severity = suggestion
+
 # SA1122: Use string.Empty for empty strings
 dotnet_diagnostic.SA1122.severity = none
 

.github/dependabot.yml

@@ -1,7 +1,7 @@
 # To get started with Dependabot version updates, you'll need to specify which
 # package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 
 version: 2
 updates:
@@ -18,6 +18,10 @@ updates:
       interval: weekly
     rebase-strategy: auto
     open-pull-requests-limit: 20
+    groups:
+      github-actions:
+        patterns:
+          - "*"
 
   - package-ecosystem: "npm"
     directory: "/"
@@ -32,3 +36,13 @@ updates:
       interval: weekly
     rebase-strategy: auto
     open-pull-requests-limit: 20
+    groups:
+      code-analyzers:
+        patterns:
+          - "*Analyzer*"
+      ms-dependencies:
+        patterns:
+          - "Microsoft.*"
+          - "System.*"
+        exclude-patterns:
+          - "Microsoft.Playwright"

.github/workflows/ci.yml

@@ -27,15 +27,15 @@ jobs:
       with:
         fetch-depth: 0 # Get all the history so MinGit can compute the version
     - name: Setup .NET Core (latest)
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
     - run: dotnet pack NGitLab.sln --configuration Release --output ${{ env.NuGetDirectory }} /bl
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: nuget
         if-no-files-found: error
         retention-days: 7
         path: ${{ env.NuGetDirectory }}/**/*
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: binlogs
         if-no-files-found: error
@@ -51,8 +51,8 @@ jobs:
         # Keep in sync with the version in GitLabDockerContainer.cs
         # Available tags: https://hub.docker.com/r/gitlab/gitlab-ee/tags
         gitlab: [
-          'gitlab/gitlab-ee:15.4.6-ee.0',
           'gitlab/gitlab-ee:15.11.9-ee.0',
+          'gitlab/gitlab-ee:15.11.13-ee.0',
         ]
         configuration: [ Release ]
       fail-fast: false
@@ -67,15 +67,15 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET Core (latest)
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
     - run: |
         $value = "${{ matrix.gitlab }}-${{ matrix.configuration }}".Replace(':', '-').Replace('/', '-')
         "artifact_name=test-results-$value" >> $env:GITHUB_OUTPUT
       name: Set artifact name
       id: set-artifact-name
     - run: dotnet test --configuration ${{ matrix.configuration }} --logger trx --results-directory "${{ env.TestResultsDirectory }}" --collect:"XPlat Code Coverage" /p:RunAnalyzers=false
       name: Run tests
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: ${{ steps.set-artifact-name.outputs.artifact_name }}
@@ -96,12 +96,12 @@ jobs:
     runs-on: 'ubuntu-20.04'
     needs: [ create_nuget, build_and_test ]
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: nuget
         path: ${{ env.NuGetDirectory }}
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
     - run: |
         Write-Host "Current ref: $env:GITHUB_REF"
         Write-Host "Searching nupkg in folder: ${{ env.NuGetDirectory }}"

BannedSymbols.txt

@@ -1,4 +1,4 @@
-#https://github.com/dotnet/csharplang/blob/main/spec/documentation-comments.md#id-string-format
+// https://github.com/dotnet/csharpstandard/blob/standard-v6/standard/documentation-comments.md#d42-id-string-format
 
 M:System.String.ToLower;Use ToLowerInvariant instead
 M:System.String.ToUpper;Use ToUpperInvariant instead

Directory.Build.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <!-- Assembly Info -->
     <Company>Ubisoft</Company>
@@ -8,7 +8,7 @@
     <Authors>$(Company), NGitLab contributors</Authors>
 
     <!-- Compile Options -->
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <Deterministic>true</Deterministic>
     <Features>strict</Features>
     <TreatWarningsAsErrors Condition="'$(Configuration)' != 'Debug'">true</TreatWarningsAsErrors>
@@ -27,7 +27,7 @@
     <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
 
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)/BannedSymbols.txt" Link="Properties/BannedSymbols.txt" />
-    <PackageReference Include="MinVer" PrivateAssets="All" Version="4.3.0" />
+    <PackageReference Include="MinVer" PrivateAssets="All" Version="5.0.0" />
 
     <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
@@ -37,17 +37,17 @@
 
   <!-- Analyzers (Roslyn, Meziantou, StyleCop, ...) -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.4">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.84">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.146">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

NGitLab.Mock.Tests/BotUserTests.cs

@@ -1,41 +1,40 @@
 using NGitLab.Models;
 using NUnit.Framework;
 
-namespace NGitLab.Mock.Tests
+namespace NGitLab.Mock.Tests;
+
+public sealed class BotUserTests
 {
-    public sealed class BotUserTests
+    [Test]
+    public void Test_project_bot_user()
     {
-        [Test]
-        public void Test_project_bot_user()
-        {
-            using var server = new GitLabServer();
-            var group = new Group("test");
-            var project = new Project("test-project");
-            server.Groups.Add(group);
-            group.Projects.Add(project);
+        using var server = new GitLabServer();
+        var group = new Group("test");
+        var project = new Project("test-project");
+        server.Groups.Add(group);
+        group.Projects.Add(project);
 
-            var bot = project.CreateBotUser("token_name", AccessLevel.Maintainer);
+        var bot = project.CreateBotUser("token_name", AccessLevel.Maintainer);
 
-            Assert.That(bot.Bot, Is.True);
-            Assert.That(bot.Name, Is.EqualTo("token_name"));
-            var permissions = project.GetEffectivePermissions();
-            var botPermission = permissions.GetEffectivePermission(bot);
-            Assert.That(botPermission.AccessLevel, Is.EqualTo(AccessLevel.Maintainer));
-        }
+        Assert.That(bot.Bot, Is.True);
+        Assert.That(bot.Name, Is.EqualTo("token_name"));
+        var permissions = project.GetEffectivePermissions();
+        var botPermission = permissions.GetEffectivePermission(bot);
+        Assert.That(botPermission.AccessLevel, Is.EqualTo(AccessLevel.Maintainer));
+    }
 
-        [Test]
-        public void Test_group_bot_user()
-        {
-            using var server = new GitLabServer();
-            var group = new Group("test");
-            server.Groups.Add(group);
+    [Test]
+    public void Test_group_bot_user()
+    {
+        using var server = new GitLabServer();
+        var group = new Group("test");
+        server.Groups.Add(group);
 
-            var bot = group.CreateBotUser(AccessLevel.Maintainer);
+        var bot = group.CreateBotUser(AccessLevel.Maintainer);
 
-            Assert.That(bot.Bot, Is.True);
-            var permissions = group.GetEffectivePermissions();
-            var botPermission = permissions.GetEffectivePermission(bot);
-            Assert.That(botPermission.AccessLevel, Is.EqualTo(AccessLevel.Maintainer));
-        }
+        Assert.That(bot.Bot, Is.True);
+        var permissions = group.GetEffectivePermissions();
+        var botPermission = permissions.GetEffectivePermission(bot);
+        Assert.That(botPermission.AccessLevel, Is.EqualTo(AccessLevel.Maintainer));
     }
 }

NGitLab.Mock.Tests/BranchesMockTests.cs

@@ -2,41 +2,40 @@
 using NGitLab.Mock.Config;
 using NUnit.Framework;
 
-namespace NGitLab.Mock.Tests
+namespace NGitLab.Mock.Tests;
+
+public class BranchesMockTests
 {
-    public class BranchesMockTests
+    [Test]
+    public void Test_search_branches()
     {
-        [Test]
-        public void Test_search_branches()
-        {
-            using var server = new GitLabConfig()
-                .WithUser("user1", isDefault: true)
-                .WithProject("test-project", id: 1, addDefaultUserAsMaintainer: true, defaultBranch: "main", configure: project => project
-                    .WithCommit("Initial commit")
-                    .WithCommit("Commit for branch_1", sourceBranch: "branch_1"))
-                .BuildServer();
-
-            var client = server.CreateClient("user1");
-            var branchClient = client.GetRepository(1).Branches;
-
-            var branches = branchClient.Search("main").ToList();
-            var expectedBranch = branches.Single();
-            Assert.AreEqual("main", expectedBranch.Name);
-
-            branches = branchClient.Search("^main$").ToList();
-            expectedBranch = branches.Single();
-            Assert.AreEqual("main", expectedBranch.Name);
-
-            branches = branchClient.Search("^branch").ToList();
-            expectedBranch = branches.Single();
-            Assert.AreEqual("branch_1", expectedBranch.Name);
-
-            branches = branchClient.Search("1$").ToList();
-            expectedBranch = branches.Single();
-            Assert.AreEqual("branch_1", expectedBranch.Name);
-
-            branches = branchClient.Search("foobar").ToList();
-            Assert.IsEmpty(branches);
-        }
+        using var server = new GitLabConfig()
+            .WithUser("user1", isDefault: true)
+            .WithProject("test-project", id: 1, addDefaultUserAsMaintainer: true, defaultBranch: "main", configure: project => project
+                .WithCommit("Initial commit")
+                .WithCommit("Commit for branch_1", sourceBranch: "branch_1"))
+            .BuildServer();
+
+        var client = server.CreateClient("user1");
+        var branchClient = client.GetRepository(1).Branches;
+
+        var branches = branchClient.Search("main").ToList();
+        var expectedBranch = branches.Single();
+        Assert.That(expectedBranch.Name, Is.EqualTo("main"));
+
+        branches = branchClient.Search("^main$").ToList();
+        expectedBranch = branches.Single();
+        Assert.That(expectedBranch.Name, Is.EqualTo("main"));
+
+        branches = branchClient.Search("^branch").ToList();
+        expectedBranch = branches.Single();
+        Assert.That(expectedBranch.Name, Is.EqualTo("branch_1"));
+
+        branches = branchClient.Search("1$").ToList();
+        expectedBranch = branches.Single();
+        Assert.That(expectedBranch.Name, Is.EqualTo("branch_1"));
+
+        branches = branchClient.Search("foobar").ToList();
+        Assert.That(branches, Is.Empty);
     }
 }