From b09f98ecbae1fc65fd920de5e6d81c1db30d2841 Mon Sep 17 00:00:00 2001
From: Andrew Skiba <andrews@mono-cvs.ximian.com>
Date: Wed, 24 May 2006 12:48:10 +0000
Subject: [PATCH] use ifdef to name resources in visual studio

svn path=/trunk/mcs/; revision=61051
---
 .../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Helper.cs | 9 +++++++++
 .../Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Helper.cs b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Helper.cs
index 5db7a82bfad..b782024f609 100644
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Helper.cs
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Helper.cs
@@ -40,12 +40,21 @@ namespace NunitWeb
 			foreach (Assembly ass in AppDomain.CurrentDomain.GetAssemblies ())
 				CopyAssembly (ass, binDir);
 
+#if VISUAL_STUDIO
+			CopyResource (Assembly.GetExecutingAssembly (), "NunitWeb.Resources.Web.config", "Web.config");
+			CopyResource (Assembly.GetExecutingAssembly (), "NunitWeb.Resources.MyPage.aspx", "MyPage.aspx");
+			CopyResource (Assembly.GetExecutingAssembly (), "NunitWeb.Resources.MyPage.aspx.cs", "MyPage.aspx.cs");
+			CopyResource (Assembly.GetExecutingAssembly (), "NunitWeb.Resources.MyPageWithMaster.aspx", "MyPageWithMaster.aspx");
+			CopyResource (Assembly.GetExecutingAssembly (), "NunitWeb.Resources.MyPageWithMaster.aspx.cs", "MyPageWithMaster.aspx.cs");
+			CopyResource (Assembly.GetExecutingAssembly (), "NunitWeb.Resources.My.master", "My.master");
+#else
 			CopyResource (Assembly.GetExecutingAssembly (), "Web.config", "Web.config");
 			CopyResource (Assembly.GetExecutingAssembly (), "MyPage.aspx", "MyPage.aspx");
 			CopyResource (Assembly.GetExecutingAssembly (), "MyPage.aspx.cs", "MyPage.aspx.cs");
 			CopyResource (Assembly.GetExecutingAssembly (), "MyPageWithMaster.aspx", "MyPageWithMaster.aspx");
 			CopyResource (Assembly.GetExecutingAssembly (), "MyPageWithMaster.aspx.cs", "MyPageWithMaster.aspx.cs");
 			CopyResource (Assembly.GetExecutingAssembly (), "My.master", "My.master");
+#endif
 
 			host = (MyHost) ApplicationHost.CreateApplicationHost (typeof (MyHost), VIRTUAL_BASE_DIR, baseDir);
 
diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj
index 78d860be51e..12fabc6d21f 100644
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/NunitWeb.csproj
@@ -14,7 +14,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;VISUAL_STUDIO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-- 
2.25.1