diff --git a/EDMCOverlay/EDMCOverlay/Properties/AssemblyInfo.cs b/EDMCOverlay/EDMCOverlay/Properties/AssemblyInfo.cs index 4cfebf0..eb50955 100644 --- a/EDMCOverlay/EDMCOverlay/Properties/AssemblyInfo.cs +++ b/EDMCOverlay/EDMCOverlay/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // Patch Number // Revision // -[assembly: AssemblyVersion("1.0.3.0")] -[assembly: AssemblyFileVersion("1.0.3.0")] +[assembly: AssemblyVersion("1.0.5.0")] +[assembly: AssemblyFileVersion("1.0.5.0")] diff --git a/EDMCOverlay/Installer/Installer.vdproj b/EDMCOverlay/Installer/Installer.vdproj index 644568e..02a942d 100644 --- a/EDMCOverlay/Installer/Installer.vdproj +++ b/EDMCOverlay/Installer/Installer.vdproj @@ -165,6 +165,11 @@ "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" "ScatterAssemblies" { + "_FA3A32BF12EDED1EBB2265CBB27D2ACD" + { + "Name" = "8:Newtonsoft.Json.dll" + "Attributes" = "3:512" + } } "SourcePath" = "8:Newtonsoft.Json.dll" "TargetName" = "8:" @@ -251,15 +256,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:EDMC Overlay" - "ProductCode" = "8:{32CA7E64-76BF-4234-86D1-4EB59F6D9C85}" - "PackageCode" = "8:{1BD0008F-A199-44A8-9467-2F7D7E03F2EE}" + "ProductCode" = "8:{D8CA5784-7FD7-4674-BF17-DE6B5B62A6FD}" + "PackageCode" = "8:{05C102CD-1DEB-4B7F-B0F2-08C780B07F5D}" "UpgradeCode" = "8:{5130A4E3-3C60-4F9B-B3A7-5602D91B03AF}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.3" + "ProductVersion" = "8:1.0.5" "Manufacturer" = "8:EDMC Overlay" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://github.com/inorton/EDMCOverlay" @@ -275,7 +280,7 @@ "UseSystemSearchPath" = "11:TRUE" "TargetPlatform" = "3:0" "PreBuildEvent" = "8:" - "PostBuildEvent" = "8:c:\\Python27\\python.exe $(ProjectDir)\\..\\signer.py f:\\MovedUserdata\\inb\\Dropbox\\Authenticode\\authenticode.pfx $(BuiltOuputPath) $(ProjectDir)\\$(Configuration)\\EDMCOverlay-1.0.3.msi --gui" + "PostBuildEvent" = "8:c:\\Python27\\python.exe $(ProjectDir)\\..\\signer.py f:\\MovedUserdata\\inb\\Dropbox\\Authenticode\\authenticode.pfx $(BuiltOuputPath) $(ProjectDir)\\$(Configuration)\\EDMCOverlay-1.0.5.msi --gui" "RunPostBuildEvent" = "3:0" } "Registry" diff --git a/edmcoverlay.py b/edmcoverlay.py index 6ad9e7a..a0c7fb6 100644 --- a/edmcoverlay.py +++ b/edmcoverlay.py @@ -136,7 +136,7 @@ def send_raw(self, msg): :param msg: :return: """ - if not self.connnection: + if not self.connection: return None assert isinstance(msg, dict)