diff --git a/SHERPA-BBM.sln b/SHERPA-BBM.sln new file mode 100644 index 0000000..98630fb --- /dev/null +++ b/SHERPA-BBM.sln @@ -0,0 +1,55 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28407.52 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA", "SHERPA\SHERPA.csproj", "{B59C0668-53A0-48C2-8959-CC7ECEB6D004}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{6AE920DD-D404-4781-B6D6-CABCA89FB42D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW_data", "..\GPW\GPW_Data\GPW_data.csproj", "{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA_SYNC", "SHERPA_SYNC\SHERPA_SYNC.csproj", "{BF6789C2-2592-4A8F-B75B-C938E3D90F71}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA.BBM", "SHERPA.BBM\SHERPA.BBM.csproj", "{248D0FE3-14C4-4205-AB5B-536755B93951}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SHERPA.BBM.UI", "SHERPA.BBM.UI\SHERPA.BBM.UI.csproj", "{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B59C0668-53A0-48C2-8959-CC7ECEB6D004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B59C0668-53A0-48C2-8959-CC7ECEB6D004}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B59C0668-53A0-48C2-8959-CC7ECEB6D004}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B59C0668-53A0-48C2-8959-CC7ECEB6D004}.Release|Any CPU.Build.0 = Release|Any CPU + {6AE920DD-D404-4781-B6D6-CABCA89FB42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6AE920DD-D404-4781-B6D6-CABCA89FB42D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6AE920DD-D404-4781-B6D6-CABCA89FB42D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6AE920DD-D404-4781-B6D6-CABCA89FB42D}.Release|Any CPU.Build.0 = Release|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.Build.0 = Release|Any CPU + {BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Release|Any CPU.Build.0 = Release|Any CPU + {248D0FE3-14C4-4205-AB5B-536755B93951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {248D0FE3-14C4-4205-AB5B-536755B93951}.Debug|Any CPU.Build.0 = Debug|Any CPU + {248D0FE3-14C4-4205-AB5B-536755B93951}.Release|Any CPU.ActiveCfg = Release|Any CPU + {248D0FE3-14C4-4205-AB5B-536755B93951}.Release|Any CPU.Build.0 = Release|Any CPU + {BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {ABA99076-1982-4649-B39C-D2A63DB228FA} + EndGlobalSection +EndGlobal diff --git a/SHERPA.BBM.UI/Data/BBM_EFService.cs b/SHERPA.BBM.UI/Data/BBM_EFService.cs index c90ce80..f89d430 100644 --- a/SHERPA.BBM.UI/Data/BBM_EFService.cs +++ b/SHERPA.BBM.UI/Data/BBM_EFService.cs @@ -98,7 +98,7 @@ namespace SHERPA.BBM.UI.Data { try { - dbController.DocDelete(currItem.CodBasket); + dbController.DocDelete(currItem.DocId); } catch { @@ -111,9 +111,9 @@ namespace SHERPA.BBM.UI.Data return Task.FromResult(dbController.DocGetLastDesc(numRec).ToArray()); } - public Task DocsGetAsync(string CodBasket, string CodNegotiation, int numRec) + public Task DocsGetAsync(int BasketId, int NegotiationId, int numRec) { - return Task.FromResult(dbController.DocGetLastDesc(CodBasket, CodNegotiation, numRec).ToArray()); + return Task.FromResult(dbController.DocGetLastDesc(BasketId, NegotiationId, numRec).ToArray()); } public void DocsUpdate(DatabaseModels.DocsModel currItem) diff --git a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj index 819ee21..d4e5085 100644 --- a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj +++ b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj @@ -1,4 +1,4 @@ - + net5.0 diff --git a/SHERPA.BBM/App.config b/SHERPA.BBM/App.config index 9839fae..7c55d35 100644 --- a/SHERPA.BBM/App.config +++ b/SHERPA.BBM/App.config @@ -1,14 +1,11 @@  + +
+ - - -
- diff --git a/SHERPA.BBM/Controllers/BBMController.cs b/SHERPA.BBM/Controllers/BBMController.cs index e229079..dcc79ff 100644 --- a/SHERPA.BBM/Controllers/BBMController.cs +++ b/SHERPA.BBM/Controllers/BBMController.cs @@ -169,18 +169,18 @@ namespace SHERPA.BBM.Controllers } /// - /// Elimina item Basket + /// Elimina item Doc /// - /// + /// /// - public bool DocDelete(string CodDoc) + public bool DocDelete(int DocId) { bool done = false; try { var item2del = dbCtx .DbSetDocs - .Where(x => x.CodDoc == CodDoc) + .Where(x => x.DocId == DocId) .FirstOrDefault(); dbCtx.DbSetDocs.Remove(item2del); dbCtx.SaveChanges(); @@ -221,7 +221,7 @@ namespace SHERPA.BBM.Controllers /// /// /// - public List DocGetLastDesc(string CodBasket = "", string CodNegotiation = "", int numRecord = 0) + public List DocGetLastDesc(int BasketId = 0, int NegotiationId = 0, int numRecord = 0) { List dbResult = new List(); // se numRecord = 0 --> passo tutti @@ -231,7 +231,7 @@ namespace SHERPA.BBM.Controllers } dbResult = dbCtx .DbSetDocs - .Where(x => (x.CodBasket == CodBasket || CodBasket == "") && (x.CodNegotiation == CodNegotiation || CodNegotiation == "")) + .Where(x => (x.BasketId == BasketId || BasketId == 0) && (x.NegotiationId == NegotiationId || NegotiationId == 0)) .OrderByDescending(x => x.CodDoc) .OrderByDescending(x => x.DataIns) .Take(numRecord) diff --git a/SHERPA.BBM/DatabaseContext.cs b/SHERPA.BBM/DatabaseContext.cs index 6b786fb..7a042be 100644 --- a/SHERPA.BBM/DatabaseContext.cs +++ b/SHERPA.BBM/DatabaseContext.cs @@ -21,7 +21,7 @@ namespace SHERPA.BBM //public DatabaseContext() : base("BBMModel") public DatabaseContext() : base("Data Source=SQL2012DEV;Initial Catalog=SHERPA.BBM;User ID=sa;Password=keyhammer16;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework") { - } + } public DatabaseContext(string connectionString) : base(connectionString) { diff --git a/SHERPA.BBM/DatabaseModels/BasketsModel.cs b/SHERPA.BBM/DatabaseModels/BasketsModel.cs index ed6fb5f..adbde51 100644 --- a/SHERPA.BBM/DatabaseModels/BasketsModel.cs +++ b/SHERPA.BBM/DatabaseModels/BasketsModel.cs @@ -14,16 +14,19 @@ namespace SHERPA.BBM.DatabaseModels { #region Public Properties - [Key, Column("CodBasket", Order = 0), MaxLength(50)] + [Key, Column("BasketId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int DocId { get; set; } + + [Column("CodBasket", Order = 1), MaxLength(50)] public string CodBasket { get; set; } = "BBM.0000.0000"; - [Column("CodClient", Order = 2), MaxLength(50)] + [Column("CodClient", Order = 3), MaxLength(50)] public string CodClient { get; set; } = "ND"; - [Column("DataIns", Order = 1)] + [Column("DataIns", Order = 2)] public DateTime DataIns { get; set; } = DateTime.Now; - [Column("Descript", Order = 3), MaxLength(250)] + [Column("Descript", Order = 4), MaxLength(250)] public string Descript { get; set; } = ""; #endregion Public Properties diff --git a/SHERPA.BBM/DatabaseModels/DocModel.cs b/SHERPA.BBM/DatabaseModels/DocModel.cs index 0ffcf6e..e047593 100644 --- a/SHERPA.BBM/DatabaseModels/DocModel.cs +++ b/SHERPA.BBM/DatabaseModels/DocModel.cs @@ -14,34 +14,37 @@ namespace SHERPA.BBM.DatabaseModels { #region Public Properties - [ForeignKey("CodBasket")] + [ForeignKey("BasketId")] public virtual BasketsModel Basket { get; set; } - [Column("CodBasket", Order = 6), MaxLength(50)] - public string CodBasket { get; set; } = ""; + [Column("BasketId", Order = 7), MaxLength(50)] + public int BasketId { get; set; } - [Key, Column("CodDoc", Order = 0), MaxLength(50)] + [Column("CodDoc", Order = 1), MaxLength(50)] public string CodDoc { get; set; } = "EGW.D.0000.0000.00"; - [Column("CodNegotiation", Order = 1), MaxLength(50)] - public string CodNegotiation { get; set; } = ""; + [Column("NegotiationId", Order = 2)] + public int NegotiationId { get; set; } - [Column("DataIns", Order = 5)] + [Column("DataIns", Order = 6)] public DateTime DataIns { get; set; } = DateTime.Now; - [Column("Descript", Order = 2), MaxLength(250)] + [Column("Descript", Order = 3), MaxLength(250)] public string Descript { get; set; } = ""; - [Column("DocPath", Order = 7), MaxLength(500)] + [Key, Column("DocId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int DocId { get; set; } + + [Column("DocPath", Order = 8), MaxLength(500)] public string DocPath { get; set; } = ""; - [Column("DocType", Order = 4)] + [Column("DocType", Order = 5)] public BbmDocType DocType { get; set; } = BbmDocType.Quote; - [ForeignKey("CodNegotiation")] + [ForeignKey("NegotiationId")] public virtual NegotiationsModel Negotiation { get; set; } - [Column("NumDoc", Order = 3)] + [Column("NumDoc", Order = 4)] public int NumDoc { get; set; } = 0; #endregion Public Properties diff --git a/SHERPA.BBM/DatabaseModels/Fatt2DocModel.cs b/SHERPA.BBM/DatabaseModels/Fatt2DocModel.cs index e0eecdb..e9b839d 100644 --- a/SHERPA.BBM/DatabaseModels/Fatt2DocModel.cs +++ b/SHERPA.BBM/DatabaseModels/Fatt2DocModel.cs @@ -14,13 +14,13 @@ namespace SHERPA.BBM.DatabaseModels { #region Public Properties - [Key, Column("CodDoc", Order = 0), MaxLength(50)] - public string CodDoc { get; set; } = ""; + [Key, Column("DocId", Order = 0)] + public int DocId { get; set; } [Column("DataIns", Order = 2)] public DateTime DataIns { get; set; } = DateTime.Now; - [ForeignKey("CodDoc")] + [ForeignKey("DocId")] public virtual DocsModel Document { get; set; } [Key, Column("IdxFatt", Order = 1)] diff --git a/SHERPA.BBM/DatabaseModels/ItemsModel.cs b/SHERPA.BBM/DatabaseModels/ItemsModel.cs index 21dd3fd..40c8ecd 100644 --- a/SHERPA.BBM/DatabaseModels/ItemsModel.cs +++ b/SHERPA.BBM/DatabaseModels/ItemsModel.cs @@ -17,22 +17,22 @@ namespace SHERPA.BBM.DatabaseModels [Key, Column("ItemId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int ItemId { get; set; } - [Column("CodItem", Order = 0), MaxLength(50)] + [Column("CodItem", Order = 1), MaxLength(50)] public string CodItem { get; set; } = "ITEM.000000"; - [Column("Descript", Order = 3), MaxLength(250)] + [Column("Descript", Order = 4), MaxLength(250)] public string Descript { get; set; } = ""; - [Column("ResType", Order = 1)] + [Column("ResType", Order = 2)] public BbmResType ResType { get; set; } = BbmResType.ND; - [Column("UM", Order = 2), MaxLength(50)] + [Column("UM", Order = 3), MaxLength(50)] public string UM { get; set; } = "nr"; - [Column("UnitCost", Order = 4)] + [Column("UnitCost", Order = 5)] public double UnitCost { get; set; } = 1; - [Column("UnitPrice", Order = 5)] + [Column("UnitPrice", Order = 6)] public double UnitPrice { get; set; } = 1; #endregion Public Properties diff --git a/SHERPA.BBM/DatabaseModels/NegotiationsModel.cs b/SHERPA.BBM/DatabaseModels/NegotiationsModel.cs index 65caa6e..94b196e 100644 --- a/SHERPA.BBM/DatabaseModels/NegotiationsModel.cs +++ b/SHERPA.BBM/DatabaseModels/NegotiationsModel.cs @@ -14,22 +14,25 @@ namespace SHERPA.BBM.DatabaseModels { #region Public Properties - [Column("BasePath", Order = 5)] + [Column("BasePath", Order = 6)] public string BasePath { get; set; } = ""; - [Column("CodClient", Order = 2), MaxLength(50)] + [Column("CodClient", Order = 3), MaxLength(50)] public string CodClient { get; set; } = "ND"; - [Key, Column("CodNegotiation", Order = 0), MaxLength(50)] + [Column("CodNegotiation", Order = 0), MaxLength(50)] public string CodNegotiation { get; set; } = "EGW.0000.0000"; - [Column("DataIns", Order = 1)] + [Column("DataIns", Order = 2)] public DateTime DataIns { get; set; } = DateTime.Now; - [Column("Descript", Order = 3), MaxLength(250)] + [Column("Descript", Order = 4), MaxLength(250)] public string Descript { get; set; } = ""; - [Column("Refer", Order = 4), MaxLength(50)] + [Key, Column("NegotiationId", Order = 1), DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int NegotiationId { get; set; } + + [Column("Refer", Order = 5), MaxLength(50)] public string Refer { get; set; } = ""; #endregion Public Properties diff --git a/SHERPA.BBM/DatabaseModels/ResurcesModel.cs b/SHERPA.BBM/DatabaseModels/ResurcesModel.cs index b00482c..68099f9 100644 --- a/SHERPA.BBM/DatabaseModels/ResurcesModel.cs +++ b/SHERPA.BBM/DatabaseModels/ResurcesModel.cs @@ -14,13 +14,13 @@ namespace SHERPA.BBM.DatabaseModels { #region Public Properties - [Column("CodDoc", Order = 1), MaxLength(50)] - public string CodDoc { get; set; } = ""; + [Column("DocId", Order = 1)] + public int DocId { get; set; } [Column("ItemId", Order = 3)] public int ItemId { get; set; } - [ForeignKey("CodDoc")] + [ForeignKey("DocId")] public virtual DocsModel Document { get; set; } [ForeignKey("ItemId")] diff --git a/SHERPA.BBM/Migrations/202103111741020_InitDb.Designer.cs b/SHERPA.BBM/Migrations/202103111741020_InitDb.Designer.cs deleted file mode 100644 index fff85f3..0000000 --- a/SHERPA.BBM/Migrations/202103111741020_InitDb.Designer.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -namespace SHERPA.BBM.Migrations -{ - using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; - using System.Resources; - - [GeneratedCode("EntityFramework.Migrations", "6.4.4")] - public sealed partial class InitDb : IMigrationMetadata - { - private readonly ResourceManager Resources = new ResourceManager(typeof(InitDb)); - - string IMigrationMetadata.Id - { - get { return "202103111741020_InitDb"; } - } - - string IMigrationMetadata.Source - { - get { return null; } - } - - string IMigrationMetadata.Target - { - get { return Resources.GetString("Target"); } - } - } -} diff --git a/SHERPA.BBM/Migrations/202103111741020_InitDb.cs b/SHERPA.BBM/Migrations/202103111741020_InitDb.cs deleted file mode 100644 index 10b5882..0000000 --- a/SHERPA.BBM/Migrations/202103111741020_InitDb.cs +++ /dev/null @@ -1,128 +0,0 @@ -namespace SHERPA.BBM.Migrations -{ - using System; - using System.Data.Entity.Migrations; - - public partial class InitDb : DbMigration - { - public override void Up() - { - CreateTable( - "dbo.Baskets", - c => new - { - CodBasket = c.String(nullable: false, maxLength: 50), - DataIns = c.DateTime(nullable: false), - CodClient = c.String(maxLength: 50), - Descript = c.String(maxLength: 250), - }) - .PrimaryKey(t => t.CodBasket); - - CreateTable( - "dbo.Counters", - c => new - { - CodCounter = c.String(nullable: false, maxLength: 50), - LastNum = c.Int(nullable: false), - }) - .PrimaryKey(t => t.CodCounter); - - CreateTable( - "dbo.Docs", - c => new - { - CodDoc = c.String(nullable: false, maxLength: 50), - CodNegotiation = c.String(maxLength: 50), - Descript = c.String(maxLength: 250), - NumDoc = c.Int(nullable: false), - DocType = c.Int(nullable: false), - DataIns = c.DateTime(nullable: false), - CodBasket = c.String(maxLength: 50), - DocPath = c.String(maxLength: 500), - }) - .PrimaryKey(t => t.CodDoc) - .ForeignKey("dbo.Baskets", t => t.CodBasket) - .ForeignKey("dbo.Negotiations", t => t.CodNegotiation) - .Index(t => t.CodNegotiation) - .Index(t => t.CodBasket); - - CreateTable( - "dbo.Negotiations", - c => new - { - CodNegotiation = c.String(nullable: false, maxLength: 50), - DataIns = c.DateTime(nullable: false), - CodClient = c.String(maxLength: 50), - Descript = c.String(maxLength: 250), - Refer = c.String(maxLength: 50), - BasePath = c.String(), - }) - .PrimaryKey(t => t.CodNegotiation); - - CreateTable( - "dbo.Fatt2Doc", - c => new - { - CodDoc = c.String(nullable: false, maxLength: 50), - IdxFatt = c.Int(nullable: false), - DataIns = c.DateTime(nullable: false), - }) - .PrimaryKey(t => new { t.CodDoc, t.IdxFatt }) - .ForeignKey("dbo.Docs", t => t.CodDoc, cascadeDelete: true) - .Index(t => t.CodDoc); - - CreateTable( - "dbo.Items", - c => new - { - CodItem = c.String(nullable: false, maxLength: 50), - ResType = c.Int(nullable: false), - UM = c.String(maxLength: 50), - Descript = c.String(maxLength: 250), - UnitCost = c.Double(nullable: false), - UnitPrice = c.Double(nullable: false), - }) - .PrimaryKey(t => t.CodItem); - - CreateTable( - "dbo.Resources", - c => new - { - ResourceId = c.Int(nullable: false, identity: true), - CodDoc = c.String(maxLength: 50), - Ord = c.Int(nullable: false), - CodItem = c.String(maxLength: 50), - QtyPrev = c.Double(nullable: false), - QtyOff = c.Double(nullable: false), - UnitPriceOff = c.Double(nullable: false), - }) - .PrimaryKey(t => t.ResourceId) - .ForeignKey("dbo.Docs", t => t.CodDoc) - .ForeignKey("dbo.Items", t => t.CodItem) - .Index(t => t.CodDoc) - .Index(t => t.CodItem); - - } - - public override void Down() - { - DropForeignKey("dbo.Resources", "CodItem", "dbo.Items"); - DropForeignKey("dbo.Resources", "CodDoc", "dbo.Docs"); - DropForeignKey("dbo.Fatt2Doc", "CodDoc", "dbo.Docs"); - DropForeignKey("dbo.Docs", "CodNegotiation", "dbo.Negotiations"); - DropForeignKey("dbo.Docs", "CodBasket", "dbo.Baskets"); - DropIndex("dbo.Resources", new[] { "CodItem" }); - DropIndex("dbo.Resources", new[] { "CodDoc" }); - DropIndex("dbo.Fatt2Doc", new[] { "CodDoc" }); - DropIndex("dbo.Docs", new[] { "CodBasket" }); - DropIndex("dbo.Docs", new[] { "CodNegotiation" }); - DropTable("dbo.Resources"); - DropTable("dbo.Items"); - DropTable("dbo.Fatt2Doc"); - DropTable("dbo.Negotiations"); - DropTable("dbo.Docs"); - DropTable("dbo.Counters"); - DropTable("dbo.Baskets"); - } - } -} diff --git a/SHERPA.BBM/Migrations/202103111741020_InitDb.resx b/SHERPA.BBM/Migrations/202103111741020_InitDb.resx deleted file mode 100644 index 7209839..0000000 --- a/SHERPA.BBM/Migrations/202103111741020_InitDb.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - - - dbo - - \ No newline at end of file diff --git a/SHERPA.BBM/SHERPA.BBM.csproj b/SHERPA.BBM/SHERPA.BBM.csproj index 6c52d70..9cc9481 100644 --- a/SHERPA.BBM/SHERPA.BBM.csproj +++ b/SHERPA.BBM/SHERPA.BBM.csproj @@ -86,23 +86,13 @@ - - - 202103111741020_InitDb.cs - - - - - 202103111741020_InitDb.cs - - diff --git a/SHERPA.sln b/SHERPA.sln index 98630fb..2a99f27 100644 --- a/SHERPA.sln +++ b/SHERPA.sln @@ -11,10 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW_data", "..\GPW\GPW_Data EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA_SYNC", "SHERPA_SYNC\SHERPA_SYNC.csproj", "{BF6789C2-2592-4A8F-B75B-C938E3D90F71}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA.BBM", "SHERPA.BBM\SHERPA.BBM.csproj", "{248D0FE3-14C4-4205-AB5B-536755B93951}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SHERPA.BBM.UI", "SHERPA.BBM.UI\SHERPA.BBM.UI.csproj", "{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,14 +33,6 @@ Global {BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Release|Any CPU.Build.0 = Release|Any CPU - {248D0FE3-14C4-4205-AB5B-536755B93951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {248D0FE3-14C4-4205-AB5B-536755B93951}.Debug|Any CPU.Build.0 = Debug|Any CPU - {248D0FE3-14C4-4205-AB5B-536755B93951}.Release|Any CPU.ActiveCfg = Release|Any CPU - {248D0FE3-14C4-4205-AB5B-536755B93951}.Release|Any CPU.Build.0 = Release|Any CPU - {BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SHERPA/SHERPA.csproj b/SHERPA/SHERPA.csproj index b5c16c7..6a4d0f6 100644 --- a/SHERPA/SHERPA.csproj +++ b/SHERPA/SHERPA.csproj @@ -119,8 +119,8 @@ ..\packages\MongoDB.Driver.Core.2.12.0\lib\net452\MongoDB.Driver.Core.dll - - ..\packages\MongoDB.LibMongocrypt.1.2.0\lib\net452\MongoDB.LibMongocrypt.dll + + ..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -811,10 +811,6 @@ {7bea5d99-8486-4592-b01d-fe2c76eb66cf} GPW_data - - {248d0fe3-14c4-4205-ab5b-536755b93951} - SHERPA.BBM - {bf6789c2-2592-4a8f-b75b-c938e3d90f71} SHERPA_SYNC @@ -894,11 +890,11 @@ - + - + \ No newline at end of file diff --git a/SHERPA/packages.config b/SHERPA/packages.config index 0a5ed2c..54b8c6e 100644 --- a/SHERPA/packages.config +++ b/SHERPA/packages.config @@ -33,7 +33,7 @@ - + diff --git a/SHERPA_SYNC/SHERPA_SYNC.csproj b/SHERPA_SYNC/SHERPA_SYNC.csproj index 9c9998e..facd650 100644 --- a/SHERPA_SYNC/SHERPA_SYNC.csproj +++ b/SHERPA_SYNC/SHERPA_SYNC.csproj @@ -61,8 +61,8 @@ ..\packages\MongoDB.Driver.Core.2.12.0\lib\net452\MongoDB.Driver.Core.dll - - ..\packages\MongoDB.LibMongocrypt.1.2.0\lib\net452\MongoDB.LibMongocrypt.dll + + ..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -184,9 +184,9 @@ - + - + \ No newline at end of file diff --git a/SHERPA_SYNC/packages.config b/SHERPA_SYNC/packages.config index 4d91f7e..864a3e5 100644 --- a/SHERPA_SYNC/packages.config +++ b/SHERPA_SYNC/packages.config @@ -9,7 +9,7 @@ - +