Skip to content

Commit 35cc227

Browse files
slozierslozier
authored
Version 3.4.0-beta (#1422)
* Bump version number * Update installer * Update DLR * Update nuspec * Clean up -V output * Fix failing test * Add -VV option * Package .NET 6 version
1 parent 78cdb1a commit 35cc227

File tree

16 files changed

+196
-173
lines changed

16 files changed

+196
-173
lines changed

‎Build/After.targets‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
</Choose>
2020

2121
<PropertyGroup>
22-
<MainStageDir>$(StageDir)\$(TargetFramework)</MainStageDir>
23-
<MainStageDir Condition=" '$(StoreInDLLs)' == 'true' ">$(StageDir)\$(TargetFramework)\DLLs</MainStageDir>
22+
<_TargetFramework>$(TargetFramework)</_TargetFramework>
23+
<_TargetFramework Condition=" $(TargetFramework.EndsWith('-windows')) ">$(TargetFramework.Substring(0, $(TargetFramework.IndexOf('-windows'))))</_TargetFramework>
24+
<MainStageDir>$(StageDir)\$(_TargetFramework)</MainStageDir>
25+
<MainStageDir Condition=" '$(StoreInDLLs)' == 'true' ">$(StageDir)\$(_TargetFramework)\DLLs</MainStageDir>
2426
<UnsignedItems>@(StageItem)</UnsignedItems>
2527
<UnsignedMainStaged>@(StageItem->'$(MainStageDir)\%(RecursiveDir)\%(Filename)%(Extension)')</UnsignedMainStaged>
2628
</PropertyGroup>

‎CurrentVersion.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<MajorVersion>3</MajorVersion>
55
<MinorVersion>4</MinorVersion>
66
<MicroVersion>0</MicroVersion>
7-
<ReleaseLevel>alpha</ReleaseLevel>
7+
<ReleaseLevel>beta</ReleaseLevel>
88
<ReleaseSerial>1</ReleaseSerial><!-- this should only be 0 when final -->
99

1010
<AssemblyRevision>0</AssemblyRevision>

‎Package/choco/IronPython.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<title>IronPython3</title>
1010
<authors>IronPython Contributors,Microsoft</authors>
1111
<owners>IronPython Community</owners>
12-
<projectUrl>http://ironpython.net</projectUrl>
12+
<projectUrl>https://ironpython.net</projectUrl>
1313
<licenseUrl>https://github.com/IronLanguages/ironpython3/blob/master/LICENSE</licenseUrl>
1414
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1515
<description>IronPython is an open-source implementation of the Python programming language which is tightly integrated with the .NET Framework. IronPython can use the .NET Framework and Python libraries, and other .NET languages can use Python code just as easily.</description>

‎Package/msi/Dlr.wxs‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<Fragment>
44
<DirectoryRef Id="INSTALLDIR">
5-
<Component Guid="{3C386FF0-9BC5-4B45-9628-4EE4AC1916A2}">
6-
<File Id="Microsoft.Scripting.dll" KeyPath="yes" Source="$(var.PlatformDir)\Microsoft.Scripting.dll" />
5+
<Component>
6+
<File Source="$(var.PlatformDir)\Microsoft.Scripting.dll" />
77
</Component>
88

9-
<Component Guid="{9D15CFB0-C88B-4223-A9E6-C8FA6B336E2B}">
10-
<File Id="Microsoft.Dynamic.dll" KeyPath="yes" Source="$(var.PlatformDir)\Microsoft.Dynamic.dll" />
11-
</Component>
12-
</DirectoryRef>
13-
14-
<DirectoryRef Id="GAC">
15-
<Component Guid="{24AAD7FE-15E3-440C-84E7-26DBDF7F9EBE}">
16-
<File Id="gac_Microsoft.Scripting.dll" Name="Microsoft.Scripting.dll" Assembly=".net" KeyPath="yes" Source="$(var.PlatformDir)\Microsoft.Scripting.dll">
17-
<netfx:NativeImage Id="ngen_Microsoft.Scripting.dll" Platform="all" AppBaseDirectory="INSTALLDIR" />
18-
</File>
19-
</Component>
20-
21-
<Component Guid="{A62AD5D3-18CE-4933-9FF7-AA593537C4C2}">
22-
<File Id="gac_Microsoft.Dynamic.dll" Name="Microsoft.Dynamic.dll" Assembly=".net" KeyPath="yes" Source="$(var.PlatformDir)\Microsoft.Dynamic.dll">
23-
<netfx:NativeImage Id="ngen_Microsoft.Dynamic.dll" Platform="all" AppBaseDirectory="INSTALLDIR" />
24-
</File>
9+
<Component>
10+
<File Source="$(var.PlatformDir)\Microsoft.Dynamic.dll" />
2511
</Component>
2612
</DirectoryRef>
2713

@@ -30,9 +16,5 @@
3016
<ComponentRef Id="Microsoft.Dynamic.dll" />
3117
</ComponentGroup>
3218

33-
<ComponentGroup Id="DlrGac">
34-
<ComponentRef Id="gac_Microsoft.Scripting.dll" />
35-
<ComponentRef Id="gac_Microsoft.Dynamic.dll" />
36-
</ComponentGroup>
3719
</Fragment>
38-
</Wix>
20+
</Wix>

‎Package/msi/IronPython.Installer.wixproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
8-
<ProductVersion>3.5</ProductVersion>
8+
<ProductVersion>3.4</ProductVersion>
99
<ProjectGuid>{49c7ae2b-d9d1-4b32-9d11-474f1be86658}</ProjectGuid>
1010
<SchemaVersion>2.0</SchemaVersion>
1111
<OutputName>IronPython-$(DisplayVersion)</OutputName>
@@ -30,37 +30,34 @@
3030
</WixConstant>
3131
<WixConstant Include="ReleaseSeries">
3232
<Value>$(MajorVersion).$(MinorVersion)</Value>
33-
</WixConstant>
33+
</WixConstant>
3434
<WixConstant Include="BuildDir">
3535
<Value>$(BuildDir)</Value>
36-
</WixConstant>
36+
</WixConstant>
3737
<WixConstant Include="StdLibDir">
3838
<Value>$(BindInputPaths)\Lib</Value>
3939
</WixConstant>
4040
<WixConstant Include="PlatformDir">
4141
<Value>$(BindInputPaths)\net46</Value>
4242
</WixConstant>
43-
<WixConstant Include="IpyExeComponentGuid">
44-
<Value>{419DAD09-D6E8-47F0-BC58-874019842004}</Value>
45-
</WixConstant>
4643
</ItemGroup>
4744

4845
<PropertyGroup>
4946
<CommonWixConstants>@(WixConstant->'%(Identity)=%(Value)')</CommonWixConstants>
5047
</PropertyGroup>
51-
48+
5249
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
5350
<OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(Configuration)\</OutputPath>
5451
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
5552
<DefineConstants>Debug;$(CommonWixConstants)</DefineConstants>
5653
</PropertyGroup>
57-
54+
5855
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
5956
<OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(Configuration)\</OutputPath>
6057
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
6158
<DefineConstants>$(CommonWixConstants)</DefineConstants>
6259
</PropertyGroup>
63-
60+
6461
<ItemGroup>
6562
<Compile Include="Dlr.wxs" />
6663
<Compile Include="IronPython.wxs" />

‎Package/msi/IronPython.wxs‎

Lines changed: 59 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -4,78 +4,69 @@
44
<Fragment>
55
<DirectoryRef Id="INSTALLDIR">
66

7-
<Component Guid="{8CF1D19D-EF1C-4340-9C13-3DF5E08BAA45}">
8-
<File Id="IronPython.dll" KeyPath="yes" Source="$(var.PlatformDir)\IronPython.dll" />
7+
<Component>
8+
<File Source="$(var.PlatformDir)\IronPython.dll" />
99
</Component>
1010

11-
<Component Guid="{CC3AF708-7831-45DC-8CC6-60E33DE1A7EA}">
12-
<File Id="IronPython.Modules.dll" KeyPath="yes" Source="$(var.PlatformDir)\IronPython.Modules.dll" />
11+
<Component>
12+
<File Source="$(var.PlatformDir)\IronPython.Modules.dll" />
1313
</Component>
1414

15-
<Component Guid="$(var.IpyExeComponentGuid)">
16-
<File Id="ipy.exe" KeyPath="yes" Source="$(var.PlatformDir)\ipy.exe">
15+
<Component>
16+
<File Source="$(var.PlatformDir)\ipy.exe">
1717
<netfx:NativeImage Id="ngen_ipy.exe" Platform="all" AppBaseDirectory="INSTALLDIR" />
1818
</File>
19-
<RegistryKey Root="HKLM" Key="Software\Python\IronPython\$(var.ReleaseSeries)">
20-
<RegistryValue Key="InstallPath" Type="string" Value="[INSTALLDIR]" KeyPath="no" />
21-
<RegistryValue Key="InstallPath" Name="ExecutablePath" Type="string" Value="[#ipy.exe]" KeyPath="no" />
22-
</RegistryKey>
23-
<File Id="ipy32.exe" Source="$(var.PlatformDir)\ipy32.exe">
19+
</Component>
20+
<Component>
21+
<File Source="$(var.PlatformDir)\ipy32.exe">
2422
<netfx:NativeImage Id="ngen_ipy32.exe" Platform="all" AppBaseDirectory="INSTALLDIR" />
2523
</File>
26-
<RegistryKey Root="HKLM" Key="Software\Python\IronPython\$(var.ReleaseSeries)-32">
27-
<RegistryValue Key="InstallPath" Type="string" Value="[INSTALLDIR]" KeyPath="no" />
28-
<RegistryValue Key="InstallPath" Name="ExecutablePath" Type="string" Value="[#ipy32.exe]" KeyPath="no" />
29-
</RegistryKey>
3024
</Component>
3125

32-
<Component Guid="{F7E1626D-3007-405D-A656-1A971D172A07}">
33-
<File Id="ipyc.exe" KeyPath="yes" Source="$(var.PlatformDir)\ipyc.exe">
26+
<Component>
27+
<File Source="$(var.PlatformDir)\ipyc.exe">
3428
<netfx:NativeImage Id="ngen_ipyc.exe" Platform="all" AppBaseDirectory="INSTALLDIR" />
3529
</File>
36-
<File Id="IKVM.Reflection.dll" Source="$(var.PlatformDir)\IKVM.Reflection.dll" />
30+
</Component>
31+
<Component>
32+
<File Source="$(var.PlatformDir)\IKVM.Reflection.dll" />
3733
</Component>
3834

39-
<Component Guid="{A9A13553-6EAD-4C92-9334-149F223F854C}">
40-
<File Id="ipyw.exe" KeyPath="yes" Source="$(var.PlatformDir)\ipyw.exe">
35+
<Component>
36+
<File Source="$(var.PlatformDir)\ipyw.exe">
4137
<netfx:NativeImage Id="ngen_ipyw.exe" Platform="all" AppBaseDirectory="INSTALLDIR" />
4238
</File>
43-
<RegistryKey Root="HKLM" Key="Software\Python\IronPython\$(var.ReleaseSeries)">
44-
<RegistryValue Key="InstallPath" Name="WindowedExecutablePath" Type="string" Value="[#ipyw.exe]" KeyPath="no" />
45-
</RegistryKey>
46-
<File Id="ipyw32.exe" Source="$(var.PlatformDir)\ipyw32.exe">
39+
</Component>
40+
<Component>
41+
<File Source="$(var.PlatformDir)\ipyw32.exe">
4742
<netfx:NativeImage Id="ngen_ipyw32.exe" Platform="all" AppBaseDirectory="INSTALLDIR" />
4843
</File>
49-
<RegistryKey Root="HKLM" Key="Software\Python\IronPython\$(var.ReleaseSeries)-32">
50-
<RegistryValue Key="InstallPath" Name="WindowedExecutablePath" Type="string" Value="[#ipyw32.exe]" KeyPath="no" />
51-
</RegistryKey>
5244
</Component>
5345

5446
<Directory Id="IronPython_DLLs" Name="DLLs">
55-
<Component Guid="{476E201D-7D77-4F4B-A17E-D49CD575B90C}">
56-
<File Id="IronPython.Wpf.dll" KeyPath="yes" Source="$(var.PlatformDir)\DLLs\IronPython.Wpf.dll" />
47+
<Component>
48+
<File Source="$(var.PlatformDir)\DLLs\IronPython.Wpf.dll" />
5749
</Component>
58-
<Component Guid="{218765CA-4881-450E-B406-23CF3C45CFE4}">
59-
<File Id="IronPython.SQLite.dll" KeyPath="yes" Source="$(var.PlatformDir)\DLLs\IronPython.SQLite.dll" />
50+
<Component>
51+
<File Source="$(var.PlatformDir)\DLLs\IronPython.SQLite.dll" />
6052
</Component>
6153
</Directory>
6254

6355
<Component>
64-
<File Id="README.md" />
56+
<File Source="$(var.PlatformDir)\System.Buffers.dll" />
6557
</Component>
66-
6758
<Component>
68-
<File Id="System.Buffers.dll" KeyPath="yes" Source="$(var.PlatformDir)\System.Buffers.dll" />
59+
<File Source="$(var.PlatformDir)\System.Memory.dll" />
6960
</Component>
7061
<Component>
71-
<File Id="System.Memory.dll" KeyPath="yes" Source="$(var.PlatformDir)\System.Memory.dll" />
62+
<File Source="$(var.PlatformDir)\System.Runtime.CompilerServices.Unsafe.dll" />
7263
</Component>
64+
7365
<Component>
74-
<File Id="System.Runtime.CompilerServices.Unsafe.dll" KeyPath="yes" Source="$(var.PlatformDir)\System.Runtime.CompilerServices.Unsafe.dll" />
66+
<File Source="LICENSE" />
7567
</Component>
76-
77-
<Component Guid="{B5D964A4-37EB-4A59-9D63-726DB1F84E5E}">
78-
<File Id="LICENSE" KeyPath="yes" />
68+
<Component>
69+
<File Source="README.md" />
7970
</Component>
8071

8172
<Component>
@@ -90,25 +81,27 @@
9081

9182
<Component Id="CommonPythonRegistration">
9283
<RegistryKey Root="HKLM" Key="Software\Python\IronPython">
93-
<RegistryValue Name="DisplayName" Type="string" Value="IronPython" KeyPath="yes" />
94-
<RegistryValue Name="SupportUrl" Type="string" Value="http://www.ironpython.net/" KeyPath="no" />
84+
<RegistryValue Name="DisplayName" Type="string" Value="IronPython" />
85+
<RegistryValue Name="SupportUrl" Type="string" Value="https://ironpython.net/" />
9586
</RegistryKey>
9687
</Component>
9788

9889
<Component Id="PythonRegistration">
9990
<RegistryKey Root="HKLM" Key="Software\Python\IronPython\$(var.ReleaseSeries)">
100-
<RegistryValue Name="DisplayName" Type="string" Value="IronPython $(var.ReleaseSeries) (64-bit)" KeyPath="yes" />
101-
<RegistryValue Name="SupportUrl" Type="string" Value="http://www.ironpython.net/" KeyPath="no" />
102-
<RegistryValue Name="Version" Type="string" Value="$(var.ProductVersionText)" KeyPath="no" />
103-
<RegistryValue Name="SysVersion" Type="string" Value="$(var.ReleaseSeries)" KeyPath="no" />
104-
<RegistryValue Name="SysArchitecture" Type="string" Value="64bit" KeyPath="no" />
91+
<RegistryValue Name="DisplayName" Type="string" Value="IronPython $(var.ReleaseSeries) (64-bit)" />
92+
<RegistryValue Name="SupportUrl" Type="string" Value="https://ironpython.net/" />
93+
<RegistryValue Name="Version" Type="string" Value="$(var.ProductVersionText)" />
94+
<RegistryValue Name="SysVersion" Type="string" Value="$(var.ReleaseSeries)" />
95+
<RegistryValue Name="SysArchitecture" Type="string" Value="64bit" />
96+
<RegistryValue Name="PathEnvironmentVariable" Type="string" Value="IRONPYTHONPATH" />
10597
</RegistryKey>
10698
<RegistryKey Root="HKLM" Key="Software\Python\IronPython\$(var.ReleaseSeries)-32">
107-
<RegistryValue Name="DisplayName" Type="string" Value="IronPython $(var.ReleaseSeries) (32-bit)" KeyPath="no" />
108-
<RegistryValue Name="SupportUrl" Type="string" Value="http://www.ironpython.net/" KeyPath="no" />
109-
<RegistryValue Name="Version" Type="string" Value="$(var.ProductVersionText)" KeyPath="no" />
110-
<RegistryValue Name="SysVersion" Type="string" Value="$(var.ReleaseSeries)" KeyPath="no" />
111-
<RegistryValue Name="SysArchitecture" Type="string" Value="32bit" KeyPath="no" />
99+
<RegistryValue Name="DisplayName" Type="string" Value="IronPython $(var.ReleaseSeries) (32-bit)" />
100+
<RegistryValue Name="SupportUrl" Type="string" Value="https://ironpython.net/" />
101+
<RegistryValue Name="Version" Type="string" Value="$(var.ProductVersionText)" />
102+
<RegistryValue Name="SysVersion" Type="string" Value="$(var.ReleaseSeries)" />
103+
<RegistryValue Name="SysArchitecture" Type="string" Value="32bit" />
104+
<RegistryValue Name="PathEnvironmentVariable" Type="string" Value="IRONPYTHONPATH" />
112105
</RegistryKey>
113106
</Component>
114107

@@ -121,34 +114,19 @@
121114
</RegistryKey>
122115
</Component>
123116

124-
</DirectoryRef>
125-
126-
<DirectoryRef Id="GAC">
127-
<Component Guid="{38CF0071-81C1-41A2-9F64-F3667160A5F5}">
128-
<File Id="gac_IronPython.dll" Name="IronPython.dll" Assembly=".net" KeyPath="yes" Source="$(var.PlatformDir)\IronPython.dll">
129-
<netfx:NativeImage Id="ngen_IronPython.dll" Platform="all" AppBaseDirectory="INSTALLDIR" />
130-
</File>
131-
</Component>
132-
<!--
133-
<Component Guid="{40B104FB-E966-425C-A960-7DB19E3344E3}">
134-
<File Id="policy.$(var.ReleaseSeries).IronPython.dll" KeyPath="yes"
135-
Source="$(var.BuildDir)\policy.$(var.ReleaseSeries).IronPython.dll" Assembly=".net" />
136-
<File Id="policy.$(var.ReleaseSeries).IronPython.config" KeyPath="no"
137-
Source="$(var.BuildDir)\policy.IronPython.config" />
138-
</Component> -->
139-
140-
<Component Guid="{24B20236-2211-46B6-816E-A2118BDE76C9}">
141-
<File Id="gac_IronPython.Modules.dll" Name="IronPython.Modules.dll" Assembly=".net" KeyPath="yes" Source="$(var.PlatformDir)\IronPython.Modules.dll">
142-
<netfx:NativeImage Id="ngen_IronPython.Modules.dll" Platform="all" AppBaseDirectory="INSTALLDIR" />
143-
</File>
117+
<Component Id="InstallPathRegistry">
118+
<RegistryKey Root="HKLM" Key="Software\Python\IronPython\$(var.ReleaseSeries)">
119+
<RegistryValue Key="InstallPath" Type="string" Value="[INSTALLDIR]" />
120+
<RegistryValue Key="InstallPath" Name="ExecutablePath" Type="string" Value="[INSTALLDIR]ipy.exe" />
121+
<RegistryValue Key="InstallPath" Name="WindowedExecutablePath" Type="string" Value="[INSTALLDIR]ipyw.exe" />
122+
</RegistryKey>
123+
<RegistryKey Root="HKLM" Key="Software\Python\IronPython\$(var.ReleaseSeries)-32">
124+
<RegistryValue Key="InstallPath" Type="string" Value="[INSTALLDIR]" />
125+
<RegistryValue Key="InstallPath" Name="ExecutablePath" Type="string" Value="[INSTALLDIR]ipy32.exe" />
126+
<RegistryValue Key="InstallPath" Name="WindowedExecutablePath" Type="string" Value="[INSTALLDIR]ipyw32.exe" />
127+
</RegistryKey>
144128
</Component>
145129

146-
<!-- <Component Guid="{9883A38B-A77C-4818-A13E-029F33A2D914}">
147-
<File Id="policy.$(var.ReleaseSeries).IronPython.Modules.dll" KeyPath="yes"
148-
Source="$(var.BuildDir)\policy.$(var.ReleaseSeries).IronPython.Modules.dll" Assembly=".net" />
149-
<File Id="policy.$(var.ReleaseSeries).IronPython.Modules.config" KeyPath="no"
150-
Source="$(var.BuildDir)\policy.IronPython.Modules.config" />
151-
</Component> -->
152130
</DirectoryRef>
153131

154132
<ComponentGroup Id="IronPython">
@@ -157,8 +135,11 @@
157135
<ComponentRef Id="IronPython.Wpf.dll" />
158136
<ComponentRef Id="IronPython.SQLite.dll" />
159137
<ComponentRef Id="ipy.exe" />
138+
<ComponentRef Id="ipy32.exe" />
160139
<ComponentRef Id="ipyw.exe" />
140+
<ComponentRef Id="ipyw32.exe" />
161141
<ComponentRef Id="ipyc.exe" />
142+
<ComponentRef Id="IKVM.Reflection.dll" />
162143
<ComponentRef Id="README.md" />
163144
<ComponentRef Id="System.Buffers.dll" />
164145
<ComponentRef Id="System.Memory.dll" />
@@ -169,13 +150,7 @@
169150
<ComponentRef Id="CommonPythonRegistration" />
170151
<ComponentRef Id="PythonRegistration" />
171152
<ComponentRef Id="PythonPathRegistry" />
172-
</ComponentGroup>
173-
174-
<ComponentGroup Id="IronPythonGac">
175-
<ComponentRef Id="gac_IronPython.dll" />
176-
<!-- <ComponentRef Id="policy.$(var.ReleaseSeries).IronPython.dll"/> -->
177-
<ComponentRef Id="gac_IronPython.Modules.dll" />
178-
<!-- <ComponentRef Id="policy.$(var.ReleaseSeries).IronPython.Modules.dll"/> -->
153+
<ComponentRef Id="InstallPathRegistry" />
179154
</ComponentGroup>
180155
</Fragment>
181156
</Wix>

0 commit comments

Comments
 (0)