From 1b08de2be910b80b6d698e1bea2fa74135a0d496 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 26 May 2021 20:51:32 +0200 Subject: [PATCH 01/15] inizio bozza ultimo step (nexus) --- .gitlab-ci.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 591fdf87..dc6bf376 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,24 +79,16 @@ release: script: - dotnet publish -c Release -o ./publish MP.Stats/MP.Stats.csproj +staging: + stage: installer + only: + - master + needs: ["build"] + # before_script: + # - *nuget-fix + # - dotnet restore + script: + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj + # da fare qui il deploy su nexus... -# AC:install: -# stage: installer -# rules: -# - if: '$CI_COMMIT_BRANCH == "master"' -# when: manual -# # only: -# # - tags # the build process will only be started by git tag commits -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore GPW.sln' -# - *version-fix -# script: -# # Admin ZIP package -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Admin.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj' -# # Commesse ZIP package -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Commesse.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj' -# needs: ["AC:build"] - - From 788b865ccf0caad70e03b257c0f06c63b76582ea Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 09:58:34 +0200 Subject: [PATCH 02/15] Bozza gestione upload su nexus da provare --- .gitlab-ci.yml | 72 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc6bf376..084bac15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,10 @@ variables: # ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' # EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release' # DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds' - VERS_MAIN: '1.0' - NEW_REL: '' +# VERS_MAIN: '1.0' +# NEW_REL: '' + NEXUS_PATH: 'MP-STATS' + APP_NAME: 'MP.Stats' # helper x fix pacchetti nuget da repo locale nexus.steamware.net .nuget-fix: &nuget-fix @@ -18,14 +20,46 @@ variables: } echo $hasSource +# helper creazione hash files +.hashBuild: &hashBuild + - | + $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" + $MD5 = Get-FileHash $Target -Algorithm MD5 + $SHA1 = Get-FileHash $Target -Algorithm SHA1 + New-Item $Target".md5" + 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 +.nexusUpload: &nexusUpload + - | + Set-Alias mCurl C:\Windows\system32\curl.exe + if($CI_COMMIT_BRANCH -eq "master") + { + $version = "stable" + } + else + { + $version = "unstable" + } + $File2Send = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".md5" http://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" http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".sha1" + + +# mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip stages: - build - test - staging - deploy - - release - installer + - release build: stage: build @@ -67,11 +101,29 @@ staging: - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj +staging: + stage: installer + only: + - develop + - master + needs: ["build"] + # before_script: + # - *nuget-fix + # - dotnet restore + script: + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -c Release -o ./Releases/ $CI_COMMIT_BRANCH MP.Stats/MP.Stats.csproj + # da fare qui il deploy su nexus... + - *hashBuild + - *nexusUpload + release: stage: release only: #- feature/Deploy_CI_CD - - master + # - master + - tags + except: + - branches needs: ["build"] artifacts: paths: @@ -79,16 +131,4 @@ release: script: - dotnet publish -c Release -o ./publish MP.Stats/MP.Stats.csproj -staging: - stage: installer - only: - - master - needs: ["build"] - # before_script: - # - *nuget-fix - # - dotnet restore - script: - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj - # da fare qui il deploy su nexus... - From 732063abcb4d59b97a506a5ad13f777428770c97 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 10:03:31 +0200 Subject: [PATCH 03/15] typo fix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 084bac15..c01c2414 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,7 +111,7 @@ staging: # - *nuget-fix # - dotnet restore script: - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -c Release -o ./Releases/ $CI_COMMIT_BRANCH MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -c Release -o ./Releases/$CI_COMMIT_BRANCH MP.Stats/MP.Stats.csproj # da fare qui il deploy su nexus... - *hashBuild - *nexusUpload From 551149f3d06baddd8522f067a83ac80aeb994bfd Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 10:22:39 +0200 Subject: [PATCH 04/15] Modifica ciclo pubblicazione/zip/caricamento --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c01c2414..2aedaaf6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,28 @@ variables: C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" } echo $hasSource +# helper pulizia files zip +.cleanup-zip: &cleanup-zip + - | + $env:OUTPUT_DIR = "Releases\" + $CI_COMMIT_BRANCH + "\*" + if ((Test-Path $env:OUTPUT_DIR)) + { + Remove-Item $env:OUTPUT_DIR -Force -Recurse -ErrorAction Ignore + } + echo "Clening ZIP dir: $env:OUTPUT_DIR" + +# helper creazione files zip +.zipper: &zipper + - | + $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe" + if (-not (Test-Path -Path $7zipPath -PathType Leaf)) { + throw "7 zip file '$7zipPath' not found" + } + Set-Alias 7zip $7zipPath + $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" + $Source = "Publish\" + $CI_COMMIT_BRANCH + "\*" + 7zip a -tzip $Target $Source + echo "called ZIP $Source --> $Target" # helper creazione hash files .hashBuild: &hashBuild @@ -107,12 +129,16 @@ staging: - develop - master needs: ["build"] - # before_script: - # - *nuget-fix - # - dotnet restore + before_script: + # - *nuget-fix + # - dotnet restore + # - '& "$env:NUGET_PATH" restore LPA.sln' # path alla solution corrente + # - *version-fix + - *cleanup-zip script: - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -c Release -o ./Releases/$CI_COMMIT_BRANCH MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -c Release -o ./Publish/$CI_COMMIT_BRANCH MP.Stats/MP.Stats.csproj # da fare qui il deploy su nexus... + - *zipper - *hashBuild - *nexusUpload From 36201de782002944391321f26924735093a057c4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 11:17:22 +0200 Subject: [PATCH 05/15] Cambio script pubblicazione zip package --- .gitlab-ci.yml | 16 ++++++++-------- MP.Stats/MP.Stats.csproj | 2 +- .../PublishProfiles/IISProfile.pubxml.user | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2aedaaf6..baffcffd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ staging: stage: staging only: - develop - needs: ["build"] + needs: ["test"] # before_script: # - *nuget-fix # - dotnet restore @@ -115,7 +115,7 @@ staging: stage: deploy only: - master - needs: ["build"] + needs: ["test"] # before_script: # - *nuget-fix # - dotnet restore @@ -128,7 +128,7 @@ staging: only: - develop - master - needs: ["build"] + needs: ["test"] before_script: # - *nuget-fix # - dotnet restore @@ -136,11 +136,11 @@ staging: # - *version-fix - *cleanup-zip script: - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -c Release -o ./Publish/$CI_COMMIT_BRANCH MP.Stats/MP.Stats.csproj + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj # da fare qui il deploy su nexus... - - *zipper - - *hashBuild - - *nexusUpload + # - *zipper + # - *hashBuild + # - *nexusUpload release: stage: release @@ -150,7 +150,7 @@ release: - tags except: - branches - needs: ["build"] + needs: ["test"] artifacts: paths: - publish/ diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index e9250fe8..4a2d536d 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 1.0.2105.2620 + 1.0.2105.2711 diff --git a/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user index 2a7c708a..105ac0ab 100644 --- a/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user +++ b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml.user @@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt - True|2021-05-26T17:51:13.5051479Z;True|2021-05-26T19:51:04.9283608+02:00;True|2021-05-25T16:38:26.4142377+02:00; + True|2021-05-27T09:13:55.8234781Z;True|2021-05-26T19:51:13.5051479+02:00;True|2021-05-26T19:51:04.9283608+02:00;True|2021-05-25T16:38:26.4142377+02:00; \ No newline at end of file From cb93b7a48f91b289573f9cd2ae1a19273ca924a1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 11:21:59 +0200 Subject: [PATCH 06/15] correzione fase pack + invio --- .gitlab-ci.yml | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index baffcffd..5655a914 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,33 +19,33 @@ variables: C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" } echo $hasSource -# helper pulizia files zip -.cleanup-zip: &cleanup-zip - - | - $env:OUTPUT_DIR = "Releases\" + $CI_COMMIT_BRANCH + "\*" - if ((Test-Path $env:OUTPUT_DIR)) - { - Remove-Item $env:OUTPUT_DIR -Force -Recurse -ErrorAction Ignore - } - echo "Clening ZIP dir: $env:OUTPUT_DIR" +# # helper pulizia files zip +# .cleanup-zip: &cleanup-zip +# - | +# $env:OUTPUT_DIR = "Releases\" + $CI_COMMIT_BRANCH + "\*" +# if ((Test-Path $env:OUTPUT_DIR)) +# { +# Remove-Item $env:OUTPUT_DIR -Force -Recurse -ErrorAction Ignore +# } +# echo "Clening ZIP dir: $env:OUTPUT_DIR" -# helper creazione files zip -.zipper: &zipper - - | - $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe" - if (-not (Test-Path -Path $7zipPath -PathType Leaf)) { - throw "7 zip file '$7zipPath' not found" - } - Set-Alias 7zip $7zipPath - $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" - $Source = "Publish\" + $CI_COMMIT_BRANCH + "\*" - 7zip a -tzip $Target $Source - echo "called ZIP $Source --> $Target" +# # helper creazione files zip +# .zipper: &zipper +# - | +# $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe" +# if (-not (Test-Path -Path $7zipPath -PathType Leaf)) { +# throw "7 zip file '$7zipPath' not found" +# } +# Set-Alias 7zip $7zipPath +# $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" +# $Source = "Publish\" + $CI_COMMIT_BRANCH + "\*" +# 7zip a -tzip $Target $Source +# echo "called ZIP $Source --> $Target" # helper creazione hash files .hashBuild: &hashBuild - | - $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" + $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 $SHA1 = Get-FileHash $Target -Algorithm SHA1 New-Item $Target".md5" @@ -67,7 +67,7 @@ variables: { $version = "unstable" } - $File2Send = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" + $File2Send = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".md5" http://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" http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".sha1" @@ -134,13 +134,13 @@ staging: # - dotnet restore # - '& "$env:NUGET_PATH" restore LPA.sln' # path alla solution corrente # - *version-fix - - *cleanup-zip + # - *cleanup-zip script: - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj # da fare qui il deploy su nexus... # - *zipper - # - *hashBuild - # - *nexusUpload + - *hashBuild + - *nexusUpload release: stage: release From af0d71c915bda8a8fb3dc0ea5c7e62b9ce444425 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 11:31:53 +0200 Subject: [PATCH 07/15] Aggiunta copia foreach ricorsiva --- .gitlab-ci.yml | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5655a914..319dcf6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,29 +19,7 @@ variables: C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" } echo $hasSource -# # helper pulizia files zip -# .cleanup-zip: &cleanup-zip -# - | -# $env:OUTPUT_DIR = "Releases\" + $CI_COMMIT_BRANCH + "\*" -# if ((Test-Path $env:OUTPUT_DIR)) -# { -# Remove-Item $env:OUTPUT_DIR -Force -Recurse -ErrorAction Ignore -# } -# echo "Clening ZIP dir: $env:OUTPUT_DIR" - -# # helper creazione files zip -# .zipper: &zipper -# - | -# $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe" -# if (-not (Test-Path -Path $7zipPath -PathType Leaf)) { -# throw "7 zip file '$7zipPath' not found" -# } -# Set-Alias 7zip $7zipPath -# $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" -# $Source = "Publish\" + $CI_COMMIT_BRANCH + "\*" -# 7zip a -tzip $Target $Source -# echo "called ZIP $Source --> $Target" - + # helper creazione hash files .hashBuild: &hashBuild - | @@ -67,11 +45,15 @@ variables: { $version = "unstable" } - $File2Send = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".md5" http://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" http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".sha1" + $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*") + ForEach ($File in $File2Send) { + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$File + } +# $File2Send = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" +# mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip +# mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".md5" http://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" http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".sha1" # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip From 57d9a0a6f7995d167fafc3ba5f4324de113b1ae0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 12:01:55 +0200 Subject: [PATCH 08/15] fix filename (maybe) su nexus --- .gitlab-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 319dcf6a..e31896ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,14 +47,10 @@ variables: } $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*") ForEach ($File in $File2Send) { - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$File + $FileName = Split-Path $File -leaf + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$FileName } -# $File2Send = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" -# mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip -# mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".md5" http://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" http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".sha1" - # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip stages: From 60780aa5c94e3fb95f2c86dd5bec4aa43155c19d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 12:16:23 +0200 Subject: [PATCH 09/15] Modifica x copia ANCHE dei file x versione --- .gitlab-ci.yml | 2 ++ MP.Stats/MP.Stats.csproj | 2 +- MP.Stats/post-build.ps1 | 5 ++++- VersNum.txt | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 VersNum.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e31896ed..5170f603 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,7 @@ variables: .nexusUpload: &nexusUpload - | Set-Alias mCurl C:\Windows\system32\curl.exe + $VersNumb = Get-Content "VersNum.txt" if($CI_COMMIT_BRANCH -eq "master") { $version = "stable" @@ -49,6 +50,7 @@ variables: ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$VersNum/$FileName } # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 4a2d536d..828323cb 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 1.0.2105.2711 + 1.0.2105.2712 diff --git a/MP.Stats/post-build.ps1 b/MP.Stats/post-build.ps1 index dc0fc8e1..8e1ed3fb 100644 --- a/MP.Stats/post-build.ps1 +++ b/MP.Stats/post-build.ps1 @@ -1,11 +1,14 @@ param([string]$ProjectDir, [string]$ProjectPath); +$VersNumb="..\VersNum.txt" $MajMin="1.0." $currentDate = get-date -format yyMM; $currentTime = get-date -format ddHH; $find = "(.|\n)*?"; +$currRelNum=$MajMin + $currentDate +"." + $currentTime $replace = "" + $MajMin + $currentDate +"." + $currentTime + ""; $csproj = Get-Content $ProjectPath $csprojUpdated = $csproj -replace $find, $replace -Set-Content -Path $ProjectPath -Value $csprojUpdated \ No newline at end of file +Set-Content -Path $ProjectPath -Value $csprojUpdated +Set-Content -Path $VersNumb -Value $currRelNum \ No newline at end of file diff --git a/VersNum.txt b/VersNum.txt new file mode 100644 index 00000000..c9045140 --- /dev/null +++ b/VersNum.txt @@ -0,0 +1 @@ +1.0.2105.2712 From f5bc1719dbfdeb60d374c14990b5634161195ced Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 12:29:18 +0200 Subject: [PATCH 10/15] Altro test rilascio nexus --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5170f603..d1c354f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ variables: # ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' # EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release' # DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds' -# VERS_MAIN: '1.0' # NEW_REL: '' + VERS_MAIN: '1.0' NEXUS_PATH: 'MP-STATS' APP_NAME: 'MP.Stats' @@ -37,7 +37,9 @@ variables: .nexusUpload: &nexusUpload - | Set-Alias mCurl C:\Windows\system32\curl.exe - $VersNumb = Get-Content "VersNum.txt" + $currentDate = get-date -format yyMM; + $currentTime = get-date -format ddHH; + $VersNumb = $env:VERS_MAIN + "." + $currentDate +"." + $currentTime if($CI_COMMIT_BRANCH -eq "master") { $version = "stable" @@ -49,8 +51,8 @@ variables: $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*") ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$FileName - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$VersNum/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNum/$FileName } # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip From 4b4c2ac41c87966890918e88ad10366c29f0f5b7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 12:49:56 +0200 Subject: [PATCH 11/15] Update stage nexus upload --- .gitlab-ci.yml | 8 ++++++-- MP.Stats/post-build.ps1 | 13 +++++++++++-- Resources/ChangeLog.html | 27 +++++++++++++++++++++++++++ VersNum.txt => Resources/VersNum.txt | 0 Resources/logoSteamware.png | Bin 0 -> 3402 bytes Resources/manifest.xml | 7 +++++++ 6 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 Resources/ChangeLog.html rename VersNum.txt => Resources/VersNum.txt (100%) create mode 100644 Resources/logoSteamware.png create mode 100644 Resources/manifest.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1c354f3..456a8dd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,8 @@ variables: Set-Alias mCurl C:\Windows\system32\curl.exe $currentDate = get-date -format yyMM; $currentTime = get-date -format ddHH; - $VersNumb = $env:VERS_MAIN + "." + $currentDate +"." + $currentTime + $VersNumb = Get-Content "Resources\VersNum.txt" + echo "Curr Version: $VersNumb" if($CI_COMMIT_BRANCH -eq "master") { $version = "stable" @@ -53,7 +54,10 @@ variables: $FileName = Split-Path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$FileName mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNum/$FileName - } + } + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ChangeLog.html + # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip diff --git a/MP.Stats/post-build.ps1 b/MP.Stats/post-build.ps1 index 8e1ed3fb..08dc18a4 100644 --- a/MP.Stats/post-build.ps1 +++ b/MP.Stats/post-build.ps1 @@ -1,6 +1,7 @@ param([string]$ProjectDir, [string]$ProjectPath); -$VersNumb="..\VersNum.txt" +$FileVers="..\Resources\VersNum.txt" +$FileMani="..\Resources\manifest.xml" $MajMin="1.0." $currentDate = get-date -format yyMM; $currentTime = get-date -format ddHH; @@ -11,4 +12,12 @@ $csproj = Get-Content $ProjectPath $csprojUpdated = $csproj -replace $find, $replace Set-Content -Path $ProjectPath -Value $csprojUpdated -Set-Content -Path $VersNumb -Value $currRelNum \ No newline at end of file +Set-Content -Path $FileVers -Value $currRelNum + +# replace conf x manifest +$manData = Get-Content $FileMani +$manData = $manData -replace "1.0.0.0", $currRelNum +$manData = $manData -replace "{{DIRNAME}}", "MP-STATS" +$manData = $manData -replace "{{BRANCHNAME}}", "stable" +$manData = $manData -replace "{{PACKNAME}}", "MP.Stats" +Set-Content -Path $FileMani -Value $manData diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html new file mode 100644 index 00000000..9d23cb37 --- /dev/null +++ b/Resources/ChangeLog.html @@ -0,0 +1,27 @@ + + Modulo statistiche MAPO +

