From 07bf83dd61a595f7ebba4e66267886b0d2ef18fd Mon Sep 17 00:00:00 2001
From: monojenkins <jo.shields+jenkins@xamarin.com>
Date: Tue, 11 Apr 2017 16:29:26 +0000
Subject: [PATCH] [msvc] Update csproj files

---
 .../System.Runtime.Caching-net_4_x.csproj     |  2 +-
 ...stem.ServiceModel.Internals-net_4_x.csproj |  3 +-
 .../System.Web/System.Web-net_4_x.csproj      |  1 +
 .../System.Web-plainweb-net_4_x.csproj        |  1 +
 mcs/class/System/System-bare-net_4_x.csproj   |  2 +
 mcs/class/System/System-net_4_x.csproj        |  2 +
 mcs/class/System/System-secxml-net_4_x.csproj |  2 +
 mcs/tools/resgen/resgen-net_4_x.csproj        | 25 +++++-
 msvc/scripts/order.xml                        | 80 ++++++++++++-------
 net_4_x.sln                                   | 22 ++---
 10 files changed, 97 insertions(+), 43 deletions(-)

diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj
index 124793b54c4..66d36bd4d78 100644
--- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj
+++ b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj
@@ -100,7 +100,7 @@
     <Compile Include="ReferenceSources\CacheEntryCollection.cs" />
     <Compile Include="ReferenceSources\CacheExpires.cs" />
     <Compile Include="ReferenceSources\CacheUsage.cs" />
-    <Compile Include="ReferenceSources\R.Designer.cs" />
  </ItemGroup>
+    <Compile Include="ReferenceSources\R.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/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj
index c0dce2a430c..ffb6f6a5a66 100644
--- a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj
@@ -128,7 +128,8 @@
     <Compile Include="..\referencesource\System.ServiceModel.Internals\TraceCore.Designer.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="EventLogEntryType.cs" />
-    <Compile Include="InternalSR.cs" />
  </ItemGroup>
+    <Compile Include="InternalSR.cs" />
+    <Compile Include="ReferenceSources\LocalAppContextSwitches.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/System.Web/System.Web-net_4_x.csproj b/mcs/class/System.Web/System.Web-net_4_x.csproj
index 33594b8bb1d..7732be367a3 100644
--- a/mcs/class/System.Web/System.Web-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-net_4_x.csproj
@@ -552,6 +552,7 @@
     <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />
     <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
+    <Compile Include="ReferenceSources\TelemetryLogger.cs" />
     <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />
     <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />
     <Compile Include="System.Web.Caching\Cache.cs" />
diff --git a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
index bd51042b5fa..8ece36e1643 100644
--- a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
@@ -552,6 +552,7 @@
     <Compile Include="Mono.Web.Util\SettingsMappingManager.cs" />
     <Compile Include="Mono.Web.Util\SettingsMappingWhat.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
+    <Compile Include="ReferenceSources\TelemetryLogger.cs" />
     <Compile Include="System.Collections.Concurrent\SplitOrderedList.cs" />
     <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />
     <Compile Include="System.Web.Caching\Cache.cs" />
diff --git a/mcs/class/System/System-bare-net_4_x.csproj b/mcs/class/System/System-bare-net_4_x.csproj
index edcca181b51..f6c98cf17ea 100644
--- a/mcs/class/System/System-bare-net_4_x.csproj
+++ b/mcs/class/System/System-bare-net_4_x.csproj
@@ -200,6 +200,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\GZipStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.ServicePoint\src\System\Net\SecurityProtocolType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\ClientWebSocket.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\ClientWebSocketOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\WebSocketHandle.Managed.cs" />
@@ -920,6 +921,7 @@
     <Compile Include="ReferenceSources\NativeMethods.cs" />
     <Compile Include="ReferenceSources\RequestCacheProtocol.cs" />
     <Compile Include="ReferenceSources\SecureStringHelper.cs" />
+    <Compile Include="ReferenceSources\ServerCertValidationCallback.cs" />
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />
     <Compile Include="ReferenceSources\Socket.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
