diff options
166 files changed, 498 insertions, 126 deletions
diff --git a/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj b/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj index c224fc588fa..fe8429ebd78 100644 --- a/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj +++ b/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj @@ -3,12 +3,14 @@ <Import Project="../../../../../msbuild/ice.common.props" /> <PropertyGroup> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <AssemblyName>iceboxnet</AssemblyName> <Version>$(IceVersion)</Version> <OutputPath>../../../../../bin</OutputPath> <TargetFramework>$(AppTargetFramework)</TargetFramework> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AssemblyInfoExe.cs" /> <Compile Include="../../../Server.cs" /> diff --git a/csharp/test/Glacier2/application/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Glacier2/application/msbuild/client/netstandard2.0/client.csproj index 0c4a86df9c8..3c5ec201136 100644 --- a/csharp/test/Glacier2/application/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Glacier2/application/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../CallbackI.cs" /> diff --git a/csharp/test/Glacier2/application/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Glacier2/application/msbuild/server/netstandard2.0/server.csproj index a2b946ce7a6..b6351e3742a 100644 --- a/csharp/test/Glacier2/application/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Glacier2/application/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../CallbackI.cs" /> diff --git a/csharp/test/Glacier2/router/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Glacier2/router/msbuild/client/netstandard2.0/client.csproj index 0c4a86df9c8..3c5ec201136 100644 --- a/csharp/test/Glacier2/router/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Glacier2/router/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../CallbackI.cs" /> diff --git a/csharp/test/Glacier2/router/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Glacier2/router/msbuild/server/netstandard2.0/server.csproj index a2b946ce7a6..b6351e3742a 100644 --- a/csharp/test/Glacier2/router/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Glacier2/router/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../CallbackI.cs" /> diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/client/netstandard2.0/client.csproj index 0c4a86df9c8..3c5ec201136 100644 --- a/csharp/test/Glacier2/sessionHelper/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Glacier2/sessionHelper/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../CallbackI.cs" /> diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/server/netstandard2.0/server.csproj index a2b946ce7a6..b6351e3742a 100644 --- a/csharp/test/Glacier2/sessionHelper/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Glacier2/sessionHelper/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../CallbackI.cs" /> diff --git a/csharp/test/Ice/acm/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/acm/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/acm/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/acm/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/acm/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/acm/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/Ice/acm/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/acm/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/acm/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/acm/msbuild/test/netstandard2.0/test.csproj index 8c6fb341085..7b5ce6e8cc3 100644 --- a/csharp/test/Ice/acm/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/acm/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/client/netstandard2.0/client.csproj index 6613727f153..ec426402b2a 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/client/netstandard2.0/client.csproj @@ -4,13 +4,15 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <IceBuilderOutputDir>generated</IceBuilderOutputDir> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/netstandard2.0/collocated.csproj index 27224a956d3..36db9727307 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/server/netstandard2.0/server.csproj index 3f0923fed25..d7a2ec87082 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/test/netstandard2.0/test.csproj index 257d065b87e..a21e5158203 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/admin/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/admin/msbuild/client/netstandard2.0/client.csproj index 91d952d6622..7de010109cf 100644 --- a/csharp/test/Ice/admin/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/admin/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/admin/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/admin/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/Ice/admin/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/admin/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/admin/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/admin/msbuild/test/netstandard2.0/test.csproj index b433073214c..06836059a96 100644 --- a/csharp/test/Ice/admin/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/admin/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/ami/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/ami/msbuild/client/netstandard2.0/client.csproj index 2ac83152161..e96e1ea30ea 100644 --- a/csharp/test/Ice/ami/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/ami/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/ami/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/ami/msbuild/collocated/netstandard2.0/collocated.csproj index cc78b387da9..407bbdd9224 100644 --- a/csharp/test/Ice/ami/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/ami/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/ami/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/ami/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/Ice/ami/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/ami/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/ami/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/ami/msbuild/test/netstandard2.0/test.csproj index f044aaa986a..2c1584f22b8 100644 --- a/csharp/test/Ice/ami/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/ami/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/application/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/application/msbuild/client/netstandard2.0/client.csproj index 22c021fa259..ab5cdaa390d 100644 --- a/csharp/test/Ice/application/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/application/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs"/> <Compile Include="../../../Client.cs"/> diff --git a/csharp/test/Ice/assemblies/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/assemblies/msbuild/client/netstandard2.0/client.csproj index 23def126f99..f40044768bc 100644 --- a/csharp/test/Ice/assemblies/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/assemblies/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs"/> <Compile Include="../../../Client.cs"/> diff --git a/csharp/test/Ice/assemblies/msbuild/user/netstandard2.0/user.csproj b/csharp/test/Ice/assemblies/msbuild/user/netstandard2.0/user.csproj index 48c48c79b85..9944b278a82 100644 --- a/csharp/test/Ice/assemblies/msbuild/user/netstandard2.0/user.csproj +++ b/csharp/test/Ice/assemblies/msbuild/user/netstandard2.0/user.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup> <SliceCompile> <IncludeDirectories>../../..</IncludeDirectories> diff --git a/csharp/test/Ice/background/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/background/msbuild/client/netstandard2.0/client.csproj index 3f6c38bed28..46bd320c52b 100644 --- a/csharp/test/Ice/background/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/background/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Acceptor.cs" /> diff --git a/csharp/test/Ice/background/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/background/msbuild/server/netstandard2.0/server.csproj index 060f6b297b5..178fe8bc966 100644 --- a/csharp/test/Ice/background/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/background/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Acceptor.cs" /> diff --git a/csharp/test/Ice/binding/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/binding/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/binding/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/binding/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/binding/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/binding/msbuild/server/netstandard2.0/server.csproj index ab4b2eb67a1..0e8e016f5f7 100644 --- a/csharp/test/Ice/binding/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/binding/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/binding/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/binding/msbuild/test/netstandard2.0/test.csproj index 96eecb11a1f..49d1ef528e2 100644 --- a/csharp/test/Ice/binding/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/binding/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj index c7284ad166f..ecfbae6cbb2 100644 --- a/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup Label="IceBuilder"> <SliceCompile> <AdditionalOptions>--checksum</AdditionalOptions> diff --git a/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj index fe7b0c224e8..80bc46ab9af 100644 --- a/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup Label="IceBuilder"> <SliceCompile> <AdditionalOptions>--checksum</AdditionalOptions> diff --git a/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj index 281caf9c03f..7fa0e9dbf6b 100644 --- a/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/defaultServant/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/defaultServant/msbuild/client/netstandard2.0/client.csproj index 566a5e66039..72837ac30a9 100644 --- a/csharp/test/Ice/defaultServant/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/defaultServant/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/defaultServant/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/defaultServant/msbuild/test/netstandard2.0/test.csproj index 07fe2f38510..0bdd0589ec9 100644 --- a/csharp/test/Ice/defaultServant/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/defaultServant/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/defaultValue/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/defaultValue/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/defaultValue/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/defaultValue/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/defaultValue/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/defaultValue/msbuild/test/netstandard2.0/test.csproj index ab17d126152..7f191d41554 100644 --- a/csharp/test/Ice/defaultValue/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/defaultValue/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/dictMapping/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/dictMapping/msbuild/client/netstandard2.0/client.csproj index ba9ec77a4bd..bed4baa2ba6 100644 --- a/csharp/test/Ice/dictMapping/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/dictMapping/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/dictMapping/msbuild/collocated/netstandard2.0/collocated.csproj index 88853229d2a..1b91f277541 100644 --- a/csharp/test/Ice/dictMapping/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/dictMapping/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/dictMapping/msbuild/server/netstandard2.0/server.csproj index 82b1c71556e..3577dfe2cb6 100644 --- a/csharp/test/Ice/dictMapping/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MyClassI.cs" /> diff --git a/csharp/test/Ice/dictMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/dictMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj index 7e33cf109a6..2089d99eb81 100644 --- a/csharp/test/Ice/dictMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MyClassAMDI.cs" /> diff --git a/csharp/test/Ice/dictMapping/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/dictMapping/msbuild/test/netstandard2.0/test.csproj index d5ff3fb5fed..248ff1755fc 100644 --- a/csharp/test/Ice/dictMapping/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/dispatcher/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/dispatcher/msbuild/client/netstandard2.0/client.csproj index 9075de83b34..5a1daacb632 100644 --- a/csharp/test/Ice/dispatcher/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/dispatcher/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/dispatcher/msbuild/collocated/netstandard2.0/collocated.csproj index 12ef0370819..aab124ab156 100644 --- a/csharp/test/Ice/dispatcher/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/dispatcher/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/dispatcher/msbuild/server/netstandard2.0/server.csproj index f9f7a3891be..0365c3c3e75 100644 --- a/csharp/test/Ice/dispatcher/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/echo/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/echo/msbuild/server/netstandard2.0/server.csproj index 5ed123e0eea..404e631d258 100644 --- a/csharp/test/Ice/echo/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/echo/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../BlobjectI.cs" /> diff --git a/csharp/test/Ice/enums/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/enums/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/enums/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/enums/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/enums/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/enums/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/Ice/enums/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/enums/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/enums/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/enums/msbuild/test/netstandard2.0/test.csproj index b3a4c90e3c0..b7da5f5da9e 100644 --- a/csharp/test/Ice/enums/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/enums/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/exceptions/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/exceptions/msbuild/client/netstandard2.0/client.csproj index 0aebe264748..e3e8e2f3fb1 100644 --- a/csharp/test/Ice/exceptions/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/exceptions/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/exceptions/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/exceptions/msbuild/collocated/netstandard2.0/collocated.csproj index a92f1017e57..e3bfe89e154 100644 --- a/csharp/test/Ice/exceptions/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/exceptions/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/exceptions/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/exceptions/msbuild/server/netstandard2.0/server.csproj index 64a141187f0..548aa670186 100644 --- a/csharp/test/Ice/exceptions/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/exceptions/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../ThrowerI.cs" /> diff --git a/csharp/test/Ice/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj index cf5952fb58e..509caeaa8dc 100644 --- a/csharp/test/Ice/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../ThrowerAMDI.cs" /> diff --git a/csharp/test/Ice/exceptions/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/exceptions/msbuild/test/netstandard2.0/test.csproj index d4660210931..4e0722c9ac6 100644 --- a/csharp/test/Ice/exceptions/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/exceptions/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/facets/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/facets/msbuild/client/netstandard2.0/client.csproj index ef6afbd4385..a1d02995abf 100644 --- a/csharp/test/Ice/facets/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/facets/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/facets/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/facets/msbuild/collocated/netstandard2.0/collocated.csproj index 900f8d090b2..49b82a12580 100644 --- a/csharp/test/Ice/facets/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/facets/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/facets/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/facets/msbuild/server/netstandard2.0/server.csproj index 67e1f4742a6..dbc1adfe261 100644 --- a/csharp/test/Ice/facets/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/facets/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AI.cs" /> diff --git a/csharp/test/Ice/facets/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/facets/msbuild/test/netstandard2.0/test.csproj index e42f9d06b5e..ea0e53ac47b 100644 --- a/csharp/test/Ice/facets/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/facets/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/faultTolerance/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/faultTolerance/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/faultTolerance/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/faultTolerance/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/faultTolerance/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/faultTolerance/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/Ice/faultTolerance/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/faultTolerance/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/hash/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/hash/msbuild/client/netstandard2.0/client.csproj index a94b22a7359..21647cfbe63 100644 --- a/csharp/test/Ice/hash/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/hash/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/hold/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/hold/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/hold/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/hold/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/hold/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/hold/msbuild/server/netstandard2.0/server.csproj index 59a84f88e08..caebb4d3800 100644 --- a/csharp/test/Ice/hold/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/hold/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../HoldI.cs" /> diff --git a/csharp/test/Ice/hold/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/hold/msbuild/test/netstandard2.0/test.csproj index f00ae9f20e4..7ad3445f5df 100644 --- a/csharp/test/Ice/hold/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/hold/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/info/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/info/msbuild/client/netstandard2.0/client.csproj index 47f4a1c3d9b..eeb8bdcf694 100644 --- a/csharp/test/Ice/info/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/info/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/info/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/info/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/Ice/info/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/info/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/info/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/info/msbuild/test/netstandard2.0/test.csproj index a6a6e513446..50258ededad 100644 --- a/csharp/test/Ice/info/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/info/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/inheritance/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/inheritance/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/inheritance/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/inheritance/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/inheritance/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/inheritance/msbuild/collocated/netstandard2.0/collocated.csproj index 1df9a7902a2..2aabca37f9d 100644 --- a/csharp/test/Ice/inheritance/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/inheritance/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/inheritance/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/inheritance/msbuild/server/netstandard2.0/server.csproj index afacb6a221e..db37c1f6d33 100644 --- a/csharp/test/Ice/inheritance/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/inheritance/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../CAI.cs" /> diff --git a/csharp/test/Ice/inheritance/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/inheritance/msbuild/test/netstandard2.0/test.csproj index d15f60e75ae..0aa3e717479 100644 --- a/csharp/test/Ice/inheritance/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/inheritance/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../CAI.cs" /> diff --git a/csharp/test/Ice/interceptor/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/interceptor/msbuild/client/netstandard2.0/client.csproj index 2051dd35bdf..0edee30cdbc 100644 --- a/csharp/test/Ice/interceptor/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/interceptor/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../InterceptorI.cs" /> diff --git a/csharp/test/Ice/interceptor/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/interceptor/msbuild/test/netstandard2.0/test.csproj index 15bed33e88c..38144cce92f 100644 --- a/csharp/test/Ice/interceptor/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/interceptor/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../Client.cs" /> <Compile Include="../../../InterceptorI.cs" /> diff --git a/csharp/test/Ice/invoke/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/invoke/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/invoke/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/invoke/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/invoke/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/invoke/msbuild/server/netstandard2.0/server.csproj index 5ed123e0eea..404e631d258 100644 --- a/csharp/test/Ice/invoke/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/invoke/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../BlobjectI.cs" /> diff --git a/csharp/test/Ice/invoke/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/invoke/msbuild/test/netstandard2.0/test.csproj index 7287c3739b8..8021adaec28 100644 --- a/csharp/test/Ice/invoke/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/invoke/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../BlobjectI.cs" /> diff --git a/csharp/test/Ice/location/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/location/msbuild/client/netstandard2.0/client.csproj index 7fa0aa56a6d..8062b72238d 100644 --- a/csharp/test/Ice/location/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/location/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/location/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/location/msbuild/server/netstandard2.0/server.csproj index 63ceb4e74c9..9ef4a3c8c0f 100644 --- a/csharp/test/Ice/location/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/location/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../HelloI.cs" /> diff --git a/csharp/test/Ice/location/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/location/msbuild/test/netstandard2.0/test.csproj index 22db7dc776f..d3e97660d5d 100644 --- a/csharp/test/Ice/location/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/location/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/logger/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/logger/msbuild/client/netstandard2.0/client.csproj index 22c021fa259..ab5cdaa390d 100644 --- a/csharp/test/Ice/logger/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/logger/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs"/> <Compile Include="../../../Client.cs"/> diff --git a/csharp/test/Ice/metrics/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/metrics/msbuild/client/netstandard2.0/client.csproj index 232fd7812a3..9ee2cd188ab 100644 --- a/csharp/test/Ice/metrics/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/metrics/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/metrics/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/metrics/msbuild/collocated/netstandard2.0/collocated.csproj index d1b830f082a..df56b8e5598 100644 --- a/csharp/test/Ice/metrics/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/metrics/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/metrics/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/metrics/msbuild/server/netstandard2.0/server.csproj index ebf6220c89d..fbfb88f7cf6 100644 --- a/csharp/test/Ice/metrics/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/metrics/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MetricsI.cs" /> diff --git a/csharp/test/Ice/metrics/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/metrics/msbuild/serveramd/netstandard2.0/serveramd.csproj index 3245c04db2f..e7887b92c23 100644 --- a/csharp/test/Ice/metrics/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/metrics/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MetricsAMDI.cs" /> diff --git a/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj index dddb5f8ae72..43741fb7282 100644 --- a/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <NoWarn>1701;1702;3005</NoWarn> </PropertyGroup> diff --git a/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj index bd338484c38..5936d4e3094 100644 --- a/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <NoWarn>1701;1702;3005</NoWarn> </PropertyGroup> diff --git a/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj index 6203aed186e..a6d9da9a0bd 100644 --- a/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup Label="IceBuilder"> <SliceCompile> <OutputDir>$(MSBuildProjectDirectory)\generated</OutputDir> diff --git a/csharp/test/Ice/networkProxy/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/networkProxy/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/networkProxy/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/networkProxy/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/networkProxy/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/networkProxy/msbuild/server/netstandard2.0/server.csproj index 0a1214534b1..899bb6ebe7d 100644 --- a/csharp/test/Ice/networkProxy/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/networkProxy/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Server.cs" /> diff --git a/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj index 88f1fb3f141..9e55ebf68a8 100644 --- a/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj index b3d4933d70d..b6f80a27f76 100644 --- a/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj index 74278ad2f45..9b293d3029c 100644 --- a/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../BI.cs" /> diff --git a/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj index 576e8c61224..c10391b92d9 100644 --- a/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../Client.cs" /> <Compile Include="../../../Collocated.cs" /> diff --git a/csharp/test/Ice/operations/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/operations/msbuild/client/netstandard2.0/client.csproj index fca607d1e73..e7362a5cd63 100644 --- a/csharp/test/Ice/operations/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/operations/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/operations/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/operations/msbuild/collocated/netstandard2.0/collocated.csproj index 5d4e9f1db4e..53b31f10547 100644 --- a/csharp/test/Ice/operations/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/operations/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/operations/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/operations/msbuild/server/netstandard2.0/server.csproj index d338f14349f..5c49dae6121 100644 --- a/csharp/test/Ice/operations/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/operations/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MyDerivedClassI.cs" /> diff --git a/csharp/test/Ice/operations/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/operations/msbuild/serveramd/netstandard2.0/serveramd.csproj index 5b4850a83e8..6d9e2c337b6 100644 --- a/csharp/test/Ice/operations/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/operations/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MyDerivedClassAMDI.cs" /> diff --git a/csharp/test/Ice/operations/msbuild/serveramdtie/netstandard2.0/serveramdtie.csproj b/csharp/test/Ice/operations/msbuild/serveramdtie/netstandard2.0/serveramdtie.csproj index 73e3b4c796d..721d70f3d5b 100644 --- a/csharp/test/Ice/operations/msbuild/serveramdtie/netstandard2.0/serveramdtie.csproj +++ b/csharp/test/Ice/operations/msbuild/serveramdtie/netstandard2.0/serveramdtie.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramdtie</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MyDerivedClassAMDTieI.cs" /> diff --git a/csharp/test/Ice/operations/msbuild/servertie/netstandard2.0/servertie.csproj b/csharp/test/Ice/operations/msbuild/servertie/netstandard2.0/servertie.csproj index 439758ae0df..5311009f435 100644 --- a/csharp/test/Ice/operations/msbuild/servertie/netstandard2.0/servertie.csproj +++ b/csharp/test/Ice/operations/msbuild/servertie/netstandard2.0/servertie.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>servertie</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MyDerivedClassTieI.cs" /> diff --git a/csharp/test/Ice/operations/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/operations/msbuild/test/netstandard2.0/test.csproj index 8fd5d3828b0..6552faf2141 100644 --- a/csharp/test/Ice/operations/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/operations/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/optional/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/optional/msbuild/client/netstandard2.0/client.csproj index bc67b66ec4c..a6ab4e39f7e 100644 --- a/csharp/test/Ice/optional/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/optional/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/optional/msbuild/serializable/netstandard2.0/serializable.csproj b/csharp/test/Ice/optional/msbuild/serializable/netstandard2.0/serializable.csproj index 7d411cc7785..98ffff31cf6 100644 --- a/csharp/test/Ice/optional/msbuild/serializable/netstandard2.0/serializable.csproj +++ b/csharp/test/Ice/optional/msbuild/serializable/netstandard2.0/serializable.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../SerializableClass.cs"/> </ItemGroup> diff --git a/csharp/test/Ice/optional/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/optional/msbuild/server/netstandard2.0/server.csproj index 5675d6d5ed8..fc76a9a9ca7 100644 --- a/csharp/test/Ice/optional/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/optional/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/optional/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/optional/msbuild/serveramd/netstandard2.0/serveramd.csproj index 17b67df1c53..81fc88d8163 100644 --- a/csharp/test/Ice/optional/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/optional/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestAMDI.cs" /> diff --git a/csharp/test/Ice/optional/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/optional/msbuild/test/netstandard2.0/test.csproj index 61774fe7f8a..1078ae85077 100644 --- a/csharp/test/Ice/optional/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/optional/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/plugin/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/plugin/msbuild/client/netstandard2.0/client.csproj index 22c021fa259..ab5cdaa390d 100644 --- a/csharp/test/Ice/plugin/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/plugin/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs"/> <Compile Include="../../../Client.cs"/> diff --git a/csharp/test/Ice/plugin/msbuild/plugin/netstandard2.0/plugin.csproj b/csharp/test/Ice/plugin/msbuild/plugin/netstandard2.0/plugin.csproj index a5a7aaab0b7..2f94742fe72 100644 --- a/csharp/test/Ice/plugin/msbuild/plugin/netstandard2.0/plugin.csproj +++ b/csharp/test/Ice/plugin/msbuild/plugin/netstandard2.0/plugin.csproj @@ -9,6 +9,9 @@ <DefineConstants Condition="'$(Configuration)' == 'Debug'">DEBUG;$(DefineConstants)</DefineConstants> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../BasePlugin.cs"/> <Compile Include="../../../BasePluginFail.cs"/> diff --git a/csharp/test/Ice/properties/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/properties/msbuild/client/netstandard2.0/client.csproj index 22c021fa259..ab5cdaa390d 100644 --- a/csharp/test/Ice/properties/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/properties/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs"/> <Compile Include="../../../Client.cs"/> diff --git a/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj index 2f1bea008c2..9685ce03658 100644 --- a/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj index d338f14349f..5c49dae6121 100644 --- a/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MyDerivedClassI.cs" /> diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj index 5b4850a83e8..6d9e2c337b6 100644 --- a/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../MyDerivedClassAMDI.cs" /> diff --git a/csharp/test/Ice/proxy/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/proxy/msbuild/test/netstandard2.0/test.csproj index 7665a001c2f..f602bdcfc57 100644 --- a/csharp/test/Ice/proxy/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/proxy/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/retry/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/retry/msbuild/client/netstandard2.0/client.csproj index 0a4d6e34c5a..558b35f171f 100644 --- a/csharp/test/Ice/retry/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/retry/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/retry/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/retry/msbuild/collocated/netstandard2.0/collocated.csproj index a387b45a0c0..4f4cdbe3135 100644 --- a/csharp/test/Ice/retry/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/retry/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon\TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/retry/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/retry/msbuild/server/netstandard2.0/server.csproj index d507de44b6b..201f3e96ea9 100644 --- a/csharp/test/Ice/retry/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/retry/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../RetryI.cs" /> diff --git a/csharp/test/Ice/retry/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/retry/msbuild/test/netstandard2.0/test.csproj index 9743cb33970..124d670c953 100644 --- a/csharp/test/Ice/retry/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/retry/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/scope/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/scope/msbuild/client/netstandard2.0/client.csproj index 0b5db366555..cdb5ec40854 100644 --- a/csharp/test/Ice/scope/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/scope/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/scope/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/scope/msbuild/collocated/netstandard2.0/collocated.csproj index e1565077937..71da54db935 100644 --- a/csharp/test/Ice/scope/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/scope/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs"/> <Compile Include="../../../TestI.cs"/> diff --git a/csharp/test/Ice/scope/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/scope/msbuild/server/netstandard2.0/server.csproj index 2c4f68fad59..5c72c1e2e22 100644 --- a/csharp/test/Ice/scope/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/scope/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Server.cs" /> diff --git a/csharp/test/Ice/scope/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/scope/msbuild/test/netstandard2.0/test.csproj index 8fd139dd571..b284145ee69 100644 --- a/csharp/test/Ice/scope/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/scope/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj index cfd27a6fee5..e14a69838c3 100644 --- a/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj index 85192e3b06d..20d05c03bb5 100644 --- a/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj b/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj index 6718ae17a3c..e743db218d2 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../Serializable.cs"/> </ItemGroup> diff --git a/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj index 8670f1bf1e5..1f7c12a1f5b 100644 --- a/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Custom.cs" /> diff --git a/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj index 86b4cfd6991..607f3473538 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Custom.cs" /> diff --git a/csharp/test/Ice/seqMapping/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/seqMapping/msbuild/test/netstandard2.0/test.csproj index c9e786afc22..2996cbcfd69 100644 --- a/csharp/test/Ice/seqMapping/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/serialize/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/serialize/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/serialize/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/serialize/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/serialize/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/serialize/msbuild/test/netstandard2.0/test.csproj index 772a0318cba..a6ec604ca85 100644 --- a/csharp/test/Ice/serialize/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/serialize/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/servantLocator/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/servantLocator/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/servantLocator/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/servantLocator/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/servantLocator/msbuild/collocated/netstandard2.0/collocated.csproj index a32ecb5a112..61b7851bd64 100644 --- a/csharp/test/Ice/servantLocator/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/collocated/netstandard2.0/collocated.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>collocated</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/servantLocator/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/servantLocator/msbuild/server/netstandard2.0/server.csproj index 90b609156fc..4da0a4e60f7 100644 --- a/csharp/test/Ice/servantLocator/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/servantLocator/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/servantLocator/msbuild/serveramd/netstandard2.0/serveramd.csproj index 65c53f66e01..1b6633c232c 100644 --- a/csharp/test/Ice/servantLocator/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestAMDI.cs" /> diff --git a/csharp/test/Ice/servantLocator/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/servantLocator/msbuild/test/netstandard2.0/test.csproj index b8288761919..8b30a12ad75 100644 --- a/csharp/test/Ice/servantLocator/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj index ba2e6cda22f..699b8add77f 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup> <SliceCompile> <IncludeDirectories>../../..</IncludeDirectories> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj index 8901fb45bb9..3e83ed42536 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup> <SliceCompile> <IncludeDirectories>../../..</IncludeDirectories> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj index 37c33caa67c..6e60b64fa02 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup> <SliceCompile> <IncludeDirectories>../../..</IncludeDirectories> diff --git a/csharp/test/Ice/slicing/objects/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/slicing/objects/msbuild/client/netstandard2.0/client.csproj index ba2e6cda22f..699b8add77f 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup> <SliceCompile> <IncludeDirectories>../../..</IncludeDirectories> diff --git a/csharp/test/Ice/slicing/objects/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/slicing/objects/msbuild/server/netstandard2.0/server.csproj index 8901fb45bb9..3e83ed42536 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup> <SliceCompile> <IncludeDirectories>../../..</IncludeDirectories> diff --git a/csharp/test/Ice/slicing/objects/msbuild/serveramd/netstandard2.0/serveramd.csproj b/csharp/test/Ice/slicing/objects/msbuild/serveramd/netstandard2.0/serveramd.csproj index 37c33caa67c..6e60b64fa02 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/serveramd/netstandard2.0/serveramd.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/serveramd/netstandard2.0/serveramd.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>serveramd</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemDefinitionGroup> <SliceCompile> <IncludeDirectories>../../..</IncludeDirectories> diff --git a/csharp/test/Ice/stream/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/stream/msbuild/client/netstandard2.0/client.csproj index bc67b66ec4c..a6ab4e39f7e 100644 --- a/csharp/test/Ice/stream/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/stream/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/stream/msbuild/serializable/netstandard2.0/serializable.csproj b/csharp/test/Ice/stream/msbuild/serializable/netstandard2.0/serializable.csproj index 6718ae17a3c..e743db218d2 100644 --- a/csharp/test/Ice/stream/msbuild/serializable/netstandard2.0/serializable.csproj +++ b/csharp/test/Ice/stream/msbuild/serializable/netstandard2.0/serializable.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../Serializable.cs"/> </ItemGroup> diff --git a/csharp/test/Ice/stream/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/stream/msbuild/test/netstandard2.0/test.csproj index 130ef32b528..52dda4ae287 100644 --- a/csharp/test/Ice/stream/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/stream/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/client/netstandard2.0/client.csproj index a94b22a7359..21647cfbe63 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/server/netstandard2.0/server.csproj index d562ca660b8..738f496eee6 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../PriorityI.cs" /> diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/test/netstandard2.0/test.csproj index 011e6162f69..661369fe216 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../Client.cs" /> <Compile Include="../../../PriorityI.cs" /> diff --git a/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj index 91d952d6622..7de010109cf 100644 --- a/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj index 0ccc9e8ce82..5d8af53a36b 100644 --- a/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/udp/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/udp/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/Ice/udp/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/udp/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/Ice/udp/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/udp/msbuild/server/netstandard2.0/server.csproj index 94397b76103..25c8c5c7ad7 100644 --- a/csharp/test/Ice/udp/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/udp/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestIntfI.cs" /> diff --git a/csharp/test/Ice/udp/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/udp/msbuild/test/netstandard2.0/test.csproj index 48472d7a3d8..9177db3f85e 100644 --- a/csharp/test/Ice/udp/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/udp/msbuild/test/netstandard2.0/test.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/IceBox/admin/msbuild/client/netstandard2.0/client.csproj b/csharp/test/IceBox/admin/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/IceBox/admin/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/IceBox/admin/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/IceBox/admin/msbuild/testservice/netstandard2.0/testservice.csproj b/csharp/test/IceBox/admin/msbuild/testservice/netstandard2.0/testservice.csproj index 9bcacaf487f..b036107d44b 100644 --- a/csharp/test/IceBox/admin/msbuild/testservice/netstandard2.0/testservice.csproj +++ b/csharp/test/IceBox/admin/msbuild/testservice/netstandard2.0/testservice.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../TestI.cs" /> <Compile Include="../../../TestServiceI.cs" /> diff --git a/csharp/test/IceBox/configuration/msbuild/client/netstandard2.0/client.csproj b/csharp/test/IceBox/configuration/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/IceBox/configuration/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/IceBox/configuration/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/IceBox/configuration/msbuild/testservice/netstandard2.0/testservice.csproj b/csharp/test/IceBox/configuration/msbuild/testservice/netstandard2.0/testservice.csproj index 9bcacaf487f..b036107d44b 100644 --- a/csharp/test/IceBox/configuration/msbuild/testservice/netstandard2.0/testservice.csproj +++ b/csharp/test/IceBox/configuration/msbuild/testservice/netstandard2.0/testservice.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../TestI.cs" /> <Compile Include="../../../TestServiceI.cs" /> diff --git a/csharp/test/IceDiscovery/simple/msbuild/client/netstandard2.0/client.csproj b/csharp/test/IceDiscovery/simple/msbuild/client/netstandard2.0/client.csproj index 5c25b94b949..b6eeed2c0f2 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/IceDiscovery/simple/msbuild/server/netstandard2.0/server.csproj b/csharp/test/IceDiscovery/simple/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/IceGrid/simple/msbuild/client/netstandard2.0/client.csproj b/csharp/test/IceGrid/simple/msbuild/client/netstandard2.0/client.csproj index 8c659788eb8..0ca7f945db2 100644 --- a/csharp/test/IceGrid/simple/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/IceGrid/simple/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/IceGrid/simple/msbuild/server/netstandard2.0/server.csproj b/csharp/test/IceGrid/simple/msbuild/server/netstandard2.0/server.csproj index 05d2a42a7b5..9d0065ea3b3 100644 --- a/csharp/test/IceGrid/simple/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/IceGrid/simple/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj b/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj index 95bc33bb06f..26cc8266056 100644 --- a/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../AllTests.cs" /> diff --git a/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj b/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj index e17f03a6626..6e997bb9ace 100644 --- a/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>server</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../TestI.cs" /> diff --git a/csharp/test/IceUtil/inputUtil/msbuild/client/netstandard2.0/client.csproj b/csharp/test/IceUtil/inputUtil/msbuild/client/netstandard2.0/client.csproj index 22c021fa259..ab5cdaa390d 100644 --- a/csharp/test/IceUtil/inputUtil/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/IceUtil/inputUtil/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs"/> <Compile Include="../../../Client.cs"/> diff --git a/csharp/test/Slice/escape/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Slice/escape/msbuild/client/netstandard2.0/client.csproj index 843b921f061..9c20060cb71 100644 --- a/csharp/test/Slice/escape/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Slice/escape/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Slice/macros/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Slice/macros/msbuild/client/netstandard2.0/client.csproj index a94b22a7359..21647cfbe63 100644 --- a/csharp/test/Slice/macros/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Slice/macros/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/Slice/structure/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Slice/structure/msbuild/client/netstandard2.0/client.csproj index a94b22a7359..21647cfbe63 100644 --- a/csharp/test/Slice/structure/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Slice/structure/msbuild/client/netstandard2.0/client.csproj @@ -4,12 +4,14 @@ <PropertyGroup> <AssemblyName>client</AssemblyName> <OutputType>Exe</OutputType> - <UseAppHost>true</UseAppHost> <TargetFramework>$(AppTargetFramework)</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../../../TestCommon/TestHelper.cs" /> <Compile Include="../../../Client.cs" /> diff --git a/csharp/test/TestCommon/msbuild/testcommon/netstandard2.0/testcommon.csproj b/csharp/test/TestCommon/msbuild/testcommon/netstandard2.0/testcommon.csproj index 74bfdd4eed5..968a10ac63e 100644 --- a/csharp/test/TestCommon/msbuild/testcommon/netstandard2.0/testcommon.csproj +++ b/csharp/test/TestCommon/msbuild/testcommon/netstandard2.0/testcommon.csproj @@ -8,6 +8,9 @@ <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>.</OutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> + <UseAppHost>true</UseAppHost> + </PropertyGroup> <ItemGroup> <Compile Include="../../../TestHelper.cs"/> <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/> |