Skip to content

Commit eb5d3fe

Browse files
authored
Do not stage IronPythonTest products (#1580)
1 parent 7cc6d84 commit eb5d3fe

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

Build/After.targets

Lines changed: 3 additions & 4 deletions
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
<Choose>
4-
<When Condition=" '$(OutputType)' == 'Library' ">
4+
<When Condition=" '$(OutputType)' == 'Library' AND '$(PreventStaging)' != 'true' ">
55
<ItemGroup>
66
<StageItem Include="$(TargetPath)" />
77
<StageItem Include="$(DocumentationFile)" />
@@ -10,7 +10,7 @@
1010
<StageItem Include="$(TargetDir)$(TargetName).pdb" Condition=" Exists('$(TargetDir)$(TargetName).pdb') " />
1111
</ItemGroup>
1212
</When>
13-
<When Condition=" '$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe' ">
13+
<When Condition=" ('$(OutputType)' == 'Exe' OR '$(OutputType)' == 'WinExe') AND '$(PreventStaging)' != 'true' ">
1414
<ItemGroup>
1515
<StageItem Include="$(TargetPath)" />
1616
<StageItem Include="$(TargetPath).config" Condition=" Exists('$(TargetPath).config') " />
@@ -29,7 +29,7 @@
2929

3030
<Target Name="_LateStage"
3131
DependsOnTargets="CoreBuild"
32-
Condition=" '$(Staging)' == 'true' ">
32+
Condition=" '$(Staging)' == 'true' AND '$(PreventStaging)' != 'true' ">
3333
<CreateItem Include="@(LateStageItem)">
3434
<Output TaskParameter="Include" ItemName="StageItem" />
3535
</CreateItem>
@@ -50,4 +50,3 @@
5050

5151
<Target Name="Stage" DependsOnTargets="_LateStage;_MainStage;_StoreInDLLs" />
5252
</Project>
53-

Package/deb/Deb.Packaging.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

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

1919
<ItemGroup>

Package/dotnettool/IronPython.Console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ This package contains a standalone Python interpreter, invokable from the comman
4545
<ItemGroup>
4646
<ToolFiles Include="$(StageDir)\$(TargetFramework)\ipy.deps.json" />
4747
<ToolFiles Include="$(StageDir)\$(TargetFramework)\ipy.dll" />
48-
<ToolFiles Include="$(StageDir)\$(TargetFramework)\IronPython*.dll" Exclude="$(StageDir)\$(TargetFramework)\IronPythonTest.dll" />
48+
<ToolFiles Include="$(StageDir)\$(TargetFramework)\IronPython*.dll" />
4949
<ToolFiles Include="$(StageDir)\$(TargetFramework)\**\DLLs\*.dll" />
5050
</ItemGroup>
5151

Package/pkg/Pkg.Packaging.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

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

2222
<ItemGroup>

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)\**\IronPythonTest.*;$(StageDir)\**\*.pdb;$(StageDir)\netcoreapp2.1\**\*;$(StageDir)\net7.0*\**\*" />
7+
<ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\**\*.pdb;$(StageDir)\netcoreapp2.1\**\*;$(StageDir)\net7.0*\**\*" />
88
</ItemGroup>
99
<Zip Files="@(ZipFiles)" ZipFileName="$(PackageDir)\IronPython.$(PackageVersion).zip" WorkingDirectory="$(StageDir)" />
1010

Src/IronPythonTest/IronPythonTest.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
55
<!-- EOL netcoreapp2.1 is used to test netstandard2.0 assemblies -->
66
<CheckEolTargetFramework>false</CheckEolTargetFramework>
7+
<PreventStaging>true</PreventStaging>
78
</PropertyGroup>
89

910
<ItemGroup>

0 commit comments

Comments
 (0)