diff --git a/mcs/class/System/System-net_4_x.csproj b/mcs/class/System/System-net_4_x.csproj
index 567edc59d33..bf204056889 100644
--- a/mcs/class/System/System-net_4_x.csproj
+++ b/mcs/class/System/System-net_4_x.csproj
@@ -200,6 +200,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\GZipStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.ServicePoint\src\System\Net\SecurityProtocolType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\ClientWebSocket.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\ClientWebSocketOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\WebSocketHandle.Managed.cs" />
@@ -920,6 +921,7 @@
     <Compile Include="ReferenceSources\NativeMethods.cs" />
     <Compile Include="ReferenceSources\RequestCacheProtocol.cs" />
     <Compile Include="ReferenceSources\SecureStringHelper.cs" />
+    <Compile Include="ReferenceSources\ServerCertValidationCallback.cs" />
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />
     <Compile Include="ReferenceSources\Socket.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
diff --git a/mcs/class/System/System-secxml-net_4_x.csproj b/mcs/class/System/System-secxml-net_4_x.csproj
index cae16569acb..8b3a733f8c6 100644
--- a/mcs/class/System/System-secxml-net_4_x.csproj
+++ b/mcs/class/System/System-secxml-net_4_x.csproj
@@ -200,6 +200,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\GZipStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.ServicePoint\src\System\Net\SecurityProtocolType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\ClientWebSocket.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\ClientWebSocketOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.WebSockets.Client\src\System\Net\WebSockets\WebSocketHandle.Managed.cs" />
@@ -920,6 +921,7 @@
     <Compile Include="ReferenceSources\NativeMethods.cs" />
     <Compile Include="ReferenceSources\RequestCacheProtocol.cs" />
     <Compile Include="ReferenceSources\SecureStringHelper.cs" />
+    <Compile Include="ReferenceSources\ServerCertValidationCallback.cs" />
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />
     <Compile Include="ReferenceSources\Socket.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
diff --git a/mcs/tools/resgen/resgen-net_4_x.csproj b/mcs/tools/resgen/resgen-net_4_x.csproj
index 3c4ab2ae961..ad6adbc9ca3 100644
--- a/mcs/tools/resgen/resgen-net_4_x.csproj
+++ b/mcs/tools/resgen/resgen-net_4_x.csproj
@@ -15,7 +15,7 @@
     <NoStdLib>True</NoStdLib>
     
     <NoConfig>True</NoConfig>
-    
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>
     </RootNamespace>
@@ -51,6 +51,25 @@
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\..\class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap\SoapFormatter.cs" />
+    <Compile Include="..\..\class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap\SoapReader.cs" />
+    <Compile Include="..\..\class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap\SoapTypeMapper.cs" />
+    <Compile Include="..\..\class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap\SoapWriter.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\FileRefHandler.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\InMemoryHandler.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\NullRefHandler.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXDataNode.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXFileRef.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXNullRef.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXResourceReader.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXResourceSet.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXResourceWriter.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="monoresgen.cs" />
  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -91,6 +110,10 @@
       <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
       <Name>System.Core-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../../class/System.Drawing/System.Drawing-net_4_x.csproj">
+      <Project>{584A5E46-2958-4CB2-8DF9-188B420D0BB0}</Project>
+      <Name>System.Drawing-net_4_x</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 20ce1ba6f3f..863f323576b 100644
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -616,6 +616,17 @@
       <resources></resources>
       <response>System.IO.Compression.dll.sources</response>
     </project>
+    <project dir="class/System.Drawing" library="System.Drawing-build">
+      <boot>false</boot>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/build/mscorlib.dll -optimize /unsafe -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS -r:./../../class/lib/build/System.dll</flags>
+      <output>System.Drawing.dll</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/build/System.Drawing.dll</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>build</profile>
+      <resources></resources>
+      <response>System.Drawing.dll.sources</response>
+    </project>
     <project dir="class/Mono.Cecil" library="Mono.Cecil-build">
       <boot>false</boot>
       <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/build/mscorlib.dll -optimize -keyfile:../mono.snk -d:NET_4_0 /publicsign -r:./../../class/lib/build/System.Core.dll -r:./../../class/lib/build/System.dll</flags>
@@ -1001,6 +1012,17 @@
       <resources></resources>
       <response>System.Text.Encoding.CodePages.dll.sources</response>
     </project>
