From b4790a1cb7166e14ea259783f367457ad6cf8588 Mon Sep 17 00:00:00 2001
From: Alex Earl <slide.o.mix@gmail.com>
Date: Sat, 23 Jul 2016 21:21:54 -0700
Subject: [PATCH] Remove Silverlight

---
 CurrentVersion.props                    | 4 ++--
 Msi/Python/IronPython.Installer.wixproj | 9 +++++----
 Msi/Python/IronPython.wxs               | 8 +-------
 Msi/Python/Product.wxs                  | 9 +--------
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/CurrentVersion.props b/CurrentVersion.props
index 97b8c0d51b..26758f45b5 100644
--- a/CurrentVersion.props
+++ b/CurrentVersion.props
@@ -5,8 +5,8 @@
     <MinorVersion>7</MinorVersion>
     <MicroVersion>6</MicroVersion>
     <!-- Allowed: alpha,beta,candidate,final -->
-    <ReleaseLevel>alpha</ReleaseLevel>
-    <ReleaseSerial>0</ReleaseSerial>
+    <ReleaseLevel>candidate</ReleaseLevel>
+    <ReleaseSerial>1</ReleaseSerial>
 
     <AssemblyRevision>0</AssemblyRevision>
   </PropertyGroup>
diff --git a/Msi/Python/IronPython.Installer.wixproj b/Msi/Python/IronPython.Installer.wixproj
index d8a28516de..3c63e37303 100644
--- a/Msi/Python/IronPython.Installer.wixproj
+++ b/Msi/Python/IronPython.Installer.wixproj
@@ -55,12 +55,12 @@
     <WixConstant Include="PlatformsNet45Dir">
       <Value>Platforms\Net45</Value>
     </WixConstant>
-    <WixConstant Include="PlatformsSl5Dir">
+    <!--<WixConstant Include="PlatformsSl5Dir">
       <Value>Platforms\Sl5</Value>
     </WixConstant>
     <WixConstant Include="SilverlightToolsDir">
       <Value>Silverlight</Value>
-    </WixConstant>
+    </WixConstant>-->
     <WixConstant Include="ToolsDir">
       <Value>Tools</Value>
     </WixConstant>
@@ -133,7 +133,7 @@
       <ComponentGroupName>IronPythonPlatformsNet45</ComponentGroupName>
       <PreprocessorVariable>var.PlatformsNet45Dir</PreprocessorVariable>
     </HarvestDirectory>
-    
+    <!-- 
     <HarvestDirectory Include="$(BaseInputPaths)\Platforms\Sl5">
       <DirectoryRefId>IronPythonPlatformsDir</DirectoryRefId>
       <ComponentGroupName>IronPythonPlatformsSl5</ComponentGroupName>
@@ -145,6 +145,7 @@
       <ComponentGroupName>IronPythonSilverlightTools</ComponentGroupName>
       <PreprocessorVariable>var.SilverlightToolsDir</PreprocessorVariable>
     </HarvestDirectory>
+    -->
 
     <HarvestDirectory Include="$(BaseInputPaths)\Tools">
       <DirectoryRefId>INSTALLDIR</DirectoryRefId>
@@ -167,4 +168,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Msi/Python/IronPython.wxs b/Msi/Python/IronPython.wxs
index 193327bdea..7465514d50 100644
--- a/Msi/Python/IronPython.wxs
+++ b/Msi/Python/IronPython.wxs
@@ -78,11 +78,6 @@
         <RegistryValue Id='VSNet20ReferenceAssemblyKey'
           Root='HKLM' Key='SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\$(var.ProductShortName)$(var.ReleaseSeries)' Type='string' Value='[INSTALLDIR]$(var.PlatformsNet35Dir)' />
       </Component>
-      
-      <Component>
-        <RegistryValue Id='VSSl5ReferenceAssemblyKey'
-          Root='HKLM' Key='SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v5.0\AssemblyFoldersEx\$(var.ProductShortName)$(var.ReleaseSeries)' Type='string' Value='[INSTALLDIR]$(var.PlatformsSl5Dir)' />
-      </Component>
     </DirectoryRef>
 
     <DirectoryRef Id='GAC'>
@@ -126,7 +121,6 @@
       <ComponentRef Id="VSNet45ReferenceAssemblyKey"/>
       <ComponentRef Id="VSNet40ReferenceAssemblyKey"/>
       <ComponentRef Id="VSNet20ReferenceAssemblyKey"/>
-      <ComponentRef Id="VSSl5ReferenceAssemblyKey"/>
     </ComponentGroup>
 
     <ComponentGroup Id="IronPythonGac">
@@ -136,4 +130,4 @@
       <ComponentRef Id="policy.$(var.ReleaseSeries).IronPython.Modules.dll"/>
     </ComponentGroup>
   </Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
diff --git a/Msi/Python/Product.wxs b/Msi/Python/Product.wxs
index 98c3fdd59a..b5fdb5c062 100644
--- a/Msi/Python/Product.wxs
+++ b/Msi/Python/Product.wxs
@@ -110,13 +110,6 @@ WHEN PERFORMING MAJOR IP UPGRADES (e.g., 2.5 => 2.6):
           <ComponentGroupRef Id='IronPythonPlatformsNet45'/>
         </Feature>
 
-        <Feature Id='IronPython_Platforms_Sl5' AllowAdvertise='no' Level='1' Title='Silverlight 5' Description='Development assemblies for Silverlight 5.'>
-          <ComponentGroupRef Id='IronPythonPlatformsSl5'/>
-        </Feature>
-      </Feature>
-
-      <Feature Id='IronPython_SilverlightTools' AllowAdvertise='no' Level='1' Title='Silverlight Tools' Description='Tools for developing Silverlight apps with IronPython (Chiron.exe et al.).'>
-        <ComponentGroupRef Id='IronPythonSilverlightTools' />
       </Feature>
 
       <Feature Id='IronPython_Tools' AllowAdvertise='no' Level='1' Title='Scripts' Description='Some useful scripts that have been written for IronPython.'>
@@ -148,4 +141,4 @@ WHEN PERFORMING MAJOR IP UPGRADES (e.g., 2.5 => 2.6):
 
   </Product>
 
-</Wix>
\ No newline at end of file
+</Wix>