Skip to content

Remove optional consumption of CoreCLR transport packages in CoreCLR test build. #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 1 commit into from
Nov 25, 2019
Merged

Remove optional consumption of CoreCLR transport packages in CoreCLR test build. #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/coreclr/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
Expand Down Expand Up @@ -35,12 +34,6 @@
<DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
<RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
</DependencyBuildInfo>

<XmlUpdateStep Include="CoreClr">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>MicrosoftNETCoreRuntimeCoreCLRPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
</XmlUpdateStep>
</ItemGroup>

<!-- Override isolated build dependency versions with versions from Repo API. -->
Expand Down
27 changes: 7 additions & 20 deletions src/coreclr/tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<PropertyGroup>
<RunningOnUnix Condition="('$(RunningOnUnix)' == '') And ('$(MSBuildRuntimeType)' == 'Core') And ('$(OS)'!='Windows_NT')">true</RunningOnUnix>
</PropertyGroup>
</PropertyGroup>

<!-- Common repo directories -->
<PropertyGroup>
Expand Down Expand Up @@ -51,27 +51,14 @@
<RestorePackages>false</RestorePackages>
</PropertyGroup>

<PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
<BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile>
</PropertyGroup>

<!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in artifacts/obj -->
<Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" />

<PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
<VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore>
<VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionToRestore>
<PackageVersionArg>/p:MicrosoftNETCoreRuntimeCoreCLRPackageVersion=$(VersionToRestore)</PackageVersionArg>
</PropertyGroup>

<!-- Which tests shall we build? Default: Priority 0 tests.
At the command-line, the user can specify /p:CLRTestPriorityToBuild=666 (for example), and
all tests with CLRTestPriority 666,..., 1 AND 0 will build.
all tests with CLRTestPriority 666,..., 1 AND 0 will build.

Consequently, specifying CLRTestPriorityToBuild=1 will build all tests with CLRTestPriority 1 and 0.
CLRTestPriority = 0 will build only priority 0 cases.

CLRTestPriority = 0 will build only priority 0 cases.

In other words, the CLRTestPriority cases of 0 are *essential* testcases. The higher the value,
the less priority we give them.
-->
Expand All @@ -86,5 +73,5 @@
<NETCoreAppTestHostFxrPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'host', 'fxr', '$(TestHostVersion)'))</NETCoreAppTestHostFxrPath>
<NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(TestHostVersion)'))</NETCoreAppTestSharedFrameworkPath>
</PropertyGroup>

</Project>
2 changes: 0 additions & 2 deletions src/coreclr/tests/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

<ItemGroup>
<RestoreProjects Include="$(MSBuildThisFileDirectory)scripts\scripts.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj" />
Expand Down
12 changes: 0 additions & 12 deletions src/coreclr/tests/publishdependency.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,6 @@
<CoreRootProjectFiles Include="$(SourceDir)Common\test_runtime\test_runtime.csproj" />
</ItemGroup>

<ItemGroup>
<RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\obj\project.assets.json"/>
</ItemGroup>

<ItemGroup>
<ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\obj\project.assets.json"/>
</ItemGroup>

<ItemGroup>
<CrossGenFiles Include="$(NuGetPackageRoot)\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/>
</ItemGroup>

<PropertyGroup>
<ProductDestination>$(RootRepoDir)\artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)</ProductDestination>
<RefDestination>$(ProductDestination)\ref</RefDestination>
Expand Down
35 changes: 0 additions & 35 deletions ...clr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions src/coreclr/tests/src/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
<DisabledProjects Include="Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" />
<DisabledProjects Include="Common\test_runtime\test_runtime.csproj" />
<DisabledProjects Include="Common\test_dependencies\test_dependencies.csproj" />
<DisabledProjects Include="Common\CoreFX\TestFileSetup\CoreFX.TestUtils.TestFileSetup.csproj" />
<DisabledProjects Include="Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" />
<DisabledProjects Include="Common\targeting_pack_ref\targeting_pack_ref.csproj" />
<DisabledProjects Include="Common\CoreFX\TestFileSetup\CoreFX.TestUtils.TestFileSetup.csproj" />
<DisabledProjects Include="Common\PerfHarness\PerfHarness.csproj" />
<DisabledProjects Include="Common\stress_dependencies\stress_dependencies.csproj" />
<DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" />
Expand Down Expand Up @@ -125,7 +123,7 @@
</Target>

<Import Project="..\dir.traversal.targets" />

<!-- Override clean from dir.traversal.targets and just remove the full BinDir -->
<Target Name="Clean">
<RemoveDir Directories="$(BinDir)" />
Expand Down
13 changes: 0 additions & 13 deletions src/coreclr/tests/src/runtest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,22 +354,9 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
</ItemGroup>
</Target>

<!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in artifacts/obj -->
<Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" />

<PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
<VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore>
<VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionToRestore>
<DesiredPackageVersionArg>$(VersionToRestore)</DesiredPackageVersionArg>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)../tests.targets" />
<Import Project="$(MSBuildThisFileDirectory)../publishdependency.targets" />

<PropertyGroup>
<DesiredPackageVersionArg Condition="'$(DesiredPackageVersionArg)' == ''">$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</DesiredPackageVersionArg>
</PropertyGroup>

<Target Name="CreateTestOverlay">
<MSBuild Projects="$(MSBuildProjectFile)"
Targets="CopyDependencyToCoreRoot"
Expand Down