From 6e2ccc39275c04249bc39a3e5c280d8c7765abee Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:46:10 +0200 Subject: [PATCH 1/4] Fix tag + last dot --- .gitlab-ci.yml | 1 + MapoSDK.Debug.nuspec | 2 +- MapoSDK.Release.nuspec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11b2e6d0..991800e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,7 @@ variables: $newContenuto | Set-Content -Path 'VersGen\MoonPro.cs' echo "Modifica dati file nuspec Release" $currRelease = $env:NEW_REL + $lastDot = $currRelease.LastIndexOf("."); $currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot); $find = "(.|\n)*?"; $fileNameRel = "MapoSDK.Release.nuspec"; diff --git a/MapoSDK.Debug.nuspec b/MapoSDK.Debug.nuspec index 1adcb020..f03586db 100644 --- a/MapoSDK.Debug.nuspec +++ b/MapoSDK.Debug.nuspec @@ -10,7 +10,7 @@ SDK for MAPO solutions - beta/unstable #releaseNotes# #copyright# - MAPO;SDK;IOB + MAPO SDK IOB diff --git a/MapoSDK.Release.nuspec b/MapoSDK.Release.nuspec index 1f896c8e..3fe162e3 100644 --- a/MapoSDK.Release.nuspec +++ b/MapoSDK.Release.nuspec @@ -10,7 +10,7 @@ SDK for MAPO solutions #releaseNotes# #copyright# - MAPO;SDK;IOB + MAPO SDK IOB From 959b538d0ef01bdd9005e1407331c132f7b3f3cc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:58:36 +0200 Subject: [PATCH 2/4] Correzione invio versione debug selezionando solo dll puntuale --- .gitlab-ci.yml | 6 ++++-- MapoSDK.Debug.nuspec | 3 +++ MapoSDK.Release.nuspec | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 991800e5..ad4d1e05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ variables: DEPLOY_FOLDER: 'c:\Projects\Deploy\MoonPro\Builds' VERS_MAIN: '6.14' NEW_REL: '' + NEW_DEB: '' NEXUS_PATH: 'MP-XXXX' APP_NAME: 'MP.Xxxx' APP_CONF: 'Release' @@ -101,6 +102,7 @@ variables: $currRelease = $env:NEW_REL $lastDot = $currRelease.LastIndexOf("."); $currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot); + $env:NEW_DEB = $currDebug $find = "(.|\n)*?"; $fileNameRel = "MapoSDK.Release.nuspec"; $replRel = "" + $currRelease + ""; @@ -162,11 +164,11 @@ SDK-unstable: - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' + - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Debug /verbosity:minimal /m' - '& Remove-Item *.nupkg' - '& $env:NUGET_PATH pack MapoSDK.Debug.nuspec' - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' - - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' + - '& $env:NUGET_PATH push MapoSDK.$env:NEW_DEB.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' ADM:build: stage: build diff --git a/MapoSDK.Debug.nuspec b/MapoSDK.Debug.nuspec index f03586db..aded2fbe 100644 --- a/MapoSDK.Debug.nuspec +++ b/MapoSDK.Debug.nuspec @@ -15,4 +15,7 @@ + + + \ No newline at end of file diff --git a/MapoSDK.Release.nuspec b/MapoSDK.Release.nuspec index 3fe162e3..d8463710 100644 --- a/MapoSDK.Release.nuspec +++ b/MapoSDK.Release.nuspec @@ -4,7 +4,7 @@ MapoSDK #version# MapoSDK - Samuele E. Locatelli + Samuele E. Locatelli, EgalWare false MIT SDK for MAPO solutions @@ -15,4 +15,8 @@ + + + + \ No newline at end of file From fcdcb1b13d8f482c9e1fc4d9516ab1c5a96a1e6e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 16:07:02 +0200 Subject: [PATCH 3/4] fix nuspec invertiti debug/release --- MapoSDK.Release.nuspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MapoSDK.Release.nuspec b/MapoSDK.Release.nuspec index d8463710..cbc0b199 100644 --- a/MapoSDK.Release.nuspec +++ b/MapoSDK.Release.nuspec @@ -16,7 +16,6 @@ - - + \ No newline at end of file From dc29400bfd56527dc1dba8b307aa4867027bcd68 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 16:07:08 +0200 Subject: [PATCH 4/4] fix altro nuspec --- MapoSDK.Debug.nuspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MapoSDK.Debug.nuspec b/MapoSDK.Debug.nuspec index aded2fbe..3af1ad7b 100644 --- a/MapoSDK.Debug.nuspec +++ b/MapoSDK.Debug.nuspec @@ -16,6 +16,7 @@ - + + \ No newline at end of file