diff --git a/Yavsc/Interfaces/ILifeTime.cs b/Yavsc/Interfaces/ILifeTime.cs deleted file mode 100644 index fd82fefb..00000000 --- a/Yavsc/Interfaces/ILifeTime.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; - -namespace Yavsc.Interfaces -{ - public interface ILifeTime - { - DateTime Modified { get; set; } - DateTime Posted { get; set; } - } -} diff --git a/Yavsc/Models/Billing/Contract.cs b/Yavsc/Models/Billing/Contract.cs index ba4f11f8..1835bf9a 100644 --- a/Yavsc/Models/Billing/Contract.cs +++ b/Yavsc/Models/Billing/Contract.cs @@ -2,10 +2,9 @@ using Yavsc.Models.Market; namespace Yavsc.Models.Billing { - public class ServiceContract

where P : Service { } -} \ No newline at end of file +} diff --git a/Yavsc/Models/Billing/NominativeServiceCommand.cs b/Yavsc/Models/Billing/NominativeServiceCommand.cs index c0cc53ba..d0c9b591 100644 --- a/Yavsc/Models/Billing/NominativeServiceCommand.cs +++ b/Yavsc/Models/Billing/NominativeServiceCommand.cs @@ -8,6 +8,7 @@ namespace Yavsc.Models.Billing using Newtonsoft.Json; using Workflow; using YavscLib; + using YavscLib.Models.Workflow; public abstract class NominativeServiceCommand : IBaseTrackedEntity, IQuery { diff --git a/Yavsc/Models/Haircut/BrusherProfile.cs b/Yavsc/Models/HairCut/BrusherProfile.cs similarity index 99% rename from Yavsc/Models/Haircut/BrusherProfile.cs rename to Yavsc/Models/HairCut/BrusherProfile.cs index 6bb413c4..10927829 100644 --- a/Yavsc/Models/Haircut/BrusherProfile.cs +++ b/Yavsc/Models/HairCut/BrusherProfile.cs @@ -8,6 +8,10 @@ namespace Yavsc.Models.Haircut { public class BrusherProfile : ISpecializationSettings { + public BrusherProfile() + { + } + [Key] public string UserId { diff --git a/Yavsc/Models/Haircut/HairCutGenders.cs b/Yavsc/Models/HairCut/HairCutGenders.cs similarity index 100% rename from Yavsc/Models/Haircut/HairCutGenders.cs rename to Yavsc/Models/HairCut/HairCutGenders.cs diff --git a/Yavsc/Models/Haircut/HairCutQuery.cs b/Yavsc/Models/HairCut/HairCutQuery.cs similarity index 100% rename from Yavsc/Models/Haircut/HairCutQuery.cs rename to Yavsc/Models/HairCut/HairCutQuery.cs diff --git a/Yavsc/Models/Haircut/HairCutQueryEvent.cs b/Yavsc/Models/HairCut/HairCutQueryEvent.cs similarity index 100% rename from Yavsc/Models/Haircut/HairCutQueryEvent.cs rename to Yavsc/Models/HairCut/HairCutQueryEvent.cs diff --git a/Yavsc/Models/Haircut/HairDressings.cs b/Yavsc/Models/HairCut/HairDressings.cs similarity index 100% rename from Yavsc/Models/Haircut/HairDressings.cs rename to Yavsc/Models/HairCut/HairDressings.cs diff --git a/Yavsc/Models/Haircut/HairLength.cs b/Yavsc/Models/HairCut/HairLength.cs similarity index 100% rename from Yavsc/Models/Haircut/HairLength.cs rename to Yavsc/Models/HairCut/HairLength.cs diff --git a/Yavsc/Models/Haircut/HairMultiCutQuery.cs b/Yavsc/Models/HairCut/HairMultiCutQuery.cs similarity index 100% rename from Yavsc/Models/Haircut/HairMultiCutQuery.cs rename to Yavsc/Models/HairCut/HairMultiCutQuery.cs diff --git a/Yavsc/Models/Haircut/HairPrestation.cs b/Yavsc/Models/HairCut/HairPrestation.cs similarity index 100% rename from Yavsc/Models/Haircut/HairPrestation.cs rename to Yavsc/Models/HairCut/HairPrestation.cs diff --git a/Yavsc/Models/Haircut/HairTaint.cs b/Yavsc/Models/HairCut/HairTaint.cs similarity index 100% rename from Yavsc/Models/Haircut/HairTaint.cs rename to Yavsc/Models/HairCut/HairTaint.cs diff --git a/Yavsc/Models/Haircut/HairTechnos.cs b/Yavsc/Models/HairCut/HairTechnos.cs similarity index 100% rename from Yavsc/Models/Haircut/HairTechnos.cs rename to Yavsc/Models/HairCut/HairTechnos.cs diff --git a/YavscLib/HairCut/Haircut.cs b/Yavsc/Models/HairCut/Haircut.cs similarity index 100% rename from YavscLib/HairCut/Haircut.cs rename to Yavsc/Models/HairCut/Haircut.cs diff --git a/YavscLib/HairCut/IHairPrestation.cs b/Yavsc/Models/HairCut/IHairPrestation.cs similarity index 100% rename from YavscLib/HairCut/IHairPrestation.cs rename to Yavsc/Models/HairCut/IHairPrestation.cs diff --git a/Yavsc/Models/Haircut/Views/HaircutQueryInfo.cs b/Yavsc/Models/HairCut/Views/HaircutQueryInfo.cs similarity index 82% rename from Yavsc/Models/Haircut/Views/HaircutQueryInfo.cs rename to Yavsc/Models/HairCut/Views/HaircutQueryInfo.cs index 0b4413ad..3580f1ec 100644 --- a/Yavsc/Models/Haircut/Views/HaircutQueryInfo.cs +++ b/Yavsc/Models/HairCut/Views/HaircutQueryInfo.cs @@ -9,7 +9,7 @@ namespace Yavsc.Models.Haircut.Views public class HaircutQueryProviderInfo : HaircutQueryComonInfo { public HaircutQueryProviderInfo(HairCutQuery query) : base (query) { - ClientInfo = new UserInfo(query.Client); + ClientInfo = new UserInfo(query.Client.Id, query.Client.UserName, query.Client.Avatar); } public UserInfo ClientInfo { get; set; } @@ -17,9 +17,10 @@ namespace Yavsc.Models.Haircut.Views public class HaircutQueryClientInfo : HaircutQueryComonInfo { public HaircutQueryClientInfo(HairCutQuery query) : base (query) { - ProviderInfo = new UserInfo(query.PerformerProfile.Performer); + var user = query.PerformerProfile.Performer; + ProviderInfo = new UserInfo(user.Id, user.UserName, user.Avatar); } - public UserInfo ProviderInfo { get; set; } + public UserInfo ProviderInfo { get; set; } } public class HaircutQueryComonInfo diff --git a/Yavsc/Models/Market/Catalog.cs b/Yavsc/Models/Market/Catalog.cs index 8d68c624..b58a1c1c 100644 --- a/Yavsc/Models/Market/Catalog.cs +++ b/Yavsc/Models/Market/Catalog.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; namespace Yavsc.Models.Market { - public class Catalog { public List Products { get; set; } public List Services { get; set; } } -} \ No newline at end of file +} diff --git a/Yavsc/Models/Market/Service.cs b/Yavsc/Models/Market/Service.cs index d4ee08d7..8177bd59 100644 --- a/Yavsc/Models/Market/Service.cs +++ b/Yavsc/Models/Market/Service.cs @@ -3,8 +3,8 @@ using System.ComponentModel.DataAnnotations.Schema; namespace Yavsc.Models.Market { using System.ComponentModel.DataAnnotations; - using Billing; using Workflow; + using Yavsc.Models.Billing; public class Service : BaseProduct { @@ -14,27 +14,27 @@ namespace Yavsc.Models.Market { /// [Key(),DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Id { get; set; } - + public string ContextId { get; set; } [ForeignKey("ContextId")] public virtual Activity Context { get; set; } ///

/// List of billing clause, - /// associated to this service, + /// associated to this service, /// that defines the transformation rules /// to take in account during the transformation /// of a corresponding prestation to an amount to pay. /// This property is built at constructing a new instance - /// and is not mapped in database. + /// and is not mapped in database. /// For the moment, it's hard coded only. /// /// [NotMapped] public List Billing { get; set; } - - + + } -} \ No newline at end of file +} diff --git a/Yavsc/Models/Messaging/BaseEvent.cs b/Yavsc/Models/Messaging/BaseEvent.cs index befcbc0e..feea05f1 100644 --- a/Yavsc/Models/Messaging/BaseEvent.cs +++ b/Yavsc/Models/Messaging/BaseEvent.cs @@ -23,8 +23,8 @@ using System.ComponentModel.DataAnnotations; namespace Yavsc.Models.Messaging { - using Interfaces; using Interfaces.Workflow; + using YavscLib; /// /// Base event. diff --git a/Yavsc/Models/Relationship/CircleMember.cs b/Yavsc/Models/Relationship/CircleMember.cs index 42e89b35..7bda74df 100644 --- a/Yavsc/Models/Relationship/CircleMember.cs +++ b/Yavsc/Models/Relationship/CircleMember.cs @@ -1,15 +1,16 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using YavscLib; namespace Yavsc.Models.Relationship { public partial class CircleMember { - + [Required] - public long CircleId { get; set; } + public long CircleId { get; set; } [ForeignKey("CircleId")] public virtual Circle Circle { get; set; } diff --git a/Yavsc/Models/Workflow/Activity.cs b/Yavsc/Models/Workflow/Activity.cs index 98605326..ec781cf8 100644 --- a/Yavsc/Models/Workflow/Activity.cs +++ b/Yavsc/Models/Workflow/Activity.cs @@ -7,7 +7,7 @@ using Newtonsoft.Json; namespace Yavsc.Models.Workflow { - using Market; + using Yavsc.Models.Market; using YavscLib; public class Activity : IBaseTrackedEntity, IActivity diff --git a/Yavsc/Models/Workflow/PerformerProfile.cs b/Yavsc/Models/Workflow/PerformerProfile.cs index 011c282c..00fb6c5b 100644 --- a/Yavsc/Models/Workflow/PerformerProfile.cs +++ b/Yavsc/Models/Workflow/PerformerProfile.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Yavsc.Models.Workflow +namespace Yavsc.Models.Workflow { using System; using Models.Relationship; @@ -42,7 +42,7 @@ namespace Yavsc.Models.Workflow [Display(Name="Active")] public bool Active { get; set; } - + [Obsolete("Implement and use a new specialization setting")] [Display(Name="Maximal Daily Cost (euro/day)"),DisplayFormat(DataFormatString="{0:C}")] public int? MaxDailyCost { get; set; } @@ -58,6 +58,6 @@ namespace Yavsc.Models.Workflow public bool DoesBlog { get { return Performer?.Posts?.Count > 0 ; } } - + } -} \ No newline at end of file +} diff --git a/Yavsc/Models/Workflow/RendezVous.cs b/Yavsc/Models/Workflow/RendezVous.cs index 3942a9a5..07e84f18 100644 --- a/Yavsc/Models/Workflow/RendezVous.cs +++ b/Yavsc/Models/Workflow/RendezVous.cs @@ -6,6 +6,7 @@ using Yavsc.Models.Market; namespace Yavsc.Models.Workflow { using Models.Relationship; + /// /// A date, between two persons /// @@ -35,4 +36,4 @@ namespace Yavsc.Models.Workflow } -} \ No newline at end of file +} diff --git a/Yavsc/project.json b/Yavsc/project.json index 2dc6a789..2050d59c 100755 --- a/Yavsc/project.json +++ b/Yavsc/project.json @@ -61,7 +61,7 @@ "Google.Apis.Core": "1.11.1", "Google.Apis": "1.11.1", "MailKit": "1.12.0", - "MarkdownDeep-av.NET": "1.5.5", + "MarkdownDeep-av.NET": "1.5.6", "Microsoft.AspNet.Authentication.Cookies": "1.0.0-rc1-final", "Microsoft.AspNet.Authentication.Facebook": "1.0.0-rc1-final", "Microsoft.AspNet.Authentication.Twitter": "1.0.0-rc1-final", diff --git a/Yavsc/project.lock.json b/Yavsc/project.lock.json index ab8c30a0..75bc4362 100644 --- a/Yavsc/project.lock.json +++ b/Yavsc/project.lock.json @@ -289,7 +289,7 @@ "lib/net451/MailKit.dll": {} } }, - "MarkdownDeep-av.NET/1.5.5": { + "MarkdownDeep-av.NET/1.5.6": { "type": "package", "compile": { "lib/net451/MarkdownDeep.dll": {} @@ -2514,7 +2514,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/7.0.1": { + "Newtonsoft.Json/10.0.2": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -2853,7 +2853,13 @@ }, "YavscLib/1.0.0": { "type": "project", - "framework": ".NETFramework,Version=v4.5.1" + "framework": ".NETFramework,Version=v4.5.1", + "dependencies": { + "Newtonsoft.Json": "10.0.2" + }, + "frameworkAssemblies": [ + "System.ComponentModel.DataAnnotations" + ] }, "Zlib.Portable.Signed/1.11.0": { "type": "package", @@ -3152,7 +3158,7 @@ "lib/net451/MailKit.dll": {} } }, - "MarkdownDeep-av.NET/1.5.5": { + "MarkdownDeep-av.NET/1.5.6": { "type": "package", "compile": { "lib/net451/MarkdownDeep.dll": {} @@ -5377,7 +5383,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/7.0.1": { + "Newtonsoft.Json/10.0.2": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -5716,7 +5722,13 @@ }, "YavscLib/1.0.0": { "type": "project", - "framework": ".NETFramework,Version=v4.5.1" + "framework": ".NETFramework,Version=v4.5.1", + "dependencies": { + "Newtonsoft.Json": "10.0.2" + }, + "frameworkAssemblies": [ + "System.ComponentModel.DataAnnotations" + ] }, "Zlib.Portable.Signed/1.11.0": { "type": "package", @@ -6015,7 +6027,7 @@ "lib/net451/MailKit.dll": {} } }, - "MarkdownDeep-av.NET/1.5.5": { + "MarkdownDeep-av.NET/1.5.6": { "type": "package", "compile": { "lib/net451/MarkdownDeep.dll": {} @@ -8240,7 +8252,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/7.0.1": { + "Newtonsoft.Json/10.0.2": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -8579,7 +8591,13 @@ }, "YavscLib/1.0.0": { "type": "project", - "framework": ".NETFramework,Version=v4.5.1" + "framework": ".NETFramework,Version=v4.5.1", + "dependencies": { + "Newtonsoft.Json": "10.0.2" + }, + "frameworkAssemblies": [ + "System.ComponentModel.DataAnnotations" + ] }, "Zlib.Portable.Signed/1.11.0": { "type": "package", @@ -8884,15 +8902,15 @@ "MailKit.nuspec" ] }, - "MarkdownDeep-av.NET/1.5.5": { + "MarkdownDeep-av.NET/1.5.6": { "type": "package", - "sha512": "RVNumZoZCPDq3H83vrudwptPgR0YFb3MsxIAuGZccUIPiwVUyixGanymHOy0H9QPubkYWo8t00iXqVvIjiu2gg==", + "sha512": "/nK/Hzru+vAmNGX5tZtEkKxCqjUS8a/u1vZaQ4pEmlvm6C9IIJ5rWIJephDWVwbzi6eKdEeduU+xmPfLNXrQwQ==", "files": [ "lib/dnxcore50/MarkdownDeep.dll", "lib/MonoAndroid10/MarkdownDeep.dll", "lib/net451/MarkdownDeep.dll", - "MarkdownDeep-av.NET.1.5.5.nupkg", - "MarkdownDeep-av.NET.1.5.5.nupkg.sha512", + "MarkdownDeep-av.NET.1.5.6.nupkg", + "MarkdownDeep-av.NET.1.5.6.nupkg.sha512", "MarkdownDeep-av.NET.nuspec" ] }, @@ -10614,9 +10632,9 @@ "MimeKit.nuspec" ] }, - "Newtonsoft.Json/7.0.1": { + "Newtonsoft.Json/10.0.2": { "type": "package", - "sha512": "q3V4KLetMLnt1gpAVWgtXnHjKs0UG/RalBc29u2ZKxd5t5Ze4JBL5WiiYIklJyK/5CRiIiNwigVQUo0FgbsuWA==", + "sha512": "iwElSU2IXmwGvytJsezyDML2ZWDkG2JzTYzlU/BNlmzMdlmRvbnwITsGGY74gwVEpDli1UdOLkMT7/3jxWvXzA==", "files": [ "lib/net20/Newtonsoft.Json.dll", "lib/net20/Newtonsoft.Json.xml", @@ -10626,12 +10644,17 @@ "lib/net40/Newtonsoft.Json.xml", "lib/net45/Newtonsoft.Json.dll", "lib/net45/Newtonsoft.Json.xml", - "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll", - "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml", - "lib/portable-net45+wp80+win8+wpa81+dnxcore50/Newtonsoft.Json.dll", - "lib/portable-net45+wp80+win8+wpa81+dnxcore50/Newtonsoft.Json.xml", - "Newtonsoft.Json.7.0.1.nupkg", - "Newtonsoft.Json.7.0.1.nupkg.sha512", + "lib/netstandard1.0/Newtonsoft.Json.dll", + "lib/netstandard1.0/Newtonsoft.Json.xml", + "lib/netstandard1.3/Newtonsoft.Json.dll", + "lib/netstandard1.3/Newtonsoft.Json.xml", + "lib/portable-net40+sl5+win8+wpa81+wp8/Newtonsoft.Json.dll", + "lib/portable-net40+sl5+win8+wpa81+wp8/Newtonsoft.Json.xml", + "lib/portable-net45+win8+wpa81+wp8/Newtonsoft.Json.dll", + "lib/portable-net45+win8+wpa81+wp8/Newtonsoft.Json.xml", + "LICENSE.md", + "Newtonsoft.Json.10.0.2.nupkg", + "Newtonsoft.Json.10.0.2.nupkg.sha512", "Newtonsoft.Json.nuspec", "tools/install.ps1" ] @@ -11550,7 +11573,7 @@ "Google.Apis.Core >= 1.11.1", "Google.Apis >= 1.11.1", "MailKit >= 1.12.0", - "MarkdownDeep-av.NET >= 1.5.5", + "MarkdownDeep-av.NET >= 1.5.6", "Microsoft.AspNet.Authentication.Cookies >= 1.0.0-rc1-final", "Microsoft.AspNet.Authentication.Facebook >= 1.0.0-rc1-final", "Microsoft.AspNet.Authentication.Twitter >= 1.0.0-rc1-final", diff --git a/YavscLib/HairCut/HairLength.cs b/YavscLib/HairCut/HairLength.cs deleted file mode 100644 index 24f35177..00000000 --- a/YavscLib/HairCut/HairLength.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace YavscLib.HairCut -{ - public enum HairLength : int - { - HalfLong, - - Short = 1, - - Long - } -} diff --git a/YavscLib/Billing/IAccountBalance.cs b/YavscLib/IAccountBalance.cs similarity index 100% rename from YavscLib/Billing/IAccountBalance.cs rename to YavscLib/IAccountBalance.cs diff --git a/Yavsc/Models/Billing/IBillingImpacter.cs b/YavscLib/IBillingImpacter.cs similarity index 100% rename from Yavsc/Models/Billing/IBillingImpacter.cs rename to YavscLib/IBillingImpacter.cs diff --git a/YavscLib/Billing/IEstimate.cs b/YavscLib/IEstimate.cs similarity index 100% rename from YavscLib/Billing/IEstimate.cs rename to YavscLib/IEstimate.cs diff --git a/YavscLib/IIdentified.cs b/YavscLib/IIdentified.cs index 0fa26058..1a00aa4e 100644 --- a/YavscLib/IIdentified.cs +++ b/YavscLib/IIdentified.cs @@ -19,7 +19,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with this program. If not, see . -namespace Yavsc.Interfaces +namespace YavscLib { /// /// I identified. diff --git a/Yavsc/Interfaces/ITitle.cs b/YavscLib/ITitle.cs similarity index 96% rename from Yavsc/Interfaces/ITitle.cs rename to YavscLib/ITitle.cs index e8cc76de..1df21e59 100644 --- a/Yavsc/Interfaces/ITitle.cs +++ b/YavscLib/ITitle.cs @@ -18,7 +18,7 @@ // // You should have received a copy of the GNU Lesser General Public License // along with this program. If not, see . -namespace Yavsc.Interfaces +namespace YavscLib { public interface ITitle { diff --git a/YavscLib/Billing/IcommandLine.cs b/YavscLib/IcommandLine.cs similarity index 99% rename from YavscLib/Billing/IcommandLine.cs rename to YavscLib/IcommandLine.cs index a806f587..920394fc 100644 --- a/YavscLib/Billing/IcommandLine.cs +++ b/YavscLib/IcommandLine.cs @@ -4,10 +4,9 @@ namespace YavscLib.Billing { long Id { get; set; } string Description { get; set; } - int Count { get; set; } decimal UnitaryCost { get; set; } long EstimateId { get; set; } } -} \ No newline at end of file +} diff --git a/YavscLib/Identity/IApplicationUser.cs b/YavscLib/Identity/IApplicationUser.cs index b4327fc6..214b377e 100644 --- a/YavscLib/Identity/IApplicationUser.cs +++ b/YavscLib/Identity/IApplicationUser.cs @@ -2,6 +2,9 @@ { public interface IApplicationUser { + string Id { get; set; } + string UserName { get; set; } + string Avatar { get ; set; } IAccountBalance AccountBalance { get; set; } string DedicatedGoogleCalendar { get; set; } ILocation PostalAddress { get; set; } diff --git a/Yavsc/ViewModels/Account/UserInfo.cs b/YavscLib/Identity/UserInfo.cs similarity index 62% rename from Yavsc/ViewModels/Account/UserInfo.cs rename to YavscLib/Identity/UserInfo.cs index 4e2f4e30..604516d1 100644 --- a/Yavsc/ViewModels/Account/UserInfo.cs +++ b/YavscLib/Identity/UserInfo.cs @@ -7,11 +7,11 @@ namespace Yavsc.Models.Auth } - public UserInfo(ApplicationUser user) + public UserInfo(string userId, string userName, string avatar) { - UserId = user.Id; - UserName = user.UserName; - Avatar = user.Avatar; + UserId = userId; + UserName = userName; + Avatar = avatar; } public string UserId { get; set; } diff --git a/YavscLib/Workflow/IActivity.cs b/YavscLib/Workflow/IActivity.cs index d0e539cd..ffbce358 100644 --- a/YavscLib/Workflow/IActivity.cs +++ b/YavscLib/Workflow/IActivity.cs @@ -32,4 +32,4 @@ namespace YavscLib get; set; } } -} \ No newline at end of file +} diff --git a/Yavsc/Models/Workflow/IQuery.cs b/YavscLib/Workflow/IQuery.cs similarity index 78% rename from Yavsc/Models/Workflow/IQuery.cs rename to YavscLib/Workflow/IQuery.cs index 8688babf..ceab9345 100644 --- a/Yavsc/Models/Workflow/IQuery.cs +++ b/YavscLib/Workflow/IQuery.cs @@ -1,4 +1,4 @@ -namespace Yavsc.Models.Workflow +namespace YavscLib.Models.Workflow { using YavscLib; diff --git a/YavscLib/Workflow/IRating.cs b/YavscLib/Workflow/IRating.cs index 496739f7..7cd51812 100644 --- a/YavscLib/Workflow/IRating.cs +++ b/YavscLib/Workflow/IRating.cs @@ -18,7 +18,8 @@ // // You should have received a copy of the GNU Lesser General Public License // along with this program. If not, see . -namespace Yavsc.Interfaces + +namespace YavscLib.Interfaces { /// diff --git a/Yavsc/Models/Workflow/IRequisition.cs b/YavscLib/Workflow/IRequisition.cs similarity index 100% rename from Yavsc/Models/Workflow/IRequisition.cs rename to YavscLib/Workflow/IRequisition.cs diff --git a/YavscLib/project.json b/YavscLib/project.json index 4db142d6..5b3818e9 100644 --- a/YavscLib/project.json +++ b/YavscLib/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "description": "Yavsc Client Api", "authors": [ @@ -12,18 +12,13 @@ "tooling": { "defaultNamespace": "Yavsc" }, - "dependencies": {}, + "dependencies": { + "Newtonsoft.Json": "10.0.2" + }, "frameworks": { "net451": { - "System.ComponentModel.Annotations": "4.0.0" - }, - ".NETPortable,Version=v4.5,Profile=Profile111": { "frameworkAssemblies": { - "System": "4.0.0", - "System.Runtime": "4.0.0", - "System.Globalization": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Collections": "4.0.0" + "System.ComponentModel.DataAnnotations": "4.0.0" } } } diff --git a/YavscLib/project.lock.json b/YavscLib/project.lock.json index 6565f069..07703531 100644 --- a/YavscLib/project.lock.json +++ b/YavscLib/project.lock.json @@ -2,23 +2,75 @@ "locked": false, "version": 2, "targets": { - ".NETFramework,Version=v4.5.1": {}, - ".NETPortable,Version=v4.5,Profile=Profile111": {}, - ".NETFramework,Version=v4.5.1/debian.8-x86": {}, - ".NETFramework,Version=v4.5.1/debian.8-x64": {}, - ".NETPortable,Version=v4.5,Profile=Profile111/debian.8-x86": {}, - ".NETPortable,Version=v4.5,Profile=Profile111/debian.8-x64": {} + ".NETFramework,Version=v4.5.1": { + "Newtonsoft.Json/10.0.2": { + "type": "package", + "compile": { + "lib/net45/Newtonsoft.Json.dll": {} + }, + "runtime": { + "lib/net45/Newtonsoft.Json.dll": {} + } + } + }, + ".NETFramework,Version=v4.5.1/debian.8-x86": { + "Newtonsoft.Json/10.0.2": { + "type": "package", + "compile": { + "lib/net45/Newtonsoft.Json.dll": {} + }, + "runtime": { + "lib/net45/Newtonsoft.Json.dll": {} + } + } + }, + ".NETFramework,Version=v4.5.1/debian.8-x64": { + "Newtonsoft.Json/10.0.2": { + "type": "package", + "compile": { + "lib/net45/Newtonsoft.Json.dll": {} + }, + "runtime": { + "lib/net45/Newtonsoft.Json.dll": {} + } + } + } + }, + "libraries": { + "Newtonsoft.Json/10.0.2": { + "type": "package", + "sha512": "iwElSU2IXmwGvytJsezyDML2ZWDkG2JzTYzlU/BNlmzMdlmRvbnwITsGGY74gwVEpDli1UdOLkMT7/3jxWvXzA==", + "files": [ + "lib/net20/Newtonsoft.Json.dll", + "lib/net20/Newtonsoft.Json.xml", + "lib/net35/Newtonsoft.Json.dll", + "lib/net35/Newtonsoft.Json.xml", + "lib/net40/Newtonsoft.Json.dll", + "lib/net40/Newtonsoft.Json.xml", + "lib/net45/Newtonsoft.Json.dll", + "lib/net45/Newtonsoft.Json.xml", + "lib/netstandard1.0/Newtonsoft.Json.dll", + "lib/netstandard1.0/Newtonsoft.Json.xml", + "lib/netstandard1.3/Newtonsoft.Json.dll", + "lib/netstandard1.3/Newtonsoft.Json.xml", + "lib/portable-net40+sl5+win8+wpa81+wp8/Newtonsoft.Json.dll", + "lib/portable-net40+sl5+win8+wpa81+wp8/Newtonsoft.Json.xml", + "lib/portable-net45+win8+wpa81+wp8/Newtonsoft.Json.dll", + "lib/portable-net45+win8+wpa81+wp8/Newtonsoft.Json.xml", + "LICENSE.md", + "Newtonsoft.Json.10.0.2.nupkg", + "Newtonsoft.Json.10.0.2.nupkg.sha512", + "Newtonsoft.Json.nuspec", + "tools/install.ps1" + ] + } }, - "libraries": {}, "projectFileDependencyGroups": { - "": [], - ".NETFramework,Version=v4.5.1": [], - ".NETPortable,Version=v4.5,Profile=Profile111": [ - "fx/System >= 4.0.0", - "fx/System.Runtime >= 4.0.0", - "fx/System.Globalization >= 4.0.0", - "fx/System.Resources.ResourceManager >= 4.0.0", - "fx/System.Collections >= 4.0.0" + "": [ + "Newtonsoft.Json >= 10.0.2" + ], + ".NETFramework,Version=v4.5.1": [ + "fx/System.ComponentModel.DataAnnotations >= 4.0.0" ] } } \ No newline at end of file