diff --git a/Common/.shared/SharedAssemblyInfo.cs b/Common/.shared/SharedAssemblyInfo.cs index ae1a5838..4520536c 100644 --- a/Common/.shared/SharedAssemblyInfo.cs +++ b/Common/.shared/SharedAssemblyInfo.cs @@ -14,4 +14,4 @@ using System.Reflection; //[assembly: AssemblyVersion("1.2.*.0")] -[assembly: AssemblyVersion("2.6.10.*")] +[assembly: AssemblyVersion("2.6.11.*")] diff --git a/Common/.vs/config/applicationhost.config b/Common/.vs/config/applicationhost.config index de10b180..883679a3 100644 --- a/Common/.vs/config/applicationhost.config +++ b/Common/.vs/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/Common/Common.sln.DotSettings.user b/Common/Common.sln.DotSettings.user index 9a455621..5a21fbc7 100644 --- a/Common/Common.sln.DotSettings.user +++ b/Common/Common.sln.DotSettings.user @@ -21,6 +21,8 @@ <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> <Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /> <Policy Inspect="False" Prefix="" Suffix="" Style="Aa_bb" /> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Enum members"><ElementKinds><Kind Name="ENUM_MEMBER" /></ElementKinds></Descriptor><Policy Inspect="False" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Properties"><ElementKinds><Kind Name="PROPERTY" /></ElementKinds></Descriptor><Policy Inspect="False" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="Aa_bb" /></Policy> <AssemblyExplorer> <Assembly Path="D:\Projekte\SENSUS_tfs_workspaces\WorkBenchV2\Main\Common\Ui\IrdaFunctionalTestApp\bin\Debug\Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.dll" /> <Assembly Path="D:\Projekte\SENSUS_GitLab\laa_production\Common\Hardware\WaterMeter\Genesis\GenesisPwd\bin\Debug\Newtonsoft.Json.dll" /> @@ -28,6 +30,7 @@ True NewVersion True + True diff --git a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj index 6148fb5a..d55b6f53 100644 --- a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj +++ b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj @@ -80,7 +80,7 @@ true - 254AA244F3F29F0692A7B2FAA31F24C884355262 + 5586F8F849F79C1CEB990ED4E3ACB22CDF595CB5 CordonelAssemblyLine_TemporaryKey.pfx @@ -91,6 +91,9 @@ true + + true + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/Common/CordonelAssemblyLine/Model/PickingModel.cs b/Common/CordonelAssemblyLine/Model/PickingModel.cs index e7f32ca4..4141f59c 100644 --- a/Common/CordonelAssemblyLine/Model/PickingModel.cs +++ b/Common/CordonelAssemblyLine/Model/PickingModel.cs @@ -9,6 +9,7 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading; using System.Threading.Tasks; +using System.Windows; using Xylem.Common.CommonCore.Configuration; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile; diff --git a/Common/CordonelPreadjustmentUi/MainForm.cs b/Common/CordonelPreadjustmentUi/MainForm.cs index e96f977c..8fbc7f47 100644 --- a/Common/CordonelPreadjustmentUi/MainForm.cs +++ b/Common/CordonelPreadjustmentUi/MainForm.cs @@ -11,6 +11,7 @@ using Xylem.Common.CommonCore.Consts; using Xylem.Common.Hardware.Interfaces.Ports.PortCore; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig; using Xylem.Common.Hardware.WaterMeter.WaterMeterCore; +using Xylem.Common.Ui.CordonelPreadjustmentUi; namespace CordonelPreadjustmentUi { diff --git a/Common/CordonelPreadjustmentUi/MeterStateControl.Designer.cs b/Common/CordonelPreadjustmentUi/MeterStateControl.Designer.cs index aec05c13..fdebe704 100644 --- a/Common/CordonelPreadjustmentUi/MeterStateControl.Designer.cs +++ b/Common/CordonelPreadjustmentUi/MeterStateControl.Designer.cs @@ -1,4 +1,4 @@ -namespace CordonelPreadjustmentUi +namespace Xylem.Common.Ui.CordonelPreadjustmentUi { partial class MeterStateControl { diff --git a/Common/CordonelPreadjustmentUi/MeterStateControl.cs b/Common/CordonelPreadjustmentUi/MeterStateControl.cs index 4ceed16a..d157ac8d 100644 --- a/Common/CordonelPreadjustmentUi/MeterStateControl.cs +++ b/Common/CordonelPreadjustmentUi/MeterStateControl.cs @@ -1,19 +1,18 @@ -using CordonelPreadjustmentUi.Processes.Itinerary; -using Newtonsoft.Json; -using System; +using System; using System.Collections.Generic; -using System.Configuration; using System.Drawing; using System.Linq; -using System.Net.Http; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using CordonelPreadjustmentUi; +using CordonelPreadjustmentUi.Processes.Itinerary; +using Newtonsoft.Json; using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; using Xylem.Common.Logic.SoftwareAccessHelper; using Xylem.Common.Ui.CordonelPreadjustmentUi.Helper.Extensions; -namespace CordonelPreadjustmentUi +namespace Xylem.Common.Ui.CordonelPreadjustmentUi { public partial class MeterStateControl : UserControl diff --git a/Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs b/Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs index 3db5e413..6fbc5463 100644 --- a/Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs +++ b/Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs @@ -13,6 +13,7 @@ using System.Windows.Forms; using Xylem.Common.Hardware.WaterMeter.WaterMeterCore; using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts; using Xylem.Common.Logic.ProductionOrderCore.OrderData; +using Xylem.Common.Ui.CordonelPreadjustmentUi; using Xylem.Common.Ui.CordonelPreadjustmentUi.Parameters; namespace CordonelPreadjustmentUi diff --git a/Common/CordonelPreadjustmentUi/Processes/Actions/AmplitudeTestProcess.cs b/Common/CordonelPreadjustmentUi/Processes/Actions/AmplitudeTestProcess.cs index 2a0b6118..535b9a16 100644 --- a/Common/CordonelPreadjustmentUi/Processes/Actions/AmplitudeTestProcess.cs +++ b/Common/CordonelPreadjustmentUi/Processes/Actions/AmplitudeTestProcess.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; +using Xylem.Common.Ui.CordonelPreadjustmentUi; using static CordonelPreadjustmentUi.PreAdjustmentControl; namespace CordonelPreadjustmentUi.Processes.Actions diff --git a/Common/CordonelPreadjustmentUi/Processes/Actions/LoginProcess.cs b/Common/CordonelPreadjustmentUi/Processes/Actions/LoginProcess.cs index 5f8119f6..7fc5dcd2 100644 --- a/Common/CordonelPreadjustmentUi/Processes/Actions/LoginProcess.cs +++ b/Common/CordonelPreadjustmentUi/Processes/Actions/LoginProcess.cs @@ -8,6 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Xylem.Common.CommonCore.Consts; using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; +using Xylem.Common.Ui.CordonelPreadjustmentUi; using static CordonelPreadjustmentUi.PreAdjustmentControl; diff --git a/Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPAmplitudeTestProcess.cs b/Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPAmplitudeTestProcess.cs index d69dd737..eca5e9eb 100644 --- a/Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPAmplitudeTestProcess.cs +++ b/Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPAmplitudeTestProcess.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; +using Xylem.Common.Ui.CordonelPreadjustmentUi; using static CordonelPreadjustmentUi.PreAdjustmentControl; namespace CordonelPreadjustmentUi.Processes.Actions diff --git a/Common/CordonelPreadjustmentUi/Processes/BaseProcess.cs b/Common/CordonelPreadjustmentUi/Processes/BaseProcess.cs index 24cbcb81..9b0cef5b 100644 --- a/Common/CordonelPreadjustmentUi/Processes/BaseProcess.cs +++ b/Common/CordonelPreadjustmentUi/Processes/BaseProcess.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Xylem.Common.Ui.CordonelPreadjustmentUi; using static CordonelPreadjustmentUi.PreAdjustmentControl; namespace CordonelPreadjustmentUi.Processes diff --git a/Common/CordonelPreadjustmentUi/Processes/IProcess.cs b/Common/CordonelPreadjustmentUi/Processes/IProcess.cs index 23beed32..2f4ad46e 100644 --- a/Common/CordonelPreadjustmentUi/Processes/IProcess.cs +++ b/Common/CordonelPreadjustmentUi/Processes/IProcess.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using Xylem.Common.Ui.CordonelPreadjustmentUi; namespace CordonelPreadjustmentUi.Processes { diff --git a/Common/CordonelPreadjustmentUi/TempMeterStateControl.cs b/Common/CordonelPreadjustmentUi/TempMeterStateControl.cs index 8754c1e5..853a6039 100644 --- a/Common/CordonelPreadjustmentUi/TempMeterStateControl.cs +++ b/Common/CordonelPreadjustmentUi/TempMeterStateControl.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading; using CordonelPreadjustmentUi.Processes.Itinerary; +using Xylem.Common.Ui.CordonelPreadjustmentUi; namespace CordonelPreadjustmentUi { diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache index d110f5fc..9389613c 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c43c40a030005a8f189e6179faf40a6d42bfef5c +7df2ad6be70922b931820861acc675522243ee78 diff --git a/Common/LaaPackages b/Common/LaaPackages index 466fafaf..9d6866a1 160000 --- a/Common/LaaPackages +++ b/Common/LaaPackages @@ -1 +1 @@ -Subproject commit 466fafaf46e31503975195fc911d6182971fa10b +Subproject commit 9d6866a16b66a4281d0620f0d1d305ad46fd6b1d diff --git a/Common/SoftwareAccessHelper/LocalWebRequest.cs b/Common/SoftwareAccessHelper/LocalWebRequest.cs index 851b7882..462aaa31 100644 --- a/Common/SoftwareAccessHelper/LocalWebRequest.cs +++ b/Common/SoftwareAccessHelper/LocalWebRequest.cs @@ -285,7 +285,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper { try { - var httpClient = new System.Net.Http.HttpClient(); + var httpClient = new HttpClient(); httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); httpClient.Timeout = TimeSpan.FromMilliseconds(timeoutMs); diff --git a/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj b/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj index a40a5b84..f9df97b0 100644 --- a/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj +++ b/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj @@ -95,7 +95,7 @@ - ..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Net.Http.dll + C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Http.dll diff --git a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache index 84b6b3be..5d31c946 100644 --- a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache +++ b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -65d75c3322f8a137c69963cfdc0cb6f1ffacf62a +070cbc63d77ce85bafd060291a9ebf8c88444eb5 diff --git a/Common/Ui/LegacyGenesisControl/ctlBenchRdy.cs b/Common/Ui/LegacyGenesisControl/ctlBenchRdy.cs index 65f90f1f..a3919c1a 100644 --- a/Common/Ui/LegacyGenesisControl/ctlBenchRdy.cs +++ b/Common/Ui/LegacyGenesisControl/ctlBenchRdy.cs @@ -14,7 +14,7 @@ using Xylem.Common.Logic.ProductionOrderCore.OrderData; using Xylem.Common.Logic.SoftwareAccessHelper; using XylemCommonUiLegacyGenCtl.DataPackage; using XylemCommonUiLegacyGenCtl.Enums; -using static CordonelPreadjustmentUi.MeterStateControl; +using static Xylem.Common.Ui.CordonelPreadjustmentUi.MeterStateControl; namespace XylemCommonUiLegacyGenCtl {