reconnect
This commit is contained in:
parent
602d696c91
commit
3d295abe86
27 changed files with 742 additions and 232 deletions
|
|
@ -31,7 +31,13 @@ namespace CompareDef
|
|||
int i = a[0].IndexOf('=');
|
||||
if (i >= 0)
|
||||
a[0] = a[0].Substring(0, i );
|
||||
list.Add(a[0], int.Parse(a[1].Substring(1)));
|
||||
i = a[0].LastIndexOf('@');
|
||||
if (i >= 0) a[0] = a[0].Substring(0, i);
|
||||
|
||||
if (a[0].StartsWith("Begin", StringComparison.CurrentCultureIgnoreCase)) a[0] = a[0].Substring(5);
|
||||
else if (a[0].StartsWith("End", StringComparison.CurrentCultureIgnoreCase)) a[0] = a[0].Substring(3);
|
||||
|
||||
if (!list.ContainsKey(a[0])) list.Add(a[0], int.Parse(a[1].Substring(1)));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ EpdBase::Epd2U::Epd2U(int comport)
|
|||
}
|
||||
WORD EpdBase::Epd2U::WriteConfig()
|
||||
{
|
||||
if (port == 0) return 1;
|
||||
if (port == 0 ) return 1;
|
||||
return WriteDisplayConfig(00,2,40,10, 2,displayConfig, 56);
|
||||
}
|
||||
DWORD EpdBase::Epd2U::StartCom()
|
||||
|
|
@ -479,9 +479,12 @@ WORD EpdBase::Epd2U::PrepareForIssue()
|
|||
{
|
||||
int rv = 0;
|
||||
if (port == 0) return 0;
|
||||
|
||||
CommitRV = WriteConfig();
|
||||
CommitRV = 0;
|
||||
ClearAlarms();
|
||||
if (CommitRV) CommitRV = Commit();
|
||||
Commit();
|
||||
//if (CommitRV) CommitRV = Commit();
|
||||
if (CommitRV) CommitRV = ClearDose();
|
||||
if (CommitRV) CommitRV = ClearTotalDose();
|
||||
if (CommitRV) CommitRV = ClearPeakRates();
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ namespace EpdBase
|
|||
WORD OtherAlarms;
|
||||
WORD EEPROMBadSectors;
|
||||
|
||||
WORD WriteConfig32 = 0;
|
||||
|
||||
WORD CommsInitialized = 0;
|
||||
WORD InitRv = 0;
|
||||
WORD DiscRV = 0;
|
||||
|
|
|
|||
|
|
@ -187,6 +187,16 @@ int Epd3Base::Epd3U::OpenDev(DiscoveryId DeviceID)
|
|||
return Dll3RV;
|
||||
}
|
||||
|
||||
int Epd3Base::Epd3U::ReOpenDev()
|
||||
{
|
||||
if (epdComsHandle != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
Dll3RV = Connect3(epdComsHandle, Epd, true);
|
||||
}
|
||||
else { Dll3RV = 0; }
|
||||
return Dll3RV;
|
||||
}
|
||||
|
||||
int Epd3Base::Epd3U::DisCon(UINT16 alarm)
|
||||
{
|
||||
int rv = 0;
|
||||
|
|
@ -870,19 +880,30 @@ error:
|
|||
WORD Epd3Base::Epd3U::PrepareForIssue()
|
||||
{
|
||||
int rv = 0;
|
||||
int step = 0;
|
||||
if (port == 0) return 0;
|
||||
rv = WriteConfig();
|
||||
|
||||
rv = ReOpenDev(); ++step;
|
||||
if (WriteConfig32)
|
||||
rv = WriteConfig();
|
||||
if (rv != 0)
|
||||
goto error;
|
||||
|
||||
++step;
|
||||
if (DetectorsOn) {
|
||||
|
||||
token = BeginEpdOnOff(epdComsHandle, 0, nullptr);
|
||||
rv = Commit3(epdComsHandle);
|
||||
if (!rv) rv = EndEpdOnOff(epdComsHandle, token);
|
||||
}
|
||||
|
||||
++step;
|
||||
rv = ReOpenDev();
|
||||
++step;
|
||||
rv = ClearDoses();
|
||||
|
||||
if (rv != 0)
|
||||
goto error;
|
||||
|
||||
++step;
|
||||
rv = ClearAlarms();
|
||||
if (rv != 0)
|
||||
goto error;
|
||||
|
|
@ -1046,6 +1067,7 @@ WORD Epd3Base::Epd3U::WriteWearer() {
|
|||
WORD Epd3Base::Epd3U::Issue(bool PrepareDone)
|
||||
{
|
||||
int r=0;
|
||||
int step = 0;
|
||||
int tries = 0;
|
||||
if (port == 0) return r;
|
||||
|
||||
|
|
@ -1055,6 +1077,7 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)
|
|||
if (r != 0)
|
||||
goto error;
|
||||
}
|
||||
++step; //1
|
||||
|
||||
/*if (isMK3) {
|
||||
token = BeginEnableProtectedSession_R3(epdComsHandle, 1, nullptr);
|
||||
|
|
@ -1067,6 +1090,7 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)
|
|||
r = WriteAlarmTresholds();
|
||||
if (r != 0)
|
||||
goto error;
|
||||
++step;//2
|
||||
r = WriteWearer();
|
||||
if (r != 0)
|
||||
goto error;
|
||||
|
|
@ -1075,7 +1099,7 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)
|
|||
goto error;*/
|
||||
|
||||
|
||||
|
||||
++step;//3
|
||||
//EPDIssued
|
||||
//if (!DetectorsOn) {
|
||||
token = BeginEpdOnOff(epdComsHandle, 1, nullptr);
|
||||
|
|
@ -1087,7 +1111,7 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)
|
|||
r=0;
|
||||
//}
|
||||
|
||||
|
||||
++step;//4
|
||||
tries = 1;
|
||||
token = BeginIssueEPD(epdComsHandle, nullptr);
|
||||
r = Commit3(epdComsHandle);
|
||||
|
|
@ -1110,12 +1134,13 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)
|
|||
goto error;
|
||||
}*/
|
||||
|
||||
++step;//5
|
||||
if (isMK3) {
|
||||
|
||||
r = DisCon(EndSessionControl); //stops protected session
|
||||
if (r)
|
||||
goto error;
|
||||
}
|
||||
++step;
|
||||
EndCom();
|
||||
|
||||
return r;
|
||||
|
|
@ -1207,10 +1232,13 @@ int Epd3Base::Epd3U::GetAllDeissue()
|
|||
int Epd3Base::Epd3U::IssueAndCheck(float gain,float ChirpRate)
|
||||
{
|
||||
int rv = 0;
|
||||
int step = 0;
|
||||
|
||||
if (isNG) {
|
||||
float kx = gain;
|
||||
rv = ReadCal();
|
||||
if (rv != 0 || K6 != 1310) { rv = 1; goto error; }
|
||||
++step;
|
||||
if (K3 != kx || K4 != kx)
|
||||
{
|
||||
K3 = K4 = kx;
|
||||
|
|
@ -1218,9 +1246,14 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain,float ChirpRate)
|
|||
if (rv != 0) goto error;
|
||||
}
|
||||
}
|
||||
++step;
|
||||
SetChirp( ChirpRate);
|
||||
++step;
|
||||
rv = PrepareForIssue();
|
||||
if (rv != 0) goto error;
|
||||
++step;
|
||||
if (!rv) rv = Issue(true); // data already loaded
|
||||
if (rv != 0) goto error;
|
||||
return rv;
|
||||
error:
|
||||
return rv;
|
||||
|
|
@ -1228,7 +1261,7 @@ error:
|
|||
|
||||
int Epd3Base::Epd3U::WriteConfig(void)
|
||||
{
|
||||
if (port == 0) return 1;
|
||||
if (port == 0 || WriteConfig32==0) return 1;
|
||||
int32_t r = 0;
|
||||
ECLen = 32;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ namespace Epd3Base {
|
|||
WORD DeviceCount = 0;
|
||||
DWORD DeviceIDs[10];
|
||||
|
||||
WORD WriteConfig32 = 1;
|
||||
|
||||
WORD Error = 0;
|
||||
WORD ErrorSource;
|
||||
WORD ErrorReason;
|
||||
|
|
@ -243,6 +245,7 @@ namespace Epd3Base {
|
|||
|
||||
//Functions
|
||||
int OpenDev(DiscoveryId DeviceID);
|
||||
int ReOpenDev();
|
||||
int DisCon(UINT16 alarm);
|
||||
|
||||
void CloseDev(bool CloseAll);
|
||||
|
|
|
|||
|
|
@ -9,7 +9,12 @@ EpdBaseClr::Epd2::Epd2(int port, bool OnlyMK2)
|
|||
isMK3 = EPDIssued = isBG = 0;
|
||||
onlyMK2 = OnlyMK2;
|
||||
epd = new EpdBase::Epd2U(port);
|
||||
if (!OnlyMK2) epd3 = new Epd3Base::Epd3U(port); else epd3 = nullptr;
|
||||
if (!OnlyMK2) {
|
||||
epd3 = new Epd3Base::Epd3U(port);
|
||||
if (epd3) epd3->WriteConfig32 = 0;
|
||||
}
|
||||
else epd3 = nullptr;
|
||||
|
||||
this->InitRV = epd->InitRv;
|
||||
Hp10Name = gcnew String(tHp10);
|
||||
Hp07Name = gcnew String(tHp07);
|
||||
|
|
@ -801,6 +806,7 @@ void EpdBaseClr::Epd2::InitData()
|
|||
SoftVersion = 0;
|
||||
FunctionFlags = 0;
|
||||
CountsClock = 0;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// connect to Epd and read status
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ namespace TestEPD3Dll
|
|||
|
||||
//254245176
|
||||
int rv;
|
||||
MK3.Epd2 x = new MK3.Epd2(5);
|
||||
MK3.Epd2 x = new MK3.Epd2(7);
|
||||
x.Connect(false);
|
||||
|
||||
x.ECIn = System.Security.Cryptography.SHA256.Create().ComputeHash(System.Text.Encoding.UTF8.GetBytes("Administrator"));
|
||||
|
|
|
|||
|
|
@ -7,11 +7,12 @@
|
|||
|
||||
|
||||
|
||||
char comPort[] = "COM4";
|
||||
char comPort[] = "COM7";
|
||||
CommsHandle epdComsHandle;
|
||||
uint32_t EpdID;
|
||||
EpdGeneration EpdGen;
|
||||
DiscoveryId Epd;
|
||||
int DeviceCount;
|
||||
|
||||
HANDLE Ev1 = INVALID_HANDLE_VALUE;
|
||||
CompletionToken token;
|
||||
|
|
@ -19,11 +20,13 @@ StatusData_t status;
|
|||
MeasValue_t doses[4];
|
||||
uint8_t numDoses;
|
||||
uint32_t utc;
|
||||
uint8_t EC[]{ 0xE7 ,0xD3 ,0xE7 ,0x69 ,0xF3 ,0xF5 ,0x93 ,0xDA ,0xDC ,0xB8 ,0x63 ,0x4C ,0xC5 ,0xB0 ,0x9F ,0xC9 ,0x0D ,0xD3 ,0xA6 ,0x1C ,0x4A ,0x06 ,0xA7 ,0x9C ,0xB0 ,0x92 ,0x36 ,0x62 ,0xFE ,0x6F ,0xAE ,0x6B };
|
||||
|
||||
|
||||
void WINAPI discovery(CommsHandle hComms, DiscoveryId const discovered[], int32_t count)
|
||||
{
|
||||
EpdID = 0;
|
||||
DeviceCount = count;
|
||||
if (count > 0) {
|
||||
EpdID = discovered[0].Id;
|
||||
EpdGen = discovered[0].Gen;
|
||||
|
|
@ -47,31 +50,47 @@ void GetEPD()
|
|||
FALSE, // initial state is nonsignaled
|
||||
TEXT("WriteEvent") // object name
|
||||
);
|
||||
r = StartDiscovery(epdComsHandle, discovery);
|
||||
|
||||
int tries = 5; DeviceCount = 0;
|
||||
while (tries-- > 0 && DeviceCount == 0)
|
||||
{
|
||||
//memset(DevceIDs, 0, sizeof(DeviceIDs));
|
||||
r = StartDiscovery(epdComsHandle, discovery);
|
||||
if (r == 0) r = WaitForSingleObject(Ev1, 10000);
|
||||
}
|
||||
|
||||
|
||||
std::cout << "wacht effen!\n";
|
||||
r = WaitForSingleObject(Ev1, 10000); // no time-out interval
|
||||
|
||||
std::cout << "ok!\n";
|
||||
r = Connect(epdComsHandle,Epd, true);
|
||||
|
||||
// -9 = r_OperationTimeout
|
||||
std::cout << "Connect rv " << r << "\n";
|
||||
ResetEvent(Ev1);
|
||||
std::cout << "get status\n";
|
||||
token = BeginReadStatus(epdComsHandle, completion);
|
||||
r = Commit(epdComsHandle);
|
||||
r = WaitForSingleObject(Ev1, 10000); // no time-out interval
|
||||
std::cout << "got status\n";
|
||||
r = WaitForSingleObject(Ev1, 1000); // no time-out interval
|
||||
r = EndReadStatus(epdComsHandle, token, &status);
|
||||
std::cout << "got status "<<r<<"\n";
|
||||
|
||||
|
||||
//r = Connect(epdComsHandle, Epd, true);
|
||||
token = BeginWriteAccessLevel(epdComsHandle, AccessLevel_t::Admin, EC, 32, nullptr);
|
||||
r = Commit(epdComsHandle);
|
||||
//-7 r_InvalidState
|
||||
r = EndWriteAccessLevel(epdComsHandle, token);
|
||||
std::cout << "EndWriteAccessLevel rv " << r << "\n";
|
||||
|
||||
numDoses = 0; utc = 0;
|
||||
ResetEvent(Ev1);
|
||||
//token = BeginReadDoses(epdComsHandle, new uint8_t[]{ 0, 1 }, 2 , completion);
|
||||
token = BeginReadDoses(epdComsHandle, nullptr, 0 , completion);
|
||||
r = Commit(epdComsHandle);
|
||||
r = WaitForSingleObject(Ev1, 10000); // no time-out interval
|
||||
std::cout << "got doses\n";
|
||||
r = EndReadDoses(epdComsHandle, token, doses, 2, &numDoses, &utc);
|
||||
std::cout << "got doses " << r << "\n";
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<Image Source="/Images/EPD-MK3.png" VerticalAlignment="Center" Stretch="None" />
|
||||
<Run BaselineAlignment="Center">eDos EPD station</Run>
|
||||
</Paragraph>
|
||||
<Paragraph>2021-2022 Version
|
||||
<Paragraph>2021-2024 Version
|
||||
<TextBlock Name="aVersion" Text="1.1" />
|
||||
</Paragraph>
|
||||
<Table BorderBrush="#FF1E8CED" BorderThickness="1" >
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ namespace eDosStation
|
|||
public About(Station station)
|
||||
{
|
||||
InitializeComponent();
|
||||
aVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
|
||||
aVersion.Text = "2021 - 2024 Version " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()+ " (Build "+Properties.Resources.BuildDate+")";
|
||||
stationID.Text = station.ID_Station.ToString();
|
||||
ReadAlias();
|
||||
if (station.checkUser) checkUser.Text = "Yes"; else checkUser.Text = "No";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,13 @@
|
|||
<connectionStrings>
|
||||
<add name="eDosStation.Properties.Settings.localConnectionString" connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation" xdt:Locator="Match(name)" xdt:Transform="Replace"/>
|
||||
</connectionStrings>
|
||||
<userSettings>
|
||||
<eDosStation.Properties.Settings>
|
||||
<setting name="ComPort" serializeAs="String">
|
||||
<value>7</value>
|
||||
</setting>
|
||||
</eDosStation.Properties.Settings>
|
||||
</userSettings>
|
||||
<appSettings >
|
||||
<add key="Reader" value="HID Global OMNIKEY 5022 Smart Card Reader 0" xdt:Locator="Match(key)" xdt:Transform="Replace" />
|
||||
<add key="TestCSN" value="0428790A0B4E80" xdt:Locator="Match(key)" xdt:Transform="Replace" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
|
|
@ -58,5 +58,11 @@
|
|||
</system.web>
|
||||
<runtime>
|
||||
<generatePublisherEvidence enabled="false" />
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
|
|
@ -455,7 +455,7 @@ namespace eDosStation
|
|||
if (_User.VisitIDLocked > 0 || _User.AccessAllow == false)
|
||||
ReasonNoAccess = _User.ReasonNoAccess;
|
||||
else if (_User.hasEPD)
|
||||
ReasonNoAccess = "EPD in use";
|
||||
ReasonNoAccess = User.ErrorEPDInUse;
|
||||
else ReasonNoAccess = getCommentOnEvent(string.Empty, 3);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ using System.Windows;
|
|||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("eDosStation")]
|
||||
[assembly: AssemblyDescription("MK2/MK3 epd station 2023 Isabelle Majkowski, Luc Praet, Luc Vandenbroucke")]
|
||||
[assembly: AssemblyDescription("MK2/MK3 epd station 2024 Isabelle Majkowski, Luc Praet, Luc Vandenbroucke")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("SCK CEN")]
|
||||
[assembly: AssemblyProduct("eDosStation")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019-2023 Luc Vandenbroucke")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019-2024 Luc Vandenbroucke")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
|
|
@ -51,5 +51,5 @@ using System.Windows;
|
|||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("2.13.4.0")]
|
||||
[assembly: AssemblyFileVersion("2.13.4.0")]
|
||||
[assembly: AssemblyVersion("2.14.0.0")]
|
||||
[assembly: AssemblyFileVersion("2.14.0.0")]
|
||||
|
|
|
|||
10
eDosStation/Properties/Resources.Designer.cs
generated
10
eDosStation/Properties/Resources.Designer.cs
generated
|
|
@ -59,5 +59,15 @@ namespace eDosStation.Properties {
|
|||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Thu 05/16/2024 15:48:58.18
|
||||
///.
|
||||
/// </summary>
|
||||
internal static string BuildDate {
|
||||
get {
|
||||
return ResourceManager.GetString("BuildDate", resourceCulture);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
|
|
@ -60,6 +60,7 @@
|
|||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
|
|
@ -68,9 +69,10 @@
|
|||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
|
|
@ -85,9 +87,10 @@
|
|||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
|
|
@ -109,9 +112,13 @@
|
|||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
|
||||
</data>
|
||||
</root>
|
||||
1
eDosStation/Resources/BuildDate.txt
Normal file
1
eDosStation/Resources/BuildDate.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
Thu 05/16/2024 15:51:50.20
|
||||
|
|
@ -24,6 +24,7 @@
|
|||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="20" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
|
@ -69,8 +70,11 @@
|
|||
<TextBlock Grid.Row="12" Grid.Column="0" Text="Meerdere EPD toegelaten" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
|
||||
<CheckBox Grid.Row="12" Grid.ColumnSpan="2" Name="cbAllowMultipleEPD" Grid.Column="1" Padding="10,0,10,0" VerticalAlignment="Center" />
|
||||
|
||||
<TextBlock Grid.Row="13" Grid.Column="0" Text="Write config 3.2" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
|
||||
<CheckBox Grid.Row="13" Grid.ColumnSpan="2" Name="cbWriteConfig32" Grid.Column="1" Padding="10,0,10,0" VerticalAlignment="Center" />
|
||||
|
||||
<telerik:RadButton Grid.Row="14" Grid.Column="0" Name="bOK" Content="OK" Click="BOK_Click" Style="{DynamicResource OkCancelButton}" />
|
||||
<telerik:RadButton Grid.Row="14" Grid.Column="1" Name="bCancel" Content="Cancel" Click="BCancel_Click" Style="{DynamicResource OkCancelButton}" HorizontalAlignment="Right" />
|
||||
|
||||
<telerik:RadButton Grid.Row="15" Grid.Column="0" Name="bOK" Content="OK" Click="BOK_Click" Style="{DynamicResource OkCancelButton}" />
|
||||
<telerik:RadButton Grid.Row="15" Grid.Column="1" Name="bCancel" Content="Cancel" Click="BCancel_Click" Style="{DynamicResource OkCancelButton}" HorizontalAlignment="Right" />
|
||||
</Grid>
|
||||
</Window>
|
||||
|
|
|
|||
|
|
@ -70,6 +70,9 @@ namespace eDosStation
|
|||
|
||||
thisStation.AllowMultipleEPD = cbAllowMultipleEPD.IsChecked != null ? cbAllowMultipleEPD.IsChecked.Value : false;
|
||||
|
||||
|
||||
thisStation.WriteConfig32 = cbWriteConfig32.IsChecked != null ? cbWriteConfig32.IsChecked.Value : false;
|
||||
|
||||
thisStation.Update();
|
||||
this.Close();
|
||||
if (thisStation.Error > 0)
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ namespace eDosStation
|
|||
public TimeSpan ShowTimeoutTime { get; internal set; }
|
||||
public TimeSpan InfoProgressbarInterval { get; internal set; }
|
||||
public double InfoScreenTimeout { get; internal set; }
|
||||
public bool WriteConfig32 { get; internal set; }
|
||||
|
||||
public bool Changed = false;
|
||||
public int Error = 0;
|
||||
public string ErrorMessage;
|
||||
|
|
@ -119,6 +121,7 @@ namespace eDosStation
|
|||
RestartComFirst = rs.BoolOrDefault("RestartComFirst", false);
|
||||
OnlyMK2 = rs.BoolOrDefault("OnlyMK2", false);
|
||||
AllowMultipleEPD = rs.BoolOrDefault("AllowMultipleEPD", false);
|
||||
WriteConfig32 = false; // rs.BoolOrDefault("WriteConfig32", false);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -135,6 +138,7 @@ namespace eDosStation
|
|||
EPDTimeOut = 10000;
|
||||
EPDRetries = 2;
|
||||
AllowMultipleEPD = false;
|
||||
WriteConfig32 = false;
|
||||
}
|
||||
rs.Close();
|
||||
splunkLog.WriteSplunkLog("StationInit", spl1.iseverity.info);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ namespace eDosStation
|
|||
{
|
||||
public class User
|
||||
{
|
||||
public const string ErrorEPDInUse = "EPD in use";
|
||||
|
||||
public int PersID { get; set; }
|
||||
public string LastName { get; set; }
|
||||
public string FirstName { get; set; }
|
||||
|
|
|
|||
|
|
@ -91,24 +91,166 @@
|
|||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="LSWLib, Version=4.0.8.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\LSWLib2.4.0.10\lib\net48\LSWLib.dll</HintPath>
|
||||
<Reference Include="LSWLib, Version=4.0.24.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\LSWLib2.4.0.25\lib\net48\LSWLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Win32.Registry.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Win32.Registry.AccessControl.8.0.0\lib\net462\Microsoft.Win32.Registry.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Win32.SystemEvents, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Win32.SystemEvents.8.0.0\lib\net462\Microsoft.Win32.SystemEvents.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Data.OleDb, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.OleDb.7.0.0\lib\net462\System.Data.OleDb.dll</HintPath>
|
||||
<Reference Include="System.Data.Odbc, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.Odbc.8.0.0\lib\net462\System.Data.Odbc.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.SqlClient, Version=4.6.1.5, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.SqlClient.4.8.5\lib\net461\System.Data.SqlClient.dll</HintPath>
|
||||
<Reference Include="System.Data.OleDb, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.OleDb.8.0.0\lib\net462\System.Data.OleDb.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.OracleClient" />
|
||||
<Reference Include="System.Data.SqlClient, Version=4.6.1.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.SqlClient.4.8.6\lib\net461\System.Data.SqlClient.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.EventLog, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.EventLog.8.0.0\lib\net462\System.Diagnostics.EventLog.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.PerformanceCounter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.8.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.DirectoryServices" />
|
||||
<Reference Include="System.DirectoryServices.AccountManagement" />
|
||||
<Reference Include="System.DirectoryServices.Protocols" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Drawing.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Drawing.Common.8.0.4\lib\net462\System.Drawing.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IdentityModel" />
|
||||
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.FileSystem.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Packaging, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.Packaging.8.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Pipes.AccessControl, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.Pipes.AccessControl.5.0.0\lib\net461\System.IO.Pipes.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Ports, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.Ports.8.0.0\lib\net462\System.IO.Ports.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Runtime" />
|
||||
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Reflection.Context" />
|
||||
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Caching" />
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.InteropServices" />
|
||||
<Reference Include="System.Security" />
|
||||
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Cng, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Cng.5.0.0\lib\net47\System.Security.Cryptography.Cng.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.ProtectedData, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.ProtectedData.8.0.0\lib\net462\System.Security.Cryptography.ProtectedData.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Xml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Xml.8.0.0\lib\net462\System.Security.Cryptography.Xml.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel" />
|
||||
<Reference Include="System.ServiceModel.Duplex, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Duplex.4.10.0\lib\net461\System.ServiceModel.Duplex.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.Http, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Http.4.10.0\lib\net461\System.ServiceModel.Http.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.NetTcp, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.NetTcp.4.10.0\lib\net461\System.ServiceModel.NetTcp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.Primitives, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Primitives.4.10.0\lib\net461\System.ServiceModel.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.Security, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Security.4.10.0\lib\net461\System.ServiceModel.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.Syndication, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Syndication.8.0.0\lib\net462\System.ServiceModel.Syndication.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceProcess" />
|
||||
<Reference Include="System.ServiceProcess.ServiceController, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceProcess.ServiceController.8.0.0\lib\net462\System.ServiceProcess.ServiceController.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Speech" />
|
||||
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.AccessControl.8.0.0\lib\net462\System.Threading.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Transactions" />
|
||||
<Reference Include="System.Web.Extensions" />
|
||||
<Reference Include="System.Web.Services" />
|
||||
<Reference Include="System.Web.Services.Description, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Web.Services.Description.4.10.0\lib\net461\System.Web.Services.Description.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -119,21 +261,17 @@
|
|||
<Reference Include="System.Xaml">
|
||||
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="Telerik.Windows.Controls, Version=2023.2.718.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
|
||||
<HintPath>..\lib\RCWPF\2023.2.718.45\Telerik.Windows.Controls.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="Telerik.Windows.Controls, Version=2024.1.423.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Telerik.Windows.Controls.for.Wpf.Xaml.2024.1.423\lib\net45\Telerik.Windows.Controls.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Telerik.Windows.Controls.GridView, Version=2023.2.718.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
|
||||
<HintPath>..\lib\RCWPF\2023.2.718.45\Telerik.Windows.Controls.GridView.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="Telerik.Windows.Controls.GridView, Version=2024.1.423.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Telerik.Windows.Controls.GridView.for.Wpf.Xaml.2024.1.423\lib\net45\Telerik.Windows.Controls.GridView.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Telerik.Windows.Controls.Input, Version=2023.2.718.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
|
||||
<HintPath>..\lib\RCWPF\2023.2.718.45\Telerik.Windows.Controls.Input.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="Telerik.Windows.Controls.Input, Version=2024.1.423.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Telerik.Windows.Controls.Input.for.Wpf.Xaml.2024.1.423\lib\net45\Telerik.Windows.Controls.Input.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Telerik.Windows.Data, Version=2023.2.718.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
|
||||
<HintPath>..\lib\RCWPF\2023.2.718.45\Telerik.Windows.Data.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="Telerik.Windows.Data, Version=2024.1.423.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Telerik.Windows.Data.for.Wpf.Xaml.2024.1.423\lib\net45\Telerik.Windows.Data.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="UIAutomationProvider">
|
||||
<Private>False</Private>
|
||||
|
|
@ -305,6 +443,7 @@
|
|||
<Content Include="Reader32.dll">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Resource Include="Resources\BuildDate.txt" />
|
||||
<Resource Include="todo.txt" />
|
||||
<Resource Include="Images\EPD-MK3.png" />
|
||||
<Resource Include="Images\logo500.png" />
|
||||
|
|
@ -354,4 +493,7 @@
|
|||
</PropertyGroup>
|
||||
<Import Project="..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.targets" Condition="Exists('..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.targets')" />
|
||||
<Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.50\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.50\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>echo %25date%25 %25time%25 > "$(ProjectDir)\Resources\BuildDate.txt"</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,18 +1,70 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="LSWDesfirePublic" version="1.3.9" targetFramework="net48" />
|
||||
<package id="LSWLib2" version="4.0.10" targetFramework="net48" />
|
||||
<package id="LSWLib2" version="4.0.25" targetFramework="net48" />
|
||||
<package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.50" targetFramework="net48" developmentDependency="true" />
|
||||
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Win32.Registry.AccessControl" version="8.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Win32.SystemEvents" version="8.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Windows.Compatibility" version="8.0.4" targetFramework="net48" />
|
||||
<package id="SharpDX" version="4.2.0" targetFramework="net48" />
|
||||
<package id="SharpDX.D3DCompiler" version="4.2.0" targetFramework="net48" />
|
||||
<package id="SharpDX.Direct2D1" version="4.2.0" targetFramework="net48" />
|
||||
<package id="SharpDX.Direct3D10" version="4.2.0" targetFramework="net48" />
|
||||
<package id="SharpDX.Direct3D9" version="4.2.0" targetFramework="net48" />
|
||||
<package id="SharpDX.DXGI" version="4.2.0" targetFramework="net48" />
|
||||
<package id="System.Data.OleDb" version="7.0.0" targetFramework="net48" />
|
||||
<package id="System.Data.SqlClient" version="4.8.5" targetFramework="net48" />
|
||||
<package id="Telerik.Windows.Controls.for.Wpf.Xaml" version="2022.1.222" targetFramework="net48" />
|
||||
<package id="Telerik.Windows.Controls.GridView.for.Wpf.Xaml" version="2022.1.222" targetFramework="net48" />
|
||||
<package id="Telerik.Windows.Controls.Input.for.Wpf.Xaml" version="2022.1.222" targetFramework="net48" />
|
||||
<package id="Telerik.Windows.Data.for.Wpf.Xaml" version="2022.1.222" targetFramework="net48" />
|
||||
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
|
||||
<package id="System.CodeDom" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.ComponentModel.Composition" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net48" />
|
||||
<package id="System.Data.Odbc" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Data.OleDb" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Data.SqlClient" version="4.8.6" targetFramework="net48" />
|
||||
<package id="System.Diagnostics.EventLog" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.DirectoryServices" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.DirectoryServices.AccountManagement" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.DirectoryServices.Protocols" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Drawing.Common" version="8.0.4" targetFramework="net48" />
|
||||
<package id="System.IO" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.IO.Packaging" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.IO.Pipes.AccessControl" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.IO.Ports" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Management" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
|
||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
|
||||
<package id="System.Reflection.Context" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Reflection.Emit" version="4.7.0" targetFramework="net48" />
|
||||
<package id="System.Reflection.Emit.ILGeneration" version="4.7.0" targetFramework="net48" />
|
||||
<package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="net48" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Runtime.Caching" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Pkcs" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.ProtectedData" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Xml" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Permissions" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Duplex" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Http" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.NetTcp" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Primitives" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Security" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Syndication" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.ServiceProcess.ServiceController" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Speech" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Threading.AccessControl" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Web.Services.Description" version="4.10.0" targetFramework="net48" />
|
||||
<package id="Telerik.Windows.Controls.for.Wpf.Xaml" version="2024.1.423" targetFramework="net48" />
|
||||
<package id="Telerik.Windows.Controls.GridView.for.Wpf.Xaml" version="2024.1.423" targetFramework="net48" />
|
||||
<package id="Telerik.Windows.Controls.Input.for.Wpf.Xaml" version="2024.1.423" targetFramework="net48" />
|
||||
<package id="Telerik.Windows.Data.for.Wpf.Xaml" version="2024.1.423" targetFramework="net48" />
|
||||
</packages>
|
||||
|
|
@ -1,23 +1,27 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
</configSections>
|
||||
<connectionStrings>
|
||||
<add name="eDosConnectionString" connectionString="Data Source=eDos;Initial Catalog=eDos;Persist Security Info=True;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=syncEdosLocal" />
|
||||
<add name="LocalConnectionString" connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;Persist Security Info=True;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True" />
|
||||
<add name="syncEdosLocal.Properties.Settings.eDosLocalConnectionString"
|
||||
connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;Persist Security Info=True;User ID=eDosStation;Password=Infopla+8;Connect Timeout=30;TrustServerCertificate=True;ConnectRetryCount=3"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="syncEdosLocal.Properties.Settings.eDosConnectionString"
|
||||
connectionString="Data Source=eDos;Initial Catalog=eDos;Persist Security Info=True;User ID=eDosStation;Password=Infopla+8;Connect Timeout=30;TrustServerCertificate=True;Application Name=syncEdosLocal;ConnectRetryCount=3"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="syncEdosLocal.Properties.Settings.eDosLocalConnectionString" connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;Persist Security Info=True;User ID=eDosStation;Password=Infopla+8;Connect Timeout=30;TrustServerCertificate=True;ConnectRetryCount=3" providerName="System.Data.SqlClient" />
|
||||
<add name="syncEdosLocal.Properties.Settings.eDosConnectionString" connectionString="Data Source=eDos;Initial Catalog=eDos;Persist Security Info=True;User ID=eDosStation;Password=Infopla+8;Connect Timeout=30;TrustServerCertificate=True;Application Name=syncEdosLocal;ConnectRetryCount=3" providerName="System.Data.SqlClient" />
|
||||
</connectionStrings>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
|
||||
</startup>
|
||||
<appSettings>
|
||||
<add key="smtpFrom" value="lvandenb@sckcen.be"/>
|
||||
<add key="smtpServer" value="smtp.sckcen.be"/>
|
||||
<add key="smtpPort" value="25"/>
|
||||
<add key="smtpFrom" value="lvandenb@sckcen.be" />
|
||||
<add key="smtpServer" value="smtp.sckcen.be" />
|
||||
<add key="smtpPort" value="25" />
|
||||
</appSettings>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,59 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="LSWLib2" version="4.0.10" targetFramework="net48" />
|
||||
<package id="LSWLib2" version="4.0.25" targetFramework="net48" />
|
||||
<package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.50" targetFramework="net48" developmentDependency="true" />
|
||||
<package id="System.Data.OleDb" version="7.0.0" targetFramework="net48" />
|
||||
<package id="System.Data.SqlClient" version="4.8.5" targetFramework="net48" />
|
||||
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Win32.Registry.AccessControl" version="8.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Win32.SystemEvents" version="8.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Windows.Compatibility" version="8.0.4" targetFramework="net48" />
|
||||
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
|
||||
<package id="System.CodeDom" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.ComponentModel.Composition" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net48" />
|
||||
<package id="System.Data.Odbc" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Data.OleDb" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Data.SqlClient" version="4.8.6" targetFramework="net48" />
|
||||
<package id="System.Diagnostics.EventLog" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.DirectoryServices" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.DirectoryServices.AccountManagement" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.DirectoryServices.Protocols" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Drawing.Common" version="8.0.4" targetFramework="net48" />
|
||||
<package id="System.IO" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.IO.Packaging" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.IO.Pipes.AccessControl" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.IO.Ports" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Management" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
|
||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
|
||||
<package id="System.Reflection.Context" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Reflection.Emit" version="4.7.0" targetFramework="net48" />
|
||||
<package id="System.Reflection.Emit.ILGeneration" version="4.7.0" targetFramework="net48" />
|
||||
<package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="net48" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Runtime.Caching" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Pkcs" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.ProtectedData" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Xml" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Permissions" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Duplex" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Http" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.NetTcp" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Primitives" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Security" version="4.10.0" targetFramework="net48" />
|
||||
<package id="System.ServiceModel.Syndication" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.ServiceProcess.ServiceController" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Speech" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Threading.AccessControl" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Web.Services.Description" version="4.10.0" targetFramework="net48" />
|
||||
</packages>
|
||||
|
|
@ -37,26 +37,170 @@
|
|||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="LSWLib, Version=4.0.8.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\LSWLib2.4.0.10\lib\net48\LSWLib.dll</HintPath>
|
||||
<Reference Include="LSWLib, Version=4.0.24.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\LSWLib2.4.0.25\lib\net48\LSWLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Win32.Registry.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Win32.Registry.AccessControl.8.0.0\lib\net462\Microsoft.Win32.Registry.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Win32.SystemEvents, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Win32.SystemEvents.8.0.0\lib\net462\Microsoft.Win32.SystemEvents.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Data.OleDb, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.OleDb.7.0.0\lib\net462\System.Data.OleDb.dll</HintPath>
|
||||
<Reference Include="System.Data.Odbc, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.Odbc.8.0.0\lib\net462\System.Data.Odbc.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.SqlClient, Version=4.6.1.5, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.SqlClient.4.8.5\lib\net461\System.Data.SqlClient.dll</HintPath>
|
||||
<Reference Include="System.Data.OleDb, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.OleDb.8.0.0\lib\net462\System.Data.OleDb.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.OracleClient" />
|
||||
<Reference Include="System.Data.SqlClient, Version=4.6.1.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.SqlClient.4.8.6\lib\net461\System.Data.SqlClient.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.EventLog, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.EventLog.8.0.0\lib\net462\System.Diagnostics.EventLog.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.PerformanceCounter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.8.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.DirectoryServices" />
|
||||
<Reference Include="System.DirectoryServices.AccountManagement" />
|
||||
<Reference Include="System.DirectoryServices.Protocols" />
|
||||
<Reference Include="System.Drawing.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Drawing.Common.8.0.4\lib\net462\System.Drawing.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IdentityModel" />
|
||||
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.FileSystem.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Packaging, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.Packaging.8.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Pipes.AccessControl, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.Pipes.AccessControl.5.0.0\lib\net461\System.IO.Pipes.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Ports, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.IO.Ports.8.0.0\lib\net462\System.IO.Ports.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Reflection.Context" />
|
||||
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Caching" />
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime" />
|
||||
<Reference Include="System.Runtime.InteropServices" />
|
||||
<Reference Include="System.Security" />
|
||||
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Cng, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Cng.5.0.0\lib\net47\System.Security.Cryptography.Cng.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.ProtectedData, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.ProtectedData.8.0.0\lib\net462\System.Security.Cryptography.ProtectedData.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Xml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Xml.8.0.0\lib\net462\System.Security.Cryptography.Xml.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel" />
|
||||
<Reference Include="System.ServiceModel.Duplex, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Duplex.4.10.0\lib\net461\System.ServiceModel.Duplex.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.Http, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Http.4.10.0\lib\net461\System.ServiceModel.Http.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.NetTcp, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.NetTcp.4.10.0\lib\net461\System.ServiceModel.NetTcp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.Primitives, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Primitives.4.10.0\lib\net461\System.ServiceModel.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.Security, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Security.4.10.0\lib\net461\System.ServiceModel.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel.Syndication, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceModel.Syndication.8.0.0\lib\net462\System.ServiceModel.Syndication.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceProcess" />
|
||||
<Reference Include="System.ServiceProcess.ServiceController, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ServiceProcess.ServiceController.8.0.0\lib\net462\System.ServiceProcess.ServiceController.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Speech" />
|
||||
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.AccessControl, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.AccessControl.8.0.0\lib\net462\System.Threading.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Transactions" />
|
||||
<Reference Include="System.Web.Services" />
|
||||
<Reference Include="System.Web.Services.Description, Version=4.10.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Web.Services.Description.4.10.0\lib\net461\System.Web.Services.Description.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="WindowsBase" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="DataSet1.Designer.cs">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue