* Remove PackageReference to cijobs tool.
* Remove jit-dasm and jit-analyze package references per feedback.
* Remove test_runtime.csproj and move the copying of the UCRT files to Core_Root to test_dependencies.csproj.
<ItemGroup>
<RestoreProjects Include="$(MSBuildThisFileDirectory)scripts\scripts.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" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)external\external.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\ilasm\ilasm.ilproj" />
subsequent restore only copies files that don't already exist
in CORE_ROOT, so assets from the first project file win. -->
<CoreRootProjectFiles Include="$(SourceDir)Common\test_dependencies\test_dependencies.csproj" />
- <CoreRootProjectFiles Include="$(SourceDir)Common\test_runtime\test_runtime.csproj" />
</ItemGroup>
<PropertyGroup>
<Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
+ <Target Name="AddUcrtFilesToCoreRoot" BeforeTargets="CopyDependencyToCoreRoot" Condition="'$(BuildOS)' == 'Windows_NT'">
+ <ItemGroup>
+ <NativeCopyLocalItems Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" />
+ </ItemGroup>
+ </Target>
+
<Target Name="AddLibrariesToCoreRoot" BeforeTargets="CopyDependencyToCoreRoot" DependsOnTargets="ResolveLibrariesFromLocalBuild">
<ItemGroup>
<RuntimeCopyLocalItems Include="@(LibrariesRuntimeFiles)" />
+++ /dev/null
-<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <CLRTestKind>BuildOnly</CLRTestKind>
- <IsTestProject>false</IsTestProject>
- <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
- <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
- <AssetTargetFallback>$(AssetTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</AssetTargetFallback>
- <NoWarn>$(NoWarn);NU1603</NoWarn>
- <NoWarn>$(NoWarn);NU1701</NoWarn>
- <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
- <UseLiveRuntimeIdentifierGraph>true</UseLiveRuntimeIdentifierGraph>
- </PropertyGroup>
- <ItemGroup>
- <PackageReference Include="jit-dasm" Version="0.0.1.4" NoWarn="NU1701" />
- <PackageReference Include="cijobs" Version="0.0.1.2" NoWarn="NU1701" />
- <PackageReference Include="jit-analyze" Version="0.0.1.1" NoWarn="NU1701" />
- </ItemGroup>
-
- <Target Name="AddUcrtFilesToCoreRoot" BeforeTargets="CopyDependencyToCoreRoot" Condition="'$(BuildOS)' == 'Windows_NT'">
- <ItemGroup>
- <NativeCopyLocalItems Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" />
- </ItemGroup>
- </Target>
-
- <Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />
-
- <PropertyGroup>
- <ProjectAssetsFile>$(SourceDir)Common\test_runtime\obj\project.assets.json</ProjectAssetsFile>
- </PropertyGroup>
-
-</Project>
<DisabledProjects Include="TestWrappers*\**\*.csproj" />
<DisabledProjects Include="*\**\cs_template.csproj" />
<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\PerfHarness\PerfHarness.csproj" />