diff options
| author | Karthik Rajasekaran <karajas@microsoft.com> | 2016-11-15 04:04:59 +0300 |
|---|---|---|
| committer | Karthik Rajasekaran <karajas@microsoft.com> | 2016-12-12 22:05:40 +0300 |
| commit | 382601e92eaac7fd997409a64298009b4e304d89 (patch) | |
| tree | b91a5c58e38e0522b09d60b2763792ab65a34e4d /build.proj | |
| parent | 89cd1913d1faf159bde3b83e28e96c4962091f37 (diff) | |
Detect testnugetruntimeid by changing order of rid detection.
Update BuildToolsVersion
Fix versions of manually entered dependencies.
Diffstat (limited to 'build.proj')
| -rw-r--r-- | build.proj | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/build.proj b/build.proj index 78671a91a1..f3b4ebc0ff 100644 --- a/build.proj +++ b/build.proj @@ -88,7 +88,6 @@ <ItemGroup> <TestProjectJsons Include="$(MSBuildThisFileDirectory)src/Common/test-runtime/project.json" /> - <SupportsDefinitionFileGroup Include="$(MSBuildThisFileDirectory)/packages/Microsoft.DotNet.BuildTools.TestSuite/**/runtime.json" /> </ItemGroup> <PropertyGroup> @@ -137,8 +136,7 @@ </Target> <UsingTask TaskName="AddDependenciesToProjectJson" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> - <Target Name="UpdateVersionsOnTestProjectJson" > - + <Target Name="UpdateVersionsOnTestProjectJson" DependsOnTargets="GetDefaultTestRid"> <!-- Duplicate properties to be removed in future --> <ItemGroup> <_PackagesDropsForCommonProjectJson Include="$(PackagesDrops)" /> @@ -147,7 +145,7 @@ <PackageNameRegex Condition="'$(PackageNameRegex)' == ''">(?%3Cname%3E.*)\.(?%3Cversion%3E\d+\.\d+\.\d+)(-(?%3Cprerelease%3E.*)?)?</PackageNameRegex> </PropertyGroup> - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] KARTHIKDEBUG supprots '$(SupportsDefinitionFile)'" /> + <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Using RuntimeIdentifier = '$(TestNugetRuntimeId)'" /> <AddDependenciesToProjectJson AdditionalDependencies="@(_InjectProjectReferenceDependency)" PackagesDrops="@(_PackagesDropsForCommonProjectJson)" @@ -156,9 +154,9 @@ ProjectJson="$(CommonTestProjectJson)" OutputProjectJson="$(CommonOutputTestProjectJson)" UseNewestAvailablePackages="$(UseNewestAvailablePackages)" - SupportsFile="$(SupportsDefinitionFile)" + SupportsFile="$(CommonTestProjectJson)" TestRuntime="$(TestNugetRuntimeId)" - TestTargetFramework="$(TestTFM)" + TestTargetFramework="$(FilterToTestTFM)" /> </Target> |