Merge branch 'sessionProvider' of https://github.com/SwissLife-OSS/mo…

…ngo-extensions into sessionProvider
SwissLife-OSS · Oct 2, 2023 · 622b6d7 · 622b6d7
2 parents 361f56b + 68621d0
commit 622b6d7
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 43 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
  "dotnet-sonarscanner": {
- "version": "4.8.0",
+ "version": "5.13.1",
  "commands": [
  "dotnet-sonarscanner"
  ]

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -0,0 +1,29 @@
+name: Pull Request
+
+on:
+ pull_request:
+ branches: ['master']
+
+jobs:
+ tests:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v3
+ with:
+ dotnet-version: |
+ 6
+ 7
+ - name: Build, Test and Sonar
+ uses: swisslife-oss/actions/pull-request@main
+ with:
+ sonar_token: ${{ secrets.SONAR_TOKEN }}
+ sonar_project_key: 'SwissLife-OSS_Mongo-Extensions'
+ sonar_project_name: "mongo-extensions"
+ pr_number: ${{ github.event.pull_request.number }}
+ pr_source_branch: ${{ github.head_ref }}
+ pr_target_branch: ${{ github.base_ref }}
+ github_repository: ${{ github.repository }}
+ sonar_exclusions: ${{ vars.SONAR_EXCLUSIONS }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,44 @@
+name: Release
+
+on:
+ push:
+ tags:
+ - "*"
+
+jobs:
+ release:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+ - name: Use .NET SDK from global.json
+ uses: actions/setup-dotnet@v3
+ - name: Build, Test and Push
+ uses: swisslife-oss/actions/release-packages@main
+ with:
+ tag: ${{ github.ref_name }}
+ nuget_api_key: ${{ secrets.NUGET_API_KEY }}
+ enable_push: 'yes'
+
+ sonar:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v3
+ with:
+ dotnet-version: |
+ 6
+ 7
+ - name: Restore tools
+ run: dotnet tool restore
+ - name: Build, Test and Sonar
+ uses: swisslife-oss/actions/release-sonar@main
+ with:
+ tag: ${{ github.ref_name }}
+ sonar_token: ${{ secrets.SONAR_TOKEN }}
+ sonar_project_key: 'SwissLife-OSS_Mongo-Extensions'
+ sonar_project_name: "mongo-extensions"
+ sonar_exclusions: ${{ vars.SONAR_EXCLUSIONS }}
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,14 +6,14 @@
 
  <ItemGroup>
  <PackageVersion Include="Moq" Version="4.16.1" />
- <PackageVersion Include="Snapshooter.Xunit" Version="0.12.0" />
- <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
- <PackageVersion Include="Squadron.Mongo" Version="0.17.0" />
+ <PackageVersion Include="Snapshooter.Xunit" Version="0.13.0" />
+ <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+ <PackageVersion Include="Squadron.Mongo" Version="0.18.0" />
  <PackageVersion Include="xunit" Version="2.4.2" />
  <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
  <PackageVersion Include="FluentAssertions" Version="6.2.0" />
  <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
- <PackageVersion Include="coverlet.msbuild" Version="3.1.0" />
+ <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/Context.AllowedTypes.Tests/Helpers/TestHelpers.cs b/src/Context.AllowedTypes.Tests/Helpers/TestHelpers.cs
@@ -13,8 +13,11 @@ public static object GetTypeObjectSerializerContent()
  AllowedTypes = TypeObjectSerializer.AllowedTypes
  .Select(pair => new KeyValuePair<string?, bool>(pair.Key.FullName, pair.Value))
  .OrderBy(pair => pair.Key),
- TypeObjectSerializer.AllowedTypesByNamespaces,
- TypeObjectSerializer.AllowedTypesByDependencies
+ AllowedTypesByNamespaces = TypeObjectSerializer.AllowedTypesByNamespaces
+ .OrderBy(x => x),
+ AllowedTypesByDependencies = TypeObjectSerializer.AllowedTypesByDependencies
+ .Except(new[] { "Coverlet" })
+ .OrderBy(x => x)
  };
  }
 }
