Upgrade C# build to target .NET 8.0 (#1976)

zeroc-ice · Mar 22, 2024 · 3db9bf0 · 3db9bf0
1 parent 5fc9cec
commit 3db9bf0
Show file tree

Hide file tree

Showing 146 changed files with 187 additions and 237 deletions.
diff --git a/csharp/BUILDING.md b/csharp/BUILDING.md
@@ -21,7 +21,7 @@ resulting binaries. As an alternative, you can download and install the
 
 In order to build Ice for .NET from source, you need:
 
-* Visual Studio 2022 with [.NET 6.0 SDK][2] or [.NET 8.0 SDK][3].
+* Visual Studio 2022 with [.NET 8.0 SDK][2].
 
 ### Compiling Ice for .NET on Windows
 
@@ -44,26 +44,14 @@ msbuild msbuild\ice.proj
 > msbuild msbuild\ice.proj /p:Platform=x64
 > ```
 
-Upon completion, the Ice assemblies for .NET Standard 2.0 are placed in the `lib\netstandard2.0` folder.
+Upon completion, the Ice assemblies for .NET 8.0 are placed in the `lib\net8.0` folder.
 
 You can skip the build of the test suite with the `BuildDist` target:
 
 ```shell
 msbuild msbuild\ice.proj /t:BuildDist
 ```
 
-The iceboxnet executable and test applications target `net6.0` You can change
-the target framework by setting the `AppTargetFramework` property to a different
-
-Target Framework Moniker value, for example:
-
-```shell
-msbuild msbuild\ice.proj /p:"AppTargetFramework=net8.0"
-```
-
-This builds the test programs for `net8.0`. The target frameworks you specify
-must implement .NET Standard 2.0.
-
 #### Authenticode Signatures
 
 You can sign the Ice binaries with Authenticode by setting the following
@@ -90,7 +78,7 @@ necessary.
 
 ### Linux and macOS Build Requirements
 
-You need the [.NET 6.0 SDK][2] or [.NET 8.0 SDK][3] to build Ice for .NET from source.
+You need the [.NET 8.0 SDK][2] to build Ice for .NET from source.
 
 ### Compiling Ice for .NET on Linux or macOS
 
@@ -106,22 +94,14 @@ Then run:
 dotnet msbuild msbuild/ice.proj
 ```
 
-Upon completion, the Ice assemblies are placed in the `lib/netstandard2.0` directory.
+Upon completion, the Ice assemblies are placed in the `lib/net8.0` directory.
 
 You can skip the build of the test suite with the `BuildDist` target:
 
 ```shell
 dotnet msbuild msbuild/ice.proj /t:BuildDist
 ```
 
-The iceboxnet executable and test applications target `net6.0`. You can change the target
-framework by setting the `AppTargetFramework` property to a different Target Framework Moniker value,
-for example:
-
-```shell
-dotnet msbuild msbuild/ice.proj /p:"AppTargetFramework=net8.0"
-```
-
 ## Running the Tests
 
 Python is required to run the test suite. Additionally, the Glacier2 tests
@@ -141,15 +121,6 @@ python allTests.py
 If everything worked out, you should see lots of `ok` messages. In case of a
 failure, the tests abort with `failed`.
 
-`allTests.py` executes by default the tests for .NET 6.0. If you want to run
-the test with a different .NET Framework you must use `--framework` option.
-
-For example, to run .NET 8.0 tests:
-
-```shell
-python allTests.py --framework=net8.0
-```
-
 ## NuGet Package
 
 ### Creating NuGet Packages on Windows
@@ -176,5 +147,4 @@ This creates the `zeroc.ice.net` Nuget package in the `msbuild/zeroc.ice.net`
 directory.
 
 [1]: https://zeroc.com/downloads/ice
-[2]: https://dotnet.microsoft.com/en-us/download/dotnet/6.0
-[3]: https://dotnet.microsoft.com/en-us/download/dotnet/8.0
+[2]: https://dotnet.microsoft.com/en-us/download/dotnet/8.0
diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <AppTargetFramework Condition="'$(AppTargetFramework)' == ''">net6.0</AppTargetFramework>
+        <AppTargetFramework Condition="'$(AppTargetFramework)' == ''">net8.0</AppTargetFramework>
     </PropertyGroup>
 </Project>
diff --git a/csharp/msbuild/ice.nuget.targets b/csharp/msbuild/ice.nuget.targets
@@ -10,12 +10,12 @@
         <!--
              Pack the dependencies next to iceboxnet.dll, the .exe native executable is excluded as it is platform dependent.
         -->
