Merge pull request #7 from 7digital/master

More improvements to the msbuild files
mono · Aug 23, 2012 · b03b249 · b03b249
2 parents 6d2c99e + d33eefe
commit b03b249
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/src/Mono.WebServer.Apache/Mono.WebServer.Apache.csproj b/src/Mono.WebServer.Apache/Mono.WebServer.Apache.csproj
@@ -49,6 +49,7 @@
     <Compile Include="ModMonoWorker.cs" />
     <Compile Include="ModMonoWorkerRequest.cs" />
     <Compile Include="RequestReader.cs" />
+    <Compile Include="AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

diff --git a/src/Mono.WebServer.FastCgi/Mono.WebServer.FastCgi.csproj b/src/Mono.WebServer.FastCgi/Mono.WebServer.FastCgi.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{6A65EE42-6B11-40F4-8E3C-B40E4AB21001}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Mono.WebServer.FastCgi</RootNamespace>
-    <AssemblyName>Mono.WebServer.FastCgi</AssemblyName>
+    <AssemblyName>fastcgi-mono-server4</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,6 +20,11 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <EnvironmentVariables>
+      <EnvironmentVariables>
+        <Variable name="MONO_PATH" value="." />
+      </EnvironmentVariables>
+    </EnvironmentVariables>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -62,11 +67,17 @@
     <Compile Include="UnmanagedSocket.cs" />
     <Compile Include="WebSource.cs" />
     <Compile Include="WorkerRequest.cs" />
+    <Compile Include="AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mono.WebServer\Mono.WebServer.csproj">
       <Project>{5339C36C-A524-44CE-93BD-59A79F57B346}</Project>
       <Name>Mono.WebServer</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ConfigurationManager.xml">
+      <LogicalName>ConfigurationManager.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
diff --git a/src/Mono.WebServer.XSP/Mono.WebServer.XSP.csproj b/src/Mono.WebServer.XSP/Mono.WebServer.XSP.csproj
@@ -46,6 +46,7 @@
     <Compile Include="XSPWebSource.cs" />
     <Compile Include="XSPWorker.cs" />
     <Compile Include="XSPWorkerRequest.cs" />
+    <Compile Include="AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mono.WebServer\Mono.WebServer.csproj">

diff --git a/src/Mono.WebServer/Mono.WebServer.csproj b/src/Mono.WebServer/Mono.WebServer.csproj
@@ -60,5 +60,6 @@
     <Compile Include="WebSource.cs" />
     <Compile Include="Worker.cs" />
     <Compile Include="WebTrace.cs" />
+    <Compile Include="AssemblyInfo.cs" />
   </ItemGroup>
 </Project>
diff --git a/xsp.sln b/xsp.sln
@@ -33,6 +33,6 @@ Global
 		{6A65EE42-6B11-40F4-8E3C-B40E4AB21001}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = src\Mono.WebServer\Mono.WebServer.csproj
+		StartupItem = src\Mono.WebServer.FastCgi\Mono.WebServer.FastCgi.csproj
 	EndGlobalSection
 EndGlobal