diff --git a/..._/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap b/..._/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap
@@ -2,26 +2,26 @@
  "AllowedTypes": [],
  "AllowedTypesByNamespaces": [],
  "AllowedTypesByDependencies": [
- "Newtonsoft",
- "Internal",
- "Xunit",
- "NuGet",
- "MongoDB",
- "Squadron",
- "ThirdParty",
- "AWSSDK",
  "Amazon",
+ "AWSSDK",
  "Castle",
  "DnsClient",
  "Docker",
  "FluentAssertions",
- "SharpCompress",
- "TypeNameFormatter",
+ "ICSharpCode",
+ "Internal",
+ "MongoDB",
  "Moq",
+ "Newtonsoft",
+ "NuGet",
  "Polly",
- "ICSharpCode",
+ "SharpCompress",
  "Snappier",
  "Snapshooter",
+ "Squadron",
+ "ThirdParty",
+ "TypeNameFormatter",
+ "Xunit",
  "ZstdSharp"
  ]
 }
diff --git a/..._/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap b/..._/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap
@@ -2,26 +2,26 @@
  "AllowedTypes": [],
  "AllowedTypesByNamespaces": [],
  "AllowedTypesByDependencies": [
- "Newtonsoft",
- "Internal",
- "Xunit",
- "NuGet",
- "MongoDB",
- "Squadron",
- "ThirdParty",
- "AWSSDK",
  "Amazon",
+ "AWSSDK",
  "Castle",
  "DnsClient",
  "Docker",
  "FluentAssertions",
- "SharpCompress",
- "TypeNameFormatter",
+ "ICSharpCode",
+ "Internal",
+ "MongoDB",
  "Moq",
+ "Newtonsoft",
+ "NuGet",
  "Polly",
- "ICSharpCode",
+ "SharpCompress",
  "Snappier",
  "Snapshooter",
+ "Squadron",
+ "ThirdParty",
+ "TypeNameFormatter",
+ "Xunit",
  "ZstdSharp"
  ]
 }
diff --git a/...napshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypesInDependencies_True.snap b/...napshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypesInDependencies_True.snap
@@ -7,26 +7,26 @@
  ],
  "AllowedTypesByNamespaces": [],
  "AllowedTypesByDependencies": [
- "Newtonsoft",
- "Internal",
- "Xunit",
- "NuGet",
- "MongoDB",
- "Squadron",
- "ThirdParty",
- "AWSSDK",
  "Amazon",
+ "AWSSDK",
  "Castle",
  "DnsClient",
  "Docker",
  "FluentAssertions",
- "SharpCompress",
- "TypeNameFormatter",
+ "ICSharpCode",
+ "Internal",
+ "MongoDB",
  "Moq",
+ "Newtonsoft",
+ "NuGet",
  "Polly",
- "ICSharpCode",
+ "SharpCompress",
  "Snappier",
  "Snapshooter",
+ "Squadron",
+ "ThirdParty",
+ "TypeNameFormatter",
+ "Xunit",
  "ZstdSharp"
  ]
 }
diff --git a/src/Context.Tests/Internal/DependencyTypesResolverTests.cs b/src/Context.Tests/Internal/DependencyTypesResolverTests.cs
@@ -13,10 +13,12 @@ public void GetAllowedTypesByDependencies_All_Successful()
  // Arrange
 
  // Act
- IEnumerable<string> knownNamespaces =
- DependencyTypesResolver.GetAllowedTypesByDependencies();
+ IEnumerable<string> knownNamespaces = DependencyTypesResolver
+ .GetAllowedTypesByDependencies()
+ .Except(new[] { "Coverlet" })
+ .OrderBy(x => x);
 
  // Assert
- Snapshot.Match(knownNamespaces.OrderBy(x => x));
+ Snapshot.Match(knownNamespaces);
  }
 }