Add .NET 5.0 support (#1154)

4 files changed, 145 insertions, 0 deletions

diff --git a/csharp/test/Ice/proxy/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/proxy/msbuild/client/net5.0/client.csproj
new file mode 100644
index 00000000000..d260bdb4c4e
--- /dev/null
+++ b/csharp/test/Ice/proxy/msbuild/client/net5.0/client.csproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>client</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+    <UseAppHost>true</UseAppHost>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.4" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/net5.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff --git a/csharp/test/Ice/proxy/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/proxy/msbuild/collocated/net5.0/collocated.csproj
new file mode 100644
index 00000000000..ba7f68f7a63
--- /dev/null
+++ b/csharp/test/Ice/proxy/msbuild/collocated/net5.0/collocated.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>collocated</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+    <UseAppHost>true</UseAppHost>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../MyDerivedClassI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.4" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/net5.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff --git a/csharp/test/Ice/proxy/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/proxy/msbuild/server/net5.0/server.csproj
new file mode 100644
index 00000000000..99d96e488be
--- /dev/null
+++ b/csharp/test/Ice/proxy/msbuild/server/net5.0/server.csproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>server</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+    <UseAppHost>true</UseAppHost>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyDerivedClassI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.4" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/net5.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/proxy/msbuild/serveramd/net5.0/serveramd.csproj
new file mode 100644
index 00000000000..ac9cc403b84
--- /dev/null
+++ b/csharp/test/Ice/proxy/msbuild/serveramd/net5.0/serveramd.csproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>serveramd</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+    <UseAppHost>true</UseAppHost>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyDerivedClassAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.4" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/net5.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>