diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5aef5505..9d7d26c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,6 +36,7 @@ variables: .version-fix: &version-fix - | $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format ddHH) + $env:NUM_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format ddHH) $env:NUM_DEB = $env:VERS_MAIN+"."+(get-date –format yyMM)+"-beta."+(get-date –format dHH) $env:NEW_COPYRIGHT = "EgalWare @ 2006-" + (get-date -format yyyy) $contenuto = Get-Content -path 'VersGen\VersGen.cs' -Raw @@ -43,8 +44,32 @@ variables: $newContenuto = $newContenuto -replace 'EgalWare © 2006', $env:NEW_COPYRIGHT $newContenuto | Set-Content -Path 'VersGen\VersGen.cs' # display versioni generate - $resoconto = "Effettuato fix file nuspec | release v: " + $env:NUM_REL + " | debug v: " + $env:NUM_DEB; + $resoconto = "Effettuato fix file VersGen | release v: " + $env:NUM_REL + " | debug v: " + $env:NUM_DEB; Write-Output $resoconto; + echo "replace completati" + +# helper x fix nuspec file +.nuspec-fix: &nuspec-fix + - | + echo "Modifica dati file nuspec Release" + $currRelease = $env:NUM_REL + $currDebug = $env:NUM_DEB + $find = "(.|\n)*?"; + $fileNameRel = "$env:APP_NAME.Release.nuspec"; + $nuspDataRel = Get-Content $fileNameRel; + $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel; + $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#", $replCopy; + $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#", "Build $adesso"; + Set-Content -Path $fileNameRel -Value $nuspDataRelUpd; + echo "Modifica dati file nuspec Debug" + $fileNameDeb = "$env:APP_NAME.Debug.nuspec"; + $replDeb = "" + $currDebug + ""; + $nuspDataDeb = Get-Content $fileNameDeb; + $nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb; + $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#", $replCopy; + $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#", "Build $adesso"; + Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd; + echo "replace completati" # helper pulizia files zip .cleanup-zip: &cleanup-zip @@ -80,17 +105,8 @@ variables: New-Item $Target".sha1" $MD5.Hash | Set-Content -Path $Target".md5" $SHA1.Hash | Set-Content -Path $Target".sha1" - echo "Created HASH files for $Target" -# helper x send su NEXUS - # $File2Send = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" - # mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip - # mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".md5" https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".md5" - # mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".sha1" https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".sha1" - # $currentDate = get-date -format yyMM; - # $currentTime = get-date -format ddHH; - # $fileVers = $env:APP_NAME + "\Resources\VersNum.txt" .nexusUpload: &nexusUpload - | Set-Alias mCurl C:\Windows\system32\curl.exe @@ -227,9 +243,11 @@ EgwProxy.Icoel:build:staging: - *nuget-fix - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' - *version-fix + - *nuspec-fix script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' - - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' + - '& Remove-Item *.nupkg' + - '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"' - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' @@ -249,9 +267,12 @@ EgwProxy.MultiCncLib:build:staging: - *nuget-fix - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' - *version-fix + - *nuspec-fix script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' - - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' + - '& Remove-Item *.nupkg' + - '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"' +# - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' @@ -271,9 +292,12 @@ EgwProxy.OsaiCncLib:build:staging: - *nuget-fix - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' - *version-fix + - *nuspec-fix script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' - - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' + - '& Remove-Item *.nupkg' + - '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"' +# - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' @@ -353,9 +377,12 @@ EgwProxy.Icoel:build:release: - *nuget-fix - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' - *version-fix + - *nuspec-fix script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' - - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL' + - '& Remove-Item *.nupkg' + - '& $env:NUGET_PATH pack "$env:APP_NAME.Release.nuspec"' +# - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL' - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' @@ -375,9 +402,12 @@ EgwProxy.MultiCncLib:build:release: - *nuget-fix - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' - *version-fix + - *nuspec-fix script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' - - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL' + - '& Remove-Item *.nupkg' + - '& $env:NUGET_PATH pack "$env:APP_NAME.Release.nuspec"' +# - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL' - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' @@ -397,9 +427,12 @@ EgwProxy.OsaiCncLib:build:release: - *nuget-fix - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' - *version-fix + - *nuspec-fix script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' - - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL' + - '& Remove-Item *.nupkg' + - '& $env:NUGET_PATH pack "$env:APP_NAME.Release.nuspec"' +# - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL' - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' diff --git a/EgwProxy.Icoel.Debug.nuspec b/EgwProxy.Icoel.Debug.nuspec new file mode 100644 index 00000000..5026df13 --- /dev/null +++ b/EgwProxy.Icoel.Debug.nuspec @@ -0,0 +1,20 @@ + + + + EgwProxy.Icoel + #version# + EgwProxy.Icoel + Samuele E. Locatelli, EgalWare + false + MIT + Libreria per comunicazione con SOAP API del sizer di Icoel (IOB-WIN-NEXT) - beta/unstable + #releaseNotes# + #copyright# + EgwProxy.Icoel EgwProxy Icoel + + + + + + + \ No newline at end of file diff --git a/EgwProxy.Icoel.Release.nuspec b/EgwProxy.Icoel.Release.nuspec new file mode 100644 index 00000000..914ded8e --- /dev/null +++ b/EgwProxy.Icoel.Release.nuspec @@ -0,0 +1,19 @@ + + + + EgwProxy.Icoel + #version# + EgwProxy.Icoel + Samuele E. Locatelli, EgalWare + false + MIT + Libreria per comunicazione con SOAP API del sizer di Icoel (IOB-WIN-NEXT) + #releaseNotes# + #copyright# + EgwProxy.Icoel EgwProxy Icoel + + + + + + \ No newline at end of file diff --git a/EgwProxy.Icoel/EgwProxy.Icoel.csproj b/EgwProxy.Icoel/EgwProxy.Icoel.csproj index 4643139a..b10ce5ca 100644 --- a/EgwProxy.Icoel/EgwProxy.Icoel.csproj +++ b/EgwProxy.Icoel/EgwProxy.Icoel.csproj @@ -40,7 +40,9 @@ + + @@ -141,7 +143,6 @@ - diff --git a/EgwProxy.Icoel/index.md b/EgwProxy.Icoel/index.md index 48cad64a..49fbf9b1 100644 --- a/EgwProxy.Icoel/index.md +++ b/EgwProxy.Icoel/index.md @@ -1,9 +1,10 @@ - # EgwProxy.Icoel Library Documentazione relativa alla libreria di interfaccia con il Sizer di ICOEL per le operazioni di R/W dei dati di batch di produzione. -Disponibile in forma di pacchetto nuget sul repo aziendale nexus.steamware.net. +Disponibile in forma di pacchetto nuget sul repo aziendale nexus.steamware.net: i pacchetti sono disponibili all'indirizzo + +https://nexus.steamware.net/#browse/browse:nuget-hosted Vedere la sezione Articles per maggiori informazioni sulle definizioni, l'impiego ed esempi. diff --git a/EgwProxy.MultiCncLib.Debug.nuspec b/EgwProxy.MultiCncLib.Debug.nuspec new file mode 100644 index 00000000..497ba011 --- /dev/null +++ b/EgwProxy.MultiCncLib.Debug.nuspec @@ -0,0 +1,20 @@ + + + + EgwProxy.MultiCncLib + #version# + EgwProxy.MultiCncLib + Samuele E. Locatelli, EgalWare + false + MIT + Libreria per comunicazione CNC FANUC, SIEMENS, OSAI - beta/unstable + #releaseNotes# + #copyright# + EgwProxy.MultiCncLib EgwProxy MultiCncLib FANUC SIEMENS OSAI + + + + + + + \ No newline at end of file diff --git a/EgwProxy.MultiCncLib.Release.nuspec b/EgwProxy.MultiCncLib.Release.nuspec new file mode 100644 index 00000000..5d82fe43 --- /dev/null +++ b/EgwProxy.MultiCncLib.Release.nuspec @@ -0,0 +1,19 @@ + + + + EgwProxy.MultiCncLib + #version# + EgwProxy.MultiCncLib + Samuele E. Locatelli, EgalWare + false + MIT + Libreria per comunicazione CNC FANUC, SIEMENS, OSAI + #releaseNotes# + #copyright# + EgwProxy.MultiCncLib EgwProxy MultiCncLib FANUC SIEMENS OSAI + + + + + + \ No newline at end of file diff --git a/EgwProxy.MultiCncLib/index.md b/EgwProxy.MultiCncLib/index.md index 1c18c443..23d2aae5 100644 --- a/EgwProxy.MultiCncLib/index.md +++ b/EgwProxy.MultiCncLib/index.md @@ -2,7 +2,9 @@ Documentazione relativa alla libreria EgwProxy.MultiCncLib. -Disponibile in forma di pacchetto nuget sul repo aziendale nexus.steamware.net. +Disponibile in forma di pacchetto nuget sul repo aziendale nexus.steamware.net: i pacchetti sono disponibili all'indirizzo + +https://nexus.steamware.net/#browse/browse:nuget-hosted Vedere la sezione Articles per maggiori informazioni sulle definizioni, l'impiego ed esempi. diff --git a/EgwProxy.OsaiCncLib.Debug.nuspec b/EgwProxy.OsaiCncLib.Debug.nuspec new file mode 100644 index 00000000..ebddc897 --- /dev/null +++ b/EgwProxy.OsaiCncLib.Debug.nuspec @@ -0,0 +1,20 @@ + + + + EgwProxy.OsaiCncLib + #version# + EgwProxy.OsaiCncLib + Samuele E. Locatelli, EgalWare + false + MIT + Libreria per comunicazione CNC OSAI - beta/unstable + #releaseNotes# + #copyright# + EgwProxy.OsaiCncLib EgwProxy OsaiCncLib + + + + + + + \ No newline at end of file diff --git a/EgwProxy.OsaiCncLib.Release.nuspec b/EgwProxy.OsaiCncLib.Release.nuspec new file mode 100644 index 00000000..18dde968 --- /dev/null +++ b/EgwProxy.OsaiCncLib.Release.nuspec @@ -0,0 +1,19 @@ + + + + EgwProxy.OsaiCncLib + #version# + EgwProxy.OsaiCncLib + Samuele E. Locatelli, EgalWare + false + MIT + Libreria per comunicazione CNC OSAI + #releaseNotes# + #copyright# + EgwProxy.OsaiCncLib EgwProxy OsaiCncLib OSAI + + + + + + \ No newline at end of file diff --git a/EgwProxy.OsaiCncLib/EgwProxy.OsaiCncLib.vbproj b/EgwProxy.OsaiCncLib/EgwProxy.OsaiCncLib.vbproj index b3415f05..c9b20265 100644 --- a/EgwProxy.OsaiCncLib/EgwProxy.OsaiCncLib.vbproj +++ b/EgwProxy.OsaiCncLib/EgwProxy.OsaiCncLib.vbproj @@ -18,7 +18,6 @@ Binary Off On - arstcomm.ico My Project\app.manifest publish\ true @@ -744,7 +743,6 @@ - WCF Proxy Generator Reference.vb diff --git a/EgwProxy.OsaiCncLib/index.md b/EgwProxy.OsaiCncLib/index.md index da475c85..aef1be09 100644 --- a/EgwProxy.OsaiCncLib/index.md +++ b/EgwProxy.OsaiCncLib/index.md @@ -2,7 +2,10 @@ Documentazione relativa alla libreria EgwProxy.OsaiCncLib. -Disponibile in forma di pacchetto nuget sul repo aziendale nexus.steamware.net. +Disponibile in forma di pacchetto nuget sul repo aziendale nexus.steamware.net: i pacchetti sono disponibili all'indirizzo + +https://nexus.steamware.net/#browse/browse:nuget-hosted + Vedere la sezione Articles per maggiori informazioni sulle definizioni, l'impiego ed esempi. diff --git a/IOB-WIN-NEXT.sln b/IOB-WIN-NEXT.sln index 012e126d..461599ee 100644 --- a/IOB-WIN-NEXT.sln +++ b/IOB-WIN-NEXT.sln @@ -1,14 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29613.14 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32505.173 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{58E399F3-9D4E-49D3-AB35-9ED536543D50}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgwProxy.MultiCncLib", "EgwProxy.MultiCncLib\EgwProxy.MultiCncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgwProxy.OsaiCncLib", "EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B52E3E86-1B82-4F4D-982C-0C8909CD2A28}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -46,38 +42,6 @@ Global {58E399F3-9D4E-49D3-AB35-9ED536543D50}.SIEMENS|Any CPU.Build.0 = Release|Any CPU {58E399F3-9D4E-49D3-AB35-9ED536543D50}.SIEMENS|x86.ActiveCfg = Debug|Any CPU {58E399F3-9D4E-49D3-AB35-9ED536543D50}.SIEMENS|x86.Build.0 = Debug|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.Debug|x86.ActiveCfg = Debug|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.Debug|x86.Build.0 = Debug|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.FANUC|Any CPU.ActiveCfg = FANUC|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.FANUC|Any CPU.Build.0 = FANUC|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.FANUC|x86.ActiveCfg = FANUC|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.FANUC|x86.Build.0 = FANUC|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.Release|Any CPU.Build.0 = Release|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.Release|x86.ActiveCfg = Release|x86 - {2D769FFD-1122-4276-A115-29246E6D23C5}.Release|x86.Build.0 = Release|x86 - {2D769FFD-1122-4276-A115-29246E6D23C5}.SIEMENS|Any CPU.ActiveCfg = SIEMENS|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.SIEMENS|Any CPU.Build.0 = SIEMENS|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.SIEMENS|x86.ActiveCfg = SIEMENS|Any CPU - {2D769FFD-1122-4276-A115-29246E6D23C5}.SIEMENS|x86.Build.0 = SIEMENS|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Debug|x86.ActiveCfg = Debug|x86 - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Debug|x86.Build.0 = Debug|x86 - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.FANUC|Any CPU.ActiveCfg = Release|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.FANUC|Any CPU.Build.0 = Release|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.FANUC|x86.ActiveCfg = Release|x86 - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.FANUC|x86.Build.0 = Release|x86 - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Release|Any CPU.Build.0 = Release|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Release|x86.ActiveCfg = Release|x86 - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Release|x86.Build.0 = Release|x86 - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|Any CPU.ActiveCfg = Release|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|Any CPU.Build.0 = Release|Any CPU - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|x86.ActiveCfg = Release|x86 - {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|x86.Build.0 = Release|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|Any CPU.Build.0 = Debug|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/IOB-WIN-NEXT/App.config b/IOB-WIN-NEXT/App.config index 820f073c..caccef85 100644 --- a/IOB-WIN-NEXT/App.config +++ b/IOB-WIN-NEXT/App.config @@ -1,152 +1,152 @@ - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - + - - - + + + - + - - - + + + - - - + + + - + - - - + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + diff --git a/IOB-WIN-NEXT/ExtLib/CndexLinkDotNet.dll b/IOB-WIN-NEXT/ExtLib/CndexLinkDotNet.dll new file mode 100644 index 00000000..d86313f1 Binary files /dev/null and b/IOB-WIN-NEXT/ExtLib/CndexLinkDotNet.dll differ diff --git a/IOB-WIN-NEXT/ExtLib/Siemens.Sinumerik.Operate.Services.Wrapper.dll b/IOB-WIN-NEXT/ExtLib/Siemens.Sinumerik.Operate.Services.Wrapper.dll new file mode 100644 index 00000000..b8d54cf9 Binary files /dev/null and b/IOB-WIN-NEXT/ExtLib/Siemens.Sinumerik.Operate.Services.Wrapper.dll differ diff --git a/IOB-WIN-NEXT/ExtLib/Siemens.Sinumerik.Operate.Services.dll b/IOB-WIN-NEXT/ExtLib/Siemens.Sinumerik.Operate.Services.dll new file mode 100644 index 00000000..f00469d5 Binary files /dev/null and b/IOB-WIN-NEXT/ExtLib/Siemens.Sinumerik.Operate.Services.dll differ diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index 0d17b818..e05a06bd 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -86,6 +86,12 @@ ..\packages\EasyModbusTCP.5.6.0\lib\net40\EasyModbus.dll + + ..\packages\EgwProxy.MultiCncLib.3.6.2205.1913\lib\net40\EgwProxy.MultiCncLib.dll + + + ..\packages\EgwProxy.OsaiCncLib.3.6.2205.1913\lib\net40\EgwProxy.OsaiCncLib.dll + False ExtLib\krcc.dll @@ -302,10 +308,14 @@ Always + + Always + + Always @@ -842,14 +852,6 @@ - - {2d769ffd-1122-4276-a115-29246e6d23c5} - EgwProxy.MultiCncLib - - - {dc6b309e-f8e9-4ba2-a621-4f617c072533} - EgwProxy.OsaiCncLib - {90512e12-29fc-460d-94cc-648c2a072dbd} IOB-UT-NEXT diff --git a/EgwProxy.OsaiCncLib/arstcomm.ico b/IOB-WIN-NEXT/arstcomm.ico similarity index 100% rename from EgwProxy.OsaiCncLib/arstcomm.ico rename to IOB-WIN-NEXT/arstcomm.ico diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config index 689d5481..457c3e12 100644 --- a/IOB-WIN-NEXT/packages.config +++ b/IOB-WIN-NEXT/packages.config @@ -2,6 +2,8 @@ + +