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/OpenIdProviderMvc | |
| 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/OpenIdProviderMvc')
| -rw-r--r-- | samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj | 2 | ||||
| -rw-r--r-- | samples/OpenIdProviderMvc/Web.config | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj b/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj index 2607c47..4c2aba5 100644 --- a/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj +++ b/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj @@ -6,7 +6,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{AEA29D4D-396F-47F6-BC81-B58D4B855245}</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>OpenIdProviderMvc</RootNamespace> diff --git a/samples/OpenIdProviderMvc/Web.config b/samples/OpenIdProviderMvc/Web.config index 6c5b5b6..9c3aeac 100644 --- a/samples/OpenIdProviderMvc/Web.config +++ b/samples/OpenIdProviderMvc/Web.config @@ -200,12 +200,12 @@ <runtime> <legacyHMACWarning enabled="0" /> - <!-- When targeting ASP.NET MVC 2, this assemblyBinding makes MVC 1 references relink - to MVC 2 so libraries such as DotNetOpenAuth that compile against MVC 1 will work with it. --> + <!-- 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> |