diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2020-03-10 14:33:07 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2020-03-10 14:33:07 +0100 |
| commit | ca433f52a66cbd4dfe73b24a470232548ad8e3be (patch) | |
| tree | cc3b4d6c4b09625e2e98e562fb9c518dc4baa06d /csharp/test/Ice/proxy | |
| parent | Fixed C# exe projects to set <UseAppHost>true</UseAppHost> which is now disab... (diff) | |
| download | ice-ca433f52a66cbd4dfe73b24a470232548ad8e3be.tar.bz2 ice-ca433f52a66cbd4dfe73b24a470232548ad8e3be.tar.xz ice-ca433f52a66cbd4dfe73b24a470232548ad8e3be.zip | |
Fixed C# projects to set UseAppHost only with netcoreapp3.1
Diffstat (limited to 'csharp/test/Ice/proxy')
5 files changed, 15 insertions, 4 deletions
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" /> |