diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fe032b1..faab3131 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,6 +46,25 @@ variables:
# display versioni generate
$resoconto = "Effettuato fix file nuspec | release v: " + $env:NUM_REL + " | debug v: " + $env:NUM_DEB;
Write-Output $resoconto;
+ 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
@@ -81,17 +100,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
@@ -230,7 +240,9 @@ EgwProxy.Icoel:build:staging:
- *version-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" pack "$env:APP_NAME\$env:APP_NAME.csproj" -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'
@@ -356,7 +368,9 @@ EgwProxy.Icoel:build:release:
- *version-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.Debug.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'
diff --git a/EgwProxy.Icoel/EgwProxy.Icoel.csproj b/EgwProxy.Icoel/EgwProxy.Icoel.csproj
index 4643139a..77ee9ad6 100644
--- a/EgwProxy.Icoel/EgwProxy.Icoel.csproj
+++ b/EgwProxy.Icoel/EgwProxy.Icoel.csproj
@@ -39,8 +39,13 @@
+
+ ..\packages\NLog.5.0.0\lib\net46\NLog.dll
+
+
+
diff --git a/EgwProxy.Icoel/packages.config b/EgwProxy.Icoel/packages.config
new file mode 100644
index 00000000..b76cf6c3
--- /dev/null
+++ b/EgwProxy.Icoel/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/EgwProxy.OsaiCncLib/arstcomm.ico b/EgwProxy.OsaiCncLib/arstcomm.ico
deleted file mode 100644
index 8dac1124..00000000
Binary files a/EgwProxy.OsaiCncLib/arstcomm.ico and /dev/null differ
diff --git a/EgxProxy.Icoel.Debug.nuspec b/EgxProxy.Icoel.Debug.nuspec
new file mode 100644
index 00000000..102f6032
--- /dev/null
+++ b/EgxProxy.Icoel.Debug.nuspec
@@ -0,0 +1,23 @@
+
+
+
+ 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/EgxProxy.Icoel.Release.nuspec b/EgxProxy.Icoel.Release.nuspec
new file mode 100644
index 00000000..a9716c7e
--- /dev/null
+++ b/EgxProxy.Icoel.Release.nuspec
@@ -0,0 +1,22 @@
+
+
+
+ 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