diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-10-18 12:01:54 -0400 |
|---|---|---|
| committer | Jose <pepone@users.noreply.github.com> | 2018-10-18 18:01:53 +0200 |
| commit | 456001e3e4dbb3f15396c0598b6ddb5436ac3a2a (patch) | |
| tree | facb9db494f91b066a1c0b5e29c371ec523a82e7 /csharp/test/xamarin/controller | |
| parent | Update Xamarin test instructions (diff) | |
| download | ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.tar.bz2 ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.tar.xz ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.zip | |
Rework cs:namespace implementation (fix issue #239) (#249)
* Rework the cs:namespace implementation
No longer rely on Ice.Packages. Fixes #239.
* Renamed Ice/packagemd to Ice/namespacemd (C#)
* Removed Ice.Package property from C# tests
* Switched to get-only attribute, fixed Xamarin test
Diffstat (limited to 'csharp/test/xamarin/controller')
| -rw-r--r-- | csharp/test/xamarin/controller/MainPage.xaml.cs | 8 | ||||
| -rw-r--r-- | csharp/test/xamarin/controller/controller.csproj | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/csharp/test/xamarin/controller/MainPage.xaml.cs b/csharp/test/xamarin/controller/MainPage.xaml.cs index bb34df2be02..279c01a98f8 100644 --- a/csharp/test/xamarin/controller/MainPage.xaml.cs +++ b/csharp/test/xamarin/controller/MainPage.xaml.cs @@ -263,13 +263,13 @@ namespace controller return new Ice.optional.AMD.Server(); } - else if(type.Equals("Ice.packagemd.Client")) + else if(type.Equals("Ice.namespacemd.Client")) { - return new Ice.packagemd.Client(); + return new Ice.namespacemd.Client(); } - else if(type.Equals("Ice.packagemd.Server")) + else if(type.Equals("Ice.namespacemd.Server")) { - return new Ice.packagemd.Server(); + return new Ice.namespacemd.Server(); } else if(type.Equals("Ice.proxy.Client")) diff --git a/csharp/test/xamarin/controller/controller.csproj b/csharp/test/xamarin/controller/controller.csproj index 2a4684d6e5c..ffbd80f6f3e 100644 --- a/csharp/test/xamarin/controller/controller.csproj +++ b/csharp/test/xamarin/controller/controller.csproj @@ -76,7 +76,7 @@ <ProjectReference Include="..\..\Ice\objects\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\operations\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\optional\msbuild\test\netstandard2.0\test.csproj" /> - <ProjectReference Include="..\..\Ice\packagemd\msbuild\test\netstandard2.0\test.csproj" /> + <ProjectReference Include="..\..\Ice\namespacemd\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\proxy\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\retry\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\scope\msbuild\test\netstandard2.0\test.csproj" /> |