Merge C# test & dist solutions (#2717)

zeroc-ice · Sep 4, 2024 · 58d8716 · 58d8716
1 parent b1afb78
commit 58d8716
Show file tree

Hide file tree

Showing 131 changed files with 2,266 additions and 2,846 deletions.
diff --git a/.github/workflows/dotnet_format.yml b/.github/workflows/dotnet_format.yml
@@ -18,4 +18,3 @@ jobs:
       - name: Run dotnet format
         run: |
           dotnet format --verify-no-changes csharp/msbuild/ice.sln
-          dotnet format --verify-no-changes csharp/msbuild/ice.test.sln
diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj
@@ -37,68 +37,35 @@
               Condition="'$(OS)' != 'Windows_NT'"/>
     </Target>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(ICE_BIN_DIST)' != 'all'">
         <!-- .NET Solution files -->
-        <DistSolution Include="ice.sln">
-          <Properties>Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform)</Properties>
-        </DistSolution>
-
-        <TestSolution Include="ice.test.sln">
+        <SolutionFile Include="ice.sln">
           <Properties>Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform)</Properties>
-        </TestSolution>
+        </SolutionFile>
     </ItemGroup>
 
-    <Target Name="NuGetRestoreDist" Condition="'$(ICE_BIN_DIST)' != 'all'">
-        <MSBuild Projects="@(DistSolution)"
+    <Target Name="NuGetRestore">
+        <MSBuild Projects="@(SolutionFile)"
                  BuildInParallel="true"
                  Properties="%(Properties)"
                  Targets="Restore"/>
     </Target>
 
-    <Target Name="BuildDist"
-            DependsOnTargets="SliceCompilers;NuGetRestoreDist"
-            Condition="'$(ICE_BIN_DIST)' != 'all'">
-
-        <MSBuild Projects="@(DistSolution)"
+    <Target Name="Build"
+            DependsOnTargets="SliceCompilers;NuGetRestore">
+        <MSBuild Projects="@(SolutionFile)"
                  BuildInParallel="true"
                  Properties="%(Properties)"/>
-
     </Target>
 
-    <Target Name="CleanDist" Condition="'$(ICE_BIN_DIST)' != 'all'">
-
-        <MSBuild Projects="@(DistSolution)"
+    <Target Name="Clean">
+        <MSBuild Projects="@(SolutionFile)"
                  BuildInParallel="true"
                  Properties="%(Properties)"
                  Targets="Clean" />
-
-    </Target>
-
-    <Target Name="NuGetRestore" DependsOnTargets="NuGetRestoreDist">
-        <MSBuild Projects="@(TestSolution)"
-                 BuildInParallel="true"
-                 Properties="%(Properties)"
-                 Targets="Restore"/>
-    </Target>
-
-    <Target Name="Build" DependsOnTargets="BuildDist;NuGetRestore">
-
-        <MSBuild Projects="@(TestSolution)"
-                 BuildInParallel="true"
-                 Properties="%(Properties)"/>
-
-    </Target>
-
-    <Target Name="Clean" DependsOnTargets="CleanDist">
-
-        <MSBuild Projects="@(TestSolution)"
-                 BuildInParallel="true"
-                 Properties="%(Properties)"
-                 Targets="Clean" />
-
     </Target>
 
-    <Target Name="WindowsNuGetPack" DependsOnTargets="BuildDist" Condition="'$(OS)' == 'Windows_NT'">
+    <Target Name="WindowsNuGetPack" DependsOnTargets="Build" Condition="'$(OS)' == 'Windows_NT'">
         <RemoveDir Directories="zeroc.ice.net" />
 
         <!-- Build iceboxnet with net8.0 target framework (default) -->
@@ -139,7 +106,7 @@
               WorkingDirectory="zeroc.ice.net"/>
     </Target>
 
-    <Target Name="UnixNuGetPack" DependsOnTargets="BuildDist" Condition="'$(OS)' != 'Windows_NT'">
+    <Target Name="UnixNuGetPack" DependsOnTargets="Build" Condition="'$(OS)' != 'Windows_NT'">
         <RemoveDir Directories="zeroc.ice.net" />
         <!-- Build iceboxnet with net8.0 target framework (default) -->
         <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBoxNet\IceBoxNet.csproj"

