Merge BlockCore @version 1.1.40

.github/workflows/build.yml

@@ -1,108 +1,71 @@
 name: Build
 
-on: 
+on:
  push:
  branches:
  - master
+# repository_dispatch:
+# types: [build]
+ workflow_dispatch:
 
 jobs:
- 
- buildTestRelease:
+
+ buildAndUnitTest:
 
  strategy:
  matrix:
  os: [ windows-latest, ubuntu-latest, macos-latest ]
- include:
- - os: windows-latest
- extension: ".zip"
- runtime: "win-x64"
- package_runtime: "win-x64"
- - os: ubuntu-latest
- extension: ".tar.gz"
- runtime: "linux-x64"
- package_runtime: "linux-x64"
- - os: macos-latest
- runtime: "osx-x64"
- package_runtime: "mac-x64"
- extension: ".zip"
- node_version: [16.x]
- dotnet_version: ['6.0.101']
  fail-fast: false
 
  runs-on: ${{ matrix.os }}
- 
+
  env:
- PROJECT_NAME: 'x42.Node'
  SOLUTION_PATH: 'src/Blockcore.sln'
- PROJECT_PATH: 'src/Node/Blockcore.Node/Blockcore.Node.csproj'
  BUILD_CONFIGURATION: 'Release'
 
  steps:
 
  - uses: actions/checkout@v2
+ name: Checkout
 
  - name: Setup dotnet
  uses: actions/setup-dotnet@v1
  with:
  dotnet-version: | 
- 6.0.x
+ 8.0.x
 
- - name: Setup Node.js (${{ matrix.node_version }})
+ - name: Setup Node.js (16.x)
  uses: actions/setup-node@v1
  with:
- node-version: ${{ matrix.node_version }}
+ node-version: 18
 
  - name: Variables
  run: |
  echo VERSION=$(npm run version --silent) >> $GITHUB_ENV
- echo RELEASE_CONFIGURATION=${{ matrix.runtime }} >> $GITHUB_ENV
  shell: bash
 
- - name: Setup .NET Core (${{ matrix.dotnet_version }})
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: ${{ matrix.dotnet_version }}
-
- - name: Restore
+ - name: Unit Test
  run: |
  dotnet nuget locals all --clear
- dotnet restore ${{env.SOLUTION_PATH}}
-
- - name: Build
- run: dotnet build -c ${{env.BUILD_CONFIGURATION}} -r ${{env.RELEASE_CONFIGURATION}} -v m ${{env.SOLUTION_PATH}} -p:ImportByWildcardBeforeSolution=false
+ dotnet test -v=normal --filter "FullyQualifiedName!~IntegrationTests&Unstable!=True" -c ${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_PATH}}
 
- - name: Publish
- run: dotnet publish -c ${{env.BUILD_CONFIGURATION}} -r ${{env.RELEASE_CONFIGURATION}} -v m -o ./bin/publish ${{env.PROJECT_PATH}} -p:ImportByWildcardBeforeSolution=false
+ - name: Nuget Pack
+ run: dotnet pack --configuration ${{env.BUILD_CONFIGURATION}} --output "${{github.workspace}}/package/" ${{env.SOLUTION_PATH}}
 
- - name: Package Name
- run: |
- echo RELEASE_NAME=${{ env.PROJECT_NAME }}-${{ env.VERSION }}-${{ matrix.package_runtime }}${{ matrix.extension }} >> $GITHUB_ENV
- echo RELEASE_PATH=${{ env.PROJECT_NAME }}-${{ env.VERSION }}-${{ matrix.package_runtime }}${{ matrix.extension }} >> $GITHUB_ENV
- shell: bash
-
- - name: Package (Linux)
- if: matrix.os == 'ubuntu-latest'
- run: |
- echo RELEASE_PATH=./bin/publish/${{env.RELEASE_NAME}} >> $GITHUB_ENV
- cd ./bin/publish/
- tar cvzf ${{env.RELEASE_NAME}} *
-
- - name: Package (Windows)
- if: matrix.os == 'windows-latest'
- run: Compress-Archive -Path .\bin\publish\* -DestinationPath .\${{env.RELEASE_NAME}}
-
- - name: Package (Mac)
- if: matrix.os == 'macos-latest'
- run: zip -j -r ${{env.RELEASE_NAME}} ./bin/publish/
+ - uses: actions/upload-artifact@v2
+ with:
+ name: Blockcore-${{env.VERSION}}-${{matrix.os}}-preview
+ path: "${{github.workspace}}/package/"
 
  - name: Release
