Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj1
-rw-r--r--mcs/class/System.Design/Makefile4
-rw-r--r--mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj9
-rw-r--r--mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj9
-rw-r--r--mcs/class/System.Web.Services/Makefile5
-rw-r--r--mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj9
-rw-r--r--mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj9
-rw-r--r--mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj9
-rw-r--r--mcs/class/System.Web/System.Web-net_4_x.csproj9
-rw-r--r--mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs6
-rw-r--r--msvc/scripts/genproj.cs31
-rw-r--r--msvc/scripts/net_4_x.sln18
-rw-r--r--msvc/scripts/order.xml22
14 files changed, 96 insertions, 46 deletions
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
index 498cf09f808..4b6ac0cc472 100644
--- 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 f85b1433aca..52324e95acd 100644
--- 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>
<OutputPath>./../../class/lib/net_4_x</OutputPath>
<NoStdLib>True</NoStdLib>
+
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index 3dc11aa3b01..1e9a30c444c 100644
--- 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 8226a18720b..ba55712c778 100644
--- 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>
<Name>System.Web-net_4_x</Name>
</ProjectReference>
- <Reference Include="./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll</HintPath>
- <Private>False</Private>
- </Reference>
+ <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">
+ <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>
+ <Name>Microsoft.Web.Infrastructure-net_4_x</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
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 e9b71e62304..a1b717cb40b 100644
--- 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>
<Name>corlib-net_4_x</Name>
</ProjectReference>
- <Reference Include="./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll</HintPath>
- <Private>False</Private>
- </Reference>
+ <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">
+ <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>
+ <Name>Microsoft.Web.Infrastructure-net_4_x</Name>
+ </ProjectReference>
<ProjectReference Include="../System/System-net_4_x.csproj">
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
<Name>System-net_4_x</Name>
diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index 0e8dd48092a..0170bcddc5c 100644
--- 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 f9a00bca359..97796581e23 100644
--- 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>
<Name>System.Web-plainweb-net_4_x</Name>
</ProjectReference>
- <Reference Include="./../../class/lib/net_4_x/plaindesign/System.Design.dll">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>./../../class/lib/net_4_x/plaindesign/System.Design.dll</HintPath>
- <Private>False</Private>
- </Reference>
+ <ProjectReference Include="../System.Design/System.Design-plaindesign-net_4_x.csproj">
+ <Project>{6FC8169B-4128-46FE-8357-5D3CE8D6FA42}</Project>
+ <Name>System.Design-plaindesign-net_4_x</Name>
+ </ProjectReference>
<ProjectReference Include="../System.DirectoryServices/System.DirectoryServices-net_4_x.csproj">
<Project>{CC4F3F73-E0A6-49EE-8F7D-BD8B9F293A72}</Project>
<Name>System.DirectoryServices-net_4_x</Name>
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 582e54ff90c..e63e591c27f 100644
--- 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>
<Name>System.Web-net_4_x</Name>
</ProjectReference>
- <Reference Include="./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll</HintPath>
- <Private>False</Private>
- </Reference>
+ <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">
+ <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>
+ <Name>Microsoft.Web.Infrastructure-net_4_x</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
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 e854d6d1550..ea9abbcc9b4 100644
--- 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>
<Name>Microsoft.CSharp-net_4_x</Name>
</ProjectReference>
- <Reference Include="./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>./../../class/lib/net_4_x/Microsoft.Web.Infrastructure.dll</HintPath>
- <Private>False</Private>
- </Reference>
+ <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_x.csproj">
+ <Project>{CD409902-9DA0-48A3-B360-C09060168CB5}</Project>
+ <Name>Microsoft.Web.Infrastructure-net_4_x</Name>
+ </ProjectReference>
<ProjectReference Include="../System/System-net_4_x.csproj">
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
<Name>System-net_4_x</Name>
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 8c0960986fe..c7a7cf866c3 100644
--- 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>
<Name>System.Web.Services-net_4_x</Name>
</ProjectReference>
- <Reference Include="./../../class/lib/net_4_x/plaindesign/System.Design.dll">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>./../../class/lib/net_4_x/plaindesign/System.Design.dll</HintPath>
- <Private>False</Private>
- </Reference>
+ <ProjectReference Include="../System.Design/System.Design-plaindesign-net_4_x.csproj">
+ <Project>{6FC8169B-4128-46FE-8357-5D3CE8D6FA42}</Project>
+ <Name>System.Design-plaindesign-net_4_x</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
index 35721765996..50e9009741a 100644
--- 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 955e658d439..b8f01a62291 100644
--- 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 37cccc4e0c9..bc10f59cd91 100644
--- 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 826abdc03f9..c0df5a880fa 100644
--- 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>