diff options
| author | Brandon West <brawest@gmail.com> | 2014-06-14 10:37:51 -0600 |
|---|---|---|
| committer | Brandon West <brawest@gmail.com> | 2014-06-14 10:37:51 -0600 |
| commit | 643dd1a1f0d4021d6c3f47db33b938b74862e96f (patch) | |
| tree | 1d1cce75f02559141e8d2a7578d523f642586529 /SendGrid | |
| parent | 4d0333295ac4115de75372234ed02a31fddfee6e (diff) | |
| download | sendgrid-csharp-643dd1a1f0d4021d6c3f47db33b938b74862e96f.zip sendgrid-csharp-643dd1a1f0d4021d6c3f47db33b938b74862e96f.tar.gz sendgrid-csharp-643dd1a1f0d4021d6c3f47db33b938b74862e96f.tar.bz2 | |
add conditional compile symbol specifying whether or not to use publickeytoken for friend assemblies
Diffstat (limited to 'SendGrid')
| -rw-r--r-- | SendGrid/SendGridMail/Properties/AssemblyInfo.cs | 10 | ||||
| -rw-r--r-- | SendGrid/Tests/Tests.csproj | 23 |
2 files changed, 24 insertions, 9 deletions
diff --git a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs index f923150..3ae7c11 100644 --- a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs +++ b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs @@ -1,4 +1,6 @@ -using System.Reflection;
+#define build
+
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -24,13 +26,17 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("193fa200-8430-4206-aacd-2d2bb2dfa6cf")]
+
+#if (build)
+[assembly: InternalsVisibleTo("Tests")]
+#else
[assembly: InternalsVisibleTo("Tests," + "" +
"PublicKey=00240000048000009400000006020000002400005253413100040000010001004126bffd5a4461" +
"e915193b2695401cee8d67bb14b252a34e5230e6468582f108aafbe31d39f2059240461d622e86" +
"2a294169d5f2659efe0d68b30d7ceee310356c70b54ece3c8c69bbd9db86e07c34ff4fd5d7528b" +
"3ddf078d272025cb7a588030c78020f5eb91872b38dc2832f561fe184715bb8edb6f0b3b644de5" +
"2bc588ae")]
-
+#endif
// Version information for an assembly consists of the following four values:
//
// Major Version
diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj index a17a830..5214954 100644 --- a/SendGrid/Tests/Tests.csproj +++ b/SendGrid/Tests/Tests.csproj @@ -16,17 +16,31 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)' == 'BuildNet40'">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <DebugType>pdbonly</DebugType>
+ <OutputPath>bin\BuildNet40\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <RestorePackages>false</RestorePackages>
+ <Prefer32Bit>false</Prefer32Bit>
+ <BuildPackage>false</BuildPackage>
+ <SignAssembly>false</SignAssembly>
+ </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
<DebugType>pdbonly</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release\</OutputPath>
@@ -35,12 +49,6 @@ <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
- <PropertyGroup>
- <SignAssembly>true</SignAssembly>
- </PropertyGroup>
- <PropertyGroup>
- <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNet40|AnyCPU'">
<OutputPath>bin\ReleaseNet40\</OutputPath>
</PropertyGroup>
@@ -51,6 +59,7 @@ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'BuildNet40|AnyCPU'">
<OutputPath>bin\BuildNet40\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Threading.Tasks">
|