check sync

This commit is contained in:
Luc Vandenbroucke 2025-01-10 08:59:01 +01:00
parent 110dc53de7
commit 2fcf73e2e9
13 changed files with 122 additions and 97 deletions

View file

@ -13,8 +13,8 @@ Set-AuthenticodeSignature -FilePath "$ScriptPath\installatie.ps1" -Certificate $
Set-AuthenticodeSignature -FilePath "$ScriptPath\installatie2.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com" Set-AuthenticodeSignature -FilePath "$ScriptPath\installatie2.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
compress-archive -force -Path "$SourcePath\syncEdosLocal\bin\Release\*.*" -Destinationpath "$DestPath\eDosSync.zip" compress-archive -force -Path "$SourcePath\syncEdosLocal\bin\Release\*.*" -DestinationPath "$DestPath\eDosSync.zip"
compress-archive -force -Path "$SourcePath\eDosStation\bin\Release\*.*" -Destinationpath "$DestPath\eDosStation.zip" compress-archive -force -Path "$SourcePath\eDosStation\bin\Release\*.*" -DestinationPath "$DestPath\eDosStation.zip"
Copy-Item -Path "$ScriptPath\*.cmd" -Destination "$DestPath" Copy-Item -Path "$ScriptPath\*.cmd" -Destination "$DestPath"
@ -57,8 +57,8 @@ exit
# SIG # Begin signature block # SIG # Begin signature block
# MIImVwYJKoZIhvcNAQcCoIImSDCCJkQCAQExDzANBglghkgBZQMEAgEFADB5Bgor # MIImVwYJKoZIhvcNAQcCoIImSDCCJkQCAQExDzANBglghkgBZQMEAgEFADB5Bgor
# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBOovM3ASaHoVvq # KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDJncE+G3QSzIEV
# Y3WcYYPla07yjxis9VpB7KDXZXHEHqCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG # A9/XTbyKhHcIBZ4p+ySNnqcm9sYzH6CCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG
# SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK # SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK
# BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV # BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV
# BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw # BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw
@ -128,18 +128,18 @@ exit
# MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ # MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ
# Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB # Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB
# gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE # gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE
# MSIEINxxoyHY2HqlI4IDjqmbDD8MnL1OTSks9eQZK0QEEcHyMEQGCisGAQQBgjcC # MSIEIJKzATJgKpAm2Oao683qKw2ANzq3XO+LySAh2pPDK/AZMEQGCisGAQQBgjcC
# AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0 # AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0
# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQDjwulk9eHa92awBQ7xtivxxEJ1 # AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQCznUJDAQxLJVGsohrzHRGuuAzv
# lqw2SJ+qrTOCYvDVIqPP23fn7fRT4qN5p5mFDyHITlmQ0G9o80pCDCCyyULvCWX1 # rj4WBob6gCNVVHcltjm+1eUcDLPGNqRM8sVWg+p3FfwNgI2xxtTuE7dWVQbj4uVM
# o16d73ak1ULMj8+lqki1yNo8OByZA7H0L9GOdc7kqL8zct6L3DyiArTfVB1vuuLL # 62nlnuQ3IgE3ohsjAEKlVaGTYz3ukke8KiSQWiMVm73Erw8rRllrLnz/3iibUQ71
# s4oPY/cQ/NAcGolVN+WswsBWWpeBC8f8lBik7qqb8VarmOd9UcfFLztKa4vKk4Ke # uh5RtY1gRG9Sm/qoxQUEUsF7oU+03w3XGRmGa2KYrWUh6di39XPJiIZQm8wb4DKi
# VXZ/r6oRA0/o/PDXf07iYspUB5KSUdnlDS6A7DfdBlWFXA9F/xQfu3J7iCN95eJV # XiLSv6ETeIJyFv4r+2riZB+thb6EEOBAivTp5MHUZH+fPwXHk1eBcxGFXtldpinU
# Zc+w3vlj24iqSpsfQ1EvtZSeQDOiEeGaZn0z2Df5aFlJViZyQtrPL1GWVhotoYIX # E9HKDDZQe2oeHwV20M9NpShH5N+v/EZ1Nv0222oVnKywX0vgPCNgLx4zqU7coYIX
# KjCCFyYGCisGAQQBgjcDAwExghcWMIIXEgYJKoZIhvcNAQcCoIIXAzCCFv8CAQMx # KjCCFyYGCisGAQQBgjcDAwExghcWMIIXEgYJKoZIhvcNAQcCoIIXAzCCFv8CAQMx
# DzANBglghkgBZQMEAgEFADBoBgsqhkiG9w0BCRABBKBZBFcwVQIBAQYJYIZIAYb9 # DzANBglghkgBZQMEAgEFADBoBgsqhkiG9w0BCRABBKBZBFcwVQIBAQYJYIZIAYb9
# bAcBMCEwCQYFKw4DAhoFAAQUE6Y7dydL7ahN3nc02OYn6IaWKBECEQClWSIdpI4c # bAcBMCEwCQYFKw4DAhoFAAQU/1clKaYHmhA9wjvbxDFqb7UT3FECEQDnBnnXS6W0
# i6DGVoF6KtdmGA8yMDI1MDEwOTExMzE1MlqgghMDMIIGvDCCBKSgAwIBAgIQC65m # iAOlwxxHyhnQGA8yMDI1MDEwOTE1MTAxOFqgghMDMIIGvDCCBKSgAwIBAgIQC65m
# vFq6f5WHxvnpBOMzBDANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJVUzEXMBUG # vFq6f5WHxvnpBOMzBDANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJVUzEXMBUG
# A1UEChMORGlnaUNlcnQsIEluYy4xOzA5BgNVBAMTMkRpZ2lDZXJ0IFRydXN0ZWQg # A1UEChMORGlnaUNlcnQsIEluYy4xOzA5BgNVBAMTMkRpZ2lDZXJ0IFRydXN0ZWQg
# RzQgUlNBNDA5NiBTSEEyNTYgVGltZVN0YW1waW5nIENBMB4XDTI0MDkyNjAwMDAw # RzQgUlNBNDA5NiBTSEEyNTYgVGltZVN0YW1waW5nIENBMB4XDTI0MDkyNjAwMDAw
@ -245,19 +245,19 @@ exit
# LCBJbmMuMTswOQYDVQQDEzJEaWdpQ2VydCBUcnVzdGVkIEc0IFJTQTQwOTYgU0hB # LCBJbmMuMTswOQYDVQQDEzJEaWdpQ2VydCBUcnVzdGVkIEc0IFJTQTQwOTYgU0hB
# MjU2IFRpbWVTdGFtcGluZyBDQQIQC65mvFq6f5WHxvnpBOMzBDANBglghkgBZQME # MjU2IFRpbWVTdGFtcGluZyBDQQIQC65mvFq6f5WHxvnpBOMzBDANBglghkgBZQME
# AgEFAKCB0TAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkF # AgEFAKCB0TAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkF
# MQ8XDTI1MDEwOTExMzE1MlowKwYLKoZIhvcNAQkQAgwxHDAaMBgwFgQU29OF7mLb # MQ8XDTI1MDEwOTE1MTAxOFowKwYLKoZIhvcNAQkQAgwxHDAaMBgwFgQU29OF7mLb
# 0j575PZxSFCHJNWGW0UwLwYJKoZIhvcNAQkEMSIEICQ+zvUF+5VmLmF+fO2X1uXe # 0j575PZxSFCHJNWGW0UwLwYJKoZIhvcNAQkEMSIEIGkHSkWhVRKilPIQIe4PWd8r
# lsqZnWl6plFIuWG1plmdMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIHZ2n6jyYy8f # g7v39VmhXFAMD7HEifY2MDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIHZ2n6jyYy8f
# Qws6IzCu1lZ1/tdz2wXWZbkFk5hDj5rbMA0GCSqGSIb3DQEBAQUABIICABiN0py3 # Qws6IzCu1lZ1/tdz2wXWZbkFk5hDj5rbMA0GCSqGSIb3DQEBAQUABIICAHaMCQ4Q
# Vb7ARHbALuYXKx91mA2tFWzLe0/R2rLvoda9yn9Xl8LPcTdQT78eC3xvNNbFo57R # x9T51D2cwCAFS8++nYMwgmqS/CTW245YaO/8grO9pDwfeaQZpto+LPfYb1vMrwba
# Kg8FcdmWECJSONX26ZZffeNzk8Nv6ElBmd2SBGMwTncuLM9+2JOiPkK79XN+qJ0P # +Cszkm4zykaCRTxzuX52mstMyjA+BdyFYKu75EKzPYbIChNjiwf59ty3b58Bmdh0
# Ub4aPsnAmOUre++1AOUbO+IlSPrTfrRVJf/iJkEUUx28J9BvamJo4bQLEq2jdFat # ESakLXwQL0GH8ubst6UcUMGRViXLp7xuSgvU9qXZY6tcUWO9Eckek5xjpvty/Dt9
# Hf74FFnw10tJYAoI9o6+1+PYAWUTwMBLkn4xizEt5ocbZayqev29mHO96T93j3M5 # AEQMB3tfI4JhW2IqgmfWn9BFH+C+26gQTgYlxIcFI+bVLkcdEt8n2+ohKhr0r6Ye
# CXaKWBv9gUch7TTLPRb1nNpgbxifpaMBgniLIF1OVwUoyb1ybPwnVMTID5s3ifeG # FEjhWEZvBf6UmHwkt34/ubs8POT+ICTdubBCZX3/0tJBkPSc2DcFWT/1h7hpvDWx
# F2RiC/R6XK9qHOJoqRGljhvP8LBLmf1D4JMP6lgLv1P7xmCm9CWqEMUO1C9W1ucJ # +0MEdEFp0eN9WuOSD8MxNyskzvzHQidOJM+czfpClDn7Rzljcva7WgcoP3E4CKhs
# araLWQTR14uHtB/g49P0v0acASomCmyGJiwlwvayMQbTb+DFPKmNC1Hpx5WPADMX # jEzU+qr9tJpnNxZlfLowmChwHen3BeY4tzfe8MTFr5nqhxiZQMkfkoCtDbRTXdRt
# D5x98cjKappm/0MIhXX3x+xmoq7Wl7TuZ/OTtuJfD7Y8/70VuPziEgZIPqIlvLa8 # JZ+664PcjnQbxX6A3419KEZpU0gp6YMULB0pzf5nawIe3z6Be4hJmBYqXvrUoX2M
# qE2zoZsg+QS1q0+81Ky4JD5N07acxjRVB6YVcy6aVB6SXq4xii+A4qhlGtxNGtLD # 62t8iW7wCZpt/+p424auhMTf44ONrw1QpmNzIFC/G9K4DKb2msoNC2W1Lh3ZcMu1
# WRuajcp3BuJymc9FNT1urQ92Z7RFCd7Hf1aXmBMSNg/ezYBLUWkxLevCd3uPjHcg # f5r7pJ67biMtKYQqX1hi5LAvPYNMezUdC8uD5fHZtjtG/b0Yt37yl7H1KYR/+BT4
# RUErNnASC9tP+xgbuv+/rKfVgpuCUT/h/ZHL # J0LPATOSU+leRr8RyzwI/GLVEY/yBagtkNmW
# SIG # End signature block # SIG # End signature block

