diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-05 19:24:33 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-05 19:24:33 -0800 |
| commit | 32c393177fc75ccccee1bced5d03ebdaf3a825cd (patch) | |
| tree | 96367dcf9ccbe138ce018402f292b44e5f6a8e85 /src | |
| parent | 502d7c5bf2e0767ae0bb93256e4938b8f9dc1339 (diff) | |
| download | DotNetOpenAuth-32c393177fc75ccccee1bced5d03ebdaf3a825cd.zip DotNetOpenAuth-32c393177fc75ccccee1bced5d03ebdaf3a825cd.tar.gz DotNetOpenAuth-32c393177fc75ccccee1bced5d03ebdaf3a825cd.tar.bz2 | |
Fixed warnings about using deprecated Code Access Security features in CLR4.
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.csproj | 1 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/Properties/AssemblyInfo.cs | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj index 0b0c085..2e3371b 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj @@ -125,6 +125,7 @@ http://opensource.org/licenses/ms-pl.html </PropertyGroup> <PropertyGroup> <SignAssembly>true</SignAssembly> + <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">$(DefineConstants);CLR4</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/src/DotNetOpenAuth/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth/Properties/AssemblyInfo.cs index 0bba853..ce08780 100644 --- a/src/DotNetOpenAuth/Properties/AssemblyInfo.cs +++ b/src/DotNetOpenAuth/Properties/AssemblyInfo.cs @@ -70,6 +70,8 @@ using System.Web.UI; [assembly: InternalsVisibleTo("DotNetOpenAuth.Test")] #endif +#if !CLR4 + // Specify what permissions are required and optional for the assembly. // In order for CAS to remove unnecessary privileges from this assembly (which is desirable // for security), we need at least one RequestMinimum and at least one RequestOptional. @@ -99,5 +101,6 @@ using System.Web.UI; [assembly: RegistryPermission(SecurityAction.RequestOptional, Unrestricted = true)] [assembly: SecurityPermission(SecurityAction.RequestOptional, ControlEvidence = true, UnmanagedCode = true, ControlThread = true)] [assembly: FileIOPermission(SecurityAction.RequestOptional, AllFiles = FileIOPermissionAccess.PathDiscovery | FileIOPermissionAccess.Read)] -#endif -#endif +#endif // TRACE || DEBUG +#endif // PARTIAL_TRUST +#endif // CLR4 |