+    <project dir="tools/resgen" library="resgen-build">
+      <boot></boot>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -unsafe -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/build/mscorlib.dll -optimize -r:System -r:System.Xml -r:System.Core -r:System.Drawing</flags>
+      <output>resgen.exe</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/build/resgen.exe</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>build</profile>
+      <resources></resources>
+      <response>resgen.exe.sources</response>
+    </project>
     <project dir="tools/gacutil" library="gacutil-build">
       <boot></boot>
       <flags>/codepage:65001 /nologo /noconfig /deterministic -unsafe -define:NO_SYMBOL_WRITER -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/build/mscorlib.dll -optimize -r:System -r:Mono.Security -r:System.Security</flags>
@@ -1309,16 +1331,27 @@
       <resources></resources>
       <response>./../../build/deps/net_4_x_System.Configuration_test.dll.response</response>
     </project>
-    <project dir="tools/resgen" library="resgen-net_4_x">
-      <boot></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 -r:System -r:System.Xml -r:System.Core</flags>
-      <output>resgen.exe</output>
+    <project dir="class/System.Drawing" library="System.Drawing-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 /unsafe -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS -r:./../../class/lib/net_4_x/System.dll</flags>
+      <output>System.Drawing.dll</output>
       <built_sources></built_sources>
-      <library_output>./../../class/lib/net_4_x/resgen.exe</library_output>
+      <library_output>./../../class/lib/net_4_x/System.Drawing.dll</library_output>
       <fx_version>4.5</fx_version>
       <profile>net_4_x</profile>
       <resources></resources>
-      <response>resgen.exe.sources</response>
+      <response>System.Drawing.dll.sources</response>
+    </project>
+    <project dir="class/System.Drawing" library="System.Drawing-tests-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 -r:./../../class/lib/net_4_x/System.Drawing.dll /unsafe -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS -r:./../../class/lib/net_4_x/System.dll -define:TEST -resource:Test/resources/indexed.png,indexed.png -nowarn:0618 -nowarn:219 -nowarn:169</flags>
+      <output>net_4_x_System.Drawing_test.dll</output>
+      <built_sources></built_sources>
+      <library_output>net_4_x_System.Drawing_test.dll</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <resources></resources>
+      <response>./../../build/deps/net_4_x_System.Drawing_test.dll.response</response>
     </project>
     <project dir="class/System.IO.Compression" library="System.IO.Compression-net_4_x">
       <boot>false</boot>
@@ -1364,28 +1397,6 @@
       <resources></resources>
       <response>./../../build/deps/net_4_x_System.IO.Compression.FileSystem_test.dll.response</response>
     </project>
-    <project dir="class/System.Drawing" library="System.Drawing-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 /unsafe -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS -r:./../../class/lib/net_4_x/System.dll</flags>
-      <output>System.Drawing.dll</output>
-      <built_sources></built_sources>
-      <library_output>./../../class/lib/net_4_x/System.Drawing.dll</library_output>
-      <fx_version>4.5</fx_version>
-      <profile>net_4_x</profile>
-      <resources></resources>
-      <response>System.Drawing.dll.sources</response>
-    </project>
-    <project dir="class/System.Drawing" library="System.Drawing-tests-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 -r:./../../class/lib/net_4_x/System.Drawing.dll /unsafe -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS -r:./../../class/lib/net_4_x/System.dll -define:TEST -resource:Test/resources/indexed.png,indexed.png -nowarn:0618 -nowarn:219 -nowarn:169</flags>
-      <output>net_4_x_System.Drawing_test.dll</output>
-      <built_sources></built_sources>
-      <library_output>net_4_x_System.Drawing_test.dll</library_output>
-      <fx_version>4.5</fx_version>
-      <profile>net_4_x</profile>
-      <resources></resources>
-      <response>./../../build/deps/net_4_x_System.Drawing_test.dll.response</response>
-    </project>
     <project dir="class/System.Transactions" library="System.Transactions-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 -r:./../../class/lib/net_4_x/System.dll -r:./../../class/lib/net_4_x/System.Configuration.dll</flags>
@@ -5093,6 +5104,17 @@
       <resources></resources>
       <response>ilasm.exe.sources</response>
     </project>
+    <project dir="tools/resgen" library="resgen-net_4_x">
+      <boot></boot>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -unsafe -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 -r:System -r:System.Xml -r:System.Core -r:System.Drawing</flags>
+      <output>resgen.exe</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/net_4_x/resgen.exe</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <resources></resources>
+      <response>resgen.exe.sources</response>
+    </project>
     <project dir="tools/gacutil" library="gacutil-net_4_x">
       <boot></boot>
       <flags>/codepage:65001 /nologo /noconfig /deterministic -unsafe -define:NO_SYMBOL_WRITER -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 -r:System -r:Mono.Security -r:System.Security</flags>
