Fix invalid project references

ARKADE-291
arkivverket · Oct 19, 2018 · 5bcc30d · 5bcc30d
1 parent 2ad647c
commit 5bcc30d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/Setup/Product.wxs b/src/Setup/Product.wxs
@@ -3,7 +3,7 @@
   <Product Id="*"
            Name="Arkade"
            Language="1033"
-           Version="!(bind.FileVersion.fil645ACC73EBD39164CBEC59427DA927BE)"
+           Version="!(bind.FileVersion.filBC02C298FE69F20A0EDF74E1F73A270E)"
            Manufacturer="Arkivverket"
            UpgradeCode="029ba52f-9fd9-483c-9f7b-b83febc9d9d6">
     <Package InstallerVersion="200"

diff --git a/src/Setup/Setup.wixproj b/src/Setup/Setup.wixproj
@@ -23,16 +23,6 @@
     <Compile Include="FilesFragment.wxs" />
     <Compile Include="Product.wxs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Arkivverket.Arkade.UI\Arkivverket.Arkade.UI.csproj">
-      <Name>Arkivverket.Arkade.UI</Name>
-      <Project>{13964257-fe3d-427b-841a-402eaa8e1942}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUIExtension">
       <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
@@ -44,6 +34,16 @@
     <Content Include="License.rtf" />
     <Content Include="Transform.xslt" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Arkivverket.Arkade.GUI\Arkivverket.Arkade.GUI.csproj">
+      <Name>Arkivverket.Arkade.GUI</Name>
+      <Project>{13964257-fe3d-427b-841a-402eaa8e1942}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

diff --git a/src/Setup/Transform.xslt b/src/Setup/Transform.xslt
@@ -14,15 +14,15 @@
 
 <!-- Add specific ID-tag to exe file for use in Product.wxs
 
-  <xsl:template match="wix:File[contains(@Source, 'Arkade.UI.exe') and not(contains(@Source, '.config'))]">
+  <xsl:template match="wix:File[contains(@Source, 'Arkade.GUI.exe') and not(contains(@Source, '.config'))]">
     <xsl:copy>
       <xsl:attribute name="Id">ApplicationExe</xsl:attribute>
       <xsl:apply-templates select="@*[name()!='Id'] | node()" />
     </xsl:copy>
   </xsl:template>
 -->
 
-  <xsl:template match="wix:File[contains(@Source, 'Arkade.UI.exe') and not(contains(@Source, '.config'))]">
+  <xsl:template match="wix:File[contains(@Source, 'Arkade.GUI.exe') and not(contains(@Source, '.config'))]">
     <xsl:copy>
       <xsl:apply-templates select="@* | node()" />
       <wix:Shortcut Id="ApplicationStartMenuShortcut"
@@ -35,7 +35,7 @@
   </xsl:template>
 
 
-  <xsl:template match="wix:Component[wix:File[contains(@Source, 'Arkade.UI.exe') and not(contains(@Source, '.config'))]]">
+  <xsl:template match="wix:Component[wix:File[contains(@Source, 'Arkade.GUI.exe') and not(contains(@Source, '.config'))]]">
     <xsl:copy>
       <xsl:apply-templates select="@* | node()" />
       <wix:RemoveFolder Id="RemoveApplicationProgramsFolder" Directory="ApplicationProgramsFolder" On="uninstall"/>