Skip to content
Browse files

Made some fixes for mono and fixed samples.

- Fixed master page
- Fixed make file
  • Loading branch information...
1 parent c3336fd commit e7fcbc1ae0468f1eddd0487047a85c24c3f72ff6 @davidfowl davidfowl committed Oct 20, 2012
View
4 makefile
@@ -1,10 +1,10 @@
all: clean compile
compile:
- xbuild SignalR.Mono.sln
+ xbuild Microsoft.AspNet.SignalR.Mono.sln
clean:
- xbuild SignalR.Mono.sln /t:Clean
+ xbuild Microsoft.AspNet.SignalR.Mono.sln /t:Clean
# For some odd reason, this hangs after running all the tests so
# ctrl + c might be needed to break out after tests run.
View
2 samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Default.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="SignalR Samples" Language="C#" MasterPageFile="~/SignalR.Samples.master" AutoEventWireup="true"
+<%@ Page Title="SignalR Samples" Language="C#" MasterPageFile="~/SignalR.master" AutoEventWireup="true"
CodeBehind="Default.aspx.cs" Inherits="Microsoft.AspNet.SignalR.Samples._Default" %>
<asp:Content ID="HeaderContent" runat="server" ContentPlaceHolderID="HeadContent">
View
35 ...Net.SignalR.Hosting.AspNet.Samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples.csproj
@@ -21,36 +21,38 @@
<ProductVersion>10.0.0</ProductVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
+ <DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
- <Optimize>false</Optimize>
+ <Optimize>False</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AspNet>
- <AspNet DisableCodeBehindGeneration="true" />
+ <AspNet DisableCodeBehindGeneration="True" />
</AspNet>
+ <StartupObject />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
+ <Optimize>True</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="HtmlSanitizationLibrary">
<HintPath>..\..\packages\AntiXSS.4.0.1\lib\net35\HtmlSanitizationLibrary.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
- <Reference Include="System.configuration" />
<Reference Include="System.Web" />
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>..\..\packages\Newtonsoft.Json.4.5.4\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
+ <Reference Include="System.Configuration" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\bg.jpg" />
@@ -212,13 +214,6 @@
<Compile Include="SignalR.Master.designer.cs">
<DependentUpon>SignalR.Master</DependentUpon>
</Compile>
- <Compile Include="SignalR.Samples.master.cs">
- <DependentUpon>SignalR.Samples.master</DependentUpon>
- <SubType>ASPXCodeBehind</SubType>
- </Compile>
- <Compile Include="SignalR.Samples.master.designer.cs">
- <DependentUpon>SignalR.Samples.master</DependentUpon>
- </Compile>
<Compile Include="Streaming\Streaming.cs" />
</ItemGroup>
<ItemGroup>
@@ -231,11 +226,11 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.AspNet\Microsoft.AspNet.SignalR.Hosting.AspNet.csproj">
- <Project>{0e513ae2-bea8-40cf-b9f2-102b351f2fb2}</Project>
+ <Project>{0E513AE2-BEA8-40CF-B9F2-102B351F2FB2}</Project>
<Name>Microsoft.AspNet.SignalR.Hosting.AspNet</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3b71f0ae-d4b6-4f47-bf62-333d45615673}</Project>
+ <Project>{3B71F0AE-D4B6-4F47-BF62-333D45615673}</Project>
<Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj">
@@ -244,9 +239,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <Content Include="SignalR.Samples.master" />
- </ItemGroup>
- <ItemGroup>
<Content Include="SignalR.Master" />
</ItemGroup>
<ItemGroup>
@@ -256,9 +248,6 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
- <PropertyGroup>
- <StartupObject />
- </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
@@ -282,8 +271,8 @@
</FlavorProperties>
</VisualStudio>
<MonoDevelop>
- <Properties VerifyCodeBehindFields="true" VerifyCodeBehindEvents="true">
- <XspParameters Port="8080" Address="127.0.0.1" SslMode="None" SslProtocol="Default" KeyType="None" CertFile="" KeyFile="" PasswordOptions="None" Password="" Verbose="true" />
+ <Properties VerifyCodeBehindFields="True" VerifyCodeBehindEvents="True">
+ <XspParameters Port="8080" Address="127.0.0.1" SslMode="None" SslProtocol="Default" KeyType="None" CertFile="" KeyFile="" PasswordOptions="None" Password="" Verbose="True" />
</Properties>
</MonoDevelop>
</ProjectExtensions>
@@ -304,4 +293,4 @@
<Exec Condition="'$(ArtifactsDir)' == '' AND '$(OS)' == 'Windows_NT'" Command="$(SolutionDir)\src\Microsoft.AspNet.SignalR.Utils\bin\$(Configuration)\signalr.exe ghp /o:$(SolutionDir)\samples\Microsoft.AspNet.SignalR.Hosting.AspNet.Samples\Scripts\hubs.js" WorkingDirectory="$(OutputPath)" />
<Exec Condition="'$(ArtifactsDir)' != '' AND '$(OS)' == 'Windows_NT'" Command="$(ArtifactsDir)\Microsoft.AspNet.SignalR.Utils\signalr.exe ghp /o:$(SolutionDir)\samples\Microsoft.AspNet.SignalR.Hosting.AspNet.Samples\Scripts\hubs.js" WorkingDirectory="$(OutputPath)" />
</Target>
-</Project>
+</Project>
View
8 samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/SignalR.Samples.master
@@ -1,8 +0,0 @@
-<%@ Master Language="C#" MasterPageFile="~/SignalR.Master" AutoEventWireup="true" CodeBehind="SignalR.Samples.master.cs"
- Inherits="SignalR.Samples.SignalRSamples.SignalRSamples" %>
-<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
- <asp:ContentPlaceHolder ID="HeadContent" runat="server"></asp:ContentPlaceHolder>
-</asp:Content>
-<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
- <asp:ContentPlaceHolder ID="MainContent" runat="server" />
-</asp:Content>
View
12 samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/SignalR.Samples.master.cs
@@ -1,12 +0,0 @@
-using System;
-
-namespace Microsoft.AspNet.SignalR.Samples.SignalRSamples
-{
- public partial class SignalRSamples : System.Web.UI.MasterPage
- {
- protected void Page_Load(object sender, EventArgs e)
- {
-
- }
- }
-}
View
35 samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/SignalR.Samples.master.designer.cs
@@ -1,35 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.AspNet.SignalR.Samples.SignalRSamples
-{
-
-
- public partial class SignalRSamples
- {
-
- /// <summary>
- /// HeadContent control.
- /// </summary>
- /// <remarks>
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- /// </remarks>
- protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent;
-
- /// <summary>
- /// MainContent control.
- /// </summary>
- /// <remarks>
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- /// </remarks>
- protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent;
- }
-}

0 comments on commit e7fcbc1

Please sign in to comment.
Something went wrong with that request. Please try again.