-        <NetStandardIceBox Include="$(IceSrcRootDir)bin\**\publish\*"
-                           Exclude="$(IceSrcRootDir)bin\**\publish\*.exe" />
+        <IceBox Include="$(IceSrcRootDir)bin\**\publish\*"
+                Exclude="$(IceSrcRootDir)bin\**\publish\*.exe" />
 
         <Assemblies Include="$(IceSrcRootDir)lib\**\*.dll;
                              $(IceSrcRootDir)lib\**\*.xml"/>
-        <NetStandardPdbs Include="$(IceSrcRootDir)lib\netstandard2.0\*.pdb" />
+        <Pdbs Include="$(IceSrcRootDir)lib\net8.0\*.pdb" />
 
         <Slices Include="$(IceSrcRootDir)..\slice\**\*.ice"
                 Exclude="$(IceSrcRootDir)..\slice\IceDiscovery\*.ice;
@@ -25,9 +25,9 @@
     <!-- Copy required files to the package specific directories -->
     <Target Name="NugetPack">
         <Copy SourceFiles="@(Assemblies)" DestinationFolder="$(PackageDirectory)\lib\%(Assemblies.RecursiveDir)" />
-        <Copy SourceFiles="@(NetStandardPdbs)" DestinationFolder="$(PackageDirectory)\lib\netstandard2.0" />
+        <Copy SourceFiles="@(Pdbs)" DestinationFolder="$(PackageDirectory)\lib\net8.0" />
         <Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)" />
         <Copy SourceFiles="@(SliceCompilers)" DestinationFolder="$(PackageDirectory)\tools" />
-        <Copy SourceFiles="@(NetStandardIceBox)" DestinationFolder="$(PackageDirectory)\tools\%(NetStandardIceBox.RecursiveDir)\.." />
+        <Copy SourceFiles="@(IceBox)" DestinationFolder="$(PackageDirectory)\tools\%(IceBox.RecursiveDir)\.." />
     </Target>
 </Project>
diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj
@@ -48,7 +48,6 @@
         </TestSolution>
     </ItemGroup>
 
-    <!-- NET Standard Targets -->
     <Target Name="NuGetRestoreDist" Condition="'$(ICE_BIN_DIST)' != 'all'">
         <MSBuild Projects="@(DistSolution)"
                  BuildInParallel="true"
@@ -92,7 +91,7 @@
 
     <Target Name="Clean" DependsOnTargets="CleanDist">
 
-        <MSBuild Projects="@(NetStandardTestSolution)"
+        <MSBuild Projects="@(TestSolution)"
                  BuildInParallel="true"
                  Properties="%(Properties)"
                  Targets="Clean" />
@@ -102,9 +101,9 @@
     <Target Name="WindowsNuGetPack" DependsOnTargets="BuildDist" Condition="'$(OS)' == 'Windows_NT'">
         <RemoveDir Directories="zeroc.ice.net" />
 
-        <!-- Build iceboxnet with net6.0 target framework (default) -->
+        <!-- Build iceboxnet with net8.0 target framework (default) -->
         <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBoxNet\IceBoxNet.csproj"
-                 Properties="Configuration=$(Configuration);Platform=Any CPU;AppTargetFramework=net6.0"
+                 Properties="Configuration=$(Configuration);Platform=Any CPU;AppTargetFramework=net8.0"
                  Targets="Restore;Publish" />
 
         <MSBuild Projects="ice.nuget.targets"
