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 /nuget/content/OpenId.Core | |
| 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 'nuget/content/OpenId.Core')
| -rw-r--r-- | nuget/content/OpenId.Core/web.config.transform | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nuget/content/OpenId.Core/web.config.transform b/nuget/content/OpenId.Core/web.config.transform index 0771d2c..a61011b 100644 --- a/nuget/content/OpenId.Core/web.config.transform +++ b/nuget/content/OpenId.Core/web.config.transform @@ -1,12 +1,16 @@ <configuration> <configSections> - <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <!-- The following section is necessary iff targeting .NET 3.5. It is incompatible with .NET 4.0. + <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />--> <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core"> <section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" /> </sectionGroup> </configSections> <uri> + <!-- See an error due to this section? When targeting .NET 3.5, please add the following line to your <configSections> at the top of this file: + <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + --> <!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names), which is necessary for OpenID urls with unicode characters in the domain/host name. It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. --> @@ -15,20 +19,20 @@ </uri> <runtime> - <!-- 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> <dotNetOpenAuth> <!-- This is an optional configuration section where aspects of dotnetopenauth can be customized. --> <!-- For a complete set of configuration options see http://www.dotnetopenauth.net/developers/code-snippets/configuration-options/ --> - <!-- You may also refer to README.Bin.html for instructions on enabling Intellisense for this section. --> <openid> </openid> </dotNetOpenAuth> |