View file

@ -91,8 +91,8 @@
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="LSWLib, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="LSWLib, Version=4.1.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LSWLib2.4.1.0\lib\net48\LSWLib.dll</HintPath> <HintPath>..\packages\LSWLib2.4.1.2\lib\net48\LSWLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="LSWDesfirePublic" version="1.3.9" targetFramework="net48" /> <package id="LSWDesfirePublic" version="1.3.9" targetFramework="net48" />
<package id="LSWLib2" version="4.1.0" targetFramework="net48" /> <package id="LSWLib2" version="4.1.2" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.50" targetFramework="net48" developmentDependency="true" /> <package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.50" targetFramework="net48" developmentDependency="true" />
<package id="SharpDX" version="4.2.0" targetFramework="net48" /> <package id="SharpDX" version="4.2.0" targetFramework="net48" />
<package id="SharpDX.D3DCompiler" version="4.2.0" targetFramework="net48" /> <package id="SharpDX.D3DCompiler" version="4.2.0" targetFramework="net48" />

View file

@ -213,17 +213,17 @@ exit
# dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI # dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI
# QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD # QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD
# BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP # BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP
# Fw0yNTAxMDkxMTI5MzlaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz+ekiprJJ # Fw0yNTAxMDkxNTA2NTBaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz+ekiprJJ
# KPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgASbOk8bEZlUtfJ5oZ2 # KPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgBjspxYWjJVw4+YH73t
# H+P8Nx06y4ZZey0CWt7hEXACiwhJ01RU6p5lMrT2yqjXmqRfOc+Vho6POVw/vele # wb+J4zZxKLzolmlnpFeYmVpldPL1j1UdTLMai/itl8h8J5cxl887XNWzeACAW5G6
# oCbQNKKaPG42rwEWWSnHRnSBooXT+mDQXbNvzKRHA1mK99sGnVCYmjaJ5TaG/uMC # DNH8S1dkIEXD+PPN1E1SiR7gt9Zk3D4x7Xzg+MU+aWDjGfdnrx8BRdnqtY7d/bbK
# L7YSeYx4j8U16u/mDLFaH5Xy+J8qbJHKoleja1mIx8z9SncJlRfgk8qghwRf3ltv # OghfO5kMZZoHsiTfm2omq6I/UhkhOtfCGyiLDzV6nv/nXeM3ZbABzbsGEPILRRzA
# YBLekrXqeX0RYbtRSKDtK6aYDGsGEoAb/wSpBnHLC5bfGC2EPljP4GNdVAdBY5AS # d1r/2IW/xMxno8mzeaQy8jEfFDioOq8o0WYIFzToKa80b7py9AdckrDKV/PE8D6s
# vY6pzkgnNJIJOz8YrcxfBAfU0yECWlfSDe1KcJitUDkLgcv/NU68uay888DU8Kz9 # tyn0aCt36c4dc+aDf2kCXruqMSIrWLLNFZ2iIOCmWCgYVSQ1fUoWGthOJ7I3D6BU
# MqgzsIq5dktg5Xz0q9YC+TPAwoOOcXiXPIIaAGOaGVwDWvppFvzTVcy8Me5fe8I3 # MIjdUdgs7oVSujuev1mqNebF3p/w21vmhyFYHicK10/RxkxV2uRIG3yRELm47M7s
# hDdo/dxNFUmX7BsMF06+JsQGrAs0YvjtSZhpn5IXWWZH/uzO4ZGnwXFO4YVccURK # KcW8uy0LEgfWelRSTH9FtG8oNY77fZ/pOkXBQRw1rifGXndNWE0fz9rQsYeBCcm1
# 0kktoMk0F0ny9IrtDaGVK0kkB9Q3+hjvUjxrNkCrkwMJfeffbJTp88/VzWXw+4dS # SaxP8JZ0Ixd/NhBv3QkZqzdLbBUCHpj6G7v0rMG4AlBG8uqSZCgom/N9h1R78arY
# UczP3CMMsq66xMdDvVYePBuXM4lK5VJr2TxOtRsMZrqsatdgy0fW2IFv63xf2yLU # za1KI17KVH23U/54LANdfceG/Ne3lZhddLHPL3mI3B70n+byBWE4/0gPTNZ/zdC8
# vbS+OY6LASkbpDjA6al7y4p1RMgNshUlsyyVwqviPpM7tiVLFzJBdED0TBVkW7pB # Fdti1Nfr7KrKd78keDBAYzxRciiKQ6/BFk1GY4ygeNsfa7PIoeX6T6Qo7d9JYoBc
# qu5S7/XXdTCTazUVVBGzcdTJPA== # Fw0HIoH+8OR1rQ6zofD6xmm7tA==
# SIG # End signature block # SIG # End signature block

