summaryrefslogtreecommitdiff
path: root/src/ToolBox/SOS/NETCore
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-06-13 18:47:36 +0900
committerJiyoung Yun <jy910.yun@samsung.com>2017-06-13 18:47:36 +0900
commit61d6a817e39d3bae0f47dbc09838d51db22a5d30 (patch)
treecb37caa1784bc738b976273335d6ed04a7cc80b0 /src/ToolBox/SOS/NETCore
parent5b975f8233e8c8d17b215372f89ca713b45d6a0b (diff)
downloadcoreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.gz
coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.bz2
coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.zip
Imported Upstream version 2.0.0.11992upstream/2.0.0.11992
Diffstat (limited to 'src/ToolBox/SOS/NETCore')
-rw-r--r--src/ToolBox/SOS/NETCore/SOS.NETCore.csproj27
-rw-r--r--src/ToolBox/SOS/NETCore/project.json15
2 files changed, 23 insertions, 19 deletions
diff --git a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
index 440cff5d82..c579b59dc0 100644
--- a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
+++ b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
@@ -11,13 +11,15 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<NoStdLib>true</NoStdLib>
<NoCompilerStandardLib>true</NoCompilerStandardLib>
- <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
+ <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 -->
@@ -39,8 +41,25 @@
<Compile Include="SymbolReader.cs" />
</ItemGroup>
+ <PropertyGroup>
+ <TargetFramework>netcoreapp1.0</TargetFramework>
+ <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+ <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
+ </PropertyGroup>
+
<ItemGroup>
- <None Include="project.json" />
+ <PackageReference Include="Microsoft.NETCore.Platforms">
+ <Version>$(RuntimeIdGraphDefinitionVersion)</Version>
+ </PackageReference>
+ <PackageReference Include="System.IO.FileSystem">
+ <Version>4.0.1</Version>
+ </PackageReference>
+ <PackageReference Include="System.Runtime.InteropServices">
+ <Version>4.1.0</Version>
+ </PackageReference>
+ <PackageReference Include="System.Reflection.Metadata">
+ <Version>1.4.1</Version>
+ </PackageReference>
</ItemGroup>
<Target Name="CopyItemsToDirectory" AfterTargets="Build">
@@ -52,7 +71,7 @@
UseHardlinksIfPossible="false">
</Copy>
- <Copy
+ <Copy
SourceFiles="$(OutputPath)$(AssemblyName).pdb"
DestinationFolder="$(BinDir)\PDB"
SkipUnchangedFiles="false"
diff --git a/src/ToolBox/SOS/NETCore/project.json b/src/ToolBox/SOS/NETCore/project.json
deleted file mode 100644
index a92b173569..0000000000
--- a/src/ToolBox/SOS/NETCore/project.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.0.1",
- "System.IO.FileSystem": "4.0.1",
- "System.Runtime.InteropServices": "4.1.0",
- "System.Reflection.Metadata": "1.4.1"
- },
- "frameworks": {
- "netcoreapp1.0": {
- "imports": [
- "portable-net45+win8"
- ]
- }
- }
-}