- uses: DennisAMenace/action-release@master
+ if: matrix.os == 'ubuntu-latest'
+ uses: sondreb/action-release@main
  with:
  commit: 'master'
  token: ${{ secrets.GITHUB_TOKEN }}
- files: "${{env.RELEASE_PATH}}"
+ folder: "${{github.workspace}}/package/"
  draft: true
- prerelease: true
+ prerelease: false
  body: ''
- name: "x42-BlockCore (Release ${{env.VERSION}})"
- tag: v${{env.VERSION}}
+ name: "Blockcore ${{env.VERSION}}"
+ tag: ${{env.VERSION}}

.github/workflows/publish-pre-release.yml

@@ -55,4 +55,4 @@ jobs:
  # run: nuget sources add -name "GPR" -Source "https://nuget.pkg.github.com/${{env.GITHUB_OWNER}}/index.json" -Username "${{env.GITHUB_OWNER}}" -Password ${{secrets.GITHUB_TOKEN}} 
 
  # - name: Nuget Push
- # run: nuget push **/*.nupkg -Source "GPR" -SkipDuplicate
+ # run: nuget push **/*.nupkg -Source "GPR" -SkipDuplicate

.github/workflows/pull-request.yml

@@ -19,6 +19,7 @@ jobs:
  env:
  SOLUTION_PATH: 'src/Blockcore.sln'
  BUILD_CONFIGURATION: 'Release'
+ DYLD_LIBRARY_PATH: "/System/Volumes/Data/opt/homebrew/lib"
 
  steps:
 
@@ -28,14 +29,18 @@ jobs:
  uses: actions/setup-dotnet@v1
  with:
  dotnet-version: | 
- 6.0.x
+ 8.0.x
 
+ - name: Install LevelDB
+ if: matrix.os == 'macos-latest'
+ run: brew install leveldb snappy gperftools
+
  - name: Restore
  run: dotnet restore ${{env.SOLUTION_PATH}}
 
  - name: Build
  run: dotnet build -c ${{env.BUILD_CONFIGURATION}} -v m ${{env.SOLUTION_PATH}}
- 
+
  - name: Unit Test
  run: dotnet test -v=normal --filter "FullyQualifiedName!~IntegrationTests&Unstable!=True" -c ${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_PATH}}
 

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
  uses: actions/setup-dotnet@v1
  with:
  dotnet-version: | 
- 6.0.x
+ 8.0.x
 
  - name: Log Variables
  run: |

.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
  uses: actions/setup-dotnet@v1
  with:
  dotnet-version: | 
- 6.0.x
+ 8.0.x
 
  - name: Restore
  run: dotnet restore ${{env.SOLUTION_PATH}}

CHANGELOG.md

