Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix project options & setup

Browse Source
This commit is contained in:
Lucio Maranta
2019-04-10 17:22:55 +02:00
parent cef729a0ef
commit 8d6c1fd39a
10 changed files with 16178 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/Client.csproj
+4 -4
View File
@@ -51,7 +51,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\Step\bin\Client\x86\</OutputPath>
<OutputPath>..\Step\bin\Client_Debug\x86\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@@ -61,7 +61,7 @@
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<OutputPath>..\Step\bin\Client\x86\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -75,7 +75,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\Step\bin\Client\x64\</OutputPath>
<OutputPath>..\Step\bin\Client_Debug\x64\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
@@ -84,7 +84,7 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\Step\bin\Client_Release\x64\</OutputPath>
<OutputPath>..\Step\bin\Client\x64\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
Libs/CMS_CORE_Library.dll
BIN
View File
Binary file not shown.
Step.Model/Constants.cs
+9 -1
View File
@@ -141,6 +141,15 @@ namespace Step.Model
// Config File Names
public static readonly string BASE_PATH = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
#if DEBUG
public static readonly string CLIENT_PATH_64 = BASE_PATH + @"\Client_Debug\x64\" + CLIENT_EXE_NAME;
public static readonly string CLIENT_PATH_86 = BASE_PATH + @"\Client_Debug\x84\" + CLIENT_EXE_NAME;
public static string WEBSITE_DIRECTORY = Path.Combine(BASE_PATH, "..", "wwwroot");
#else
public static readonly string CLIENT_PATH_64 = BASE_PATH + @"\Client\" + CLIENT_EXE_NAME;
public static readonly string CLIENT_PATH_86 = BASE_PATH + @"\Client\" + CLIENT_EXE_NAME;
public static string WEBSITE_DIRECTORY = BASE_PATH + "\\view";
#endif
public const string CONFIG_DIRECTORY = "Config\\";
public const string RESOURCE_DIRECTORY = @"Step.Config.Config.";
public const string SERVER_CONFIG_SCHEMA_PATH = RESOURCE_DIRECTORY + @"serverConfigValidator.xsd";
@@ -170,7 +179,6 @@ namespace Step.Model
public const string MACROS_CONFIG_SCHEMA_PATH = RESOURCE_DIRECTORY + "macrosConfigValidator.xsd";
public const string MACROS_CONFIG_PATH = CONFIG_DIRECTORY + "macrosConfig.xml";
public static string WEBSITE_DIRECTORY = Path.Combine(BASE_PATH, "..", "wwwroot");
public static string LANGUAGE_PACK_DIRECTORY = BASE_PATH + "\\languages\\";
public static string LANGUAGE_SCHEMA_PATH = BASE_PATH + "\\LanguageValidator.xsd";
public static string CANDY_DUMMYFILE_PATH = BASE_PATH + "\\dll.dll";
Step.UI/ServerControlWindow.cs
+8 -8
View File
@@ -155,17 +155,17 @@ namespace Step.UI
MessageServices.Current.Publish(SEND_STOP_SERVER);
}
public static void StartCMSClient(string url)
public static void StartCMSClient(string url)
{
//Setup the Path Variable
String CMSClientPath = "";
string CMSClientPath = "";
if (!ClientIsRunning())
{
//Check if the system is 64/32 bit
if (Environment.Is64BitOperatingSystem && File.Exists(BASE_PATH + @"\Client\x64\" + CLIENT_EXE_NAME))
CMSClientPath = BASE_PATH + @"\Client\x64\" + CLIENT_EXE_NAME;
else if (File.Exists(BASE_PATH + @"\Client\x86\" + CLIENT_EXE_NAME))
CMSClientPath = BASE_PATH + @"\Client\x86\" + CLIENT_EXE_NAME;
// Check if the system is 64/32 bit
if (Environment.Is64BitOperatingSystem && File.Exists(CLIENT_PATH_64))
CMSClientPath = CLIENT_PATH_64;
else if (File.Exists(CLIENT_PATH_86))
CMSClientPath = CLIENT_PATH_86;
if (!String.IsNullOrEmpty(CMSClientPath))
Process.Start(CMSClientPath, url);
@@ -238,7 +238,7 @@ namespace Step.UI
{
// Show balloon with new status
StepNotifyIcon.ShowBalloonTip(1000, title, message, toolTipIcon);
TXTstatus.Text = "[" + DateTime.Now.ToString("T") + "] " + title;
TXTstatus.Text = "[" + DateTime.Now.ToString("T") + "] " + title;
});
}
Step.UI/Step.UI.csproj
+4 -1
View File
@@ -34,7 +34,10 @@
<ApplicationIcon>Resources\CMS_Icon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="CMS_CORE_Library, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null" />
<Reference Include="CMS_CORE_Library, Version=1.1.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Libs\CMS_CORE_Library.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
Step.sln
+2 -2
View File
@@ -117,8 +117,8 @@ Global
{66FA29DB-925A-402B-A4C7-D3D780FB1BC3}.Release|Any CPU.Build.0 = Release|Any CPU
{66FA29DB-925A-402B-A4C7-D3D780FB1BC3}.Release|x64.ActiveCfg = Release|x64
{66FA29DB-925A-402B-A4C7-D3D780FB1BC3}.Release|x64.Build.0 = Release|x64
{66FA29DB-925A-402B-A4C7-D3D780FB1BC3}.Release|x86.ActiveCfg = Release|x86
{66FA29DB-925A-402B-A4C7-D3D780FB1BC3}.Release|x86.Build.0 = Release|x86
{66FA29DB-925A-402B-A4C7-D3D780FB1BC3}.Release|x86.ActiveCfg = Release|Any CPU
{66FA29DB-925A-402B-A4C7-D3D780FB1BC3}.Release|x86.Build.0 = Release|Any CPU
{CBEB631B-ABFA-4042-9779-C0060B0DFEFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CBEB631B-ABFA-4042-9779-C0060B0DFEFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CBEB631B-ABFA-4042-9779-C0060B0DFEFE}.Debug|x64.ActiveCfg = Debug|Any CPU
Step/Provider/ApplicationOAuthProvider.cs
+4 -1
View File
@@ -7,6 +7,7 @@ using System.Security.Claims;
using static Step.Model.Constants;
using static Step.Config.ServerConfig;
using System.Linq;
using Microsoft.Owin.Security;
namespace Step.Provider
{
@@ -54,9 +55,11 @@ namespace Step.Provider
// Add machine id
identity.AddClaim(new Claim(MACHINE_ID_KEY, machineUser.MachineId.ToString()));
}
var tiket = new AuthenticationTicket(identity, null);
tiket.Properties.IsPersistent = true;
// Create Token with identity data
context.Validated(identity);
context.Validated(tiket);
await base.GrantResourceOwnerCredentials(context);
Step/SetupActiveConWIzard.iss → Step/SetupActive.iss
+22 -14
View File
@@ -1,5 +1,5 @@
;================================= 09-04-2019 =====
; CMS S.p.A. - HMI Division
; CMS S.p.A. - UX-HMI Office
;
; Setup for Active
; Inno Setup Compiler version 5.6.0
@@ -13,7 +13,12 @@
#define MySourcePath "C:\Workspace\CMS_STEP\Step\bin"
#define WwwRootPath "C:\Workspace\CMS_STEP\Step\wwwroot"
#define MyOtherAppPath "C:\CMS"
#define MyOtherAppPath "C:\CMS"
#define SinumerikPath1 "{pf}\Siemens\Sinumerik\HMIsl\siemens\sinumerik\hmi\autostart\"
#define SinumerikPath2 "C:\Siemens\Sinumerik\HMIsl\siemens\sinumerik\hmi\autostart\"
#define SinumerikPath3 "{pf}\Siemens\MotionControl\siemens\sinumerik\hmi\autostart\"
#define SinumerikAppName "Sinumerik HMI"
#define SinumerikAppExeName "run_hmi.exe"
[Setup]
AppName={#MyAppName}
@@ -24,13 +29,12 @@ AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName=C:\CMS\{#MyAppName}
DisableDirPage=true
DisableDirPage=false
DisableProgramGroupPage=yes
OutputBaseFilename=setup
Compression=lzma
SolidCompression=true
VersionInfoVersion={#MyAppVersion}
VersionInfoCompany={#MyAppPublisher}
VersionInfoDescription={#MyAppName}
@@ -40,7 +44,6 @@ VersionInfoCopyright={#MyAppPublisher}
;WizardSmallImageFile=C:\Programmi\Inno Setup 5\CMS.bmp
WindowVisible=false
; Setup installation type
[Types]
Name: custom; Description: Custom installation; Flags: iscustom
@@ -76,11 +79,12 @@ Name: startupicon; Description: {cm:CreateStartupIcon}; GroupDescription: {cm:Ad
Name: sinumerikicons; Description: {cm:CreateSinumerikIcons}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone; Components: Siemens
[Files]
Source: "C:\Workspace\CMS_STEP\Step\bin\Active.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#MySourcePath}\Active.exe"; DestDir: "{app}"; Flags: ignoreversion
; Path to exe resources (dll, xml, config)
Source: "{#MySourcePath}\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#MySourcePath}\*.xml"; DestDir: "{app}\"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#MySourcePath}\*.config"; DestDir: "{app}\"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#MySourcePath}\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#MySourcePath}\*.xml"; DestDir: "{app}"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#MySourcePath}\*.config"; DestDir: "{app}"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
; Configuration files
Source: "{#MySourcePath}\Config\*.xml"; DestDir: "{app}\Config\"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
; Osai Library
@@ -89,11 +93,15 @@ Source: "{#MySourcePath}\CndexLinkDotNet.dll"; DestDir: "{app}"; Flags: ignoreve
Source: "{#MySourcePath}\Language\*.*"; DestDir: "{app}\Language\"; Flags: ignoreversion; Components: Osai
Source: "{#MySourcePath}\languages\*.*"; DestDir: "{app}\languages\"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
; Client copy
Source: "{#MySourcePath}\Client\x64\*.*"; DestDir: "{app}\Client\x64"; Flags: recursesubdirs ignoreversion; Components: Demo Fanuc Osai Siemens
; WWWRoot
Source: "{#WwwRootPath}\*.*"; DestDir: "..\{app}\wwwroot"; Flags: recursesubdirs ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#MySourcePath}\Client\x64\*.*"; DestDir: "{app}\Client\"; Flags: recursesubdirs ignoreversion; Components: Demo Fanuc Osai Siemens
; WWWRoot Files
Source: "{#WwwRootPath}\favicon.ico"; DestDir: "{app}\view\"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#WwwRootPath}\index.html"; DestDir: "{app}\view\"; Flags: ignoreversion; Components: Demo Fanuc Osai Siemens
; WWWRoot Directories
Source: "{#WwwRootPath}\dist\*"; DestDir: "{app}\view\dist\"; Flags: recursesubdirs ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#WwwRootPath}\libs\*"; DestDir: "{app}\view\libs\"; Flags: recursesubdirs ignoreversion; Components: Demo Fanuc Osai Siemens
Source: "{#WwwRootPath}\assets\*"; DestDir: "{app}\view\assets\"; Flags: recursesubdirs ignoreversion; Components: Demo Fanuc Osai Siemens
[Icons]
Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
Step/Step.csproj
+16117 -118
View File
File diff suppressed because it is too large Load Diff
Step/Step.csproj.user
+8
View File
@@ -15,6 +15,14 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />
<ErrorReportUrlHistory />
<FallbackCulture>it-IT</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
<ProjectExtensions />
</Project>