From 2a64cf1e9184dd3924cdeaaa1b867f99f6d4594c Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期五, 10 七月 2020 18:40:44 +0800
Subject: [PATCH] 7.10
---
src/Bro.Process.DBManager/Bro.Process.DataBase.csproj | 2 +-
src/Bro.M071.DBManager/KeyUnitDataManager.cs | 2 +-
src/Bro.Process/Bro.Process.csproj | 4 +++-
src/Bro.Common.Model/Bro.Common.Model.csproj | 5 ++---
src/Bro.M071.DBManager/MeasurementUnitResultManager.cs | 2 +-
src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs | 2 +-
src/Bro.M071.DBManager/MeasurementAndKeyDataRelationManager.cs | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/Bro.Common.Model/Bro.Common.Model.csproj b/src/Bro.Common.Model/Bro.Common.Model.csproj
index f20a16a..5bb013e 100644
--- a/src/Bro.Common.Model/Bro.Common.Model.csproj
+++ b/src/Bro.Common.Model/Bro.Common.Model.csproj
@@ -76,9 +76,8 @@
<Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
</Reference>
- <Reference Include="dog_net_windows, Version=1.0.1.28668, Culture=neutral, PublicKeyToken=56120be447701319, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\T047\libs\SafetyDog\dog_net_windows.dll</HintPath>
+ <Reference Include="dog_net_windows">
+ <HintPath>..\..\libs\SafetyDog\dog_net_windows.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
diff --git a/src/Bro.M071.DBManager/KeyUnitDataManager.cs b/src/Bro.M071.DBManager/KeyUnitDataManager.cs
index 2b246c7..2bee754 100644
--- a/src/Bro.M071.DBManager/KeyUnitDataManager.cs
+++ b/src/Bro.M071.DBManager/KeyUnitDataManager.cs
@@ -14,7 +14,7 @@
{
public class KeyUnitDataManager : ModelManager<KeyUnitData>
{
- DbProviderFactory Dbfactory = SQLiteFactory.Instance;
+ //DbProviderFactory Dbfactory = SQLiteFactory.Instance;
protected override void ActionBeforeNewModel(DBModel context, KeyUnitData config)
{
CheckProductionCodeDuplicate(context, config);
diff --git a/src/Bro.M071.DBManager/MeasurementAndKeyDataRelationManager.cs b/src/Bro.M071.DBManager/MeasurementAndKeyDataRelationManager.cs
index 8a368a5..b8c8b6c 100644
--- a/src/Bro.M071.DBManager/MeasurementAndKeyDataRelationManager.cs
+++ b/src/Bro.M071.DBManager/MeasurementAndKeyDataRelationManager.cs
@@ -14,7 +14,7 @@
{
public class MeasurementAndKeyDataRelationManager : ModelManager<MeasurementAndKeyDataRelation>
{
- DbProviderFactory Dbfactory = SQLiteFactory.Instance;
+ //DbProviderFactory Dbfactory = SQLiteFactory.Instance;
protected override void ActionBeforeNewModel(DBModel context, MeasurementAndKeyDataRelation config)
{
CheckProductionCodeDuplicate(context, config);
diff --git a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
index be0bb9e..686a1e1 100644
--- a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
+++ b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
@@ -14,7 +14,7 @@
{
public class MeasurementUnitResultManager : ModelManager<MeasurementUnitResult>
{
- DbProviderFactory Dbfactory = SQLiteFactory.Instance;
+ //DbProviderFactory Dbfactory = SQLiteFactory.Instance;
protected override void ActionBeforeNewModel(DBModel context, MeasurementUnitResult config)
{
CheckProductionCodeDuplicate(context, config);
diff --git a/src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs b/src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs
index 1526b59..fa3f8f6 100644
--- a/src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs
+++ b/src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs
@@ -14,7 +14,7 @@
{
public class ProductionMeasurementRecordsManager : ModelManager<ProductionMeasurementRecords>
{
- DbProviderFactory Dbfactory = SQLiteFactory.Instance;
+ //DbProviderFactory Dbfactory = SQLiteFactory.Instance;
protected override void ActionBeforeNewModel(DBModel context, ProductionMeasurementRecords config)
{
CheckProductionCodeDuplicate(context, config);
diff --git a/src/Bro.Process.DBManager/Bro.Process.DataBase.csproj b/src/Bro.Process.DBManager/Bro.Process.DataBase.csproj
index c2ecbbd..e8d335d 100644
--- a/src/Bro.Process.DBManager/Bro.Process.DataBase.csproj
+++ b/src/Bro.Process.DBManager/Bro.Process.DataBase.csproj
@@ -122,7 +122,7 @@
<Project>{987308DD-8BAA-463A-94E2-77D62E01A5BF}</Project>
<Name>Bro.Common.Device</Name>
</ProjectReference>
- <ProjectReference Include="..\Bro.M071.Process.Model\Bro.M071.Model.csproj">
+ <ProjectReference Include="..\Bro.M071.Model\Bro.M071.Model.csproj">
<Project>{AD645C48-5811-4B1E-B81F-D35D5E6B577F}</Project>
<Name>Bro.M071.Model</Name>
</ProjectReference>
diff --git a/src/Bro.Process/Bro.Process.csproj b/src/Bro.Process/Bro.Process.csproj
index c705958..d7b408b 100644
--- a/src/Bro.Process/Bro.Process.csproj
+++ b/src/Bro.Process/Bro.Process.csproj
@@ -128,7 +128,9 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
- <None Include="Setting.json" />
+ <None Include="Setting.json">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Forms\Calibration\FrmCalibration_9P.resx">
--
Gitblit v1.8.0