diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b863f03..10781a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: NUGET_PATH: 'C:\Tools\nuget.exe' MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' - VERS_MAIN: '1.8' + VERS_MAIN: '1.1' NEW_REL: '' NEXUS_PATH: 'WebLCP' APP_NAME: 'WebLCP' @@ -104,7 +104,7 @@ WebLCP:build: - *version-fix script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' - + WebLCP:IIS01:deploy: stage: deploy tags: @@ -135,29 +135,29 @@ WebLCP:IIS01:deploy: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' # - *version-fix # script: # - '& "$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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' # needs: ["WebLCP:build"] -# WebLCP:IIS03:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# script: -# - '& "$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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] +WebLCP:IIS03:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] # WebLCP:File:release: # stage: release