summaryrefslogtreecommitdiff
path: root/src/mscorlib/facade
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2016-12-27 07:46:08 (GMT)
committerJiyoung Yun <jy910.yun@samsung.com>2016-12-27 07:46:08 (GMT)
commitdb20f3f1bb8595633a7e16c8900fd401a453a6b5 (patch)
treee5435159cd1bf0519276363a6fe1663d1721bed3 /src/mscorlib/facade
parent4b4aad7217d3292650e77eec2cf4c198ea9c3b4b (diff)
downloadcoreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.zip
coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.gz
coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.bz2
Imported Upstream version 1.0.0.9127upstream/1.0.0.9127
Diffstat (limited to 'src/mscorlib/facade')
-rw-r--r--src/mscorlib/facade/TypeForwards.cs37
-rw-r--r--src/mscorlib/facade/mscorlib.csproj37
-rw-r--r--src/mscorlib/facade/project.json1
3 files changed, 23 insertions, 52 deletions
diff --git a/src/mscorlib/facade/TypeForwards.cs b/src/mscorlib/facade/TypeForwards.cs
deleted file mode 100644
index ba78711..0000000
--- a/src/mscorlib/facade/TypeForwards.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.CompilerServices;
-
-#if WINDOWS_TYPEFORWARDS
-[assembly: TypeForwardedTo(typeof(System.Threading.WinRTSynchronizationContextFactoryBase))]
-[assembly: TypeForwardedTo(typeof(System.Resources.WindowsRuntimeResourceManagerBase))]
-[assembly: TypeForwardedTo(typeof(System.Resources.PRIExceptionInfo))]
-[assembly: TypeForwardedTo(typeof(System.Runtime.InteropServices.WindowsRuntime.WindowsRuntimeImportAttribute))]
-[assembly: TypeForwardedTo(typeof(System.Runtime.InteropServices.WindowsRuntime.IRestrictedErrorInfo))]
-[assembly: TypeForwardedTo(typeof(System.StubHelpers.EventArgsMarshaler))]
-[assembly: TypeForwardedTo(typeof(System.StubHelpers.InterfaceMarshaler))]
-#endif
-
-[assembly: TypeForwardedTo(typeof(System.Diagnostics.Tracing.FrameworkEventSource))]
-[assembly: TypeForwardedTo(typeof(System.Globalization.CultureData))]
-[assembly: TypeForwardedTo(typeof(System.Globalization.CalendarData))]
-[assembly: TypeForwardedTo(typeof(System.IO.BufferedStream))]
-[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.JitHelpers))]
-[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.ObjectHandleOnStack))]
-[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.PinningHelper))]
-[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.StackCrawlMarkHandle))]
-[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.StringHandleOnStack))]
-[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.FriendAccessAllowedAttribute))]
-[assembly: TypeForwardedTo(typeof(System.StubHelpers.StubHelpers))]
-[assembly: TypeForwardedTo(typeof(System.StubHelpers.CleanupWorkList))]
-[assembly: TypeForwardedTo(typeof(System.StubHelpers.CleanupWorkListElement))]
-[assembly: TypeForwardedTo(typeof(System.Threading.StackCrawlMark))]
-[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.AsyncCausalityStatus))]
-[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.CausalityRelation))]
-[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.CausalitySynchronousWork))]
-[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.AsyncCausalityTracer))]
-[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.CausalityTraceLevel))]
-
-
diff --git a/src/mscorlib/facade/mscorlib.csproj b/src/mscorlib/facade/mscorlib.csproj
index c3a165d..7d0133a 100644
--- a/src/mscorlib/facade/mscorlib.csproj
+++ b/src/mscorlib/facade/mscorlib.csproj
@@ -48,20 +48,13 @@
<DebugType>none</DebugType>
</PropertyGroup>
- <!-- Some of the type forwards should only be build when targeting Windows. -->
- <PropertyGroup>
- <DefineConstants Condition="'$(TargetsWindows)'=='true'">$(DefineConstants);WINDOWS_TYPEFORWARDS</DefineConstants>
- </PropertyGroup>
-
<!-- Output paths -->
<PropertyGroup>
<BaseIntermediateOutputPath>$(RootBinDir)\obj</BaseIntermediateOutputPath>
- <!-- Note the trailing '\\' - they are needed so that genfacade does not fail due to an invalid path
- In particular, the facadepath is sent in quotes.
- And the IntermediateOutputPath is required to end in a '\' in the coreclr repo. This means that the
- facadepath ends up being sent as 'mypath\"' and that trips the Path normalization.
- Introducing a second '\' tricks the normalization logic to treat this '\\"' as '\"' and not complain. -->
- <IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)\facade\\</IntermediateOutputPath>
+ <!-- IntermediateOutputPath must have a trailing slash, however GenFacades
+ surrounds the value in quotes when passing as the '-facadepath' argument.
+ To avoid escaping the trailing quote, use a forward slash. -->
+ <IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)\facade/</IntermediateOutputPath>
<OutputPath>$(BinDir)\facade</OutputPath>
</PropertyGroup>
@@ -70,10 +63,6 @@
</ItemGroup>
<ItemGroup>
- <Compile Include="TypeForwards.cs" />
- </ItemGroup>
-
- <ItemGroup>
<None Include="project.json" />
</ItemGroup>
@@ -97,6 +86,24 @@
<SeedTypePreference Include="System.Console">
<Assembly>System.Console</Assembly>
</SeedTypePreference>
+ <SeedTypePreference Include="System.IO.BinaryReader">
+ <Assembly>System.IO</Assembly>
+ </SeedTypePreference>
+ <SeedTypePreference Include="System.IO.BinaryWriter">
+ <Assembly>System.IO</Assembly>
+ </SeedTypePreference>
+ <SeedTypePreference Include="System.IO.EndOfStreamException">
+ <Assembly>System.IO</Assembly>
+ </SeedTypePreference>
+ <SeedTypePreference Include="System.IO.MemoryStream">
+ <Assembly>System.IO</Assembly>
+ </SeedTypePreference>
+ <SeedTypePreference Include="System.IO.SeekOrigin">
+ <Assembly>System.IO</Assembly>
+ </SeedTypePreference>
+ <SeedTypePreference Include="System.IO.Stream">
+ <Assembly>System.IO</Assembly>
+ </SeedTypePreference>
</ItemGroup>
</Project>
diff --git a/src/mscorlib/facade/project.json b/src/mscorlib/facade/project.json
index 485086e..37f8c1b 100644
--- a/src/mscorlib/facade/project.json
+++ b/src/mscorlib/facade/project.json
@@ -1,6 +1,7 @@
{
"dependencies": {
"System.Console": "4.0.0",
+ "System.IO": "4.1.0",
"System.Security.Cryptography.Primitives": "4.0.0",
"System.Security.Claims": "4.0.0",
},