Merge branch 'develop' into feature/Testcontainers.Xunit

testcontainers · Nov 22, 2024 · 250d6a4 · 250d6a4
2 parents aeb8cd5 + 37e5351
commit 250d6a4
Show file tree

Hide file tree

Showing 57 changed files with 758 additions and 177 deletions.
diff --git a/.cake-scripts/parameters.cake b/.cake-scripts/parameters.cake
@@ -19,6 +19,7 @@ internal sealed class BuildParameters
   public string PullRequestId { get; private set; }
   public string Version { get; private set; }
   public string TestFilter { get; private set; }
+  public string TestProject { get; private set; }
   public bool IsLocalBuild { get; private set; }
   public bool IsReleaseBuild { get; private set; }
   public bool IsPullRequest { get; private set; }
@@ -49,6 +50,7 @@ internal sealed class BuildParameters
       PullRequestId = buildInformation.PullRequestId,
       Version = buildInformation.Version,
       TestFilter = context.Argument<string>("test-filter", null),
+      TestProject = context.Argument<string>("test-project", null),
       IsLocalBuild = buildInformation.IsLocalBuild,
       IsReleaseBuild = !buildInformation.IsLocalBuild && buildInformation.IsReleaseBuild,
       IsPullRequest = buildInformation.IsPullRequest,

