Merge branch 'feature/LAND-DEPLOY' into develop

.gitlab-ci.yml

@@ -69,88 +69,158 @@ stages:
   - installer
   - release
 
-build:
+LAND:build:
+  stage: build
+  tags:
+    - win
+  before_script:
+    - *nuget-fix
+    - dotnet restore MP-LAND.sln
+  script:
+    - dotnet build MP.Land/MP.Land.csproj
+    
+PROG:build:
+  stage: build
+  tags:
+    - win
+  before_script:
+    - *nuget-fix
+    - dotnet restore MP-PROG.sln
+  script:
+    - dotnet build MP.Prog/MP.Prog.csproj
+    
+STAT:build:
   stage: build
   tags:
     - win
   before_script:
     - *nuget-fix
     - dotnet restore MP-STATS.sln
-    - dotnet restore MP-PROG.sln
   script:
     - dotnet build MP.Stats/MP.Stats.csproj
-    - dotnet build MP.Prog/MP.Prog.csproj
 
-test:
+LAND:test:
   stage: test
   tags:
     - win
   only:
     - develop
-  needs: ["build"]
+  needs: ["LAND:build"]
+  script:
+    - dotnet test MP.Land/MP.Land.csproj
+    
+PROG:test:
+  stage: test
+  tags:
+    - win
+  only:
+    - develop
+  needs: ["PROG:build"]
+  script:
+    - dotnet test MP.Prog/MP.Prog.csproj
+    
+STAT:test:
+  stage: test
+  tags:
+    - win
+  only:
+    - develop
+  needs: ["STAT:build"]
   script:
     - dotnet test MP.Stats/MP.Stats.csproj
-    - dotnet test MP.Prog/MP.Prog.csproj
 
-IIS01:deploy:
+LAND:IIS01:deploy:
   stage: deploy
   tags:
     - win
   only:
     - develop
-  needs: ["test"]
-  # before_script:
-  #   - *nuget-fix
-  #   - dotnet restore
+  needs: ["LAND:test"]
+  script: 
+    - 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
+    
+PROG:IIS01:deploy:
+  stage: deploy
+  tags:
+    - win
+  only:
+    - develop
+  needs: ["PROG:test"]
   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.Prog/MP.Prog.csproj
 
 
-IIS02:deploy:
+STAT:IIS01:deploy:
+  stage: deploy
+  tags:
+    - win
+  only:
+    - develop
+  needs: ["STAT:test"]
+  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
+
+LAND:IIS02:deploy:
   stage: deploy
   tags:
     - win
   only:
     - master
-  needs: ["build"]
-  # before_script:
-  #   - *nuget-fix
-  #   - dotnet restore
+  needs: ["LAND:build"]
+  script: 
+    - 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
+    
+PROG:IIS02:deploy:
+  stage: deploy
+  tags:
+    - win
+  only:
+    - master
+  needs: ["PROG:build"]
+  script: 
+    - 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
+   
+STAT:IIS02:deploy:
+  stage: deploy
+  tags:
+    - win
+  only:
+    - master
+  needs: ["STAT:build"]
   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.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
 
-STA:installer:
+LAND:installer:
   stage: installer
   tags:
     - win
   only:
     - develop
     - master
