projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a9a282e)
[msvc] Update csproj files (#4249)
authormonojenkins <jo.shields+jenkins@xamarin.com>
Sat, 14 Jan 2017 17:21:08 +0000 (17:21 +0000)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Sat, 14 Jan 2017 17:21:08 +0000 (18:21 +0100)
mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj patch | blob | history
mcs/class/Facades/System.Data.Common/Facades_System.Data.Common-net_4_x.csproj patch | blob | history
mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj patch | blob | history
mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions-net_4_x.csproj patch | blob | history
mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives-net_4_x.csproj patch | blob | history
mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj patch | blob | history
mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj patch | blob | history
mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped-net_4_x.csproj patch | blob | history
mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument-net_4_x.csproj patch | blob | history
mcs/class/Mono.Security/Mono.Security-net_4_x.csproj patch | blob | history
msvc/scripts/order.xml patch | blob | history

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 848d270904b6b97fba74a8bafe8e88f1a844b09c..e728ab3b6bee47b21fbd1d1e99a1b61831e9510d 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
     <Compile Include="RegistryAclExtensions.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
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 3330cb041e33a3dc363275e5820664a10d3dbf02..796e72236d6e1f66851f3f10721040c8a9c16338 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbColumn.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbDataReaderExtensions.Facade.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IColumnMappingCollection.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="DbColumn.cs" />\r
-    <Compile Include="DbDataReaderExtensions.Facade.cs" />\r
-    <Compile Include="IDbColumnSchemaGenerator.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
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 9deb4bfd08fb704f12d902ac6528b7d634df96bd..84edae66afc1c9cd72154e601dec4b1abb0bf1cf 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.Extensions\src\System\Globalization\Extensions.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.Extensions\src\System\StringNormalizationExtensions.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="GlobalizationExtensions.cs" />\r
     <Compile Include="SR.cs" />\r
-    <Compile Include="StringNormalizationExtensions.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
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 1bd72654555a8f4aa6d9c22c3986b18e5ad4d538..cdee9d8978dc496c68149403864961706bde05a4 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Reflection.TypeExtensions\src\System\Reflection\Requires.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Reflection.TypeExtensions\src\System\Reflection\TypeExtensions.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="Requires.cs" />\r
-    <Compile Include="SR.cs" />\r
-    <Compile Include="TypeExtensions.CoreCLR.cs" />\r
+    <Compile Include="corefx\SR.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
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 613424dec1f276fba0e1e822ea24abf56ec3f3e4..2828c2b519691d4d98b7c8f207753e1aa034889c 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.Serialization.Primitives\src\System\Runtime\Serialization\ISerializationSurrogateProvider.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="ISerializationSurrogateProvider.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
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 02d276ad0aeff4e9e00c9ee8f1ec0e57c48a1593..128db04c4bedd31f1cc9916c9dd8d3a1c628fc20 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Runtime.InteropServices\src\System\Security\SecureStringMarshal.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="SecureStringMarshal.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
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 da0d43087fe387218519642b3bbd16d9062db7cb..91aa53608c81e524894ae7bc566a6a2acb4f4e7a 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-    <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
     <Compile Include="ThreadingAclExtensions.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
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 a76789ba5495de8f3f196ac3299421356bdba395..869f0219a28051802b446dc2087bc1de38814684 100644 (file)
--- 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>\r
     <ProjectGuid>{E8BFEFD2-AAB9-45E6-8523-1F6AEB1918A2}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
+    <NoWarn>1699,1616,1699,3021</NoWarn>\r
     <OutputPath>./../../../class/lib/net_4_x/Facades</OutputPath>\r
     <IntermediateOutputPath>obj-Facades</IntermediateOutputPath>\r
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>\r
@@ -33,7 +33,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
+    <NoWarn>1699,1616,1699,3021</NoWarn>\r
     <Optimize>false</Optimize>\r
     <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
@@ -41,7 +41,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
-    <NoWarn>1699,1616,1699</NoWarn>\r
+    <NoWarn>1699,1616,1699,3021</NoWarn>\r
     <Optimize>true</Optimize>\r
     <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
@@ -55,13 +55,13 @@
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\..\..\external\corefx\src\Common\src\System\HResults.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Threading.Overlapped\src\System\Threading\ClrThreadPoolBoundHandle.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Threading.Overlapped\src\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Threading.Overlapped\src\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Threading.Overlapped\src\System\Threading\DeferredDisposableLifetime.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="ClrThreadPoolBoundHandle.cs" />\r
-    <Compile Include="ClrThreadPoolBoundHandleOverlapped.cs" />\r
-    <Compile Include="ClrThreadPoolPreAllocatedOverlapped.cs" />\r
-    <Compile Include="DeferredDisposableLifetime.cs" />\r
-    <Compile Include="HResults.cs" />\r
-    <Compile Include="SR.cs" />\r
+    <Compile Include="corefx\SR.cs" />\r
     <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
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 4329f3b2bcf89ec87d2ba6edb9d190f85b23488d..2dc9c4b2fa27c7d9241649e6f56b6255bc0ef3b3 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\..\..\external\corefx\src\System.Xml.XPath.XDocument\src\System\Xml\XPath\XDocumentExtensions.cs" />\r
     <Compile Include="AssemblyInfo.cs" />\r
-    <Compile Include="TypeForwarders.cs" />\r
-    <Compile Include="XDocumentExtensions.cs" />\r  </ItemGroup>\r
+    <Compile Include="TypeForwarders.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
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 d8c83f9939d1ef78f634de44d9970a26a1c5b89d..05e68c7920ce7aa13e68f758083e57b7330a303a 100644 (file)
--- 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>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
+    <Compile Include="..\..\build\common\AssemblyRef.cs" />\r
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\Locale.cs" />\r
     <Compile Include=".\Assembly\AssemblyInfo.cs" />\r
diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 9e8ddb8e7fb908a040421fa20455014c6a3886e8..303466d8fba4d1c175abae50129e9f97e3b90a37 100644 (file)
--- 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>
my mono mirror. check out Moved to http://github.com/mono/mono