Skip to content

Commit

Permalink
Pushed up version numbers and removed the "|| true" from the #if (!DE…
Browse files Browse the repository at this point in the history 
…BUG) check
  • Loading branch information
Luca Auer authored and Luca Auer committed May 31, 2018
1 parent 2026c47 commit 9940f2f
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 23 deletions.
98 changes: 80 additions & 18 deletions Image Sort Installer/Image Sort Installer.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@
}
"Entry"
{
"MsmKey" = "8:_3DAFB9AA01507CF132A2916A49A6E64A"
"OwnerKey" = "8:_C6AAD1D1C1414E83A48D3F35430D284A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_3DAFB9AA01507CF132A2916A49A6E64A"
"OwnerKey" = "8:_350CACAB9B62D927C86FBC886EA8D7BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_88DB843D0A646F85242224660E01637F"
"OwnerKey" = "8:_332A5541F409A29049E46D6884C27855"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -124,13 +136,13 @@
"Entry"
{
"MsmKey" = "8:_FCAB67E3AC08A938212CA3E8DEE794FB"
"OwnerKey" = "8:_C6AAD1D1C1414E83A48D3F35430D284A"
"OwnerKey" = "8:_28C763FB24B68A13C3DE2B306D9AC4D8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_FCAB67E3AC08A938212CA3E8DEE794FB"
"OwnerKey" = "8:_28C763FB24B68A13C3DE2B306D9AC4D8"
"OwnerKey" = "8:_C6AAD1D1C1414E83A48D3F35430D284A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand All @@ -142,31 +154,31 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_A06178DD3F86E177AEFC5810CFA6B176"
"OwnerKey" = "8:_B17F75D244A9307FC0EF855F6A8AF948"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_3DAFB9AA01507CF132A2916A49A6E64A"
"OwnerKey" = "8:_CE1C16F719FBCCEED6D1B696DDFB8A56"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_0BE504D09B5F4B1B9CABC07FA2E67343"
"OwnerKey" = "8:_28C763FB24B68A13C3DE2B306D9AC4D8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_88DB843D0A646F85242224660E01637F"
"OwnerKey" = "8:_382FC0B4BDB9D61C22F507C8E5C5285A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_332A5541F409A29049E46D6884C27855"
"OwnerKey" = "8:_FCAB67E3AC08A938212CA3E8DEE794FB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand All @@ -178,31 +190,31 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_FCAB67E3AC08A938212CA3E8DEE794FB"
"OwnerKey" = "8:_332A5541F409A29049E46D6884C27855"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_382FC0B4BDB9D61C22F507C8E5C5285A"
"OwnerKey" = "8:_88DB843D0A646F85242224660E01637F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_28C763FB24B68A13C3DE2B306D9AC4D8"
"OwnerKey" = "8:_0BE504D09B5F4B1B9CABC07FA2E67343"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_CE1C16F719FBCCEED6D1B696DDFB8A56"
"OwnerKey" = "8:_3DAFB9AA01507CF132A2916A49A6E64A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_B17F75D244A9307FC0EF855F6A8AF948"
"OwnerKey" = "8:_A06178DD3F86E177AEFC5810CFA6B176"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand Down Expand Up @@ -307,6 +319,11 @@
"AssemblyAsmDisplayName" = "8:MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_28C763FB24B68A13C3DE2B306D9AC4D8"
{
"Name" = "8:MahApps.Metro.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:MahApps.Metro.dll"
"TargetName" = "8:"
Expand All @@ -333,6 +350,11 @@
"AssemblyAsmDisplayName" = "8:Image sort.Logic, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_332A5541F409A29049E46D6884C27855"
{
"Name" = "8:Image sort.Logic.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Image sort.Logic.dll"
"TargetName" = "8:"
Expand All @@ -356,9 +378,14 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Image sort.Update, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:Image sort.Update, Version=1.13.2.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_350CACAB9B62D927C86FBC886EA8D7BC"
{
"Name" = "8:Image sort.Update.exe"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Image sort.Update.exe"
"TargetName" = "8:"
Expand All @@ -385,6 +412,11 @@
"AssemblyAsmDisplayName" = "8:ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_382FC0B4BDB9D61C22F507C8E5C5285A"
{
"Name" = "8:ControlzEx.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:ControlzEx.dll"
"TargetName" = "8:"
Expand All @@ -411,6 +443,11 @@
"AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_3DAFB9AA01507CF132A2916A49A6E64A"
{
"Name" = "8:Newtonsoft.Json.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Newtonsoft.Json.dll"
"TargetName" = "8:"
Expand All @@ -437,6 +474,11 @@
"AssemblyAsmDisplayName" = "8:Image sort.UI.Dialogs, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_88DB843D0A646F85242224660E01637F"
{
"Name" = "8:Image sort.UI.Dialogs.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Image sort.UI.Dialogs.dll"
"TargetName" = "8:"
Expand All @@ -463,6 +505,11 @@
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ScatterAssemblies"
{
"_A06178DD3F86E177AEFC5810CFA6B176"
{
"Name" = "8:System.Net.Http.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Net.Http.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -509,6 +556,11 @@
"AssemblyAsmDisplayName" = "8:Markdig.Wpf, Version=0.2.4.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_B17F75D244A9307FC0EF855F6A8AF948"
{
"Name" = "8:Markdig.Wpf.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Markdig.Wpf.dll"
"TargetName" = "8:"
Expand All @@ -535,6 +587,11 @@
"AssemblyAsmDisplayName" = "8:Markdig, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_CE1C16F719FBCCEED6D1B696DDFB8A56"
{
"Name" = "8:Markdig.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Markdig.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -581,6 +638,11 @@
"AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_FCAB67E3AC08A938212CA3E8DEE794FB"
{
"Name" = "8:System.Windows.Interactivity.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Windows.Interactivity.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -656,15 +718,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Image Sort"
"ProductCode" = "8:{19133B4B-075B-4C53-8335-338EB59D9526}"
"PackageCode" = "8:{0C39E217-E25B-46EE-8034-B54875EE4919}"
"ProductCode" = "8:{845273E1-33AB-47F2-9E27-59A47D3BA5D8}"
"PackageCode" = "8:{8C323E00-2177-49A4-9491-87B47BCEF057}"
"UpgradeCode" = "8:{1AC9D063-74DA-4D56-BA4A-C7F4216CFAF3}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.13.2"
"ProductVersion" = "8:1.13.3"
"Manufacturer" = "8:Lolle2000la"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down Expand Up @@ -1380,7 +1442,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0BE504D09B5F4B1B9CABC07FA2E67343"
{
"SourcePath" = "8:..\\Image sort.Update\\obj\\Release\\Image sort.Update.exe"
"SourcePath" = "8:..\\Image sort.Update\\obj\\Debug\\Image sort.Update.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4FE78034DF8844EF8FA37D4422726931"
Expand Down Expand Up @@ -1436,7 +1498,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C6AAD1D1C1414E83A48D3F35430D284A"
{
"SourcePath" = "8:..\\Image sort.UI\\obj\\Release\\Image sort.UI.exe"
"SourcePath" = "8:..\\Image sort.UI\\obj\\Debug\\Image sort.UI.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4FE78034DF8844EF8FA37D4422726931"
Expand Down
4 changes: 2 additions & 2 deletions Image sort.UI/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.13.2.0")]
[assembly: AssemblyFileVersion("1.13.2.0")]
[assembly: AssemblyVersion("1.13.3.0")]
[assembly: AssemblyFileVersion("1.13.3.0")]
[assembly: NeutralResourcesLanguage("en-GB")]

2 changes: 1 addition & 1 deletion Image sort.Update/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Program
/// <param name="args"></param>
static void Main(string[] args)
{
#if (!DEBUG || true)
#if (!DEBUG)
// If the updater is already open once, don't open another instance/
// close this one right after start.
if (Process.GetProcessesByName("Image sort.Update").Count() > 1)
Expand Down
4 changes: 2 additions & 2 deletions Image sort.Update/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.13.2.0")]
[assembly: AssemblyFileVersion("1.13.2.0")]
[assembly: AssemblyVersion("1.13.3.0")]
[assembly: AssemblyFileVersion("1.13.3.0")]

0 comments on commit 9940f2f

Please sign in to comment.