Skip to content

Commit e2d1dc3

Browse files
slozierslozier
authored
Bump up to .NET Framework 4.6.2 (IronLanguages#1484)
* Bump up to .NET Framework 4.6.2 * Update DLR
1 parent 7f76163 commit e2d1dc3

File tree

24 files changed

+38
-44
lines changed

24 files changed

+38
-44
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
with:
4646
name: packages
4747
path: Package/Release/Packages
48-
- name: Test (net46)
49-
run: ./make.ps1 -frameworks net46 test-all
48+
- name: Test (net462)
49+
run: ./make.ps1 -frameworks net462 test-all
5050
shell: pwsh
5151
- name: Test (netcoreapp2.1)
5252
run: ./make.ps1 -frameworks netcoreapp2.1 test-all

Build/net46.props renamed to Build/net462.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
4+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
55
<IsFullFramework>true</IsFullFramework>
66
</PropertyGroup>
77

‎IronPython.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ EndProject
3434
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB-40C6-41A6-83DA-3203A4DCEC19}"
3535
ProjectSection(SolutionItems) = preProject
3636
Build\After.targets = Build\After.targets
37-
Build\net46.props = Build\net46.props
37+
Build\net462.props = Build\net462.props
3838
Build\net6.0-windows.props = Build\net6.0-windows.props
3939
Build\net6.0.props = Build\net6.0.props
4040
Build\netcoreapp2.1.props = Build\netcoreapp2.1.props

‎Package/choco/IronPython.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<mailingListUrl>https://ironpython.groups.io/g/users</mailingListUrl>
2020
</metadata>
2121
<files>
22-
<file src="$STAGEDIR$\net46\*.dll;$STAGEDIR$\net46\*.exe" exclude="**\rowantest*.dll;**\IronPythonTest.dll" />
23-
<file src="$STAGEDIR$\net46\DLLs\**" target="DLLs" exclude="**\*.xml" />
22+
<file src="$STAGEDIR$\net462\*.dll;$STAGEDIR$\net462\*.exe" exclude="**\rowantest*.dll;**\IronPythonTest.dll" />
23+
<file src="$STAGEDIR$\net462\DLLs\**" target="DLLs" exclude="**\*.xml" />
2424
<file src="$STAGEDIR$\Lib\**" target="Lib" />
2525
<file src="$STAGEDIR$\LICENSE;$STAGEDIR$\README.md" />
2626
<file src="tools\*" target="tools" />

‎Package/deb/Deb.Packaging.targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ApplicationFiles Include="$(StageDir)/net46/*.exe" />
16-
<ApplicationFiles Include="$(StageDir)/net46/**/*.dll" Exclude="IronPythonTest.dll" />
15+
<ApplicationFiles Include="$(StageDir)/net462/*.exe" />
16+
<ApplicationFiles Include="$(StageDir)/net462/**/*.dll" Exclude="IronPythonTest.dll" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
2020
<ScriptFiles Include="$(PackageDebFolder)/ipy*" />
2121
</ItemGroup>
2222

2323
<!-- Build the application deb -->
24-
<Exec Command="chmod 777 $(StageDir)/net46/*.exe" />
24+
<Exec Command="chmod 777 $(StageDir)/net462/*.exe" />
2525
<Exec Command="rm -rf $(PackageTempFolder)" />
2626
<Exec Command="mkdir -p $(PackageTempFolder)/DEBIAN" />
2727
<Exec Command="cp $(PackageDebFolder)/DEBIAN/* $(PackageTempFolder)/DEBIAN"/>
@@ -41,8 +41,8 @@
4141
<Copy SourceFiles="@(StdLibFiles)" DestinationFolder="$(PackageTempFolder)/usr/lib/ironpython3.4/%(StdLibFiles.RecursiveDir)"/>
4242

