From 94a6860b09a33cb4acac78e6607148a2edc0a8e3 Mon Sep 17 00:00:00 2001 From: Thomas Wiedebusch Date: Thu, 2 Mar 2023 09:09:34 +0100 Subject: [PATCH] GenesisStatus: Repaired project location --- Common/Common.sln | 2 +- .../CordonelAssemblyLine/CordonelAssemblyLine.csproj | 2 +- .../{GenesisStatus => }/GenesisStatus.cs | 0 .../{GenesisStatus => }/GenesisStatus.csproj | 11 ++++++----- .../{GenesisStatus => }/GenesisStatusHandler.cs | 0 .../{GenesisStatus => }/Properties/AssemblyInfo.cs | 0 .../GenesisStatus/{GenesisStatus => }/packages.config | 0 .../ProductionUiCordonel/ProductionUiCordonel.csproj | 2 +- .../MeterProcessState/MeterProcessState.csproj | 2 +- Common/Ui/GenesisToolBox/GenesisToolBox.csproj | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) rename Common/Hardware/WaterMeter/Genesis/GenesisStatus/{GenesisStatus => }/GenesisStatus.cs (100%) rename Common/Hardware/WaterMeter/Genesis/GenesisStatus/{GenesisStatus => }/GenesisStatus.csproj (86%) rename Common/Hardware/WaterMeter/Genesis/GenesisStatus/{GenesisStatus => }/GenesisStatusHandler.cs (100%) rename Common/Hardware/WaterMeter/Genesis/GenesisStatus/{GenesisStatus => }/Properties/AssemblyInfo.cs (100%) rename Common/Hardware/WaterMeter/Genesis/GenesisStatus/{GenesisStatus => }/packages.config (100%) diff --git a/Common/Common.sln b/Common/Common.sln index f4f6bdce..05f7ea5b 100644 --- a/Common/Common.sln +++ b/Common/Common.sln @@ -149,7 +149,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TempFlansh", "TempFlansh\Te EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicStremingLogAnalyzer", "Ui\DynamicStremingLogAnalyzer\DynamicStremingLogAnalyzer.csproj", "{652ECA13-A411-4789-8814-6823965947CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenesisStatus", "Hardware\WaterMeter\Genesis\GenesisStatus\GenesisStatus\GenesisStatus.csproj", "{0F646872-D8DC-4EE5-989F-D4C73F0ACE3F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenesisStatus", "Hardware\WaterMeter\Genesis\GenesisStatus\GenesisStatus.csproj", "{0F646872-D8DC-4EE5-989F-D4C73F0ACE3F}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution diff --git a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj index 17812979..ca9e7a83 100644 --- a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj +++ b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj @@ -180,7 +180,7 @@ {2C6378C6-6BA1-4CEE-8992-8404D8369A90} GenesisFile - + {0F646872-D8DC-4EE5-989F-D4C73F0ACE3F} GenesisStatus diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/GenesisStatus.cs b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.cs similarity index 100% rename from Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/GenesisStatus.cs rename to Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.cs diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/GenesisStatus.csproj b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.csproj similarity index 86% rename from Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/GenesisStatus.csproj rename to Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.csproj index fbb862b4..19a59454 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/GenesisStatus.csproj +++ b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.csproj @@ -32,7 +32,8 @@ - ..\..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + False + ..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll @@ -48,19 +49,19 @@ - + {9EB1F659-6F73-4F65-BCAB-4114FD94F5FC} CommonCore.Configuration - + {A33E3C6D-EAAE-4A20-A0EE-F9E6922FD029} SoftwareAccessHelper - + {04201E95-90A0-4B73-A72F-379739B2A3AE} GenesisCore - + {F4AAF7E6-7333-4284-B735-E32DEB076C64} Registers diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/GenesisStatusHandler.cs b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatusHandler.cs similarity index 100% rename from Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/GenesisStatusHandler.cs rename to Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatusHandler.cs diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/Properties/AssemblyInfo.cs b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/Properties/AssemblyInfo.cs similarity index 100% rename from Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/Properties/AssemblyInfo.cs rename to Common/Hardware/WaterMeter/Genesis/GenesisStatus/Properties/AssemblyInfo.cs diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/packages.config b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/packages.config similarity index 100% rename from Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus/packages.config rename to Common/Hardware/WaterMeter/Genesis/GenesisStatus/packages.config diff --git a/Common/ProductionUiCordonel/ProductionUiCordonel.csproj b/Common/ProductionUiCordonel/ProductionUiCordonel.csproj index b6c88422..ee1d811e 100644 --- a/Common/ProductionUiCordonel/ProductionUiCordonel.csproj +++ b/Common/ProductionUiCordonel/ProductionUiCordonel.csproj @@ -339,7 +339,7 @@ {AC434B18-4D7B-49BA-9AD5-0527C79E8297} GenesisPwd - + {0F646872-D8DC-4EE5-989F-D4C73F0ACE3F} GenesisStatus diff --git a/Common/Service/MeterProcessState/MeterProcessState.csproj b/Common/Service/MeterProcessState/MeterProcessState.csproj index ca717448..a49c0cde 100644 --- a/Common/Service/MeterProcessState/MeterProcessState.csproj +++ b/Common/Service/MeterProcessState/MeterProcessState.csproj @@ -385,7 +385,7 @@ {2C6378C6-6BA1-4CEE-8992-8404D8369A90} GenesisFile - + {0F646872-D8DC-4EE5-989F-D4C73F0ACE3F} GenesisStatus diff --git a/Common/Ui/GenesisToolBox/GenesisToolBox.csproj b/Common/Ui/GenesisToolBox/GenesisToolBox.csproj index f277c596..bc4bf65e 100644 --- a/Common/Ui/GenesisToolBox/GenesisToolBox.csproj +++ b/Common/Ui/GenesisToolBox/GenesisToolBox.csproj @@ -629,7 +629,7 @@ {ac434b18-4d7b-49ba-9ad5-0527c79e8297} GenesisPwd - + {0F646872-D8DC-4EE5-989F-D4C73F0ACE3F} GenesisStatus