diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-24 18:27:53 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-24 18:27:53 -0700 |
| commit | 033b32eef902f806ac6a8cc28cceb299dcccf95f (patch) | |
| tree | b1faaffce8731f640ca4a3ea687b303273855141 /samples/OAuthAuthorizationServer | |
| parent | b96059ad3bb7d30284edf9fe7b1a2e7d0dd9ffef (diff) | |
| parent | e5b8e2e4bd925ef6967c264644e4d67749b5b3de (diff) | |
| download | DotNetOpenAuth-033b32eef902f806ac6a8cc28cceb299dcccf95f.zip DotNetOpenAuth-033b32eef902f806ac6a8cc28cceb299dcccf95f.tar.gz DotNetOpenAuth-033b32eef902f806ac6a8cc28cceb299dcccf95f.tar.bz2 | |
Merge branch 'v4.0'
Conflicts:
src/version.txt
Diffstat (limited to 'samples/OAuthAuthorizationServer')
3 files changed, 5 insertions, 3 deletions
diff --git a/samples/OAuthAuthorizationServer/Controllers/HomeController.cs b/samples/OAuthAuthorizationServer/Controllers/HomeController.cs index d6dd144..685b4e7 100644 --- a/samples/OAuthAuthorizationServer/Controllers/HomeController.cs +++ b/samples/OAuthAuthorizationServer/Controllers/HomeController.cs @@ -40,7 +40,7 @@ dc.Clients.InsertOnSubmit(new Client { ClientIdentifier = "sampleImplicitConsumer", Name = "Some sample client used for implicit grants (no secret)", - Callback = "http://localhost:59721/", + Callback = "http://localhost:59722/", }); dc.SubmitChanges(); diff --git a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj index ffb0828..15c3f15 100644 --- a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj +++ b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj @@ -8,7 +8,7 @@ </ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{C78E8235-1D46-43EB-A912-80B522C4E9AE}</ProjectGuid> - <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids> + <ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>OAuthAuthorizationServer</RootNamespace> diff --git a/samples/OAuthAuthorizationServer/Web.config b/samples/OAuthAuthorizationServer/Web.config index 20b2bbd..7ff2518 100644 --- a/samples/OAuthAuthorizationServer/Web.config +++ b/samples/OAuthAuthorizationServer/Web.config @@ -98,10 +98,12 @@ </system.webServer> <runtime> + <!-- When targeting ASP.NET MVC 3, this assemblyBinding makes MVC 1 and 2 references relink + to MVC 3 so libraries such as DotNetOpenAuth that compile against MVC 1 will work with it. --> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0" /> + <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> </dependentAssembly> </assemblyBinding> </runtime> |