diff options
| author | Roy <roy.mail.net@gmail.com> | 2017-12-25 11:06:31 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2017-12-25 11:06:31 +0200 |
| commit | 6450fc175114a6f8d0b75cb21386d1bb0c902711 (patch) | |
| tree | 374c3005e7073855264c16f8ea0ad1d022f9f627 /Software/Visual_Studio/Tango.Stubs | |
| parent | 6e095fe0b74ee090603fc25980fa0c71f61c6467 (diff) | |
| download | Tango-6450fc175114a6f8d0b75cb21386d1bb0c902711.tar.gz Tango-6450fc175114a6f8d0b75cb21386d1bb0c902711.zip | |
Implemented Container ErrorCode handling on .NET + Java.
Diffstat (limited to 'Software/Visual_Studio/Tango.Stubs')
| -rw-r--r-- | Software/Visual_Studio/Tango.Stubs/Stubs/Progress.cs | 10 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj | 17 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Stubs/packages.config | 6 |
3 files changed, 31 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Tango.Stubs/Stubs/Progress.cs b/Software/Visual_Studio/Tango.Stubs/Stubs/Progress.cs index cd13a84ff..9ce96e633 100644 --- a/Software/Visual_Studio/Tango.Stubs/Stubs/Progress.cs +++ b/Software/Visual_Studio/Tango.Stubs/Stubs/Progress.cs @@ -32,9 +32,15 @@ namespace Tango.Stubs.Stubs { Amount = (int)Amount, Delay = (int)Delay, - }), (response) => + })).Subscribe((x) => { - multiResponseCallback(response.Message.Progress.ToString()); + multiResponseCallback(x.Message.Progress.ToString()); + }, (ex) => + { + multiResponseCallback(ex.Message); + }, () => + { + multiResponseCallback("Completed!"); }); return Task.FromResult<String>(""); diff --git a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj index 6d4538830..541119a44 100644 --- a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj +++ b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj @@ -36,12 +36,29 @@ </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> + <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll</HintPath> + </Reference> + <Reference Include="System.Windows" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> + <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup> <Compile Include="..\Versioning\GlobalVersionInfo.cs"> diff --git a/Software/Visual_Studio/Tango.Stubs/packages.config b/Software/Visual_Studio/Tango.Stubs/packages.config index e7e6cbade..97f56d4cc 100644 --- a/Software/Visual_Studio/Tango.Stubs/packages.config +++ b/Software/Visual_Studio/Tango.Stubs/packages.config @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Google.Protobuf" version="3.4.1" targetFramework="net45" /> + <package id="System.Reactive" version="3.1.1" targetFramework="net46" /> + <package id="System.Reactive.Core" version="3.1.1" targetFramework="net46" /> + <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net46" /> + <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net46" /> + <package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net46" /> + <package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net46" /> </packages>
\ No newline at end of file |