Skip to content

Commit 418570a

Browse files
max-charlambmax-charlamb
committed
remove helix references
1 parent 1c87d1c commit 418570a

File tree

2 files changed

+5
-122
lines changed

2 files changed

+5
-122
lines changed

‎eng/build.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,6 @@ if [[ "$__RunTests" == 1 ]]; then
314314
export SOS_TEST_CDAC="true"
315315
fi
316316

317-
if [[ "$__UseHelix" == 1 ]]; then
318-
__ManagedBuildArgs="$__ManagedBuildArgs /p:UseHelix=true"
319-
fi
320-
321317
# __CommonMSBuildArgs contains TargetOS property
322318
"$__RepoRootDir/eng/common/build.sh" \
323319
--test \

‎tests/Directory.Build.targets‎

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

1414
<ItemGroup Condition="'$(NeedsCdb)' == 'true' and '$(BuildTests)' == 'true'">
15-
<PackageDownload Include="cdb-sos"
15+
<PackageDownload Include="cdb-sos"
1616
Version="[$(cdbsosversion)]" />
1717
</ItemGroup>
1818

1919
<ItemGroup Condition="'$(NeedsTestAssets)' == 'true' and '$(BuildTests)' == 'true' and '$(OS)' == 'Windows_NT'">
20-
<PackageDownload Include="TestAssets.Windows.x64.6.0"
20+
<PackageDownload Include="TestAssets.Windows.x64.6.0"
2121
Version="[$(TestAssetsVersion)]" />
22-
<PackageDownload Include="TestAssets.Windows.x86.6.0"
22+
<PackageDownload Include="TestAssets.Windows.x86.6.0"
2323
Version="[$(TestAssetsVersion)]" />
2424
</ItemGroup>
2525

2626
<ItemGroup Condition="'$(NeedsTestAssets)' == 'true' and '$(BuildTests)' == 'true' and ('$(OS)' == 'Unix' OR '$(OS)' == 'Windows_NT')">
27-
<PackageDownload Include="TestAssets.Linux.x64.6.0"
27+
<PackageDownload Include="TestAssets.Linux.x64.6.0"
2828
Version="[$(TestAssetsVersion)]" />
29-
<PackageDownload Include="TestAssets.Linux.arm64.6.0"
29+
<PackageDownload Include="TestAssets.Linux.arm64.6.0"
3030
Version="[$(TestAssetsVersion)]" />
3131
</ItemGroup>
3232

@@ -43,119 +43,6 @@
4343
<MSBuild Projects="$(RepositoryEngineeringDir)InstallRuntimes.proj" Targets="InstallTestRuntimes" />
4444
</Target>
4545

