From 60b66179d44b4fe3716a5c9b6db9030e98fde49b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 14:52:17 +0200 Subject: [PATCH 1/7] Aggiunta preliminare file nuspec --- MapoSDK.nuspec | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 MapoSDK.nuspec diff --git a/MapoSDK.nuspec b/MapoSDK.nuspec new file mode 100644 index 00000000..7ba67fa4 --- /dev/null +++ b/MapoSDK.nuspec @@ -0,0 +1,18 @@ + + + + MapoSDK + $version$ + Mapo SDK LIbrary + Samuele E. Locatelli + false + MIT + $description$ + $releaseNotes$ + $copyright$ + MAPO;SDK;IOB + + + + + \ No newline at end of file From e1c7af08208078d0a0edd4501bcf3ebf586c4ca0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:22:26 +0200 Subject: [PATCH 2/7] Aggiunta conf nuspec --- MapoSDK.Develop.nuspec | 18 ++++++++++++++++++ MapoSDK.nuspec => MapoSDK.Release.nuspec | 10 +++++----- 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 MapoSDK.Develop.nuspec rename MapoSDK.nuspec => MapoSDK.Release.nuspec (65%) diff --git a/MapoSDK.Develop.nuspec b/MapoSDK.Develop.nuspec new file mode 100644 index 00000000..1adcb020 --- /dev/null +++ b/MapoSDK.Develop.nuspec @@ -0,0 +1,18 @@ + + + + MapoSDK + #version# + MapoSDK + Samuele E. Locatelli + false + MIT + SDK for MAPO solutions - beta/unstable + #releaseNotes# + #copyright# + MAPO;SDK;IOB + + + + + \ No newline at end of file diff --git a/MapoSDK.nuspec b/MapoSDK.Release.nuspec similarity index 65% rename from MapoSDK.nuspec rename to MapoSDK.Release.nuspec index 7ba67fa4..1f896c8e 100644 --- a/MapoSDK.nuspec +++ b/MapoSDK.Release.nuspec @@ -2,14 +2,14 @@ MapoSDK - $version$ - Mapo SDK LIbrary + #version# + MapoSDK Samuele E. Locatelli false MIT - $description$ - $releaseNotes$ - $copyright$ + SDK for MAPO solutions + #releaseNotes# + #copyright# MAPO;SDK;IOB From 5bd685e6cae42b192a343dd881e4673424698d29 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:22:35 +0200 Subject: [PATCH 3/7] Update yaml (da testare) --- .gitlab-ci.yml | 22 ++++++++++++++++++++++ MP-IO/MP-IO.csproj.user | 2 +- MP-Site/MP-Site.csproj.user | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a846f19..90a8172b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,9 +92,31 @@ variables: - | $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format dHH) echo "Set vers: $env:NEW_REL" + $anno = (get-date -format yyyy) + $adesso = (get-date -format dd:HH:mm) $contenuto = Get-Content -path 'VersGen\MoonPro.cs' -Raw $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL $newContenuto | Set-Content -Path 'VersGen\MoonPro.cs' + echo "Modifica dati file nuspec Release" + $currRelease = $env:NEW_REL + $currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot); + $find = "(.|\n)*?"; + $fileNameRel = "MapoSDK.Release.nuspec"; + $replRel = "" + $currRelease + ""; + $nuspDataRel = Get-Content $fileNameRel; + $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel; + $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#" "SteamWare-EgalWare, 2007-$anno" + $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#" "Build $adesso" + Set-Content -Path $fileNameRel -Value $nuspDataRelUpd; + echo "Modifica dati file nuspec Debug" + $fileNameDeb = "MapoSDK.Debug.nuspec"; + $replDeb = "" + $currDebug + ""; + $nuspDataDeb = Get-Content $fileNameDeb; + $nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb; + $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#" "SteamWare-EgalWare, 2007-$anno" + $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#" "Build $adesso" + Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd; + echo "replace completati" stages: - build diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index e85dec40..391097c4 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,7 +10,7 @@ - Debug|Any CPU + Release|Any CPU MvcControllerEmptyScaffolder root/Common/MVC/Controller 600 diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index c2cb7f33..3679bec0 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU ShowAllFiles IIS02 From be4a64289d3fca2aa7c049c1819638c21d5ed277 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:35:37 +0200 Subject: [PATCH 4/7] typo replace string --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90a8172b..b51fafb0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,9 +103,10 @@ variables: $find = "(.|\n)*?"; $fileNameRel = "MapoSDK.Release.nuspec"; $replRel = "" + $currRelease + ""; + $replCopy = "Copyright SteamWare-EgalWare, 2007-" + $anno $nuspDataRel = Get-Content $fileNameRel; $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel; - $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#" "SteamWare-EgalWare, 2007-$anno" + $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#" $replCopy $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#" "Build $adesso" Set-Content -Path $fileNameRel -Value $nuspDataRelUpd; echo "Modifica dati file nuspec Debug" @@ -113,7 +114,7 @@ variables: $replDeb = "" + $currDebug + ""; $nuspDataDeb = Get-Content $fileNameDeb; $nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb; - $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#" "SteamWare-EgalWare, 2007-$anno" + $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#" $replCopy $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#" "Build $adesso" Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd; echo "replace completati" From 76640c9e5a7a15d4e225a119983ef56de2d98541 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:36:51 +0200 Subject: [PATCH 5/7] ancora replace typo fix --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b51fafb0..38c96db1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,16 +106,16 @@ variables: $replCopy = "Copyright SteamWare-EgalWare, 2007-" + $anno $nuspDataRel = Get-Content $fileNameRel; $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel; - $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#" $replCopy - $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#" "Build $adesso" + $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#", $replCopy; + $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#", "Build $adesso"; Set-Content -Path $fileNameRel -Value $nuspDataRelUpd; echo "Modifica dati file nuspec Debug" $fileNameDeb = "MapoSDK.Debug.nuspec"; $replDeb = "" + $currDebug + ""; $nuspDataDeb = Get-Content $fileNameDeb; $nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb; - $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#" $replCopy - $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#" "Build $adesso" + $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#", $replCopy; + $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#", "Build $adesso"; Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd; echo "replace completati" From 604f2e92626057d9894833e58b38f0e96caebed0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:38:03 +0200 Subject: [PATCH 6/7] Fix debug name typo --- MapoSDK.Develop.nuspec => MapoSDK.Debug.nuspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename MapoSDK.Develop.nuspec => MapoSDK.Debug.nuspec (100%) diff --git a/MapoSDK.Develop.nuspec b/MapoSDK.Debug.nuspec similarity index 100% rename from MapoSDK.Develop.nuspec rename to MapoSDK.Debug.nuspec From be6ccc9ed2abdd4f86b630b7845bd981ae603dfa Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:43:43 +0200 Subject: [PATCH 7/7] Pubblicazioni anche su develop di versione unstable --- .gitlab-ci.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38c96db1..11b2e6d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ stages: - installer -SDK: +SDK-stable: stage: sdk tags: - win @@ -143,11 +143,30 @@ SDK: script: - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' - '& Remove-Item *.nupkg' - - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Version $env:NEW_REL' + - '& $env:NUGET_PATH pack MapoSDK.Release.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' - # - *sendSDK - + +SDK-unstable: + stage: sdk + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + variables: + APP_NAME: MP-ADM + NEXUS_PATH: MP-ADM + before_script: + - *nuget-fix + - '& "$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' + - '& 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' + ADM:build: stage: build variables: