From e737812e81d6a10a7e5f38db38a7682d27038c44 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 4 Mar 2021 15:42:13 +0100 Subject: [PATCH 1/3] Pulizia nuget deprecati in SDK e update --- ....GeneratedMSBuildEditorConfig.editorconfig | 28 --------------- MapoSDK/MapoSDK.csproj | 35 ++++--------------- MapoSDK/packages.config | 6 +--- 3 files changed, 7 insertions(+), 62 deletions(-) diff --git a/MapoSDK/MapoSDK.GeneratedMSBuildEditorConfig.editorconfig b/MapoSDK/MapoSDK.GeneratedMSBuildEditorConfig.editorconfig index 755ee5e5..89c8e35d 100644 --- a/MapoSDK/MapoSDK.GeneratedMSBuildEditorConfig.editorconfig +++ b/MapoSDK/MapoSDK.GeneratedMSBuildEditorConfig.editorconfig @@ -1,36 +1,8 @@ is_global = true build_property.TargetFramework = -build_property.TargetFramework = -build_property.TargetFramework = -build_property.TargetFramework = -build_property.TargetFramework = -build_property.TargetPlatformMinVersion = -build_property.TargetPlatformMinVersion = -build_property.TargetPlatformMinVersion = -build_property.TargetPlatformMinVersion = build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = -build_property.UsingMicrosoftNETSdkWeb = -build_property.UsingMicrosoftNETSdkWeb = -build_property.UsingMicrosoftNETSdkWeb = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.ProjectTypeGuids = -build_property.ProjectTypeGuids = -build_property.ProjectTypeGuids = build_property.ProjectTypeGuids = build_property.PublishSingleFile = -build_property.PublishSingleFile = -build_property.PublishSingleFile = -build_property.PublishSingleFile = -build_property.PublishSingleFile = build_property.IncludeAllContentForSelfExtract = -build_property.IncludeAllContentForSelfExtract = -build_property.IncludeAllContentForSelfExtract = -build_property.IncludeAllContentForSelfExtract = -build_property.IncludeAllContentForSelfExtract = -build_property._SupportedPlatformList = -build_property._SupportedPlatformList = -build_property._SupportedPlatformList = -build_property._SupportedPlatformList = build_property._SupportedPlatformList = diff --git a/MapoSDK/MapoSDK.csproj b/MapoSDK/MapoSDK.csproj index d39e32d6..560f4e77 100644 --- a/MapoSDK/MapoSDK.csproj +++ b/MapoSDK/MapoSDK.csproj @@ -1,10 +1,6 @@  - - - - - + Debug @@ -67,35 +63,16 @@ - - - - - - - - - + + Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. - - - - - - - - - - + + - - - - - + \ No newline at end of file diff --git a/MapoSDK/packages.config b/MapoSDK/packages.config index 666639dd..10b4b798 100644 --- a/MapoSDK/packages.config +++ b/MapoSDK/packages.config @@ -1,9 +1,5 @@  - - - - - + \ No newline at end of file From 295d581242e3bffde3ad54533f72649b383e3e7d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 4 Mar 2021 15:58:21 +0100 Subject: [PATCH 2/3] ulteriore pulizia nuget --- MP-ADM/Web.config | 268 +++++++++++++++++++++++++----- MP-IO/Web.config | 376 ++++++++++++++++++++++++++++++++---------- MP-LAND/Web.config | 360 ++++++++++++++++++++++++++++++++--------- MP-MON/Web.config | 378 +++++++++++++++++++++++++++++++++---------- MP-Site/Web.config | 378 +++++++++++++++++++++++++++++++++---------- MP-TAB/Web.config | 378 +++++++++++++++++++++++++++++++++---------- MapoDb/MapoDb.csproj | 5 +- 7 files changed, 1665 insertions(+), 478 deletions(-) diff --git a/MP-ADM/Web.config b/MP-ADM/Web.config index fcabf2f1..aecd0d86 100644 --- a/MP-ADM/Web.config +++ b/MP-ADM/Web.config @@ -1,4 +1,4 @@ - + - - - + + + - - - - - - - - - + + + + + + + + + - + - + - + - - - - - - + + + + + + - - - + + + - - - + + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - - - - - + + + + + - + - - - - + + + + - - + + - + -
-
-
-
+
+
+
+
-
+
- - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - + - + - - + + - - + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + - - + + - + - + - \ No newline at end of file + diff --git a/MP-MON/Web.config b/MP-MON/Web.config index 428d1061..560b989e 100644 --- a/MP-MON/Web.config +++ b/MP-MON/Web.config @@ -1,4 +1,4 @@ - + -
+
-
-
-
-
+
+
+
+
- - - + + + - - - - - + + + + + - - - - + + + + - + - - + + - - + + - + - + - - + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - + - + - + - + - - - + + + - - - - - + + + + + - + - - - + + + - - - - - + + + + + - - - + + + - + - + - + - + - + - - + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - + - - - - - + + + + + - - + + - - + + - + - + - - - + + + - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - + + + + + - - - - - - + + + + + + - - + + - + + + ..\packages\Microsoft.ReportViewer.Runtime.WinForms.12.0.2402.15\lib\Microsoft.ReportViewer.WinForms.dll ..\packages\MongoDB.Bson.2.12.0\lib\net452\MongoDB.Bson.dll From 258d00e87c7045c249bedd3a282849043b7ac867 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 4 Mar 2021 15:58:35 +0100 Subject: [PATCH 3/3] rel 1400 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 970c5976..70fba6d2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1399']) { + withEnv(['NEXT_BUILD_NUMBER=1400']) { // env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO'