Skip to content
This repository has been archived by the owner on Sep 14, 2018. It is now read-only.

Commit

Permalink
Remove Silverlight
Browse files Browse the repository at this point in the history
  • Loading branch information
slide committed Jul 24, 2016
1 parent 4924355 commit b4790a1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 21 deletions.
4 changes: 2 additions & 2 deletions CurrentVersion.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 5 additions & 4 deletions Msi/Python/IronPython.Installer.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -133,7 +133,7 @@
<ComponentGroupName>IronPythonPlatformsNet45</ComponentGroupName>
<PreprocessorVariable>var.PlatformsNet45Dir</PreprocessorVariable>
</HarvestDirectory>

<!--
<HarvestDirectory Include="$(BaseInputPaths)\Platforms\Sl5">
<DirectoryRefId>IronPythonPlatformsDir</DirectoryRefId>
<ComponentGroupName>IronPythonPlatformsSl5</ComponentGroupName>
Expand All @@ -145,6 +145,7 @@
<ComponentGroupName>IronPythonSilverlightTools</ComponentGroupName>
<PreprocessorVariable>var.SilverlightToolsDir</PreprocessorVariable>
</HarvestDirectory>
-->

<HarvestDirectory Include="$(BaseInputPaths)\Tools">
<DirectoryRefId>INSTALLDIR</DirectoryRefId>
Expand All @@ -167,4 +168,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
8 changes: 1 addition & 7 deletions Msi/Python/IronPython.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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'>
Expand Down Expand Up @@ -126,7 +121,6 @@
<ComponentRef Id="VSNet45ReferenceAssemblyKey"/>
<ComponentRef Id="VSNet40ReferenceAssemblyKey"/>
<ComponentRef Id="VSNet20ReferenceAssemblyKey"/>
<ComponentRef Id="VSSl5ReferenceAssemblyKey"/>
</ComponentGroup>

<ComponentGroup Id="IronPythonGac">
Expand All @@ -136,4 +130,4 @@
<ComponentRef Id="policy.$(var.ReleaseSeries).IronPython.Modules.dll"/>
</ComponentGroup>
</Fragment>
</Wix>
</Wix>
9 changes: 1 addition & 8 deletions Msi/Python/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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.'>
Expand Down Expand Up @@ -148,4 +141,4 @@ WHEN PERFORMING MAJOR IP UPGRADES (e.g., 2.5 => 2.6):

</Product>

</Wix>
</Wix>

0 comments on commit b4790a1

Please sign in to comment.