Merge pull request #3009 from akoeplinger/fix-sockettest-catch

[System] Get rid of useless catch-all clauses in SocketTest

diff --git a/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
index 498cf09f8086d398d8eb22bf07deaa45e47261d5..4b6ac0cc4726ba45cdf55fb587f1617de3ba88c8 100644 (file)
--- a/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
@@ -43,7 +43,6 @@ using System.Security;
 [assembly: ComVisible (false)]
 [assembly: AssemblyFileVersion ("1.0.20105.407")]
 [assembly: AssemblyVersion ("1.0.0.0")]
-[assembly: TargetFramework (".NETFramework,Version=v4.0", FrameworkDisplayName=".NET Framework 4")]
 [assembly: AllowPartiallyTrustedCallers]
 [assembly: CompilationRelaxations (8)]
 [assembly: AssemblyTitle ("Microsoft.Web.Infrastructure")]

diff --git a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj
index f85b1433acaeb5117cd063903576aecfcd099c69..52324e95acd63a4a0451c32689cdb1bb96ce8b05 100644 (file)
--- a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj
+++ b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj
@@ -10,6 +10,7 @@
     <NoWarn>1699</NoWarn>\r
     <OutputPath>./../../class/lib/net_4_x</OutputPath>\r
     <NoStdLib>True</NoStdLib>\r
+    \r
     <NoConfig>True</NoConfig>\r
     \r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r

diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index 3dc11aa3b01e293dc886b475ccd6ff36704715d2..1e9a30c444cc473480977e8837deae1372ed948d 100644 (file)
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -13,6 +13,10 @@ TEST_MCS_FLAGS =
 include ../../build/library.make
 
 ifneq (plaindesign/,$(intermediate))
+csproj-local:
+       $(MAKE) csproj-local intermediate=plaindesign/
+
 $(the_libdir_base)plaindesign/System.Design.dll:
        $(MAKE) intermediate=plaindesign/ $(the_libdir_base)plaindesign/System.Design.dll
 endif
+

diff --git a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj
index 8226a18720b6577e396879a58e3975e39c07bc2b..ba55712c7780bf1569306afc5570e40c14f9de88 100644 (file)
--- a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj
+++ b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj
@@ -156,11 +156,10 @@
       <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>\r
       <Name>System.Web-net_4_x</Name>\r
     </ProjectReference>\r
-    <Reference Include="./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
+    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">\r
+      <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>\r
+      <Name>Microsoft.Web.Infrastructure-net_4_x</Name>\r
+    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r

diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
index e9b71e62304df106d2a2f65a4cb7da81dc157b89..a1b717cb40bccc44be1fb83e72551abc36c5482f 100644 (file)
--- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
+++ b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj
@@ -420,11 +420,10 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>\r
       <Name>corlib-net_4_x</Name>\r
     </ProjectReference>\r
-    <Reference Include="./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
+    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">\r
+      <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>\r
+      <Name>Microsoft.Web.Infrastructure-net_4_x</Name>\r
+    </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_x.csproj">\r
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>\r
       <Name>System-net_4_x</Name>\r

diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index 0e8dd48092a02ed4dec8aa97c7c34f192ae50502..0170bcddc5c8f4348d94161cd400df69dd3f0113 100644 (file)
--- a/mcs/class/System.Web.Services/Makefile
+++ b/mcs/class/System.Web.Services/Makefile
@@ -56,7 +56,10 @@ EXTRA_DISTFILES = \
 
 include ../../build/library.make
 
-$(the_libdir_base)$(LIBRARY): $(system_web_deps) $(system_design_deps)
+$(the_libdir_base)$(LIBRARY): $(system_web_deps) $(system_design_deps) t
+
+t:
+       echo $(plaindesign)
 
 $(plainweb):
        (cd ../System.Web; $(MAKE) $@)

diff --git a/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj b/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj
index f9a00bca3596b1f14baf50d103030bc9413ccfd3..97796581e234bbf665e15a62c83f6cad7be9a13a 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj
+++ b/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj
@@ -267,11 +267,10 @@
       <Project>{DE51B021-D51C-4F26-99EE-B0729D97631E}</Project>\r
       <Name>System.Web-plainweb-net_4_x</Name>\r
     </ProjectReference>\r
-    <Reference Include="./../../class/lib/net_4_x/plaindesign/System.Design.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>./../../class/lib/net_4_x/plaindesign/System.Design.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
+    <ProjectReference Include="../System.Design/System.Design-plaindesign-net_4_x.csproj">\r
+      <Project>{6FC8169B-4128-46FE-8357-5D3CE8D6FA42}</Project>\r
+      <Name>System.Design-plaindesign-net_4_x</Name>\r
+    </ProjectReference>\r
     <ProjectReference Include="../System.DirectoryServices/System.DirectoryServices-net_4_x.csproj">\r
       <Project>{CC4F3F73-E0A6-49EE-8F7D-BD8B9F293A72}</Project>\r
       <Name>System.DirectoryServices-net_4_x</Name>\r

diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
index 582e54ff90c1003f432d7c5f65c5defa16798556..e63e591c27f95888b6ac154719a1643bce82ffd9 100644 (file)
--- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
+++ b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj
@@ -113,11 +113,10 @@
       <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>\r
       <Name>System.Web-net_4_x</Name>\r
     </ProjectReference>\r
-    <Reference Include="./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
+    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">\r
+      <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>\r
+      <Name>Microsoft.Web.Infrastructure-net_4_x</Name>\r
+    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r

diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
index e854d6d15507f7bd538e6147ec71f47769e428fd..ea9abbcc9b41ec46b427d65f56d101d8a0f3c463 100644 (file)
--- a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
+++ b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj
@@ -228,11 +228,10 @@
       <Project>{DABF9F75-63AD-4991-9D2B-9234E7032B32}</Project>\r
       <Name>Microsoft.CSharp-net_4_x</Name>\r
     </ProjectReference>\r
-    <Reference Include="./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
+    <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">\r
+      <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>\r
+      <Name>Microsoft.Web.Infrastructure-net_4_x</Name>\r
+    </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_x.csproj">\r
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>\r
       <Name>System-net_4_x</Name>\r

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 8c0960986fed80d3df89c805a783f53bb7951715..c7a7cf866c369f36a7c2865d28103aed525801b4 100644 (file)
--- a/mcs/class/System.Web/System.Web-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-net_4_x.csproj
@@ -1554,11 +1554,10 @@
       <Project>{E43ADBA7-5DB9-466B-90C6-FFFDA520848D}</Project>\r
       <Name>System.Web.Services-net_4_x</Name>\r
     </ProjectReference>\r
-    <Reference Include="./../../class/lib/net_4_x/plaindesign/System.Design.dll">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>./../../class/lib/net_4_x/plaindesign/System.Design.dll</HintPath>\r
-      <Private>False</Private>\r
-    </Reference>\r
+    <ProjectReference Include="../System.Design/System.Design-plaindesign-net_4_x.csproj">\r
+      <Project>{6FC8169B-4128-46FE-8357-5D3CE8D6FA42}</Project>\r
+      <Name>System.Design-plaindesign-net_4_x</Name>\r
+    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r

diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
index 357217659964fea2aabcd59beb116fe8b5866d08..50e9009741a2f5d028818a16e4aa7ddc0354d6a8 100644 (file)
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
@@ -101,6 +101,9 @@ namespace System.Net.NetworkInformation {
 
                static void MaybeCreate ()
                {
+#if MONOTOUCH_WATCH
+                       throw new PlatformNotSupportedException ("NetworkInformation.NetworkChange is not supported on the current platform.");
+#else
                        if (networkChange != null)
                                return;
 
@@ -111,6 +114,7 @@ namespace System.Net.NetworkInformation {
                                networkChange = new LinuxNetworkChange ();
 #endif
                        }
+#endif // MONOTOUCH_WATCH
                }
 
                static void MaybeDispose ()
@@ -122,6 +126,7 @@ namespace System.Net.NetworkInformation {
                }
        }
 
+#if !MONOTOUCH_WATCH
        internal sealed class MacNetworkChange : INetworkChange
        {
                const string DL_LIB = "/usr/lib/libSystem.dylib";
@@ -317,6 +322,7 @@ namespace System.Net.NetworkInformation {
                                availabilityChanged (null, new NetworkAvailabilityEventArgs (instance.IsAvailable));
                }
        }
+#endif // !MONOTOUCH_WATCH
 
 #if !NETWORK_CHANGE_STANDALONE && !MONOTOUCH
 

diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index 955e658d439fded1be6b109e24823b9a54ecfd60..b8f01a62291de9f5599f94f9edc7da2de19622cf 100644 (file)
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -1,3 +1,16 @@
+//
+// Consumes the order.xml file that contains a list of all the assemblies to build
+// and produces a solution and the csproj files for it
+//
+// Currently this hardcodes a set of assemblies to build, the net-4.x series, but 
+// it can be extended to handle the command line tools.
+//
+// KNOWN ISSUES:
+//    * This fails to find matches for "System" and "System.xml" when processing the
+//      RabbitMQ executable, likely, because we do not process executables yet
+//
+//    * Has not been tested in a while with the command line tools
+//
 using System;
 using System.IO;
 using System.Collections.Generic;
