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

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index ee1a80d..6336b79 100644 (file)
--- a/src/coreclr/dependencies.props
+++ b/src/coreclr/dependencies.props
@@ -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>
@@ -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. -->

diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props
index 77c129c..532dacb 100644 (file)
--- a/src/coreclr/tests/Directory.Build.props
+++ b/src/coreclr/tests/Directory.Build.props
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <RunningOnUnix Condition="('$(RunningOnUnix)' == '') And ('$(MSBuildRuntimeType)' == 'Core') And ('$(OS)'!='Windows_NT')">true</RunningOnUnix>
-  </PropertyGroup>  
+  </PropertyGroup>
 
   <!-- Common repo directories -->
   <PropertyGroup>
@@ -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.
    -->
@@ -86,5 +73,5 @@
     <NETCoreAppTestHostFxrPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'host', 'fxr', '$(TestHostVersion)'))</NETCoreAppTestHostFxrPath>
     <NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(TestHostVersion)'))</NETCoreAppTestSharedFrameworkPath>
   </PropertyGroup>
-  
+
 </Project>

diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj
index ee9112a..448cc55 100644 (file)
--- a/src/coreclr/tests/build.proj
+++ b/src/coreclr/tests/build.proj
@@ -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" />

diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets
index b327700..6096501 100644 (file)
--- a/src/coreclr/tests/publishdependency.targets
+++ b/src/coreclr/tests/publishdependency.targets
@@ -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>

diff --git a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
deleted file mode 100644 (file)
index dcd564e..0000000
--- a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <CLRTestKind>BuildOnly</CLRTestKind>
-    <IsTestProject>false</IsTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.ILAsm">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.ILDAsm">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.Jit">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.TestHost">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-  <Target Name="Build"
-     DependsOnTargets="ResolveReferences" />
-</Project>

diff --git a/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj
deleted file mode 100644 (file)
index 3721bc5..0000000
--- a/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <CLRTestKind>BuildOnly</CLRTestKind>
-    <IsTestProject>false</IsTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.TargetingPack.Private.CoreCLR">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
-  </PropertyGroup>
-
-  <!-- This project depends on properties pulled in by Directory.Build.targets in the test/src directory,
-       which isn't usually imported for the tests/src/Common
-       projects. -->
-  <Import Project="$(SourceDir)\Directory.Build.targets" />
-  <Target Name="Build"
-     DependsOnTargets="ResolveReferences" />
-</Project>

diff --git a/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj
index c545e1c..36961b4 100644 (file)
--- a/src/coreclr/tests/src/dirs.proj
+++ b/src/coreclr/tests/src/dirs.proj
@@ -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" />
@@ -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)" />

diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj
index 60b711b..2aa4d1a 100644 (file)
--- a/src/coreclr/tests/src/runtest.proj
+++ b/src/coreclr/tests/src/runtest.proj
@@ -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"