mirror of
https://github.com/ckaczor/FeedCenter.git
synced 2026-01-13 17:22:48 -05:00
More installer migration
This commit is contained in:
@@ -179,7 +179,6 @@
|
|||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
<HintPath>..\packages\Microsoft.SqlServer.Compact.4.0.8854.1\lib\net40\System.Data.SqlServerCe.Entity.dll</HintPath>
|
<HintPath>..\packages\Microsoft.SqlServer.Compact.4.0.8854.1\lib\net40\System.Data.SqlServerCe.Entity.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Deployment" />
|
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.Web" />
|
<Reference Include="System.Web" />
|
||||||
<Reference Include="System.Windows.Forms" />
|
<Reference Include="System.Windows.Forms" />
|
||||||
@@ -188,6 +187,7 @@
|
|||||||
<Reference Include="System.Xaml">
|
<Reference Include="System.Xaml">
|
||||||
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
<Reference Include="PresentationFramework" />
|
<Reference Include="PresentationFramework" />
|
||||||
@@ -271,6 +271,8 @@
|
|||||||
<Compile Include="SplashWindow.xaml.cs">
|
<Compile Include="SplashWindow.xaml.cs">
|
||||||
<DependentUpon>SplashWindow.xaml</DependentUpon>
|
<DependentUpon>SplashWindow.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="Update\UpdateCheck.cs" />
|
||||||
|
<Compile Include="Update\VersionFile.cs" />
|
||||||
<Compile Include="VersionCheck.cs" />
|
<Compile Include="VersionCheck.cs" />
|
||||||
<Page Include="FeedErrorWindow.xaml">
|
<Page Include="FeedErrorWindow.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ using FeedCenter.Properties;
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Deployment.Application;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
@@ -17,6 +16,7 @@ using System.Windows.Controls;
|
|||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Interop;
|
using System.Windows.Interop;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
|
using FeedCenter.Update;
|
||||||
|
|
||||||
namespace FeedCenter
|
namespace FeedCenter
|
||||||
{
|
{
|
||||||
@@ -98,6 +98,10 @@ namespace FeedCenter
|
|||||||
// Initialize the feed display
|
// Initialize the feed display
|
||||||
InitializeFeed();
|
InitializeFeed();
|
||||||
|
|
||||||
|
// Check for update
|
||||||
|
if (UpdateCheck.UpdateAvailable)
|
||||||
|
newVersionLink.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
Tracer.WriteLine("MainForm creation finished");
|
Tracer.WriteLine("MainForm creation finished");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -539,11 +543,6 @@ namespace FeedCenter
|
|||||||
public Feed Feed;
|
public Feed Feed;
|
||||||
}
|
}
|
||||||
|
|
||||||
private class FeedReadWorkerOutput
|
|
||||||
{
|
|
||||||
public UpdateCheckInfo UpdateResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SetProgressMode(bool value, int feedCount)
|
private void SetProgressMode(bool value, int feedCount)
|
||||||
{
|
{
|
||||||
// Reset the progress bar if we need it
|
// Reset the progress bar if we need it
|
||||||
@@ -607,9 +606,6 @@ namespace FeedCenter
|
|||||||
|
|
||||||
private void HandleFeedReadWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
|
private void HandleFeedReadWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
|
||||||
{
|
{
|
||||||
// Get the state info
|
|
||||||
var workerOutput = (FeedReadWorkerOutput) e.Result;
|
|
||||||
|
|
||||||
// Reset the database to current settings
|
// Reset the database to current settings
|
||||||
ResetDatabase();
|
ResetDatabase();
|
||||||
|
|
||||||
@@ -625,10 +621,8 @@ namespace FeedCenter
|
|||||||
// Switch to normal mode
|
// Switch to normal mode
|
||||||
SetProgressMode(false, 0);
|
SetProgressMode(false, 0);
|
||||||
|
|
||||||
// Check for update information
|
// Check for update
|
||||||
var updateCheckInfo = workerOutput.UpdateResult;
|
if (UpdateCheck.UpdateAvailable)
|
||||||
|
|
||||||
if (updateCheckInfo != null && updateCheckInfo.UpdateAvailable)
|
|
||||||
newVersionLink.Visibility = Visibility.Visible;
|
newVersionLink.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
UpdateErrorLink();
|
UpdateErrorLink();
|
||||||
@@ -658,9 +652,6 @@ namespace FeedCenter
|
|||||||
// Get the input information
|
// Get the input information
|
||||||
var workerInput = (FeedReadWorkerInput) e.Argument;
|
var workerInput = (FeedReadWorkerInput) e.Argument;
|
||||||
|
|
||||||
// Create the output
|
|
||||||
var workerOutput = new FeedReadWorkerOutput();
|
|
||||||
|
|
||||||
// Setup for progress
|
// Setup for progress
|
||||||
var currentProgress = 0;
|
var currentProgress = 0;
|
||||||
|
|
||||||
@@ -696,22 +687,10 @@ namespace FeedCenter
|
|||||||
worker.ReportProgress(currentProgress);
|
worker.ReportProgress(currentProgress);
|
||||||
|
|
||||||
// See if we're due for a version check
|
// See if we're due for a version check
|
||||||
if (DateTime.Now - Settings.Default.LastVersionCheck >= Settings.Default.VersionCheckInterval && ApplicationDeployment.IsNetworkDeployed)
|
if (DateTime.Now - Settings.Default.LastVersionCheck >= Settings.Default.VersionCheckInterval)
|
||||||
{
|
|
||||||
UpdateCheckInfo updateCheckInfo = null;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
{
|
||||||
// Get the update information
|
// Get the update information
|
||||||
updateCheckInfo = ApplicationDeployment.CurrentDeployment.CheckForDetailedUpdate(false);
|
UpdateCheck.CheckForUpdate();
|
||||||
}
|
|
||||||
catch (Exception exception)
|
|
||||||
{
|
|
||||||
Tracer.WriteException(exception);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store the update information in the output
|
|
||||||
workerOutput.UpdateResult = updateCheckInfo;
|
|
||||||
|
|
||||||
// Update the last check time
|
// Update the last check time
|
||||||
Settings.Default.LastVersionCheck = DateTime.Now;
|
Settings.Default.LastVersionCheck = DateTime.Now;
|
||||||
@@ -723,9 +702,6 @@ namespace FeedCenter
|
|||||||
// Report progress
|
// Report progress
|
||||||
worker.ReportProgress(currentProgress);
|
worker.ReportProgress(currentProgress);
|
||||||
|
|
||||||
// Save the output
|
|
||||||
e.Result = workerOutput;
|
|
||||||
|
|
||||||
// Sleep for a little bit so the user can see the update
|
// Sleep for a little bit so the user can see the update
|
||||||
Thread.Sleep(Settings.Default.ProgressSleepInterval * 3);
|
Thread.Sleep(Settings.Default.ProgressSleepInterval * 3);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System.Deployment.Application;
|
using FeedCenter.Update;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
namespace FeedCenter.Options
|
namespace FeedCenter.Options
|
||||||
@@ -16,7 +16,7 @@ namespace FeedCenter.Options
|
|||||||
|
|
||||||
applicationNameLabel.Text = Properties.Resources.ApplicationDisplayName;
|
applicationNameLabel.Text = Properties.Resources.ApplicationDisplayName;
|
||||||
|
|
||||||
string version = (ApplicationDeployment.IsNetworkDeployed ? ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString() : "0");
|
string version = UpdateCheck.CurrentVersion.ToString();
|
||||||
versionLabel.Text = string.Format(Properties.Resources.Version, version);
|
versionLabel.Text = string.Format(Properties.Resources.Version, version);
|
||||||
|
|
||||||
companyLabel.Text = ((AssemblyCompanyAttribute) Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company;
|
companyLabel.Text = ((AssemblyCompanyAttribute) Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company;
|
||||||
|
|||||||
@@ -49,4 +49,4 @@ 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.*")]
|
[assembly: AssemblyVersion("0.2.*")]
|
||||||
|
|||||||
9
Application/Properties/Resources.Designer.cs
generated
9
Application/Properties/Resources.Designer.cs
generated
@@ -1279,6 +1279,15 @@ namespace FeedCenter.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Downloading update....
|
||||||
|
/// </summary>
|
||||||
|
public static string SplashDownloadingUpdate {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("SplashDownloadingUpdate", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Installing update....
|
/// Looks up a localized string similar to Installing update....
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -166,6 +166,9 @@
|
|||||||
<data name="SplashInstallingUpdate" xml:space="preserve">
|
<data name="SplashInstallingUpdate" xml:space="preserve">
|
||||||
<value>Installing update...</value>
|
<value>Installing update...</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="SplashDownloadingUpdate" xml:space="preserve">
|
||||||
|
<value>Downloading update...</value>
|
||||||
|
</data>
|
||||||
<data name="SplashMaintainingDatabase" xml:space="preserve">
|
<data name="SplashMaintainingDatabase" xml:space="preserve">
|
||||||
<value>Maintaining database...</value>
|
<value>Maintaining database...</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
18
Application/Properties/Settings.Designer.cs
generated
18
Application/Properties/Settings.Designer.cs
generated
@@ -272,5 +272,23 @@ namespace FeedCenter.Properties {
|
|||||||
this["MultipleLineDisplay"] = value;
|
this["MultipleLineDisplay"] = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||||
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
|
[global::System.Configuration.DefaultSettingValueAttribute("FeedCenterSetup.xml")]
|
||||||
|
public string VersionFile {
|
||||||
|
get {
|
||||||
|
return ((string)(this["VersionFile"]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||||
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
|
[global::System.Configuration.DefaultSettingValueAttribute("http://server/FeedCenter/")]
|
||||||
|
public string VersionLocation {
|
||||||
|
get {
|
||||||
|
return ((string)(this["VersionLocation"]));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,5 +65,11 @@
|
|||||||
<Setting Name="MultipleLineDisplay" Provider="Common.Settings.GenericSettingsProvider" Type="FeedCenter.Options.MultipleLineDisplay" Scope="User">
|
<Setting Name="MultipleLineDisplay" Provider="Common.Settings.GenericSettingsProvider" Type="FeedCenter.Options.MultipleLineDisplay" Scope="User">
|
||||||
<Value Profile="(Default)">Normal</Value>
|
<Value Profile="(Default)">Normal</Value>
|
||||||
</Setting>
|
</Setting>
|
||||||
|
<Setting Name="VersionFile" Type="System.String" Scope="Application">
|
||||||
|
<Value Profile="(Default)">FeedCenterSetup.xml</Value>
|
||||||
|
</Setting>
|
||||||
|
<Setting Name="VersionLocation" Type="System.String" Scope="Application">
|
||||||
|
<Value Profile="(Default)">http://server/FeedCenter/</Value>
|
||||||
|
</Setting>
|
||||||
</Settings>
|
</Settings>
|
||||||
</SettingsFile>
|
</SettingsFile>
|
||||||
@@ -1,12 +1,10 @@
|
|||||||
using Common.Debug;
|
using FeedCenter.Data;
|
||||||
using FeedCenter.Data;
|
|
||||||
using FeedCenter.Properties;
|
using FeedCenter.Properties;
|
||||||
|
using FeedCenter.Update;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Deployment.Application;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
|
|
||||||
namespace FeedCenter
|
namespace FeedCenter
|
||||||
@@ -51,7 +49,7 @@ namespace FeedCenter
|
|||||||
_dispatcher = Dispatcher.CurrentDispatcher;
|
_dispatcher = Dispatcher.CurrentDispatcher;
|
||||||
|
|
||||||
// Get the version to display
|
// Get the version to display
|
||||||
string version = (ApplicationDeployment.IsNetworkDeployed ? ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString() : "0");
|
string version = UpdateCheck.CurrentVersion.ToString();
|
||||||
|
|
||||||
// Show the version
|
// Show the version
|
||||||
lblVersion.Content = string.Format(Properties.Resources.Version, version);
|
lblVersion.Content = string.Format(Properties.Resources.Version, version);
|
||||||
@@ -183,16 +181,14 @@ namespace FeedCenter
|
|||||||
private void LoadProgressSteps()
|
private void LoadProgressSteps()
|
||||||
{
|
{
|
||||||
// Load the progress steps
|
// Load the progress steps
|
||||||
_progressSteps.Add(new ProgressStep(ProgressKey.Update, Properties.Resources.SplashCheckingForUpdate, CheckUpdate));
|
|
||||||
_progressSteps.Add(new ProgressStep(ProgressKey.Update, Properties.Resources.SplashInstallingUpdate, DownloadUpdate));
|
|
||||||
_progressSteps.Add(new ProgressStep(ProgressKey.Update, Properties.Resources.SplashRestarting, RestartAfterUpdate));
|
|
||||||
|
|
||||||
_progressSteps.Add(new ProgressStep(ProgressKey.DatabaseCreate, Properties.Resources.SplashCheckingForDatabase, CheckDatabase));
|
_progressSteps.Add(new ProgressStep(ProgressKey.DatabaseCreate, Properties.Resources.SplashCheckingForDatabase, CheckDatabase));
|
||||||
_progressSteps.Add(new ProgressStep(ProgressKey.DatabaseCreate, Properties.Resources.SplashCreatingDatabase, CreateDatabase));
|
_progressSteps.Add(new ProgressStep(ProgressKey.DatabaseCreate, Properties.Resources.SplashCreatingDatabase, CreateDatabase));
|
||||||
|
|
||||||
_progressSteps.Add(new ProgressStep(ProgressKey.DatabaseUpdate, Properties.Resources.SplashUpdatingDatabase, UpdateDatabase));
|
_progressSteps.Add(new ProgressStep(ProgressKey.DatabaseUpdate, Properties.Resources.SplashUpdatingDatabase, UpdateDatabase));
|
||||||
|
|
||||||
_progressSteps.Add(new ProgressStep(ProgressKey.DatabaseMaintenance, Properties.Resources.SplashMaintainingDatabase, MaintainDatabase));
|
_progressSteps.Add(new ProgressStep(ProgressKey.DatabaseMaintenance, Properties.Resources.SplashMaintainingDatabase, MaintainDatabase));
|
||||||
|
|
||||||
|
_progressSteps.Add(new ProgressStep(ProgressKey.Update, Properties.Resources.SplashCheckingForUpdate, CheckUpdate));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool CheckUpdate()
|
private static bool CheckUpdate()
|
||||||
@@ -201,47 +197,8 @@ namespace FeedCenter
|
|||||||
if (!Settings.Default.CheckVersionAtStartup)
|
if (!Settings.Default.CheckVersionAtStartup)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// If the application isn't install then skip
|
// Return if the check worked and an update is available
|
||||||
if (!ApplicationDeployment.IsNetworkDeployed)
|
return UpdateCheck.CheckForUpdate() && UpdateCheck.UpdateAvailable;
|
||||||
return false;
|
|
||||||
|
|
||||||
UpdateCheckInfo updateCheckInfo;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// Get detailed version information
|
|
||||||
updateCheckInfo = ApplicationDeployment.CurrentDeployment.CheckForDetailedUpdate(false);
|
|
||||||
}
|
|
||||||
catch (Exception exception)
|
|
||||||
{
|
|
||||||
// Log the exception
|
|
||||||
Tracer.WriteException(exception);
|
|
||||||
|
|
||||||
// No update at this time
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Return if an update is available
|
|
||||||
return updateCheckInfo.UpdateAvailable;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool DownloadUpdate()
|
|
||||||
{
|
|
||||||
// Download and installthe update
|
|
||||||
ApplicationDeployment.CurrentDeployment.Update();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool RestartAfterUpdate()
|
|
||||||
{
|
|
||||||
// We need to restart
|
|
||||||
((App) Application.Current).Restart = true;
|
|
||||||
|
|
||||||
// Cancel the worker
|
|
||||||
_backgroundWorker.CancelAsync();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool CheckDatabase()
|
private static bool CheckDatabase()
|
||||||
|
|||||||
64
Application/Update/UpdateCheck.cs
Normal file
64
Application/Update/UpdateCheck.cs
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
using FeedCenter.Properties;
|
||||||
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
|
using System.Net;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace FeedCenter.Update
|
||||||
|
{
|
||||||
|
public static class UpdateCheck
|
||||||
|
{
|
||||||
|
public static VersionFile VersionFile { get; private set; }
|
||||||
|
public static string LocalInstallFile { get; private set; }
|
||||||
|
|
||||||
|
public static bool UpdateAvailable { get; private set; }
|
||||||
|
|
||||||
|
public static Version CurrentVersion
|
||||||
|
{
|
||||||
|
get { return Assembly.GetExecutingAssembly().GetName().Version; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool CheckForUpdate()
|
||||||
|
{
|
||||||
|
VersionFile = VersionFile.Load();
|
||||||
|
|
||||||
|
if (VersionFile == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var serverVersion = VersionFile.Version;
|
||||||
|
var localVersion = CurrentVersion;
|
||||||
|
|
||||||
|
UpdateAvailable = serverVersion > localVersion;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static async Task<bool> DownloadUpdate()
|
||||||
|
{
|
||||||
|
if (VersionFile == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var remoteFile = Settings.Default.VersionLocation + VersionFile.InstallFile;
|
||||||
|
|
||||||
|
LocalInstallFile = Path.Combine(Path.GetTempPath(), VersionFile.InstallFile);
|
||||||
|
|
||||||
|
var webClient = new WebClient();
|
||||||
|
|
||||||
|
await webClient.DownloadFileTaskAsync(new Uri(remoteFile), LocalInstallFile);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static bool InstallUpdate()
|
||||||
|
{
|
||||||
|
if (VersionFile == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
Process.Start(LocalInstallFile, "/passive");
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
49
Application/Update/VersionFile.cs
Normal file
49
Application/Update/VersionFile.cs
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
using Common.Debug;
|
||||||
|
using FeedCenter.Properties;
|
||||||
|
using System;
|
||||||
|
using System.Xml.Linq;
|
||||||
|
|
||||||
|
namespace FeedCenter.Update
|
||||||
|
{
|
||||||
|
public class VersionFile
|
||||||
|
{
|
||||||
|
public Version Version { get; set; }
|
||||||
|
public string InstallFile { get; set; }
|
||||||
|
public DateTime InstallCreated { get; set; }
|
||||||
|
|
||||||
|
public static VersionFile Load()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var document = XDocument.Load(Settings.Default.VersionLocation + Settings.Default.VersionFile);
|
||||||
|
|
||||||
|
var versionInformationElement = document.Element("versionInformation");
|
||||||
|
|
||||||
|
if (versionInformationElement == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var versionElement = versionInformationElement.Element("version");
|
||||||
|
var installFileElement = versionInformationElement.Element("installFile");
|
||||||
|
var installCreatedElement = versionInformationElement.Element("installCreated");
|
||||||
|
|
||||||
|
if (versionElement == null || installFileElement == null || installCreatedElement == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var versionFile = new VersionFile
|
||||||
|
{
|
||||||
|
Version = Version.Parse(versionElement.Value),
|
||||||
|
InstallFile = installFileElement.Value,
|
||||||
|
InstallCreated = DateTime.Parse(installCreatedElement.Value)
|
||||||
|
};
|
||||||
|
|
||||||
|
return versionFile;
|
||||||
|
}
|
||||||
|
catch (Exception exception)
|
||||||
|
{
|
||||||
|
Tracer.WriteException(exception);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,44 +2,23 @@
|
|||||||
using FeedCenter.Properties;
|
using FeedCenter.Properties;
|
||||||
using System;
|
using System;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Deployment.Application;
|
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
using FeedCenter.Update;
|
||||||
using Application = System.Windows.Forms.Application;
|
using Application = System.Windows.Forms.Application;
|
||||||
|
|
||||||
namespace FeedCenter
|
namespace FeedCenter
|
||||||
{
|
{
|
||||||
internal static class VersionCheck
|
internal static class VersionCheck
|
||||||
{
|
{
|
||||||
public static void DisplayUpdateInformation(bool showIfCurrent)
|
public static async void DisplayUpdateInformation(bool showIfCurrent)
|
||||||
{
|
{
|
||||||
if (!ApplicationDeployment.IsNetworkDeployed)
|
UpdateCheck.CheckForUpdate();
|
||||||
return;
|
|
||||||
|
|
||||||
UpdateCheckInfo updateCheckInfo = null;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
updateCheckInfo = ApplicationDeployment.CurrentDeployment.CheckForDetailedUpdate(false);
|
|
||||||
}
|
|
||||||
catch (Exception exception)
|
|
||||||
{
|
|
||||||
Tracer.WriteException(exception);
|
|
||||||
}
|
|
||||||
|
|
||||||
DisplayUpdateInformation(updateCheckInfo, showIfCurrent);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void DisplayUpdateInformation(UpdateCheckInfo updateCheckInfo, bool showIfCurrent)
|
|
||||||
{
|
|
||||||
// If we didn't get any information then do nothing
|
|
||||||
if (updateCheckInfo == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Check for an update
|
// Check for an update
|
||||||
if (updateCheckInfo.UpdateAvailable)
|
if (UpdateCheck.UpdateAvailable)
|
||||||
{
|
{
|
||||||
// Load the version string from the server
|
// Load the version string from the server
|
||||||
Version serverVersion = updateCheckInfo.AvailableVersion;
|
Version serverVersion = UpdateCheck.VersionFile.Version;
|
||||||
|
|
||||||
// Format the check title
|
// Format the check title
|
||||||
string updateCheckTitle = string.Format(Resources.UpdateCheckTitle, Resources.ApplicationDisplayName);
|
string updateCheckTitle = string.Format(Resources.UpdateCheckTitle, Resources.ApplicationDisplayName);
|
||||||
@@ -52,7 +31,10 @@ namespace FeedCenter
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// Get the update
|
// Get the update
|
||||||
ApplicationDeployment.CurrentDeployment.Update();
|
await UpdateCheck.DownloadUpdate();
|
||||||
|
|
||||||
|
// Install the update
|
||||||
|
UpdateCheck.InstallUpdate();
|
||||||
|
|
||||||
// Set to restart
|
// Set to restart
|
||||||
((App) System.Windows.Application.Current).Restart = true;
|
((App) System.Windows.Application.Current).Restart = true;
|
||||||
@@ -101,18 +83,16 @@ namespace FeedCenter
|
|||||||
_backgroundWorker = null;
|
_backgroundWorker = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HandleBackgroundWorkerDoWork(object sender, DoWorkEventArgs e)
|
private static void HandleBackgroundWorkerDoWork(object sender, DoWorkEventArgs e)
|
||||||
{
|
{
|
||||||
// If the application isn't installed then do nothing
|
|
||||||
if (!ApplicationDeployment.IsNetworkDeployed)
|
|
||||||
return;
|
|
||||||
|
|
||||||
e.Result = null;
|
e.Result = null;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
UpdateCheck.CheckForUpdate();
|
||||||
|
|
||||||
// Get the update information and set it into the result
|
// Get the update information and set it into the result
|
||||||
e.Result = ApplicationDeployment.CurrentDeployment.CheckForDetailedUpdate(false);
|
e.Result = UpdateCheck.UpdateAvailable;
|
||||||
}
|
}
|
||||||
catch (Exception exception)
|
catch (Exception exception)
|
||||||
{
|
{
|
||||||
@@ -123,7 +103,7 @@ namespace FeedCenter
|
|||||||
private static void HandleBackgroundWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
|
private static void HandleBackgroundWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
|
||||||
{
|
{
|
||||||
// Display any update info
|
// Display any update info
|
||||||
DisplayUpdateInformation(e.Result as UpdateCheckInfo, false);
|
DisplayUpdateInformation(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -79,6 +79,12 @@
|
|||||||
<setting name="VersionCheckInterval" serializeAs="String">
|
<setting name="VersionCheckInterval" serializeAs="String">
|
||||||
<value>01:00:00</value>
|
<value>01:00:00</value>
|
||||||
</setting>
|
</setting>
|
||||||
|
<setting name="VersionFile" serializeAs="String">
|
||||||
|
<value>FeedCenterSetup.xml</value>
|
||||||
|
</setting>
|
||||||
|
<setting name="VersionLocation" serializeAs="String">
|
||||||
|
<value>http://server/FeedCenter/</value>
|
||||||
|
</setting>
|
||||||
</FeedCenter.Properties.Settings>
|
</FeedCenter.Properties.Settings>
|
||||||
</applicationSettings>
|
</applicationSettings>
|
||||||
<startup>
|
<startup>
|
||||||
|
|||||||
@@ -24,6 +24,10 @@
|
|||||||
<Compile Include="Bundle.wxs" />
|
<Compile Include="Bundle.wxs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<WixExtension Include="WixBalExtensionExt">
|
||||||
|
<HintPath>..\..\..\Public\WixBalExtensionExt\wixext\bin\Debug\WixBalExtensionExt.dll</HintPath>
|
||||||
|
<Name>WixBalExtensionExt</Name>
|
||||||
|
</WixExtension>
|
||||||
<WixExtension Include="WixNetFxExtension">
|
<WixExtension Include="WixNetFxExtension">
|
||||||
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
|
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
|
||||||
<Name>WixNetFxExtension</Name>
|
<Name>WixNetFxExtension</Name>
|
||||||
@@ -32,10 +36,6 @@
|
|||||||
<HintPath>..\..\WixFileVersionExtension\bin\Release\WixFileVersionExtension.dll</HintPath>
|
<HintPath>..\..\WixFileVersionExtension\bin\Release\WixFileVersionExtension.dll</HintPath>
|
||||||
<Name>WixFileVersionExtension</Name>
|
<Name>WixFileVersionExtension</Name>
|
||||||
</WixExtension>
|
</WixExtension>
|
||||||
<WixExtension Include="WixBalExtension">
|
|
||||||
<HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
|
|
||||||
<Name>WixBalExtension</Name>
|
|
||||||
</WixExtension>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Application\FeedCenter.csproj">
|
<ProjectReference Include="..\Application\FeedCenter.csproj">
|
||||||
@@ -57,7 +57,9 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(WixTargetsPath)" />
|
<Import Project="$(WixTargetsPath)" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>D:\Code\Personal\CreateInstallDescriptor\bin\Debug\CreateInstallDescriptor.exe !(TargetPath) $(TargetDir)\$(TargetName).xml</PostBuildEvent>
|
<PostBuildEvent>D:\Code\Personal\CreateInstallDescriptor\bin\Debug\CreateInstallDescriptor.exe !(TargetPath) $(TargetDir)\$(TargetName).xml
|
||||||
|
copy $(TargetDir)\$(TargetName).xml \\server\d\FeedCenter
|
||||||
|
copy $(TargetDir)\$(TargetName).exe \\server\d\FeedCenter</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!--
|
<!--
|
||||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||||
|
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
|
||||||
|
|
||||||
<?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?>
|
<?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?>
|
||||||
<?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?>
|
<?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?>
|
||||||
<?define ProductVersion="$(fileVersion.ProductVersion($(var.FeedCenter.TargetPath)))" ?>
|
<?define ProductVersion="$(fileVersion.ProductVersion($(var.FeedCenter.TargetPath)))" ?>
|
||||||
@@ -9,11 +11,14 @@
|
|||||||
Manufacturer="$(var.CompanyName)"
|
Manufacturer="$(var.CompanyName)"
|
||||||
UpgradeCode="5e5c13a5-635e-4310-a653-0f9760f46935">
|
UpgradeCode="5e5c13a5-635e-4310-a653-0f9760f46935">
|
||||||
|
|
||||||
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
|
<BootstrapperApplicationRef Id="WixExtendedBootstrapperApplication.HyperlinkLicense">
|
||||||
<bal:WixStandardBootstrapperApplication
|
<bal:WixExtendedBootstrapperApplication
|
||||||
LicenseUrl=""
|
LicenseUrl=""
|
||||||
SuppressOptionsUI="yes"
|
SuppressOptionsUI="yes"
|
||||||
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" />
|
ShowVersion="yes"
|
||||||
|
LaunchPassive="yes"
|
||||||
|
LaunchQuiet="yes"
|
||||||
|
LaunchTarget="[LocalAppDataFolder]$(var.ProductName)\FeedCenter.exe" />
|
||||||
</BootstrapperApplicationRef>
|
</BootstrapperApplicationRef>
|
||||||
|
|
||||||
<Chain>
|
<Chain>
|
||||||
|
|||||||
107
FeedCenter.sln
107
FeedCenter.sln
@@ -16,16 +16,32 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Bootstrapper", "Bootstrappe
|
|||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug - With Setup|Any CPU = Debug - With Setup|Any CPU
|
||||||
|
Debug - With Setup|Mixed Platforms = Debug - With Setup|Mixed Platforms
|
||||||
|
Debug - With Setup|x64 = Debug - With Setup|x64
|
||||||
|
Debug - With Setup|x86 = Debug - With Setup|x86
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
Debug|Mixed Platforms = Debug|Mixed Platforms
|
Debug|Mixed Platforms = Debug|Mixed Platforms
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
Debug|x86 = Debug|x86
|
Debug|x86 = Debug|x86
|
||||||
|
Release - With Setup|Any CPU = Release - With Setup|Any CPU
|
||||||
|
Release - With Setup|Mixed Platforms = Release - With Setup|Mixed Platforms
|
||||||
|
Release - With Setup|x64 = Release - With Setup|x64
|
||||||
|
Release - With Setup|x86 = Release - With Setup|x86
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
Release|Mixed Platforms = Release|Mixed Platforms
|
Release|Mixed Platforms = Release|Mixed Platforms
|
||||||
Release|x64 = Release|x64
|
Release|x64 = Release|x64
|
||||||
Release|x86 = Release|x86
|
Release|x86 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|x86
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|x64.ActiveCfg = Debug|x64
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|x64.Build.0 = Debug|x64
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|x86.ActiveCfg = Debug|x86
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug - With Setup|x86.Build.0 = Debug|x86
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
@@ -34,6 +50,13 @@ Global
|
|||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x64.Build.0 = Debug|x64
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x64.Build.0 = Debug|x64
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x86.ActiveCfg = Debug|x86
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x86.Build.0 = Debug|x86
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|Mixed Platforms.Build.0 = Release|x86
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|x64.ActiveCfg = Release|x86
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|x86.ActiveCfg = Release|x86
|
||||||
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release - With Setup|x86.Build.0 = Release|x86
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Any CPU.Build.0 = Release|Any CPU
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
@@ -41,6 +64,14 @@ Global
|
|||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x64.ActiveCfg = Release|x86
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x64.ActiveCfg = Release|x86
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x86.ActiveCfg = Release|x86
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x86.ActiveCfg = Release|x86
|
||||||
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x86.Build.0 = Release|x86
|
{BD3D12F2-DE23-4466-83B1-1EB617A877A4}.Release|x86.Build.0 = Release|x86
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug - With Setup|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug - With Setup|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|x86
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug - With Setup|x64.ActiveCfg = Debug|x64
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug - With Setup|x64.Build.0 = Debug|x64
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug - With Setup|x86.ActiveCfg = Debug|x86
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug - With Setup|x86.Build.0 = Debug|x86
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
@@ -49,6 +80,14 @@ Global
|
|||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x64.Build.0 = Debug|x64
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x64.Build.0 = Debug|x64
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x86.ActiveCfg = Debug|x86
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x86.Build.0 = Debug|x86
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release - With Setup|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release - With Setup|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release - With Setup|Mixed Platforms.Build.0 = Release|x86
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release - With Setup|x64.ActiveCfg = Release|x64
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release - With Setup|x64.Build.0 = Release|x64
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release - With Setup|x86.ActiveCfg = Release|x86
|
||||||
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release - With Setup|x86.Build.0 = Release|x86
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Any CPU.Build.0 = Release|Any CPU
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
@@ -57,6 +96,14 @@ Global
|
|||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x64.Build.0 = Release|x64
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x64.Build.0 = Release|x64
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x86.ActiveCfg = Release|x86
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x86.ActiveCfg = Release|x86
|
||||||
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x86.Build.0 = Release|x86
|
{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x86.Build.0 = Release|x86
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug - With Setup|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug - With Setup|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|x86
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug - With Setup|x64.ActiveCfg = Debug|x64
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug - With Setup|x64.Build.0 = Debug|x64
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug - With Setup|x86.ActiveCfg = Debug|x86
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug - With Setup|x86.Build.0 = Debug|x86
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
@@ -65,6 +112,14 @@ Global
|
|||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x64.Build.0 = Debug|x64
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x64.Build.0 = Debug|x64
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x86.ActiveCfg = Debug|x86
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x86.Build.0 = Debug|x86
|
{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release - With Setup|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release - With Setup|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release - With Setup|Mixed Platforms.Build.0 = Release|x86
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release - With Setup|x64.ActiveCfg = Release|x64
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release - With Setup|x64.Build.0 = Release|x64
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release - With Setup|x86.ActiveCfg = Release|x86
|
||||||
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release - With Setup|x86.Build.0 = Release|x86
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Release|Any CPU.Build.0 = Release|Any CPU
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
@@ -73,6 +128,14 @@ Global
|
|||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Release|x64.Build.0 = Release|x64
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release|x64.Build.0 = Release|x64
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Release|x86.ActiveCfg = Release|x86
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release|x86.ActiveCfg = Release|x86
|
||||||
{0074C983-550E-4094-9E8C-F566FB669297}.Release|x86.Build.0 = Release|x86
|
{0074C983-550E-4094-9E8C-F566FB669297}.Release|x86.Build.0 = Release|x86
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug - With Setup|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug - With Setup|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|x86
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug - With Setup|x64.ActiveCfg = Debug|x64
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug - With Setup|x64.Build.0 = Debug|x64
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug - With Setup|x86.ActiveCfg = Debug|x86
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug - With Setup|x86.Build.0 = Debug|x86
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
@@ -81,6 +144,14 @@ Global
|
|||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x64.Build.0 = Debug|x64
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x64.Build.0 = Debug|x64
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x86.ActiveCfg = Debug|x86
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x86.Build.0 = Debug|x86
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release - With Setup|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release - With Setup|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release - With Setup|Mixed Platforms.Build.0 = Release|x86
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release - With Setup|x64.ActiveCfg = Release|x64
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release - With Setup|x64.Build.0 = Release|x64
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release - With Setup|x86.ActiveCfg = Release|x86
|
||||||
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release - With Setup|x86.Build.0 = Release|x86
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|Any CPU.Build.0 = Release|Any CPU
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
@@ -89,31 +160,55 @@ Global
|
|||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x64.Build.0 = Release|x64
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x64.Build.0 = Release|x64
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x86.ActiveCfg = Release|x86
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x86.ActiveCfg = Release|x86
|
||||||
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x86.Build.0 = Release|x86
|
{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x86.Build.0 = Release|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|Any CPU.ActiveCfg = Debug|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|Any CPU.Build.0 = Debug|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|x64.ActiveCfg = Debug|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|x64.Build.0 = Debug|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|x86.ActiveCfg = Debug|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug - With Setup|x86.Build.0 = Debug|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Any CPU.ActiveCfg = Debug|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Any CPU.Build.0 = Debug|x86
|
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x64.ActiveCfg = Debug|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x64.ActiveCfg = Debug|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x64.Build.0 = Debug|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x64.Build.0 = Debug|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x86.ActiveCfg = Debug|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x86.Build.0 = Debug|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|Any CPU.ActiveCfg = Release|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|Any CPU.Build.0 = Release|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|Mixed Platforms.Build.0 = Release|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|x64.ActiveCfg = Release|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|x86.ActiveCfg = Release|x86
|
||||||
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release - With Setup|x86.Build.0 = Release|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Any CPU.ActiveCfg = Release|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Any CPU.ActiveCfg = Release|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|Mixed Platforms.Build.0 = Release|x86
|
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x64.ActiveCfg = Release|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x64.ActiveCfg = Release|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x86.ActiveCfg = Release|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x86.ActiveCfg = Release|x86
|
||||||
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x86.Build.0 = Release|x86
|
{DFB3FE30-18EA-4216-8D92-11DF9C8D50F1}.Release|x86.Build.0 = Release|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|Any CPU.ActiveCfg = Debug|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|Any CPU.Build.0 = Debug|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|Mixed Platforms.Build.0 = Debug|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|x64.ActiveCfg = Debug|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|x64.Build.0 = Debug|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|x86.ActiveCfg = Debug|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug - With Setup|x86.Build.0 = Debug|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Any CPU.ActiveCfg = Debug|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Any CPU.Build.0 = Debug|x86
|
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x64.ActiveCfg = Debug|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x64.ActiveCfg = Debug|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x64.Build.0 = Debug|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x64.Build.0 = Debug|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x86.ActiveCfg = Debug|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x86.Build.0 = Debug|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|Any CPU.ActiveCfg = Release|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|Any CPU.Build.0 = Release|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|Mixed Platforms.Build.0 = Release|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|x64.ActiveCfg = Release|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|x86.ActiveCfg = Release|x86
|
||||||
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release - With Setup|x86.Build.0 = Release|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Any CPU.ActiveCfg = Release|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Any CPU.ActiveCfg = Release|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|Mixed Platforms.Build.0 = Release|x86
|
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x64.ActiveCfg = Release|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x64.ActiveCfg = Release|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x86.ActiveCfg = Release|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x86.ActiveCfg = Release|x86
|
||||||
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x86.Build.0 = Release|x86
|
{5E5C13A5-635E-4310-A653-0F9760F46935}.Release|x86.Build.0 = Release|x86
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||||
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
|
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
|
||||||
|
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||||
<?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?>
|
<?define ProductName="$(fileVersion.ProductName($(var.FeedCenter.TargetPath)))" ?>
|
||||||
<?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?>
|
<?define CompanyName="$(fileVersion.CompanyName($(var.FeedCenter.TargetPath)))" ?>
|
||||||
<?define ProductVersion="$(fileVersion.ProductVersion($(var.FeedCenter.TargetPath)))" ?>
|
<?define ProductVersion="$(fileVersion.ProductVersion($(var.FeedCenter.TargetPath)))" ?>
|
||||||
@@ -11,11 +12,19 @@
|
|||||||
Version="$(var.ProductVersion)"
|
Version="$(var.ProductVersion)"
|
||||||
Manufacturer="$(var.CompanyName)"
|
Manufacturer="$(var.CompanyName)"
|
||||||
UpgradeCode="47f30e4a-a861-47ac-b82d-35e4b886992a">
|
UpgradeCode="47f30e4a-a861-47ac-b82d-35e4b886992a">
|
||||||
<Package InstallerVersion="200"
|
<Package InstallerVersion="405"
|
||||||
Compressed="yes"
|
Compressed="yes"
|
||||||
InstallScope="perUser" />
|
InstallScope="perUser" />
|
||||||
|
|
||||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
<util:CloseApplication Id="CloseApplication"
|
||||||
|
Target="FeedCenter.exe"
|
||||||
|
CloseMessage="yes"
|
||||||
|
Timeout="5" />
|
||||||
|
|
||||||
|
<MajorUpgrade Schedule="afterInstallValidate"
|
||||||
|
AllowDowngrades="no"
|
||||||
|
AllowSameVersionUpgrades="no"
|
||||||
|
DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||||
|
|
||||||
<MediaTemplate />
|
<MediaTemplate />
|
||||||
|
|
||||||
@@ -132,7 +141,8 @@
|
|||||||
<File Source="$(var.FeedCenter.TargetDir)\System.Data.SqlServerCe.Entity.dll" />
|
<File Source="$(var.FeedCenter.TargetDir)\System.Data.SqlServerCe.Entity.dll" />
|
||||||
|
|
||||||
<File Source="$(var.FeedCenter.TargetPath).config" />
|
<File Source="$(var.FeedCenter.TargetPath).config" />
|
||||||
<File Source="$(var.FeedCenter.TargetPath)" />
|
<File Id="FeedCenter.exe"
|
||||||
|
Source="$(var.FeedCenter.TargetPath)" />
|
||||||
|
|
||||||
<RemoveFolder Id='INSTALLFOLDER'
|
<RemoveFolder Id='INSTALLFOLDER'
|
||||||
On='uninstall' />
|
On='uninstall' />
|
||||||
|
|||||||
@@ -26,6 +26,10 @@
|
|||||||
<Compile Include="Product.wxs" />
|
<Compile Include="Product.wxs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<WixExtension Include="WixUtilExtension">
|
||||||
|
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
|
||||||
|
<Name>WixUtilExtension</Name>
|
||||||
|
</WixExtension>
|
||||||
<WixExtension Include="WixNetFxExtension">
|
<WixExtension Include="WixNetFxExtension">
|
||||||
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
|
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
|
||||||
<Name>WixNetFxExtension</Name>
|
<Name>WixNetFxExtension</Name>
|
||||||
|
|||||||
Reference in New Issue
Block a user