Versione: {{CURRENT-REL}}

+
+ Note di rilascio: +
    +
  • + Ultime modifiche: +
      {{LAST-CHANGES}}
    +
    • +
  • + v.1.* → +
      +
    • Prima release dotnet5
      • +
    • Integrazione EFCore
      • +
    +
    • +
+
+
+ +
+ +
+ \ No newline at end of file diff --git a/VersNum.txt b/Resources/VersNum.txt similarity index 100% rename from VersNum.txt rename to Resources/VersNum.txt diff --git a/Resources/logoSteamware.png b/Resources/logoSteamware.png new file mode 100644 index 0000000000000000000000000000000000000000..0958b50a1ee7f6a934e26cf55e2335d4cea6aa82 GIT binary patch literal 3402 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 literal 0 HcmV?d00001 diff --git a/Resources/manifest.xml b/Resources/manifest.xml new file mode 100644 index 00000000..8333ad51 --- /dev/null +++ b/Resources/manifest.xml @@ -0,0 +1,7 @@ + + + 1.0.0.0 + http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + false + \ No newline at end of file From 8066f3b2311f0d93e746350f8cc11d2117e85e97 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 13:07:01 +0200 Subject: [PATCH 12/15] correzione x upload versioni storicizzate --- .gitlab-ci.yml | 2 +- MP.Stats/MP.Stats.csproj | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 456a8dd1..3c73dbdf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ variables: ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$FileName - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNum/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNumb/$FileName } mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/manifest.xml mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ChangeLog.html diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 828323cb..9f72a354 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 1.0.2105.2712 + 1.0.2105.2713 diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index c9045140..c9ecf25d 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2105.2712 +1.0.2105.2713 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 8333ad51..44eeef7f 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,7 +1,7 @@ - 1.0.0.0 - http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + 1.0.2105.2713 + http://nexus.steamware.net/repository/SWS/MP-STATS/stable/MP.Stats.zip + http://nexus.steamware.net/repository/SWS/MP-STATS/stable/ChangeLog.html false - \ No newline at end of file + From 8fb10ea4d825c05aa060e68c3b9cfe5b97b15e7e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 13:19:14 +0200 Subject: [PATCH 13/15] Update x pubblicazione su area _LATEST --- .gitlab-ci.yml | 6 +++--- MP.Stats/post-build.ps1 | 19 +++++++++++++++---- Resources/ChangeLog-original.html | 27 +++++++++++++++++++++++++++ Resources/ChangeLog.html | 4 ++-- Resources/manifest-original.xml | 7 +++++++ 5 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 Resources/ChangeLog-original.html create mode 100644 Resources/manifest-original.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c73dbdf..3ddbbaff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,11 +52,11 @@ variables: $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*") ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/_LATEST/$FileName mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNumb/$FileName } - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/manifest.xml - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ChangeLog.html + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/_LATEST/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/_LATEST/ChangeLog.html # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip diff --git a/MP.Stats/post-build.ps1 b/MP.Stats/post-build.ps1 index 08dc18a4..8fd588f4 100644 --- a/MP.Stats/post-build.ps1 +++ b/MP.Stats/post-build.ps1 @@ -1,7 +1,10 @@ param([string]$ProjectDir, [string]$ProjectPath); $FileVers="..\Resources\VersNum.txt" -$FileMani="..\Resources\manifest.xml" +$FileManIn="..\Resources\manifest-original.xml" +$FileManOut="..\Resources\manifest.xml" +$FileCLogIn="..\Resources\ChangeLog-original.html" +$FileCLogOut="..\Resources\ChangeLog.html" $MajMin="1.0." $currentDate = get-date -format yyMM; $currentTime = get-date -format ddHH; @@ -14,10 +17,18 @@ $csprojUpdated = $csproj -replace $find, $replace Set-Content -Path $ProjectPath -Value $csprojUpdated Set-Content -Path $FileVers -Value $currRelNum -# replace conf x manifest -$manData = Get-Content $FileMani +# replace x manifest +$manData = Get-Content $FileManIn $manData = $manData -replace "1.0.0.0", $currRelNum $manData = $manData -replace "{{DIRNAME}}", "MP-STATS" $manData = $manData -replace "{{BRANCHNAME}}", "stable" $manData = $manData -replace "{{PACKNAME}}", "MP.Stats" -Set-Content -Path $FileMani -Value $manData +Set-Content -Path $FileManOut -Value $manData + +# replace x ChangeLog +$clogData = Get-Content $FileCLogIn +$clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum +# $clogData = $clogData -replace "{{DIRNAME}}", "MP-STATS" +# $clogData = $clogData -replace "{{BRANCHNAME}}", "stable" +# $clogData = $clogData -replace "{{PACKNAME}}", "MP.Stats" +Set-Content -Path $FileCLogOut -Value $clogData diff --git a/Resources/ChangeLog-original.html b/Resources/ChangeLog-original.html new file mode 100644 index 00000000..9d23cb37 --- /dev/null +++ b/Resources/ChangeLog-original.html @@ -0,0 +1,27 @@ + + Modulo statistiche MAPO +