diff --git a/.cake-scripts/paths.cake b/.cake-scripts/paths.cake
@@ -9,7 +9,7 @@ internal sealed class BuildPaths
 
   public static BuildPaths Instance(ICakeContext context, string version)
   {
-    var baseDir = (DirectoryPath) context.Directory(".");
+    var baseDir = (DirectoryPath)context.Directory(".");
 
     var testResultsDir = baseDir.Combine("test-results");
     var testCoverageDir = baseDir.Combine("test-coverage");

diff --git a/.cake-scripts/version.cake b/.cake-scripts/version.cake
@@ -1,4 +1,4 @@
-#addin nuget:?package=Cake.Git&version=3.0.0
+#addin nuget:?package=Cake.Git&version=4.0.0
 
 internal sealed class BuildInformation
 {

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "3.2.0",
+      "version": "4.2.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/.github/settings.yml b/.github/settings.yml
@@ -175,7 +175,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["analyze (csharp)", "build (ubuntu-22.04)", "build (windows-2022)", "netlify/testcontainers-dotnet/deploy-preview"]
+        contexts: ["Test Report", "analyze (csharp)"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Prevent merge commits from being pushed to matching branches
@@ -207,7 +207,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["analyze (csharp)", "build (ubuntu-22.04)", "build (windows-2022)", "netlify/testcontainers-dotnet/deploy-preview"]
+        contexts: ["Test Report", "analyze (csharp)"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Prevent merge commits from being pushed to matching branches

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -3,8 +3,10 @@ name: Continuous Integration & Delivery
 on:
   push:
     branches: [ develop, main, bugfix/*, feature/* ]
+    paths-ignore: [ 'docs/**', 'examples/**' ]
   pull_request:
     branches: [ develop, main ]
+    paths-ignore: [ 'docs/**', 'examples/**' ]
   workflow_dispatch:
     inputs:
       publish_nuget_package:
@@ -25,13 +27,61 @@ env:
   TZ: CET # https://stackoverflow.com/q/53510011
 
 jobs:
-  build:
+  ci:
     strategy:
-      fail-fast: false
+      max-parallel: 6
       matrix:
-        os: [ ubuntu-22.04, windows-2022 ]
-
-    runs-on: ${{ matrix.os }}
+        test-projects: [
+          { name: "Testcontainers", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Platform.Linux", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Platform.Windows", runs-on: "windows-2022" },
+          { name: "Testcontainers.Databases", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.ResourceReaper", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.ActiveMq", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.ArangoDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Azurite", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.BigQuery", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Bigtable", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.ClickHouse", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.CockroachDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Consul", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.CosmosDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Couchbase", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.CouchDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.DynamoDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Elasticsearch", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.EventStoreDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.FakeGcsServer", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.FirebirdSql", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Firestore", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.InfluxDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.JanusGraph", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.K3s", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Kafka", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Keycloak", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Kusto", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.LocalStack", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.MariaDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Milvus", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Minio", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.MongoDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.MsSql", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.MySql", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Nats", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Neo4j", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Oracle", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Papercut", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.PostgreSql", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.PubSub", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Pulsar", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.RabbitMq", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.RavenDb", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Redis", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.Redpanda", runs-on: "ubuntu-22.04" },
+          { name: "Testcontainers.WebDriver", runs-on: "ubuntu-22.04" }
+        ]
+
+    runs-on: ${{ matrix.test-projects.runs-on }}
 
     steps:
       - name: Checkout Repository
@@ -42,27 +92,9 @@ jobs:
       - name: Cache NuGet Packages
         uses: actions/cache@v4
         with:
-          key: ${{ matrix.os }}-nuget-${{ hashFiles('Directory.Packages.props') }}
+          key: ${{ matrix.test-projects.runs-on }}-nuget-${{ hashFiles('Directory.Packages.props') }}
           path: ~/.nuget/packages
 
-      # Our modules occupy too much disk space. The GitHub-hosted runners ran into the
-      # error: "no space left on device." The pulled images are not cleaned up between
-      # the test runs. One obvious approach is splitting the tests and running them on
-      # multiple runners. However, we need to keep in mind that running too many
-      # simultaneous builds has an impact on others as well. We observed that scheduled
-      # Dependabot builds blocked others in the Testcontainers organization.
-      - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@v1.3.1
-        if: runner.os == 'Linux'
-        with:
-          tool-cache: true
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: false
-
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
 
@@ -76,28 +108,28 @@ jobs:
         run: dotnet cake --target=Build
 
       - name: Run Tests
-        run: dotnet cake --target=Tests --test-filter=${{ startsWith(matrix.os, 'ubuntu') && 'FullyQualifiedName~Testcontainers' || 'DockerPlatform=Windows' }}
+        run: dotnet cake --target=Test --test-project=${{ matrix.test-projects.name }}
 
       - name: Upload Test And Coverage Results
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: ${{ matrix.os }}
+          name: ${{ matrix.test-projects.name }}
           path: test-results
 
-  publish:
+  cd:
     if: ${{ contains(fromJson('["develop", "main"]'), github.ref_name) }}
 
-    needs: build
+    needs: ci
 
     environment: production
 
-    runs-on: ubuntu-22.04
-
     permissions:
       contents: write
       pull-requests: read
 
+    runs-on: ubuntu-22.04
+
     env:
       CODE_SIGNING_CERTIFICATE_BASE64: ${{ secrets.CODE_SIGNING_CERTIFICATE_BASE64 }}
       CODE_SIGNING_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CERTIFICATE_PASSWORD }}
@@ -116,20 +148,14 @@ jobs:
           lfs: true
           fetch-depth: 0
 
-      - name: Download Test And Coverage Results (ubuntu-22.04)
-        uses: actions/download-artifact@v4
-        with:
-          name: ubuntu-22.04
-          path: test-results
-
-      - name: Download Test And Coverage Results (windows-2022)
+      - name: Download Test And Coverage Results
         uses: actions/download-artifact@v4
         with:
-          name: windows-2022
+          pattern: Testcontainers*
           path: test-results
 
       - name: Fix Absolute Code Coverage Paths
-        run: Get-ChildItem -Path 'test-results' -Filter *.xml -Recurse | Select-Object -ExpandProperty FullName | % { (Get-Content -LiteralPath $_) -Replace 'fullPath="[A-Za-z0-9:\-\/\\]+(src|tests)', 'fullPath="${{ github.workspace }}/$1' | Set-Content -LiteralPath $_ }
+        run: Get-ChildItem -Path 'test-results' -Filter '*.xml' -Recurse | Select-Object -ExpandProperty FullName | % { (Get-Content -LiteralPath $_) -Replace 'fullPath="[A-Za-z0-9:\-\/\\]+(src|tests)', 'fullPath="${{ github.workspace }}/$1' | Set-Content -LiteralPath $_ }
         shell: pwsh
 
       - name: Cache NuGet Packages
@@ -142,7 +168,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -3,8 +3,10 @@ name: CodeQL
 on:
   push:
     branches: [ develop, main ]
+    paths-ignore: [ 'docs/**', 'examples/**' ]
   pull_request:
     branches: [ develop, main ]
+    paths-ignore: [ 'docs/**', 'examples/**' ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.sha }}

diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml
@@ -8,24 +8,19 @@ on:
 
 jobs:
   report:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-22.04, windows-2022 ]
-
-    runs-on: ${{ matrix.os }}
-
     permissions:
       actions: read
       checks: write
       contents: read
 
+    runs-on: ubuntu-22.04
+
     steps:
       # https://github.com/dorny/test-reporter/issues/363#issuecomment-2381625959.
       - name: Publish Test Report
         uses: dorny/test-reporter@v1.9.1
         with:
-          artifact: ${{ matrix.os }}
-          name: report (${{ matrix.os }})
+          artifact: '/Testcontainers.*/'
+          name: Test Report
           path: '*.trx'
           reporter: dotnet-trx
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <Product>Testcontainers</Product>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,25 +4,25 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
     <ItemGroup>
-        <PackageVersion Include="BouncyCastle.Cryptography" Version="2.3.1"/>
-        <PackageVersion Include="Docker.DotNet.X509" Version="3.125.15"/>
-        <PackageVersion Include="Docker.DotNet" Version="3.125.15"/>
-        <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0"/>
+        <PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0"/>
+        <PackageVersion Include="Docker.DotNet.Enhanced.X509" Version="3.126.0"/>
+        <PackageVersion Include="Docker.DotNet.Enhanced" Version="3.126.0"/>
+        <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0"/>
         <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1"/>
-        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4"/>
-        <PackageVersion Include="ReflectionMagic" Version="5.0.1"/>
+        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2"/>
         <PackageVersion Include="SharpZipLib" Version="1.4.2"/>
-        <PackageVersion Include="SSH.NET" Version="2023.0.0"/>
-        <PackageVersion Include="System.Text.Json" Version="6.0.9"/>
+        <PackageVersion Include="SSH.NET" Version="2024.1.0"/>
+        <PackageVersion Include="System.Text.Json" Version="8.0.5"/>
         <!-- Unit and integration test dependencies: -->
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
-        <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="8.9.1"/>
+        <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="8.10.0"/>
         <PackageVersion Include="coverlet.collector" Version="6.0.2"/>
         <PackageVersion Include="Dapper" Version="2.1.35"/>
+        <PackageVersion Include="ReflectionMagic" Version="5.0.1"/>
         <PackageVersion Include="xunit.extensibility.execution" Version="2.9.0"/>
         <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
         <PackageVersion Include="xunit.v3.extensibility.core" Version="0.2.0-pre.69"/>
-        <PackageVersion Include="xunit" Version="2.9.0"/>
+        <PackageVersion Include="xunit" Version="2.9.2"/>
         <!-- Third-party client dependencies to connect and interact with the containers: -->
         <PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.1.0"/>
         <PackageVersion Include="ArangoDBNetStandard" Version="2.0.1"/>

diff --git a/Testcontainers.sln b/Testcontainers.sln
@@ -79,6 +79,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Neo4j", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Oracle", "src\Testcontainers.Oracle\Testcontainers.Oracle.csproj", "{596EAFC1-0496-495C-B382-D57415FA456A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Papercut", "src\Testcontainers.Papercut\Testcontainers.Papercut.csproj", "{B2608563-8EE4-49AA-A9A0-B1614486AEEF}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.PostgreSql", "src\Testcontainers.PostgreSql\Testcontainers.PostgreSql.csproj", "{8AB91636-9055-4900-A72A-7CFFACDFDBF0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.PubSub", "src\Testcontainers.PubSub\Testcontainers.PubSub.csproj", "{E6642255-667D-476B-B584-089AA5E6C0B1}"
@@ -171,6 +173,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Neo4j.Tests"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Oracle.Tests", "tests\Testcontainers.Oracle.Tests\Testcontainers.Oracle.Tests.csproj", "{4AC1088B-9965-4497-AC8E-570F1AD5631F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Papercut.Tests", "tests\Testcontainers.Papercut.Tests\Testcontainers.Papercut.Tests.csproj", "{F03FA970-BE2B-4AE2-96FE-7E1F805CEA20}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Platform.Linux.Tests", "tests\Testcontainers.Platform.Linux.Tests\Testcontainers.Platform.Linux.Tests.csproj", "{DA1D7ADE-452C-4369-83CC-56289176EACD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcontainers.Platform.Windows.Tests", "tests\Testcontainers.Platform.Windows.Tests\Testcontainers.Platform.Windows.Tests.csproj", "{3E55CBE8-AFE8-426D-9470-49D63CD1051C}"
@@ -338,6 +342,10 @@ Global
 		{596EAFC1-0496-495C-B382-D57415FA456A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{596EAFC1-0496-495C-B382-D57415FA456A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{596EAFC1-0496-495C-B382-D57415FA456A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2608563-8EE4-49AA-A9A0-B1614486AEEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2608563-8EE4-49AA-A9A0-B1614486AEEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2608563-8EE4-49AA-A9A0-B1614486AEEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2608563-8EE4-49AA-A9A0-B1614486AEEF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8AB91636-9055-4900-A72A-7CFFACDFDBF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8AB91636-9055-4900-A72A-7CFFACDFDBF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8AB91636-9055-4900-A72A-7CFFACDFDBF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -522,6 +530,10 @@ Global
 		{4AC1088B-9965-4497-AC8E-570F1AD5631F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AC1088B-9965-4497-AC8E-570F1AD5631F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4AC1088B-9965-4497-AC8E-570F1AD5631F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F03FA970-BE2B-4AE2-96FE-7E1F805CEA20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F03FA970-BE2B-4AE2-96FE-7E1F805CEA20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F03FA970-BE2B-4AE2-96FE-7E1F805CEA20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F03FA970-BE2B-4AE2-96FE-7E1F805CEA20}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA1D7ADE-452C-4369-83CC-56289176EACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA1D7ADE-452C-4369-83CC-56289176EACD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA1D7ADE-452C-4369-83CC-56289176EACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -609,6 +621,7 @@ Global
 		{BF37BEA1-0816-4326-B1E0-E82290F8FCE0} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{ADC2372B-6FE0-421D-8277-BB628E8EFC22} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{596EAFC1-0496-495C-B382-D57415FA456A} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
+		{B2608563-8EE4-49AA-A9A0-B1614486AEEF} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{8AB91636-9055-4900-A72A-7CFFACDFDBF0} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{E6642255-667D-476B-B584-089AA5E6C0B1} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
 		{27D46863-65B9-4934-B3C8-2383B217A477} = {673F23AE-7694-4BB9-ABD4-136D6C13634E}
@@ -655,6 +668,7 @@ Global
 		{87A3F137-6DC3-4CE5-91E6-01797D076086} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{D3F63405-C0FA-4F83-8B79-E30BFF5FF5BF} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{4AC1088B-9965-4497-AC8E-570F1AD5631F} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
+		{F03FA970-BE2B-4AE2-96FE-7E1F805CEA20} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{DA1D7ADE-452C-4369-83CC-56289176EACD} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{3E55CBE8-AFE8-426D-9470-49D63CD1051C} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}
 		{56D0DCA5-567F-4B3B-8B79-CB108F8EB8A6} = {7164F1FB-7F24-444A-ACD2-2C329C2B3CCF}