46-
<Target Name="_PrepareTestingAssets"
47-
Condition="'$(BuildTests)' == 'true'"
48-
AfterTargets="Build"
49-
DependsOnTargets="_CopyDebugTestAssets;_CompressTest" />
50-
51-
<Target Name="_CopyDebugTestAssets">
52-
<ItemGroup>
53-
<_cdbFiles Include="$(NuGetPackageRoot)cdb-sos\$(cdbsosversion)\**\*"
54-
Condition="'$(NeedsCdb)' == 'true'" />
55-
56-
<_testAssetsWinx64 Include="$(NuGetPackageRoot)testassets.windows.x64.6.0\$(TestAssetsVersion)\**\*"
57-
Condition="'$(NeedsTestAssets)' == 'true' and '$(OS)' == 'Windows_NT'" />
58-
59-
<_testAssetsWinx86 Include="$(NuGetPackageRoot)testassets.windows.x86.6.0\$(TestAssetsVersion)\**\*"
60-
Condition="'$(NeedsTestAssets)' == 'true' and '$(OS)' == 'Windows_NT'" />
61-
62-
<_testAssetsLinux64 Include="$(NuGetPackageRoot)testassets.linux.x64.6.0\$(TestAssetsVersion)\**\*"
63-
Condition="'$(NeedsTestAssets)' == 'true'" />
64-
65-
<_testAssetsLinuxArm64 Include="$(NuGetPackageRoot)testassets.linux.arm64.6.0\$(TestAssetsVersion)\**\*"
66-
Condition="'$(NeedsTestAssets)' == 'true'" />
67-
</ItemGroup>
68-
69-
<Copy SourceFiles="@(_cdbFiles)"
70-
DestinationFiles="@(_cdbFiles->'$(PackageArtifactsRootDir)cdb-sos\%(RecursiveDir)%(Filename)%(Extension)')"
71-
SkipUnchangedFiles="true" />
72-
73-
<Copy SourceFiles="@(_testAssetsWinx64)"
74-
DestinationFiles="@(_testAssetsWinx64->'$(PackageArtifactsRootDir)testassets.windows.x64.6.0\%(RecursiveDir)%(Filename)%(Extension)')" />
75-
76-
<Copy SourceFiles="@(_testAssetsWinx86)"
77-
DestinationFiles="@(_testAssetsWinx86->'$(PackageArtifactsRootDir)testassets.windows.x86.6.0\%(RecursiveDir)%(Filename)%(Extension)')" />
78-
79-
<Copy SourceFiles="@(_testAssetsLinux64)"
80-
DestinationFiles="@(_testAssetsLinux64->'$(PackageArtifactsRootDir)testassets.linux.x64.6.0\%(RecursiveDir)%(Filename)%(Extension)')" />
81-
82-
<Copy SourceFiles="@(_testAssetsLinuxArm64)"
83-
DestinationFiles="@(_testAssetsLinuxArm64->'$(PackageArtifactsRootDir)testassets.linux.arm64.6.0\%(RecursiveDir)%(Filename)%(Extension)')" />
84-
</Target>
85-
86-
<Target Name="_CompressTest"
87-
Condition="'$(ArchiveTests)' == 'true' and '$(IsTestProject)' == 'true'"
88-
DependsOnTargets="_ZipTestArchive" />
89-
90-
<Target Name="_ZipTestArchive"
91-
Condition="'$(OutDir)' != ''">
92-
<PropertyGroup>
93-
<_ZipSourceDirectory>$(OutDir)</_ZipSourceDirectory>
94-
<_ZipSourceDirectory Condition="'$(NeedsPublishing)' == 'true'">$(PublishDir)</_ZipSourceDirectory>
95-
</PropertyGroup>
96-
97-
<MakeDir Directories="$(TestArchiveTestsDir)" />
98-
99-
<!-- We're going to just build the debuggees as needed on helix -->
100-
<ItemGroup Condition="'$(NeedsDebuggees)' == 'true'">
101-
<_TempZipFiles Include="$(_ZipSourceDirectory)*" />
102-
<_TempZipFiles Include="$(DebuggerVersionConfigFileName)" />
103-
<_TempZipFiles Include="$(XunitConsoleNetCoreAppPath)" />
104-
<_DebuggeeFiles Include="$(DebuggeeSourceRootDir)**\*" />
105-
<_DebuggeeArtifactFiles Include="$(DebuggeeArtifactsRootDir)**\*" />
106-
<_AuxMsBuildFiles Include="$(AuxMSBuildRootDir)**\*" />
107-
<_TestPackageFiles Include="$(PackageArtifactsRootDir)**\*" />
108-
<_DebuggerNativeFiles Include="$(ArtifactsBinNativeDir)**\*" />
109-
</ItemGroup>
110-
111-
<PropertyGroup Condition="'$(NeedsDebuggees)' == 'true'">
112-
<_TempZipDir>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'TempZip'))</_TempZipDir>
113-
</PropertyGroup>
114-
115-
<MakeDir Condition="'$(NeedsDebuggees)' == 'true'" Directories="$(_TempZipDir)" />
116-
<MakeDir Condition="'$(NeedsDebuggees)' == 'true'" Directories="$(_TempZipDir)eng\AuxMsbuildFiles\" />
117-
<MakeDir Condition="'$(NeedsDebuggees)' == 'true'" Directories="$(_TempZipDir)tests\Debuggees\" />
118-
<MakeDir Condition="'$(NeedsDebuggees)' == 'true'" Directories="$(_TempZipDir)artifacts\bin\debuggees\" />
119-
<MakeDir Condition="'$(NeedsDebuggees)' == 'true'" Directories="$(_TempZipDir)packages\" />
120-
<MakeDir Condition="'$(NeedsDebuggees)' == 'true'" Directories="$(_TempZipDir)native\" />
121-
122-
<Copy Condition="'$(NeedsDebuggees)' == 'true'"
123-
SourceFiles="@(_TempZipFiles)"
124-
DestinationFiles="@(_TempZipFiles->'$(_TempZipDir)%(RecursiveDir)%(Filename)%(Extension)')" />
125-
126-
<Copy Condition="'$(NeedsDebuggees)' == 'true'"
127-
SourceFiles="@(_DebuggerNativeFiles)"
128-
DestinationFiles="@(_DebuggerNativeFiles->'$(_TempZipDir)native\%(RecursiveDir)%(Filename)%(Extension)')" />
129-
130-
<Copy Condition="'$(NeedsDebuggees)' == 'true'"
131-
SourceFiles="@(_AuxMsBuildFiles)"
132-
DestinationFiles="@(_AuxMsBuildFiles->'$(_TempZipDir)eng\AuxMsbuildFiles\%(RecursiveDir)%(Filename)%(Extension)')" />
133-
134-
<Copy Condition="'$(NeedsDebuggees)' == 'true'"
135-
SourceFiles="@(_DebuggeeFiles)"
136-
DestinationFiles="@(_DebuggeeFiles->'$(_TempZipDir)tests\Debuggees\%(RecursiveDir)%(Filename)%(Extension)')" />
137-
138-
<Copy Condition="'$(NeedsDebuggees)' == 'true'"
139-
SourceFiles="@(_DebuggeeArtifactFiles)"
140-
DestinationFiles="@(_DebuggeeArtifactFiles->'$(_TempZipDir)artifacts\bin\debuggees\%(RecursiveDir)%(Filename)%(Extension)')" />
141-
142-
<Copy Condition="'$(NeedsDebuggees)' == 'true'"
143-
SourceFiles="@(_TestPackageFiles)"
144-
DestinationFiles="@(_TestPackageFiles->'$(_TempZipDir)packages\%(RecursiveDir)%(Filename)%(Extension)')" />
145-
146-
<ZipDirectory Condition="'$(NeedsDebuggees)' == 'true'"
147-
SourceDirectory="$(_TempZipDir)"
148-
DestinationFile="$([MSBuild]::NormalizePath('$(TestArchiveTestsDir)', '$(MSBuildProjectName).zip'))"
149-
Overwrite="true" />
150-
151-
<ZipDirectory Condition="'$(NeedsDebuggees)' != 'true'"
152-
SourceDirectory="$(_ZipSourceDirectory)"
153-
DestinationFile="$([MSBuild]::NormalizePath('$(TestArchiveTestsDir)', '$(MSBuildProjectName).zip'))"
154-
Overwrite="true" />
155-
156-
<RemoveDir Condition="'$(NeedsDebuggees)' == 'true'" Directories="$(_TempZipDir)" />
157-
</Target>
158-
15946
<Target Name="WriteTestVersionManifest"
16047
BeforeTargets="Build"
16148
Inputs="$(VersionsPropsPath)"

0 commit comments

Comments
 (0)