diff options
| -rw-r--r-- | build-test.cmd | 57 | ||||
| -rw-r--r-- | buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json | 2 | ||||
| -rw-r--r-- | buildpipeline/pipelines.json | 14 | ||||
| -rw-r--r-- | config.json | 6 | ||||
| -rw-r--r-- | tests/helixprep.proj | 10 | ||||
| -rw-r--r-- | tests/publishdependency.targets | 76 | ||||
| -rw-r--r-- | tests/runtest.proj | 19 | ||||
| -rw-r--r-- | tests/src/Common/build_against_pkg_dependencies/project.json | 3 | ||||
| -rw-r--r-- | tests/src/Common/test_dependencies/project.json | 3 | ||||
| -rw-r--r-- | tests/src/Common/test_runtime/project.json | 6 |
10 files changed, 79 insertions, 117 deletions
diff --git a/build-test.cmd b/build-test.cmd index 785c3cbf05..c12e9af645 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -57,6 +57,7 @@ set __RunArgs= set __BuildAgainstPackagesArg= set __RuntimeId= set __ZipTests= +set __TargetsWindows=1 :Arg_Loop if "%1" == "" goto ArgsDone @@ -80,6 +81,7 @@ if /i "%1" == "toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs if /i "%1" == "buildagainstpackages" (set __ZipTests=1&set __BuildAgainstPackagesArg=-BuildTestsAgainstPackages&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "ziptests" (set __ZipTests=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "runtimeid" (set __RuntimeId=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) +if /i "%1" == "targetsNonWindows" (set __TargetsWindows=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "Exclude" (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) if [!processedArgs!]==[] ( @@ -90,6 +92,13 @@ if [!processedArgs!]==[] ( :ArgsDone +if defined __BuildAgainstPackagesArg ( + if not defined __RuntimeID ( + echo %__MsgPrefix%Error: When building against packages, you must supply a target Runtime ID. + exit /b 1 + ) +) + echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\VsDevCmd.bat" call "%__VSToolsRoot%\VsDevCmd.bat" @@ -228,32 +237,17 @@ REM ============================================================================ if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir% set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root" -set "CORE_OVERLAY=%XunitTestBinBase%\Tests\Core_Root_%__RuntimeId%" call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -UpdateDependencies -BatchRestorePackages -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% set __BuildLogRootName=Tests_GenerateRuntimeLayout -call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\runtest.proj -BinPlaceRef -BinPlaceProduct -CopyCrossgenToProduct -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% +call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\runtest.proj -BinPlaceRef -BinPlaceProduct -CopyCrossgenToProduct -RuntimeId="%__RuntimeId%" -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% if errorlevel 1 ( echo BinPlace of mscorlib.dll failed exit /b 1 ) -if defined __RuntimeId ( - - if not exist %__PackagesDir%\TestNativeBins ( - echo %__MsgPrefix%Error: Ensure you have run sync.cmd -ab before building a non-Windows test overlay against packages - exit /b 1 - ) - - call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\runtest.proj -CreateNonWindowsTestOverlay -RuntimeId="%__RuntimeId%" -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% - for /R %__PackagesDir%\TestNativeBins\%__RuntimeId%\%__BuildType% %%f in (*.so) do copy %%f %Core_Overlay% - for /R %__PackagesDir%\TestNativeBins\%__RuntimeId%\%__BuildType% %%f in (*.dylib) do copy %%f %Core_Overlay% - - echo %__MsgPrefix% Created the runtime layout for %__RuntimeId% in %CORE_OVERLAY% -) - echo %__MsgPrefix% Restored CoreCLR product from packages :SkipRestoreProduct @@ -305,14 +299,34 @@ if exist "%CORE_ROOT%" rd /s /q "%CORE_ROOT%" md "%CORE_ROOT%" xcopy /s "%__BinDir%" "%CORE_ROOT%" +if defined __BuildAgainstPackagesArg ( + if "%__TargetsWindows%"=="0" ( + + if not exist %__PackagesDir%\TestNativeBins ( + echo %__MsgPrefix%Error: Ensure you have run sync.cmd -ab before building a non-Windows test overlay against packages + exit /b 1 + ) + + for /R %__PackagesDir%\TestNativeBins\%__RuntimeId%\%__BuildType% %%f in (*.so) do copy %%f %CORE_ROOT% + for /R %__PackagesDir%\TestNativeBins\%__RuntimeId%\%__BuildType% %%f in (*.dylib) do copy %%f %CORE_ROOT% + ) +) + echo %__MsgPrefix%Creating test wrappers... set RuntimeIdArg= +set TargetsWindowsArg= if defined __RuntimeId ( set RuntimeIdArg=-RuntimeID="%__RuntimeId%" ) +if "%__TargetsWindows%"=="1" ( + set TargetsWindowsArg=-TargetsWindows=true +) else if "%__TargetsWindows%"=="0" ( + set TargetsWindowsArg=-TargetsWindows=false +) + set __BuildLogRootName=Tests_XunitWrapper set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn @@ -321,7 +335,7 @@ set __msbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%" set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" -call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\runtest.proj -BuildWrappers -MsBuildEventLogging=" " -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% %RuntimeIdArg% +call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\runtest.proj -BuildWrappers -MsBuildEventLogging=" " -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% %TargetsWindowsArg% if errorlevel 1 ( echo Xunit Wrapper build failed exit /b 1 @@ -337,7 +351,7 @@ set __msbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%" set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" -call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\runtest.proj -testOverlay -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__unprocessedBuildArgs% +call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\runtest.proj -testOverlay -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %RuntimeIdArg% %__unprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: echo %__BuildLog% @@ -362,7 +376,7 @@ REM === Prep test binaries for Helix publishing REM === REM ========================================================================================= -call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\helixprep.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% %RuntimeIdArg% +call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\helixprep.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% %RuntimeIdArg% %TargetsWindowsArg% echo %__MsgPrefix% Prepped test binaries for publishing @@ -393,13 +407,16 @@ echo runtimeid ^<ID^>: Builds a test overlay for the specified OS (Only supporte echo alpine.3.4.3-x64: Builds overlay for Alpine 3.4.3 echo debian.8-x64: Builds overlay for Debian 8 echo fedora.24-x64: Builds overlay for Fedora 24 -echo fedora.25-x64: Builds overlay for Fedora 25 +echo linux-x64: Builds overlay for portable linux echo opensuse.42.1-x64: Builds overlay for OpenSUSE 42.1 echo osx.10.12-x64: Builds overlay for OSX 10.12 +echo osx-x64: Builds overlay for portable OSX echo rhel.7-x64: Builds overlay for RHEL 7 or CentOS echo ubuntu.14.04-x64: Builds overlay for Ubuntu 14.04 echo ubuntu.16.04-x64: Builds overlay for Ubuntu 16.04 echo ubuntu.16.10-x64: Builds overlay for Ubuntu 16.10 +echo win-x64: Builds overlay for portable Windows +echo win7-x64: Builds overlay for Windows 7 echo ziptests: zips CoreCLR tests & Core_Root for a Helix run echo Exclude- Optional parameter - specify location of default exclusion file (defaults to tests\issues.targets if not specified) echo Set to "" to disable default exclusion file. diff --git a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json index f559d86ebd..4deb689a55 100644 --- a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json +++ b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json @@ -68,7 +68,7 @@ }, "inputs": { "filename": "build-test.cmd", - "arguments": "$(PB_BuildType) $(Architecture) buildagainstpackages $(RuntimeIDArg) -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority)", + "arguments": "$(PB_BuildType) $(Architecture) buildagainstpackages runtimeid $(Rid) $(TargetsNonWindowsArg) -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority)", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index a06f054c5a..8729d73859 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -494,10 +494,10 @@ "Name": "Dotnet-CoreClr-Trusted-BuildTests", "Parameters": { "TargetsWindows": "true", - "Rid": "windows_nt-x64", + "Rid": "win-x64", "TargetQueues": "windows.10.amd64", - "TestContainerSuffix": "windows10", - "RuntimeIDArg": " " + "TestContainerSuffix": "windows", + "TargetsNonWindowsArg": " " }, "ReportingParameters": { "OperatingSystem": "Windows", @@ -510,10 +510,10 @@ "Name": "Dotnet-CoreClr-Trusted-BuildTests", "Parameters": { "TargetsWindows": "false", - "Rid": "osx.10.12-x64", + "Rid": "osx-x64", "TargetQueues": "osx.1012.amd64", - "TestContainerSuffix": "osx1012", - "RuntimeIDArg": "runtimeid osx.10.12-x64" + "TestContainerSuffix": "osx", + "TargetsNonWindowsArg": "TargetsNonWindows" }, "ReportingParameters": { "OperatingSystem": "OSX", @@ -529,7 +529,7 @@ "Rid": "linux-x64", "TargetQueues": "debian.82.amd64,fedora.25.amd64,redhat.72.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1610.amd64", "TestContainerSuffix": "linux", - "RuntimeIDArg": "runtimeid linux-x64" + "TargetsNonWindowsArg": "TargetsNonWindows" }, "ReportingParameters": { "OperatingSystem": "RedHat 7", diff --git a/config.json b/config.json index 64066cb124..475a659f2d 100644 --- a/config.json +++ b/config.json @@ -312,6 +312,12 @@ "values": [ true, false ], "defaultValue": true }, + "TargetsWindows": { + "description": "Sets the property specifying if the tests we're building will target Windows", + "valueType": "property", + "values": [ true, false ], + "defaultValue": true + }, "PublishTestNativeBins": { "description": "Publishes test native binaries to Azure on non-windows", "valueType": "property", diff --git a/tests/helixprep.proj b/tests/helixprep.proj index 91aa4861d7..c6267b99a9 100644 --- a/tests/helixprep.proj +++ b/tests/helixprep.proj @@ -7,10 +7,8 @@ <PropertyGroup> <DiscoveryDirectory>$(TestWorkingDir)</DiscoveryDirectory> - <CoreRootDir Condition="'$(RuntimeID)' == '' ">$(CORE_ROOT)</CoreRootDir> - <CoreRootDir Condition="'$(RuntimeID)' != '' ">$(CORE_OVERLAY)</CoreRootDir> - <CoreRootName Condition="'$(RuntimeID)' == '' ">Core_Root_Windows_NT-$(__BuildArch)</CoreRootName> - <CoreRootName Condition="'$(RuntimeID)' != '' ">Core_Root_$(RuntimeID)</CoreRootName> + <CoreRootDir>$(CORE_ROOT)</CoreRootDir> + <CoreRootName>Core_Root_$(RuntimeID)</CoreRootName> </PropertyGroup> <ItemGroup> @@ -73,7 +71,7 @@ <!-- Generate wrapper .cmd file for an Xunit wrapper --> <Target Name="GenerateWrapperCmd" - Condition="'$(RuntimeID)' == '' "> + Condition="'$(TargetsWindows)' == 'true' "> <PropertyGroup> <WrapperCmdContents> @@ -104,7 +102,7 @@ EXIT /B %ERRORLEVEL% </Target> <Target Name="GenerateWrapperSh" - Condition="'$(RuntimeID)' != '' "> + Condition="'$(TargetsWindows)' != 'true' "> <!-- Need to force in Unix line endings for Shell script --> <PropertyGroup> diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index eec373fb3c..cce4296d51 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -23,11 +23,6 @@ </ItemGroup> <ItemGroup> - <NonWindowsProjectLockJsonFiles Include="@(CoreRootProjectLockJsonFiles)"/> - <NonWindowsProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\project.lock.json"/> - </ItemGroup> - - <ItemGroup> <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\project.lock.json"/> </ItemGroup> @@ -57,7 +52,7 @@ <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="false" IncludeFrameworkReferences="false" NuGetPackagesDirectory="$(PackagesDir)" - RuntimeIdentifier="$(TestNugetRuntimeId)" + RuntimeIdentifier="$(TargetRid)" ProjectLanguage="$(Language)" ProjectLockFile="%(CoreRootProjectLockJsonFiles.Identity)" TargetMonikers="@(TestTargetFramework)"> @@ -90,70 +85,6 @@ </Copy> </Target> - <Target Name="CopyNonWindowsDependecyToCoreRoot" - Inputs="@(NonWindowsProjectLockJsonFiles)" - Outputs="$(CORE_OVERLAY)\*.*"> - - <MSBuild Projects="$(SourceDir)Common\test_runtime\test_runtime.csproj"/> - - <MSBuild Projects="$(SourceDir)Common\test_dependencies\test_dependencies.csproj"/> - - <MSBuild Projects="$(SourceDir)Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj"/> - - <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items - for the xunit wrapper projects --> - <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true" - IncludeFrameworkReferences="false" - NuGetPackagesDirectory="$(PackagesDir)" - RuntimeIdentifier="$(RuntimeId)" - ProjectLanguage="$(Language)" - ProjectLockFile="%(NonWindowsProjectLockJsonFiles.Identity)" - TargetMonikers="@(TestTargetFramework)"> - <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" /> - <Output TaskParameter="ResolvedReferences" ItemName="Reference" /> - <Output TaskParameter="ResolvedCopyLocalItems" ItemName="RunTimeCopyLocal" /> - </PrereleaseResolveNuGetPackageAssets> - <ItemGroup> - <RunTimeDependecyExclude Include="$(CORE_OVERLAY)\**\*.*" /> - <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName)%(Extension)')" /> - <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).ni%(Extension)')" /> - <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).pdb')" /> - <AllResolvedRuntimeDependencies Include="@(RunTimeCopyLocal -> '%(FileName)%(Extension)')"> - <File>%(Identity)</File> - </AllResolvedRuntimeDependencies> - <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)" Exclude="@(RunTimeDependecyExcludeFiles)"/> - <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')" /> - <RunTimeDependecyCopyLocal Include="$(TargetingPackPath)/*" /> - </ItemGroup> - - <Copy - SourceFiles="@(RunTimeDependecyCopyLocal)" - DestinationFolder="$(CORE_OVERLAY)" - SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" - OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" - Retries="$(CopyRetryCount)" - RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)" - UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"> - <Output TaskParameter="DestinationFiles" ItemName="FileWrites" /> - </Copy> - - <ItemGroup> - <NonWindowsCrossGenFiles Include="..\packages\runtime.$(RuntimeID).Microsoft.NETCore.Runtime.CoreCLR\$(CoreClrPackageVersion)\tools\crossgen"/> - </ItemGroup> - - <Copy - SourceFiles="@(NonWindowsCrossGenFiles)" - DestinationFolder="$(CORE_OVERLAY)" - SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" - OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" - Retries="$(CopyRetryCount)" - RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)" - UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"> - <Output TaskParameter="DestinationFiles" ItemName="FileWrites" /> - </Copy> - - </Target> - <Target Name="CopyDependencyToRef" Inputs="@(RefProjectLockJsonFiles)" Outputs="$(RefDestination)\*.*"> @@ -165,7 +96,7 @@ <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true" IncludeFrameworkReferences="false" NuGetPackagesDirectory="$(PackagesDir)" - RuntimeIdentifier="$(TestNugetRuntimeId)" + RuntimeIdentifier="$(TargetRid)" ProjectLanguage="$(Language)" ProjectLockFile="%(RefProjectLockJsonFiles.Identity)" TargetMonikers="@(TestTargetFramework)"> @@ -197,7 +128,7 @@ <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true" IncludeFrameworkReferences="false" NuGetPackagesDirectory="$(PackagesDir)" - RuntimeIdentifier="$(TestNugetRuntimeId)" + RuntimeIdentifier="$(TargetRid)" ProjectLanguage="$(Language)" ProjectLockFile="%(ProductProjectLockJsonFiles.Identity)" TargetMonikers="@(TestTargetFramework)"> @@ -219,6 +150,7 @@ </Target> <Target Name="CopyCrossgenToProduct" + AfterTargets="CopyDependencyToProduct" Outputs="$(ProductDestination)\crossgen.exe;$(CORE_OVERLAY)\crossgen.exe"> <Copy diff --git a/tests/runtest.proj b/tests/runtest.proj index 58d3744a38..9ebe5c00b6 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -216,7 +216,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). </ItemGroup> <PropertyGroup> - <TestExecutableReplacement Condition="'$(RuntimeID)' != '' ">testExecutable = testExecutable.Replace("\\", "/")%3B</TestExecutableReplacement> + <TestExecutableReplacement Condition="'$(TargetsWindows)' != 'true' ">testExecutable = testExecutable.Replace("\\", "/")%3B</TestExecutableReplacement> </PropertyGroup> <ItemGroup> @@ -323,23 +323,22 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <Import Project="tests.targets" /> <Import Project="publishdependency.targets" /> + <PropertyGroup> + <TargetRid Condition="'$(RuntimeId)' != ''">$(RuntimeId)</TargetRid> + <TargetRid Condition="'$(RuntimeId)' == ''">$(TestNugetRuntimeId)</TargetRid> + </PropertyGroup> + <Target Name="CreateTestOverlay"> <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyDependecyToCoreRoot" - Properties="Language=C#" /> - </Target> - - <Target Name="CreateNonWindowsTestOverlay"> - <MSBuild Projects="$(MSBuildProjectFile)" - Targets="CopyNonWindowsDependecyToCoreRoot" - Properties="Language=C#;NonWindowsRuntimeId=$(NonWindowsRuntimeId)" /> + Properties="Language=C#;TargetRid=$(TargetRid)" /> </Target> <Target Name="BinPlaceRef"> <!-- Copy mscorlib.dll from TargetingPack to bin/Product/ref, if we're building against packages --> <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyDependencyToRef" - Properties="Language=C#" + Properties="Language=C#;TargetRid=$(TargetRid)" Condition=" '$(BuildTestsAgainstPackages)'=='true' " /> </Target> @@ -347,7 +346,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <!-- Copy test dependencies to bin/Product, if we're building against packages --> <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyDependencyToProduct" - Properties="Language=C#" + Properties="Language=C#;TargetRid=$(TargetRid)" Condition=" '$(BuildTestsAgainstPackages)'=='true' " /> </Target> diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json index 501dfec274..4313a2a90b 100644 --- a/tests/src/Common/build_against_pkg_dependencies/project.json +++ b/tests/src/Common/build_against_pkg_dependencies/project.json @@ -15,6 +15,8 @@ } }, "runtimes": { + "win-x64": {}, + "win-x86": {}, "win7-x86": {}, "win7-x64": {}, "win10-arm64": {}, @@ -22,6 +24,7 @@ "ubuntu.16.04-x64": {}, "ubuntu.16.10-x64": {}, "osx.10.12-x64": {}, + "osx-x64": {}, "centos.7-x64": {}, "rhel.7-x64": {}, "debian.8-x64": {}, diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json index 89a5d6b6eb..45dad83034 100644 --- a/tests/src/Common/test_dependencies/project.json +++ b/tests/src/Common/test_dependencies/project.json @@ -15,12 +15,15 @@ } }, "runtimes": { + "win-x64": {}, + "win-x86": {}, "win7-x86": {}, "win7-x64": {}, "ubuntu.14.04-x64": {}, "ubuntu.16.04-x64": {}, "ubuntu.16.10-x64": {}, "osx.10.12-x64": {}, + "osx-x64": {}, "centos.7-x64": {}, "rhel.7-x64": {}, "debian.8-x64": {}, diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json index 0f82a117e8..f0d097a89d 100644 --- a/tests/src/Common/test_runtime/project.json +++ b/tests/src/Common/test_runtime/project.json @@ -15,15 +15,19 @@ } }, "runtimes": { + "win-x64": {}, + "win-x86": {}, "win7-x86": {}, "win7-x64": {}, "ubuntu.14.04-x64": {}, "ubuntu.16.04-x64": {}, "ubuntu.16.10-x64": {}, "osx.10.12-x64": {}, + "osx-x64": {}, "centos.7-x64": {}, "rhel.7-x64": {}, "debian.8-x64": {}, - "fedora.24-x64": {} + "fedora.24-x64": {}, + "linux-x64": {} } } |