@@ -1,3 +1,104 @@
+## (2023-05-15)
+
+* bump version ([3d8dc3a](https://github.com/block-core/blockcore/commit/3d8dc3a))
+* Move NBitcoin to namespace Blockcore.NBitcoin (#446) ([d6dd45b](https://github.com/block-core/blockcore/commit/d6dd45b)), closes [#446](https://github.com/block-core/blockcore/issues/446)
+
+
+
+## (2023-04-16)
+
+* Add an interface to override services from the network class (#438) ([faa5f75](https://github.com/block-core/blockcore/commit/faa5f75)), closes [#438](https://github.com/block-core/blockcore/issues/438)
+* make sure cold staking legacy accounts default to bip44 ([729ec43](https://github.com/block-core/blockcore/commit/729ec43))
+* Update version and changelog ([9c4ff98](https://github.com/block-core/blockcore/commit/9c4ff98))
+
+
+
+## (2023-02-02)
+
+* Fix big size blocks bug from NBitcoin ([880292e](https://github.com/block-core/blockcore/commit/880292e))
+* Fix not null warning ([f4f7330](https://github.com/block-core/blockcore/commit/f4f7330))
+* Update bitcoin checkpoints and defaultAssumeValid (#436) ([57a93a8](https://github.com/block-core/blockcore/commit/57a93a8)), closes [#436](https://github.com/block-core/blockcore/issues/436)
+* Update version and changelog ([213b2e8](https://github.com/block-core/blockcore/commit/213b2e8))
+
+
+
+## (2022-10-24)
+
+* Add back the SBC and RSC launch settings ([5e529f3](https://github.com/block-core/blockcore/commit/5e529f3))
+* Adding BC flags for SHA512 hashes ([62f41df](https://github.com/block-core/blockcore/commit/62f41df))
+* Adding MOL blockchain (#423) ([91eaea8](https://github.com/block-core/blockcore/commit/91eaea8)), closes [#423](https://github.com/block-core/blockcore/issues/423)
+* Bump version and update change log ([d6f143a](https://github.com/block-core/blockcore/commit/d6f143a))
+* Enable blazor (#419) ([6829168](https://github.com/block-core/blockcore/commit/6829168)), closes [#419](https://github.com/block-core/blockcore/issues/419)
+* Ensure that configuration file for MOL is lower-case only ([d631c72](https://github.com/block-core/blockcore/commit/d631c72))
+* Ensure that folder name is lower-case for MOL ([7826a8d](https://github.com/block-core/blockcore/commit/7826a8d))
+* Ensure that impleumx test and regtest is lowercase ([f5fc937](https://github.com/block-core/blockcore/commit/f5fc937))
+* Remove empty solution folder ([4ab57b2](https://github.com/block-core/blockcore/commit/4ab57b2))
+* Remove the reload on change to reduce listeners handlers (OS resources) ([09be90a](https://github.com/block-core/blockcore/commit/09be90a))
+
+
+
+## (2022-09-29)
+
+* Add additional checkpoint for City Chain ([f928dab](https://github.com/block-core/blockcore/commit/f928dab))
+* Configure reloadOnChange to be false ([229a3ed](https://github.com/block-core/blockcore/commit/229a3ed)), closes [#418](https://github.com/block-core/blockcore/issues/418)
+* Define a maximum tx fee or else zero few is required ([885634a](https://github.com/block-core/blockcore/commit/885634a))
+* Fix wallet to use segwit in the correct derivation path (#415) ([3ef32a7](https://github.com/block-core/blockcore/commit/3ef32a7)), closes [#415](https://github.com/block-core/blockcore/issues/415)
+* Update DNS and seed nodes for City Chain ([f0fc349](https://github.com/block-core/blockcore/commit/f0fc349))
+* Update version ([c36bf5e](https://github.com/block-core/blockcore/commit/c36bf5e))
+
+
+
+## (2022-08-26)
+
+* add changelog ([5e5cde6](https://github.com/block-core/blockcore/commit/5e5cde6))
+* Add error handling for rpc trx broad cast (#413) ([405629b](https://github.com/block-core/blockcore/commit/405629b)), closes [#413](https://github.com/block-core/blockcore/issues/413)
+* Add UI for ban list (#408) ([6446575](https://github.com/block-core/blockcore/commit/6446575)), closes [#408](https://github.com/block-core/blockcore/issues/408)
+* Change Blockcore logo (#412) ([8a4157e](https://github.com/block-core/blockcore/commit/8a4157e)), closes [#412](https://github.com/block-core/blockcore/issues/412)
+* Preparing for cold staking pools (#410) ([f0cbd71](https://github.com/block-core/blockcore/commit/f0cbd71)), closes [#410](https://github.com/block-core/blockcore/issues/410)
+
+
+
+## (2022-06-12)
+
+* bump version ([2a34841](https://github.com/block-core/blockcore/commit/2a34841))
+* Hidden Mining menu when there is no wallet (#405) ([58d4540](https://github.com/block-core/blockcore/commit/58d4540)), closes [#405](https://github.com/block-core/blockcore/issues/405)
+* Mine UI code correction (#406) ([ef8a08d](https://github.com/block-core/blockcore/commit/ef8a08d)), closes [#406](https://github.com/block-core/blockcore/issues/406)
+* Update TSBC Consensus and TRSC Consensus (#407) ([23be1a7](https://github.com/block-core/blockcore/commit/23be1a7)), closes [#407](https://github.com/block-core/blockcore/issues/407)
+
+
+
+## (2022-05-18)
+
+* Add sign/verify schnorr using bouncy castle (#404) ([dd61fed](https://github.com/block-core/blockcore/commit/dd61fed)), closes [#404](https://github.com/block-core/blockcore/issues/404)
+
+
+
+## (2022-05-13)
+
+* Synced PowLimit condition with Official XRC Node (#403) ([baf9929](https://github.com/block-core/blockcore/commit/baf9929)), closes [#403](https://github.com/block-core/blockcore/issues/403)
+
+
+
+## (2022-05-10)
+
+* change nodes IP for SBC and RSC (#394) ([968052b](https://github.com/block-core/blockcore/commit/968052b)), closes [#394](https://github.com/block-core/blockcore/issues/394)
+* Coldstake redeem bug (#396) ([cfeda4a](https://github.com/block-core/blockcore/commit/cfeda4a)), closes [#396](https://github.com/block-core/blockcore/issues/396)
+* Node UI (#399) ([5e5c67a](https://github.com/block-core/blockcore/commit/5e5c67a)), closes [#399](https://github.com/block-core/blockcore/issues/399)
+* Update NuGet packages (#400) ([1a1c2ee](https://github.com/block-core/blockcore/commit/1a1c2ee)), closes [#400](https://github.com/block-core/blockcore/issues/400)
+* update SBC, RSC and CY logos (#401) ([25d68dc](https://github.com/block-core/blockcore/commit/25d68dc)), closes [#401](https://github.com/block-core/blockcore/issues/401)
+* XRC HardFork - X11, DigiShield POW algo (#402) ([59458b4](https://github.com/block-core/blockcore/commit/59458b4)), closes [#402](https://github.com/block-core/blockcore/issues/402)
+
+
+
+## (2022-01-30)
+
+* add checkpoints to strax ([cc038cf](https://github.com/block-core/blockcore/commit/cc038cf))
+* Add endpoint to return the network weight for POS chains (#377) ([d4e38ee](https://github.com/block-core/blockcore/commit/d4e38ee)), closes [#377](https://github.com/block-core/blockcore/issues/377)
+* Enable staking on strax (#379) ([36f93cb](https://github.com/block-core/blockcore/commit/36f93cb)), closes [#379](https://github.com/block-core/blockcore/issues/379)
+* Upgrade for release 1.1.29 ([b21ac78](https://github.com/block-core/blockcore/commit/b21ac78))
+
+
+
 ## (2021-11-21)
 
 * Add max tx fee to strax network ([7d13219](https://github.com/block-core/blockcore/commit/7d13219))

src/Blockcore.sln

@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.BlockSto
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.MemoryPool", "Features\Blockcore.Features.MemoryPool\Blockcore.Features.MemoryPool.csproj", "{AFDF6339-EE03-4F76-BFB5-024713230D91}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.MemoryPool.Tests", "Tests\Blockcore.Features.MemoryPool.Tests\Blockcore.Features.MemoryPool.Tests.csproj", "{0735CA29-50F0-4D29-9CDD-8121437D8170}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Consensus", "Features\Blockcore.Features.Consensus\Blockcore.Features.Consensus.csproj", "{75C364C1-0785-4EDD-9DB8-B0B21F27573C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Consensus.Tests", "Tests\Blockcore.Features.Consensus.Tests\Blockcore.Features.Consensus.Tests.csproj", "{84433C94-9CB7-4D6F-B2C1-C16B6F7F277C}"
@@ -131,8 +133,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Impleum"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.BCP", "Networks\Blockcore.Networks.BCP\Blockcore.Networks.BCP.csproj", "{120500DF-C04F-43CC-9A1E-523A6429301F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "x42.Features.xServer", "Features\x42.Features.xServer\x42.Features.xServer.csproj", "{97875874-26BE-483E-838D-F43E5A3872FF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Strax", "Networks\Blockcore.Networks.Strax\Blockcore.Networks.Strax.csproj", "{17330538-D54C-44B0-85AD-D652453FAD65}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.X1", "Networks\Blockcore.Networks.X1\Blockcore.Networks.X1.csproj", "{9A2BA15A-C316-42B4-8E4D-E01B4873190C}"
@@ -154,6 +154,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.SeniorBl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.RoyalSportsCity", "Networks\Blockcore.Networks.RoyalSportsCity\Blockcore.Networks.RoyalSportsCity.csproj", "{D176C98F-E2EF-49C6-B073-32F08889BD27}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Networks.Molie", "Networks\Blockcore.Networks.Molie\Blockcore.Networks.Molie.csproj", "{876BAE76-9A83-4757-9688-84E3692134FE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "x42.Features.xServer", "Features\x42.Features.xServer\x42.Features.xServer.csproj", "{37254468-1D80-4649-B2A1-A0CDF573FFC4}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -208,6 +212,10 @@ Global
  {AFDF6339-EE03-4F76-BFB5-024713230D91}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {AFDF6339-EE03-4F76-BFB5-024713230D91}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {AFDF6339-EE03-4F76-BFB5-024713230D91}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0735CA29-50F0-4D29-9CDD-8121437D8170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0735CA29-50F0-4D29-9CDD-8121437D8170}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0735CA29-50F0-4D29-9CDD-8121437D8170}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0735CA29-50F0-4D29-9CDD-8121437D8170}.Release|Any CPU.Build.0 = Release|Any CPU
  {75C364C1-0785-4EDD-9DB8-B0B21F27573C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {75C364C1-0785-4EDD-9DB8-B0B21F27573C}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {75C364C1-0785-4EDD-9DB8-B0B21F27573C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -368,10 +376,6 @@ Global
  {120500DF-C04F-43CC-9A1E-523A6429301F}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {120500DF-C04F-43CC-9A1E-523A6429301F}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {120500DF-C04F-43CC-9A1E-523A6429301F}.Release|Any CPU.Build.0 = Release|Any CPU
- {97875874-26BE-483E-838D-F43E5A3872FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {97875874-26BE-483E-838D-F43E5A3872FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {97875874-26BE-483E-838D-F43E5A3872FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {97875874-26BE-483E-838D-F43E5A3872FF}.Release|Any CPU.Build.0 = Release|Any CPU
  {17330538-D54C-44B0-85AD-D652453FAD65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {17330538-D54C-44B0-85AD-D652453FAD65}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {17330538-D54C-44B0-85AD-D652453FAD65}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -404,6 +408,14 @@ Global
  {D176C98F-E2EF-49C6-B073-32F08889BD27}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {D176C98F-E2EF-49C6-B073-32F08889BD27}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {D176C98F-E2EF-49C6-B073-32F08889BD27}.Release|Any CPU.Build.0 = Release|Any CPU
+ {876BAE76-9A83-4757-9688-84E3692134FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {876BAE76-9A83-4757-9688-84E3692134FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {876BAE76-9A83-4757-9688-84E3692134FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {876BAE76-9A83-4757-9688-84E3692134FE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {37254468-1D80-4649-B2A1-A0CDF573FFC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {37254468-1D80-4649-B2A1-A0CDF573FFC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {37254468-1D80-4649-B2A1-A0CDF573FFC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {37254468-1D80-4649-B2A1-A0CDF573FFC4}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
@@ -420,6 +432,7 @@ Global
  {528DB00C-F8AE-4703-80E5-ECC37AC56A9E} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
  {8B3DE868-8062-42C6-8D8A-A905A0D25DE4} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
  {AFDF6339-EE03-4F76-BFB5-024713230D91} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
+ {0735CA29-50F0-4D29-9CDD-8121437D8170} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
  {75C364C1-0785-4EDD-9DB8-B0B21F27573C} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
  {84433C94-9CB7-4D6F-B2C1-C16B6F7F277C} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
  {FB78D861-F3DF-412D-8A3D-D1756ADA39D4} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
@@ -463,7 +476,6 @@ Global
  {4275AF0C-587B-4C9D-A100-0F2DD1702674} = {64694A14-97E0-4CBC-8032-754F9353B2DD}
  {64E9C309-867E-45F6-A88E-7BC061305D0B} = {3B56C02B-4468-4268-B797-851562789FCC}
  {120500DF-C04F-43CC-9A1E-523A6429301F} = {3B56C02B-4468-4268-B797-851562789FCC}
- {97875874-26BE-483E-838D-F43E5A3872FF} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
  {17330538-D54C-44B0-85AD-D652453FAD65} = {3B56C02B-4468-4268-B797-851562789FCC}
  {9A2BA15A-C316-42B4-8E4D-E01B4873190C} = {3B56C02B-4468-4268-B797-851562789FCC}
  {4615D1C6-14CD-47CA-8B78-A462A37057F6} = {3B56C02B-4468-4268-B797-851562789FCC}
@@ -472,6 +484,8 @@ Global
  {2834DEF2-0CF7-4012-A73D-07F06256CC75} = {3B56C02B-4468-4268-B797-851562789FCC}
  {9C962CB5-A11B-47F1-A5D3-2AD2215CF100} = {3B56C02B-4468-4268-B797-851562789FCC}
  {D176C98F-E2EF-49C6-B073-32F08889BD27} = {3B56C02B-4468-4268-B797-851562789FCC}
+ {876BAE76-9A83-4757-9688-84E3692134FE} = {3B56C02B-4468-4268-B797-851562789FCC}
+ {37254468-1D80-4649-B2A1-A0CDF573FFC4} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
  EndGlobalSection
  GlobalSection(ExtensibilityGlobals) = postSolution
  SolutionGuid = {6C780ABA-5872-4B83-AD3F-A5BD423AD907}