Update CoreRT build to use latest .NET CLI and build tools (#3916)

- Pick up latest .NET Core 2.0 CLI and buildtools
- Remove all project.json references and convert everything to msbuild projects
- Stick to vanilla .NET CLI project shape as much as possible. Minimize dependencies on buildtools special behaviors

4 files changed, 17 insertions, 62 deletions

diff --git a/src/ILCompiler.DependencyAnalysisFramework/src/ILCompiler.DependencyAnalysisFramework.csproj b/src/ILCompiler.DependencyAnalysisFramework/src/ILCompiler.DependencyAnalysisFramework.csproj
index 82991f93e..e66316c2d 100644
--- a/src/ILCompiler.DependencyAnalysisFramework/src/ILCompiler.DependencyAnalysisFramework.csproj
+++ b/src/ILCompiler.DependencyAnalysisFramework/src/ILCompiler.DependencyAnalysisFramework.csproj
@@ -1,25 +1,18 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" Condition="'$(IsProjectNLibrary)' != 'true'" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DAC23E9F-F826-4577-AE7A-0849FF83280C}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ILCompiler.DependencyAnalysisFramework</RootNamespace>
     <AssemblyName>ILCompiler.DependencyAnalysisFramework</AssemblyName>
-    <ExcludeResourcesImport>true</ExcludeResourcesImport>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <TargetFramework>netstandard1.3</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageDestination Include="Tools">
-      <InProject>false</InProject>
-      <TargetFramework>.NetCoreApp,Version=2.0</TargetFramework>
-    </PackageDestination>
+    <PackageReference Include="System.Xml.ReaderWriter">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>1.3.1</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ComputedStaticDependencyNode.cs" />
@@ -36,8 +29,5 @@
     <Compile Include="IDependencyNode.cs" />
     <Compile Include="NoLogStrategy.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" Condition="'$(IsProjectNLibrary)' != 'true'" />
 </Project>
diff --git a/src/ILCompiler.DependencyAnalysisFramework/src/project.json b/src/ILCompiler.DependencyAnalysisFramework/src/project.json
deleted file mode 100644
index e2b39c402..000000000
--- a/src/ILCompiler.DependencyAnalysisFramework/src/project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "System.Xml.ReaderWriter": "4.3.0",
-    "System.Collections.Immutable": "1.3.1"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  }
-}
diff --git a/src/ILCompiler.DependencyAnalysisFramework/tests/ILCompiler.DependencyAnalysisFramework.Tests.csproj b/src/ILCompiler.DependencyAnalysisFramework/tests/ILCompiler.DependencyAnalysisFramework.Tests.csproj
index 2c51757cb..37f6e2a40 100644
--- a/src/ILCompiler.DependencyAnalysisFramework/tests/ILCompiler.DependencyAnalysisFramework.Tests.csproj
+++ b/src/ILCompiler.DependencyAnalysisFramework/tests/ILCompiler.DependencyAnalysisFramework.Tests.csproj
@@ -1,32 +1,25 @@
 <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>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{90076B9B-918B-49DD-8ADE-E76426D60B4D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>ILCompiler.DependencyAnalysisFramework.Tests</AssemblyName>
     <RootNamespace>ILCompiler.DependencyAnalysisFramework.Tests</RootNamespace>
-    <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker>
-    <TestTFM>netcoreapp1.1</TestTFM>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <TargetFramework>netstandard1.3</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\src\ILCompiler.DependencyAnalysisFramework.csproj">
-      <Project>{DAC23E9F-F826-4577-AE7A-0849FF83280C}</Project>
-      <Name>ILCompiler.DependencyAnalysisFramework</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\src\ILCompiler.DependencyAnalysisFramework.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DependencyAnalysisFrameworkTests.cs" />
-    <Compile Include="TestGraph.cs" />
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>1.3.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite">
+      <Version>$(XunitNetcoreExtensionsVersion)</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="project.json" />
+    <Compile Include="DependencyAnalysisFrameworkTests.cs" />
+    <Compile Include="TestGraph.cs" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
diff --git a/src/ILCompiler.DependencyAnalysisFramework/tests/project.json b/src/ILCompiler.DependencyAnalysisFramework/tests/project.json
deleted file mode 100644
index be28cf2c6..000000000
--- a/src/ILCompiler.DependencyAnalysisFramework/tests/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Microsoft.NETCore.Platforms": "1.1.0",
-    "System.Collections.Immutable": "1.3.1",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    }
-  },
-  "frameworks": {
-    "netstandard1.3": { }
-  },
-  "supports": {
-    "coreFx.Test.netcoreapp1.1": { }
-  }
-}