Binary file not shown.

View file

@ -328,17 +328,17 @@ exit
# dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI # dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI
# QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD # QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD
# BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP # BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP
# Fw0yNTAxMDkxMTI5MzlaMC8GCSqGSIb3DQEJBDEiBCCyup1JgA0NXjui7RGocw5b # Fw0yNTAxMDkxNTA2NTBaMC8GCSqGSIb3DQEJBDEiBCCyup1JgA0NXjui7RGocw5b
# pc/ttgrR6DcrmX+cuFKXxDANBgkqhkiG9w0BAQEFAASCAgAkyGz1E0fXDfGcC7a+ # pc/ttgrR6DcrmX+cuFKXxDANBgkqhkiG9w0BAQEFAASCAgCdLblih/9k6OOihONx
# sjn4pEhTNQmuOOZyV01IpwYV6uizaa6C153lHP4xWHJF2qI5BakXEPLXQQvLc85i # KWgqaUGqj5cXXy2M/HeEoKO6jvQaLaF/+7GOq39GFDCUVmSqzbCAn1apfK7lkGUd
# 9cWTto/mebGm/vAA3XAbBi0Pp0M/XjiPLLMHB5EE1NFCi3ZOALhzwt9jbLxG++g7 # /YNMTdpSw82UdnNM5oRd65zlf7AP5b/40XsfUB0Rw0HLUyhUBwreBe4mZd55I+OL
# VcCNyqDUQ3ERyjR6DZ9h/5xIqL1BUc7EfFQi0Zy0YqyMO5fMRKUwt9bP8EJ/snag # rfJ7YAv2tOHTmf8actNfDKr5sAvU7i9B/pX23X2FFpCeg9EQTJqtWNvtzZd4YOEv
# w955f48W8G0IlF3Ncib04JwQ/0AkUPqNbVsYrRhHQaVQx7iVIeaftlTtuQ8Px/Fl # JiHUcLp1oI318pN15DI167gGc4evo9Oe3haxm6hq+o+7HaHy25B9fy3uGGpAlyI5
# HFope3tdSByIlD73WRrYtvPUO4cDdBV7hE0n4x44xBjR7tfKoQPxtYsVJtZhX9UM # W+nXCNfrSHwX8tBXrXnklKZY19XVDa54tGC2ntYlkJFpmRRCbpdXgUrqP2MypM0J
# 6sJVou90NOrEOFDb4dvlREmlvdKQu3DusO8iO/pZarXqXGr4/YBP2obLR3LH1Wdh # 09Wb7XUobA1A/vPPC53J/iTT1JMZ3MDS8JRxpuFlyvw/X48w7/2Ko36+tgSHqBlf
# OMix4THE8cV/8de26un9+LmULxGoS/Oo9t6A5b1gRj6V5Wa9F2v9gKPKyDFUnju1 # 7lanA+vaU+QjDSgtG3qjnatVxgBEdh4By5AKmKyO2+yiIdnqBQDHMUFJOWwuCV1K
# c8qyouaky0wbr5wN9TbTPTXuUUyr6RpB4f7fXi2btW1X6q+u6yQzqjrtrLYtkTsH # sk6k/E0xhRHwxCZu6ZrYq9HieztBy+y5Dkm2W4Oj4vVXWomkEzbBsCBvmu7l9YYU
# ZEmLX9Aul/vybjetgHzdfCiSUmX/AT9Vk98LXZd7zGyWm1T6MCmlNHFGDOnI2cHX # TRwbsoAUZOu//zTEfKc6SG7v625+IPJWBEMwszrtBxpm2F4ClQ3dPEYlKAMMtQ4a
# iA1M19VpbAgxDTNplwE7YXQf1lp/HAWa0hveT2hGLXdk4AUqM3rFtErKjBZRqyV1 # ctlhO9whCKg4LTRmRW0oCTVh6206K5Ge4nRxxD8WIjazLwe5P08687YmMNsWpZwR
# pWRzFpkTUx7zCKaHNFzlrPwSuw== # /Wecmy/gI4fTIiUnmUZr9uLJZA==
# SIG # End signature block # SIG # End signature block

