Global rename dei projcs e namespaces, meno 3 proj

This commit is contained in:
Samuele Locatelli
2020-04-09 13:15:01 +02:00
parent 90811d5bdb
commit f25694e0ff
1420 changed files with 20048 additions and 20045 deletions
@@ -1,99 +1,99 @@
using Termo.Active.CmsConnectGateway.Builders;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway
{
public class GatewayNetworkConfigurationBuilder : iBuilder
{
private GatewayNetworkConfiguration config;
public GatewayNetworkConfigurationBuilder()
{
config = new GatewayNetworkConfiguration();
}
public GatewayNetworkConfigurationBuilder HasDhcp(Boolean useDhcp)
{
config.hasDhcp = useDhcp;
return this;
}
public GatewayNetworkConfigurationBuilder IpAddress(IPAddress ipAddress)
{
config.ipAddress = ipAddress;
return this;
}
public GatewayNetworkConfigurationBuilder NetMaskAddress(IPAddress netMask)
{
config.netMaskAddress = netMask;
return this;
}
public GatewayNetworkConfigurationBuilder DefaultGatewayAddress(IPAddress gateway)
{
config.defaultGatewayAddress = gateway;
return this;
}
public GatewayNetworkConfigurationBuilder DnsAddresses(IEnumerable<IPAddress> dns)
{
config.dnsAddresses = dns;
return this;
}
public GatewayNetworkConfigurationBuilder DnsPrefixes(IEnumerable<string> dnsPrefixes)
{
config.dnsPrefixes = dnsPrefixes;
return this;
}
public GatewayNetworkConfiguration GenerateConfiguration()
{
//If DHCP enabled go out
if (config.hasDhcp)
{
config.ipAddress = null;
config.netMaskAddress = null;
config.defaultGatewayAddress = null;
}
else
{
//Controls not NULL
CheckNotNull(config.ipAddress, "IpAddress");
CheckNotNull(config.netMaskAddress, "NetMaskAddress");
CheckNotNull(config.defaultGatewayAddress, "DefaultGatewayAddress");
//Controls address
CheckIpAddress(config.ipAddress);
CheckNetmaskAddress(config.netMaskAddress);
CheckIpAddress(config.defaultGatewayAddress);
}
//Controls DNS Address
if (config.dnsAddresses != null)
{
foreach (IPAddress addr in config.dnsAddresses)
CheckIpAddress(addr);
}
//Controls empty spaces
if (config.dnsPrefixes != null)
{
foreach (string str in config.dnsPrefixes)
CheckNoEmptySpaces(str, "DnsPrefixes");
}
return config;
}
}
}
using Termo.Active.CmsConnectGateway.Builders;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway
{
public class GatewayNetworkConfigurationBuilder : iBuilder
{
private GatewayNetworkConfiguration config;
public GatewayNetworkConfigurationBuilder()
{
config = new GatewayNetworkConfiguration();
}
public GatewayNetworkConfigurationBuilder HasDhcp(Boolean useDhcp)
{
config.hasDhcp = useDhcp;
return this;
}
public GatewayNetworkConfigurationBuilder IpAddress(IPAddress ipAddress)
{
config.ipAddress = ipAddress;
return this;
}
public GatewayNetworkConfigurationBuilder NetMaskAddress(IPAddress netMask)
{
config.netMaskAddress = netMask;
return this;
}
public GatewayNetworkConfigurationBuilder DefaultGatewayAddress(IPAddress gateway)
{
config.defaultGatewayAddress = gateway;
return this;
}
public GatewayNetworkConfigurationBuilder DnsAddresses(IEnumerable<IPAddress> dns)
{
config.dnsAddresses = dns;
return this;
}
public GatewayNetworkConfigurationBuilder DnsPrefixes(IEnumerable<string> dnsPrefixes)
{
config.dnsPrefixes = dnsPrefixes;
return this;
}
public GatewayNetworkConfiguration GenerateConfiguration()
{
//If DHCP enabled go out
if (config.hasDhcp)
{
config.ipAddress = null;
config.netMaskAddress = null;
config.defaultGatewayAddress = null;
}
else
{
//Controls not NULL
CheckNotNull(config.ipAddress, "IpAddress");
CheckNotNull(config.netMaskAddress, "NetMaskAddress");
CheckNotNull(config.defaultGatewayAddress, "DefaultGatewayAddress");
//Controls address
CheckIpAddress(config.ipAddress);
CheckNetmaskAddress(config.netMaskAddress);
CheckIpAddress(config.defaultGatewayAddress);
}
//Controls DNS Address
if (config.dnsAddresses != null)
{
foreach (IPAddress addr in config.dnsAddresses)
CheckIpAddress(addr);
}
//Controls empty spaces
if (config.dnsPrefixes != null)
{
foreach (string str in config.dnsPrefixes)
CheckNoEmptySpaces(str, "DnsPrefixes");
}
return config;
}
}
}
@@ -1,93 +1,93 @@
using Termo.Active.CmsConnectGateway.Builders;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway
{
public class GatewayProxyConfigurationBuilder : iBuilder
{
private GatewayProxyConfiguration config;
public GatewayProxyConfigurationBuilder()
{
config = new GatewayProxyConfiguration();
}
public GatewayProxyConfigurationBuilder HasProxy(Boolean useProxy)
{
config.hasProxy = useProxy;
return this;
}
public GatewayProxyConfigurationBuilder Address(string address)
{
config.address = address;
return this;
}
public GatewayProxyConfigurationBuilder Address(IPAddress address)
{
CheckIpAddress(address);
config.address = address.ToString();
return this;
}
public GatewayProxyConfigurationBuilder Port(uint port)
{
config.port = port;
return this;
}
public GatewayProxyConfigurationBuilder Username(string username)
{
config.username = username;
return this;
}
public GatewayProxyConfigurationBuilder Password(string password)
{
config.password = password;
return this;
}
public GatewayProxyConfigurationBuilder NoproxyAddresses(IEnumerable<string> addresses)
{
config.noproxyAddresses = addresses;
return this;
}
public GatewayProxyConfiguration GenerateConfiguration()
{
//If DHCP enabled go out
if (!config.hasProxy)
{
config.address = null;
config.port = 0;
config.username = null;
config.password = null;
config.noproxyAddresses = null;
return config;
}
//Controls not NULL
CheckNotNull(config.address, "Address");
//Controls empty spaces
CheckNoEmptySpaces(config.address, "Address");
if(config.username != null)
CheckNoEmptySpaces(config.username, "Username");
if (config.password != null)
CheckNoEmptySpaces(config.password, "Password");
foreach (string str in config.noproxyAddresses)
CheckNoEmptySpaces(str, "NoproxyAddresses");
return config;
}
}
}
using Termo.Active.CmsConnectGateway.Builders;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway
{
public class GatewayProxyConfigurationBuilder : iBuilder
{
private GatewayProxyConfiguration config;
public GatewayProxyConfigurationBuilder()
{
config = new GatewayProxyConfiguration();
}
public GatewayProxyConfigurationBuilder HasProxy(Boolean useProxy)
{
config.hasProxy = useProxy;
return this;
}
public GatewayProxyConfigurationBuilder Address(string address)
{
config.address = address;
return this;
}
public GatewayProxyConfigurationBuilder Address(IPAddress address)
{
CheckIpAddress(address);
config.address = address.ToString();
return this;
}
public GatewayProxyConfigurationBuilder Port(uint port)
{
config.port = port;
return this;
}
public GatewayProxyConfigurationBuilder Username(string username)
{
config.username = username;
return this;
}
public GatewayProxyConfigurationBuilder Password(string password)
{
config.password = password;
return this;
}
public GatewayProxyConfigurationBuilder NoproxyAddresses(IEnumerable<string> addresses)
{
config.noproxyAddresses = addresses;
return this;
}
public GatewayProxyConfiguration GenerateConfiguration()
{
//If DHCP enabled go out
if (!config.hasProxy)
{
config.address = null;
config.port = 0;
config.username = null;
config.password = null;
config.noproxyAddresses = null;
return config;
}
//Controls not NULL
CheckNotNull(config.address, "Address");
//Controls empty spaces
CheckNoEmptySpaces(config.address, "Address");
if(config.username != null)
CheckNoEmptySpaces(config.username, "Username");
if (config.password != null)
CheckNoEmptySpaces(config.password, "Password");
foreach (string str in config.noproxyAddresses)
CheckNoEmptySpaces(str, "NoproxyAddresses");
return config;
}
}
}
@@ -1,79 +1,79 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway.Builders
{
public abstract class iBuilder
{
//------------------------------------ To Implement ------------------------------------
#region ToImplement_Functions
#endregion
//------------------------------------ Controls ------------------------------------
#region Control_Functions
internal void CheckIpAddress(IPAddress ipAddress)
{
byte[] byteIP = ipAddress.GetAddressBytes();
//IP must be NE 0.0.0.0
if (byteIP[0] == 0 && byteIP[1] == 0 && byteIP[2] == 0 && byteIP[3] == 0)
throw new ArgumentException("IP must be different from 0.0.0.0");
}
internal void CheckNetmaskAddress(IPAddress netmaskAddress)
{
byte[] byteIP = netmaskAddress.GetAddressBytes();
//NETMASK must be NE 0.0.0.0
if (byteIP[0] == 0 && byteIP[1] == 0 && byteIP[2] == 0 && byteIP[3] == 0)
throw new ArgumentException("NETMASK must be different from 0.0.0.0");
//NETMASK first number must be NE 0
if (byteIP[0] == 0)
throw new ArgumentException("NETMASK starting address must be different from 0. Eg: xx.0.0.0 ");
}
internal void CheckNotNull(object objToCheck, string paramName)
{
if (objToCheck == null)
throw new FormatException("BAD FORMAT - param \"" + paramName + "\" is mandatory");
}
internal void CheckNoEmptySpaces(string strToCheck,string paramName)
{
if (strToCheck.Contains(" "))
throw new FormatException("BAD FORMAT - param \"" + paramName + "\" must be without empty spaces");
}
private bool EvaluateIPV4(string stringValue, out IPAddress address)
{
Regex rgx = new Regex(@"^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$");
if (rgx.IsMatch(stringValue))
{
IPAddress.TryParse(stringValue, out address);
return true;
}
address = new IPAddress(0);
return false;
}
#endregion
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway.Builders
{
public abstract class iBuilder
{
//------------------------------------ To Implement ------------------------------------
#region ToImplement_Functions
#endregion
//------------------------------------ Controls ------------------------------------
#region Control_Functions
internal void CheckIpAddress(IPAddress ipAddress)
{
byte[] byteIP = ipAddress.GetAddressBytes();
//IP must be NE 0.0.0.0
if (byteIP[0] == 0 && byteIP[1] == 0 && byteIP[2] == 0 && byteIP[3] == 0)
throw new ArgumentException("IP must be different from 0.0.0.0");
}
internal void CheckNetmaskAddress(IPAddress netmaskAddress)
{
byte[] byteIP = netmaskAddress.GetAddressBytes();
//NETMASK must be NE 0.0.0.0
if (byteIP[0] == 0 && byteIP[1] == 0 && byteIP[2] == 0 && byteIP[3] == 0)
throw new ArgumentException("NETMASK must be different from 0.0.0.0");
//NETMASK first number must be NE 0
if (byteIP[0] == 0)
throw new ArgumentException("NETMASK starting address must be different from 0. Eg: xx.0.0.0 ");
}
internal void CheckNotNull(object objToCheck, string paramName)
{
if (objToCheck == null)
throw new FormatException("BAD FORMAT - param \"" + paramName + "\" is mandatory");
}
internal void CheckNoEmptySpaces(string strToCheck,string paramName)
{
if (strToCheck.Contains(" "))
throw new FormatException("BAD FORMAT - param \"" + paramName + "\" must be without empty spaces");
}
private bool EvaluateIPV4(string stringValue, out IPAddress address)
{
Regex rgx = new Regex(@"^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$");
if (rgx.IsMatch(stringValue))
{
IPAddress.TryParse(stringValue, out address);
return true;
}
address = new IPAddress(0);
return false;
}
#endregion
}
}
@@ -1,20 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway.Events
{
public class GatewayRebootEventHandlerArgs : EventArgs
{
public Boolean errorStatus { get; internal set; }
public String errorMessage { get; internal set; }
public GatewayRebootEventHandlerArgs()
{
errorStatus = false;
errorMessage = "";
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway.Events
{
public class GatewayRebootEventHandlerArgs : EventArgs
{
public Boolean errorStatus { get; internal set; }
public String errorMessage { get; internal set; }
public GatewayRebootEventHandlerArgs()
{
errorStatus = false;
errorMessage = "";
}
}
}
@@ -1,15 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway.Exceptions
{
public class GatewayException: Exception
{
public GatewayException(string message): base(message)
{
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.CmsConnectGateway.Exceptions
{
public class GatewayException: Exception
{
public GatewayException(string message): base(message)
{
}
}
}
@@ -1,56 +1,56 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Net;
namespace Termo.Active.CmsConnectGateway
{
public enum GatewayConnectionStatus { OK = 0, WEB_ERROR = 1, PORT_ERROR = 2 };
public class GatewayNetworkConfiguration
{
internal GatewayNetworkConfiguration() {}
public Boolean hasDhcp { get; internal set;}
public IPAddress ipAddress { get; internal set; }
public IPAddress netMaskAddress { get; internal set; }
public IPAddress defaultGatewayAddress { get; internal set; }
public IEnumerable<IPAddress> dnsAddresses { get; internal set; }
public IEnumerable<string> dnsPrefixes { get; internal set; }
public override string ToString()
{
return "hasDhcp: " + hasDhcp + Environment.NewLine +
"ipAddress: " + (ipAddress != null ? ipAddress.ToString() : "null") + Environment.NewLine +
"netMaskAddress: " + (netMaskAddress != null ? netMaskAddress.ToString() : "null") + Environment.NewLine +
"defaultGatewayAddress: " + (defaultGatewayAddress != null ? defaultGatewayAddress.ToString() : "null") + Environment.NewLine +
"dnsAddresses: " + (dnsAddresses != null ? string.Join(",", dnsAddresses) : "null") + Environment.NewLine +
"dnsPrefixes: " + (dnsPrefixes != null ? string.Join(",", dnsPrefixes) : "null");
}
}
public class GatewayProxyConfiguration
{
internal GatewayProxyConfiguration(){}
public Boolean hasProxy { get; internal set; }
public string address { get; internal set; }
public uint port { get; internal set; }
public string username { get; internal set; }
public string password { get; internal set; }
public IEnumerable<string> noproxyAddresses { get; internal set; }
public override string ToString()
{
return "hasProxy: " + hasProxy + Environment.NewLine +
"address: " + (address != null ? address.ToString() : "null") + Environment.NewLine +
"port: " + (port != 0 ? port.ToString() : "null") + Environment.NewLine +
"username: " + (username != null ? username : "null") + Environment.NewLine +
"password: " + (password != null ? password : "null") + Environment.NewLine +
"noproxyAddresses: " + (noproxyAddresses != null ? string.Join(",", noproxyAddresses) : "null");
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Net;
namespace Termo.Active.CmsConnectGateway
{
public enum GatewayConnectionStatus { OK = 0, WEB_ERROR = 1, PORT_ERROR = 2 };
public class GatewayNetworkConfiguration
{
internal GatewayNetworkConfiguration() {}
public Boolean hasDhcp { get; internal set;}
public IPAddress ipAddress { get; internal set; }
public IPAddress netMaskAddress { get; internal set; }
public IPAddress defaultGatewayAddress { get; internal set; }
public IEnumerable<IPAddress> dnsAddresses { get; internal set; }
public IEnumerable<string> dnsPrefixes { get; internal set; }
public override string ToString()
{
return "hasDhcp: " + hasDhcp + Environment.NewLine +
"ipAddress: " + (ipAddress != null ? ipAddress.ToString() : "null") + Environment.NewLine +
"netMaskAddress: " + (netMaskAddress != null ? netMaskAddress.ToString() : "null") + Environment.NewLine +
"defaultGatewayAddress: " + (defaultGatewayAddress != null ? defaultGatewayAddress.ToString() : "null") + Environment.NewLine +
"dnsAddresses: " + (dnsAddresses != null ? string.Join(",", dnsAddresses) : "null") + Environment.NewLine +
"dnsPrefixes: " + (dnsPrefixes != null ? string.Join(",", dnsPrefixes) : "null");
}
}
public class GatewayProxyConfiguration
{
internal GatewayProxyConfiguration(){}
public Boolean hasProxy { get; internal set; }
public string address { get; internal set; }
public uint port { get; internal set; }
public string username { get; internal set; }
public string password { get; internal set; }
public IEnumerable<string> noproxyAddresses { get; internal set; }
public override string ToString()
{
return "hasProxy: " + hasProxy + Environment.NewLine +
"address: " + (address != null ? address.ToString() : "null") + Environment.NewLine +
"port: " + (port != 0 ? port.ToString() : "null") + Environment.NewLine +
"username: " + (username != null ? username : "null") + Environment.NewLine +
"password: " + (password != null ? password : "null") + Environment.NewLine +
"noproxyAddresses: " + (noproxyAddresses != null ? string.Join(",", noproxyAddresses) : "null");
}
}
}
@@ -1,36 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Le informazioni generali relative a un assembly sono controllate dal seguente
// set di attributi. Modificare i valori di questi attributi per modificare le informazioni
// associate a un assembly.
[assembly: AssemblyTitle("Step.CmsConnect")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Step.CmsConnect")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Se si imposta ComVisible su false, i tipi in questo assembly non saranno visibili
// ai componenti COM. Se è necessario accedere a un tipo in questo assembly da
// COM, impostare su true l'attributo ComVisible per tale tipo.
[assembly: ComVisible(false)]
// Se il progetto viene esposto a COM, il GUID seguente verrà utilizzato come ID della libreria dei tipi
[assembly: Guid("49b04d99-0ecd-4900-86d3-7098d61314d7")]
// Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori:
//
// Versione principale
// Versione secondaria
// Numero di build
// Revisione
//
// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
// usando l'asterisco '*' come illustrato di seguito:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Le informazioni generali relative a un assembly sono controllate dal seguente
// set di attributi. Modificare i valori di questi attributi per modificare le informazioni
// associate a un assembly.
[assembly: AssemblyTitle("Step.CmsConnect")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Step.CmsConnect")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Se si imposta ComVisible su false, i tipi in questo assembly non saranno visibili
// ai componenti COM. Se è necessario accedere a un tipo in questo assembly da
// COM, impostare su true l'attributo ComVisible per tale tipo.
[assembly: ComVisible(false)]
// Se il progetto viene esposto a COM, il GUID seguente verrà utilizzato come ID della libreria dei tipi
[assembly: Guid("49b04d99-0ecd-4900-86d3-7098d61314d7")]
// Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori:
//
// Versione principale
// Versione secondaria
// Numero di build
// Revisione
//
// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
// usando l'asterisco '*' come illustrato di seguito:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -7,8 +7,8 @@
<ProjectGuid>{49B04D99-0ECD-4900-86D3-7098D61314D7}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Termo.Active.CmsConnectGateway</RootNamespace>
<AssemblyName>Termo.Active.CmsConnectGateway</AssemblyName>
<RootNamespace>Thermo.Active.CmsConnectGateway</RootNamespace>
<AssemblyName>Thermo.Active.CmsConnectGateway</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="IPNetwork2" version="2.4.0.126" targetFramework="net461" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net461" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="IPNetwork2" version="2.4.0.126" targetFramework="net461" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net461" />
</packages>
@@ -7,8 +7,8 @@
<ProjectGuid>{3F5C2483-FC87-43EF-92A8-66FF7D0E440F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Termo.Active.Config</RootNamespace>
<AssemblyName>Termo.Active.Config</AssemblyName>
<RootNamespace>Thermo.Active.Config</RootNamespace>
<AssemblyName>Thermo.Active.Config</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
@@ -118,13 +118,13 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Step.Model\Termo.Active.Model.csproj">
<ProjectReference Include="..\Thermo.Active.Model\Thermo.Active.Model.csproj">
<Project>{631375dd-06d3-49bb-8130-d9ddb34c429d}</Project>
<Name>Termo.Active.Model</Name>
<Name>Thermo.Active.Model</Name>
</ProjectReference>
<ProjectReference Include="..\Step.Utils\Termo.Active.Utils.csproj">
<ProjectReference Include="..\Thermo.Active.Utils\Thermo.Active.Utils.csproj">
<Project>{cbeb631b-abfa-4042-9779-c0060b0dfefe}</Project>
<Name>Termo.Active.Utils</Name>
<Name>Thermo.Active.Utils</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Termo.Active.Core.Properties {
namespace Thermo.Active.Core.Properties {
using System;
@@ -39,7 +39,7 @@ namespace Termo.Active.Core.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Termo.Active.Core.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Thermo.Active.Core.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

@@ -7,8 +7,8 @@
<ProjectGuid>{DE54FF4C-8390-4489-882A-1BC7D99EF185}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Termo.Active.Core</RootNamespace>
<AssemblyName>Termo.Active.Core</AssemblyName>
<RootNamespace>Thermo.Active.Core</RootNamespace>
<AssemblyName>Thermo.Active.Core</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
@@ -63,25 +63,25 @@
<Compile Include="ThreadsSiemensHmi.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Step.Config\Termo.Active.Config.csproj">
<ProjectReference Include="..\Thermo.Active.Config\Thermo.Active.Config.csproj">
<Project>{3f5c2483-fc87-43ef-92a8-66ff7d0e440f}</Project>
<Name>Termo.Active.Config</Name>
<Name>Thermo.Active.Config</Name>
</ProjectReference>
<ProjectReference Include="..\Step.Database\Termo.Active.Database.csproj">
<ProjectReference Include="..\Thermo.Active.Database\Thermo.Active.Database.csproj">
<Project>{357d5ee1-ffc8-489b-9232-22cf474d9a6f}</Project>
<Name>Termo.Active.Database</Name>
<Name>Thermo.Active.Database</Name>
</ProjectReference>
<ProjectReference Include="..\Step.Model\Termo.Active.Model.csproj">
<ProjectReference Include="..\Thermo.Active.Model\Thermo.Active.Model.csproj">
<Project>{631375DD-06D3-49BB-8130-D9DDB34C429D}</Project>
<Name>Termo.Active.Model</Name>
<Name>Thermo.Active.Model</Name>
</ProjectReference>
<ProjectReference Include="..\Step.NC\Termo.Active.NC.csproj">
<ProjectReference Include="..\Thermo.Active.NC\Thermo.Active.NC.csproj">
<Project>{b2366b08-96bd-4f6b-b748-b45089b87a14}</Project>
<Name>Termo.Active.NC</Name>
<Name>Thermo.Active.NC</Name>
</ProjectReference>
<ProjectReference Include="..\Step.Utils\Termo.Active.Utils.csproj">
<ProjectReference Include="..\Thermo.Active.Utils\Thermo.Active.Utils.csproj">
<Project>{cbeb631b-abfa-4042-9779-c0060b0dfefe}</Project>
<Name>Termo.Active.Utils</Name>
<Name>Thermo.Active.Utils</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
File diff suppressed because it is too large Load Diff
@@ -39,14 +39,14 @@ namespace Termo.Active.Core
public static void Start()
{
ThreadsFunctions.RestoreConnection();
//Setup CMS Connect
//if(Config.ServerConfig.CmsConnectConfig.Enabled)
if (Config.ServerConfig.ServerStartupConfig.CmsConnectReady)
{
Thread t = new Thread(() => ThreadSetupCmsConnect());
t.Start();
ThreadsFunctions.RestoreConnection();
//Setup CMS Connect
//if(Config.ServerConfig.CmsConnectConfig.Enabled)
if (Config.ServerConfig.ServerStartupConfig.CmsConnectReady)
{
Thread t = new Thread(() => ThreadSetupCmsConnect());
t.Start();
}
}
@@ -101,18 +101,18 @@ namespace Termo.Active.Core
RunningThreadsList.ForEach(thread =>
{
thread.Abort();
});
if(ThreadsHandler.StartClient != null)
});
if(ThreadsHandler.StartClient != null)
ThreadsHandler.StartClient.Abort();
//Abort Connect Thread
ThreadsFunctions.AbortNcConnection();
}
public static void StartClientFromUI()
{
ThreadsFunctions.StartCMSClient();
public static void StartClientFromUI()
{
ThreadsFunctions.StartCMSClient();
}
}
}
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<entityFramework>
<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" />
<providers>
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
</providers>
</entityFramework>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add description=".Net Framework Data Provider for MySQL" invariant="MySql.Data.MySqlClient" name="MySQL Data Provider" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.10.4.0" newVersion="6.10.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<entityFramework>
<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" />
<providers>
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
</providers>
</entityFramework>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add description=".Net Framework Data Provider for MySQL" invariant="MySql.Data.MySqlClient" name="MySQL Data Provider" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.10.4.0" newVersion="6.10.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
@@ -1,7 +1,7 @@
using Termo.Active.Model.DatabaseModels;
using Termo.Active.Model.DTOModels;
using Termo.Active.Model.DTOModels.MaintenanceModels;
using Termo.Active.Utils;
using Termo.Active.Utils;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -30,29 +30,29 @@ namespace Termo.Active.Database.Controllers
}
public List<DTOPerformModel> GetPerformedMaintenancesFromId(int maintenanceId)
{
List<DTOPerformModel> valRet = new List<DTOPerformModel>();
{
List<DTOPerformModel> valRet = new List<DTOPerformModel>();
List<PerformedMaintenanceModel> maintList = (from maintenances in dbCtx.PerformedMaintenances
where maintenances.MaintenanceId == maintenanceId
where maintenances.MaintenanceId == maintenanceId
select maintenances)
.Include("Maintainer").OrderByDescending(x => x.Date)
.ToList();
foreach (PerformedMaintenanceModel maintenance in maintList)
{
if(maintenance.ControlWord != -2)
valRet.Add(new DTOPerformModel()
{
Date = maintenance.Date,
Countervalue = (uint)Math.Ceiling(SupportFunctions.ConvertInUmeas(maintenance.CounterValue, maintenance.Maintenance.UnitOfMeasure.Value)),
ControlWord = maintenance.ControlWord,
User = maintenance.Maintainer != null ? maintenance.Maintainer.Username : null
});
}
return valRet;
.ToList();
foreach (PerformedMaintenanceModel maintenance in maintList)
{
if(maintenance.ControlWord != -2)
valRet.Add(new DTOPerformModel()
{
Date = maintenance.Date,
Countervalue = (uint)Math.Ceiling(SupportFunctions.ConvertInUmeas(maintenance.CounterValue, maintenance.Maintenance.UnitOfMeasure.Value)),
ControlWord = maintenance.ControlWord,
User = maintenance.Maintainer != null ? maintenance.Maintainer.Username : null
});
}
return valRet;
}
public List<PerformedMaintenanceModel> FindLastPerformedMaintenances()
@@ -106,10 +106,10 @@ namespace Termo.Active.Database.Controllers
public MaintenanceModel Create(DTONewMaintenanceModel newMaint, int userId)
{
int counter = 0;
//fix the maintenance number to 1 (machine Counter)
if (newMaint.Type == MAINTENANCE_TYPE.MACHINE_INTERVAL)
int counter = 0;
//fix the maintenance number to 1 (machine Counter)
if (newMaint.Type == MAINTENANCE_TYPE.MACHINE_INTERVAL)
counter = 0;
MaintenanceModel dbMaint = new MaintenanceModel()
@@ -476,19 +476,19 @@ namespace Termo.Active.Database.Controllers
}
}
if (containsLetters)
if (containsLetters)
{
tmpPassword1 = tmpPassword3.PadLeft(15, '0');
number = Convert.ToInt32(tmpPassword1.Substring(5, 8), 16); // Convert from hexadecimal
cw = Convert.ToInt32(tmpPassword1.Substring(13, 2), 16); // Convert from hexadecimal
tmpPassword1 = tmpPassword3.PadLeft(15, '0');
number = Convert.ToInt32(tmpPassword1.Substring(5, 8), 16); // Convert from hexadecimal
cw = Convert.ToInt32(tmpPassword1.Substring(13, 2), 16); // Convert from hexadecimal
}
else
{
tmpPassword1 = tmpPassword3.PadLeft(11, '0');
number = Convert.ToInt32(tmpPassword1.Substring(5, 4), 16); // Convert from hexadecimal
cw = Convert.ToInt32(tmpPassword1.Substring(9, 2), 16); // Convert from hexadecimal
else
{
tmpPassword1 = tmpPassword3.PadLeft(11, '0');
number = Convert.ToInt32(tmpPassword1.Substring(5, 4), 16); // Convert from hexadecimal
cw = Convert.ToInt32(tmpPassword1.Substring(9, 2), 16); // Convert from hexadecimal
}
hours = Convert.ToInt32(tmpPassword1.Substring(0, 5), 16); // Convert from hexadecimal
@@ -1,64 +1,64 @@
using Termo.Active.Database.Redis;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.Database.Controllers
{
public static class RedisController
{
private const string redisNotificationAddress = "Machine:ProductionProcesses:%NN%:Notification";
private const string redisProdNameAddress = "Machine:ProductionProcesses:%NN%:Programs:01:Name";
private const string redisRepsTargetAddress = "Machine:ProductionProcesses:%NN%:Programs:01:RepsTarget";
private const string redisRepsDoneAddress = "Machine:ProductionProcesses:%NN%:Programs:01:RepsDone";
private const string redisAlmCurr = "AdpConf:Plc:Condition:Curr";
private const string redisAlmIt = "AdpConf:Plc:Condition:It";
private const string redisAlmEn = "AdpConf:Plc:Condition:En";
public static void WriteProductionNotification(uint ProductionProcess, string Notification)
{
string redisHash = redUtil.man.redHash(redisNotificationAddress).Replace("%NN%", ProductionProcess.ToString("00"));
redUtil.man.setRSV(redisHash, Notification);
}
public static void WriteProductionName(uint ProductionProcess, string Name)
{
string redisHash = redUtil.man.redHash(redisProdNameAddress).Replace("%NN%", ProductionProcess.ToString("00"));
redUtil.man.setRSV(redisHash, Name);
}
public static void WriteProductionRepsTarget(uint ProductionProcess, string RepsTarget)
{
string redisHash = redUtil.man.redHash(redisRepsTargetAddress).Replace("%NN%", ProductionProcess.ToString("00"));
redUtil.man.setRSV(redisHash, RepsTarget);
}
public static void WriteProductionRepsDone(uint ProductionProcess, string RepsDone)
{
string redisHash = redUtil.man.redHash(redisRepsDoneAddress).Replace("%NN%", ProductionProcess.ToString("00"));
redUtil.man.setRSV(redisHash, RepsDone);
}
public static bool WriteAlarmsConfigCurr(Dictionary<string,string> alarms)
{
string redisHash = redUtil.man.redHash(redisAlmCurr);
return redUtil.man.redSaveHashDict(redisHash, alarms);
}
public static bool WriteAlarmsConfigEn(Dictionary<string, string> alarms)
{
string redisHash = redUtil.man.redHash(redisAlmEn);
return redUtil.man.redSaveHashDict(redisHash, alarms);
}
public static bool WriteAlarmsConfigIt(Dictionary<string, string> alarms)
{
string redisHash = redUtil.man.redHash(redisAlmIt);
return redUtil.man.redSaveHashDict(redisHash, alarms);
}
}
}
using Termo.Active.Database.Redis;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Termo.Active.Database.Controllers
{
public static class RedisController
{
private const string redisNotificationAddress = "Machine:ProductionProcesses:%NN%:Notification";
private const string redisProdNameAddress = "Machine:ProductionProcesses:%NN%:Programs:01:Name";
private const string redisRepsTargetAddress = "Machine:ProductionProcesses:%NN%:Programs:01:RepsTarget";
private const string redisRepsDoneAddress = "Machine:ProductionProcesses:%NN%:Programs:01:RepsDone";
private const string redisAlmCurr = "AdpConf:Plc:Condition:Curr";
private const string redisAlmIt = "AdpConf:Plc:Condition:It";
private const string redisAlmEn = "AdpConf:Plc:Condition:En";
public static void WriteProductionNotification(uint ProductionProcess, string Notification)
{
string redisHash = redUtil.man.redHash(redisNotificationAddress).Replace("%NN%", ProductionProcess.ToString("00"));
redUtil.man.setRSV(redisHash, Notification);
}
public static void WriteProductionName(uint ProductionProcess, string Name)
{
string redisHash = redUtil.man.redHash(redisProdNameAddress).Replace("%NN%", ProductionProcess.ToString("00"));
redUtil.man.setRSV(redisHash, Name);
}
public static void WriteProductionRepsTarget(uint ProductionProcess, string RepsTarget)
{
string redisHash = redUtil.man.redHash(redisRepsTargetAddress).Replace("%NN%", ProductionProcess.ToString("00"));
redUtil.man.setRSV(redisHash, RepsTarget);
}
public static void WriteProductionRepsDone(uint ProductionProcess, string RepsDone)
{
string redisHash = redUtil.man.redHash(redisRepsDoneAddress).Replace("%NN%", ProductionProcess.ToString("00"));
redUtil.man.setRSV(redisHash, RepsDone);
}
public static bool WriteAlarmsConfigCurr(Dictionary<string,string> alarms)
{
string redisHash = redUtil.man.redHash(redisAlmCurr);
return redUtil.man.redSaveHashDict(redisHash, alarms);
}
public static bool WriteAlarmsConfigEn(Dictionary<string, string> alarms)
{
string redisHash = redUtil.man.redHash(redisAlmEn);
return redUtil.man.redSaveHashDict(redisHash, alarms);
}
public static bool WriteAlarmsConfigIt(Dictionary<string, string> alarms)
{
string redisHash = redUtil.man.redHash(redisAlmIt);
return redUtil.man.redSaveHashDict(redisHash, alarms);
}
}
}
@@ -176,10 +176,10 @@ namespace Termo.Active.Database.Controllers
return tmpUser
.Select(x => new DTOMessageUserModel() // Return DTOUserModel
{
Id = x.Users.UserId,
FirstName = x.Users.FirstName,
LastName = x.Users.LastName,
{
Id = x.Users.UserId,
FirstName = x.Users.FirstName,
LastName = x.Users.LastName,
Username = x.Users.Username
})
.GroupBy(elem => elem.Id).Select(group => group.First())
@@ -235,7 +235,7 @@ namespace Termo.Active.Database.Controllers
{
UserModel user = FindById(userId);
if (user != null)
{
{
user.Password = Crypto.HashPassword(userData.newPassword);
dbCtx.SaveChanges();
}
@@ -243,16 +243,16 @@ namespace Termo.Active.Database.Controllers
return GetUserInfo(userId);
}
public bool isCMSRole(int roleId)
{
var tmpRole = dbCtx.Roles
.ToList()
.First(X => X.RoleId == roleId);
if (tmpRole == null)
return true;
else
return tmpRole.Level >= MIN_CMS_ROLE;
public bool isCMSRole(int roleId)
{
var tmpRole = dbCtx.Roles
.ToList()
.First(X => X.RoleId == roleId);
if (tmpRole == null)
return true;
else
return tmpRole.Level >= MIN_CMS_ROLE;
}
public DTOUserModel UpdateUserRole(int userId, int roleId)
@@ -265,11 +265,11 @@ namespace Termo.Active.Database.Controllers
return GetUserInfo(userId);
}
public void DeleteUser(UserModel user)
{
user.Deleted = true;
dbCtx.SaveChanges();
public void DeleteUser(UserModel user)
{
user.Deleted = true;
dbCtx.SaveChanges();
}
#endregion User Manager
@@ -43,20 +43,20 @@ namespace Termo.Active.Database.Migrations
new FunctionAccessModel() { Name = AXES_SELECTION, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 7},
new FunctionAccessModel() { Name = TOOL_MANAGER, Area = TOOLING_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 8},
new FunctionAccessModel() { Name = MAINTENANCE, Area = MAINTENANCE_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 9},
// Main Areas
new FunctionAccessModel() { Name = "productionArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "toolingArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "reportArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "alarmsArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "maintenanceArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "scadaArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "usersArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "jobeditorArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "utilitiesArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 }
new FunctionAccessModel() { Name = MAINTENANCE, Area = MAINTENANCE_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 9},
// Main Areas
new FunctionAccessModel() { Name = "productionArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "toolingArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "reportArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "alarmsArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "maintenanceArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "scadaArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "usersArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "jobeditorArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 },
new FunctionAccessModel() { Name = "utilitiesArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 }
);
context.SaveChanges();
File diff suppressed because it is too large Load Diff
@@ -7,8 +7,8 @@
<ProjectGuid>{357D5EE1-FFC8-489B-9232-22CF474D9A6F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Termo.Active.Database</RootNamespace>
<AssemblyName>Termo.Active.Database</AssemblyName>
<RootNamespace>Thermo.Active.Database</RootNamespace>
<AssemblyName>Thermo.Active.Database</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
@@ -139,17 +139,17 @@
<Compile Include="Redis\redUtil.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Step.Config\Termo.Active.Config.csproj">
<ProjectReference Include="..\Thermo.Active.Config\Thermo.Active.Config.csproj">
<Project>{3f5c2483-fc87-43ef-92a8-66ff7d0e440f}</Project>
<Name>Termo.Active.Config</Name>
<Name>Thermo.Active.Config</Name>
</ProjectReference>
<ProjectReference Include="..\Step.Model\Termo.Active.Model.csproj">
<ProjectReference Include="..\Thermo.Active.Model\Thermo.Active.Model.csproj">
<Project>{631375dd-06d3-49bb-8130-d9ddb34c429d}</Project>
<Name>Termo.Active.Model</Name>
<Name>Thermo.Active.Model</Name>
</ProjectReference>
<ProjectReference Include="..\Step.Utils\Termo.Active.Utils.csproj">
<ProjectReference Include="..\Thermo.Active.Utils\Thermo.Active.Utils.csproj">
<Project>{cbeb631b-abfa-4042-9779-c0060b0dfefe}</Project>
<Name>Termo.Active.Utils</Name>
<Name>Thermo.Active.Utils</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.2.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net461" />
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net461" />
<package id="MySql.Data" version="6.10.4" targetFramework="net462" />
<package id="MySql.Data.Entity" version="6.9.10" targetFramework="net462" />
<package id="NLog" version="4.5.11" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="1.0.7" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.519" targetFramework="net462" />
<package id="System.Buffers" version="4.4.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.5.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.5.1" targetFramework="net462" />
<package id="System.Memory" version="4.5.1" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="4.5.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net462" />
<package id="System.Web.Helpers.Crypto" version="3.2.3" targetFramework="net462" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.2.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net461" />
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net461" />
<package id="MySql.Data" version="6.10.4" targetFramework="net462" />
<package id="MySql.Data.Entity" version="6.9.10" targetFramework="net462" />
<package id="NLog" version="4.5.11" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="1.0.7" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.519" targetFramework="net462" />
<package id="System.Buffers" version="4.4.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.5.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.5.1" targetFramework="net462" />
<package id="System.Memory" version="4.5.1" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="4.5.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net462" />
<package id="System.Web.Helpers.Crypto" version="3.2.3" targetFramework="net462" />
</packages>

Some files were not shown because too many files have changed in this diff Show More