Skip to content

Commit 0fe34b2

Browse files
BCSharpBCSharp
committed
Add target net11.0 conditionally
1 parent ed17122 commit 0fe34b2

13 files changed

Lines changed: 68 additions & 6 deletions

File tree

‎eng/net11.0-windows.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
4+
<IntermediateOutputPath Condition=" '$(TargetFramework)' == 'net11.0-windows' ">$(BaseIntermediateOutputPath)$(Configuration)\net11.0</IntermediateOutputPath>
5+
<OutputPath Condition=" '$(TargetFramework)' == 'net11.0-windows' ">$(BaseOutputPath)\net11.0</OutputPath>
6+
</PropertyGroup>
7+
8+
<Import Project="net11.0.props" />
9+
</Project>

‎eng/net11.0.props‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<IsFullFramework>false</IsFullFramework>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<Features>$(Features);FEATURE_APARTMENTSTATE</Features>
9+
<Features>$(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES</Features>
10+
<Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
11+
<Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
12+
<Features>$(Features);FEATURE_CODEDOM</Features>
13+
<Features>$(Features);FEATURE_COM</Features>
14+
<Features>$(Features);FEATURE_CONFIGURATION</Features>
15+
<Features>$(Features);FEATURE_CTYPES</Features>
16+
<Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
17+
<Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
18+
<Features>$(Features);FEATURE_FILESYSTEM</Features>
19+
<Features>$(Features);FEATURE_FULL_CRYPTO</Features>
20+
<Features>$(Features);FEATURE_FULL_NET</Features>
21+
<Features>$(Features);FEATURE_LCG</Features>
22+
<Features>$(Features);FEATURE_LOADWITHPARTIALNAME</Features>
23+
<Features>$(Features);FEATURE_METADATA_READER</Features>
24+
<Features>$(Features);FEATURE_MMAP</Features>
25+
<Features>$(Features);FEATURE_NATIVE</Features>
26+
<Features>$(Features);FEATURE_OSPLATFORMATTRIBUTE</Features>
27+
<Features>$(Features);FEATURE_PIPES</Features>
28+
<Features>$(Features);FEATURE_PROCESS</Features>
29+
<Features>$(Features);FEATURE_REFEMIT</Features>
30+
<Features>$(Features);FEATURE_REGISTRY</Features>
31+
<Features>$(Features);FEATURE_RUNTIMEINFORMATION</Features>
32+
<Features>$(Features);FEATURE_SECURITY_RULES</Features>
33+
<Features>$(Features);FEATURE_STACK_TRACE</Features>
34+
<Features>$(Features);FEATURE_SYNC_SOCKETS</Features>
35+
<Features>$(Features);FEATURE_THREAD</Features>
36+
<Features>$(Features);FEATURE_XMLDOC</Features>
37+
</PropertyGroup>
38+
</Project>

‎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;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*\**\*" />
43+
<file src="**\IronPython*.dll" target="lib" exclude="**\IronPythonTest.dll;**\DLLs\*.dll;net9.0*\**\*;net11.0*\**\*" />
44+
<file src="**\IronPython*.pdb" target="lib" exclude="**\IronPythonTest.pdb;**\DLLs\*.pdb;net9.0*\**\*;net11.0*\**\*" />
45+
<file src="**\IronPython*.xml" target="lib" exclude="**\IronPythonTest.xml;**\DLLs\*.xml;net9.0*\**\*;net11.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)\net9.0*\**\*" />
7+
<ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\README.md;$(StageDir)\**\*.pdb;$(StageDir)\netstandard2.0\**\*;$(StageDir)\net9.0*\**\*;$(StageDir)\net11.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: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ function Main([String] $target, [String] $configuration) {
2929
}
3030
}
3131

32-
dotnet msbuild Build.proj /m /t:$target /p:Configuration=$configuration /verbosity:minimal /nologo /p:Platform="Any CPU" /bl:build-$target-$configuration.binlog
32+
$props = @(
33+
'Build.proj', '/m', "/t:$target",
34+
"/p:Configuration=$configuration",
35+
'/verbosity:minimal', '/nologo',
36+
'/p:Platform=Any CPU',
37+
"/bl:build-$target-$configuration.binlog"
38+
)
39+
if ($frameworks -contains 'net11.0') { $props += '/p:IncludeNet11=true' }
40+
dotnet msbuild @props
3341
# use the exit code of msbuild as the exit code for this script
3442
$global:Result = $LastExitCode
3543
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;netstandard2.0;net8.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(IncludeNet11)' == 'true'">$(TargetFrameworks);net11.0</TargetFrameworks>
56
<BaseAddress>885063680</BaseAddress>
67
<GenerateDocumentationFile>true</GenerateDocumentationFile>
78
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/core/IronPython/IronPython.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;netstandard2.0;net8.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(IncludeNet11)' == 'true'">$(TargetFrameworks);net11.0</TargetFrameworks>
56
<BaseAddress>879755264</BaseAddress>
67
<GenerateDocumentationFile>true</GenerateDocumentationFile>
78
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/dlr‎

Submodule dlr updated from 3b7c638 to ba28d1f

‎src/executables/IronPython.Console/IronPython.Console.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;net8.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(IncludeNet11)' == 'true'">$(TargetFrameworks);net11.0</TargetFrameworks>
56
<OutputType>Exe</OutputType>
67
<RootNamespace>IronPython.Console</RootNamespace>
78
<AssemblyName>ipy</AssemblyName>

‎src/executables/IronPython.Console32/IronPython.Console32.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;net8.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(IncludeNet11)' == 'true'">$(TargetFrameworks);net11.0</TargetFrameworks>
56
<PlatformTarget>x86</PlatformTarget>
67
<OutputType>Exe</OutputType>
78
<RootNamespace>IronPython.Console32</RootNamespace>

0 commit comments

Comments
 (0)