Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move SOS to SDK build #15

Merged
merged 2 commits into from
Mar 18, 2019
Merged

Move SOS to SDK build #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ac0e7c
Move SOS to SDK build
swaroop-sridhar Mar 15, 2019
7aae174
Remove RootBinDir
Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 9 additions & 67 deletions src/ToolBox/SOS/NETCore/SOS.NETCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should already be set in dir.props

</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>
2 changes: 1 addition & 1 deletion src/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down