diff options
Diffstat (limited to 'csharp/test/Ice/inheritance')
26 files changed, 410 insertions, 280 deletions
diff --git a/csharp/test/Ice/inheritance/.depend.mak b/csharp/test/Ice/inheritance/.depend.mak deleted file mode 100644 index c84178e2d84..00000000000 --- a/csharp/test/Ice/inheritance/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.cs: \ - .\Test.ice diff --git a/csharp/test/Ice/inheritance/AllTests.cs b/csharp/test/Ice/inheritance/AllTests.cs index 2b224c64bf7..01f198da062 100644 --- a/csharp/test/Ice/inheritance/AllTests.cs +++ b/csharp/test/Ice/inheritance/AllTests.cs @@ -7,45 +7,27 @@ // // ********************************************************************** -using System; using Test; -#if SILVERLIGHT -using System.Windows.Controls; -#endif - -public class AllTests : TestCommon.TestApp -{ -#if SILVERLIGHT - public override Ice.InitializationData initData() - { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(); - initData.properties.setProperty("Ice.FactoryAssemblies", "inheritance,version=1.0.0.0"); - return initData; - } - - override - public void run(Ice.Communicator communicator) -#else - public static InitialPrx allTests(Ice.Communicator communicator) -#endif - +public class AllTests : TestCommon.AllTests +{ + public static InitialPrx allTests(TestCommon.Application app) { + Ice.Communicator communicator = app.communicator(); Write("testing stringToProxy... "); Flush(); - string ref_Renamed = "initial:default -p 12010"; + string ref_Renamed = "initial:" + app.getTestEndpoint(0); Ice.ObjectPrx @base = communicator.stringToProxy(ref_Renamed); test(@base != null); WriteLine("ok"); - + Write("testing checked cast... "); Flush(); InitialPrx initial = InitialPrxHelper.checkedCast(@base); test(initial != null); test(initial.Equals(@base)); WriteLine("ok"); - + Write("getting proxies for class hierarchy... "); Flush(); Test.MA.CAPrx ca = initial.caop(); @@ -59,7 +41,7 @@ public class AllTests : TestCommon.TestApp test(cb != cd); test(cc != cd); WriteLine("ok"); - + Write("getting proxies for interface hierarchy... "); Flush(); Test.MA.IAPrx ia = initial.iaop(); @@ -72,13 +54,13 @@ public class AllTests : TestCommon.TestApp test(ib1 != ic); test(ib2 != ic); WriteLine("ok"); - + Write("invoking proxy operations on class hierarchy... "); Flush(); Test.MA.CAPrx cao; Test.MB.CBPrx cbo; Test.MA.CCPrx cco; - + cao = ca.caop(ca); test(cao.Equals(ca)); cao = ca.caop(cb); @@ -97,7 +79,7 @@ public class AllTests : TestCommon.TestApp test(cao.Equals(cb)); cao = cc.caop(cc); test(cao.Equals(cc)); - + cao = cb.cbop(cb); test(cao.Equals(cb)); cbo = cb.cbop(cb); @@ -114,7 +96,7 @@ public class AllTests : TestCommon.TestApp test(cao.Equals(cc)); cbo = cc.cbop(cc); test(cbo.Equals(cc)); - + cao = cc.ccop(cc); test(cao.Equals(cc)); cbo = cc.ccop(cc); @@ -122,14 +104,14 @@ public class AllTests : TestCommon.TestApp cco = cc.ccop(cc); test(cco.Equals(cc)); WriteLine("ok"); - + Write("ditto, but for interface hierarchy... "); Flush(); Test.MA.IAPrx iao; Test.MB.IB1Prx ib1o; Test.MB.IB2Prx ib2o; Test.MA.ICPrx ico; - + iao = ia.iaop(ia); test(iao.Equals(ia)); iao = ia.iaop(ib1); @@ -162,7 +144,7 @@ public class AllTests : TestCommon.TestApp test(iao.Equals(ib2)); iao = ic.iaop(ic); test(iao.Equals(ic)); - + iao = ib1.ib1op(ib1); test(iao.Equals(ib1)); ib1o = ib1.ib1op(ib1); @@ -179,7 +161,7 @@ public class AllTests : TestCommon.TestApp test(iao.Equals(ic)); ib1o = ic.ib1op(ic); test(ib1o.Equals(ic)); - + iao = ib2.ib2op(ib2); test(iao.Equals(ib2)); ib2o = ib2.ib2op(ib2); @@ -196,7 +178,7 @@ public class AllTests : TestCommon.TestApp test(iao.Equals(ic)); ib2o = ic.ib2op(ic); test(ib2o.Equals(ic)); - + iao = ic.icop(ic); test(iao.Equals(ic)); ib1o = ic.icop(ic); @@ -206,31 +188,31 @@ public class AllTests : TestCommon.TestApp ico = ic.icop(ic); test(ico.Equals(ic)); WriteLine("ok"); - + Write("ditto, but for class implementing interfaces... "); Flush(); - + cao = cd.caop(cd); test(cao.Equals(cd)); cbo = cd.cbop(cd); test(cbo.Equals(cd)); cco = cd.ccop(cd); test(cco.Equals(cd)); - + iao = cd.iaop(cd); test(iao.Equals(cd)); ib1o = cd.ib1op(cd); test(ib1o.Equals(cd)); ib2o = cd.ib2op(cd); test(ib2o.Equals(cd)); - + cao = cd.cdop(cd); test(cao.Equals(cd)); cbo = cd.cdop(cd); test(cbo.Equals(cd)); cco = cd.cdop(cd); test(cco.Equals(cd)); - + iao = cd.cdop(cd); test(iao.Equals(cd)); ib1o = cd.cdop(cd); @@ -238,11 +220,6 @@ public class AllTests : TestCommon.TestApp ib2o = cd.cdop(cd); test(ib2o.Equals(cd)); WriteLine("ok"); - -#if SILVERLIGHT - initial.shutdown(); -#else return initial; -#endif } } diff --git a/csharp/test/Ice/inheritance/CAI.cs b/csharp/test/Ice/inheritance/CAI.cs index 44693a421be..1c5386f4dc1 100644 --- a/csharp/test/Ice/inheritance/CAI.cs +++ b/csharp/test/Ice/inheritance/CAI.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -public sealed class CAI : Test.MA.CA +public sealed class CAI : Test.MA.CADisp_ { public CAI() { diff --git a/csharp/test/Ice/inheritance/CBI.cs b/csharp/test/Ice/inheritance/CBI.cs index 9a9fb9c2f31..5ba21a910ff 100644 --- a/csharp/test/Ice/inheritance/CBI.cs +++ b/csharp/test/Ice/inheritance/CBI.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -public sealed class CBI : Test.MB.CB +public sealed class CBI : Test.MB.CBDisp_ { public CBI() { diff --git a/csharp/test/Ice/inheritance/CCI.cs b/csharp/test/Ice/inheritance/CCI.cs index 5d185ccc61a..722ba84cf18 100644 --- a/csharp/test/Ice/inheritance/CCI.cs +++ b/csharp/test/Ice/inheritance/CCI.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -public sealed class CCI : Test.MA.CC +public sealed class CCI : Test.MA.CCDisp_ { public CCI() { diff --git a/csharp/test/Ice/inheritance/CDI.cs b/csharp/test/Ice/inheritance/CDI.cs index 82da8c7f1b8..e9e253a7424 100644 --- a/csharp/test/Ice/inheritance/CDI.cs +++ b/csharp/test/Ice/inheritance/CDI.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -public sealed class CDI : Test.MA.CD +public sealed class CDI : Test.MA.CDDisp_ { public CDI() { diff --git a/csharp/test/Ice/inheritance/Client.cs b/csharp/test/Ice/inheritance/Client.cs index f22bf1784da..85d775b270e 100644 --- a/csharp/test/Ice/inheritance/Client.cs +++ b/csharp/test/Ice/inheritance/Client.cs @@ -9,7 +9,6 @@ using Test; using System; -using System.Diagnostics; using System.Reflection; [assembly: CLSCompliant(true)] @@ -18,53 +17,18 @@ using System.Reflection; [assembly: AssemblyDescription("Ice test")] [assembly: AssemblyCompany("ZeroC, Inc.")] -public class Client +public class Client : TestCommon.Application { - private static int run(string[] args, Ice.Communicator communicator) + public override int run(string[] args) { - InitialPrx initial = AllTests.allTests(communicator); + InitialPrx initial = AllTests.allTests(this); initial.shutdown(); return 0; } public static int Main(string[] args) { - int status = 0; - Ice.Communicator communicator = null; - - try - { - Ice.InitializationData data = new Ice.InitializationData(); -#if COMPACT - // - // When using Ice for .NET Compact Framework, we need to specify - // the assembly so that Ice can locate classes and exceptions. - // - data.properties = Ice.Util.createProperties(); - data.properties.setProperty("Ice.FactoryAssemblies", "client"); -#endif - communicator = Ice.Util.initialize(ref args, data); - status = run(args, communicator); - } - catch(System.Exception ex) - { - System.Console.Error.WriteLine(ex); - status = 1; - } - - if(communicator != null) - { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - System.Console.Error.WriteLine(ex); - status = 1; - } - } - - return status; + Client app = new Client(); + return app.runmain(args); } } diff --git a/csharp/test/Ice/inheritance/Collocated.cs b/csharp/test/Ice/inheritance/Collocated.cs index d3b7af839ca..e16594dd73a 100644 --- a/csharp/test/Ice/inheritance/Collocated.cs +++ b/csharp/test/Ice/inheritance/Collocated.cs @@ -17,47 +17,21 @@ using System.Reflection; [assembly: AssemblyDescription("Ice test")] [assembly: AssemblyCompany("ZeroC, Inc.")] -public class Collocated +public class Collocated : TestCommon.Application { - private static int run(string[] args, Ice.Communicator communicator) + public override int run(string[] args) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); - Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); + communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.Object obj = new InitialI(adapter); - adapter.add(obj, communicator.stringToIdentity("initial")); - AllTests.allTests(communicator); + adapter.add(obj, Ice.Util.stringToIdentity("initial")); + AllTests.allTests(this); return 0; } public static int Main(string[] args) { - int status = 0; - Ice.Communicator communicator = null; - - try - { - communicator = Ice.Util.initialize(ref args); - status = run(args, communicator); - } - catch(System.Exception ex) - { - System.Console.WriteLine(ex); - status = 1; - } - - if(communicator != null) - { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - System.Console.WriteLine(ex); - status = 1; - } - } - - return status; + Collocated app = new Collocated(); + return app.runmain(args); } } diff --git a/csharp/test/Ice/inheritance/Makefile b/csharp/test/Ice/inheritance/Makefile deleted file mode 100644 index 9a05215d47f..00000000000 --- a/csharp/test/Ice/inheritance/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = client.exe server.exe collocated.exe - -C_SRCS = AllTests.cs Client.cs ../../TestCommon/TestApp.cs -S_SRCS = CAI.cs CBI.cs CCI.cs CDI.cs IAI.cs IB1I.cs IB2I.cs ICI.cs InitialI.cs Server.cs -COL_SRCS = AllTests.cs CAI.cs CBI.cs CCI.cs CDI.cs Collocated.cs IAI.cs IB1I.cs IB2I.cs ICI.cs InitialI.cs \ - ../../TestCommon/TestApp.cs - -SLICE_SRCS = $(SDIR)/Test.ice - -SDIR = . - -GDIR = generated - -include $(top_srcdir)/config/Make.rules.cs - -MCSFLAGS := $(MCSFLAGS) -target:exe - -SLICE2CSFLAGS := $(SLICE2CSFLAGS) -I. - -client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) $(subst /,$(DSEP),$^) - -server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) $(subst /,$(DSEP),$^) - -collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) $(subst /,$(DSEP),$^) diff --git a/csharp/test/Ice/inheritance/Makefile.mak b/csharp/test/Ice/inheritance/Makefile.mak deleted file mode 100644 index dd9fccbedba..00000000000 --- a/csharp/test/Ice/inheritance/Makefile.mak +++ /dev/null @@ -1,37 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = client.exe server.exe collocated.exe - -C_SRCS = AllTests.cs Client.cs ..\..\TestCommon\TestApp.cs -S_SRCS = CAI.cs CBI.cs CCI.cs CDI.cs IAI.cs IB1I.cs IB2I.cs ICI.cs InitialI.cs Server.cs -COL_SRCS = AllTests.cs CAI.cs CBI.cs CCI.cs CDI.cs Collocated.cs IAI.cs IB1I.cs IB2I.cs ICI.cs InitialI.cs ..\..\TestCommon\TestApp.cs - -GEN_SRCS = $(GDIR)\Test.cs - -SDIR = . - -GDIR = generated - -!include $(top_srcdir)\config\Make.rules.mak.cs - -MCSFLAGS = $(MCSFLAGS) -target:exe - -SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. - -client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" $(C_SRCS) $(GEN_SRCS) - -server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" $(S_SRCS) $(GEN_SRCS) - -collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" $(COL_SRCS) $(GEN_SRCS) diff --git a/csharp/test/Ice/inheritance/Server.cs b/csharp/test/Ice/inheritance/Server.cs index 6cade271950..d97e3023350 100644 --- a/csharp/test/Ice/inheritance/Server.cs +++ b/csharp/test/Ice/inheritance/Server.cs @@ -8,7 +8,6 @@ // ********************************************************************** using System; -using System.Diagnostics; using System.Reflection; [assembly: CLSCompliant(true)] @@ -17,48 +16,22 @@ using System.Reflection; [assembly: AssemblyDescription("Ice test")] [assembly: AssemblyCompany("ZeroC, Inc.")] -public class Server +public class Server : TestCommon.Application { - private static int run(string[] args, Ice.Communicator communicator) + public override int run(string[] args) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); - Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); + communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); - adapter.add(@object, communicator.stringToIdentity("initial")); + adapter.add(@object, Ice.Util.stringToIdentity("initial")); adapter.activate(); - communicator.waitForShutdown(); + communicator().waitForShutdown(); return 0; } public static int Main(string[] args) { - int status = 0; - Ice.Communicator communicator = null; - - try - { - communicator = Ice.Util.initialize(ref args); - status = run(args, communicator); - } - catch(System.Exception ex) - { - System.Console.Error.WriteLine(ex); - status = 1; - } - - if(communicator != null) - { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - System.Console.Error.WriteLine(ex); - status = 1; - } - } - - return status; + Server app = new Server(); + return app.runmain(args); } } diff --git a/csharp/test/Ice/inheritance/Test.ice b/csharp/test/Ice/inheritance/Test.ice index 84af3da3fd6..372dbcc414a 100644 --- a/csharp/test/Ice/inheritance/Test.ice +++ b/csharp/test/Ice/inheritance/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] // For classes with operations + module Test { diff --git a/csharp/test/Ice/inheritance/client.exe.config b/csharp/test/Ice/inheritance/client.exe.config deleted file mode 100755 index d3fa65b4563..00000000000 --- a/csharp/test/Ice/inheritance/client.exe.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<configuration> - <runtime> - <developmentMode developerInstallation="true"/> - </runtime> -</configuration> diff --git a/csharp/test/Ice/inheritance/collocated.exe.config b/csharp/test/Ice/inheritance/collocated.exe.config deleted file mode 100755 index d3fa65b4563..00000000000 --- a/csharp/test/Ice/inheritance/collocated.exe.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<configuration> - <runtime> - <developmentMode developerInstallation="true"/> - </runtime> -</configuration> diff --git a/csharp/test/Ice/inheritance/generated/.gitignore b/csharp/test/Ice/inheritance/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/csharp/test/Ice/inheritance/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/csharp/test/Ice/inheritance/msbuild/client/client.csproj b/csharp/test/Ice/inheritance/msbuild/client/client.csproj new file mode 100644 index 00000000000..63a590199e1 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/client/client.csproj @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(UseBinDist)' == 'yes'" /> + <PropertyGroup Label="Globals"> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> + <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> + <IceBuilderCsharpProps>$(IceBuilderInstallDir)\Resources\IceBuilder.CSharp.props</IceBuilderCsharpProps> + <IceBuilderCsharpTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.CSharp.targets</IceBuilderCsharpTargets> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{F514A26A-4176-49EB-ADC3-D3A80BEA98BB}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <AssemblyName>client</AssemblyName> + <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{3C53C28F-DC44-46B0-8B85-0C96B85B2042};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> + </PropertyGroup> + <ItemGroup> + <Reference Include="Ice, Version=3.7.54.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <HintPath>$(IceAssembliesDir)\Ice.dll</HintPath> + <SpecificVersion>False</SpecificVersion> + <Private>False</Private> + </Reference> + <Reference Include="IceSSL, Version=3.7.54.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <HintPath>$(IceAssembliesDir)\IceSSL.dll</HintPath> + <SpecificVersion>False</SpecificVersion> + <Private>False</Private> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="Microsoft.CSharp" /> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> + <ItemGroup> + <Compile Include="..\..\..\..\TestCommon\TestApp.cs"> + <Link>TestApp.cs</Link> + </Compile> + <Compile Include="..\..\AllTests.cs"> + <Link>AllTests.cs</Link> + </Compile> + <Compile Include="..\..\Client.cs"> + <Link>Client.cs</Link> + </Compile> + <Compile Include="generated\Test.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="client.exe.config" /> + <None Include="..\..\Test.ice"> + <Link>Test.ice</Link> + </None> + <None Include="packages.config" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> + <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> + <PropertyGroup Label="IceBuilder"> + <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> + </PropertyGroup> + <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> + <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('$(IceBuilderCSharpProps)')" Text="$(ErrorText)" /> + </Target> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/msbuild/client/client.exe.config b/csharp/test/Ice/inheritance/msbuild/client/client.exe.config new file mode 100644 index 00000000000..e515fe2bc95 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/client/client.exe.config @@ -0,0 +1,5 @@ +<configuration> + <runtime> + <developmentMode developerInstallation="true"/> + </runtime> +</configuration>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/msbuild/client/packages.config b/csharp/test/Ice/inheritance/msbuild/client/packages.config new file mode 100644 index 00000000000..e92a6bdbb98 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/client/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="zeroc.ice.net" version="3.7.0-alpha4" targetFramework="net452" /> +</packages>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj new file mode 100644 index 00000000000..cf6b180374d --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(UseBinDist)' == 'yes'" /> + <PropertyGroup Label="Globals"> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> + <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> + <IceBuilderCsharpProps>$(IceBuilderInstallDir)\Resources\IceBuilder.CSharp.props</IceBuilderCsharpProps> + <IceBuilderCsharpTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.CSharp.targets</IceBuilderCsharpTargets> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{9E579749-2125-408D-95C7-747819997CCB}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <AssemblyName>collocated</AssemblyName> + <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{3C53C28F-DC44-46B0-8B85-0C96B85B2042};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> + </PropertyGroup> + <ItemGroup> + <Reference Include="Ice, Version=3.7.54.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <HintPath>$(IceAssembliesDir)\Ice.dll</HintPath> + <SpecificVersion>False</SpecificVersion> + <Private>False</Private> + </Reference> + <Reference Include="IceSSL, Version=3.7.54.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <HintPath>$(IceAssembliesDir)\IceSSL.dll</HintPath> + <SpecificVersion>False</SpecificVersion> + <Private>False</Private> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="Microsoft.CSharp" /> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> + <ItemGroup> + <Compile Include="..\..\..\..\TestCommon\TestApp.cs"> + <Link>TestApp.cs</Link> + </Compile> + <Compile Include="..\..\AllTests.cs"> + <Link>AllTests.cs</Link> + </Compile> + <Compile Include="..\..\CAI.cs"> + <Link>CAI.cs</Link> + </Compile> + <Compile Include="..\..\CBI.cs"> + <Link>CBI.cs</Link> + </Compile> + <Compile Include="..\..\CCI.cs"> + <Link>CCI.cs</Link> + </Compile> + <Compile Include="..\..\CDI.cs"> + <Link>CDI.cs</Link> + </Compile> + <Compile Include="..\..\Collocated.cs"> + <Link>Collocated.cs</Link> + </Compile> + <Compile Include="..\..\IAI.cs"> + <Link>IAI.cs</Link> + </Compile> + <Compile Include="..\..\IB1I.cs"> + <Link>IB1I.cs</Link> + </Compile> + <Compile Include="..\..\IB2I.cs"> + <Link>IB2I.cs</Link> + </Compile> + <Compile Include="..\..\ICI.cs"> + <Link>ICI.cs</Link> + </Compile> + <Compile Include="..\..\InitialI.cs"> + <Link>InitialI.cs</Link> + </Compile> + <Compile Include="generated\Test.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="collocated.exe.config" /> + <None Include="..\..\Test.ice"> + <Link>Test.ice</Link> + </None> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include=".NETFramework,Version=v4.5.1"> + <Visible>False</Visible> + <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>false</Install> + </BootstrapperPackage> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> + <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> + <PropertyGroup Label="IceBuilder"> + <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> + </PropertyGroup> + <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> + <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('$(IceBuilderCSharpProps)')" Text="$(ErrorText)" /> + </Target> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/msbuild/collocated/collocated.exe.config b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.exe.config new file mode 100644 index 00000000000..e515fe2bc95 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.exe.config @@ -0,0 +1,5 @@ +<configuration> + <runtime> + <developmentMode developerInstallation="true"/> + </runtime> +</configuration>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/msbuild/collocated/packages.config b/csharp/test/Ice/inheritance/msbuild/collocated/packages.config new file mode 100644 index 00000000000..e92a6bdbb98 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/collocated/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="zeroc.ice.net" version="3.7.0-alpha4" targetFramework="net452" /> +</packages>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/msbuild/server/packages.config b/csharp/test/Ice/inheritance/msbuild/server/packages.config new file mode 100644 index 00000000000..e92a6bdbb98 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/server/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="zeroc.ice.net" version="3.7.0-alpha4" targetFramework="net452" /> +</packages>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/msbuild/server/server.csproj b/csharp/test/Ice/inheritance/msbuild/server/server.csproj new file mode 100644 index 00000000000..91ba6d1b398 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/server/server.csproj @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(UseBinDist)' == 'yes'" /> + <PropertyGroup Label="Globals"> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> + <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> + <IceBuilderCsharpProps>$(IceBuilderInstallDir)\Resources\IceBuilder.CSharp.props</IceBuilderCsharpProps> + <IceBuilderCsharpTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.CSharp.targets</IceBuilderCsharpTargets> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{4C587210-F8BF-4495-8548-B70053B94094}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <AssemblyName>server</AssemblyName> + <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{3C53C28F-DC44-46B0-8B85-0C96B85B2042};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + <PlatformTarget>x64</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'"> + <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> + <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Win32'"> + <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> + <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> + </PropertyGroup> + <ItemGroup> + <Reference Include="Ice, Version=3.7.54.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <HintPath>$(IceAssembliesDir)\Ice.dll</HintPath> + <SpecificVersion>False</SpecificVersion> + <Private>False</Private> + </Reference> + <Reference Include="IceSSL, Version=3.7.54.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <HintPath>$(IceAssembliesDir)\IceSSL.dll</HintPath> + <SpecificVersion>False</SpecificVersion> + <Private>False</Private> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="Microsoft.CSharp" /> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> + <ItemGroup> + <Compile Include="..\..\..\..\TestCommon\TestApp.cs"> + <Link>TestApp.cs</Link> + </Compile> + <Compile Include="..\..\CAI.cs"> + <Link>CAI.cs</Link> + </Compile> + <Compile Include="..\..\CBI.cs"> + <Link>CBI.cs</Link> + </Compile> + <Compile Include="..\..\CCI.cs"> + <Link>CCI.cs</Link> + </Compile> + <Compile Include="..\..\CDI.cs"> + <Link>CDI.cs</Link> + </Compile> + <Compile Include="..\..\IAI.cs"> + <Link>IAI.cs</Link> + </Compile> + <Compile Include="..\..\IB1I.cs"> + <Link>IB1I.cs</Link> + </Compile> + <Compile Include="..\..\IB2I.cs"> + <Link>IB2I.cs</Link> + </Compile> + <Compile Include="..\..\ICI.cs"> + <Link>ICI.cs</Link> + </Compile> + <Compile Include="..\..\InitialI.cs"> + <Link>InitialI.cs</Link> + </Compile> + <Compile Include="..\..\Server.cs"> + <Link>Server.cs</Link> + </Compile> + <Compile Include="generated\Test.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + <None Include="server.exe.config" /> + <None Include="..\..\Test.ice"> + <Link>Test.ice</Link> + </None> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> + <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> + <PropertyGroup Label="IceBuilder"> + <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> + </PropertyGroup> + <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> + <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('$(IceBuilderCSharpProps)')" Text="$(ErrorText)" /> + </Target> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha4\build\zeroc.ice.net.props'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/msbuild/server/server.exe.config b/csharp/test/Ice/inheritance/msbuild/server/server.exe.config new file mode 100644 index 00000000000..e515fe2bc95 --- /dev/null +++ b/csharp/test/Ice/inheritance/msbuild/server/server.exe.config @@ -0,0 +1,5 @@ +<configuration> + <runtime> + <developmentMode developerInstallation="true"/> + </runtime> +</configuration>
\ No newline at end of file diff --git a/csharp/test/Ice/inheritance/run.py b/csharp/test/Ice/inheritance/run.py deleted file mode 100755 index da399cbfd5a..00000000000 --- a/csharp/test/Ice/inheritance/run.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys, getopt - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() -TestUtil.collocatedTest() diff --git a/csharp/test/Ice/inheritance/server.exe.config b/csharp/test/Ice/inheritance/server.exe.config deleted file mode 100755 index d3fa65b4563..00000000000 --- a/csharp/test/Ice/inheritance/server.exe.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<configuration> - <runtime> - <developmentMode developerInstallation="true"/> - </runtime> -</configuration> |