From b18a62e599a415170db7ee2201f7d5d6ad791dbc Mon Sep 17 00:00:00 2001
From: monojenkins <jo.shields+jenkins@xamarin.com>
Date: Sat, 14 Jan 2017 17:21:08 +0000
Subject: [PATCH] [msvc] Update csproj files (#4249)

---
 ...Win32.Registry.AccessControl-net_4_x.csproj |  1 -
 .../Facades_System.Data.Common-net_4_x.csproj  |  6 +++---
 ...tem.Globalization.Extensions-net_4_x.csproj |  5 ++---
 ...em.Reflection.TypeExtensions-net_4_x.csproj |  6 +++---
 ...ime.Serialization.Primitives-net_4_x.csproj |  2 +-
 ...System.Security.SecureString-net_4_x.csproj |  2 +-
 ...stem.Threading.AccessControl-net_4_x.csproj |  1 -
 ..._System.Threading.Overlapped-net_4_x.csproj | 18 +++++++++---------
 ...s_System.Xml.XPath.XDocument-net_4_x.csproj |  4 ++--
 .../Mono.Security/Mono.Security-net_4_x.csproj |  1 +
 msvc/scripts/order.xml                         |  4 ++--
 11 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj
index 848d270904b..e728ab3b6be 100644
--- a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj
+++ b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj
@@ -55,7 +55,6 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="RegistryAclExtensions.cs" />
     <Compile Include="TypeForwarders.cs" />
  </ItemGroup>
diff --git a/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj b/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj
index 3330cb041e3..796e72236d6 100644
--- a/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj
+++ b/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj
@@ -55,10 +55,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbColumn.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataReaderExtensions.Facade.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IColumnMappingCollection.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="DbColumn.cs" />
-    <Compile Include="DbDataReaderExtensions.Facade.cs" />
-    <Compile Include="IDbColumnSchemaGenerator.cs" />
     <Compile Include="TypeForwarders.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.
diff --git a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj
index 9deb4bfd08f..84edae66afc 100644
--- a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj
+++ b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj
@@ -55,11 +55,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.Extensions\src\System\Globalization\Extensions.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.Extensions\src\System\StringNormalizationExtensions.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="GlobalizationExtensions.cs" />
     <Compile Include="SR.cs" />
-    <Compile Include="StringNormalizationExtensions.cs" />
     <Compile Include="TypeForwarders.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.
diff --git a/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions-net_4_x.csproj b/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions-net_4_x.csproj
index 1bd72654555..cdee9d8978d 100644
--- a/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions-net_4_x.csproj
+++ b/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions-net_4_x.csproj
@@ -55,10 +55,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\..\..\external\corefx\src\System.Reflection.TypeExtensions\src\System\Reflection\Requires.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Reflection.TypeExtensions\src\System\Reflection\TypeExtensions.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Requires.cs" />
-    <Compile Include="SR.cs" />
-    <Compile Include="TypeExtensions.CoreCLR.cs" />
+    <Compile Include="corefx\SR.cs" />
     <Compile Include="TypeForwarders.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.
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives-net_4_x.csproj b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives-net_4_x.csproj
index 613424dec1f..2828c2b5196 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives-net_4_x.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives-net_4_x.csproj
@@ -55,8 +55,8 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.Serialization.Primitives\src\System\Runtime\Serialization\ISerializationSurrogateProvider.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ISerializationSurrogateProvider.cs" />
     <Compile Include="TypeForwarders.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.
diff --git a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj
index 02d276ad0ae..128db04c4be 100644
--- a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj
+++ b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj
@@ -55,8 +55,8 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.InteropServices\src\System\Security\SecureStringMarshal.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="SecureStringMarshal.cs" />
     <Compile Include="TypeForwarders.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.
diff --git a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj
index da0d43087fe..91aa53608c8 100644
--- a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj
+++ b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj
@@ -55,7 +55,6 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="ThreadingAclExtensions.cs" />
     <Compile Include="TypeForwarders.cs" />
  </ItemGroup>
diff --git a/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped-net_4_x.csproj b/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped-net_4_x.csproj
index a76789ba549..869f0219a28 100644
--- a/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped-net_4_x.csproj
+++ b/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped-net_4_x.csproj
@@ -8,7 +8,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E8BFEFD2-AAB9-45E6-8523-1F6AEB1918A2}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <NoWarn>1699,1616,1699</NoWarn>
+    <NoWarn>1699,1616,1699,3021</NoWarn>
     <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>
     <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
