Skip to content

Commit

Permalink
Updated AssemblyInfo; Few minor fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dshinevar
dshinevar committed Jul 13, 2018
1 parent 7b0af9e commit 128cc24
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 26 deletions.
3 changes: 2 additions & 1 deletion RemoteHandbrakeController/RemoteHandbrakeController/Globals.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static class Globals

public static readonly string LINUX_PLEX_PRESET = "/var/lib/handbrakecli/PlexHandbrake.json";
public static readonly string WINDOWS_PLEX_PRESET = @"E:\Libraries\Documents\Plex Presets\PlexHandbrake.json";
public static readonly string CONFIG_NAME = $@"{System.Environment.CurrentDirectory}\RemoteHandbrakeController_Config.xml";
public static readonly string CONFIG_NAME = $@"{Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)}\RemoteHandbrakeController\RemoteHandbrakeController_Config.xml";

/// <summary>
/// Saves config file through XML Serializer
Expand All @@ -24,6 +24,7 @@ public static bool SaveConfig(string strFile, XMLConfig xmlConfig)
try
{
XmlSerializer xs = new XmlSerializer(xmlConfig.GetType());
Directory.CreateDirectory($@"{Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)}\RemoteHandbrakeController");
StreamWriter writer = File.CreateText(strFile);
xs.Serialize(writer, xmlConfig);
writer.Flush();
Expand Down
5 changes: 4 additions & 1 deletion RemoteHandbrakeController/RemoteHandbrakeController/Pages/MediaSelectionPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ public MediaSelectionPage(XMLConfig config)
#region BUTTON_CLICKS
private void BtnLoad_Clicked(object sender, RoutedEventArgs e)
{
ListDirectory(treeFiles, (string)lstInputs.SelectedValue);
if (inputDirectories.Count > 0 && lstInputs.SelectedValue != null)
{
ListDirectory(treeFiles, (string)lstInputs.SelectedValue);
}
}

private void BtnAddLib_Clicked(object sender, RoutedEventArgs e)
Expand Down
4 changes: 2 additions & 2 deletions RemoteHandbrakeController/RemoteHandbrakeController/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,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.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
76 changes: 54 additions & 22 deletions ...keController/RemoteHandbrakeControllerInstaller/RemoteHandbrakeControllerInstaller.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,38 +27,38 @@
}
"Entry"
{
"MsmKey" = "8:_5612E9D951E357A32D10B45E1DDC6886"
"OwnerKey" = "8:_8004819848FF4C60B183BC08BF5804C4"
"MsmKey" = "8:_8004819848FF4C60B183BC08BF5804C4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8004819848FF4C60B183BC08BF5804C4"
"OwnerKey" = "8:_UNDEFINED"
"MsmKey" = "8:_BB7FDEB606ECFE05B813C7EF22DC3AEA"
"OwnerKey" = "8:_8004819848FF4C60B183BC08BF5804C4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_BB7FDEB606ECFE05B813C7EF22DC3AEA"
"MsmKey" = "8:_E0B5E9F0614A14E6C2B583FE7AD4657D"
"OwnerKey" = "8:_8004819848FF4C60B183BC08BF5804C4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_BB7FDEB606ECFE05B813C7EF22DC3AEA"
"OwnerKey" = "8:_8004819848FF4C60B183BC08BF5804C4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8004819848FF4C60B183BC08BF5804C4"
"OwnerKey" = "8:_E0B5E9F0614A14E6C2B583FE7AD4657D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5612E9D951E357A32D10B45E1DDC6886"
"OwnerKey" = "8:_BB7FDEB606ECFE05B813C7EF22DC3AEA"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand All @@ -79,6 +79,14 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
{
"Enabled" = "11:TRUE"
"PromptEnabled" = "11:TRUE"
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
}
}
"Release"
{
Expand All @@ -95,6 +103,22 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
{
"Enabled" = "11:TRUE"
"PromptEnabled" = "11:TRUE"
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
"Items"
{
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
{
"Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
"ProductCode" = "8:.NETFramework,Version=v4.6.1"
}
}
}
}
"Release with Installer"
{
Expand All @@ -111,6 +135,14 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
{
"Enabled" = "11:TRUE"
"PromptEnabled" = "11:TRUE"
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
}
}
}
"Deployable"
Expand Down Expand Up @@ -180,20 +212,20 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5612E9D951E357A32D10B45E1DDC6886"
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BB7FDEB606ECFE05B813C7EF22DC3AEA"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ScatterAssemblies"
{
"_5612E9D951E357A32D10B45E1DDC6886"
"_BB7FDEB606ECFE05B813C7EF22DC3AEA"
{
"Name" = "8:Renci.SshNet.dll"
"Name" = "8:System.Net.Http.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Renci.SshNet.dll"
"SourcePath" = "8:System.Net.Http.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_C82116116CF04DFC8E55DF40F4923EB9"
Expand All @@ -211,20 +243,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BB7FDEB606ECFE05B813C7EF22DC3AEA"
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0B5E9F0614A14E6C2B583FE7AD4657D"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"AssemblyAsmDisplayName" = "8:Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_BB7FDEB606ECFE05B813C7EF22DC3AEA"
"_E0B5E9F0614A14E6C2B583FE7AD4657D"
{
"Name" = "8:System.Net.Http.dll"
"Name" = "8:Renci.SshNet.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Net.Http.dll"
"SourcePath" = "8:Renci.SshNet.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_C82116116CF04DFC8E55DF40F4923EB9"
Expand Down Expand Up @@ -298,21 +330,21 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:RemoteHandbrakeController"
"ProductCode" = "8:{03C1FACA-90D4-490D-97AB-561EA552B670}"
"PackageCode" = "8:{7DC7D7E2-9AD0-4323-8439-AA61B4A7F70A}"
"ProductCode" = "8:{4829F971-BD30-468E-9CBD-14A0C7A6C2CB}"
"PackageCode" = "8:{92480014-FC01-4387-A04D-8A9525913E41}"
"UpgradeCode" = "8:{6CDF8B18-B088-49E2-9034-DAB6DB83A30C}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:1.0.0"
"ProductVersion" = "8:1.1.0"
"Manufacturer" = "8:Daniel Shinevar"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:RemoteHandbrakeControllerInstaller"
"Subject" = "8:"
"ARPCONTACT" = "8:Default Company Name"
"ARPCONTACT" = "8:Daniel Shinevar"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:"
"ARPURLINFOABOUT" = "8:"
Expand Down

0 comments on commit 128cc24

Please sign in to comment.