Migrate to .slnx (#8195)

NethermindEth · Feb 12, 2025 · 5a74ffc · 5a74ffc
1 parent 10312b6
commit 5a74ffc
Show file tree

Hide file tree

Showing 34 changed files with 341 additions and 2,000 deletions.
diff --git a/.github/workflows/build-solutions.yml b/.github/workflows/build-solutions.yml
@@ -27,5 +27,5 @@ jobs:
           submodules: ${{ matrix.solution == 'EthereumTests' }}
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
-      - name: Build ${{ matrix.solution }}.sln
-        run: dotnet build src/Nethermind/${{ matrix.solution }}.sln -c ${{ matrix.config }}
+      - name: Build ${{ matrix.solution }}.slnx
+        run: dotnet build src/Nethermind/${{ matrix.solution }}.slnx -c ${{ matrix.config }}
diff --git a/.github/workflows/build-tools.yml b/.github/workflows/build-tools.yml
@@ -17,13 +17,14 @@ jobs:
       matrix:
         config: [release]
         project:
-          - DocGen/DocGen.sln
-          - Evm/Evm.sln
-          - HiveCompare/HiveCompare.sln
-          - HiveConsensusWorkflowGenerator/HiveConsensusWorkflowGenerator.csproj
-          - Nethermind.Tools.Kute/Nethermind.Tools.Kute.csproj
-          - SendBlobs/SendBlobs.sln
-          - TxParser/TxParser.csproj
+          - DocGen/DocGen.slnx
+          - Evm/Evm.slnx
+          - HiveCompare/HiveCompare.slnx
+          - HiveConsensusWorkflowGenerator/HiveConsensusWorkflowGenerator.slnx
+          - Nethermind.Tools.Kute/Nethermind.Tools.Kute.slnx
+          # - SchemaGenerator/SchemaGenerator.slnx
+          - SendBlobs/SendBlobs.slnx
+          - TxParser/TxParser.slnx
     steps:
       - name: Check out repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/setup-dotnet@v4
       - name: Build Nethermind
         working-directory: src/Nethermind
-        run: dotnet build Nethermind.sln -c release
+        run: dotnet build Nethermind.slnx -c release
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@v3
         with:

diff --git a/.github/workflows/update-no-op-plugin.yml b/.github/workflows/update-no-op-plugin.yml
@@ -32,8 +32,8 @@ jobs:
         run: |
           rm -rf src/Nethermind/Nethermind.Optimism
           rm -rf src/Nethermind/Nethermind.Optimism.Test
-          sed -i "/Nethermind.Optimism/d" src/Nethermind/Nethermind.sln
-          sed -i "/Nethermind.Optimism.Test/d" src/Nethermind/Nethermind.sln
+          sed -i "/Nethermind.Optimism/d" src/Nethermind/Nethermind.slnx
+          sed -i "/Nethermind.Optimism.Test/d" src/Nethermind/Nethermind.slnx
       - name: Push changes
         run: |
           git config user.name "${{ github.actor }}"

diff --git a/README.md b/README.md
@@ -115,10 +115,10 @@ dotnet run -c release -- -c mainnet
 cd nethermind/src/Nethermind
 
 # Run Nethermind tests
-dotnet test Nethermind.sln -c release
+dotnet test Nethermind.slnx -c release
 
 # Run Ethereum Foundation tests
-dotnet test EthereumTests.sln -c release
+dotnet test EthereumTests.slnx -c release
 ```
 
 For more info, see [Building standalone binaries](https://docs.nethermind.io/developers/building-from-source#building-standalone-binaries).

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.0",
+    "version": "9.0.2",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   }

diff --git a/src/Nethermind/Benchmarks.sln b/src/Nethermind/Benchmarks.sln
diff --git a/src/Nethermind/Benchmarks.slnx b/src/Nethermind/Benchmarks.slnx
@@ -0,0 +1,47 @@
+<Solution>
+  <Folder Name="/Nethermind/">
+    <Project Path="Ethereum.Test.Base/Ethereum.Test.Base.csproj" />
+    <Project Path="Nethermind.Abi/Nethermind.Abi.csproj" />
+    <Project Path="Nethermind.Api/Nethermind.Api.csproj" />
+    <Project Path="Nethermind.Blockchain/Nethermind.Blockchain.csproj" />
+    <Project Path="Nethermind.Config/Nethermind.Config.csproj" />
+    <Project Path="Nethermind.Consensus.Ethash/Nethermind.Consensus.Ethash.csproj" />
+    <Project Path="Nethermind.Consensus/Nethermind.Consensus.csproj" />
+    <Project Path="Nethermind.Core.Test/Nethermind.Core.Test.csproj" />
+    <Project Path="Nethermind.Core/Nethermind.Core.csproj" />
+    <Project Path="Nethermind.Crypto/Nethermind.Crypto.csproj" />
+    <Project Path="Nethermind.Db/Nethermind.Db.csproj" />
+    <Project Path="Nethermind.EthStats/Nethermind.EthStats.csproj" />
+    <Project Path="Nethermind.Evm.Test/Nethermind.Evm.Test.csproj" />
+    <Project Path="Nethermind.Evm/Nethermind.Evm.csproj" />
+    <Project Path="Nethermind.Facade/Nethermind.Facade.csproj" />
+    <Project Path="Nethermind.Grpc/Nethermind.Grpc.csproj" />
+    <Project Path="Nethermind.JsonRpc/Nethermind.JsonRpc.csproj" />
+    <Project Path="Nethermind.KeyStore/Nethermind.KeyStore.csproj" />
+    <Project Path="Nethermind.Logging/Nethermind.Logging.csproj" />
+    <Project Path="Nethermind.Monitoring/Nethermind.Monitoring.csproj" />
+    <Project Path="Nethermind.Network.Contract/Nethermind.Network.Contract.csproj" />
+    <Project Path="Nethermind.Network.Discovery/Nethermind.Network.Discovery.csproj" />
+    <Project Path="Nethermind.Network.Enr/Nethermind.Network.Enr.csproj" />
+    <Project Path="Nethermind.Network.Stats/Nethermind.Network.Stats.csproj" />
+    <Project Path="Nethermind.Network.Test/Nethermind.Network.Test.csproj" />
+    <Project Path="Nethermind.Network/Nethermind.Network.csproj" />
+    <Project Path="Nethermind.Serialization.Json/Nethermind.Serialization.Json.csproj" />
+    <Project Path="Nethermind.Serialization.Rlp/Nethermind.Serialization.Rlp.csproj" />
+    <Project Path="Nethermind.Sockets/Nethermind.Sockets.csproj" />
+    <Project Path="Nethermind.Specs.Test/Nethermind.Specs.Test.csproj" />
+    <Project Path="Nethermind.Specs/Nethermind.Specs.csproj" />
+    <Project Path="Nethermind.State/Nethermind.State.csproj" />
+    <Project Path="Nethermind.Synchronization/Nethermind.Synchronization.csproj" />
+    <Project Path="Nethermind.Trie/Nethermind.Trie.csproj" />
+    <Project Path="Nethermind.TxPool/Nethermind.TxPool.csproj" />
+    <Project Path="Nethermind.Wallet/Nethermind.Wallet.csproj" />
+  </Folder>
+  <Project Path="Nethermind.Benchmark.Runner/Nethermind.Benchmark.Runner.csproj" />
+  <Project Path="Nethermind.Benchmark/Nethermind.Benchmark.csproj" />
+  <Project Path="Nethermind.EthereumTests.Benchmark/Nethermind.EthereumTests.Benchmark.csproj" />
+  <Project Path="Nethermind.Evm.Benchmark/Nethermind.Evm.Benchmark.csproj" />
+  <Project Path="Nethermind.JsonRpc.Benchmark/Nethermind.JsonRpc.Benchmark.csproj" />
+  <Project Path="Nethermind.Network.Benchmark/Nethermind.Network.Benchmark.csproj" />
+  <Project Path="Nethermind.Precompiles.Benchmark/Nethermind.Precompiles.Benchmark.csproj" />
+</Solution>
diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj
@@ -37,18 +37,9 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ethereum.Test.Base\Ethereum.Test.Base.csproj" />
-    <ProjectReference Include="..\Nethermind.Blockchain\Nethermind.Blockchain.csproj">
-      <Project>{B1C9CF07-F89B-4F92-B8A5-F6949B9D3DA5}</Project>
-      <Name>Nethermind.Blockchain</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Nethermind.Core\Nethermind.Core.csproj">
-      <Project>{5751C57B-9F2D-45DE-BCC2-42645B85E39E}</Project>
-      <Name>Nethermind.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Nethermind.Evm\Nethermind.Evm.csproj">
-      <Project>{E992EFB5-85F0-49B1-9C0B-6D3846A813A5}</Project>
-      <Name>Nethermind.Evm</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Nethermind.Blockchain\Nethermind.Blockchain.csproj" />
+    <ProjectReference Include="..\Nethermind.Core\Nethermind.Core.csproj" />
+    <ProjectReference Include="..\Nethermind.Evm\Nethermind.Evm.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Blockhash\blockhash.json">

diff --git a/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj b/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj
@@ -17,10 +17,7 @@
     <PackageReference Include="NUnit3TestAdapter" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Ethereum.Test.Base\Ethereum.Test.Base.csproj">
-      <Project>{968435E3-4245-4CE2-A720-7F334BBB46FA}</Project>
-      <Name>Ethereum.Test.Base</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Ethereum.Test.Base\Ethereum.Test.Base.csproj" />
     <EmbeddedResource Include="..\..\tests\BasicTests\hexencodetest.json">
       <Link>hexencodetest.json</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>