4343
<Exec Command="fakeroot dpkg-deb -v --build $(PackageTempFolder)"/>
44-
<Copy
45-
SourceFiles="$(PackageDebFolder)/$(TempFolder).deb"
44+
<Copy
45+
SourceFiles="$(PackageDebFolder)/$(TempFolder).deb"
4646
DestinationFiles="$(PackageDir)/ironpython_$(PackageVersion).deb"/>
4747
<Delete Files="$(PackageDebFolder)/$(TempFolder).deb"/>
4848

‎Package/msi/IronPython.Installer.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Value>$(BindInputPaths)\Lib</Value>
3939
</WixConstant>
4040
<WixConstant Include="PlatformDir">
41-
<Value>$(BindInputPaths)\net46</Value>
41+
<Value>$(BindInputPaths)\net462</Value>
4242
</WixConstant>
4343
</ItemGroup>
4444

‎Package/msi/IronPython.wxs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@
7474
Root="HKLM" Key="SOFTWARE\IronPython\$(var.ReleaseSeries)\InstallPath" Type="string" Value="[INSTALLDIR]" />
7575
</Component>
7676

77-
<Component>
78-
<RegistryValue Id="VSNet45ReferenceAssemblyKey"
79-
Root="HKLM" Key="SOFTWARE\Microsoft\.NETFramework\v4.5.50709\AssemblyFoldersEx\$(var.ProductShortName)$(var.ReleaseSeries)" Type="string" Value="[INSTALLDIR]" />
80-
</Component>
81-
8277
<Component Id="CommonPythonRegistration">
8378
<RegistryKey Root="HKLM" Key="Software\Python\IronPython">
8479
<RegistryValue Name="DisplayName" Type="string" Value="IronPython" />
@@ -146,7 +141,6 @@
146141
<ComponentRef Id="System.Runtime.CompilerServices.Unsafe.dll" />
147142
<ComponentRef Id="LICENSE" />
148143
<ComponentRef Id="InstallationKey" />
149-
<ComponentRef Id="VSNet45ReferenceAssemblyKey" />
150144
<ComponentRef Id="CommonPythonRegistration" />
151145
<ComponentRef Id="PythonRegistration" />
152146
<ComponentRef Id="PythonPathRegistry" />

‎Package/nuget/IronPython.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<language>en-US</language>
1616
<tags>ironpython python dynamic dlr</tags>
1717
<dependencies>
18-
<group targetFramework="net46">
18+
<group targetFramework="net462">
1919
<dependency id="DynamicLanguageRuntime" version="1.3.2" />
2020
<dependency id="System.Memory" version="4.5.4" />
2121
</group>

‎Package/nuget/NuGet.Packaging.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.Build.NoTargets/3.3.0">
22

33
<PropertyGroup>
4-
<TargetFramework>net46</TargetFramework>
4+
<TargetFramework>net462</TargetFramework>
55
<NuspecBasePath>$(StageDir)</NuspecBasePath>
66
<NuspecProperties>version=$(PackageVersion)</NuspecProperties>
77
<IncludeBuildOutput>false</IncludeBuildOutput>

‎Package/pkg/Pkg.Packaging.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<ApplicationFiles Include="$(StageDir)/net46/*.exe" />
19-
<ApplicationFiles Include="$(StageDir)/net46/*.dll" Exclude="IronPythonTest.dll" />
18+
<ApplicationFiles Include="$(StageDir)/net462/*.exe" />
19+
<ApplicationFiles Include="$(StageDir)/net462/*.dll" Exclude="IronPythonTest.dll" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<DLLFiles Include="$(StageDir)/net46/DLLs/*.dll" />
23+
<DLLFiles Include="$(StageDir)/net462/DLLs/*.dll" />
2424
</ItemGroup>
2525

26-
<Exec Command="chmod 777 $(StageDir)/net46/*.exe" />
26+
<Exec Command="chmod 777 $(StageDir)/net462/*.exe" />
2727
<Exec Command="rm -rf $(PackageTempFolder)" />
2828
<Exec Command="mkdir -p $(PackageTempFolder)" />
2929

0 commit comments

Comments
 (0)