diff options
5 files changed, 2 insertions, 83 deletions
diff --git a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj index c57d40b..62d697c 100644 --- a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj +++ b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj @@ -155,13 +155,6 @@ <Compile Include="MembersOnly\ProfileFieldsDisplay.ascx.designer.cs"> <DependentUpon>ProfileFieldsDisplay.ascx</DependentUpon> </Compile> - <Compile Include="m\Login.aspx.cs"> - <DependentUpon>Login.aspx</DependentUpon> - <SubType>ASPXCodeBehind</SubType> - </Compile> - <Compile Include="m\Login.aspx.designer.cs"> - <DependentUpon>Login.aspx</DependentUpon> - </Compile> <Compile Include="NoIdentityOpenId.aspx.cs"> <DependentUpon>NoIdentityOpenId.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> @@ -194,7 +187,6 @@ <Content Include="MembersOnly\DisplayGoogleContacts.aspx" /> <Content Include="MembersOnly\ProfileFieldsDisplay.ascx" /> <Content Include="MembersOnly\Web.config" /> - <Content Include="m\Login.aspx" /> <Content Include="NoIdentityOpenId.aspx" /> </ItemGroup> <ItemGroup> diff --git a/samples/OpenIdRelyingPartyWebForms/m/Login.aspx b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx deleted file mode 100644 index dda8c85..0000000 --- a/samples/OpenIdRelyingPartyWebForms/m/Login.aspx +++ /dev/null @@ -1,17 +0,0 @@ -<%@ Page Language="C#" CodeBehind="Login.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.m.Login" %> - -<%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty" - TagPrefix="RP" %> -<%@ Register Assembly="System.Web.Mobile" Namespace="System.Web.UI.MobileControls" - TagPrefix="MC" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -</head> -<body> - <MC:Form id="form1" runat="server"> - <RP:OpenIdMobileTextBox ID="openIdTextBox" runat="server" /> - <MC:Command runat="server" ID="loginButton" OnClick="loginButton_Click" Text="Login" /> - </MC:Form> -</body> -</html> diff --git a/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.cs b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.cs deleted file mode 100644 index 86cd5c1..0000000 --- a/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace OpenIdRelyingPartyWebForms.m { - using System; - using System.Web.UI.MobileControls; - - public partial class Login : MobilePage { - protected void Page_Load(object sender, EventArgs e) { - } - - protected void loginButton_Click(object sender, EventArgs e) { - this.openIdTextBox.LogOn(); - } - } -} diff --git a/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.designer.cs deleted file mode 100644 index e55b802..0000000 --- a/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.designer.cs +++ /dev/null @@ -1,43 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Runtime Version:2.0.50727.4912 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </auto-generated> -//------------------------------------------------------------------------------ - -namespace OpenIdRelyingPartyWebForms.m { - - - public partial class Login { - - /// <summary> - /// form1 control. - /// </summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.MobileControls.Form form1; - - /// <summary> - /// openIdTextBox control. - /// </summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdMobileTextBox openIdTextBox; - - /// <summary> - /// loginButton control. - /// </summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.MobileControls.Command loginButton; - } -} diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj index 2e3371b..5bda05d 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj @@ -212,7 +212,7 @@ http://opensource.org/licenses/ms-pl.html <Reference Include="System.Web.Extensions.Design"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> - <Reference Include="System.Web.Mobile" /> + <Reference Include="System.Web.Mobile" Condition=" '$(TargetFrameworkVersion)' != 'v4.0' " /> <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> </Reference> <Reference Include="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> @@ -540,7 +540,7 @@ http://opensource.org/licenses/ms-pl.html <Compile Include="OpenId\RelyingParty\OpenIdButton.cs" /> <Compile Include="OpenId\RelyingParty\OpenIdEventArgs.cs" /> <Compile Include="OpenId\RelyingParty\OpenIdLogin.cs" /> - <Compile Include="OpenId\RelyingParty\OpenIdMobileTextBox.cs" /> + <Compile Include="OpenId\RelyingParty\OpenIdMobileTextBox.cs" Condition=" '$(TargetFrameworkVersion)' != 'v4.0' " /> <Compile Include="OpenId\RelyingParty\OpenIdRelyingPartyControlBase.cs" /> <Compile Include="OpenId\RelyingParty\OpenIdTextBox.cs" /> <Compile Include="OpenId\RelyingParty\PopupBehavior.cs" /> |