diff options
3 files changed, 35 insertions, 10 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs index 39d8c9b18..76d3b3fc3 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs @@ -142,7 +142,22 @@ namespace Tango.PPC.Publisher.UI _client = new PPCWebClient(); var settings = SettingsManager.Default.GetOrCreate<PublisherSettings>(); - Options = settings.Options; + var options = settings.Options; + + String vsPath = Path.GetFullPath(AppDomain.CurrentDomain.BaseDirectory + "..\\..\\..\\"); + + if (IsEureka) + { + options.InstallerProject = $@"{vsPath}\Advanced Installer Projects\Eureka Installer.aip"; + options.InstallerOutputFolder = $@"{vsPath}\Build\Installers\Eureka"; + } + else + { + options.InstallerProject = $@"{vsPath}\Visual_Studio\Advanced Installer Projects\PPC Installer.aip"; + options.InstallerOutputFolder = $@"{vsPath}\Build\Installers\PPC"; + } + + Options = options; _publisher = new PPCPublisher(Options); _publisher.IsEureka = IsEureka; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj index be3bce7d8..8eeaa1ad8 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj @@ -52,11 +52,21 @@ <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\Build\PPC\Debug\</OutputPath> + <OutputPath>..\..\Build\PPC\Eureka_Debug\</OutputPath> <DefineConstants>TRACE;Eureka</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Eureka_Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>..\..\Build\PPC\Eureka_Debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;Eureka</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> <ItemGroup> <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath> diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 674867a7c..2acf08f84 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -10353,8 +10353,8 @@ Global {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Debug|x64.Build.0 = Debug|Any CPU {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Debug|x86.ActiveCfg = Debug|Any CPU {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Debug|x86.Build.0 = Debug|Any CPU - {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Eureka_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Eureka_Debug|Any CPU.Build.0 = Debug|Any CPU + {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Eureka_Debug|Any CPU.ActiveCfg = Eureka_Debug|Any CPU + {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Eureka_Debug|Any CPU.Build.0 = Eureka_Debug|Any CPU {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Eureka_Debug|ARM.ActiveCfg = Debug|Any CPU {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Eureka_Debug|ARM.Build.0 = Debug|Any CPU {FABA6A2B-C7EA-4C58-A125-150FA5B4C72F}.Eureka_Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -21665,12 +21665,12 @@ Global {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_UseGlobalSettings = False - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs - BuildVersion_StartDate = 2000/1/1 - BuildVersion_UpdateFileVersion = False - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_UpdateFileVersion = False + BuildVersion_StartDate = 2000/1/1 + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_UseGlobalSettings = False EndGlobalSection EndGlobal |