From 268c92882980fbe66b8d5fea0fee12c102a47d85 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 22 Sep 2021 16:03:37 +0200 Subject: [PATCH 1/2] Fix proj LAND --- MP-LAND/MP-LAND.csproj | 3 --- MP-LAND/Models/MPModel.Context.cs | 1 - MP-LAND/Models/MPModel.edmx | 36 ----------------------------- MP-LAND/Models/MPModel.edmx.diagram | 1 - MP-LAND/Models/UpdateMan.cs | 24 ------------------- 5 files changed, 65 deletions(-) delete mode 100644 MP-LAND/Models/UpdateMan.cs diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj index 0dc36e90..d0a6c6e8 100644 --- a/MP-LAND/MP-LAND.csproj +++ b/MP-LAND/MP-LAND.csproj @@ -293,9 +293,6 @@ MPModel.tt - - MPModel.tt - diff --git a/MP-LAND/Models/MPModel.Context.cs b/MP-LAND/Models/MPModel.Context.cs index d7175f58..9bd750c5 100644 --- a/MP-LAND/Models/MPModel.Context.cs +++ b/MP-LAND/Models/MPModel.Context.cs @@ -30,7 +30,6 @@ namespace MP.Models public virtual DbSet AnagKeyValue { get; set; } public virtual DbSet AnagraficaOperatori { get; set; } public virtual DbSet ConfigTmp { get; set; } - public virtual DbSet UpdateMan { get; set; } public virtual ObjectResult stp_AKV_getByKey(string nomeVar) { diff --git a/MP-LAND/Models/MPModel.edmx b/MP-LAND/Models/MPModel.edmx index 614f0921..e650c374 100644 --- a/MP-LAND/Models/MPModel.edmx +++ b/MP-LAND/Models/MPModel.edmx @@ -36,17 +36,6 @@ - - - - - - - - - - - @@ -54,7 +43,6 @@ - @@ -77,7 +65,6 @@ - @@ -107,17 +94,6 @@ - - - - - - - - - - - @@ -159,18 +135,6 @@ - - - - - - - - - - - - diff --git a/MP-LAND/Models/MPModel.edmx.diagram b/MP-LAND/Models/MPModel.edmx.diagram index 3cf58a19..8f02a6b8 100644 --- a/MP-LAND/Models/MPModel.edmx.diagram +++ b/MP-LAND/Models/MPModel.edmx.diagram @@ -8,7 +8,6 @@ - diff --git a/MP-LAND/Models/UpdateMan.cs b/MP-LAND/Models/UpdateMan.cs deleted file mode 100644 index 267e096e..00000000 --- a/MP-LAND/Models/UpdateMan.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace MP.Models -{ - using System; - using System.Collections.Generic; - - public partial class UpdateMan - { - public string AppName { get; set; } - public string ManifestUrl { get; set; } - public bool IsAuth { get; set; } - public string LocalRepo { get; set; } - public string PackName { get; set; } - public string LicenseKey { get; set; } - } -} From a4f99cd7c748919ef944bd47baac45282ded5131 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 22 Sep 2021 16:03:51 +0200 Subject: [PATCH 2/2] Update CI/CD x replace vers numb corretto --- .gitlab-ci.yml | 2 -- VersGen/MoonPro.cs | 8 ++++---- VersGen/MoonPro.tt | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83626f41..f609fbc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,6 @@ stages: - deploy - installer - ADM:build: stage: build variables: @@ -93,7 +92,6 @@ ADM:build: script: - '& "$env:MSBUILD_PATH" MP-ADM/MP-ADM.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' - IO:build: stage: build variables: diff --git a/VersGen/MoonPro.cs b/VersGen/MoonPro.cs index e6b4bab4..0bbaaeb4 100644 --- a/VersGen/MoonPro.cs +++ b/VersGen/MoonPro.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyCopyright("Steamware ©")] -[assembly: AssemblyCompany("Steamware")] +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.0.0.0")] +[assembly: AssemblyCopyright("SteamWare-EgalWare © 2006+")] +[assembly: AssemblyCompany("EgalWare")] diff --git a/VersGen/MoonPro.tt b/VersGen/MoonPro.tt index 93f7213f..43d406e8 100644 --- a/VersGen/MoonPro.tt +++ b/VersGen/MoonPro.tt @@ -6,7 +6,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyCopyright("Steamware ©")] -[assembly: AssemblyCompany("Steamware")] +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.0.0.0")] +[assembly: AssemblyCopyright("SteamWare-EgalWare © 2006+")] +[assembly: AssemblyCompany("EgalWare")]