Skip to content

Commit 2e51d56

Browse files
committed
Remove target net6.0
1 parent 728f523 commit 2e51d56

File tree

17 files changed

+15
-90
lines changed

17 files changed

+15
-90
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ jobs:
3333
uses: actions/setup-dotnet@v4
3434
with:
3535
dotnet-version: '8.0.x'
36-
- name: Setup .NET 6.0
37-
uses: actions/setup-dotnet@v4
38-
with:
39-
dotnet-version: '6.0.x'
4036

4137
# CI debug information
4238
- name: Version Information
@@ -65,7 +61,7 @@ jobs:
6561
fail-fast: false
6662
matrix:
6763
os: [windows-latest, ubuntu-22.04, macos-14]
68-
framework: ['net462', 'net6.0', 'net8.0', 'net10.0']
64+
framework: ['net462', 'net8.0', 'net10.0']
6965

7066
steps:
7167
# Prerequisites
@@ -86,10 +82,6 @@ jobs:
8682
uses: actions/setup-dotnet@v4
8783
with:
8884
dotnet-version: '8.0.x'
89-
- name: Setup .NET 6.0
90-
uses: actions/setup-dotnet@v4
91-
with:
92-
dotnet-version: '6.0.x'
9385

9486
# Build & Test
9587
- name: Build

.vsts-ci.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ jobs:
8888
osName: Linux
8989
imageName: ubuntu-22.04
9090
framework: net462
91-
linux_net6_0:
92-
osName: Linux
93-
imageName: ubuntu-22.04
94-
framework: net6.0
9591
linux_net8_0:
9692
osName: Linux
9793
imageName: ubuntu-22.04
@@ -100,10 +96,6 @@ jobs:
10096
osName: macOS
10197
imageName: macOS-14
10298
framework: net462
103-
macos_net6_0:
104-
osName: macOS
105-
imageName: macOS-14
106-
framework: net6.0
10799
macos_net8_0:
108100
osName: macOS
109101
imageName: macOS-14
@@ -112,10 +104,6 @@ jobs:
112104
osName: Windows
113105
imageName: windows-latest
114106
framework: net462
115-
windows_net6_0:
116-
osName: Windows
117-
imageName: windows-latest
118-
framework: net6.0
119107
windows_net8_0:
120108
osName: Windows
121109
imageName: windows-latest
@@ -159,11 +147,6 @@ jobs:
159147
inputs:
160148
packageType: 'runtime'
161149
version: '8.0.x'
162-
- task: UseDotNet@2
163-
displayName: Install .NET 6.0 runtime for testing
164-
inputs:
165-
packageType: 'runtime'
166-
version: '6.0.x'
167150

168151
# Build & Test
169152
- powershell: ./make.ps1

IronPython.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB
3535
ProjectSection(SolutionItems) = preProject
3636
eng\After.targets = eng\After.targets
3737
eng\net462.props = eng\net462.props
38-
eng\net6.0-windows.props = eng\net6.0-windows.props
39-
eng\net6.0.props = eng\net6.0.props
4038
eng\net8.0-windows.props = eng\net8.0-windows.props
4139
eng\net8.0.props = eng\net8.0.props
4240
eng\net9.0-windows.props = eng\net9.0-windows.props

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ See the [building document](https://github.com/IronLanguages/ironpython3/wiki/Bu
152152

153153
## Supported Platforms
154154

155-
IronPython 3 targets .NET Framework 4.6.2, .NET Standard 2.0, .NET 6.0, .NET 8.0, and .NET 10.0. The support for .NET and .NET Core follow the lifecycle defined on [.NET and .NET Core Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core).
155+
IronPython 3 targets .NET Framework 4.6.2, .NET Standard 2.0, .NET 8.0, and .NET 10.0. The support for .NET and .NET Core follow the lifecycle defined on [.NET and .NET Core Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core).

eng/net6.0-windows.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

eng/net6.0.props

Lines changed: 0 additions & 39 deletions
This file was deleted.

eng/package/nuget/IronPython.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ This package contains the IronPython interpreter engine.</description>
4040
</dependencies>
4141
</metadata>
4242
<files>
43-
<file src="**\IronPython*.dll" target="lib" exclude="**\IronPythonTest.dll;**\DLLs\*.dll;net6.0\**\*;net9.0*\**\*" />
44-
<file src="**\IronPython*.pdb" target="lib" exclude="**\IronPythonTest.pdb;**\DLLs\*.pdb;net6.0\**\*;net9.0*\**\*" />
45-
<file src="**\IronPython*.xml" target="lib" exclude="**\IronPythonTest.xml;**\DLLs\*.xml;net6.0\**\*;net9.0*\**\*" />
43+
<file src="**\IronPython*.dll" target="lib" exclude="**\IronPythonTest.dll;**\DLLs\*.dll;net9.0*\**\*" />
44+
<file src="**\IronPython*.pdb" target="lib" exclude="**\IronPythonTest.pdb;**\DLLs\*.pdb;net9.0*\**\*" />
45+
<file src="**\IronPython*.xml" target="lib" exclude="**\IronPythonTest.xml;**\DLLs\*.xml;net9.0*\**\*" />
4646
<file src="LICENSE" />
4747
<file src="..\..\..\..\eng\package\nuget\README.md" target="" />
4848
<file src="..\..\..\..\docs\logo.png" target="" />

eng/package/zip/Zip.Packaging.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<MakeDir Directories="$(PackageDir)" Condition="!Exists('$(PackageDir)')"/>
55

66
<ItemGroup>
7-
<ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\README.md;$(StageDir)\**\*.pdb;$(StageDir)\netstandard2.0\**\*;$(StageDir)\net6.0\**\*;$(StageDir)\net9.0*\**\*" />
7+
<ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\README.md;$(StageDir)\**\*.pdb;$(StageDir)\netstandard2.0\**\*;$(StageDir)\net9.0*\**\*" />
88
<ZipFiles Include="README.md" Link="$(MSBuildThisFileDirectory)README.md" />
99
<ZipFiles Include="scripts/Enter-IronPythonEnvironment.ps1" Link="$(RootDir)eng\scripts\Enter-IronPythonEnvironment.ps1" />
1010
<ZipFiles Include="scripts/Install-IronPython.ps1" Link="$(RootDir)eng\scripts\Install-IronPython.ps1" />

make.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Param(
44
[Parameter(Position=1)]
55
[String] $target = "build",
66
[String] $configuration = "Release",
7-
[String[]] $frameworks=@('net462','net6.0','net8.0','net10.0'),
7+
[String[]] $frameworks=@('net462','net8.0','net10.0'),
88
[String] $platform = $null, # auto-detect
99
[switch] $runIgnored,
1010
[int] $jobs = [System.Environment]::ProcessorCount

src/core/IronPython.Modules/IronPython.Modules.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<BaseAddress>885063680</BaseAddress>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

0 commit comments

Comments
 (0)