From 4ac0e7c3dc4d8a4fbbcd1010e871df9821b8af8a Mon Sep 17 00:00:00 2001
From: Swaroop Sridhar <Swaroop.Sridhar@microsoft.com>
Date: Fri, 15 Mar 2019 11:50:12 -0700
Subject: [PATCH 1/2] Move SOS to SDK build

* Add RestoreArcade target and some other properties to SOS NETCore project
* Remove the hack to Skip SoS for arcade builds
---
 src/ToolBox/SOS/NETCore/SOS.NETCore.csproj | 76 +++-------------------
 src/build.proj                             |  2 +-
 2 files changed, 10 insertions(+), 68 deletions(-)

diff --git a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
index 7cff9d7b6f8c..cdf86f88b72d 100644
--- a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
+++ b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
@@ -1,80 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
+  <Target Name="HackToRestoreAracde" BeforeTargets="BeforeBuild" DependsOnTargets="Restore">
+  </Target>
+
   <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>SOS.NETCore</AssemblyName>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <ProjectGuid>{20513BA2-A156-4A17-4C70-5AC2DBD4F833}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputType>Library</OutputType>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <NoStdLib>true</NoStdLib>
-    <NoCompilerStandardLib>true</NoCompilerStandardLib>
-    <IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly>
-    <AssemblyKey>Open</AssemblyKey>
-    <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade>
-    <ContainsPackageReferences>true</ContainsPackageReferences>
-
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
-         the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
-  </PropertyGroup>
-
-  <!-- Default configurations to help VS understand the options -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-
-  <!-- Configuration specific properties -->
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineConstants>_DEBUG;DEBUG;TRACE;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <DebugType>portable</DebugType>
+    <NoWarn>;1591;1701</NoWarn>
+    <Description>.NET Core SOS</Description>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="SymbolReader.cs" />
-  </ItemGroup>
-
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
+    <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.IO.FileSystem">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.InteropServices">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Reflection.Metadata">
-      <Version>1.4.1</Version>
-    </PackageReference>
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
   </ItemGroup>
-
-  <Target Name="CopyItemsToDirectory" AfterTargets="Build">
-    <Copy
-      SourceFiles="$(OutputPath)$(AssemblyName).dll"
-      DestinationFolder="$(BinDir)"
-      SkipUnchangedFiles="false"
-      OverwriteReadOnlyFiles="false"
-      UseHardlinksIfPossible="false">
-    </Copy>
-
-    <Copy
-      SourceFiles="$(OutputPath)$(AssemblyName).pdb"
-      DestinationFolder="$(BinDir)\PDB"
-      SkipUnchangedFiles="false"
-      OverwriteReadOnlyFiles="false"
-      UseHardlinksIfPossible="false">
-    </Copy>
-  </Target>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
diff --git a/src/build.proj b/src/build.proj
index 62d1a5b92681..d23848546d24 100644
--- a/src/build.proj
+++ b/src/build.proj
@@ -3,7 +3,7 @@
   
   <!-- List the projects that need to be built -->
   <ItemGroup>
-    <Project Condition="$(SkipSOS) != 'true' and '$(ArcadeBuild)' != 'true'" Include="ToolBox\SOS\NETCore\SOS.NETCore.csproj" />
+    <Project Condition="$(SkipSOS) != 'true'" Include="ToolBox\SOS\NETCore\SOS.NETCore.csproj" />
     <Project Include="System.Private.CoreLib\System.Private.CoreLib.csproj" />
   </ItemGroup>
 

From 7aae174adb38bac8830fca7c14a1d5b2816b0f25 Mon Sep 17 00:00:00 2001
From: Swaroop Sridhar <swaroops@Swaroops-MBP.guest.corp.microsoft.com>
Date: Mon, 18 Mar 2019 16:44:55 -0700
Subject: [PATCH 2/2] Remove RootBinDir

---
 src/ToolBox/SOS/NETCore/SOS.NETCore.csproj | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
index cdf86f88b72d..fc32f343f617 100644
--- a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
+++ b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
@@ -5,17 +5,13 @@
   </Target>
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>SOS.NETCore</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>;1591;1701</NoWarn>
     <Description>.NET Core SOS</Description>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
   </ItemGroup>