diff options
| -rw-r--r-- | dependencies.props | 1 | ||||
| -rw-r--r-- | tests/build.proj | 1 | ||||
| -rw-r--r-- | tests/dir.props | 5 | ||||
| -rw-r--r-- | tests/publishdependency.targets | 19 | ||||
| -rw-r--r-- | tests/src/Common/vc_runtime/vc_runtime.csproj | 28 |
5 files changed, 52 insertions, 2 deletions
diff --git a/dependencies.props b/dependencies.props index 389df6cdd3..4f4b76e8a7 100644 --- a/dependencies.props +++ b/dependencies.props @@ -30,6 +30,7 @@ <XUnitConsoleNetCoreVersion>1.0.2-prerelease-00177</XUnitConsoleNetCoreVersion> <XUnitPerformanceApiVersion>1.0.0-beta-build0007</XUnitPerformanceApiVersion> <MicrosoftDiagnosticsTracingLibraryVersion>1.0.3-alpha-experimental</MicrosoftDiagnosticsTracingLibraryVersion> + <VCRuntimeVersion>1.2.0</VCRuntimeVersion> </PropertyGroup> <!-- Package dependency verification/auto-upgrade configuration. --> diff --git a/tests/build.proj b/tests/build.proj index a57c8835d9..2ff5f499ae 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -26,6 +26,7 @@ <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\vc_runtime\vc_runtime.csproj" Condition="'$(__BuildArch)' == 'arm'"/> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" /> <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark\benchmark.csproj" /> diff --git a/tests/dir.props b/tests/dir.props index 8da69c7511..82c82dd42c 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -91,8 +91,9 @@ <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. --> <DotnetSourceList Include="$(PackagesDir)AzureTransfer\" Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" /> <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> - <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> - <DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> </ItemGroup> <PropertyGroup Condition="'$(BuildAllProjects)'=='true'"> diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 8cae729776..96c5906297 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -32,6 +32,7 @@ <ItemGroup> <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/> + <VCRuntimeFiles Include="..\packages\vc-runtime\$(VCRuntimeVersion)\lib\netcoreapp1.1\*.dll"/> </ItemGroup> <PropertyGroup> @@ -158,4 +159,22 @@ </Target> + <Target Name="CopyVCRuntimeToCoreRoot" + AfterTargets="CopyDependecyToCoreRoot" + Outputs="$(CORE_ROOT)\*.*" + Condition="'$(BuildArch)' == 'arm'"> + + <Copy + SourceFiles="@(VCRuntimeFiles)" + DestinationFolder="$(CORE_ROOT)" + SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" + OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" + Retries="$(CopyRetryCount)" + RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)" + UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"> + <Output TaskParameter="DestinationFiles" ItemName="FileWrites" /> + </Copy> + + </Target> + </Project> diff --git a/tests/src/Common/vc_runtime/vc_runtime.csproj b/tests/src/Common/vc_runtime/vc_runtime.csproj new file mode 100644 index 0000000000..3380240ff6 --- /dev/null +++ b/tests/src/Common/vc_runtime/vc_runtime.csproj @@ -0,0 +1,28 @@ +<?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), dir.props))\dir.props" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <CLRTestKind>BuildOnly</CLRTestKind> + <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp1.1</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="vc-runtime"> + <Version>$(VCRuntimeVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win-arm</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <Target Name="Build" + DependsOnTargets="ResolveReferences" /> +</Project> |