Fixes an issue where async methods to execute a run profile ran synch…

…ronously Moves module to program files folder Fixes path to help file
lithnet · Jan 21, 2019 · 7dee3f1 · 7dee3f1
1 parent 8a93e97
commit 7dee3f1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/Lithnet.Miiserver.Automation.Setup/Components.wxs b/src/Lithnet.Miiserver.Automation.Setup/Components.wxs
@@ -14,6 +14,8 @@
       <Component Id="cmpd4773acad00f467cb4af8945581416af" Guid="*" Win64="yes">
         <File Id="fil52320e2b2969470aa55363dd67a5132e" KeyPath="yes" Source="$(var.Lithnet.Miiserver.Automation.TargetDir)LithnetMiisAutomation.psd1" />
       </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ENUSHELPFOLDER">
       <Component Id="cmp3413b4846e9347299068f6aac2f65a4d" Guid="*" Win64="yes">
         <File Id="fil1d55997b2c9b4248b2defbd3002eb0d0" KeyPath="yes" Source="$(var.Lithnet.Miiserver.Automation.TargetDir)en-us\Lithnet.Miiserver.Automation.dll-help.xml" />
       </Component>

diff --git a/src/Lithnet.Miiserver.Automation.Setup/Product.wxs b/src/Lithnet.Miiserver.Automation.Setup/Product.wxs
@@ -52,15 +52,13 @@
 
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="System64Folder">
+      <Directory Id="ProgramFiles64Folder">
         <Directory Id="PSROOT" Name="WindowsPowerShell">
-          <Directory Id="PSV1ROOT" Name ="v1.0">
             <Directory Id ="PSMODULESROOT" Name="Modules">
               <Directory Id="APPLICATIONFOLDER" Name="LithnetMiisAutomation">
                 <Directory Id="ENUSHELPFOLDER" Name="en-us"/>
               </Directory>
             </Directory>
-          </Directory>
         </Directory>
       </Directory>
     </Directory>

diff --git a/src/Lithnet.Miiserver.Automation/Lithnet.Miiserver.Automation.csproj b/src/Lithnet.Miiserver.Automation/Lithnet.Miiserver.Automation.csproj
@@ -35,8 +35,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Lithnet.Miiserver.Client, Version=1.0.6954.35963, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lithnet.Miiserver.Client.1.0.6954.35963\lib\net45\Lithnet.Miiserver.Client.dll</HintPath>
+    <Reference Include="Lithnet.Miiserver.Client, Version=1.0.6960.34214, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lithnet.Miiserver.Client.1.0.6960.34214\lib\net45\Lithnet.Miiserver.Client.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

diff --git a/src/Lithnet.Miiserver.Automation/LithnetMIISAutomation.Help.pshproj b/src/Lithnet.Miiserver.Automation/LithnetMIISAutomation.Help.pshproj
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <ModuleObject xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" fVersion="1.1" type="Manifest" mclass="Module" useSupports="false">
   <Name>LithnetMIISAutomation</Name>
-  <Version>1.0.6954.36015</Version>
+  <Version>1.0.6960.34402</Version>
   <Description>Lithnet PowerShell Module for FIM Synchronization Service</Description>
   <HasManifest>true</HasManifest>
   <Provider/>

diff --git a/src/Lithnet.Miiserver.Automation/packages.config b/src/Lithnet.Miiserver.Automation/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Lithnet.Miiserver.Client" version="1.0.6954.35963" targetFramework="net45" />
+  <package id="Lithnet.Miiserver.Client" version="1.0.6960.34214" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net45" />
 </packages>