Rename Managed.Windows.Forms to System.Windows.Forms for consistency.

mcs/build/library.make

@@ -16,7 +16,7 @@
 
 # All dependent libs become dependent dirs for parallel builds
 # Have to rename to handle differences between assembly/directory names
-DEP_LIBS=$(patsubst System.Xml,System.XML,$(patsubst System.Windows.Forms,Managed.Windows.Forms,$(LIB_REFS)))
+DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS))
 
 LIB_MCS_FLAGS += $(patsubst %,-r:%,$(LIB_REFS))
 

mcs/build/rules.make

@@ -193,9 +193,6 @@ endif
 # Each directory's Makefile may define DEP_LIBS and DEP_DIRS to specify the libraries and
 # directories it depends on.
 #
-# It would be nice to reduce the duplication between DEP_LIBS and LIB_MCS_FLAGS, but
-# there are too many special cases
-# (System.Windows.Forms/Managed.Windows.Forms,System.Xml/System.XML) etc.
 ifneq ($(PROFILE_PARALLEL_SUBDIRS),)
 dep_dirs = .dep_dirs-$(PROFILE)
 $(dep_dirs):

mcs/class/Mainsoft.Configuration/Mainsoft.Configuration.csproj

@@ -46,4 +46,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/Mainsoft.Web/Tests/Tests.csproj

@@ -109,4 +109,4 @@
       <UserProperties REFS-JarPath-mainsoft-web="..\bin\Debug_Java20\Mainsoft.Web.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-system-web="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Web.jar" REFS-JarPath-system-configuration="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Configuration.jar" REFS-JarPath-rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Xml.jar" REFS-JarPath-system-data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Data.jar" REFS-JarPath-system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.jar" REFS-JarPath-mscorlib="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\mscorlib.jar" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

mcs/class/Makefile

@@ -95,7 +95,7 @@ net_4_5_dirs := \
 	Accessibility			\
 	Mono.WebBrowser			\
 	System.Runtime.Serialization.Formatters.Soap \
-	Managed.Windows.Forms		\
+	System.Windows.Forms		\
 	Mono.Data.Sqlite		\
 	System.Web.ApplicationServices	\
 	System.Web			\

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_3_5.csproj

@@ -198,9 +198,9 @@
       <Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
       <Name>System.XML\System.Xml-net_2_0-1</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">
+    <ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_2_0.csproj">
       <Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>
+      <Name>System.Windows.Forms\System.Windows.Forms-net_2_0</Name>
     </ProjectReference>
     <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5.csproj">
       <Project>{C3F8A358-9DA1-423C-8466-58AB30893EB0}</Project>

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj

@@ -205,7 +205,7 @@
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
       <Name>System.Xml-net_4_5</Name>
     </ProjectReference>
-    <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
+    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
       <Name>System.Windows.Forms-net_4_5</Name>
     </ProjectReference>

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-xbuild_12.csproj

@@ -198,9 +198,9 @@
       <Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
       <Name>System.XML\System.Xml-net_4_5-1</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
+    <ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>
+      <Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>
     </ProjectReference>
     <ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12.csproj">
       <Project>{4AEF77E9-BB34-44F2-9F35-64D11ECDE2A7}</Project>

mcs/class/Microsoft.Build/Test/FunctionalTestReferenceProject.csproj

@@ -55,4 +55,4 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/Microsoft.Build/Test/FunctionalTestReferenceProject3.csproj

@@ -121,4 +121,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

mcs/class/Microsoft.Build/Test/Microsoft.Build.Test.csproj

@@ -60,4 +60,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/Microsoft.Build/Test/Microsoft.Build.csproj

@@ -140,4 +140,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/Mono.C5/C5/C5.csproj

@@ -120,4 +120,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

mcs/class/Mono.C5/Test/nunit.csproj

@@ -136,4 +136,4 @@
     <VisualStudio>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

mcs/class/Mono.C5/UserGuideExamples/UserGuideExamples.csproj

@@ -107,4 +107,4 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
+</Project>

mcs/class/Mono.CSharp/Mono.CSharp.csproj

@@ -262,4 +262,4 @@
   <PropertyGroup>
     <PreBuildEvent>"$(ProjectDir)..\..\jay\jay" -cvt &lt; "$(ProjectDir)..\..\jay\skeleton.cs" "$(ProjectDir)..\..\mcs\cs-parser.jay" &gt; "$(ProjectDir)cs-parser.cs"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

mcs/class/Mono.Cecil/Mono.Cecil-SL.csproj

@@ -197,4 +197,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/ComponentModel.csproj

