Fixes for the openECA setup package.

GridProtectionAlliance · Jun 20, 2018 · ad2d2bc · ad2d2bc
1 parent 569ba97
commit ad2d2bc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Source/Applications/openECA/openECASetup/Templates.wxi b/Source/Applications/openECA/openECASetup/Templates.wxi
@@ -656,8 +656,8 @@ Process for generating this file:
             <Component Id="cmp51295144612BBEB13CBEF4DFA8777A02" Directory="dirB3F894220A82C014380C7C5D8DF23E90" Guid="*">
                 <File Id="filABB6D444CE71F6EFEB63E6830A847F66" KeyPath="yes" Source="$(var.SolutionDir)\Templates\VisualBasic\AlgorithmTemplateLibrary\My Project\Resources.resx" />
             </Component>
-            <Component Id="cmp1637A9DB78DDE30500578E3910FE1385" Directory="dirB3F894220A82C014380C7C5D8DF23E90" Guid="*">
-                <File Id="fil1EFED5C46BE06772640CD115E1DA301A" KeyPath="yes" Source="$(var.SolutionDir)\Templates\VisualBasic\AlgorithmTemplateLibrary\My Project\Settings.Designer.vb" />
+            <Component Id="cmpCAA06445D8A1E3E179F385AC91FA8A65" Directory="dirB3F894220A82C014380C7C5D8DF23E90" Guid="*">
+                <File Id="fil043B7258203B5E4E8D296B74D17CB790" KeyPath="yes" Source="$(var.SolutionDir)\Templates\VisualBasic\AlgorithmTemplateLibrary\My Project\Settings.Designer.cs" />
             </Component>
             <Component Id="cmpBEDFD3F063EF1AD222D0C0411C2D082F" Directory="dirB3F894220A82C014380C7C5D8DF23E90" Guid="*">
                 <File Id="filE3B8AD2BC13C784981A132704381F07E" KeyPath="yes" Source="$(var.SolutionDir)\Templates\VisualBasic\AlgorithmTemplateLibrary\My Project\Settings.settings" />

diff --git a/Source/Applications/openECA/openECASetup/openECASetup.wixproj b/Source/Applications/openECA/openECASetup/openECASetup.wixproj
@@ -151,6 +151,9 @@
     <Content Include="WebFolders.wxi" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
+  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" Outputs="$(TargetPath)">
+    <OnError ExecuteTargets="RestoreBitmap" />
+  </Target>
   <PropertyGroup>
     <BeforeBuildDependsOn>
       VersionBitmap

diff --git a/Source/Applications/openECA/openECASetup/openECASetup.wxs b/Source/Applications/openECA/openECASetup/openECASetup.wxs
@@ -744,6 +744,9 @@
       <Component Id="Client.Antlr3.Runtime">
         <File Id="Client.Antlr3.Runtime.dll" Name="Antlr3.Runtime.dll" Source="$(var.SolutionDir)\Dependencies\GSF\Antlr3.Runtime.dll" />
       </Component>
+      <Component Id="Client.AjaxMin">
+        <File Id="Client.AjaxMin.dll" Name="AjaxMin.dll" Source="$(var.SolutionDir)\Dependencies\GSF\AjaxMin.dll" />
+      </Component>
       <Component Id="Client.ExpressionEvaluator">
         <File Id="Client.ExpressionEvaluator.dll" Name="ExpressionEvaluator.dll" Source="$(var.SolutionDir)\Dependencies\GSF\ExpressionEvaluator.dll" />
       </Component>