@@ -33,7 +33,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <NoWarn>1699,1616,1699</NoWarn>
+    <NoWarn>1699,1616,1699,3021</NoWarn>
     <Optimize>false</Optimize>
     <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -41,7 +41,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <NoWarn>1699,1616,1699</NoWarn>
+    <NoWarn>1699,1616,1699,3021</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -55,13 +55,13 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\..\..\external\corefx\src\Common\src\System\HResults.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Threading.Overlapped\src\System\Threading\ClrThreadPoolBoundHandle.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Threading.Overlapped\src\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Threading.Overlapped\src\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
+    <Compile Include="..\..\..\..\external\corefx\src\System.Threading.Overlapped\src\System\Threading\DeferredDisposableLifetime.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ClrThreadPoolBoundHandle.cs" />
-    <Compile Include="ClrThreadPoolBoundHandleOverlapped.cs" />
-    <Compile Include="ClrThreadPoolPreAllocatedOverlapped.cs" />
-    <Compile Include="DeferredDisposableLifetime.cs" />
-    <Compile Include="HResults.cs" />
-    <Compile Include="SR.cs" />
+    <Compile Include="corefx\SR.cs" />
     <Compile Include="TypeForwarders.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.
diff --git a/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument-net_4_x.csproj b/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument-net_4_x.csproj
index 4329f3b2bcf..2dc9c4b2fa2 100644
--- a/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument-net_4_x.csproj
+++ b/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument-net_4_x.csproj
@@ -55,9 +55,9 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\..\..\external\corefx\src\System.Xml.XPath.XDocument\src\System\Xml\XPath\XDocumentExtensions.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="TypeForwarders.cs" />
-    <Compile Include="XDocumentExtensions.cs" />
  </ItemGroup>
+    <Compile Include="TypeForwarders.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.
   <Target Name="BeforeBuild">
diff --git a/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj b/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
index d8c83f9939d..05e68c7920c 100644
--- a/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
+++ b/mcs/class/Mono.Security/Mono.Security-net_4_x.csproj
@@ -49,6 +49,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include=".\Assembly\AssemblyInfo.cs" />
diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 9e8ddb8e7fb..303466d8fba 100644
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -3588,7 +3588,7 @@
     </project>
     <project dir="class/Facades/System.Runtime.Serialization.Primitives" library="Facades_System.Runtime.Serialization.Primitives-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 -r:./../../../class/lib/net_4_x/System.Runtime.Serialization.dll</flags>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../../class/lib/net_4_x/mscorlib.dll -optimize /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 -r:./../../../class/lib/net_4_x/System.Runtime.Serialization.dll</flags>
       <output>System.Runtime.Serialization.Primitives.dll</output>
       <built_sources></built_sources>
       <library_output>./../../../class/lib/net_4_x/Facades/System.Runtime.Serialization.Primitives.dll</library_output>
@@ -4853,7 +4853,7 @@
     </project>
     <project dir="class/Facades/System.Threading.Overlapped" library="Facades_System.Threading.Overlapped-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 -unsafe -r:./../../../class/lib/net_4_x/System.dll</flags>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize /delaysign /keyfile:../../msfinal.pub /nowarn:1616,1699 -unsafe -nowarn:3021 -r:./../../../class/lib/net_4_x/System.dll</flags>
       <output>System.Threading.Overlapped.dll</output>
       <built_sources></built_sources>
       <library_output>./../../../class/lib/net_4_x/Facades/System.Threading.Overlapped.dll</library_output>
-- 
2.25.1