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

merged to main

Browse Source
This commit is contained in:
Thomas Wiedebusch 2026-02-12 09:26:42 +01:00
parent 9645eba701
commit ae2af1eb63
7 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/.shared/SharedAssemblyInfo.cs
View File

@ -13,4 +13,4 @@ using System.Reflection;
// //
//[assembly: AssemblyVersion("1.2.*.0")] //[assembly: AssemblyVersion("1.2.*.0")]
[assembly: AssemblyVersion("2.8.16.*")] [assembly: AssemblyVersion("2.8.17.*")]

2
Common/.vs/Common/config/applicationhost.config
View File

@ -179,7 +179,7 @@
</site> </site>
<site name="MeterProcessState(3)" id="5"> <site name="MeterProcessState(3)" id="5">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\REPO\lab\la_operations\laa_production\Common\Service\MeterProcessState" /> <virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\LAA_PRODUCTION\Common\Service\MeterProcessState" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:50076:localhost" /> <binding protocol="http" bindingInformation="*:50076:localhost" />

5
FM2014TestApp/Ui/Fm2014sTest/App.config
View File

@ -3,4 +3,9 @@
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1" />
</startup> </startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="Library\de;Library;Config"/>
</assemblyBinding>
</runtime>
</configuration> </configuration>

4
FM2014TestApp/Ui/Fm2014sTest/Fm2014TestBench.csproj
View File

@ -7,7 +7,7 @@
<ProjectGuid>{ED34FACA-492B-44FD-B56C-A2BD83F33D8B}</ProjectGuid> <ProjectGuid>{ED34FACA-492B-44FD-B56C-A2BD83F33D8B}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>Sensus.Ui.Fm2014TestBench</RootNamespace> <RootNamespace>Sensus.Ui.Fm2014TestBench</RootNamespace>
<AssemblyName>Sensus.Ui.Fm2014TestBench</AssemblyName> <AssemblyName>FM2014TestApp</AssemblyName>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -29,7 +29,7 @@
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\Library\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

2
FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.Designer.cs generated
View File

@ -241,7 +241,7 @@ namespace Sensus.Ui.Fm2014TestBench.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Double Pulses Deadtime:. /// Looks up a localized string similar to Double Pulses Deadtime [ms]:.
/// </summary> /// </summary>
internal static string StrLblDoublePulseDeadTime { internal static string StrLblDoublePulseDeadTime {
get { get {

2
FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.de.resx
View File

@ -271,7 +271,7 @@
<value>DUT Gemessene Zeit [s]:</value> <value>DUT Gemessene Zeit [s]:</value>
</data> </data>
<data name="StrLblDoublePulseDeadTime" xml:space="preserve"> <data name="StrLblDoublePulseDeadTime" xml:space="preserve">
<value>Doppelimpulstotzeit:</value> <value>Doppelimpulstotzeit [ms]:</value>
</data> </data>
<data name="StrLblDutToRefToleranceMin" xml:space="preserve"> <data name="StrLblDutToRefToleranceMin" xml:space="preserve">
<value>DUT/REF Toleranz min [%]:</value> <value>DUT/REF Toleranz min [%]:</value>

2
FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.resx
View File

@ -271,7 +271,7 @@
<value>DUT Measured Time [s]:</value> <value>DUT Measured Time [s]:</value>
</data> </data>
<data name="StrLblDoublePulseDeadTime" xml:space="preserve"> <data name="StrLblDoublePulseDeadTime" xml:space="preserve">
<value>Double Pulses Deadtime:</value> <value>Double Pulses Deadtime [ms]:</value>
</data> </data>
<data name="StrLblDutToRefToleranceMin" xml:space="preserve"> <data name="StrLblDutToRefToleranceMin" xml:space="preserve">
<value>DUT/REF Tolerance min [%]:</value> <value>DUT/REF Tolerance min [%]:</value>