Skip to content

Loading…

More improvements to the msbuild files #7

Merged
merged 5 commits into from

3 participants

@knocte

FastCGI runs properly now thanks to these changes.

Thanks

antonydenyer added some commits
@antonydenyer antonydenyer Mono.WebServer: add ConfigurationManager.xml as embedded resource
This is needed at runtime.
ac9c4e3
@antonydenyer antonydenyer FastCgi: set the proper assembly name in the .csproj file
Use same assembly name as the one that is used upstream.
4e8e9b1
@antonydenyer antonydenyer sln: set FastCgi as startup item
Mono.WebServer is a library, not an executable.
6409af5
@antonydenyer antonydenyer csproj: Rather include AssemblyInfo.cs files
This will make to run autogen.sh a requirement, but at
least calling /help will not fail at runtime.
9824de3
@antonydenyer antonydenyer FastCgi: set MONO_PATH to . in the Run settings of the csproj
This way it doesn't blow up trying to find fastcgi-mono-server4 assembly
at runtime.
d33eefe
@grendello grendello merged commit b03b249 into mono:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 23, 2012
  1. @antonydenyer

    Mono.WebServer: add ConfigurationManager.xml as embedded resource

    antonydenyer committed
    This is needed at runtime.
  2. @antonydenyer

    FastCgi: set the proper assembly name in the .csproj file

    antonydenyer committed
    Use same assembly name as the one that is used upstream.
  3. @antonydenyer

    sln: set FastCgi as startup item

    antonydenyer committed
    Mono.WebServer is a library, not an executable.
  4. @antonydenyer

    csproj: Rather include AssemblyInfo.cs files

    antonydenyer committed
    This will make to run autogen.sh a requirement, but at
    least calling /help will not fail at runtime.
  5. @antonydenyer

    FastCgi: set MONO_PATH to . in the Run settings of the csproj

    antonydenyer committed
    This way it doesn't blow up trying to find fastcgi-mono-server4 assembly
    at runtime.
This page is out of date. Refresh to see the latest.
View
1 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>
View
13 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,6 +67,7 @@
<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">
@@ -69,4 +75,9 @@
<Name>Mono.WebServer</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="ConfigurationManager.xml">
+ <LogicalName>ConfigurationManager.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
</Project>
View
1 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">
View
1 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>
View
2 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
Something went wrong with that request. Please try again.