You've already forked linux-packaging-mono
Imported Upstream version 5.10.0.69
Former-commit-id: fc39669a0b707dd3c063977486506b6793da2890
This commit is contained in:
parent
d8f8abd549
commit
e2950ec768
45
external/corert/tests/CoreCLR/runtest/dir.props
vendored
45
external/corert/tests/CoreCLR/runtest/dir.props
vendored
@@ -1,4 +1,4 @@
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)\..\..\..\dir.props" />
|
||||
<!--
|
||||
$(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
|
||||
@@ -13,14 +13,6 @@
|
||||
<RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer
|
||||
as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<BuildToolsTargetsDesktop>true</BuildToolsTargetsDesktop>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Common repo directories -->
|
||||
<PropertyGroup>
|
||||
<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)'==''">false</CopyNuGetImplementations>
|
||||
@@ -29,41 +21,18 @@
|
||||
<PackagesDir>$(ProjectDir)..\..\..\packages\</PackagesDir>
|
||||
<ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir>
|
||||
<DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath>
|
||||
<BuildToolsTaskDir Condition="'$(BuildToolsTargetsDesktop)' == 'true'">$(ToolsDir)net46/</BuildToolsTaskDir>
|
||||
<SkipImportILTargets>true</SkipImportILTargets>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. -->
|
||||
<Import Project="$(MSBuildThisFileDirectory)\..\dependencies.props" />
|
||||
|
||||
<!-- Common nuget properties -->
|
||||
<PropertyGroup>
|
||||
<NuGetToolPath Condition="'$(NuGetToolPath)'==''">$(PackagesDir)NuGet.exe</NuGetToolPath>
|
||||
<NuGetConfigFile Condition="'$(NuGetConfigFile)'==''">$(SourceDir)NuGet.Config</NuGetConfigFile>
|
||||
<NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine>
|
||||
|
||||
<NugetRestoreCommand>"$(NuGetToolPath)"</NugetRestoreCommand>
|
||||
<NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand>
|
||||
<!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on
|
||||
the path. -->
|
||||
<NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand>
|
||||
<NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand>
|
||||
<NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand>
|
||||
<NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- list of nuget package sources passed to dnu -->
|
||||
<ItemGroup>
|
||||
<!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. -->
|
||||
<DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<DnuSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<!-- list of directories to perform batch restore -->
|
||||
<ItemGroup>
|
||||
<DnuRestoreDir Include=""$(MSBuildProjectDirectory)\src"" />
|
||||
</ItemGroup>
|
||||
<!-- list of nuget package sources passed to dnu -->
|
||||
<ItemGroup>
|
||||
<!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. -->
|
||||
<DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(BuildAllProjects)'=='true'">
|
||||
<!-- When we do a traversal build we get all packages up front, don't restore them again -->
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" InitialTargets="CheckForBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project InitialTargets="CheckForBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<Target Name="CheckForBuildTools">
|
||||
<Error Condition="!Exists('$(ToolsDir)')"
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
<?xml version="1.0" ?>
|
||||
<Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Condition="'$(XunitTestBinBase)' != ''">
|
||||
<ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\271010\*">
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -7,10 +7,8 @@ set __BuildType=Debug
|
||||
set __BuildOS=Windows_NT
|
||||
|
||||
:: Default to highest Visual Studio version available
|
||||
set __VSVersion=vs2015
|
||||
|
||||
if defined VS120COMNTOOLS set __VSVersion=vs2013
|
||||
if defined VS140COMNTOOLS set __VSVersion=vs2015
|
||||
set __VSVersion=vs2017
|
||||
set __VSProductVersion=150
|
||||
|
||||
:: Define a prefix for most output progress messages that come from this script. That makes
|
||||
:: it easier to see where these are coming from. Note that there is a trailing space here.
|
||||
@@ -48,9 +46,6 @@ if /i "%1" == "debug" (set __BuildType=Debug&shift&goto Arg_Loop
|
||||
if /i "%1" == "release" (set __BuildType=Release&shift&goto Arg_Loop)
|
||||
if /i "%1" == "checked" (set __BuildType=Checked&shift&goto Arg_Loop)
|
||||
|
||||
if /i "%1" == "vs2013" (set __VSVersion=%1&shift&goto Arg_Loop)
|
||||
if /i "%1" == "vs2015" (set __VSVersion=%1&shift&goto Arg_Loop)
|
||||
|
||||
if /i "%1" == "SkipWrapperGeneration" (set __SkipWrapperGeneration=true&shift&goto Arg_Loop)
|
||||
if /i "%1" == "Exclude" (set __Exclude=%2&shift&shift&goto Arg_Loop)
|
||||
if /i "%1" == "Exclude0" (set __Exclude0=%2&shift&shift&goto Arg_Loop)
|
||||
@@ -96,31 +91,15 @@ if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinB
|
||||
|
||||
if not exist %__LogsDir% md %__LogsDir%
|
||||
|
||||
set __VSProductVersion=
|
||||
if /i "%__VSVersion%" == "vs2013" set __VSProductVersion=120
|
||||
if /i "%__VSVersion%" == "vs2015" set __VSProductVersion=140
|
||||
|
||||
:: Check presence of VS
|
||||
if not defined VS%__VSProductVersion%COMNTOOLS goto NoVS
|
||||
|
||||
set __VSToolsRoot=!VS%__VSProductVersion%COMNTOOLS!
|
||||
if %__VSToolsRoot:~-1%==\ set "__VSToolsRoot=%__VSToolsRoot:~0,-1%"
|
||||
|
||||
:: Does VS really exist?
|
||||
if not exist "%__VSToolsRoot%\..\IDE\devenv.exe" goto NoVS
|
||||
if not exist "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" goto NoVS
|
||||
if not exist "%__VSToolsRoot%\VsDevCmd.bat" goto NoVS
|
||||
set _msbuildexe="%VSINSTALLDIR%\MSBuild\15.0\Bin\MSBuild.exe"
|
||||
|
||||
if /i "%__VSVersion%" =="vs2015" goto MSBuild14
|
||||
set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
|
||||
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
|
||||
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
|
||||
goto :CheckMSBuild14
|
||||
:MSBuild14
|
||||
set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
|
||||
:CheckMSBuild14
|
||||
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
|
||||
if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. && exit /b 1
|
||||
if not exist !_msbuildexe! (echo Error: Could not find MSBuild.exe. Please see https://github.com/dotnet/corert/blob/master/Documentation/prerequisites-for-building.md for build instructions. && exit /b 1)
|
||||
|
||||
:: Set the environment for the build- VS cmd prompt
|
||||
echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\VsDevCmd.bat"
|
||||
@@ -192,11 +171,6 @@ if defined __GenerateLayoutOnly (
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
if not exist %CORE_ROOT%\coreclr.dll (
|
||||
echo %__MsgPrefix%Error: Ensure you have done a successful build of the Product and %CORE_ROOT% contains runtime binaries.
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
::Check if the test Binaries are built
|
||||
if not exist %XunitTestBinBase% (
|
||||
echo %__MsgPrefix%Error: Ensure the Test Binaries are built and are present at %XunitTestBinBase%.
|
||||
@@ -378,6 +352,6 @@ echo CORE_ROOT The path to the runtime
|
||||
exit /b 1
|
||||
|
||||
:NoVS
|
||||
echo Visual Studio 2013+ ^(Community is free^) is a prerequisite to build this repository.
|
||||
echo Visual Studio 2017 ^(Community is free^) is a prerequisite to build this repository.
|
||||
echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md#prerequisites
|
||||
exit /b 1
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="src\dir.props" />
|
||||
<Import Project="$(ToolsDir)Build.Post.targets" Condition="Exists('$(ToolsDir)Build.Post.targets') AND '$(BuildWrappers)' == 'true'" />
|
||||
<Import Project="helixperftasks.targets" Condition="'$(Performance)'=='true'"/>
|
||||
@@ -66,30 +65,23 @@ $(_XunitEpilog)
|
||||
</_XunitWrapperGen>
|
||||
<XunitWrapperGenCsProj>
|
||||
<![CDATA[
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<Import Project="$(SourceDir)dir.props" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '%24(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '%24(Platform)' == '' ">AnyCPU</Platform>
|
||||
<AssemblyName>$(XunitWrapper)</AssemblyName>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFramework>net45</TargetFramework>
|
||||
<IsXunitWrapperProject>true</IsXunitWrapperProject>
|
||||
<SkipSigning>true</SkipSigning>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
|
||||
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
|
||||
<CLRTestKind>BuildOnly</CLRTestKind>
|
||||
<IsTestProject>true</IsTestProject>
|
||||
<ProjectJson>%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson>
|
||||
<ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson>
|
||||
<RestoreOutputPath>%24(IntermediateOutputRootPath)\XUnitTooling</RestoreOutputPath>
|
||||
<ReferencePath>$(ReferencePath);$(XunitTestBinBase)\Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper</ReferencePath>
|
||||
</PropertyGroup>
|
||||
<!-- Default configurations to help VS understand the configurations -->
|
||||
@@ -110,13 +102,13 @@ $(_XunitEpilog)
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="$(XunitTestBinBase)\Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper\Coreclr.TestWrapper.dll" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<ProjectJson>%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson>
|
||||
<ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(SourceDir)dir.targets" />
|
||||
<PropertyGroup>
|
||||
<OutDir>$(XunitTestBinBase)\$(Category)\</OutDir>
|
||||
<OutDir>$(XunitTestBinBase)\$(Category)\</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<_TargetFrameworkDirectories />
|
||||
<_FullFrameworkReferenceAssemblyPaths />
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
]]>
|
||||
|
||||
@@ -209,8 +209,7 @@ function xunit_output_end {
|
||||
((errorCount = 1))
|
||||
fi
|
||||
|
||||
echo '<?xml version="1.0" encoding="utf-8"?>' >>"$xunitOutputPath"
|
||||
echo '<assemblies>' >>"$xunitOutputPath"
|
||||
echo '<assemblies>' >"$xunitOutputPath"
|
||||
|
||||
local line
|
||||
|
||||
@@ -559,7 +558,7 @@ function set_up_core_dump_generation {
|
||||
# Include memory in private and shared file-backed mappings in the dump.
|
||||
# This ensures that we can see disassembly from our shared libraries when
|
||||
# inspecting the contents of the dump. See 'man core' for details.
|
||||
echo 0x3F > /proc/self/coredump_filter
|
||||
echo -n 0x3F > /proc/self/coredump_filter
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project 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>
|
||||
|
||||
@@ -1,29 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
|
||||
<!--
|
||||
This project is servicing the purpose of restoring some nuget packages which has the implementation assemblies
|
||||
like System.Collections, System.Resources.ResourceManager…etc.
|
||||
The restored implementation assemblies will be used as references for compiling some of the System.Private.*
|
||||
projects like System.Private.Threading.
|
||||
-->
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
|
||||
<Import Project="..\..\..\..\..\dir.props" />
|
||||
<PropertyGroup>
|
||||
<AssemblyVersion>4.0.0.0</AssemblyVersion>
|
||||
<OutputType>Library</OutputType>
|
||||
<OutputPath>$(AotPackageReferencePath)</OutputPath>
|
||||
<ResolvePackages>true</ResolvePackages>
|
||||
<PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
|
||||
<ProjectJson>project.json</ProjectJson>
|
||||
<ProjectLockJson>project.lock.json</ProjectLockJson>
|
||||
<TargetFramework>net45</TargetFramework>
|
||||
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Include="project.json" />
|
||||
<PackageReference Include="xunit">
|
||||
<Version>$(XunitPackageVersion)</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="xunit.assert">
|
||||
<Version>$(XunitPackageVersion)</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="xunit.core">
|
||||
<Version>$(XunitPackageVersion)</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="xunit.runner.msbuild">
|
||||
<Version>$(XunitPackageVersion)</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
|
||||
|
||||
<PropertyGroup>
|
||||
<NuGetTargetMoniker>.NETCore,Version=v5.0</NuGetTargetMoniker>
|
||||
<NuGetRuntimeIdentifier>win8-aot</NuGetRuntimeIdentifier>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"xunit": "2.2.0-beta2-build3300",
|
||||
"xunit.assert": "2.2.0-beta2-build3300",
|
||||
"xunit.core": "2.2.0-beta2-build3300",
|
||||
"xunit.runner.msbuild": "2.2.0-beta2-build3300"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.0": {
|
||||
"imports": [
|
||||
"dnxcore50",
|
||||
"portable-net45+win8"
|
||||
]
|
||||
},
|
||||
"net45": {
|
||||
"imports": "portable-net45+win8"
|
||||
}
|
||||
},
|
||||
"runtimes": {
|
||||
"win7-x86": {},
|
||||
"win7-x64": {},
|
||||
"ubuntu.14.04-x64": {},
|
||||
"osx.10.10-x64": {},
|
||||
"centos.7-x64": {},
|
||||
"rhel.7-x64": {},
|
||||
"debian.8-x64": {}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\dir.props" />
|
||||
|
||||
<!-- Set default Configuration and Platform -->
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="dir.common.props" />
|
||||
|
||||
<!-- Disable some standard properties for building our projects -->
|
||||
@@ -11,8 +11,6 @@
|
||||
<NoWarn>78,162,164,168,169,219,251,252,414,429,642,649,652,675,1691,1717,1718,3001,3002,3003,3005,3008</NoWarn>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<SkipSigning Condition="'$(CrossGen)' == 'true'">true</SkipSigning>
|
||||
<!-- Set the project.json directory for generated TestWrappers. -->
|
||||
<TestWrappersPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)TestWrappersConfig\</TestWrappersPackagesConfigFileDirectory>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Expose the target OS in a more convenient fashion -->
|
||||
@@ -81,9 +79,4 @@
|
||||
<PropertyGroup>
|
||||
<ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ProjectJson>$(SourceDir)Common\test_dependencies\project.json</ProjectJson>
|
||||
<ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<!-- Default priority building values. -->
|
||||
<PropertyGroup>
|
||||
<CLRTestKind Condition="'$(CLRTestKind)' == '' and '$(OutputType)' == 'Library'">SharedLibrary</CLRTestKind>
|
||||
@@ -50,11 +50,6 @@
|
||||
<_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(ReferenceLocalMscorlib)' == 'true'">
|
||||
<ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson>
|
||||
<ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
If it needs ProjectToRun, turn the project into a ProjectReference so it gets built
|
||||
-->
|
||||
@@ -63,11 +58,7 @@
|
||||
<Private>false</Private>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ErrorIfBuildToolsRestoredFromIndividualProject Condition="!Exists('$(ToolsDir)')">true</ErrorIfBuildToolsRestoredFromIndividualProject>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
<Import Project="..\dir.targets" />
|
||||
|
||||
<Target Name="CreateManifestResourceNames" />
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<UsingTask AssemblyFile="$(PackagesDir)xunit.runner.msbuild\$(XunitPackageVersion)\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This overrides the typical ResolveNuGetPackages so that it does copy local of the
|
||||
referenced items. This is used so that we can correctly resolve and copy the libraries necessary
|
||||
to the core_root directory -->
|
||||
@@ -6,13 +5,13 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="ResolveNuGetPackages">
|
||||
|
||||
<PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))"
|
||||
<PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectAssetsFile))"
|
||||
AllowFallbackOnTargetSelection="true"
|
||||
IncludeFrameworkReferences="false"
|
||||
NuGetPackagesDirectory="$(PackagesDir)"
|
||||
RuntimeIdentifier="$(TestNugetRuntimeId)"
|
||||
ProjectLanguage="$(Language)"
|
||||
ProjectLockFile="$(ProjectLockJson)"
|
||||
ProjectLockFile="$(ProjectAssetsFile)"
|
||||
TargetMonikers="$(TargetFrameworkMoniker)">
|
||||
<Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" />
|
||||
<Output TaskParameter="ResolvedReferences" ItemName="Reference" />
|
||||
|
||||
Reference in New Issue
Block a user