Create ability to launch connecting to use using 'test' launch param
This commit is contained in:
@@ -11,6 +11,8 @@ Global
|
|||||||
Debug|x86 = Debug|x86
|
Debug|x86 = Debug|x86
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
Release|x86 = Release|x86
|
Release|x86 = Release|x86
|
||||||
|
Test|Any CPU = Test|Any CPU
|
||||||
|
Test|x86 = Test|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{76B98E9B-A33A-464F-A07B-56E773376543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{76B98E9B-A33A-464F-A07B-56E773376543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
@@ -21,6 +23,10 @@ Global
|
|||||||
{76B98E9B-A33A-464F-A07B-56E773376543}.Release|Any CPU.Build.0 = Release|Any CPU
|
{76B98E9B-A33A-464F-A07B-56E773376543}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{76B98E9B-A33A-464F-A07B-56E773376543}.Release|x86.ActiveCfg = Release|x86
|
{76B98E9B-A33A-464F-A07B-56E773376543}.Release|x86.ActiveCfg = Release|x86
|
||||||
{76B98E9B-A33A-464F-A07B-56E773376543}.Release|x86.Build.0 = Release|x86
|
{76B98E9B-A33A-464F-A07B-56E773376543}.Release|x86.Build.0 = Release|x86
|
||||||
|
{76B98E9B-A33A-464F-A07B-56E773376543}.Test|Any CPU.ActiveCfg = Test|Any CPU
|
||||||
|
{76B98E9B-A33A-464F-A07B-56E773376543}.Test|Any CPU.Build.0 = Test|Any CPU
|
||||||
|
{76B98E9B-A33A-464F-A07B-56E773376543}.Test|x86.ActiveCfg = Test|x86
|
||||||
|
{76B98E9B-A33A-464F-A07B-56E773376543}.Test|x86.Build.0 = Test|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ namespace BodyshopPartner
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Set all of the constants
|
||||||
|
Utils.AppMetaData.CreateEndpoints();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -82,6 +82,27 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<StartupObject>BodyshopPartner.App</StartupObject>
|
<StartupObject>BodyshopPartner.App</StartupObject>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'">
|
||||||
|
<OutputPath>bin\Test\</OutputPath>
|
||||||
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<LangVersion>7.3</LangVersion>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<Prefer32Bit>true</Prefer32Bit>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|x86'">
|
||||||
|
<OutputPath>bin\x86\Test\</OutputPath>
|
||||||
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
|
<LangVersion>7.3</LangVersion>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>true</Prefer32Bit>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Interop.QBFC13, Version=13.0.0.23, Culture=neutral, PublicKeyToken=31d8aec643e18259">
|
<Reference Include="Interop.QBFC13, Version=13.0.0.23, Culture=neutral, PublicKeyToken=31d8aec643e18259">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ using System.Windows;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.0.17.0")]
|
[assembly: AssemblyVersion("1.0.18.0")]
|
||||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||||
//Setting Squirrel Aware Version.
|
//Setting Squirrel Aware Version.
|
||||||
[assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]
|
[assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]
|
||||||
@@ -28,4 +28,6 @@ AFC97D32A72155DDCDC9FA0C42E0E0309FD80E1A ImEXOnlinePartner-1.0.14-delta.nupkg 52
|
|||||||
8A9B92246C6518FE21644AADF548FDDD18548812 ImEXOnlinePartner-1.0.15-delta.nupkg 45479
|
8A9B92246C6518FE21644AADF548FDDD18548812 ImEXOnlinePartner-1.0.15-delta.nupkg 45479
|
||||||
08370231115AB8CBAF7F96F73096C76250BCB6DB ImEXOnlinePartner-1.0.15-full.nupkg 5148126
|
08370231115AB8CBAF7F96F73096C76250BCB6DB ImEXOnlinePartner-1.0.15-full.nupkg 5148126
|
||||||
8470C73928BF9AC9390CD45DA08B2BDD7A5568E5 ImEXOnlinePartner-1.0.16-delta.nupkg 50005
|
8470C73928BF9AC9390CD45DA08B2BDD7A5568E5 ImEXOnlinePartner-1.0.16-delta.nupkg 50005
|
||||||
05F6DD20D20E33AE9589E42397C63BBCACD428B0 ImEXOnlinePartner-1.0.16-full.nupkg 5149052
|
05F6DD20D20E33AE9589E42397C63BBCACD428B0 ImEXOnlinePartner-1.0.16-full.nupkg 5149052
|
||||||
|
6E1FF9DBDACF7FCD499CA8CCA8B6252208878A9B ImEXOnlinePartner-1.0.17-delta.nupkg 50415
|
||||||
|
A9081BA70BD2247EB20FC11BC55506C92873323B ImEXOnlinePartner-1.0.17-full.nupkg 5152981
|
||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows;
|
||||||
|
|
||||||
namespace BodyshopPartner.Utils
|
namespace BodyshopPartner.Utils
|
||||||
{
|
{
|
||||||
@@ -12,14 +13,52 @@ namespace BodyshopPartner.Utils
|
|||||||
public static string ActiveShopId = Properties.Settings.Default.LastSelectedShop;
|
public static string ActiveShopId = Properties.Settings.Default.LastSelectedShop;
|
||||||
public static string ShopRegion = "";
|
public static string ShopRegion = "";
|
||||||
public static dynamic CiecaOpCodes;
|
public static dynamic CiecaOpCodes;
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
public static string graphQlEndpoint;
|
||||||
|
public static string FirebaseAPIKey;
|
||||||
|
public static Boolean IsTest = false;
|
||||||
|
public static void CreateEndpoints()
|
||||||
|
{
|
||||||
|
logger.Debug("Creating endpoints for graphql.");
|
||||||
|
string[] args = Environment.GetCommandLineArgs();
|
||||||
|
if (args.Length == 1)
|
||||||
|
{
|
||||||
|
#if DEBUG
|
||||||
|
graphQlEndpoint = "https://bodyshop-dev-db.herokuapp.com/v1/graphql";
|
||||||
|
FirebaseAPIKey = "AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc";
|
||||||
|
|
||||||
#if DEBUG
|
#elif TEST
|
||||||
public static string graphQlEndpoint = "https://bodyshop-dev-db.herokuapp.com/v1/graphql";
|
graphQlEndpoint = "https://db.test.bodyshop.app/v1/graphql";
|
||||||
public static string FirebaseAPIKey = "AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc";
|
FirebaseAPIKey = "AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c";
|
||||||
|
|
||||||
#else
|
#else
|
||||||
public static string graphQlEndpoint = "https://db.imex.online/v1/graphql";
|
graphQlEndpoint = "https://db.imex.online/v1/graphql";
|
||||||
public static string FirebaseAPIKey = "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU";
|
FirebaseAPIKey = "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU";
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (args[1] == "test")
|
||||||
|
{
|
||||||
|
IsTest = true;
|
||||||
|
|
||||||
|
graphQlEndpoint = "https://db.test.bodyshop.app/v1/graphql";
|
||||||
|
FirebaseAPIKey = "AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
#if DEBUG
|
||||||
|
graphQlEndpoint = "https://bodyshop-dev-db.herokuapp.com/v1/graphql";
|
||||||
|
FirebaseAPIKey = "AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc";
|
||||||
|
#else
|
||||||
|
graphQlEndpoint = "https://db.imex.online/v1/graphql";
|
||||||
|
FirebaseAPIKey = "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU";
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ namespace BodyshopPartner.ViewModels
|
|||||||
set { SetProperty(ref _error, value); }
|
set { SetProperty(ref _error, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private string _errorMsg;
|
private string _errorMsg;
|
||||||
public string ErrorMsg
|
public string ErrorMsg
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,6 +15,13 @@ namespace BodyshopPartner.ViewModels
|
|||||||
public GrowlNotification Growler;
|
public GrowlNotification Growler;
|
||||||
private System.Timers.Timer _updateCheckTimer = new System.Timers.Timer(60 * 1000 * 60);
|
private System.Timers.Timer _updateCheckTimer = new System.Timers.Timer(60 * 1000 * 60);
|
||||||
|
|
||||||
|
private bool _testMode = Utils.AppMetaData.IsTest; // Set upon app init.
|
||||||
|
public bool TestMode
|
||||||
|
{
|
||||||
|
get { return _testMode; }
|
||||||
|
set { SetProperty(ref _testMode, value); }
|
||||||
|
}
|
||||||
|
|
||||||
private ObservableCollection<Monitor> _monitoringPaths = new ObservableCollection<Monitor>();
|
private ObservableCollection<Monitor> _monitoringPaths = new ObservableCollection<Monitor>();
|
||||||
public ObservableCollection<Monitor> MonitoringPaths
|
public ObservableCollection<Monitor> MonitoringPaths
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -172,6 +172,11 @@
|
|||||||
<ProgressBar Margin="8"
|
<ProgressBar Margin="8"
|
||||||
Value="{Binding UpdateProgress}" />
|
Value="{Binding UpdateProgress}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<Label DockPanel.Dock="Top"
|
||||||
|
Margin="8"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
Content="CONNECTED TO TEST"
|
||||||
|
Visibility="{Binding TestMode, Converter={StaticResource BooleanToVisibilityConverter}}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
|
|||||||
Reference in New Issue
Block a user