Installer changes. Use variables. Give distinct upgrade UID. Make product UID all caps (better for compatibility, so I hear)
This commit is contained in:
		@@ -1,28 +1,49 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 | 
			
		||||
	<Product Id="*" Name="EduNetworkBuilder" Language="1033" Version="1.0.0.33" Manufacturer="EduNetworkBuilder" UpgradeCode="ff6bf7dd-e8cc-426b-9b10-981a3b7196fd">
 | 
			
		||||
  <?define ProductName = "EduNetworkBuilder"?>
 | 
			
		||||
  
 | 
			
		||||
  <!-- The ProductCode should change for every *major* revision; if it can coexist with the old -->
 | 
			
		||||
  <!-- We are planning to never change it for EduNetworkBuilder -->
 | 
			
		||||
  <?define ProductCode = "71EACA51-8B58-49F5-865C-802CFC16E503"?>
 | 
			
		||||
  <!-- A unique UpgradeCode.  Should be different than ProductCode.  Should never change -->
 | 
			
		||||
  <?define UpgradeCode = "D7FAE51C-D99A-406B-935B-E91F470D8488"?>
 | 
			
		||||
 | 
			
		||||
  <!-- Product Version right now should remain in sync with EduNetworkBuilder version number -->
 | 
			
		||||
  <?define ProductVersion = "1.0.0.33"?>
 | 
			
		||||
  
 | 
			
		||||
	<Product Id="*" 
 | 
			
		||||
           Name="$(var.ProductName)" 
 | 
			
		||||
           Language="1033" 
 | 
			
		||||
           Version="$(var.ProductVersion)" 
 | 
			
		||||
           Manufacturer="EduNetworkBuilder" 
 | 
			
		||||
           UpgradeCode="$(var.UpgradeCode)">
 | 
			
		||||
		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 | 
			
		||||
 | 
			
		||||
		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 | 
			
		||||
		<MajorUpgrade Schedule="afterInstallInitialize" 
 | 
			
		||||
                  DowngradeErrorMessage="A newer version of [ProductName] is already installed." 
 | 
			
		||||
                  AllowSameVersionUpgrades="yes"/>
 | 
			
		||||
    
 | 
			
		||||
		<MediaTemplate EmbedCab="yes"/>
 | 
			
		||||
 | 
			
		||||
		<Feature Id="ProductFeature" Title="EduNetworkBuilder" Level="1">
 | 
			
		||||
		<Feature Id="ProductFeature" Title="$(var.ProductName)" Level="1">
 | 
			
		||||
			<ComponentGroupRef Id="ProductComponents" />
 | 
			
		||||
			<ComponentRef Id="ApplicationShortcut" />
 | 
			
		||||
		</Feature>
 | 
			
		||||
    
 | 
			
		||||
    <Directory Id="TARGETDIR" Name="SourceDir">
 | 
			
		||||
      <!-- Add info for program-files location -->
 | 
			
		||||
      <Directory Id="ProgramFilesFolder">
 | 
			
		||||
        <Directory Id="INSTALLFOLDER" Name="EduNetworkBuilder" />
 | 
			
		||||
        <Directory Id="INSTALLFOLDER" Name="$(var.ProductName)" />
 | 
			
		||||
      </Directory>
 | 
			
		||||
      <!-- Add info for the start-menu shortcut -->
 | 
			
		||||
      <Directory Id="ProgramMenuFolder">
 | 
			
		||||
        <Directory Id="ApplicationProgramsFolder" Name="EduNetworkBuilder"/>
 | 
			
		||||
        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
 | 
			
		||||
      </Directory>
 | 
			
		||||
    </Directory>
 | 
			
		||||
    
 | 
			
		||||
    <!-- More for the start-menu shortcut -->
 | 
			
		||||
    <DirectoryRef Id="ApplicationProgramsFolder">
 | 
			
		||||
      <Component Id="ApplicationShortcut" Guid="ff6bf7dd-e8cc-426b-9b10-981a3b7196fd">
 | 
			
		||||
      <Component Id="ApplicationShortcut" Guid="$(var.ProductCode)">
 | 
			
		||||
        <Shortcut Id="ApplicationStartMenuShortcut"
 | 
			
		||||
              Name="EduNetworkBuilder"
 | 
			
		||||
            Description="A program for teaching networking"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user