diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bb23fe2..98c3756d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,12 +99,10 @@ IIS01:deploy: only: - develop needs: ["test"] - # before_script: - # - *nuget-fix - # - dotnet restore script: - - dotnet publish -p:PublishProfile=IIS01.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=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.csproj - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj IIS02:deploy: @@ -114,16 +112,15 @@ IIS02:deploy: only: - master needs: ["build"] - # before_script: - # - *nuget-fix - # - dotnet restore script: - - 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 + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Land/MP.Land.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.Land/MP.Land.csproj - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Prog/MP.Prog.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.Prog/MP.Prog.csproj + - 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 -STA:installer: +LAND:installer: stage: installer tags: - win @@ -132,18 +129,18 @@ STA:installer: - master needs: ["build"] variables: - APP_NAME: MP.Stats - NEXUS_PATH: MP-STATS + APP_NAME: MP.Land + NEXUS_PATH: MP-LAND before_script: # - *nuget-fix # - dotnet restore script: - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj -o:publish + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Land/MP.Land.csproj -o:publish # qui il deploy su nexus... - *hashBuild - *nexusUpload -PRG:installer: +PROG:installer: stage: installer tags: - win @@ -163,6 +160,27 @@ PRG:installer: - *hashBuild - *nexusUpload +STAT:installer: + stage: installer + tags: + - win + only: + - develop + - master + needs: ["build"] + variables: + APP_NAME: MP.Stats + NEXUS_PATH: MP-STATS + before_script: + # - *nuget-fix + # - dotnet restore + script: + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj -o:publish + # qui il deploy su nexus... + - *hashBuild + - *nexusUpload + + release: stage: release tags: @@ -178,7 +196,8 @@ release: paths: - publish/ script: - - dotnet publish -c Release -o ./publish MP.Stats/MP.Stats.csproj + - dotnet publish -c Release -o ./publish MP.Land/MP.Land.csproj - dotnet publish -c Release -o ./publish MP.Prog/MP.Prog.csproj + - dotnet publish -c Release -o ./publish MP.Stats/MP.Stats.csproj diff --git a/MP.Land/Properties/PublishProfiles/IIS01.pubxml b/MP.Land/Properties/PublishProfiles/IIS01.pubxml index 8770d4a4..b96ae492 100644 --- a/MP.Land/Properties/PublishProfiles/IIS01.pubxml +++ b/MP.Land/Properties/PublishProfiles/IIS01.pubxml @@ -4,25 +4,25 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://IIS01:8172/MsDeploy.axd - Default Web Site/MP/PROG - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - True - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS01:8172/MsDeploy.axd + Default Web Site/MP/LAND + + False + WMSVC + True + jenkins + <_SavePWD>True + net5.0 + True + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/IIS02.pubxml b/MP.Land/Properties/PublishProfiles/IIS02.pubxml index 414f1262..fab9f1d8 100644 --- a/MP.Land/Properties/PublishProfiles/IIS02.pubxml +++ b/MP.Land/Properties/PublishProfiles/IIS02.pubxml @@ -15,7 +15,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt d9901b50-e61c-400c-b62c-fa060cf72c29 false https://IIS02:8172/MsDeploy.axd - Default Web Site/MP/PROG + Default Web Site/MP/LAND False WMSVC diff --git a/MP.Land/Properties/PublishProfiles/IISProfile.pubxml b/MP.Land/Properties/PublishProfiles/IISProfile.pubxml index dac2b6bb..aad930b6 100644 --- a/MP.Land/Properties/PublishProfiles/IISProfile.pubxml +++ b/MP.Land/Properties/PublishProfiles/IISProfile.pubxml @@ -14,7 +14,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt d9901b50-e61c-400c-b62c-fa060cf72c29 bin\publish\MP.Land.zip true - Default Web Site/MP/PROG + Default Web Site/MP/LAND net5.0 false diff --git a/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml b/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml index e4965fb0..18e61f7a 100644 --- a/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml +++ b/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml @@ -15,7 +15,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt d9901b50-e61c-400c-b62c-fa060cf72c29 false https://w2019-iis-dev:8172/MsDeploy.axd - Default Web Site/MP/PROG + Default Web Site/MP/LAND False WMSVC diff --git a/MP.Land/Properties/launchSettings.json b/MP.Land/Properties/launchSettings.json index 924a8e2b..aeaf5b5b 100644 --- a/MP.Land/Properties/launchSettings.json +++ b/MP.Land/Properties/launchSettings.json @@ -3,8 +3,8 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:7312", - "sslPort": 44309 + "applicationUrl": "http://localhost:7314", + "sslPort": 44311 } }, "profiles": {