@@ -131,7 +130,7 @@
         <!-- Copy bzip2 native dll next to iceboxnet assemblies -->
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v143.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.dll;
                            $(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v143.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.pdb"
-              DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\net6.0" />
+              DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\net8.0" />
 
         <Copy SourceFiles="zeroc.ice.net.props"
               DestinationFiles="zeroc.ice.net\build\zeroc.ice.net.props"/>
@@ -142,7 +141,7 @@
 
     <Target Name="UnixNuGetPack" DependsOnTargets="BuildDist" Condition="'$(OS)' != 'Windows_NT'">
         <RemoveDir Directories="zeroc.ice.net" />
-        <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBox\msbuild\icebox\netstandard2.0\icebox.csproj"
+        <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBox\msbuild\icebox\net8.0\icebox.csproj"
                  Properties="Configuration=$(Configuration);Platform=Any CPU"
                  Targets="Publish"/>
         <MSBuild Projects="zeroc.ice.net.csproj" Targets="Restore;Pack"/>

diff --git a/csharp/msbuild/zeroc.ice.net.csproj b/csharp/msbuild/zeroc.ice.net.csproj
@@ -4,8 +4,7 @@
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <NoWarn>2008;8021;NU5128</NoWarn>
         <IncludeBuildOutput>false</IncludeBuildOutput>
-        <PackageType>2.0.0.0</PackageType>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>net8</TargetFramework>
         <OutputPath>zeroc.ice.net</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <PackageId>zeroc.ice.net</PackageId>
@@ -38,9 +37,9 @@
             <PackagePath>lib\net6.0</PackagePath>
         </Content>
 
-        <Content Include="..\lib\netstandard2.0\*.dll">
+        <Content Include="..\lib\net8.0\*.dll">
             <Pack>true</Pack>
-            <PackagePath>lib\netstandard2.0</PackagePath>
+            <PackagePath>lib\net8.0</PackagePath>
         </Content>
 
         <Content Include="..\bin\$(AppTargetFramework)\publish\*" Exclude="..\bin\$(AppTargetFramework)\publish\iceboxnet">

diff --git a/csharp/src/Glacier2/Glacier2.csproj b/csharp/src/Glacier2/Glacier2.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>Glacier2</AssemblyName>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../lib</OutputPath>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <SliceCompile Include="../../../slice/$(AssemblyName)/*.ice" />

diff --git a/csharp/src/Ice/Ice.csproj b/csharp/src/Ice/Ice.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>Ice</AssemblyName>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../lib</OutputPath>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <SliceCompile Include="../../../slice/Ice/*.ice" />

diff --git a/csharp/src/IceBox/IceBox.csproj b/csharp/src/IceBox/IceBox.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../lib</OutputPath>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <SliceCompile Include="../../../slice/IceBox/*.ice" />

diff --git a/csharp/src/IceBoxNet/IceBoxNet.csproj b/csharp/src/IceBoxNet/IceBoxNet.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>iceboxnet</AssemblyName>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../bin</OutputPath>
-    <TargetFramework>$(AppTargetFramework)</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Ice/Ice.csproj" />

diff --git a/csharp/src/IceDiscovery/IceDiscovery.csproj b/csharp/src/IceDiscovery/IceDiscovery.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>IceDiscovery</AssemblyName>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../lib</OutputPath>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <SliceCompile Include="../../../slice/$(AssemblyName)/*.ice" />

diff --git a/csharp/src/IceGrid/IceGrid.csproj b/csharp/src/IceGrid/IceGrid.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>IceGrid</AssemblyName>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../lib</OutputPath>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <SliceCompile Include="../../../slice/$(AssemblyName)/*.ice" />

diff --git a/csharp/src/IceLocatorDiscovery/IceLocatorDiscovery.csproj b/csharp/src/IceLocatorDiscovery/IceLocatorDiscovery.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>IceLocatorDiscovery</AssemblyName>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../lib</OutputPath>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <SliceCompile Include="../../../slice/$(AssemblyName)/*.ice" />

diff --git a/csharp/src/IceSSL/IceSSL.csproj b/csharp/src/IceSSL/IceSSL.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>IceSSL</AssemblyName>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../lib</OutputPath>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" PrivateAssets="All" />

diff --git a/csharp/src/IceStorm/IceStorm.csproj b/csharp/src/IceStorm/IceStorm.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>IceStorm</AssemblyName>
     <Version>$(IceJSONVersion)</Version>
     <OutputPath>../../lib</OutputPath>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <SliceCompile Include="../../../slice/$(AssemblyName)/*.ice" />

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

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

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/netstandard2.0/Ice.dll" />
-        <Reference Include="../../../../../lib/netstandard2.0/Glacier2.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Glacier2.dll" />
       </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/netstandard2.0/Ice.dll" />
-        <Reference Include="../../../../../lib/netstandard2.0/Glacier2.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Glacier2.dll" />
       </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/netstandard2.0/Ice.dll" />
-        <Reference Include="../../../../../lib/netstandard2.0/Glacier2.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Glacier2.dll" />
       </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/netstandard2.0/Ice.dll" />
-        <Reference Include="../../../../../lib/netstandard2.0/Glacier2.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Glacier2.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>

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

diff --git a/csharp/test/Ice/acm/msbuild/server/server.csproj b/csharp/test/Ice/acm/msbuild/server/server.csproj
@@ -33,7 +33,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
       </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/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
       </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/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
       </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/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
       </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/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../lib/net8.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>