From: monojenkins <jo.shields+jenkins@xamarin.com>
Date: Mon, 12 Jun 2017 20:55:04 +0000 (+0100)
Subject: [msvc] Update csproj files (#4898)
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=b9e7bcabe48cd0d9f282a2eebe6ab9a8a010d9b0;p=mono.git

[msvc] Update csproj files (#4898)
---

diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation-net_4_x.csproj b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation-net_4_x.csproj
index 2c8edb8b0c8..c281126d6a5 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation-net_4_x.csproj
+++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation-net_4_x.csproj
@@ -8,7 +8,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{71D02788-3AD8-4C43-BDEB-1A3D277496BA}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <NoWarn>1699,1616,1699</NoWarn>
+    <NoWarn>1699,1616,1699,436</NoWarn>
     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
@@ -36,7 +36,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <NoWarn>1699,1616,1699</NoWarn>
+    <NoWarn>1699,1616,1699,436</NoWarn>
     <Optimize>false</Optimize>
     <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -44,7 +44,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,1616,1699</NoWarn>
+    <NoWarn>1699,1616,1699,436</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj b/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj
index 9294c1b350a..23ae9a50b56 100644
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj
+++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_x.csproj
@@ -106,9 +106,6 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Conversions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\COperators.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\AggregateDeclaration.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\Declaration.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\GlobalAttributeDeclaration.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\NamespaceDeclaration.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExplicitConversion.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionBinder.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionKind.cs" />
@@ -139,7 +136,6 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\EventSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\FieldSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\IndexerSymbol.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\LabelSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\LocalVariableSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MethodOrPropertySymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MethodSymbol.cs" />
@@ -157,13 +153,11 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolTable.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactoryBase.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TransparentIdentifierMemberSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TypeParameterSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\UnresolvedAggregateSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\VariableSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayIndex.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayInitialization.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayLength.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Assignment.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\BinaryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Block.cs" />
@@ -173,7 +167,6 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Class.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\CompoundOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Concatenate.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ConditionalOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Constant.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Event.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\EXPR.cs" />
diff --git a/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj b/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj
index 6ca551e3224..ef02d4643cb 100644
--- a/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj
+++ b/mcs/class/System.Drawing/System.Drawing-net_4_x.csproj
@@ -52,28 +52,40 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\CategoryNameCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IPropertyValueUIService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxItemProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxUser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PaintValueEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItemInvokeHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCreatorCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditorEditStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\IDeviceContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\RotateFlipType.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="System.Drawing.Design\CategoryNameCollection.cs" />
-    <Compile Include="System.Drawing.Design\IPropertyValueUIService.cs" />
-    <Compile Include="System.Drawing.Design\IToolboxItemProvider.cs" />
-    <Compile Include="System.Drawing.Design\IToolboxService.cs" />
-    <Compile Include="System.Drawing.Design\IToolboxUser.cs" />
-    <Compile Include="System.Drawing.Design\PaintValueEventArgs.cs" />
-    <Compile Include="System.Drawing.Design\PropertyValueItem.cs" />
-    <Compile Include="System.Drawing.Design\PropertyValueUIHandler.cs" />
-    <Compile Include="System.Drawing.Design\PropertyValueUIItemInvokeHandler.cs" />
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatedEventArgs.cs" />
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatedEventHandler.cs" />
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatingEventArgs.cs" />
-    <Compile Include="System.Drawing.Design\ToolboxComponentsCreatingEventHandler.cs" />
     <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
-    <Compile Include="System.Drawing.Design\ToolboxItemCollection.cs" />
-    <Compile Include="System.Drawing.Design\ToolboxItemCreatorCallback.cs" />
     <Compile Include="System.Drawing.Design\UITypeEditor.cs" />
-    <Compile Include="System.Drawing.Design\UITypeEditorEditStyle.cs" />
     <Compile Include="System.Drawing.Drawing2D\AdjustableArrowCap.cs" />
     <Compile Include="System.Drawing.Drawing2D\Blend.cs" />
     <Compile Include="System.Drawing.Drawing2D\ColorBlend.cs" />
@@ -152,29 +164,21 @@
     <Compile Include="System.Drawing.Printing\PaperSize.cs" />
     <Compile Include="System.Drawing.Printing\PaperSource.cs" />
     <Compile Include="System.Drawing.Printing\PaperSourceKind.cs" />
-    <Compile Include="System.Drawing.Printing\PreviewPageInfo.cs" />
     <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
-    <Compile Include="System.Drawing.Printing\PrintAction.cs" />
     <Compile Include="System.Drawing.Printing\PrintController.cs" />
     <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
     <Compile Include="System.Drawing.Printing\PrinterResolution.cs" />
     <Compile Include="System.Drawing.Printing\PrinterResolutionKind.cs" />
     <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
-    <Compile Include="System.Drawing.Printing\PrinterUnit.cs" />
     <Compile Include="System.Drawing.Printing\PrinterUnitConvert.cs" />
     <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
-    <Compile Include="System.Drawing.Printing\PrintEventHandler.cs" />
     <Compile Include="System.Drawing.Printing\PrintingPermission.cs" />
     <Compile Include="System.Drawing.Printing\PrintingPermissionAttribute.cs" />
-    <Compile Include="System.Drawing.Printing\PrintingPermissionLevel.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
     <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
-    <Compile Include="System.Drawing.Printing\PrintPageEventHandler.cs" />
     <Compile Include="System.Drawing.Printing\PrintRange.cs" />
-    <Compile Include="System.Drawing.Printing\QueryPageSettingsEventArgs.cs" />
-    <Compile Include="System.Drawing.Printing\QueryPageSettingsEventHandler.cs" />
     <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
     <Compile Include="System.Drawing.Text\FontCollection.cs" />
     <Compile Include="System.Drawing.Text\GenericFontFamilies.cs" />
@@ -183,8 +187,6 @@
     <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
     <Compile Include="System.Drawing.Text\TextRenderingHint.cs" />
     <Compile Include="System.Drawing\Bitmap.cs" />
-    <Compile Include="System.Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
-    <Compile Include="System.Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
     <Compile Include="System.Drawing\Brush.cs" />
     <Compile Include="System.Drawing\Brushes.cs" />
     <Compile Include="System.Drawing\BufferedGraphics.cs" />
@@ -209,7 +211,6 @@
     <Compile Include="System.Drawing\GraphicsUnit.cs" />
     <Compile Include="System.Drawing\Icon.cs" />
     <Compile Include="System.Drawing\IconConverter.cs" />
-    <Compile Include="System.Drawing\IDeviceContext.cs" />
     <Compile Include="System.Drawing\Image.cs" />
     <Compile Include="System.Drawing\ImageAnimator.cs" />
     <Compile Include="System.Drawing\ImageConverter.cs" />
@@ -226,7 +227,6 @@
     <Compile Include="System.Drawing\RectangleConverter.cs" />
     <Compile Include="System.Drawing\RectangleF.cs" />
     <Compile Include="System.Drawing\Region.cs" />
-    <Compile Include="System.Drawing\RotateFlipType.cs" />
     <Compile Include="System.Drawing\Size.cs" />
     <Compile Include="System.Drawing\SizeConverter.cs" />
     <Compile Include="System.Drawing\SizeF.cs" />
diff --git a/mcs/class/corlib/corlib-net_4_x.csproj b/mcs/class/corlib/corlib-net_4_x.csproj
index b804694794b..9c41ec0103c 100644
--- a/mcs/class/corlib/corlib-net_4_x.csproj
+++ b/mcs/class/corlib/corlib-net_4_x.csproj
@@ -60,6 +60,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.Collections.Concurrent\src\System\Collections\Concurrent\OrderablePartitioner.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections.Concurrent\src\System\Collections\Concurrent\Partitioner.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections.Concurrent\src\System\Collections\Concurrent\PartitionerStatic.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\CollectionExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.X509Certificates\src\System\Security\Cryptography\X509Certificates\X509ContentType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.X509Certificates\src\System\Security\Cryptography\X509Certificates\X509KeyStorageFlags.cs" />
     <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
@@ -76,6 +77,7 @@
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\Collections\Generic\KeyValuePair.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\Diagnostics\Debug.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\IO\Win32Marshal.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\Runtime\CompilerServices\IsByRefLikeAttribute.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\Runtime\CompilerServices\IsReadOnlyAttribute.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\Runtime\CompilerServices\ITuple.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\Runtime\CompilerServices\RuntimeFeature.cs" />
@@ -444,6 +446,7 @@
     <Compile Include="..\referencesource\mscorlib\system\reflection\pointer.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\propertyattributes.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\reflectioncontext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\reflectiontypeloadexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\resourceattributes.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\RuntimeReflectionExtensions.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\targetexception.cs" />
@@ -589,6 +592,7 @@
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\safehandle.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\sehexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ucomienumconnections.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ucomitypeinfo.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\unknownwrapper.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\variantWrapper.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\windowsruntime\attributes.cs" />
@@ -1083,7 +1087,6 @@
     <Compile Include="System.Reflection\ParameterInfo.cs" />
     <Compile Include="System.Reflection\PortableExecutableKinds.cs" />
     <Compile Include="System.Reflection\PropertyInfo.cs" />
-    <Compile Include="System.Reflection\ReflectionTypeLoadException.cs" />
     <Compile Include="System.Reflection\StrongNameKeyPair.cs" />
     <Compile Include="System.Resources\Win32Resources.cs" />
     <Compile Include="System.Runtime.CompilerServices\ConditionalWeakTable.cs" />
@@ -1127,27 +1130,16 @@
     <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />
     <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />
     <Compile Include="System.Runtime.InteropServices\BINDPTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\CALLCONV.cs" />
     <Compile Include="System.Runtime.InteropServices\ComEventsHelper.cs" />
     <Compile Include="System.Runtime.InteropServices\CustomQueryInterfaceMode.cs" />
     <Compile Include="System.Runtime.InteropServices\DESCKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\DISPPARAMS.cs" />
-    <Compile Include="System.Runtime.InteropServices\ELEMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\EXCEPINFO.cs" />
     <Compile Include="System.Runtime.InteropServices\ExporterEventKind.cs" />
     <Compile Include="System.Runtime.InteropServices\ExtensibleClassFactory.cs" />
     <Compile Include="System.Runtime.InteropServices\FILETIME.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\FUNCKIND.cs" />
     <Compile Include="System.Runtime.InteropServices\GCHandle.cs" />
     <Compile Include="System.Runtime.InteropServices\GCHandleType.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDLDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\IDLFLAG.cs" />
     <Compile Include="System.Runtime.InteropServices\IErrorInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\IMPLTYPEFLAGS.cs" />
     <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />
-    <Compile Include="System.Runtime.InteropServices\INVOKEKIND.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibConverter.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNameProvider.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNotifySink.cs" />
@@ -1156,8 +1148,6 @@
     <Compile Include="System.Runtime.InteropServices\ManagedErrorInfo.cs" />
     <Compile Include="System.Runtime.InteropServices\Marshal.cs" />
     <Compile Include="System.Runtime.InteropServices\MarshalAsAttribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\PARAMDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\PARAMFLAG.cs" />
     <Compile Include="System.Runtime.InteropServices\RegistrationClassContext.cs" />
     <Compile Include="System.Runtime.InteropServices\RegistrationConnectionType.cs" />
     <Compile Include="System.Runtime.InteropServices\RegistrationServices.cs" />
@@ -1165,10 +1155,6 @@
     <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />
     <Compile Include="System.Runtime.InteropServices\STATSTG.cs" />
     <Compile Include="System.Runtime.InteropServices\SYSKIND.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEATTR.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEFLAGS.cs" />
-    <Compile Include="System.Runtime.InteropServices\TYPEKIND.cs" />
     <Compile Include="System.Runtime.InteropServices\TYPELIBATTR.cs" />
     <Compile Include="System.Runtime.InteropServices\TypeLibConverter.cs" />
     <Compile Include="System.Runtime.InteropServices\TypeLibExporterFlags.cs" />
@@ -1185,10 +1171,7 @@
     <Compile Include="System.Runtime.InteropServices\UCOMIRunningObjectTable.cs" />
     <Compile Include="System.Runtime.InteropServices\UCOMIStream.cs" />
     <Compile Include="System.Runtime.InteropServices\UCOMITypeComp.cs" />
-    <Compile Include="System.Runtime.InteropServices\UCOMITypeInfo.cs" />
     <Compile Include="System.Runtime.InteropServices\UCOMITypeLib.cs" />
-    <Compile Include="System.Runtime.InteropServices\VARDESC.cs" />
-    <Compile Include="System.Runtime.InteropServices\VARFLAGS.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\ActivationServices.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\ActivatorLevel.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\AppDomainLevelActivator.cs" />
@@ -1753,6 +1736,9 @@
     <EmbeddedResource Include="resources/collation.cjkKOlv2.bin">
       <LogicalName>collation.cjkKOlv2.bin</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="LinkerDescriptor/mscorlib.xml">
+      <LogicalName>mscorlib.xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
 
diff --git a/mcs/tools/linker/monolinker-net_4_x.csproj b/mcs/tools/linker/monolinker-net_4_x.csproj
index f18fc0b60dc..f80636d8747 100644
--- a/mcs/tools/linker/monolinker-net_4_x.csproj
+++ b/mcs/tools/linker/monolinker-net_4_x.csproj
@@ -8,7 +8,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FA920637-C202-4E75-AC0F-1A8DBD631DF1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <NoWarn>1699</NoWarn>
+    <NoWarn>1699,1699</NoWarn>
     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
     <HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
@@ -30,17 +30,17 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <NoWarn>1699</NoWarn>
+    <NoWarn>1699,1699</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <NoWarn>1699</NoWarn>
+    <NoWarn>1699,1699</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -78,8 +78,10 @@
     <Compile Include="..\..\..\external\linker\linker\Mono.Linker\LoadException.cs" />
     <Compile Include="..\..\..\external\linker\linker\Mono.Linker\MarkException.cs" />
     <Compile Include="..\..\..\external\linker\linker\Mono.Linker\MethodAction.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\MethodReferenceExtensions.cs" />
     <Compile Include="..\..\..\external\linker\linker\Mono.Linker\Pipeline.cs" />
     <Compile Include="..\..\..\external\linker\linker\Mono.Linker\TypePreserve.cs" />
+    <Compile Include="..\..\..\external\linker\linker\Mono.Linker\TypeReferenceExtensions.cs" />
     <Compile Include="..\..\..\external\linker\linker\Mono.Linker\XApiReader.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -127,25 +129,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Descriptors/mscorlib.xml">
-      <LogicalName>mscorlib.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Descriptors/System.xml">
-      <LogicalName>System.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Descriptors/System.Core.xml">
-      <LogicalName>System.Core.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Descriptors/System.Drawing.xml">
-      <LogicalName>System.Drawing.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Descriptors/System.Web.xml">
-      <LogicalName>System.Web.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Descriptors/Mono.Posix.xml">
-      <LogicalName>Mono.Posix.xml</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
 </Project>
 
diff --git a/net_4_x.sln b/net_4_x.sln
index 9122ba00a96..a426ac95347 100644
--- a/net_4_x.sln
+++ b/net_4_x.sln
@@ -591,10 +591,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "commoncryptogenerator-net_4
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resx2sr-net_4_x", "mcs/tools/resx2sr/resx2sr-net_4_x.csproj", "{07D30676-A919-4763-8C3C-B2C4DAFFC662}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "al-net_4_x", "mcs/tools/al/al-net_4_x.csproj", "{D237CE6E-EA8F-4E8E-8413-295B27714AC6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monolinker-net_4_x", "mcs/tools/linker/monolinker-net_4_x.csproj", "{FA920637-C202-4E75-AC0F-1A8DBD631DF1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "al-net_4_x", "mcs/tools/al/al-net_4_x.csproj", "{D237CE6E-EA8F-4E8E-8413-295B27714AC6}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "genxs-net_4_x", "mcs/tools/genxs/genxs-net_4_x.csproj", "{DCD2613C-B1A0-489B-BCA1-79BEBB9B9541}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mkbundle-net_4_x", "mcs/tools/mkbundle/mkbundle-net_4_x.csproj", "{3A3DAEC2-3DF4-4968-A191-8D6F207ABA5E}"
@@ -1865,14 +1865,14 @@ Global
 		{07D30676-A919-4763-8C3C-B2C4DAFFC662}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07D30676-A919-4763-8C3C-B2C4DAFFC662}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07D30676-A919-4763-8C3C-B2C4DAFFC662}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FA920637-C202-4E75-AC0F-1A8DBD631DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA920637-C202-4E75-AC0F-1A8DBD631DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA920637-C202-4E75-AC0F-1A8DBD631DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA920637-C202-4E75-AC0F-1A8DBD631DF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DCD2613C-B1A0-489B-BCA1-79BEBB9B9541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DCD2613C-B1A0-489B-BCA1-79BEBB9B9541}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DCD2613C-B1A0-489B-BCA1-79BEBB9B9541}.Release|Any CPU.ActiveCfg = Release|Any CPU