marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge and fixing framework downgrade

Browse Source
This commit is contained in:
Roland Drabesch
2023-03-20 14:15:38 +01:00
parent 83c26d7eaf
commit a3c6804b86
8 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.vs/config/applicationhost.config
+1 -1
View File
@@ -155,7 +155,7 @@
</site> </site>
<site name="MeterProcessState" id="2"> <site name="MeterProcessState" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" /> <virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:56011:localhost" /> <binding protocol="http" bindingInformation="*:56011:localhost" />
Common/Cryptology/Security/Cryptology.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xylem.Common.Cryptology.Security</RootNamespace> <RootNamespace>Xylem.Common.Cryptology.Security</RootNamespace>
<AssemblyName>Xylem.Common.Cryptology.Security</AssemblyName> <AssemblyName>Xylem.Common.Cryptology.Security</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>false</Deterministic> <Deterministic>false</Deterministic>
<SccProjectName>SAK</SccProjectName> <SccProjectName>SAK</SccProjectName>
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
1a3d4919c9c702245832d925951f2b7cb72fc333 5ed75d99ee45ff67821090f1b3dbb001dd9e4fe3
Common/Service/MeterProcessState/Controllers/EasyAccessControler.cs
+15 -8
View File
@@ -228,19 +228,26 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
var dt = dataAccess.ExecuteQuery(query.ToString()); var dt = dataAccess.ExecuteQuery(query.ToString());
var sb = new StringBuilder(); var sb = new StringBuilder();
sb = null;
sb.AppendLine(" SerienNr; PruefgangNr; Wiederholungen; Einbauplatz; Nennweite ; ");
for (int i = 1; i <= 10; i++)
{
sb.AppendLine($"PP{i}_Soll;PP{i}_Ist;PP{i}_Ist_V;PP{i}_Fehler");
}
foreach (var item in dt.Select()) foreach (var item in dt.Select())
{ {
try try
{ {
foreach (var cell in item.ItemArray)
if (sb == null) {
{ sb.Append(cell).Append(";");
sb = new StringBuilder(); }
sb.AppendLine();
}
} }
catch (Exception ex) catch (Exception ex)
Common/Service/ProductionService/CordonelMetersFinalCheck.cs
-4
View File
@@ -48,10 +48,6 @@ namespace ProductionService
int count = (int)command.ExecuteScalar(); int count = (int)command.ExecuteScalar();
// Do something with the count here // Do something with the count here
foreach (var item in collection)
{
}
} }
} }
} }
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
f64d563def603c89cafafa61a3219ba97e1e344c 0d85a5b3a7561b41163c20e5dc7713bcd0d65555
ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xylem.ServiceFwUpdate.Common.FwUpdateDb</RootNamespace> <RootNamespace>Xylem.ServiceFwUpdate.Common.FwUpdateDb</RootNamespace>
<AssemblyName>Xylem.ServiceFwUpdate.Common.FwUpdateDb</AssemblyName> <AssemblyName>Xylem.ServiceFwUpdate.Common.FwUpdateDb</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<SccProjectName>SAK</SccProjectName> <SccProjectName>SAK</SccProjectName>
ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xylem.ServiceFwUpdate.Common.FwUpdateSafe</RootNamespace> <RootNamespace>Xylem.ServiceFwUpdate.Common.FwUpdateSafe</RootNamespace>
<AssemblyName>Xylem.ServiceFwUpdate.Common.FwUpdateSafe</AssemblyName> <AssemblyName>Xylem.ServiceFwUpdate.Common.FwUpdateSafe</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<SccProjectName>SAK</SccProjectName> <SccProjectName>SAK</SccProjectName>