diff options
| author | Jose <pepone@users.noreply.github.com> | 2020-11-18 14:35:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 14:35:45 +0100 |
| commit | 61f46a49e07d422bfb5ca7b32234b9ad1405fa07 (patch) | |
| tree | 27b9db4b875d757dc3b51fa16b72decea248cb9f /csharp/test | |
| parent | Fixed invalid Python 3.9 macro (diff) | |
| download | ice-61f46a49e07d422bfb5ca7b32234b9ad1405fa07.tar.bz2 ice-61f46a49e07d422bfb5ca7b32234b9ad1405fa07.tar.xz ice-61f46a49e07d422bfb5ca7b32234b9ad1405fa07.zip | |
Add .NET 5.0 support (#1154)
Diffstat (limited to 'csharp/test')
139 files changed, 5145 insertions, 9 deletions
diff --git a/csharp/test/Glacier2/application/msbuild/client/net5.0/client.csproj b/csharp/test/Glacier2/application/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..71ae57e219a --- /dev/null +++ b/csharp/test/Glacier2/application/msbuild/client/net5.0/client.csproj @@ -0,0 +1,39 @@ +<?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> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <PropertyGroup> + <UseAppHost>true</UseAppHost> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../CallbackI.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="generated\Callback.cs"> + <SliceCompileSource>../../../Callback.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Callback.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" /> + <Reference Include="../../../../../../lib/net5.0/Glacier2.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/Glacier2/application/msbuild/server/net5.0/server.csproj b/csharp/test/Glacier2/application/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..61d417b5acb --- /dev/null +++ b/csharp/test/Glacier2/application/msbuild/server/net5.0/server.csproj @@ -0,0 +1,39 @@ +<?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> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <PropertyGroup> + <UseAppHost>true</UseAppHost> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../CallbackI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="generated\Callback.cs"> + <SliceCompileSource>../../../Callback.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Callback.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" /> + <Reference Include="../../../../../../lib/net5.0/Glacier2.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/Glacier2/router/msbuild/client/net5.0/client.csproj b/csharp/test/Glacier2/router/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..ed462bb5926 --- /dev/null +++ b/csharp/test/Glacier2/router/msbuild/client/net5.0/client.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>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="../../../CallbackI.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="generated\Callback.cs"> + <SliceCompileSource>../../../Callback.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Callback.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" /> + <Reference Include="../../../../../../lib/net5.0/Glacier2.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/Glacier2/router/msbuild/server/net5.0/server.csproj b/csharp/test/Glacier2/router/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..02847a73b16 --- /dev/null +++ b/csharp/test/Glacier2/router/msbuild/server/net5.0/server.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>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="../../../CallbackI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="generated\Callback.cs"> + <SliceCompileSource>../../../Callback.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Callback.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" /> + <Reference Include="../../../../../../lib/net5.0/Glacier2.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/client/net5.0/client.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..ed462bb5926 --- /dev/null +++ b/csharp/test/Glacier2/sessionHelper/msbuild/client/net5.0/client.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>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="../../../CallbackI.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="generated\Callback.cs"> + <SliceCompileSource>../../../Callback.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Callback.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" /> + <Reference Include="../../../../../../lib/net5.0/Glacier2.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/server/net5.0/server.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..02847a73b16 --- /dev/null +++ b/csharp/test/Glacier2/sessionHelper/msbuild/server/net5.0/server.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>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="../../../CallbackI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="generated\Callback.cs"> + <SliceCompileSource>../../../Callback.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Callback.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" /> + <Reference Include="../../../../../../lib/net5.0/Glacier2.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/Ice/acm/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/acm/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/acm/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/acm/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/acm/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/Ice/acm/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="../../../TestI.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/adapterDeactivation/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..9c41c168b91 --- /dev/null +++ b/csharp/test/Ice/adapterDeactivation/msbuild/client/net5.0/client.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>client</AssemblyName> + <OutputType>Exe</OutputType> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <IceBuilderOutputDir>generated</IceBuilderOutputDir> + <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/adapterDeactivation/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..334dbb873ed --- /dev/null +++ b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,39 @@ +<?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="../../../TestI.cs" /> + <Compile Include="../../../CookieI.cs" /> + <Compile Include="../../../ServantLocatorI.cs" /> + <Compile Include="../../../AllTests.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/adapterDeactivation/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..663ede25e83 --- /dev/null +++ b/csharp/test/Ice/adapterDeactivation/msbuild/server/net5.0/server.csproj @@ -0,0 +1,38 @@ +<?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="../../../TestI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="../../../CookieI.cs" /> + <Compile Include="../../../ServantLocatorI.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/admin/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/admin/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..50f23a7939a --- /dev/null +++ b/csharp/test/Ice/admin/msbuild/client/net5.0/client.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>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="../../../TestI.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/admin/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/admin/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/Ice/admin/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="../../../TestI.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/ami/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/ami/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..eb60b665b79 --- /dev/null +++ b/csharp/test/Ice/ami/msbuild/client/net5.0/client.csproj @@ -0,0 +1,38 @@ +<?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"> + <Link>Test.ice</Link> + </SliceCompile> + </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/ami/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/ami/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..5066bb5ff89 --- /dev/null +++ b/csharp/test/Ice/ami/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="../../../TestI.cs" /> + <Compile Include="../../../AllTests.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/ami/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/ami/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/Ice/ami/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="../../../TestI.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/application/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/application/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..3950f80a72f --- /dev/null +++ b/csharp/test/Ice/application/msbuild/client/net5.0/client.csproj @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<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="../../../Client.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/assemblies/Client.cs b/csharp/test/Ice/assemblies/Client.cs index a06afa419f8..2f5b5942226 100644 --- a/csharp/test/Ice/assemblies/Client.cs +++ b/csharp/test/Ice/assemblies/Client.cs @@ -27,12 +27,16 @@ public class Client : Test.TestHelper string assembly = String.Format("{0}/core.dll", +#pragma warning disable SYSLIB0012 // Type or member is obsolete Path.GetFileName(Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase))); - using(var communicator = initialize(properties)) +#pragma warning restore SYSLIB0012 // Type or member is obsolete + using (var communicator = initialize(properties)) { test(AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault((e) => { +#pragma warning disable SYSLIB0012 // Type or member is obsolete return e.CodeBase.EndsWith(assembly, StringComparison.InvariantCultureIgnoreCase); +#pragma warning restore SYSLIB0012 // Type or member is obsolete }) == null); } properties.setProperty("Ice.PreloadAssemblies", "1"); @@ -40,7 +44,9 @@ public class Client : Test.TestHelper { test(AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault((e) => { +#pragma warning disable SYSLIB0012 // Type or member is obsolete return e.CodeBase.EndsWith(assembly, StringComparison.InvariantCultureIgnoreCase); +#pragma warning restore SYSLIB0012 // Type or member is obsolete }) != null); } diff --git a/csharp/test/Ice/assemblies/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/assemblies/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..132b53960ea --- /dev/null +++ b/csharp/test/Ice/assemblies/msbuild/client/net5.0/client.csproj @@ -0,0 +1,36 @@ +<?xml version="1.0"?> +<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="../../../Client.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="../../user/net5.0/user.csproj"/> + </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/assemblies/msbuild/core/net5.0/core.csproj b/csharp/test/Ice/assemblies/msbuild/core/net5.0/core.csproj new file mode 100644 index 00000000000..878cffd99d6 --- /dev/null +++ b/csharp/test/Ice/assemblies/msbuild/core/net5.0/core.csproj @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="../../../../../../msbuild/ice.common.props" /> + <PropertyGroup> + <AssemblyName>core</AssemblyName> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <OutputPath>.</OutputPath> + <OutputType>Library</OutputType> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + </ItemGroup> + <ItemGroup> + <SliceCompile Include="../../../Core.ice" /> + </ItemGroup> + <ItemGroup> + <Compile Include="generated\Core.cs"> + <SliceCompileSource>../../../Core.ice</SliceCompileSource> + </Compile> + </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/assemblies/msbuild/user/net5.0/user.csproj b/csharp/test/Ice/assemblies/msbuild/user/net5.0/user.csproj new file mode 100644 index 00000000000..7e016f7b21f --- /dev/null +++ b/csharp/test/Ice/assemblies/msbuild/user/net5.0/user.csproj @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="../../../../../../msbuild/ice.common.props" /> + <PropertyGroup> + <AssemblyName>user</AssemblyName> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <OutputPath>.</OutputPath> + <UseAppHost>true</UseAppHost> + </PropertyGroup> + <ItemDefinitionGroup> + <SliceCompile> + <IncludeDirectories>../../..</IncludeDirectories> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + </ItemGroup> + <ItemGroup> + <SliceCompile Include="../../../User.ice" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="../../core/net5.0/core.csproj" /> + </ItemGroup> + <ItemGroup> + <Compile Include="generated\User.cs"> + <SliceCompileSource>../../../User.ice</SliceCompileSource> + </Compile> + </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/background/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/background/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..4d48f3c6adb --- /dev/null +++ b/csharp/test/Ice/background/msbuild/client/net5.0/client.csproj @@ -0,0 +1,43 @@ +<?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="../../../Acceptor.cs" /> + <Compile Include="../../../AllTests.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="../../../Configuration.cs" /> + <Compile Include="../../../Connector.cs" /> + <Compile Include="../../../EndpointFactory.cs" /> + <Compile Include="../../../EndpointI.cs" /> + <Compile Include="../../../PluginI.cs" /> + <Compile Include="../../../Transceiver.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/background/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/background/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..02f70670f2b --- /dev/null +++ b/csharp/test/Ice/background/msbuild/server/net5.0/server.csproj @@ -0,0 +1,44 @@ +<?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="../../../Acceptor.cs" /> + <Compile Include="../../../BackgroundControllerI.cs" /> + <Compile Include="../../../BackgroundI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="../../../Configuration.cs" /> + <Compile Include="../../../Connector.cs" /> + <Compile Include="../../../EndpointFactory.cs" /> + <Compile Include="../../../EndpointI.cs" /> + <Compile Include="../../../PluginI.cs" /> + <Compile Include="../../../Transceiver.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/binding/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/binding/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/binding/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/binding/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/binding/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..3d7d0f2de3d --- /dev/null +++ b/csharp/test/Ice/binding/msbuild/server/net5.0/server.csproj @@ -0,0 +1,38 @@ +<?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="../../../TestI.cs" /> + <Compile Include="../../../RemoteCommunicatorI.cs" /> + <Compile Include="../../../RemoteObjectAdapterI.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/checksum/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/checksum/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..1f5fa9335a2 --- /dev/null +++ b/csharp/test/Ice/checksum/msbuild/client/net5.0/client.csproj @@ -0,0 +1,45 @@ +<?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> + <ItemDefinitionGroup Label="IceBuilder"> + <SliceCompile> + <AdditionalOptions>--checksum</AdditionalOptions> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../AllTests.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="generated\ClientTypes.cs"> + <SliceCompileSource>../../../ClientTypes.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../ClientTypes.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/checksum/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/checksum/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..591d2c8b3be --- /dev/null +++ b/csharp/test/Ice/checksum/msbuild/server/net5.0/server.csproj @@ -0,0 +1,45 @@ +<?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> + <ItemDefinitionGroup Label="IceBuilder"> + <SliceCompile> + <AdditionalOptions>--checksum</AdditionalOptions> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../TestI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="generated\ServerTypes.cs"> + <SliceCompileSource>../../../ServerTypes.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../ServerTypes.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/defaultServant/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/defaultServant/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..aa036c2496e --- /dev/null +++ b/csharp/test/Ice/defaultServant/msbuild/client/net5.0/client.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>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="../../../MyObjectI.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/defaultValue/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/defaultValue/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/defaultValue/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/dictMapping/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/dictMapping/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..2dd71e5c778 --- /dev/null +++ b/csharp/test/Ice/dictMapping/msbuild/client/net5.0/client.csproj @@ -0,0 +1,38 @@ +<?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="../../../Twoways.cs" /> + <Compile Include="../../../TwowaysAMI.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/dictMapping/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/dictMapping/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..f176fb6e702 --- /dev/null +++ b/csharp/test/Ice/dictMapping/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,39 @@ +<?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="../../../MyClassI.cs" /> + <Compile Include="../../../Twoways.cs" /> + <Compile Include="../../../TwowaysAMI.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/dictMapping/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/dictMapping/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..7c0cf8aaa37 --- /dev/null +++ b/csharp/test/Ice/dictMapping/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="../../../MyClassI.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/dictMapping/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/dictMapping/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..5e104e4204a --- /dev/null +++ b/csharp/test/Ice/dictMapping/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="../../../MyClassAMDI.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> diff --git a/csharp/test/Ice/dispatcher/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/dispatcher/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..f28f1319dc0 --- /dev/null +++ b/csharp/test/Ice/dispatcher/msbuild/client/net5.0/client.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>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="../../../Dispatcher.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/dispatcher/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/dispatcher/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..6c6c714813a --- /dev/null +++ b/csharp/test/Ice/dispatcher/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,38 @@ +<?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="../../../TestI.cs" /> + <Compile Include="../../../Dispatcher.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/dispatcher/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/dispatcher/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..425ff25574d --- /dev/null +++ b/csharp/test/Ice/dispatcher/msbuild/server/net5.0/server.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>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="../../../TestI.cs" /> + <Compile Include="../../../Dispatcher.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/echo/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/echo/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..5e927cf2e4b --- /dev/null +++ b/csharp/test/Ice/echo/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="../../../BlobjectI.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/enums/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/enums/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/enums/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/enums/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/enums/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/Ice/enums/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="../../../TestI.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/exceptions/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/exceptions/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..25d99495e11 --- /dev/null +++ b/csharp/test/Ice/exceptions/msbuild/client/net5.0/client.csproj @@ -0,0 +1,38 @@ +<?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="../../../EmptyI.cs" /> + <Compile Include="../../../ServantLocatorI.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/exceptions/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/exceptions/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..65cf1d1c456 --- /dev/null +++ b/csharp/test/Ice/exceptions/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,39 @@ +<?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="../../../ThrowerI.cs" /> + <Compile Include="../../../EmptyI.cs" /> + <Compile Include="../../../ServantLocatorI.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/exceptions/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/exceptions/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..3142c79d04d --- /dev/null +++ b/csharp/test/Ice/exceptions/msbuild/server/net5.0/server.csproj @@ -0,0 +1,38 @@ +<?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="../../../ThrowerI.cs" /> + <Compile Include="../../../EmptyI.cs" /> + <Compile Include="../../../ServantLocatorI.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/exceptions/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/exceptions/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..29f96eb7344 --- /dev/null +++ b/csharp/test/Ice/exceptions/msbuild/serveramd/net5.0/serveramd.csproj @@ -0,0 +1,38 @@ +<?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="../../../ThrowerAMDI.cs" /> + <Compile Include="../../../EmptyAMDI.cs" /> + <Compile Include="../../../ServantLocatorI.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> diff --git a/csharp/test/Ice/facets/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/facets/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..3e07558b651 --- /dev/null +++ b/csharp/test/Ice/facets/msbuild/client/net5.0/client.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>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="../../../EmptyI.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/facets/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/facets/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..3f29543b35b --- /dev/null +++ b/csharp/test/Ice/facets/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,45 @@ +<?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="../../../AI.cs" /> + <Compile Include="../../../BI.cs" /> + <Compile Include="../../../CI.cs" /> + <Compile Include="../../../DI.cs" /> + <Compile Include="../../../EI.cs" /> + <Compile Include="../../../EmptyI.cs" /> + <Compile Include="../../../FI.cs" /> + <Compile Include="../../../GI.cs" /> + <Compile Include="../../../HI.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/facets/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/facets/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..dede9d5cd96 --- /dev/null +++ b/csharp/test/Ice/facets/msbuild/server/net5.0/server.csproj @@ -0,0 +1,44 @@ +<?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="../../../AI.cs" /> + <Compile Include="../../../BI.cs" /> + <Compile Include="../../../CI.cs" /> + <Compile Include="../../../DI.cs" /> + <Compile Include="../../../EI.cs" /> + <Compile Include="../../../EmptyI.cs" /> + <Compile Include="../../../FI.cs" /> + <Compile Include="../../../GI.cs" /> + <Compile Include="../../../HI.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/faultTolerance/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/faultTolerance/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/faultTolerance/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/faultTolerance/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/faultTolerance/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/Ice/faultTolerance/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="../../../TestI.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/hash/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/hash/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..c54397ec28c --- /dev/null +++ b/csharp/test/Ice/hash/msbuild/client/net5.0/client.csproj @@ -0,0 +1,35 @@ +<?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="../../../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/hold/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/hold/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/hold/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/hold/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/hold/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..b7a7560489a --- /dev/null +++ b/csharp/test/Ice/hold/msbuild/server/net5.0/server.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>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="../../../HoldI.cs" /> + <Compile Include="../../../Timer.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/info/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/info/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..eb5ea8d8199 --- /dev/null +++ b/csharp/test/Ice/info/msbuild/client/net5.0/client.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>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" /> + <Reference Include="../../../../../../lib/net5.0/IceSSL.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/Ice/info/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/info/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/Ice/info/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="../../../TestI.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/inheritance/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/inheritance/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/inheritance/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/inheritance/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/inheritance/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..ab2ca76dbe6 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,45 @@ +<?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="../../../CAI.cs" /> + <Compile Include="../../../CBI.cs" /> + <Compile Include="../../../CCI.cs" /> + <Compile Include="../../../CDI.cs" /> + <Compile Include="../../../IAI.cs" /> + <Compile Include="../../../IB1I.cs" /> + <Compile Include="../../../IB2I.cs" /> + <Compile Include="../../../ICI.cs" /> + <Compile Include="../../../InitialI.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/inheritance/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/inheritance/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..e3cbb1fdda7 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/server/net5.0/server.csproj @@ -0,0 +1,44 @@ +<?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="../../../CAI.cs" /> + <Compile Include="../../../CBI.cs" /> + <Compile Include="../../../CCI.cs" /> + <Compile Include="../../../CDI.cs" /> + <Compile Include="../../../IAI.cs" /> + <Compile Include="../../../IB1I.cs" /> + <Compile Include="../../../IB2I.cs" /> + <Compile Include="../../../ICI.cs" /> + <Compile Include="../../../InitialI.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/interceptor/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/interceptor/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..dd1da91134a --- /dev/null +++ b/csharp/test/Ice/interceptor/msbuild/client/net5.0/client.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>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="../../../InterceptorI.cs" /> + <Compile Include="../../../MyObjectI.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/invoke/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/invoke/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/invoke/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/invoke/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/invoke/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..5e927cf2e4b --- /dev/null +++ b/csharp/test/Ice/invoke/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="../../../BlobjectI.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/location/ServerManagerI.cs b/csharp/test/Ice/location/ServerManagerI.cs index 20db90bdbb8..5813fa84572 100644 --- a/csharp/test/Ice/location/ServerManagerI.cs +++ b/csharp/test/Ice/location/ServerManagerI.cs @@ -75,11 +75,11 @@ namespace Ice adapter2.activate(); break; } - catch(Ice.SocketException ex) + catch(Ice.SocketException) { if(nRetry == 0) { - throw ex; + throw; } // Retry, if OA creation fails with EADDRINUSE(this can occur when running with JS web diff --git a/csharp/test/Ice/location/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/location/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..e6fe34959c7 --- /dev/null +++ b/csharp/test/Ice/location/msbuild/client/net5.0/client.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>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="../../../HelloI.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/location/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/location/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..fbad4f01a78 --- /dev/null +++ b/csharp/test/Ice/location/msbuild/server/net5.0/server.csproj @@ -0,0 +1,40 @@ +<?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="../../../HelloI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="../../../ServerLocator.cs" /> + <Compile Include="../../../ServerLocatorRegistry.cs" /> + <Compile Include="../../../ServerManagerI.cs" /> + <Compile Include="../../../TestI.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/logger/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/logger/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..3950f80a72f --- /dev/null +++ b/csharp/test/Ice/logger/msbuild/client/net5.0/client.csproj @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<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="../../../Client.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/metrics/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/metrics/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..5d11fcca687 --- /dev/null +++ b/csharp/test/Ice/metrics/msbuild/client/net5.0/client.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>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="../../../InstrumentationI.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/metrics/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/metrics/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..f3f687d677b --- /dev/null +++ b/csharp/test/Ice/metrics/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,38 @@ +<?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="../../../InstrumentationI.cs" /> + <Compile Include="../../../MetricsI.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/metrics/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/metrics/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..878c78ccbfa --- /dev/null +++ b/csharp/test/Ice/metrics/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="../../../MetricsI.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/metrics/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/metrics/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..c0bb37c29d4 --- /dev/null +++ b/csharp/test/Ice/metrics/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="../../../MetricsAMDI.cs" /> + <Compile Include="../../../Server.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> diff --git a/csharp/test/Ice/namespacemd/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/namespacemd/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..e89cefe3074 --- /dev/null +++ b/csharp/test/Ice/namespacemd/msbuild/client/net5.0/client.csproj @@ -0,0 +1,57 @@ +<?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> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <NoWarn>1701;1702;3005</NoWarn> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <NoWarn>1701;1702;3005</NoWarn> + </PropertyGroup> + <ItemDefinitionGroup Label="IceBuilder"> + <SliceCompile> + <OutputDir>$(MSBuildProjectDirectory)\generated</OutputDir> + <IncludeDirectories>..\..\..</IncludeDirectories> + <AdditionalOptions></AdditionalOptions> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../AllTests.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="generated\NoNamespace.cs"> + <SliceCompileSource>../../../NoNamespace.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Namespace.cs"> + <SliceCompileSource>../../../Namespace.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Namespace.ice" /> + <SliceCompile Include="../../../NoNamespace.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/namespacemd/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/namespacemd/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..8ffd6d34880 --- /dev/null +++ b/csharp/test/Ice/namespacemd/msbuild/server/net5.0/server.csproj @@ -0,0 +1,57 @@ +<?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> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <NoWarn>1701;1702;3005</NoWarn> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <NoWarn>1701;1702;3005</NoWarn> + </PropertyGroup> + <ItemDefinitionGroup Label="IceBuilder"> + <SliceCompile> + <OutputDir>$(MSBuildProjectDirectory)\generated</OutputDir> + <IncludeDirectories>..\..\..</IncludeDirectories> + <AdditionalOptions></AdditionalOptions> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../InitialI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="generated\NoNamespace.cs"> + <SliceCompileSource>../../../NoNamespace.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Namespace.cs"> + <SliceCompileSource>../../../Namespace.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Namespace.ice" /> + <SliceCompile Include="../../../NoNamespace.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/networkProxy/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/networkProxy/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/networkProxy/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/networkProxy/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/networkProxy/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..2dff3d1b7c2 --- /dev/null +++ b/csharp/test/Ice/networkProxy/msbuild/server/net5.0/server.csproj @@ -0,0 +1,35 @@ +<?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="../../../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/objects/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/objects/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..6e1b6e27ef4 --- /dev/null +++ b/csharp/test/Ice/objects/msbuild/client/net5.0/client.csproj @@ -0,0 +1,48 @@ +<?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="../../../BI.cs" /> + <Compile Include="../../../CI.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="../../../DI.cs" /> + <Compile Include="../../../EI.cs" /> + <Compile Include="../../../FI.cs" /> + <Compile Include="../../../HI.cs" /> + <Compile Include="../../../II.cs" /> + <Compile Include="../../../JI.cs" /> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>../../../Forward.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Forward.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/objects/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/objects/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..c76bf07a12c --- /dev/null +++ b/csharp/test/Ice/objects/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,51 @@ +<?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="../../../BI.cs" /> + <Compile Include="../../../CI.cs" /> + <Compile Include="../../../Collocated.cs" /> + <Compile Include="../../../DI.cs" /> + <Compile Include="../../../EI.cs" /> + <Compile Include="../../../FI.cs" /> + <Compile Include="../../../HI.cs" /> + <Compile Include="../../../II.cs" /> + <Compile Include="../../../InitialI.cs" /> + <Compile Include="../../../JI.cs" /> + <Compile Include="../../../F2I.cs" /> + <Compile Include="../../../UnexpectedObjectExceptionTestI.cs" /> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>../../../Forward.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Forward.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/objects/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/objects/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..9c6c1b3d582 --- /dev/null +++ b/csharp/test/Ice/objects/msbuild/server/net5.0/server.csproj @@ -0,0 +1,50 @@ +<?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="../../../BI.cs" /> + <Compile Include="../../../CI.cs" /> + <Compile Include="../../../DI.cs" /> + <Compile Include="../../../EI.cs" /> + <Compile Include="../../../FI.cs" /> + <Compile Include="../../../HI.cs" /> + <Compile Include="../../../II.cs" /> + <Compile Include="../../../InitialI.cs" /> + <Compile Include="../../../JI.cs" /> + <Compile Include="../../../F2I.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="../../../UnexpectedObjectExceptionTestI.cs" /> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>../../../Forward.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Forward.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/operations/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/operations/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..4c98cd94f47 --- /dev/null +++ b/csharp/test/Ice/operations/msbuild/client/net5.0/client.csproj @@ -0,0 +1,42 @@ +<?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="../../../BatchOneways.cs" /> + <Compile Include="../../../BatchOnewaysAMI.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="../../../Oneways.cs" /> + <Compile Include="../../../OnewaysAMI.cs" /> + <Compile Include="../../../Twoways.cs" /> + <Compile Include="../../../TwowaysAMI.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/operations/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/operations/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..1f0d8b46f9a --- /dev/null +++ b/csharp/test/Ice/operations/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,43 @@ +<?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="../../../BatchOneways.cs" /> + <Compile Include="../../../BatchOnewaysAMI.cs" /> + <Compile Include="../../../Collocated.cs" /> + <Compile Include="../../../MyDerivedClassI.cs" /> + <Compile Include="../../../Oneways.cs" /> + <Compile Include="../../../OnewaysAMI.cs" /> + <Compile Include="../../../Twoways.cs" /> + <Compile Include="../../../TwowaysAMI.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/operations/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/operations/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..99d96e488be --- /dev/null +++ b/csharp/test/Ice/operations/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/operations/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/operations/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..ac9cc403b84 --- /dev/null +++ b/csharp/test/Ice/operations/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> diff --git a/csharp/test/Ice/operations/msbuild/serveramdtie/net5.0/serveramdtie.csproj b/csharp/test/Ice/operations/msbuild/serveramdtie/net5.0/serveramdtie.csproj new file mode 100644 index 00000000000..445bdf02bfb --- /dev/null +++ b/csharp/test/Ice/operations/msbuild/serveramdtie/net5.0/serveramdtie.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>serveramdtie</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="../../../MyDerivedClassAMDTieI.cs" /> + <Compile Include="../../../ServerAMDTie.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> diff --git a/csharp/test/Ice/operations/msbuild/servertie/net5.0/servertie.csproj b/csharp/test/Ice/operations/msbuild/servertie/net5.0/servertie.csproj new file mode 100644 index 00000000000..1be5d446aa5 --- /dev/null +++ b/csharp/test/Ice/operations/msbuild/servertie/net5.0/servertie.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>servertie</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="../../../MyDerivedClassTieI.cs" /> + <Compile Include="../../../ServerTie.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/optional/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/optional/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d1e36fa6e8a --- /dev/null +++ b/csharp/test/Ice/optional/msbuild/client/net5.0/client.csproj @@ -0,0 +1,39 @@ +<?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> + <ItemGroup> + <ProjectReference Include="../../serializable/net5.0/serializable.csproj" /> + </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/optional/msbuild/serializable/net5.0/serializable.csproj b/csharp/test/Ice/optional/msbuild/serializable/net5.0/serializable.csproj new file mode 100644 index 00000000000..06f4ea4cb4e --- /dev/null +++ b/csharp/test/Ice/optional/msbuild/serializable/net5.0/serializable.csproj @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="../../../../../../msbuild/ice.common.props"/> + <PropertyGroup> + <AssemblyName>serializable</AssemblyName> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <OutputPath>.</OutputPath> + <UseAppHost>true</UseAppHost> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../SerializableClass.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/optional/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/optional/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..5c94b136210 --- /dev/null +++ b/csharp/test/Ice/optional/msbuild/server/net5.0/server.csproj @@ -0,0 +1,39 @@ +<?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="../../../TestI.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> + <ItemGroup> + <ProjectReference Include="../../serializable/net5.0/serializable.csproj" /> + </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/optional/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/optional/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..a9724034da4 --- /dev/null +++ b/csharp/test/Ice/optional/msbuild/serveramd/net5.0/serveramd.csproj @@ -0,0 +1,39 @@ +<?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="../../../TestAMDI.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> + <ItemGroup> + <ProjectReference Include="../../serializable/net5.0/serializable.csproj" /> + </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/plugin/Client.cs b/csharp/test/Ice/plugin/Client.cs index d3165dadb0c..cef8593555b 100644 --- a/csharp/test/Ice/plugin/Client.cs +++ b/csharp/test/Ice/plugin/Client.cs @@ -23,6 +23,8 @@ public class Client : Test.TestHelper { #if NET45 string pluginPath = "msbuild/plugin/net45/Plugin.dll"; +#elif NET5_0 + string pluginPath = "msbuild/plugin/net5.0/Plugin.dll"; #else string pluginPath = String.Format("msbuild/plugin/netstandard2.0/{0}/Plugin.dll", diff --git a/csharp/test/Ice/plugin/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/plugin/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..3950f80a72f --- /dev/null +++ b/csharp/test/Ice/plugin/msbuild/client/net5.0/client.csproj @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<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="../../../Client.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/plugin/msbuild/plugin/net5.0/plugin.csproj b/csharp/test/Ice/plugin/msbuild/plugin/net5.0/plugin.csproj new file mode 100644 index 00000000000..01c4f16e9e2 --- /dev/null +++ b/csharp/test/Ice/plugin/msbuild/plugin/net5.0/plugin.csproj @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="../../../../../../msbuild/ice.common.props"/> + <PropertyGroup> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <AssemblyName>Plugin</AssemblyName> + <DefineConstants Condition="'$(Configuration)' == 'Debug'">DEBUG;$(DefineConstants)</DefineConstants> + <OutputPath>.</OutputPath> + <UseAppHost>true</UseAppHost> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../BasePlugin.cs"/> + <Compile Include="../../../BasePluginFail.cs"/> + <Compile Include="../../../PluginFactory.cs"/> + <Compile Include="../../../PluginInitializeFailException.cs"/> + <Compile Include="../../../PluginInitializeFailFactory.cs"/> + <Compile Include="../../../PluginOneFactory.cs"/> + <Compile Include="../../../PluginOneFailFactory.cs"/> + <Compile Include="../../../PluginThreeFactory.cs"/> + <Compile Include="../../../PluginThreeFailFactory.cs"/> + <Compile Include="../../../PluginTwoFactory.cs"/> + <Compile Include="../../../PluginTwoFailFactory.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/properties/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/properties/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..3950f80a72f --- /dev/null +++ b/csharp/test/Ice/properties/msbuild/client/net5.0/client.csproj @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<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="../../../Client.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/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> diff --git a/csharp/test/Ice/retry/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/retry/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..313fe3688af --- /dev/null +++ b/csharp/test/Ice/retry/msbuild/client/net5.0/client.csproj @@ -0,0 +1,38 @@ +<?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="../../../Instrumentation.cs" /> + <Compile Include="../../../SystemFailure.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/retry/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/retry/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..be2be069113 --- /dev/null +++ b/csharp/test/Ice/retry/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,39 @@ +<?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="../../../Collocated.cs" /> + <Compile Include="../../../Instrumentation.cs" /> + <Compile Include="../../../RetryI.cs" /> + <Compile Include="../../../SystemFailure.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/retry/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/retry/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..0ea53541fa6 --- /dev/null +++ b/csharp/test/Ice/retry/msbuild/server/net5.0/server.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>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="../../../RetryI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="../../../SystemFailure.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/scope/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/scope/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..04188ff651f --- /dev/null +++ b/csharp/test/Ice/scope/msbuild/client/net5.0/client.csproj @@ -0,0 +1,41 @@ +<?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"> + <Link>Test.ice</Link> + </SliceCompile> + <None Update="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </None> + </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/scope/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/scope/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..49ab82e5e41 --- /dev/null +++ b/csharp/test/Ice/scope/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<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="../../../TestI.cs"/> + <Compile Include="../../../AllTests.cs"/> + <Compile Include="../../../Collocated.cs"/> + <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/scope/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/scope/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..908acf7d55a --- /dev/null +++ b/csharp/test/Ice/scope/msbuild/server/net5.0/server.csproj @@ -0,0 +1,38 @@ +<?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="../../../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" /> + <None Update="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </None> + </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/seqMapping/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/seqMapping/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..9c5e408af27 --- /dev/null +++ b/csharp/test/Ice/seqMapping/msbuild/client/net5.0/client.csproj @@ -0,0 +1,42 @@ +<?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="../../../Custom.cs" /> + <Compile Include="../../../Twoways.cs" /> + <Compile Include="../../../TwowaysAMI.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> + <ItemGroup> + <ProjectReference Include="../../serializable/net5.0/serializable.csproj" /> + </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/seqMapping/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/seqMapping/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..9a06de03d81 --- /dev/null +++ b/csharp/test/Ice/seqMapping/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,43 @@ +<?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="../../../MyClassI.cs" /> + <Compile Include="../../../Twoways.cs" /> + <Compile Include="../../../TwowaysAMI.cs" /> + <Compile Include="../../../Collocated.cs" /> + <Compile Include="../../../Custom.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> + <ItemGroup> + <ProjectReference Include="../../serializable/net5.0/serializable.csproj" /> + </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/seqMapping/msbuild/serializable/net5.0/serializable.csproj b/csharp/test/Ice/seqMapping/msbuild/serializable/net5.0/serializable.csproj new file mode 100644 index 00000000000..4b6d33092ec --- /dev/null +++ b/csharp/test/Ice/seqMapping/msbuild/serializable/net5.0/serializable.csproj @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="../../../../../../msbuild/ice.common.props"/> + <PropertyGroup> + <AssemblyName>serializable</AssemblyName> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <OutputPath>.</OutputPath> + <UseAppHost>true</UseAppHost> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../Serializable.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/seqMapping/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/seqMapping/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..f7968b713fc --- /dev/null +++ b/csharp/test/Ice/seqMapping/msbuild/server/net5.0/server.csproj @@ -0,0 +1,40 @@ +<?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="../../../Custom.cs" /> + <Compile Include="../../../MyClassI.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> + <ItemGroup> + <ProjectReference Include="../../serializable/net5.0/serializable.csproj" /> + </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/seqMapping/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/seqMapping/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..8541777aab0 --- /dev/null +++ b/csharp/test/Ice/seqMapping/msbuild/serveramd/net5.0/serveramd.csproj @@ -0,0 +1,40 @@ +<?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="../../../Custom.cs" /> + <Compile Include="../../../MyClassAMDI.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> + <ItemGroup> + <ProjectReference Include="../../serializable/net5.0/serializable.csproj" /> + </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/serialize/AllTests.cs b/csharp/test/Ice/serialize/AllTests.cs index 8835d911bb7..9c23d62cc2a 100644 --- a/csharp/test/Ice/serialize/AllTests.cs +++ b/csharp/test/Ice/serialize/AllTests.cs @@ -171,9 +171,11 @@ namespace Ice new StreamingContext(StreamingContextStates.All, communicator)); using(MemoryStream mem = new MemoryStream()) { +#pragma warning disable SYSLIB0011 // Type or member is obsolete bin.Serialize(mem, o); mem.Seek(0, 0); return(T)bin.Deserialize(mem); +#pragma warning restore SYSLIB0011 // Type or member is obsolete } } } diff --git a/csharp/test/Ice/serialize/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/serialize/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/serialize/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/servantLocator/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/servantLocator/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/servantLocator/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/servantLocator/msbuild/collocated/net5.0/collocated.csproj b/csharp/test/Ice/servantLocator/msbuild/collocated/net5.0/collocated.csproj new file mode 100644 index 00000000000..2a925e6365d --- /dev/null +++ b/csharp/test/Ice/servantLocator/msbuild/collocated/net5.0/collocated.csproj @@ -0,0 +1,40 @@ +<?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="../../../TestI.cs" /> + <Compile Include="../../../AllTests.cs" /> + <Compile Include="../../../CookieI.cs" /> + <Compile Include="../../../ServantLocatorI.cs" /> + <Compile Include="../../../TestActivationI.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/servantLocator/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/servantLocator/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..86499a38db8 --- /dev/null +++ b/csharp/test/Ice/servantLocator/msbuild/server/net5.0/server.csproj @@ -0,0 +1,39 @@ +<?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="../../../TestI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="../../../CookieI.cs" /> + <Compile Include="../../../ServantLocatorI.cs" /> + <Compile Include="../../../TestActivationI.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/servantLocator/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/servantLocator/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..7cbbd7e9fdf --- /dev/null +++ b/csharp/test/Ice/servantLocator/msbuild/serveramd/net5.0/serveramd.csproj @@ -0,0 +1,39 @@ +<?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="../../../TestAMDI.cs" /> + <Compile Include="../../../ServerAMD.cs" /> + <Compile Include="../../../CookieAMDI.cs" /> + <Compile Include="../../../ServantLocatorAMDI.cs" /> + <Compile Include="../../../TestActivationAMDI.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> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..42079e02dc1 --- /dev/null +++ b/csharp/test/Ice/slicing/exceptions/msbuild/client/net5.0/client.csproj @@ -0,0 +1,45 @@ +<?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> + <ItemDefinitionGroup> + <SliceCompile> + <IncludeDirectories>../../..</IncludeDirectories> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../AllTests.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="generated\ClientPrivate.cs"> + <SliceCompileSource>../../../ClientPrivate.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../ClientPrivate.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/slicing/exceptions/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..4bb933e94ea --- /dev/null +++ b/csharp/test/Ice/slicing/exceptions/msbuild/server/net5.0/server.csproj @@ -0,0 +1,45 @@ +<?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> + <ItemDefinitionGroup> + <SliceCompile> + <IncludeDirectories>../../..</IncludeDirectories> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../TestI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="generated\ServerPrivate.cs"> + <SliceCompileSource>../../../ServerPrivate.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../ServerPrivate.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/slicing/exceptions/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..f9810b27a6e --- /dev/null +++ b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net5.0/serveramd.csproj @@ -0,0 +1,45 @@ +<?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> + <ItemDefinitionGroup> + <SliceCompile> + <IncludeDirectories>../../..</IncludeDirectories> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../TestAMDI.cs" /> + <Compile Include="../../../ServerAMD.cs" /> + <Compile Include="generated\ServerPrivateAMD.cs"> + <SliceCompileSource>../../../ServerPrivateAMD.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\TestAMD.cs"> + <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../TestAMD.ice" /> + <SliceCompile Include="../../../ServerPrivateAMD.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/slicing/objects/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/slicing/objects/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..42079e02dc1 --- /dev/null +++ b/csharp/test/Ice/slicing/objects/msbuild/client/net5.0/client.csproj @@ -0,0 +1,45 @@ +<?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> + <ItemDefinitionGroup> + <SliceCompile> + <IncludeDirectories>../../..</IncludeDirectories> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../AllTests.cs" /> + <Compile Include="../../../Client.cs" /> + <Compile Include="generated\ClientPrivate.cs"> + <SliceCompileSource>../../../ClientPrivate.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../ClientPrivate.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/slicing/objects/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/slicing/objects/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..4bb933e94ea --- /dev/null +++ b/csharp/test/Ice/slicing/objects/msbuild/server/net5.0/server.csproj @@ -0,0 +1,45 @@ +<?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> + <ItemDefinitionGroup> + <SliceCompile> + <IncludeDirectories>../../..</IncludeDirectories> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../TestI.cs" /> + <Compile Include="../../../Server.cs" /> + <Compile Include="generated\ServerPrivate.cs"> + <SliceCompileSource>../../../ServerPrivate.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Test.cs"> + <SliceCompileSource>../../../Test.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../ServerPrivate.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/slicing/objects/msbuild/serveramd/net5.0/serveramd.csproj b/csharp/test/Ice/slicing/objects/msbuild/serveramd/net5.0/serveramd.csproj new file mode 100644 index 00000000000..f9810b27a6e --- /dev/null +++ b/csharp/test/Ice/slicing/objects/msbuild/serveramd/net5.0/serveramd.csproj @@ -0,0 +1,45 @@ +<?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> + <ItemDefinitionGroup> + <SliceCompile> + <IncludeDirectories>../../..</IncludeDirectories> + </SliceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <Compile Include="../../../../../../TestCommon/TestHelper.cs" /> + <Compile Include="../../../TestAMDI.cs" /> + <Compile Include="../../../ServerAMD.cs" /> + <Compile Include="generated\ServerPrivateAMD.cs"> + <SliceCompileSource>../../../ServerPrivateAMD.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\TestAMD.cs"> + <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../TestAMD.ice" /> + <SliceCompile Include="../../../ServerPrivateAMD.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/stream/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/stream/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d1e36fa6e8a --- /dev/null +++ b/csharp/test/Ice/stream/msbuild/client/net5.0/client.csproj @@ -0,0 +1,39 @@ +<?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> + <ItemGroup> + <ProjectReference Include="../../serializable/net5.0/serializable.csproj" /> + </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/stream/msbuild/serializable/net5.0/serializable.csproj b/csharp/test/Ice/stream/msbuild/serializable/net5.0/serializable.csproj new file mode 100644 index 00000000000..4b6d33092ec --- /dev/null +++ b/csharp/test/Ice/stream/msbuild/serializable/net5.0/serializable.csproj @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="../../../../../../msbuild/ice.common.props"/> + <PropertyGroup> + <AssemblyName>serializable</AssemblyName> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <OutputPath>.</OutputPath> + <UseAppHost>true</UseAppHost> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../Serializable.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/threadPoolPriority/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..c54397ec28c --- /dev/null +++ b/csharp/test/Ice/threadPoolPriority/msbuild/client/net5.0/client.csproj @@ -0,0 +1,35 @@ +<?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="../../../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/threadPoolPriority/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..bc566785712 --- /dev/null +++ b/csharp/test/Ice/threadPoolPriority/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="../../../PriorityI.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/timeout/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/timeout/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..50f23a7939a --- /dev/null +++ b/csharp/test/Ice/timeout/msbuild/client/net5.0/client.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>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="../../../TestI.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/timeout/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/timeout/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/Ice/timeout/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="../../../TestI.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/udp/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/udp/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/Ice/udp/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/udp/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/udp/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..98c56d7a11b --- /dev/null +++ b/csharp/test/Ice/udp/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="../../../TestIntfI.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/IceBox/admin/msbuild/client/net5.0/client.csproj b/csharp/test/IceBox/admin/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/IceBox/admin/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/IceBox/admin/msbuild/testservice/net5.0/testservice.csproj b/csharp/test/IceBox/admin/msbuild/testservice/net5.0/testservice.csproj new file mode 100644 index 00000000000..99c8c64ba41 --- /dev/null +++ b/csharp/test/IceBox/admin/msbuild/testservice/net5.0/testservice.csproj @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="../../../../../../msbuild/ice.common.props" /> + <PropertyGroup> + <AssemblyName>testservice</AssemblyName> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <OutputPath>.</OutputPath> + <UseAppHost>true</UseAppHost> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../TestI.cs" /> + <Compile Include="../../../TestServiceI.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" /> + <Reference Include="../../../../../../lib/net5.0/IceBox.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/IceBox/configuration/msbuild/client/net5.0/client.csproj b/csharp/test/IceBox/configuration/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/IceBox/configuration/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/IceBox/configuration/msbuild/testservice/net5.0/testservice.csproj b/csharp/test/IceBox/configuration/msbuild/testservice/net5.0/testservice.csproj new file mode 100644 index 00000000000..99c8c64ba41 --- /dev/null +++ b/csharp/test/IceBox/configuration/msbuild/testservice/net5.0/testservice.csproj @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="../../../../../../msbuild/ice.common.props" /> + <PropertyGroup> + <AssemblyName>testservice</AssemblyName> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <OutputPath>.</OutputPath> + <UseAppHost>true</UseAppHost> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../TestI.cs" /> + <Compile Include="../../../TestServiceI.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" /> + <Reference Include="../../../../../../lib/net5.0/IceBox.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/IceDiscovery/simple/msbuild/client/net5.0/client.csproj b/csharp/test/IceDiscovery/simple/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..d260bdb4c4e --- /dev/null +++ b/csharp/test/IceDiscovery/simple/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/IceDiscovery/simple/msbuild/server/net5.0/server.csproj b/csharp/test/IceDiscovery/simple/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/IceDiscovery/simple/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="../../../TestI.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/IceGrid/simple/msbuild/client/net5.0/client.csproj b/csharp/test/IceGrid/simple/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..51710cd32dc --- /dev/null +++ b/csharp/test/IceGrid/simple/msbuild/client/net5.0/client.csproj @@ -0,0 +1,40 @@ +<?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" /> + <Reference Include="../../../../../../lib/net5.0/Glacier2.dll" /> + <Reference Include="../../../../../../lib/net5.0/IceGrid.dll" /> + <Reference Include="../../../../../../lib/net5.0/IceLocatorDiscovery.dll" /> + <Reference Include="../../../../../../lib/net5.0/IceDiscovery.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/IceGrid/simple/msbuild/server/net5.0/server.csproj b/csharp/test/IceGrid/simple/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..efae87887a6 --- /dev/null +++ b/csharp/test/IceGrid/simple/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="../../../TestI.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/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs index a86fdfa40b4..dba3b6a5f8e 100644 --- a/csharp/test/IceSSL/configuration/AllTests.cs +++ b/csharp/test/IceSSL/configuration/AllTests.cs @@ -16,9 +16,6 @@ using System.Threading; public class AllTests { - private static bool IsCatalinaOrGreater = - IceInternal.AssemblyUtil.isMacOS && Environment.OSVersion.Version.Major >= 19; - private static void test(bool b) { if(!b) @@ -591,7 +588,7 @@ public class AllTests catch(Ice.LocalException ex) { // - // macOS catalina does not check the certificate common name + // macOS catalina or greater does not check the certificate common name // if(!IceInternal.AssemblyUtil.isMacOS) { @@ -648,7 +645,7 @@ public class AllTests catch(Ice.LocalException) { // macOS >= Catalina requires a DNS altName. DNS name as the Common Name is not trusted - test(IsCatalinaOrGreater); + test(IceInternal.AssemblyUtil.isMacOS); } fact.destroyServer(server); comm.destroy(); @@ -784,7 +781,7 @@ public class AllTests catch(Ice.SecurityException ex) { // - // macOS catalina does not check the certificate common name + // macOS catalina or greater does not check the certificate common name // if(!IceInternal.AssemblyUtil.isMacOS) { diff --git a/csharp/test/IceSSL/configuration/msbuild/client/net5.0/client.csproj b/csharp/test/IceSSL/configuration/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..06f787d2c91 --- /dev/null +++ b/csharp/test/IceSSL/configuration/msbuild/client/net5.0/client.csproj @@ -0,0 +1,39 @@ +<?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="../../../CertificateVerifierI.cs" /> + <Compile Include="../../../PasswordCallbackI.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" /> + <Reference Include="../../../../../../lib/net5.0/IceSSL.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/IceSSL/configuration/msbuild/server/net5.0/server.csproj b/csharp/test/IceSSL/configuration/msbuild/server/net5.0/server.csproj new file mode 100644 index 00000000000..d12121766d5 --- /dev/null +++ b/csharp/test/IceSSL/configuration/msbuild/server/net5.0/server.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>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="../../../TestI.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" /> + <Reference Include="../../../../../../lib/net5.0/IceSSL.dll" /> + </ItemGroup> + </Otherwise> + </Choose> +</Project> diff --git a/csharp/test/IceUtil/inputUtil/msbuild/client/net5.0/client.csproj b/csharp/test/IceUtil/inputUtil/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..3950f80a72f --- /dev/null +++ b/csharp/test/IceUtil/inputUtil/msbuild/client/net5.0/client.csproj @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<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="../../../Client.cs"/> + </ItemGroup> + <ItemGroup> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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/Slice/escape/msbuild/client/net5.0/client.csproj b/csharp/test/Slice/escape/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..443c741abac --- /dev/null +++ b/csharp/test/Slice/escape/msbuild/client/net5.0/client.csproj @@ -0,0 +1,39 @@ +<?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="../../../Client.cs" /> + <Compile Include="generated\Clash.cs"> + <SliceCompileSource>../../../Clash.ice</SliceCompileSource> + </Compile> + <Compile Include="generated\Key.cs"> + <SliceCompileSource>../../../Key.ice</SliceCompileSource> + </Compile> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> + <SliceCompile Include="../../../Clash.ice" /> + <SliceCompile Include="../../../Key.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/Slice/macros/msbuild/client/net5.0/client.csproj b/csharp/test/Slice/macros/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..c54397ec28c --- /dev/null +++ b/csharp/test/Slice/macros/msbuild/client/net5.0/client.csproj @@ -0,0 +1,35 @@ +<?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="../../../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/Slice/structure/msbuild/client/net5.0/client.csproj b/csharp/test/Slice/structure/msbuild/client/net5.0/client.csproj new file mode 100644 index 00000000000..c54397ec28c --- /dev/null +++ b/csharp/test/Slice/structure/msbuild/client/net5.0/client.csproj @@ -0,0 +1,35 @@ +<?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="../../../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/TestCommon/msbuild/testcommon/net5.0/testcommon.csproj b/csharp/test/TestCommon/msbuild/testcommon/net5.0/testcommon.csproj new file mode 100644 index 00000000000..ee3900fdff3 --- /dev/null +++ b/csharp/test/TestCommon/msbuild/testcommon/net5.0/testcommon.csproj @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="..\..\..\..\..\msbuild\ice.common.props"/> + <PropertyGroup> + <AssemblyName>TestCommon</AssemblyName> + <TargetFramework>net5.0</TargetFramework> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <OutputPath>.</OutputPath> + <UseAppHost>true</UseAppHost> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="../../../TestHelper.cs"/> + <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> + </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\Ice.dll"/> + </ItemGroup> + </Otherwise> + </Choose> +</Project> |