Add nestandard1.7 build for Diagnostics.Debug

This retargets the ref and src to netstandard1.7.

The test now only targets nestandard1.7.  This is due to the test
actually *not* being a portable test.  It compiles against
implementation and won't really run on anything but our impl.

This test should probably be split between unit and conformance
where the conformance cases target netstandard and run anywhere
and unit cases can compile against implementation.

12 files changed, 26 insertions, 49 deletions

diff --git a/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln b/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
index 8639126592..b42eb06e00 100644
--- a/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
+++ b/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
@@ -1,17 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug", "src\System.Diagnostics.Debug.csproj", "{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug.Tests", "tests\System.Diagnostics.Debug.Tests.csproj", "{56F67E92-E606-435E-A00F-003CBFB26945}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{47919FF5-DA40-4D99-AF2D-F560282AA913}"
-	ProjectSection(SolutionItems) = preProject
-		..\.nuget\packages.Windows_NT.config = ..\.nuget\packages.Windows_NT.config
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Unix_Debug|Any CPU = Unix_Debug|Any CPU
diff --git a/src/System.Diagnostics.Debug/dir.props b/src/System.Diagnostics.Debug/dir.props
index 94f31e5bfd..fcc1a7ca5a 100644
--- a/src/System.Diagnostics.Debug/dir.props
+++ b/src/System.Diagnostics.Debug/dir.props
@@ -2,6 +2,6 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.13.0</AssemblyVersion>
+    <AssemblyVersion>4.1.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj b/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
index 0532d55b24..37ab51591e 100644
--- a/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
+++ b/src/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
@@ -3,7 +3,10 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.Debug.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework>
+    </ProjectReference>
+    <ProjectReference Include="..\src\System.Diagnostics.Debug.csproj">
+      <TargetGroup>net463</TargetGroup>
     </ProjectReference>
     <ProjectReference Include="win\System.Diagnostics.Debug.pkgproj" />
     <ProjectReference Include="unix\System.Diagnostics.Debug.pkgproj" />
diff --git a/src/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj b/src/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj
index 9595ddecef..365c6a4df9 100644
--- a/src/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj
+++ b/src/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj
@@ -11,11 +11,6 @@
     <ProjectReference Include="..\..\src\System.Diagnostics.Debug.csproj">
       <OSGroup>Windows_NT</OSGroup>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\System.Diagnostics.Debug.csproj">
-      <OSGroup>Windows_NT</OSGroup>
-      <TargetGroup>netcore50aot</TargetGroup>
-    </ProjectReference>
-    
     <InboxOnTargetFramework Include="net45" />
     <InboxOnTargetFramework Include="win8" />
     <InboxOnTargetFramework Include="wp80" />
diff --git a/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
index 2c925bc9ac..fb434ca993 100644
--- a/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
+++ b/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
@@ -2,9 +2,8 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.Debug.cs" />
diff --git a/src/System.Diagnostics.Debug/ref/project.json b/src/System.Diagnostics.Debug/ref/project.json
index e131fe0dbc..bf1b530993 100644
--- a/src/System.Diagnostics.Debug/ref/project.json
+++ b/src/System.Diagnostics.Debug/ref/project.json
@@ -1,12 +1,8 @@
 {
   "dependencies": {
-    "System.Runtime": "4.0.0"
+    "System.Runtime": "4.1.0"
   },
   "frameworks": {
-    "netstandard1.3": {
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
+    "netstandard1.7": { }
   }
 }
diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.builds b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.builds
index 814fa908c8..ff221a8009 100644
--- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.builds
+++ b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.builds
@@ -8,13 +8,8 @@
     <Project Include="System.Diagnostics.Debug.csproj">
       <OSGroup>Windows_NT</OSGroup>
     </Project>
-    <!-- Net46 facade is currently inbox for 4.0 
     <Project Include="System.Diagnostics.Debug.csproj">
-      <TargetGroup>net46</TargetGroup>
-    </Project> -->
-    <Project Include="System.Diagnostics.Debug.csproj">
-      <OSGroup>Windows_NT</OSGroup>
-      <TargetGroup>netcore50aot</TargetGroup>
+      <TargetGroup>net463</TargetGroup>
     </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
index 8e625c797b..87bda4e374 100644
--- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
+++ b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
@@ -21,10 +21,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
   <ItemGroup Condition="'$(TargetGroup)' == ''">
     <Compile Include="Properties\InternalsVisibleTo.cs" />
     <Compile Include="System\Diagnostics\Debug.Public.cs" />
@@ -87,11 +85,11 @@
       <Link>Common\Microsoft\Win32\SafeHandles\SafeFileHandle.Unix.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'net46'">
+  <ItemGroup Condition="'$(TargetGroup)' == 'net463'">
     <TargetingPackReference Include="mscorlib" />
     <TargetingPackReference Include="System" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' != 'net46'">
+  <ItemGroup Condition="'$(TargetGroup)' != 'net463'">
     <TargetingPackReference Include="System.Private.CoreLib" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/System.Diagnostics.Debug/src/project.json b/src/System.Diagnostics.Debug/src/project.json
index c347f7de13..8570fa47cc 100644
--- a/src/System.Diagnostics.Debug/src/project.json
+++ b/src/System.Diagnostics.Debug/src/project.json
@@ -10,7 +10,7 @@
         "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24604-00"
       }
     },
-    "net46": {
+    "net463": {
       "dependencies": {
         "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds
index 90a936e509..d3ca8ccec5 100644
--- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds
+++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds
@@ -11,4 +11,4 @@
     </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
index 56319a7e05..0aab0c7f67 100644
--- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
+++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
@@ -16,13 +16,13 @@
     <NoWarn>1685</NoWarn>
     <!-- Don't allow project reference to package dependency conversion -->
     <KeepAllProjectReferences>true</KeepAllProjectReferences>
-    <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker>
+    <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Diagnostics.Debug.csproj">
       <Project>{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}</Project>
@@ -42,4 +42,4 @@
     <Compile Include="XunitAssemblyAttributes.cs" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/System.Diagnostics.Debug/tests/project.json b/src/System.Diagnostics.Debug/tests/project.json
index 137380af7b..3b4d1676dd 100644
--- a/src/System.Diagnostics.Debug/tests/project.json
+++ b/src/System.Diagnostics.Debug/tests/project.json
@@ -13,14 +13,10 @@
     "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
   },
   "frameworks": {
-    "netstandard1.3": {}
+    "netstandard1.7": {}
   },
   "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.0": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
+    "coreFx.Test.netcoreapp1.1": {},
     "coreFx.Test.net463": {}
   }
 }