Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v_6.14_unificata'

Browse Source
This commit is contained in:
Samuele Locatelli
2021-09-22 16:04:53 +02:00
parent b0fa171c08 a4f99cd7c7
commit 486b66deba
8 changed files with 8 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
-2
View File
@@ -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:
MP-LAND/MP-LAND.csproj
-3
View File
@@ -293,9 +293,6 @@
<Compile Include="Models\stp_AKV_getByKey_Result.cs">
<DependentUpon>MPModel.tt</DependentUpon>
</Compile>
<Compile Include="Models\UpdateMan.cs">
<DependentUpon>MPModel.tt</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
MP-LAND/Models/MPModel.Context.cs
-1
View File
@@ -30,7 +30,6 @@ namespace MP.Models
public virtual DbSet<AnagKeyValue> AnagKeyValue { get; set; }
public virtual DbSet<AnagraficaOperatori> AnagraficaOperatori { get; set; }
public virtual DbSet<ConfigTmp> ConfigTmp { get; set; }
public virtual DbSet<UpdateMan> UpdateMan { get; set; }
public virtual ObjectResult<AnagKeyValue> stp_AKV_getByKey(string nomeVar)
{
MP-LAND/Models/MPModel.edmx
-36
View File
@@ -36,17 +36,6 @@
<Property Name="valore" Type="nvarchar" MaxLength="250" Nullable="false" />
<Property Name="note" Type="nvarchar" MaxLength="250" Nullable="false" />
</EntityType>
<EntityType Name="UpdateMan">
<Key>
<PropertyRef Name="AppName" />
</Key>
<Property Name="AppName" Type="nvarchar" MaxLength="50" Nullable="false" />
<Property Name="ManifestUrl" Type="nvarchar" MaxLength="250" Nullable="false" />
<Property Name="IsAuth" Type="bit" Nullable="false" />
<Property Name="LocalRepo" Type="nvarchar" MaxLength="250" Nullable="false" />
<Property Name="PackName" Type="nvarchar" MaxLength="50" Nullable="false" />
<Property Name="LicenseKey" Type="nvarchar(max)" Nullable="false" />
</EntityType>
<Function Name="stp_AKV_getByKey" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
<Parameter Name="nomeVar" Type="nvarchar" Mode="In" />
</Function>
@@ -54,7 +43,6 @@
<EntitySet Name="AnagKeyValue" EntityType="Self.AnagKeyValue" Schema="dbo" store:Type="Tables" />
<EntitySet Name="AnagraficaOperatori" EntityType="Self.AnagraficaOperatori" Schema="dbo" store:Type="Tables" />
<EntitySet Name="ConfigTmp" EntityType="Self.ConfigTmp" Schema="dbo" store:Type="Tables" />
<EntitySet Name="UpdateMan" EntityType="Self.UpdateMan" Schema="dbo" store:Type="Tables" />
</EntityContainer>
</Schema></edmx:StorageModels>
<!-- CSDL content -->
@@ -77,7 +65,6 @@
</FunctionImport>
<EntitySet Name="AnagraficaOperatori" EntityType="MoonProModel.AnagraficaOperatori" />
<EntitySet Name="ConfigTmp" EntityType="MoonProModel.ConfigTmp" />
<EntitySet Name="UpdateMan" EntityType="MoonProModel.UpdateMan" />
</EntityContainer>
<ComplexType Name="stp_AKV_getByKey_Result">
<Property Type="String" Name="nomeVar" Nullable="false" MaxLength="50" />
@@ -107,17 +94,6 @@
<Property Name="valore" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
<Property Name="note" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
</EntityType>
<EntityType Name="UpdateMan">
<Key>
<PropertyRef Name="AppName" />
</Key>
<Property Name="AppName" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="ManifestUrl" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
<Property Name="IsAuth" Type="Boolean" Nullable="false" />
<Property Name="LocalRepo" Type="String" Nullable="false" MaxLength="250" FixedLength="false" Unicode="true" />
<Property Name="PackName" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="LicenseKey" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
</EntityType>
</Schema>
</edmx:ConceptualModels>
<!-- C-S mapping content -->
@@ -159,18 +135,6 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="UpdateMan">
<EntityTypeMapping TypeName="MoonProModel.UpdateMan">
<MappingFragment StoreEntitySet="UpdateMan">
<ScalarProperty Name="LicenseKey" ColumnName="LicenseKey" />
<ScalarProperty Name="PackName" ColumnName="PackName" />
<ScalarProperty Name="LocalRepo" ColumnName="LocalRepo" />
<ScalarProperty Name="IsAuth" ColumnName="IsAuth" />
<ScalarProperty Name="ManifestUrl" ColumnName="ManifestUrl" />
<ScalarProperty Name="AppName" ColumnName="AppName" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping>
</edmx:Mappings>
MP-LAND/Models/MPModel.edmx.diagram
-1
View File
@@ -8,7 +8,6 @@
<EntityTypeShape EntityType="MoonProModel.AnagKeyValue" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
<EntityTypeShape EntityType="MoonProModel.AnagraficaOperatori" Width="1.5" PointX="3.375" PointY="0.75" />
<EntityTypeShape EntityType="MoonProModel.ConfigTmp" Width="1.5" PointX="0.75" PointY="3.75" />
<EntityTypeShape EntityType="MoonProModel.UpdateMan" Width="1.5" PointX="3.375" PointY="3.75" />
</Diagram>
</edmx:Diagrams>
</edmx:Designer>
MP-LAND/Models/UpdateMan.cs
-24
View File
@@ -1,24 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.
// </auto-generated>
//------------------------------------------------------------------------------
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; }
}
}
VersGen/MoonPro.cs
+4 -4
View File
@@ -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")]
VersGen/MoonPro.tt
+4 -4
View File
@@ -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")]