From c0f858335aa792e5b6fb85cd5f4badb598e8acd0 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 15 Jun 2021 18:57:40 +0200 Subject: [PATCH 1/4] Fix durata --> durata periodo --- MP.Stats/Pages/Diario.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 101e1229..3c7877af 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -46,7 +46,7 @@ @record.IdxOdl | @record.KeyRichiesta @record.CodArticolo @record.Descrizione - @record.DurataMin + @record.DurataPeriodo @record.TotPzProd } From d677d94cdcd0bfba3f781767dd60a7bb55eb3c21 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 15 Jun 2021 18:57:45 +0200 Subject: [PATCH 2/4] refresh --- MP.Stats/MP.Stats.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index cb1018df..6e87e94e 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.2106.0319 + 1.0.2106.1518 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index c890aa19..0bea0c3c 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: 1.0.2106.0319

+

Versione: 1.0.2106.1518


Note di rilascio:
    diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index f67b5579..7cfe175c 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2106.0319 +1.0.2106.1518 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 0d23072f..b7248fc4 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2106.0319 + 1.0.2106.1518 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 From 2c50e8d762a6b17f94621d0dbb76e73108f4c5ee Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 17 Jun 2021 16:07:41 +0200 Subject: [PATCH 3/4] nuovo ciclo yml da testare x MP-STATS su nexus --- .gitlab-ci.yml | 87 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19e4f3db..1156a995 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,39 @@ variables: NEXUS_PATH: 'MP-STATS' APP_NAME: 'MP.Stats' +# # helper x fix version number +# .version-fix: &version-fix +# - | +# $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+$CI_PIPELINE_IID +# echo "Set vers: $env:NEW_REL" +# $contenuto = Get-Content -path 'VersGen\GPW.cs' -Raw +# $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL +# $newContenuto | Set-Content -Path 'VersGen\GPW.cs' + +# helper pulizia files zip +.cleanup-zip: &cleanup-zip + - | + $env:OUTPUT_DIR = $env:APP_NAME + "\bin\Release\*.zip" + 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 = $env:APP_NAME + "\bin\Release\" + $env:APP_NAME + ".zip" + $Source = $env:APP_NAME + "\bin\Release\*" + 7zip a -tzip $Target $Source + echo "called ZIP $Source --> $Target" + + # helper x fix pacchetti nuget da repo locale nexus.steamware.net .nuget-fix: &nuget-fix - | @@ -23,7 +56,7 @@ variables: # helper creazione hash files .hashBuild: &hashBuild - | - $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" + $Target = $env:APP_NAME + "\bin\Release\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 $SHA1 = Get-FileHash $Target -Algorithm SHA1 New-Item $Target".md5" @@ -33,8 +66,43 @@ variables: echo "Created HASH files for $Target" +# helper creazione hash files x IIS +.hashBuildIIS: &hashBuildIIS + - | + $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" + 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 + $currentDate = get-date -format yyMM; + $currentTime = get-date -format ddHH; + $VersNumb = Get-Content "Resources\VersNum.txt" + echo "Curr Version: $VersNumb" + if($CI_COMMIT_BRANCH -eq "master") + { + $version = "stable" + } + else + { + $version = "unstable" + } + $File2Send = Get-ChildItem($env:APP_NAME + "\bin\Release\*.zip*") + 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/SLS/$FileName + } + +# helper x send su NEXUS x pack IIS +.nexusUploadIIS: &nexusUploadIIS - | Set-Alias mCurl C:\Windows\system32\curl.exe $currentDate = get-date -format yyMM; @@ -123,11 +191,26 @@ staging: # - *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... + # deploy su nexus... # - *zipper - *hashBuild - *nexusUpload +staging: + stage: installerIIS + only: + - develop + - master + needs: ["build"] + before_script: + # - *nuget-fix + # - dotnet restore + script: + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj + # qui il deploy su nexus... + - *hashBuildIIS + - *nexusUploadIIS + release: stage: release only: From f81adbee2906bcdde26168e91d47043c717fab75 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 17 Jun 2021 16:56:16 +0200 Subject: [PATCH 4/4] provo modifiche x deploy su nexus --- .gitlab-ci.yml | 56 ++++++++++++++++++++-------------------- MP.Stats/MP.Stats.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1156a995..fb23fe63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,8 +53,8 @@ variables: } echo $hasSource -# helper creazione hash files -.hashBuild: &hashBuild +# helper creazione hash files x CORE +.hashBuildCore: &hashBuildCore - | $Target = $env:APP_NAME + "\bin\Release\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 @@ -67,7 +67,7 @@ variables: echo "Created HASH files for $Target" # helper creazione hash files x IIS -.hashBuildIIS: &hashBuildIIS +.hashBuild: &hashBuild - | $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 @@ -79,8 +79,8 @@ variables: echo "Created HASH files for $Target" -# helper x send su NEXUS -.nexusUpload: &nexusUpload +# helper x send su NEXUS CORE +.nexusUploadCore: &nexusUploadCore - | Set-Alias mCurl C:\Windows\system32\curl.exe $currentDate = get-date -format yyMM; @@ -101,8 +101,8 @@ variables: mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/SLS/$FileName } -# helper x send su NEXUS x pack IIS -.nexusUploadIIS: &nexusUploadIIS +# helper x send su NEXUS x pack +.nexusUploadIIS: &nexusUpload - | Set-Alias mCurl C:\Windows\system32\curl.exe $currentDate = get-date -format yyMM; @@ -177,6 +177,25 @@ 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: installerCore +# only: +# - develop +# - master +# needs: ["build"] +# 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 -p:Configuration=Release MP.Stats/MP.Stats.csproj +# # deploy su nexus... +# - *zipper +# - *hashBuildCore +# - *nexusUploadCore + staging: stage: installer only: @@ -186,31 +205,12 @@ staging: 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 -p:Configuration=Release MP.Stats/MP.Stats.csproj - # deploy su nexus... - # - *zipper + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj -p:output "publish/net5.0" + # qui il deploy su nexus... - *hashBuild - *nexusUpload -staging: - stage: installerIIS - only: - - develop - - master - needs: ["build"] - before_script: - # - *nuget-fix - # - dotnet restore - script: - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj - # qui il deploy su nexus... - - *hashBuildIIS - - *nexusUploadIIS - release: stage: release only: diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 6e87e94e..ad113c8f 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.2106.1518 + 1.0.2106.1716 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 0bea0c3c..93eae0d7 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

    Versione: 1.0.2106.1518

    +

    Versione: 1.0.2106.1716


    Note di rilascio:
      diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 7cfe175c..141eb829 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2106.1518 +1.0.2106.1716 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index b7248fc4..9548c50c 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2106.1518 + 1.0.2106.1716 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