@@ -5227,7 +5249,7 @@
     </project>
     <project dir="tools/resgen" library="resgen-net_4_x">
       <boot></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 -r:System -r:System.Xml -r:System.Core</flags>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -unsafe -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 -r:System -r:System.Xml -r:System.Core -r:System.Drawing</flags>
       <output>resgen.exe</output>
       <built_sources></built_sources>
       <library_output>./../../class/lib/net_4_x/resgen.exe</library_output>
diff --git a/net_4_x.sln b/net_4_x.sln
index a40e037e8be..f67ada22a2c 100644
--- a/net_4_x.sln
+++ b/net_4_x.sln
@@ -25,14 +25,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix-net_4_x", "mcs/c
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Core-net_4_x", "mcs/class/System.Core/System.Core-net_4_x.csproj", "{359142A1-D80F-401E-AA64-7167C9317649}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resgen-net_4_x", "mcs/tools/resgen/resgen-net_4_x.csproj", "{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing-net_4_x", "mcs/class/System.Drawing/System.Drawing-net_4_x.csproj", "{584A5E46-2958-4CB2-8DF9-188B420D0BB0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression-net_4_x", "mcs/class/System.IO.Compression/System.IO.Compression-net_4_x.csproj", "{6187D26C-54C8-4298-829E-A99B0E6036B1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Compression.FileSystem-net_4_x", "mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_x.csproj", "{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing-net_4_x", "mcs/class/System.Drawing/System.Drawing-net_4_x.csproj", "{584A5E46-2958-4CB2-8DF9-188B420D0BB0}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Transactions-net_4_x", "mcs/class/System.Transactions/System.Transactions-net_4_x.csproj", "{3821C69F-220D-4231-992C-0FE05311A005}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.EnterpriseServices-net_4_x", "mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_x.csproj", "{61E3D008-E273-4E12-860A-8ADA031098C2}"
@@ -579,6 +577,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console-net_4_x", "mc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ilasm-net_4_x", "mcs/ilasm/ilasm-net_4_x.csproj", "{D32B01EF-8E8D-41C1-848D-6DAEAA3FCA6C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resgen-net_4_x", "mcs/tools/resgen/resgen-net_4_x.csproj", "{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gacutil-net_4_x", "mcs/tools/gacutil/gacutil-net_4_x.csproj", "{6B9993FC-E28D-4D55-8F96-C8A35B2BC6E7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "culevel-net_4_x", "mcs/tools/culevel/culevel-net_4_x.csproj", "{ED867AC1-079C-4B5E-ADF9-E7722053B360}"
@@ -729,10 +729,10 @@ Global
 		{359142A1-D80F-401E-AA64-7167C9317649}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{359142A1-D80F-401E-AA64-7167C9317649}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{359142A1-D80F-401E-AA64-7167C9317649}.Release|Any CPU.Build.0 = Release|Any CPU
-		{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6187D26C-54C8-4298-829E-A99B0E6036B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6187D26C-54C8-4298-829E-A99B0E6036B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6187D26C-54C8-4298-829E-A99B0E6036B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -741,10 +741,6 @@ Global
 		{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E61FF2E-493E-4CA0-BBDA-2EF96A4CB058}.Release|Any CPU.Build.0 = Release|Any CPU
-		{584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{584A5E46-2958-4CB2-8DF9-188B420D0BB0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3821C69F-220D-4231-992C-0FE05311A005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3821C69F-220D-4231-992C-0FE05311A005}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3821C69F-220D-4231-992C-0FE05311A005}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1837,6 +1833,10 @@ Global
 		{D32B01EF-8E8D-41C1-848D-6DAEAA3FCA6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D32B01EF-8E8D-41C1-848D-6DAEAA3FCA6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D32B01EF-8E8D-41C1-848D-6DAEAA3FCA6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{647DC12E-A4EE-424A-9EC7-CE6643EE2EF7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B9993FC-E28D-4D55-8F96-C8A35B2BC6E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6B9993FC-E28D-4D55-8F96-C8A35B2BC6E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B9993FC-E28D-4D55-8F96-C8A35B2BC6E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-- 
2.25.1