View file

@ -192,17 +192,17 @@ exit
# dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI # dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI
# QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD # QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD
# BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP # BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP
# Fw0yNTAxMDkxMTI5MzlaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsppr9o2qvS # Fw0yNTAxMDkxNTA2NTFaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsppr9o2qvS
# 6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgC6ZEvnzn2c7sVg/VAp # 6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgBRFeAdjgT81jCyNQ4I
# AEkh1clUgI/1OXMWGSu1il8QFQtRfxaQxF3OnXvN8kqg/YggnDxJIqpsY5WJC5FD # x3Fn3yTSlfWpXfIievOY0J26iyDeN/EHmNpnfx2a9+BgsC6dJEppVXDPjSIFF35K
# gJ47GUuRJLb4Em4YCwbtZnLswN28LwLfmRBuBBdMi56G1tCHMAM++LogtPRcEAuM # fZJUG/TMDG3g3FTgW6iKIkZUELhKfd+YRWHDf3LaXN5xDg5DxYSm3s6tGkZc/vxd
# 8MYyvUheDCHeL17+LRj4uuoRrhH+KhTF2FPR71zZtnJl8Qxus7XBtLuJPgmL76t0 # HdEJS+xsT+B/IFw3oeoC+YK01CDjohsQXVSCzno7h8Ygvbjh2U90mUo8/10Jz3MT
# gOWi3oHizBa/JVVV+R/iBtA51KanqK2xLiRpeBl6AyvtQ22BJQ4JvmGB4Bhl8rLQ # +XvCFDKnUrm2d+7QxEFlhgAlkHrbEVQaQeCaVz6LwZQi1ETkqqY8mI8S/FL6hWr1
# aCMmlFdMC126Lh18leRiWioyR9xEk3Td7Qj5feZ2+A7wOyr/7jN9BskMBzMgBfXM # mcEYdbXl3l4fvsR/o4iS451OoaLpcvDWb/De5yGMXBlJFgZfSrO7uddzCtkM6IvQ
# O4UFsgYni+G2XSzxmexBsq7AZFr8XOuX5Yr98UnaEDPUyoJbwQSLGUiD7MiYA3FF # 3EsIgKIz4mvDYRVR2mqJ1QcvEKFDiFUW2ENIe3MfSpzFzk6AfeWH63MJcknsIsHc
# 91Rx2TgC/yB3r072eI9ZBnNzqN/fYOcpfuHbgLzevh/sb9JEZrvR4dbyGmmvM76Q # k/xcvIVS0COF6KfviDj5ShX6V+s7GcCSJIL3nYIwPtTomJzXH5EFvU42PVldyxru
# 3dZm2knuZw7aK7N5izsmvMHvK/P1kljPt6nVPyRqIan6jodXx/7CLBGRQH1AqkWO # MsTVzsZzNyHiJ3A3UMef73+ClmbYqpG5OzyozdTh/P9NJiJhbPtu3FyvPLh1HHYU
# OY6Mrm++xP46L7UJCWeM7pLtAoUbwdTQ4h+4pQHGxZiR0Z7+mAP/RQADuiuifqYy # THAQPVbzhLuiWMNNZElA7dX3GT02CbvVLN4TBTPUgn6J86NGPDIK7sb744Gb3hsl
# h1lgntywmEYiZrUqLxS05oSB5x8FZntAYu0rOBIlUTfYWzENM21L1UqS9bprwBnA # 9CSXuVSJo6kO4Uc6d+xTBBwsTrCQ8IUfrJGLlJcFoCcqybjOdbTLvc4X/AQLhANY
# CfVS6DUS53VaHQb0HHGTvCLiyQ== # MmeTw64cE7VlJF+4MVZ56Z0ZQg==
# SIG # End signature block # SIG # End signature block

