diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-03-01 14:24:25 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-03-01 14:24:25 +0200 |
| commit | 6e2eeb6829b2b1bf5e1e5334b9dad84f10ce2bc1 (patch) | |
| tree | d423e90c51f380d8207a2d91cbf444a4cbcc698b /Software/Visual_Studio/Utilities | |
| parent | f185c2ba392d7a05079ca1c3e27521bac053a103 (diff) | |
| download | Tango-6e2eeb6829b2b1bf5e1e5334b9dad84f10ce2bc1.tar.gz Tango-6e2eeb6829b2b1bf5e1e5334b9dad84f10ce2bc1.zip | |
Upgraded protobuf from 4.1 to 5.1 ?
Implemented a workaround for protobuf ToByteString bug.
Lowered Transporter Push/Pull Interval from 2 to 1 mili.
Set No Alpha Channel as default on color canvas.
Fixed issue with single graphs colors on technician module.
Diffstat (limited to 'Software/Visual_Studio/Utilities')
9 files changed, 20 insertions, 12 deletions
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj index ff4ab4a62..ee7e2118c 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj @@ -46,8 +46,8 @@ <Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL"> <HintPath>..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath> </Reference> - <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath> + <Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath> </Reference> <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL"> <HintPath>..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath> diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/packages.config b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/packages.config index e1cb3339d..94939c7ce 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/packages.config +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/packages.config @@ -2,6 +2,6 @@ <packages> <package id="EntityFramework" version="6.0.0" targetFramework="net46" /> <package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net45" /> - <package id="Google.Protobuf" version="3.4.1" targetFramework="net45" /> + <package id="Google.Protobuf" version="3.5.1" targetFramework="net46" /> <package id="MahApps.Metro" version="1.5.0" targetFramework="net45" /> </packages>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/Tango.MobileEM.UI.csproj b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/Tango.MobileEM.UI.csproj index a1af9a2a1..a1d032ab1 100644 --- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/Tango.MobileEM.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/Tango.MobileEM.UI.csproj @@ -40,8 +40,8 @@ <Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL"> <HintPath>..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath> </Reference> - <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath> + <Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath> </Reference> <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL"> <HintPath>..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath> diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/packages.config b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/packages.config index 9cbe8b937..4ddc687aa 100644 --- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/packages.config +++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net45" /> - <package id="Google.Protobuf" version="3.4.1" targetFramework="net45" /> + <package id="Google.Protobuf" version="3.5.1" targetFramework="net46" /> <package id="MahApps.Metro" version="1.5.0" targetFramework="net45" /> </packages>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/App.config b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/App.config index 92aa00bf9..b8ed40861 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/App.config @@ -13,4 +13,12 @@ <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> </providers> </entityFramework> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> </configuration>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj index 20787bbbb..0eb93182c 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj @@ -38,8 +38,8 @@ <HintPath>..\..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath> + <Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/packages.config b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/packages.config index 07d257330..4c4c025af 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/packages.config +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/packages.config @@ -2,6 +2,6 @@ <packages> <package id="Costura.Fody" version="1.6.2" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="2.0.0" targetFramework="net46" developmentDependency="true" /> - <package id="Google.Protobuf" version="3.4.1" targetFramework="net46" /> + <package id="Google.Protobuf" version="3.5.1" targetFramework="net46" /> <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" /> </packages>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj index 24f9d6b40..97f63343c 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj @@ -46,8 +46,8 @@ <Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL"> <HintPath>..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath> </Reference> - <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath> + <Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath> </Reference> <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL"> <HintPath>..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath> diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/packages.config b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/packages.config index 9aed4e8d0..d6f036774 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/packages.config +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/packages.config @@ -3,7 +3,7 @@ <package id="Costura.Fody" version="1.6.2" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="2.0.0" targetFramework="net46" developmentDependency="true" /> <package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net46" /> - <package id="Google.Protobuf" version="3.4.1" targetFramework="net46" /> + <package id="Google.Protobuf" version="3.5.1" targetFramework="net46" /> <package id="MahApps.Metro" version="1.5.0" targetFramework="net46" /> <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" /> </packages>
\ No newline at end of file |