diff --git a/csharp/msbuild/ice.sln b/csharp/msbuild/ice.sln
diff --git a/csharp/msbuild/ice.test.sln b/csharp/msbuild/ice.test.sln
diff --git a/csharp/test/Glacier2/router/msbuild/client/client.csproj b/csharp/test/Glacier2/router/msbuild/client/client.csproj
@@ -30,8 +30,8 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
-        <Reference Include="../../../../../lib/net8.0/Glacier2.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
+        <ProjectReference Include="../../../../../src/Glacier2/Glacier2.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Glacier2/router/msbuild/server/server.csproj b/csharp/test/Glacier2/router/msbuild/server/server.csproj
@@ -30,8 +30,8 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
-        <Reference Include="../../../../../lib/net8.0/Glacier2.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
+        <ProjectReference Include="../../../../../src/Glacier2/Glacier2.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj
@@ -30,8 +30,8 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
-        <Reference Include="../../../../../lib/net8.0/Glacier2.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
+        <ProjectReference Include="../../../../../src/Glacier2/Glacier2.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj
@@ -30,8 +30,8 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
-        <Reference Include="../../../../../lib/net8.0/Glacier2.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
+        <ProjectReference Include="../../../../../src/Glacier2/Glacier2.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj
@@ -31,7 +31,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj
@@ -33,7 +33,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj
@@ -32,7 +32,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/admin/msbuild/client/client.csproj b/csharp/test/Ice/admin/msbuild/client/client.csproj
@@ -31,7 +31,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/admin/msbuild/server/server.csproj b/csharp/test/Ice/admin/msbuild/server/server.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/ami/msbuild/client/client.csproj b/csharp/test/Ice/ami/msbuild/client/client.csproj
@@ -32,7 +32,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj b/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj
@@ -31,7 +31,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/ami/msbuild/server/server.csproj b/csharp/test/Ice/ami/msbuild/server/server.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/assemblies/msbuild/client/client.csproj b/csharp/test/Ice/assemblies/msbuild/client/client.csproj
@@ -27,7 +27,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/assemblies/msbuild/core/core.csproj b/csharp/test/Ice/assemblies/msbuild/core/core.csproj
@@ -31,7 +31,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/assemblies/msbuild/user/user.csproj b/csharp/test/Ice/assemblies/msbuild/user/user.csproj
@@ -38,7 +38,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/background/msbuild/client/client.csproj b/csharp/test/Ice/background/msbuild/client/client.csproj
@@ -37,7 +37,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/background/msbuild/server/server.csproj b/csharp/test/Ice/background/msbuild/server/server.csproj
@@ -38,7 +38,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/binding/msbuild/client/client.csproj b/csharp/test/Ice/binding/msbuild/client/client.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/binding/msbuild/server/server.csproj b/csharp/test/Ice/binding/msbuild/server/server.csproj
@@ -32,7 +32,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/defaultServant/msbuild/client/client.csproj b/csharp/test/Ice/defaultServant/msbuild/client/client.csproj
@@ -31,7 +31,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/defaultValue/msbuild/client/client.csproj b/csharp/test/Ice/defaultValue/msbuild/client/client.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/dictMapping/msbuild/client/client.csproj b/csharp/test/Ice/dictMapping/msbuild/client/client.csproj
@@ -32,7 +32,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj b/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj
@@ -33,7 +33,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/dictMapping/msbuild/server/server.csproj b/csharp/test/Ice/dictMapping/msbuild/server/server.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/echo/msbuild/server/server.csproj b/csharp/test/Ice/echo/msbuild/server/server.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/enums/msbuild/client/client.csproj b/csharp/test/Ice/enums/msbuild/client/client.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/enums/msbuild/server/server.csproj b/csharp/test/Ice/enums/msbuild/server/server.csproj
@@ -30,7 +30,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/exceptions/msbuild/client/client.csproj b/csharp/test/Ice/exceptions/msbuild/client/client.csproj
@@ -32,7 +32,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj b/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj
@@ -33,7 +33,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/exceptions/msbuild/server/server.csproj b/csharp/test/Ice/exceptions/msbuild/server/server.csproj
@@ -32,7 +32,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj
@@ -32,7 +32,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/csharp/test/Ice/executor/msbuild/client/client.csproj b/csharp/test/Ice/executor/msbuild/client/client.csproj
@@ -31,7 +31,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <ProjectReference Include="../../../../../src/Ice/Ice.csproj" />
       </ItemGroup>
     </Otherwise>
   </Choose>