From 96e72f382d161795ba64b62a88e06bd06a9678a0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 3 Aug 2022 14:59:42 +0200 Subject: [PATCH] Update assembly binding + tools yaml --- .gitlab-ci.yml | 8 ++--- GMW/GMW.csproj | 4 --- GMW_Term/Web.config | 84 ++++++++++++++++++++++----------------------- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18afb524..0e6f2da1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,14 @@ 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' + MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe' + ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.2 Tools' EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release' DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds' VERS_MAIN: '4.1' NEW_REL: '' NEW_DEB: '' - NEXUS_PATH: 'MP-XXXX' - APP_NAME: 'MP.Xxxx' + NEXUS_PATH: 'GMW' + APP_NAME: 'GMW' APP_CONF: 'Release' # VARIABILI diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index 55f47eef..99cce4e1 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -611,7 +611,6 @@ - PreserveNewest @@ -628,7 +627,6 @@ - @@ -748,8 +746,6 @@ - - diff --git a/GMW_Term/Web.config b/GMW_Term/Web.config index 74c6013a..ff1fa468 100644 --- a/GMW_Term/Web.config +++ b/GMW_Term/Web.config @@ -186,47 +186,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file