Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Fix the reference assembly for mscorlib to match the surface area of the OS #4890

Merged
merged 3 commits into from
May 11, 2016
Merged

Fix the reference assembly for mscorlib to match the surface area of the OS #4890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2955664
Fix the reference assembly for mscorlib to match the surface area of …
AlexGhiondea May 10, 2016
a5ba6fa
Create a Nuget package that will contain the reference assembly for m…
AlexGhiondea May 10, 2016
b451522
Build the reference assembly and the facade for mscorlib.
AlexGhiondea May 10, 2016
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
20 changes: 20 additions & 0 deletions ...t/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>1.0.1</Version>
Copy link
Member

Choose a reason for hiding this comment

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

Assuming you didn't already we should bump this version with the move.

Copy link
Author

Choose a reason for hiding this comment

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

I bumped this already.

<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;</PackagePlatforms>
<OutputPath>$(PackagesOutputPath)</OutputPath>
</PropertyGroup>

<ItemGroup>
<File Include="$(BinDir)/ref/mscorlib.dll">
<TargetPath>lib/netstandard1.0</TargetPath>
</File>
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
5 changes: 5 additions & 0 deletions src/.nuget/descriptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,10 @@
"Name": "Microsoft.NETCore.Runtime.CoreCLR",
"Description": "The .NET Core runtime, called CoreCLR, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.",
"CommonTypes": [ ]
},
{
"Name": "Microsoft.TargetingPack.Private.CoreCLR",
"Description": "Contains a private targeting pack which contains only the CoreCLR mscorlib reference assembly. Used for producing platform specific libraries such as facades.",
"CommonTypes": [ ]
}
]
2 changes: 2 additions & 0 deletions src/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<!-- List the projects that need to be built -->
<ItemGroup>
<Project Include="mscorlib\mscorlib.csproj" />
<Project Include="mscorlib\ref\mscorlib.csproj" />
<Project Include="mscorlib\facade\mscorlib.csproj" />
<Project Include="mscorlib\System.Private.CoreLib.csproj" />
</ItemGroup>

Expand Down
12 changes: 11 additions & 1 deletion src/mscorlib/facade/mscorlib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<!-- These prevent the default MsBuild targets from referencing System.dll and mscorlib.dll -->
<NoStdLib>true</NoStdLib>
<NoCompilerStandardLib>true</NoCompilerStandardLib>

<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
</PropertyGroup>
<!-- Default configurations to help VS understand the options -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
Expand All @@ -26,6 +29,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net462_Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net462_Release|AnyCPU'" />

<!-- Roslyn does not support writing PDBs on Unix -->
<PropertyGroup Condition="'$(OsEnvironment)' == 'Unix'">
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
</PropertyGroup>

<!-- Output paths -->
<PropertyGroup>
<BaseIntermediateOutputPath>$(RootBinDir)\obj</BaseIntermediateOutputPath>
Expand All @@ -38,9 +47,10 @@
<OutputPath>$(BinDir)\facade</OutputPath>
</PropertyGroup>

<ItemGroup Condition="'$(IsPartialFacadeAssembly)'=='true'">
<ItemGroup>
<ProjectReference Include="..\System.Private.CoreLib.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="project.json" />
</ItemGroup>
Expand Down
Loading