diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 229cf56..7d6d91b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ variables:
NEXUS_PATH: 'ZCode'
APP_NAME: 'QR-GEN'
APP_CONF: 'Release'
+ PROJ_NAME: 'QR-GEN'
# helper x fix pacchetti nuget da repo locale nexus.steamware.net
@@ -69,14 +70,14 @@ variables:
{
$version = "unstable"
}
- $File2Send = Get-ChildItem($env:PROJ_NAME + "\Release\*")
+ $File2Send = Get-ChildItem("$env:PROJ_NAME\Release\*")
ForEach ($File in $File2Send) {
$FileName = Split-path $File -leaf
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/ARCHIVE/$VersNumb/$FileName
}
- mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/manifest.xml
- mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/ChangeLog.html
+ #mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/manifest.xml
+ #mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/ChangeLog.html
stages:
- build
@@ -107,7 +108,7 @@ Zcode:IIS01:deploy:
- '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
- *version-fix
script:
- - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
+ - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
needs: ["Zcode:build"]
Zcode:IIS02:deploy:
@@ -123,7 +124,7 @@ Zcode:IIS02:deploy:
- '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
- *version-fix
script:
- - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
+ - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
needs: ["Zcode:build"]
Zcode:IIS03:deploy:
@@ -139,10 +140,9 @@ Zcode:IIS03:deploy:
- '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
- *version-fix
script:
- - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
+ - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
needs: ["Zcode:build"]
-
Zcode:OVH:release:
stage: release
tags:
@@ -156,7 +156,7 @@ Zcode:OVH:release:
- '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
- *version-fix
script:
- - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=OVH-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
+ - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=OVH-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
needs: ["Zcode:build"]
Zcode:File:release:
@@ -167,18 +167,12 @@ Zcode:File:release:
refs:
- main
- master
- # variables:
- # APP_NAME: NKC
- # PROJ_NAME: $env:APP_NAME
- # NEXUS_PATH: NKC
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
- *version-fix
-# - *manifest-fix
script:
- - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=FileExport.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
-# # qui il deploy su nexus...
+ - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=FileExport.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["Zcode:build"]
diff --git a/QR-GEN/Properties/PublishProfiles/OVH-PROD.pubxml b/QR-GEN/Properties/PublishProfiles/OVH-PROD.pubxml
index be42943..7070c67 100644
--- a/QR-GEN/Properties/PublishProfiles/OVH-PROD.pubxml
+++ b/QR-GEN/Properties/PublishProfiles/OVH-PROD.pubxml
@@ -14,7 +14,7 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere
https://172.16.0.214:8172/MsDeploy.axd
qrcode.steamware.net
- true
+ false
WMSVC
true
steamware
diff --git a/QR-GEN/Properties/PublishProfiles/OVH-PROD.pubxml.user b/QR-GEN/Properties/PublishProfiles/OVH-PROD.pubxml.user
index 3f1c56e..20ee716 100644
--- a/QR-GEN/Properties/PublishProfiles/OVH-PROD.pubxml.user
+++ b/QR-GEN/Properties/PublishProfiles/OVH-PROD.pubxml.user
@@ -7,5 +7,6 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere
AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAAA85eiHosnLZKazr6wK6WfJAAAAAASAAACgAAAAEAAAABhoEMLX9TA+Kp5dsd8O/KgYAAAAsf9Ap2KAI6JCWzjaN1NV3PQO8F6pUIFBFAAAAKE6Rw49Z7t03hkWxf0ADxRSQwF9
+ True|2022-04-11T13:08:00.6598223Z;False|2022-04-11T15:05:00.5236071+02:00;False|2022-04-11T15:01:15.6459241+02:00;
\ No newline at end of file