View file

@ -270,16 +270,17 @@ namespace syncEdosLocal
int res = 0; int res = 0;
step = "Deactivate"; step = "Deactivate";
if (sqlCmdsDeActivate != null) if (sqlCmdsDeActivate != null)
using (var cmd = new System.Data.SqlClient.SqlCommand(sqlCmdsDeActivate.ToString(), toConnection)) using (var cmd = new System.Data.SqlClient.SqlCommand(sqlCmdsDeActivate.ToString(), toConnection) { CommandType= CommandType.Text })
{ {
cmd.CommandType = CommandType.Text;
try try
{ {
spLog.SeverityReset(); spLog.SeverityReset();
spLog.KvAddCommand(spl.skeys.sqlQuery, cmd);
res = cmd.ExecuteNonQuery(); res = cmd.ExecuteNonQuery();
messages.AppendLine($"Success:Query={sqlCmdsDeActivate.ToString()}"); messages.AppendLine($"Success:Query={sqlCmdsDeActivate.ToString()}");
ucmd.Parameters["constraintsDeactivated"].Value = true; ucmd.Parameters["constraintsDeactivated"].Value = true;
spLog.WriteSplunkLog(module,step,spLog.splunkSeverity ); spLog.WriteSplunkLog(module,step,spl.iseverity.info );
} }
catch (System.Exception ex) catch (System.Exception ex)
{ {
@ -290,24 +291,42 @@ namespace syncEdosLocal
} }
} }
error = false;
int cnt = 0; int cnt = 0;
qry = LSWLib.SqlCommands.getColumnsQry(fromConnection, src); step = "GetColumnsQuery";
SqlConnection[] curDests = new SqlConnection[] { toConnection }; try
System.Diagnostics.Debug.WriteLine(Task);
step = "Task";
ignorederror = false;
cnt = Bulker.Execute(Task, fromConnection, curDests, qry, CommandType.Text, dest, 0, ref error);
ucmd.Parameters["lastRecords"].Value = cnt;
if (dest.Contains("PersonInfo"))
Result.Persons = cnt;
else if (dest.Contains("TaskInfo")) Result.Tasks = cnt;
if (error && ciIgnoreError >= 0 && rtr[ciIgnoreError] is bool && (bool)rtr[ciIgnoreError])
{ {
error = false; qry = LSWLib.SqlCommands.getColumnsQry(fromConnection, src);
ignorederror = true; spLog?.KvAdd(spl.skeys.sqlQuery, qry);
spLog.WriteSplunkLog(module,step, spl.iseverity.err); spLog?.WriteSplunkLog(module, step, spl.iseverity.info);
} catch (System.Exception ex)
{
qry = null;
spLog?.WriteException(module,step,ex);
} }
spLog.KvClear();
SqlConnection[] curDests = new SqlConnection[] { toConnection };
step = "BulkTask";
ignorederror = false;
if (!string.IsNullOrEmpty(qry))
{
spLog?.KvAdd(spl.skeys.sqlQuery, qry);
cnt = Bulker.Execute(step, fromConnection, curDests, qry, CommandType.Text, dest, 0, ref error);
ucmd.Parameters["lastRecords"].Value = cnt;
if (dest.Contains("PersonInfo"))
Result.Persons = cnt;
else if (dest.Contains("TaskInfo")) Result.Tasks = cnt;
if (error && ciIgnoreError >= 0 && rtr[ciIgnoreError] is bool && (bool)rtr[ciIgnoreError])
{
error = false;
ignorederror = true;
spLog.WriteSplunkLogM(step, spl.iseverity.err);
}
else spLog.WriteSplunkLogM(step, spl.iseverity.info);
}
spLog.KvClear();
step = "Deactivate"; step = "Deactivate";
if (sqlCmdsActivate != null) if (sqlCmdsActivate != null)
using (var cmd = new System.Data.SqlClient.SqlCommand(sqlCmdsActivate.ToString(), toConnection)) using (var cmd = new System.Data.SqlClient.SqlCommand(sqlCmdsActivate.ToString(), toConnection))
@ -321,7 +340,7 @@ namespace syncEdosLocal
res = cmd.ExecuteNonQuery(); res = cmd.ExecuteNonQuery();
messages.AppendLine($"Success:Query={sqlCmdsActivate.ToString()}"); messages.AppendLine($"Success:Query={sqlCmdsActivate.ToString()}");
ucmd.Parameters["constraintsActivated"].Value = true; ucmd.Parameters["constraintsActivated"].Value = true;
spLog.WriteSplunkLog(module,step,spl.iseverity.info); spLog?.WriteSplunkLog(module,step,spl.iseverity.info);
} }
catch (System.Exception ex) catch (System.Exception ex)
{ {
@ -334,6 +353,8 @@ namespace syncEdosLocal
ucmd.Parameters["syncError"].Value = error | ignorederror; ucmd.Parameters["syncError"].Value = error | ignorederror;
try try
{ {
spLog.KvClear();
spLog.KvAddCommand(spl.skeys.sqlQuery, ucmd);
ucmd.ExecuteNonQuery(); ucmd.ExecuteNonQuery();
} }
catch (System.Exception ex) catch (System.Exception ex)
@ -385,7 +406,7 @@ namespace syncEdosLocal
pcName = System.Environment.MachineName; pcName = System.Environment.MachineName;
spLog = new spl(moduleName); spLog = new spl(moduleName, hourlyLog:true);
Bulker = new LSWLib.Bulker(spLog, false); Bulker = new LSWLib.Bulker(spLog, false);
messages = Bulker.messages; messages = Bulker.messages;
messages.AppendLine(spLog.GetStartInfoString()); messages.AppendLine(spLog.GetStartInfoString());
@ -412,10 +433,12 @@ namespace syncEdosLocal
catch (System.Exception ex) catch (System.Exception ex)
{ {
spLog.WriteException(module,step,ex); spLog?.WriteException(module,step,ex);
messages.AppendLine($"Error reading reg key"); messages.AppendLine($"Error reading reg key");
} }
spLog?.KvAdd(spl.skeys.sqlConnection, SourceCoStr.ConnectionString);
spLog?.WriteSplunkLogM( step, spl.iseverity.info);
messages.AppendLine($"Remote {SourceCoStr.DataSource} db {SourceCoStr.InitialCatalog} Logon= { SourceCoStr.UserID} alias:{ reDos }"); messages.AppendLine($"Remote {SourceCoStr.DataSource} db {SourceCoStr.InitialCatalog} Logon= { SourceCoStr.UserID} alias:{ reDos }");
messages.AppendLine($"Local {LocalCoStr.DataSource} db {LocalCoStr.InitialCatalog} Logon= { LocalCoStr.UserID} alias:{ reDosLocal }"); messages.AppendLine($"Local {LocalCoStr.DataSource} db {LocalCoStr.InitialCatalog} Logon= { LocalCoStr.UserID} alias:{ reDosLocal }");
@ -437,7 +460,9 @@ namespace syncEdosLocal
using (System.Data.SqlClient.SqlConnection eDosCon = new SqlConnection(SourceCoStr.ConnectionString)) using (System.Data.SqlClient.SqlConnection eDosCon = new SqlConnection(SourceCoStr.ConnectionString))
{ {
eDosCon.InfoMessage += Connection_InfoMessage; eDosCon.InfoMessage += Connection_InfoMessage;
step = "DoorloopToDo";
DoorloopToDo(eDosCon, LocalCoStr.ConnectionString, iMessage, ref error, ref warning); DoorloopToDo(eDosCon, LocalCoStr.ConnectionString, iMessage, ref error, ref warning);
step = "DoorloopVisits";
DoorloopVisits(eDosLocalCon, eDosCon, Bulker.spLog, ref error); DoorloopVisits(eDosLocalCon, eDosCon, Bulker.spLog, ref error);
} }
Result.Write(); Result.Write();

BIN
syncEdosLocal/eDosSync.zip Normal file

Binary file not shown.

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="LSWLib2" version="4.1.0" targetFramework="net48" /> <package id="LSWLib2" version="4.1.2" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.50" targetFramework="net48" developmentDependency="true" /> <package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.50" targetFramework="net48" developmentDependency="true" />
</packages> </packages>

View file

@ -1,17 +1,17 @@
pause syndEdosLocal to Sqlsrv7 " pause syndEdosLocal to Sqlsrv7 "
set src="D:\l\src\cs2024\eDosStation\syncEdosLocal\bin\Release" set src="D:\l\src\cs2025\eDosStation\syncEdosLocal\bin\Release"
set C="%cd:"=%\bin\release" set C="%cd:"=%\bin\release"
if /I %src%==%C% (echo "Path OK ") else (echo "Path issue !") if /I %src%==%C% (echo "Path OK ") else (echo "Path issue !")
Pause was ok ? Pause was ok ?
set dst="\\sqlsrv7\c$\Soft\eDos2023" set dst="\\sqlsrv7\c$\Soft\eDos2025"
::set zip="eDosStation.tar" ::set zip="eDosStation.tar"
::tar -cf %zip% -C %src% --exclude *.zip *.* ::tar -cf %zip% -C %src% --exclude *.zip *.*
set zip="syncEdosLocal.zip" set zip="eDosSync.zip"
"c:\program files\7-zip\7z.exe" a -r %zip% .\bin\release\*.* "c:\program files\7-zip\7z.exe" a -r %zip% .\bin\release\*.*
xcopy %zip% %dst% /i /h /R /y xcopy %zip% %dst% /i /h /R /y

View file

@ -27,7 +27,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
@ -37,8 +37,8 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="LSWLib, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="LSWLib, Version=4.1.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LSWLib2.4.1.0\lib\net48\LSWLib.dll</HintPath> <HintPath>..\packages\LSWLib2.4.1.2\lib\net48\LSWLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />

Binary file not shown.