diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-23 23:50:13 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-23 23:50:13 +0200 |
| commit | 879a7c2179d991f4b68a513f60de3472b2e64102 (patch) | |
| tree | 283332c93e59ff85e05a61c930760ec3b1b2525b /Software/Visual_Studio/Tango.Core | |
| parent | d4cde3ccf2c29991b65285396fb97eafa1e434df (diff) | |
| download | Tango-879a7c2179d991f4b68a513f60de3472b2e64102.tar.gz Tango-879a7c2179d991f4b68a513f60de3472b2e64102.zip | |
Implemented cached entities using DataResolver<T>.
Implemented DataResolver Builder.
Implemented offline gateway, authentication, machines...
Implemented online checking.
Moved FSEWebClient and Gateway to BL.
Implemented blocking of machines outside of the organization.
Diffstat (limited to 'Software/Visual_Studio/Tango.Core')
4 files changed, 14 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Tango.Core/ExtendedObject.cs b/Software/Visual_Studio/Tango.Core/ExtendedObject.cs index acead4157..63a75480c 100644 --- a/Software/Visual_Studio/Tango.Core/ExtendedObject.cs +++ b/Software/Visual_Studio/Tango.Core/ExtendedObject.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using LiteDB; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel; @@ -33,6 +34,7 @@ namespace Tango.Core /// </summary> [JsonIgnore] [NotMapped] + [BsonIgnore] public LogManager LogManager { get { return LogManager.Default; } @@ -43,6 +45,7 @@ namespace Tango.Core /// </summary> [JsonIgnore] [NotMapped] + [BsonIgnore] public TemporaryManager TemporaryManager { get { return TemporaryManager.Default; } @@ -98,6 +101,7 @@ namespace Tango.Core /// </summary> [NotMapped] [JsonIgnore] + [BsonIgnore] public bool DesignMode { get { return (DesignerProperties.GetIsInDesignMode(new DependencyObject())); } diff --git a/Software/Visual_Studio/Tango.Core/IParameterized.cs b/Software/Visual_Studio/Tango.Core/IParameterized.cs index 776a7f926..d8e3982bb 100644 --- a/Software/Visual_Studio/Tango.Core/IParameterized.cs +++ b/Software/Visual_Studio/Tango.Core/IParameterized.cs @@ -1,4 +1,5 @@ -using System; +using LiteDB; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; @@ -18,6 +19,7 @@ namespace Tango.Core /// </summary> [ParameterIgnore] [XmlIgnore] + [BsonIgnore] ReadOnlyObservableCollection<ParameterItem> Parameters { get; } } } diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj index d37259b58..78bfa0cb1 100644 --- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj +++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj @@ -42,6 +42,10 @@ <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> + <Reference Include="LiteDB, Version=5.0.4.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL"> + <HintPath>..\packages\LiteDB.5.0.4\lib\net45\LiteDB.dll</HintPath> + <Private>False</Private> + </Reference> <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.5.0.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath> </Reference> @@ -75,6 +79,7 @@ <Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression.FileSystem" /> <Reference Include="System.Net.Http" /> + <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Windows" /> <Reference Include="System.Windows.Forms" /> diff --git a/Software/Visual_Studio/Tango.Core/packages.config b/Software/Visual_Studio/Tango.Core/packages.config index d7691338d..49cb7923e 100644 --- a/Software/Visual_Studio/Tango.Core/packages.config +++ b/Software/Visual_Studio/Tango.Core/packages.config @@ -3,6 +3,7 @@ <package id="CommonServiceLocator" version="1.3" targetFramework="net46" /> <package id="EntityFramework" version="6.2.0" targetFramework="net461" /> <package id="Google.Protobuf" version="3.4.1" targetFramework="net46" /> + <package id="LiteDB" version="5.0.4" targetFramework="net461" /> <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="5.0.5" targetFramework="net461" /> <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" /> <package id="SimpleValidator" version="0.6.1.0" targetFramework="net46" /> |