@@ -969,7 +982,9 @@ class MsbuildGenerator {
                        }
                }
                Console.WriteLine ("Did not find referenced {0} with libs={1}", dllReferenceName, String.Join (", ", libs));
-
+               foreach (var p in projects) {
+               //      Console.WriteLine ("{0}", p.Value.AbsoluteLibraryOutput);
+               }
                return null;
        }
 
@@ -990,7 +1005,7 @@ public class Driver {
                                continue;
 
                        // These are currently broken, skip until they're fixed.
-                       if (dir.StartsWith ("mcs") || dir.Contains ("Microsoft.Web.Infrastructure"))
+                       if (dir.StartsWith ("mcs") || dir.Contains ("apigen"))
                                continue;
 
                        //
@@ -1079,12 +1094,14 @@ public class Driver {
 
                FillSolution (four_five_sln_gen, MsbuildGenerator.profile_4_x, projects.Values, additionalFilter);
 
-               var sb = new StringBuilder ();
-               sb.AppendLine ("WARNING: Skipped some project references, apparent duplicates in order.xml:");
-               foreach (var item in duplicates) {
-                       sb.AppendLine (item);
+               if (duplicates.Count () > 0) {
+                       var sb = new StringBuilder ();
+                       sb.AppendLine ("WARNING: Skipped some project references, apparent duplicates in order.xml:");
+                       foreach (var item in duplicates) {
+                               sb.AppendLine (item);
+                       }
+                       Console.WriteLine (sb.ToString ());
                }
-               Console.WriteLine (sb.ToString ());
 
                WriteSolution (four_five_sln_gen, MakeSolutionName (MsbuildGenerator.profile_4_x));
 

diff --git a/msvc/scripts/net_4_x.sln b/msvc/scripts/net_4_x.sln
index 37cccc4e0c97aaee251c0a6ff4eefe8ce9029900..bc10f59cd91a9fc40646ec893e4914b8f33fba9b 100644 (file)
--- a/msvc/scripts/net_4_x.sln
+++ b/msvc/scripts/net_4_x.sln
@@ -69,6 +69,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Services-net_4_x
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web-plainweb-net_4_x", "..\..\mcs\class/System.Web\System.Web-plainweb-net_4_x.csproj", "{DE51B021-D51C-4F26-99EE-B0729D97631E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Design-plaindesign-net_4_x", "..\..\mcs\class/System.Design\System.Design-plaindesign-net_4_x.csproj", "{6FC8169B-4128-46FE-8357-5D3CE8D6FA42}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Design-net_4_x", "..\..\mcs\class/System.Design\System.Design-net_4_x.csproj", "{EFEDC380-2CB0-4B40-9566-D2302867A4D9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Remoting-net_4_x", "..\..\mcs\class/System.Runtime.Remoting\System.Runtime.Remoting-net_4_x.csproj", "{F19F77AE-1A81-4676-BAB8-6C1DA243A961}"
@@ -149,6 +151,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ServiceModel.Discove
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Caching-net_4_x", "..\..\mcs\class/System.Runtime.Caching\System.Runtime.Caching-net_4_x.csproj", "{2FE2D8C6-B7B8-4067-A2C0-9D1DEA020FD8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.Infrastructure-net_4_x", "..\..\mcs\class/Microsoft.Web.Infrastructure\Microsoft.Web.Infrastructure-net_4_x.csproj", "{CD409902-9DA0-48A3-B360-C09060168CB5}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ServiceModel.Web-net_4_x", "..\..\mcs\class/System.ServiceModel.Web\System.ServiceModel.Web-net_4_x.csproj", "{54F4FA23-5AF3-4312-9294-3DB109F644CC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http-net_4_x", "..\..\mcs\class/System.Net.Http\System.Net.Http-net_4_x.csproj", "{F1636C0A-FC68-4362-918F-9CCC789FED13}"
@@ -229,8 +233,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Parallel-net_4_x", "..
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.Win32-net_4_x", "..\..\mcs\class/Mono.Security.Win32\Mono.Security.Win32-net_4_x.csproj", "{994BF3A4-85FD-4FDB-9120-C3A3B44A57CD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Apigen-net_4_x", "..\..\mcs\class/RabbitMQ.Client/src/apigen\RabbitMQ.Client.Apigen-net_4_x.csproj", "{D2A49790-9CFD-492B-9CFA-58B9AEDA1B75}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client-net_4_x", "..\..\mcs\class/RabbitMQ.Client/src/client\RabbitMQ.Client-net_4_x.csproj", "{8A378E82-8FA2-4DC9-A2F7-CD5CACC3F8F6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Messaging.RabbitMQ-net_4_x", "..\..\mcs\class/Mono.Messaging.RabbitMQ\Mono.Messaging.RabbitMQ-net_4_x.csproj", "{FF19FF42-C95D-4BB7-A0D7-05A94C07276E}"
@@ -445,6 +447,10 @@ Global
                {DE51B021-D51C-4F26-99EE-B0729D97631E}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {DE51B021-D51C-4F26-99EE-B0729D97631E}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {DE51B021-D51C-4F26-99EE-B0729D97631E}.Release|Any CPU.Build.0 = Release|Any CPU
+               {6FC8169B-4128-46FE-8357-5D3CE8D6FA42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {6FC8169B-4128-46FE-8357-5D3CE8D6FA42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {6FC8169B-4128-46FE-8357-5D3CE8D6FA42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {6FC8169B-4128-46FE-8357-5D3CE8D6FA42}.Release|Any CPU.Build.0 = Release|Any CPU
                {EFEDC380-2CB0-4B40-9566-D2302867A4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {EFEDC380-2CB0-4B40-9566-D2302867A4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {EFEDC380-2CB0-4B40-9566-D2302867A4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -605,6 +611,10 @@ Global
                {2FE2D8C6-B7B8-4067-A2C0-9D1DEA020FD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {2FE2D8C6-B7B8-4067-A2C0-9D1DEA020FD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {2FE2D8C6-B7B8-4067-A2C0-9D1DEA020FD8}.Release|Any CPU.Build.0 = Release|Any CPU
+               {CD409902-9DA0-48A3-B360-C09060168CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {CD409902-9DA0-48A3-B360-C09060168CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {CD409902-9DA0-48A3-B360-C09060168CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {CD409902-9DA0-48A3-B360-C09060168CB5}.Release|Any CPU.Build.0 = Release|Any CPU
                {54F4FA23-5AF3-4312-9294-3DB109F644CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {54F4FA23-5AF3-4312-9294-3DB109F644CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {54F4FA23-5AF3-4312-9294-3DB109F644CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -765,10 +775,6 @@ Global
                {994BF3A4-85FD-4FDB-9120-C3A3B44A57CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {994BF3A4-85FD-4FDB-9120-C3A3B44A57CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {994BF3A4-85FD-4FDB-9120-C3A3B44A57CD}.Release|Any CPU.Build.0 = Release|Any CPU
-               {D2A49790-9CFD-492B-9CFA-58B9AEDA1B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {D2A49790-9CFD-492B-9CFA-58B9AEDA1B75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {D2A49790-9CFD-492B-9CFA-58B9AEDA1B75}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {D2A49790-9CFD-492B-9CFA-58B9AEDA1B75}.Release|Any CPU.Build.0 = Release|Any CPU
                {8A378E82-8FA2-4DC9-A2F7-CD5CACC3F8F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {8A378E82-8FA2-4DC9-A2F7-CD5CACC3F8F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {8A378E82-8FA2-4DC9-A2F7-CD5CACC3F8F6}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 826abdc03f96b3e3b240803b5ba8ef2122e41471..c0df5a880fadf6609016359e8a8b157c7c8cba17 100644 (file)
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -882,7 +882,27 @@
     </project>
     <project dir="class/System.Design" library="System.Design-tests-net_4_x">
       <boot>false</boot>
-      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/System.Design.dll</flags>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/plaindesign/System.Design.dll</flags>
+      <output>net_4_x_System.Design_test.dll</output>
+      <built_sources></built_sources>
+      <library_output>net_4_x_System.Design_test.dll</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <response>./../../build/deps/net_4_x_System.Design_test.dll.response</response>
+    </project>
+    <project dir="class/System.Design" library="System.Design-plaindesign-net_4_x">
+      <boot>false</boot>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll -debug -optimize /noconfig -r:./../../class/lib/net_4_x/System.dll -r:./../../class/lib/net_4_x/System.Xml.dll -r:./../../class/lib/net_4_x/plainweb/System.Web.dll -r:./../../class/lib/net_4_x/System.Windows.Forms.dll -r:./../../class/lib/net_4_x/System.Drawing.dll -r:./../../class/lib/net_4_x/Accessibility.dll -r:./../../class/lib/net_4_x/System.Data.dll -r:./../../class/lib/net_4_x/System.Configuration.dll</flags>
+      <output>System.Design.dll</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/net_4_x/plaindesign/System.Design.dll</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <response>System.Design.dll.sources</response>
+    </project>
+    <project dir="class/System.Design" library="System.Design-tests-net_4_x">
+      <boot>false</boot>
+      <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll -debug -optimize -r:./../../class/lib/net_4_x/plaindesign/System.Design.dll</flags>
       <output>net_4_x_System.Design_test.dll</output>
       <built_sources></built_sources>
       <library_output>net_4_x_System.Design_test.dll</library_output>