-  needs: ["build"]
+  needs: ["LAND: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
   only:
     - develop
     - master
-  needs: ["build"]
+  needs: ["PROG:build"]
   variables:
     APP_NAME: MP.Prog
     NEXUS_PATH: MP-PROG
@@ -163,7 +233,28 @@ PRG:installer:
     - *hashBuild
     - *nexusUpload
 
-release:
+STAT:installer:
+  stage: installer
+  tags:
+    - win
+  only:
+    - develop
+    - master
+  needs: ["STAT: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
+    
+
+LAND:release:
   stage: release
   tags:
     - win
@@ -173,12 +264,49 @@ release:
     - tags
   except:
     - branches
-  needs: ["build"]
+  needs: ["LAND:build"]
+  artifacts:
+    paths:
+      - publish/
+  script:
+    - dotnet publish -c Release -o ./publish MP.Land/MP.Land.csproj
+
+
+PROG:release:
+  stage: release
+  tags:
+    - win
+  only:
+    #- feature/Deploy_CI_CD
+    # - master
+    - tags
+  except:
+    - branches
+  needs: ["PROG:build"]
   artifacts:
     paths:
       - publish/
   script:
-    - dotnet publish -c Release -o ./publish MP.Stats/MP.Stats.csproj
     - dotnet publish -c Release -o ./publish MP.Prog/MP.Prog.csproj
 
 
+STAT:release:
+  stage: release
+  tags:
+    - win
+  only:
+    #- feature/Deploy_CI_CD
+    # - master
+    - tags
+  except:
+    - branches
+  needs: ["STAT:build"]
+  artifacts:
+    paths:
+      - publish/
+  script:
+    - 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
+
+

MP.Land/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\publish\net5.0\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+</Project>

MP.Land/Properties/PublishProfiles/IIS01.pubxml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <WebPublishMethod>MSDeploy</WebPublishMethod>
+        <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+        <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+        <LastUsedPlatform>Any CPU</LastUsedPlatform>
+        <SiteUrlToLaunchAfterPublish>
+        </SiteUrlToLaunchAfterPublish>
+        <ExcludeApp_Data>False</ExcludeApp_Data>
+        <ProjectGuid>d9901b50-e61c-400c-b62c-fa060cf72c29</ProjectGuid>
+        <SelfContained>false</SelfContained>
+        <MSDeployServiceURL>https://IIS01:8172/MsDeploy.axd</MSDeployServiceURL>
+        <DeployIisAppPath>Default Web Site/MP/LAND</DeployIisAppPath>
+        <RemoteSitePhysicalPath />
+        <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
+        <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+        <EnableMSDeployBackup>True</EnableMSDeployBackup>
+        <UserName>jenkins</UserName>
+        <_SavePWD>True</_SavePWD>
+        <TargetFramework>net5.0</TargetFramework>
+        <EnableMsDeployAppOffline>True</EnableMsDeployAppOffline>
+    </PropertyGroup>
+</Project>

MP.Land/Properties/PublishProfiles/IIS02.pubxml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <WebPublishMethod>MSDeploy</WebPublishMethod>
+        <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+        <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+        <LastUsedPlatform>Any CPU</LastUsedPlatform>
+        <SiteUrlToLaunchAfterPublish>
+        </SiteUrlToLaunchAfterPublish>
+        <ExcludeApp_Data>False</ExcludeApp_Data>
+        <ProjectGuid>d9901b50-e61c-400c-b62c-fa060cf72c29</ProjectGuid>
+        <SelfContained>false</SelfContained>
+        <MSDeployServiceURL>https://IIS02:8172/MsDeploy.axd</MSDeployServiceURL>
+        <DeployIisAppPath>Default Web Site/MP/LAND</DeployIisAppPath>
+        <RemoteSitePhysicalPath />
+        <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
+        <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+        <EnableMSDeployBackup>True</EnableMSDeployBackup>
+        <UserName>jenkins</UserName>
+        <_SavePWD>True</_SavePWD>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+</Project>

MP.Land/Properties/PublishProfiles/IISProfile.pubxml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <WebPublishMethod>Package</WebPublishMethod>
+        <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+        <LastUsedPlatform>Any CPU</LastUsedPlatform>
+        <SiteUrlToLaunchAfterPublish />
+        <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+        <ExcludeApp_Data>False</ExcludeApp_Data>
+        <ProjectGuid>d9901b50-e61c-400c-b62c-fa060cf72c29</ProjectGuid>
+        <DesktopBuildPackageLocation>bin\publish\MP.Land.zip</DesktopBuildPackageLocation>
+        <PackageAsSingleFile>true</PackageAsSingleFile>
+        <DeployIisAppPath>Default Web Site/MP/LAND</DeployIisAppPath>
+        <TargetFramework>net5.0</TargetFramework>
+        <SelfContained>false</SelfContained>
+    </PropertyGroup>
+</Project>

MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <WebPublishMethod>MSDeploy</WebPublishMethod>
+        <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+        <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+        <LastUsedPlatform>Any CPU</LastUsedPlatform>
+        <SiteUrlToLaunchAfterPublish>
+        </SiteUrlToLaunchAfterPublish>
+        <ExcludeApp_Data>False</ExcludeApp_Data>
+        <ProjectGuid>d9901b50-e61c-400c-b62c-fa060cf72c29</ProjectGuid>
+        <SelfContained>false</SelfContained>
+        <MSDeployServiceURL>https://w2019-iis-dev:8172/MsDeploy.axd</MSDeployServiceURL>
+        <DeployIisAppPath>Default Web Site/MP/LAND</DeployIisAppPath>
+        <RemoteSitePhysicalPath />
+        <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
+        <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+        <EnableMSDeployBackup>True</EnableMSDeployBackup>
+        <UserName>jenkins</UserName>
+        <_SavePWD>True</_SavePWD>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+</Project>

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": {