From 2fe978c301062ad63bdc3960795064b03167921a Mon Sep 17 00:00:00 2001
From: Noam Lampert <noaml@mono-cvs.ximian.com>
Date: Wed, 26 Mar 2008 07:29:01 +0000
Subject: [PATCH] Upgrade solution to Visual Studio 2008. Fix Java build.

svn path=/trunk/mcs/; revision=99005
---
 .../System.Web.Extensions.JavaEE.csproj       | 45 ++++++++++++--
 .../System.Web.Extensions.JavaEE.sln          | 60 +++++++++++++++++++
 .../System.Web.Extensions/makefile.build      |  2 +-
 3 files changed, 102 insertions(+), 5 deletions(-)
 create mode 100644 mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.sln

diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.csproj
index c1b8406435d..ea776312a2e 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.csproj
+++ b/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.csproj
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{39836A5C-64D0-4801-9493-DEF694338EF5}</ProjectGuid>
     <ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -18,8 +18,28 @@
     <RootNamespace>System.Web.Extensions</RootNamespace>
     <StartupObject>
     </StartupObject>
-    <jarserver>ipa</jarserver>
+    <jarserver>ip2</jarserver>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -59,7 +79,7 @@
   -->
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties REFS-RefInfo-system-xml="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-web-services="repository:vmw:framework:2.0" REFS-JarPath-system-web-services="" REFS-RefInfo-system-web="repository:vmw:framework:2.0" REFS-JarPath-system-web="" REFS-RefInfo-system-drawing="repository:vmw:framework:2.0" REFS-JarPath-system-drawing="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-configuration="repository:vmw:framework:2.0" REFS-JarPath-system-configuration="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system="" REFS-JarPath-rt="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" REFS-JarPath-myfaces="" REFS-RefInfo-myfaces="repository:vmw:framework:2.0" />
+      <UserProperties REFS-RefInfo-myfaces="repository:vmw:framework:2.0" REFS-JarPath-myfaces="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" REFS-JarPath-rt="" REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-configuration="" REFS-RefInfo-system-configuration="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-drawing="" REFS-RefInfo-system-drawing="repository:vmw:framework:2.0" REFS-JarPath-system-web="" REFS-RefInfo-system-web="repository:vmw:framework:2.0" REFS-JarPath-system-web-services="" REFS-RefInfo-system-web-services="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-xml="repository:vmw:framework:2.0" />
     </VisualStudio>
   </ProjectExtensions>
   <ItemGroup>
@@ -222,4 +242,21 @@ copy "$(TargetDir)$(TargetName).jar" "C:\Program Files\Mainsoft for Java EE\java
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.sln b/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.sln
new file mode 100644
index 00000000000..bd1aa93cfc5
--- /dev/null
+++ b/mcs/class/System.Web.Extensions/System.Web.Extensions.JavaEE.sln
@@ -0,0 +1,60 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Extensions.JavaEE", "System.Web.Extensions.JavaEE.csproj", "{39836A5C-64D0-4801-9493-DEF694338EF5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web20", "..\System.Web\System.Web20.csproj", "{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Services20", "..\System.Web.Services\System.Web.Services20.csproj", "{B37A8704-33AB-48D9-B0C2-1D919755B69A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_Java|Any CPU = Debug_Java|Any CPU
+		Debug_Java20_prepare|Any CPU = Debug_Java20_prepare|Any CPU
+		Debug_Java20|Any CPU = Debug_Java20|Any CPU
+		Release_Java|Any CPU = Release_Java|Any CPU
+		Release_Java20_prepare|Any CPU = Release_Java20_prepare|Any CPU
+		Release_Java20|Any CPU = Release_Java20|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Debug_Java20_prepare|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Debug_Java20_prepare|Any CPU.Build.0 = Debug_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Debug_Java20|Any CPU.Build.0 = Debug_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Release_Java20_prepare|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Release_Java20_prepare|Any CPU.Build.0 = Release_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Release_Java20|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{39836A5C-64D0-4801-9493-DEF694338EF5}.Release_Java20|Any CPU.Build.0 = Release_Java|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Debug_Java|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Debug_Java|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Debug_Java20_prepare|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Debug_Java20_prepare|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Release_Java|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Release_Java|Any CPU.Build.0 = Release_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Release_Java20_prepare|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Release_Java20_prepare|Any CPU.Build.0 = Release_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{0F744BEF-F9B1-4953-BB86-9ADBF73C3CD4}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Debug_Java|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Debug_Java|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Debug_Java20_prepare|Any CPU.ActiveCfg = Debug_Java20_prepare|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Debug_Java20_prepare|Any CPU.Build.0 = Debug_Java20_prepare|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Release_Java|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Release_Java|Any CPU.Build.0 = Release_Java20|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Release_Java20_prepare|Any CPU.ActiveCfg = Release_Java20_prepare|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Release_Java20_prepare|Any CPU.Build.0 = Release_Java20_prepare|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{B37A8704-33AB-48D9-B0C2-1D919755B69A}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/mcs/class/System.Web.Extensions/makefile.build b/mcs/class/System.Web.Extensions/makefile.build
index 4031415d2c1..1fa53ddda0d 100755
--- a/mcs/class/System.Web.Extensions/makefile.build
+++ b/mcs/class/System.Web.Extensions/makefile.build
@@ -11,7 +11,7 @@
   <!--Could be RUNTIME TOOLS ... -->
   <property name="rules" value="RUNTIME"/>
 
-  <property name="msbuild_file" value="System.Web.Extensions.JavaEE.csproj"/>
+  <property name="msbuild_file" value="System.Web.Extensions.JavaEE.sln"/>
   
   <!--Fileset describing project output files. Uset by copy/delete rules in framework-->
   <fileset id="output" basedir="${project::get-base-directory()}\bin" failonempty="true">
-- 
2.25.1