Versione: {{CURRENT-REL}}

+
+ Note di rilascio: +
    +
  • + Ultime modifiche: +
      {{LAST-CHANGES}}
    +
    • +
  • + v.1.* → +
      +
    • Prima release dotnet5
      • +
    • Integrazione EFCore
      • +
    +
    • +
+
+
+ +
+ +
+ \ No newline at end of file diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 9d23cb37..e6d690be 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: {{CURRENT-REL}}

+

Versione: 1.0.2105.2713


Note di rilascio:
    @@ -24,4 +24,4 @@ © Steamware 2006-2021 - \ No newline at end of file + diff --git a/Resources/manifest-original.xml b/Resources/manifest-original.xml new file mode 100644 index 00000000..a9269ca9 --- /dev/null +++ b/Resources/manifest-original.xml @@ -0,0 +1,7 @@ + + + 1.0.0.0 + http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + false + From cfa522e6f8c47f7f7073513dde1c08d696cd84c0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 13:32:04 +0200 Subject: [PATCH 14/15] Update default path x avere primo risultato --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ddbbaff..cd547423 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,11 +52,11 @@ variables: $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*") ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/_LATEST/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/$FileName mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNumb/$FileName } - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/_LATEST/manifest.xml - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/_LATEST/ChangeLog.html + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/ChangeLog.html # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip From 4f31c0d62c036968d8b450e1fb408b3a5ddd5476 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 27 May 2021 14:31:16 +0200 Subject: [PATCH 15/15] Correzione path con "0" --- MP.Stats/MP.Stats.csproj | 2 +- MP.Stats/post-build.ps1 | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 9f72a354..620b24cf 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 1.0.2105.2713 + 1.0.2105.2714 diff --git a/MP.Stats/post-build.ps1 b/MP.Stats/post-build.ps1 index 8fd588f4..cf74cbc8 100644 --- a/MP.Stats/post-build.ps1 +++ b/MP.Stats/post-build.ps1 @@ -21,7 +21,7 @@ Set-Content -Path $FileVers -Value $currRelNum $manData = Get-Content $FileManIn $manData = $manData -replace "1.0.0.0", $currRelNum $manData = $manData -replace "{{DIRNAME}}", "MP-STATS" -$manData = $manData -replace "{{BRANCHNAME}}", "stable" +$manData = $manData -replace "{{BRANCHNAME}}", "stable/0" $manData = $manData -replace "{{PACKNAME}}", "MP.Stats" Set-Content -Path $FileManOut -Value $manData diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index e6d690be..84026b93 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

    Versione: 1.0.2105.2713

    +

    Versione: 1.0.2105.2714


    Note di rilascio:
      diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index c9ecf25d..ca995bc1 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2105.2713 +1.0.2105.2714 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 44eeef7f..540ddb44 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,7 +1,7 @@ - 1.0.2105.2713 - http://nexus.steamware.net/repository/SWS/MP-STATS/stable/MP.Stats.zip - http://nexus.steamware.net/repository/SWS/MP-STATS/stable/ChangeLog.html + 1.0.2105.2714 + http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/MP.Stats.zip + http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html false