diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e97226f..5613e4e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ variables: NEW_REL: '' NEW_DEB: '' NEXUS_PATH: 'GMW' + PROJ_NAME: 'GMW' APP_NAME: 'GMW' APP_CONF: 'Release' @@ -46,7 +47,7 @@ variables: # helper creazione hash files x IIS .hashBuild: &hashBuild - | - $Target = $env:APP_NAME + "\Release\" + $env:APP_NAME + ".zip" + $Target = $env:PROJ_NAME + "\Release\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 $SHA1 = Get-FileHash $Target -Algorithm SHA1 New-Item $Target".md5" @@ -138,6 +139,7 @@ GMW_TK:staging: - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: GMW + PROJ_NAME: GMW NEXUS_PATH: GMW before_script: - *nuget-fix @@ -157,6 +159,7 @@ GMW_SP:staging: - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: GMW + PROJ_NAME: GMW NEXUS_PATH: GMW before_script: - *nuget-fix @@ -176,6 +179,7 @@ TERM_TK:staging: - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: GMWT + PROJ_NAME: GMW_Terminus NEXUS_PATH: GMWT before_script: - *nuget-fix @@ -195,6 +199,7 @@ TERM_SP:staging: - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: GMWT + PROJ_NAME: GMW_Terminus NEXUS_PATH: GMWT before_script: - *nuget-fix @@ -214,6 +219,7 @@ GMW_TK:deploy: - if: '$CI_COMMIT_BRANCH == "master"' variables: APP_NAME: GMW + PROJ_NAME: GMW NEXUS_PATH: GMW before_script: - *nuget-fix @@ -233,6 +239,7 @@ GMW_SP:deploy: - if: '$CI_COMMIT_BRANCH == "master"' variables: APP_NAME: GMW + PROJ_NAME: GMW NEXUS_PATH: GMW before_script: - *nuget-fix @@ -252,6 +259,7 @@ TERM_TK:deploy: - if: '$CI_COMMIT_BRANCH == "master"' variables: APP_NAME: GMWT + PROJ_NAME: GMW_Terminus NEXUS_PATH: GMWT before_script: - *nuget-fix @@ -271,6 +279,7 @@ TERM_SP:deploy: - if: '$CI_COMMIT_BRANCH == "master"' variables: APP_NAME: GMWT + PROJ_NAME: GMW_Terminus NEXUS_PATH: GMWT before_script: - *nuget-fix @@ -290,6 +299,7 @@ GMW_TK:install: - if: '$CI_COMMIT_BRANCH == "master"' variables: APP_NAME: GMW + PROJ_NAME: GMW NEXUS_PATH: GMW before_script: - *nuget-fix @@ -309,6 +319,7 @@ GMW_SP:install: - if: '$CI_COMMIT_BRANCH == "master"' variables: APP_NAME: GMW + PROJ_NAME: GMW NEXUS_PATH: GMW before_script: - *nuget-fix @@ -328,6 +339,7 @@ TERM_TK:install: - if: '$CI_COMMIT_BRANCH == "master"' variables: APP_NAME: GMWT + PROJ_NAME: GMW_Terminus NEXUS_PATH: GMWT before_script: - *nuget-fix @@ -347,6 +359,7 @@ TERM_SP:install: - if: '$CI_COMMIT_BRANCH == "master"' variables: APP_NAME: GMWT + PROJ_NAME: GMW_Terminus NEXUS_PATH: GMWT before_script: - *nuget-fix diff --git a/GMW_Term/GMW_Term.csproj b/GMW_Term/GMW_Term.csproj index d0881ee6..c121884e 100644 --- a/GMW_Term/GMW_Term.csproj +++ b/GMW_Term/GMW_Term.csproj @@ -284,7 +284,7 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll diff --git a/GMW_Term/Web.config b/GMW_Term/Web.config index f82de04c..b90861ac 100644 --- a/GMW_Term/Web.config +++ b/GMW_Term/Web.config @@ -221,7 +221,7 @@ - +