Fixed the extension manager's permission issue when auto updating.

CUAHSI · Nov 25, 2014 · 0f51866 · 0f51866
1 parent c2fda0a
commit 0f51866
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 45 deletions.
diff --git a/Installer/setup.iss b/Installer/setup.iss
@@ -10,8 +10,8 @@
 ;; define some version parameters
 ;; from http://stackoverflow.com/questions/357803/automated-build-version-number-with-wix-inno-setup-and-vs2008
 ;; or maybe http://agiletracksoftware.com/blog.html?id=4
-#define AppName "HydroDesktop 1.7.2"
-#define SrcApp "HydroDesktop_1_7_2.exe"
+#define AppName "HydroDesktop 1.7.3"
+#define SrcApp "HydroDesktop_1_7_3.exe"
 #define FileVerStr GetFileVersion(SrcApp)
 ;#define StripBuild(str VerStr) Copy(VerStr, 1, RPos(".", VerStr)-1)
 #define StripBuild(VerStr) Copy(VerStr, 1, RPos(".", VerStr)-1)
@@ -37,7 +37,7 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppID={{DED92382-70DE-4917-9956-431324047ABD}
+AppID={{52A4C3C0-3B01-4455-B3DF-CE7BCADCB714}
 
 PrivilegesRequired=poweruser
 MinVersion=,5.01
@@ -95,29 +95,29 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\Binaries\HydroDesktop.*.dll"; DestDir: "{app}"; Flags: ignoreversion;
-Source: "..\Binaries\DotSpatial.*.dll"; DestDir: "{app}"; Flags: ignoreversion;
-Source: "..\Binaries\Microsoft.*.dll"; DestDir: "{app}"; Flags: ignoreversion;
+Source: "..\Binaries\HydroDesktop.*.dll"; DestDir: "{app}"; Permissions: everyone-full; Flags: ignoreversion;
+Source: "..\Binaries\DotSpatial.*.dll"; DestDir: "{app}"; Permissions: everyone-full; Flags: ignoreversion;
+Source: "..\Binaries\Microsoft.*.dll"; DestDir: "{app}"; Permissions: everyone-full; Flags: ignoreversion;
 
-Source: "..\Documentation\HydroDesktop_Quick_Start_Guide_1.5.pdf"; DestDir: "{app}\Help\html"; Flags: ignoreversion;
-Source: "..\Documentation\HydroDesktop User Guide.pdf"; DestDir: "{app}\Help\html"; Flags: ignoreversion;
+Source: "..\Documentation\HydroDesktop_Quick_Start_Guide_1.5.pdf"; DestDir: "{app}\Help\html"; Permissions: everyone-full; Flags: ignoreversion;
+Source: "..\Documentation\HydroDesktop User Guide.pdf"; DestDir: "{app}\Help\html"; Permissions: everyone-full; Flags: ignoreversion;
 
-Source: "..\Binaries\ZedGraph.dll*"; DestDir: "{app}"; Flags: ignoreversion;
-Source: "..\Binaries\x86\SQLite.Interop.dll"; DestDir: "{app}\x86"; Flags: ignoreversion;
-Source: "..\Binaries\x64\SQLite.Interop.dll"; DestDir: "{app}\x64"; Flags: ignoreversion;
-Source: "..\Binaries\HydroDesktopSplashLogo.png"; DestDir: "{app}"; Flags: ignoreversion;
-Source: "..\Binaries\HydroDesktop_1_6_dev.exe"; DestDir: "{app}"; DestName: "{#SrcApp}"; Flags: ignoreversion;
-Source: "..\Binaries\HydroDesktop_1_6_dev.exe.config"; DestDir: "{app}"; DestName: "{#SrcApp}.config"; Flags: ignoreversion;
+Source: "..\Binaries\ZedGraph.dll*"; DestDir: "{app}"; Permissions: everyone-full; Flags: ignoreversion;
+Source: "..\Binaries\x86\SQLite.Interop.dll"; DestDir: "{app}\x86"; Permissions: everyone-full; Flags: ignoreversion;
+Source: "..\Binaries\x64\SQLite.Interop.dll"; DestDir: "{app}\x64"; Permissions: everyone-full; Flags: ignoreversion;
+Source: "..\Binaries\HydroDesktopSplashLogo.png"; DestDir: "{app}"; Permissions: everyone-full; Flags: ignoreversion;
+Source: "..\Binaries\HydroDesktop_1_6_dev.exe"; DestDir: "{app}"; DestName: "{#SrcApp}"; Permissions: everyone-full; Flags: ignoreversion;
+Source: "..\Binaries\HydroDesktop_1_6_dev.exe.config"; DestDir: "{app}"; DestName: "{#SrcApp}.config"; Permissions: everyone-full; Flags: ignoreversion;
 
 ;Plugins
-Source: "..\Binaries\Plugins\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages"; Flags: recursesubdirs ignoreversion;
-Source: "..\Source\packages\DotSpatial.Plugins.ExtensionManager.1.1.1\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.ExtensionManager.1.1.1"; Flags: recursesubdirs ignoreversion;
-Source: "..\Source\packages\DotSpatial.Plugins.MenuBar.1.0.1200\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.MenuBar.1.0.1200"; Flags: recursesubdirs ignoreversion;
-Source: "..\Source\packages\DotSpatial.Plugins.Ribbon.1.4.38\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.Ribbon.1.4.38"; Flags: recursesubdirs ignoreversion;
-Source: "..\Source\packages\DotSpatial.Plugins.WebMap.1.1.0.0\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.WebMap.1.1.0.0"; Flags: recursesubdirs ignoreversion;
+Source: "..\Binaries\Plugins\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages"; Permissions: everyone-full; Flags: recursesubdirs ignoreversion;
+Source: "..\Source\packages\DotSpatial.Plugins.ExtensionManager.1.1.3\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.ExtensionManager.1.1.3"; Permissions: everyone-full; Flags: recursesubdirs ignoreversion;
+Source: "..\Source\packages\DotSpatial.Plugins.MenuBar.1.0.1200\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.MenuBar.1.0.1200"; Permissions: everyone-full; Flags: recursesubdirs ignoreversion;
+Source: "..\Source\packages\DotSpatial.Plugins.Ribbon.1.4.38\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.Ribbon.1.4.38"; Permissions: everyone-full; Flags: recursesubdirs ignoreversion;
+Source: "..\Source\packages\DotSpatial.Plugins.WebMap.1.1.0.0\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.WebMap.1.1.0.0"; Permissions: everyone-full; Flags: recursesubdirs ignoreversion;
 
 ;Windows Specific Folders
-Source: "..\Binaries\Support\Windows\*"; DestDir: "{app}\Support\Windows\"; Flags: ignoreversion;
+Source: "..\Binaries\Support\Windows\*"; DestDir: "{app}\Support\Windows\"; Permissions: everyone-full; Flags: ignoreversion;
 
 [Icons]
 Name: "{group}\{#AppName}"; Filename: "{app}\{#SrcApp}"

diff --git a/Source/AssemblyInfoShared.cs b/Source/AssemblyInfoShared.cs
@@ -1,19 +1,20 @@
-using System.Reflection;
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18444
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
 
-/* 
- * Shared assembly attributes for all projects 
- */
+using System;
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyFileVersion("1.7.3.4")]
+[assembly: AssemblyVersion("1.7.3.4")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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.7.2.0")]
-[assembly: AssemblyFileVersion("1.7.2.0")]
diff --git a/...ns/HydroDesktop.Plugins.DownloadExtensions/HydroDesktop.Plugins.DownloadExtensions.csproj b/...ns/HydroDesktop.Plugins.DownloadExtensions/HydroDesktop.Plugins.DownloadExtensions.csproj
@@ -91,8 +91,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="DotSpatial.Plugins.ExtensionManager">
-      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.1\lib\net40-Client\DotSpatial.Plugins.ExtensionManager.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.3\lib\net40-Client\DotSpatial.Plugins.ExtensionManager.dll</HintPath>
     </Reference>
     <Reference Include="DotSpatial.Projections">
       <HintPath>..\..\packages\DotSpatial.Projections.1.6.1\lib\net40-Client\DotSpatial.Projections.dll</HintPath>
@@ -120,7 +119,7 @@
     </Reference>
     <Reference Include="NuGet.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.1\lib\net40-Client\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.3\lib\net40-Client\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -131,7 +130,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Updater">
-      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.1\lib\net40-Client\Updater.exe</HintPath>
+      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.3\lib\net40-Client\Updater.exe</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/Plugins/HydroDesktop.Plugins.DownloadExtensions/packages.config b/Source/Plugins/HydroDesktop.Plugins.DownloadExtensions/packages.config
@@ -6,7 +6,7 @@
   <package id="DotSpatial.Extensions" version="1.6.1" targetFramework="net40-Client" />
   <package id="DotSpatial.Modeling.Forms" version="1.6.1" targetFramework="net40-Client" />
   <package id="DotSpatial.Mono" version="1.6.1" targetFramework="net40-Client" />
-  <package id="DotSpatial.Plugins.ExtensionManager" version="1.1.1" targetFramework="net40-Client" />
+  <package id="DotSpatial.Plugins.ExtensionManager" version="1.1.3" targetFramework="net40-Client" />
   <package id="DotSpatial.Projections" version="1.6.1" targetFramework="net40-Client" />
   <package id="DotSpatial.Projections.Forms" version="1.6.1" targetFramework="net40-Client" />
   <package id="DotSpatial.Serialization" version="1.6.1" targetFramework="net40-Client" />

diff --git a/Source/Plugins/HydroDesktop.Plugins.MainPlugin/HydroDesktop.Plugins.MainPlugin.csproj b/Source/Plugins/HydroDesktop.Plugins.MainPlugin/HydroDesktop.Plugins.MainPlugin.csproj
@@ -94,7 +94,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="DotSpatial.Plugins.ExtensionManager">
-      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.1\lib\net40-Client\DotSpatial.Plugins.ExtensionManager.dll</HintPath>
+      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.3\lib\net40-Client\DotSpatial.Plugins.ExtensionManager.dll</HintPath>
     </Reference>
     <Reference Include="DotSpatial.Plugins.MenuBar, Version=0.11.9.6, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -130,7 +130,7 @@
     </Reference>
     <Reference Include="NuGet.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.1\lib\net40-Client\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.3\lib\net40-Client\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -143,7 +143,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Updater">
-      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.1\lib\net40-Client\Updater.exe</HintPath>
+      <HintPath>..\..\packages\DotSpatial.Plugins.ExtensionManager.1.1.3\lib\net40-Client\Updater.exe</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/Plugins/HydroDesktop.Plugins.MainPlugin/packages.config b/Source/Plugins/HydroDesktop.Plugins.MainPlugin/packages.config
@@ -6,7 +6,7 @@
   <package id="DotSpatial.Extensions" version="1.6.1" targetFramework="net40-Client" />
   <package id="DotSpatial.Modeling.Forms" version="1.6.1" targetFramework="net40-Client" />
   <package id="DotSpatial.Mono" version="1.6.1" targetFramework="net40-Client" />
-  <package id="DotSpatial.Plugins.ExtensionManager" version="1.1.1" targetFramework="net40-Client" />
+  <package id="DotSpatial.Plugins.ExtensionManager" version="1.1.3" targetFramework="net40-Client" />
   <package id="DotSpatial.Plugins.MenuBar" version="1.0.1200" targetFramework="net40-Client" />
   <package id="DotSpatial.Plugins.WebMap" version="1.1.0.0" targetFramework="net40-Client" />
   <package id="DotSpatial.Projections" version="1.6.1" targetFramework="net40-Client" />