@@ -247,4 +247,4 @@
   </ItemGroup>
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.DataSetExtensions/Test/System.Data.DataSetExtensions.Test.csproj

@@ -70,4 +70,4 @@
     <PostBuildEvent>copy $(ProjectDir)\..\..\..\nunit20\\nunit-console\bin\Debug_Java20\*.dll $(TargetDir)
 copy $(ProjectDir)\..\..\..\nunit20\\nunit-console\bin\Debug_Java20\*.exe $(TargetDir)</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

mcs/class/System.Data.Linq/examples/DbLinq.FbSql.Example/DbLinq.FbSql.Example.csproj

@@ -72,4 +72,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/examples/DbLinq.Ingres.Example/DbLinq.Ingres.Example.csproj

@@ -78,4 +78,4 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/examples/DbLinq.Mssql.Example/DbLinq.Mssql.Example.csproj

@@ -77,4 +77,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Linq/examples/DbLinq.MySql.Example/DbLinq.MySql.Example.csproj

@@ -75,4 +75,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/examples/DbLinq.Ora.Example/DbLinq.Ora.Example.csproj

@@ -67,4 +67,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/examples/DbLinq.Pgsql.Example/DbLinq.Pgsql.Example.csproj

@@ -79,4 +79,4 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/examples/DbLinq.SQLite.Example/DbLinq.SQLite.Example.csproj

@@ -106,4 +106,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.Firebird/Test/DbLinq.Firebird_test.csproj

@@ -221,4 +221,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.Ingres/Test/DbLinq.Ingres_test.csproj

@@ -218,4 +218,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.MySql/Test/DbLinq.MySql_test.csproj

@@ -236,4 +236,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.Oracle/Test/DbLinq.Oracle_test.csproj

@@ -213,4 +213,4 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.Oracle/Test/DbLinq.Oracle_test_odp.csproj

@@ -213,4 +213,4 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.PostgreSql/Test/DbLinq.PostgreSql_test.csproj

@@ -214,4 +214,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.SqlServer/DbLinq.SqlServer.csproj

@@ -77,4 +77,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.SqlServer/Test/DbLinq.SqlServer_test.csproj

@@ -228,4 +228,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.SqlServer/Test/DbLinq.SqlServer_test_ndb.csproj

@@ -65,4 +65,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.SqlServer/Test/DbLinq.SqlServer_test_strict.csproj

@@ -218,4 +218,4 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.Sqlite/Test/DbLinq.Sqlite_test.csproj

@@ -227,4 +227,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.Sqlite/Test/DbLinq.Sqlite_test_mono.csproj

@@ -228,4 +228,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq.Sqlite/Test/DbLinq.Sqlite_test_mono_strict.csproj

@@ -220,4 +220,4 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq/DbLinq.csproj

@@ -306,4 +306,4 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq.csproj

@@ -415,4 +415,4 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq/Test/DbLinq_test.csproj

@@ -120,4 +120,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbLinq/Test/DbLinq_test_ndb_strict.csproj

@@ -106,4 +106,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbMetal/Test/DbMetal_test.csproj

@@ -109,4 +109,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbMetal/Test/DbMetal_test_sqlite.csproj

@@ -63,4 +63,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/DbMetal/Test/SqlMetal_test_sqlite.csproj

@@ -63,4 +63,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/Tools/NUnitRunner/NUnitRunner.csproj

@@ -78,4 +78,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Linq/src/Tools/TestNamespaceWriter/TestNamespaceWriter.csproj

@@ -60,4 +60,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Services.Client/Client/System.Data.Services.Client.csproj

@@ -202,4 +202,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

mcs/class/System.Data.Services.Client/Client_SL/System.Data.Services.Client_SL.csproj

@@ -437,4 +437,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

mcs/class/System.Design/System.Design-net_4_5.csproj

@@ -410,7 +410,7 @@
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>
       <Name>System.Web-net_4_5</Name>
     </ProjectReference>
-    <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
+    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
       <Name>System.Windows.Forms-net_4_5</Name>
     </ProjectReference>

mcs/class/System.Design/System.Design-tests-net_4_5.csproj

@@ -92,9 +92,9 @@
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>
       <Name>System.Drawing\System.Drawing-net_4_5</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
+    <ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>
+      <Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj

@@ -96,7 +96,7 @@
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>
       <Name>System.Drawing-net_4_5</Name>
     </ProjectReference>
-    <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
+    <ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
       <Name>System.Windows.Forms-net_4_5</Name>
     </ProjectReference>