From 10956b4854231db5c0bcbd9be273fb874ab895c8 Mon Sep 17 00:00:00 2001 From: Aaron Sherber Date: Wed, 25 Jan 2017 09:29:01 -0500 Subject: [PATCH 1/9] Rearranged my net_core branch with ideas from @Gorniv and PR #136 --- docker/readme.md | 34 +- .../SparkPost.NetStandard.xproj | 21 + src/SparkPost.NetStandard/project.json | 33 + .../SparkPost.Portable.csproj | 224 ++-- src/SparkPost.sln | 6 + src/SparkPost/DataMapper.cs | 4 + src/SparkPost/File.cs | 4 +- src/SparkPost/LeftRight.cs | 5 +- src/SparkPost/MessageEvent.cs | 2 +- src/SparkPost/RequestMethods/Get.cs | 3 +- src/SparkPost/SendingDomains.cs | 3 +- src/SparkPost/SparkPost.csproj | 4 +- src/SparkPost/Suppressions.cs | 5 +- src/SparkPost/Transmission.cs | 4 + src/SparkPost/Utilities/MailMessageMapping.cs | 6 +- src/SparkPost/Utilities/MimeTypes.cs | 1025 +++++++++++++++++ src/SparkPost/Utilities/UrlUtility.cs | 20 + .../ValueMappers/AnonymousValueMapper.cs | 3 +- src/SparkPost/ValueMappers/EnumValueMapper.cs | 3 +- .../MapASetOfItemsUsingToDictionary.cs | 4 + .../MapASingleItemUsingToDictionary.cs | 4 + 21 files changed, 1271 insertions(+), 146 deletions(-) create mode 100644 src/SparkPost.NetStandard/SparkPost.NetStandard.xproj create mode 100644 src/SparkPost.NetStandard/project.json create mode 100644 src/SparkPost/Utilities/MimeTypes.cs create mode 100644 src/SparkPost/Utilities/UrlUtility.cs diff --git a/docker/readme.md b/docker/readme.md index 9a0a62a7..99d9491c 100644 --- a/docker/readme.md +++ b/docker/readme.md @@ -1,17 +1,17 @@ -## Build & Deploy via Docker & Nuget - -This docker container will pull the latest version of this library, create a nuget package, and deploy it to Nuget. - -The only thing is needs is a valid Nuget API key, from someone that has rights to publish the package to Nuget. - -``` -cd docker -docker build . # this will produce a hash key, say 12345678 -docker run -e "APIKEY=your_nuget_key_here" 12345678 -``` - -This container has been registered on Docker Hub, and can be run like so: - -``` -docker run -e "APIKEY=your_nuget_key_here" darrencauthon/csharp-sparkpost -``` +## Build & Deploy via Docker & Nuget + +This docker container will pull the latest version of this library, create a nuget package, and deploy it to Nuget. + +The only thing is needs is a valid Nuget API key, from someone that has rights to publish the package to Nuget. + +``` +cd docker +docker build . # this will produce a hash key, say 12345678 +docker run -e "APIKEY=your_nuget_key_here" 12345678 +``` + +This container has been registered on Docker Hub, and can be run like so: + +``` +docker run -e "APIKEY=your_nuget_key_here" darrencauthon/csharp-sparkpost +``` diff --git a/src/SparkPost.NetStandard/SparkPost.NetStandard.xproj b/src/SparkPost.NetStandard/SparkPost.NetStandard.xproj new file mode 100644 index 00000000..8ead7db1 --- /dev/null +++ b/src/SparkPost.NetStandard/SparkPost.NetStandard.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 9b252ba6-3d9f-4303-8003-9a3a73a70d63 + SparkPost.NetStandard + .\obj + .\bin\ + v4.5.2 + + + + 2.0 + + + diff --git a/src/SparkPost.NetStandard/project.json b/src/SparkPost.NetStandard/project.json new file mode 100644 index 00000000..ad0d8950 --- /dev/null +++ b/src/SparkPost.NetStandard/project.json @@ -0,0 +1,33 @@ +{ + "version": "1.12.0-*", + "buildOptions": { + "compile": { + "include": [ "../SparkPost/**/*.cs" ] + }, + "warningsAsErrors": false, + "outputName": "SparkPost" + }, + "configurations": { + "Debug": { + "buildOptions": { + "define": [ "DEBUG", "TRACE" ] + } + }, + "Release": { + "buildOptions": { + "define": [ "TRACE" ], + "optimize": true + } + } + }, + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore5.0" + } + }, + "dependencies": { + "NETStandard.Library": "1.6.0", + "Newtonsoft.Json": "9.0.1", + "System.Reflection.TypeExtensions": "4.3.0" + } +} \ No newline at end of file diff --git a/src/SparkPost.Portable/SparkPost.Portable.csproj b/src/SparkPost.Portable/SparkPost.Portable.csproj index 4ba02806..377ceaae 100644 --- a/src/SparkPost.Portable/SparkPost.Portable.csproj +++ b/src/SparkPost.Portable/SparkPost.Portable.csproj @@ -1,113 +1,113 @@ - - - - Debug - AnyCPU - {2F7E9E0B-27BB-42AC-AB4A-B8249B64C654} - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - SparkPost - SparkPost.Portable - v4.5 - Profile7 - - - true - full - false - bin\Debug - DEBUG;PORTABLE - prompt - 4 - false - false - - - true - bin\Release - PORTABLE - prompt - 4 - false - false - - - - Address.cs - - - Attachment.cs - - - CcHandling.cs - - - Client.cs - - - Content.cs - - - DataMapper.cs - - - File.cs - - - IClient.cs - - - InlineImage.cs - - - ITransmissions.cs - - - Options.cs - - - Recipient.cs - - - RecipientType.cs - - - Request.cs - - - RequestSender.cs - - - Response.cs - - - ResponseException.cs - - - SendTransmissionResponse.cs - - - Transmission.cs - - - Transmissions.cs - - - - Properties\AssemblyInfo.cs - - - - - ..\packages\Newtonsoft.Json.8.0.2\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll - - - - - - SparkPost.nuspec - - - - + + + + Debug + AnyCPU + {2F7E9E0B-27BB-42AC-AB4A-B8249B64C654} + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + SparkPost + SparkPost.Portable + v4.5 + Profile7 + + + true + full + false + bin\Debug + DEBUG;PORTABLE + prompt + 4 + false + false + + + true + bin\Release + PORTABLE + prompt + 4 + false + false + + + + Address.cs + + + Attachment.cs + + + CcHandling.cs + + + Client.cs + + + Content.cs + + + DataMapper.cs + + + File.cs + + + IClient.cs + + + InlineImage.cs + + + ITransmissions.cs + + + Options.cs + + + Recipient.cs + + + RecipientType.cs + + + Request.cs + + + RequestSender.cs + + + Response.cs + + + ResponseException.cs + + + SendTransmissionResponse.cs + + + Transmission.cs + + + Transmissions.cs + + + + Properties\AssemblyInfo.cs + + + + + ..\packages\Newtonsoft.Json.8.0.2\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + + + + + + SparkPost.nuspec + + + + \ No newline at end of file diff --git a/src/SparkPost.sln b/src/SparkPost.sln index 176fb061..3b45128a 100644 --- a/src/SparkPost.sln +++ b/src/SparkPost.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkPost.Tests", "SparkPos EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkPost.Acceptance", "SparkPost.Acceptance\SparkPost.Acceptance.csproj", "{8F62193B-1C44-4E92-96C7-8EBD610F7669}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SparkPost.NetStandard", "SparkPost.NetStandard\SparkPost.NetStandard.xproj", "{9B252BA6-3D9F-4303-8003-9A3A73A70D63}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,6 +29,10 @@ Global {8F62193B-1C44-4E92-96C7-8EBD610F7669}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F62193B-1C44-4E92-96C7-8EBD610F7669}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F62193B-1C44-4E92-96C7-8EBD610F7669}.Release|Any CPU.Build.0 = Release|Any CPU + {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/SparkPost/DataMapper.cs b/src/SparkPost/DataMapper.cs index ac3ce89b..945a8055 100644 --- a/src/SparkPost/DataMapper.cs +++ b/src/SparkPost/DataMapper.cs @@ -223,8 +223,12 @@ public IDictionary CatchAll(object anything) { var converters = ToDictionaryMethods(); if (converters.ContainsKey(anything.GetType())) +#if NET45 return converters[anything.GetType()].Invoke(this, BindingFlags.Default, null, new[] {anything}, CultureInfo.CurrentCulture) as IDictionary; +#else + return converters[anything.GetType()].Invoke(this, new[] { anything }) as IDictionary; +#endif return WithCommonConventions(anything); } diff --git a/src/SparkPost/File.cs b/src/SparkPost/File.cs index 5b85d0eb..75894b2c 100644 --- a/src/SparkPost/File.cs +++ b/src/SparkPost/File.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using System.Web; +using SparkPost.Utilities; namespace SparkPost { @@ -34,7 +34,7 @@ public abstract class File if (content != null) { result.Data = Convert.ToBase64String(content); - result.Type = MimeMapping.GetMimeMapping(name); + result.Type = MimeTypes.GetMimeType(name); result.Name = name; }; return result; diff --git a/src/SparkPost/LeftRight.cs b/src/SparkPost/LeftRight.cs index 492fb674..b8063fdc 100644 --- a/src/SparkPost/LeftRight.cs +++ b/src/SparkPost/LeftRight.cs @@ -1,4 +1,5 @@ using System.Linq; +using System.Reflection; namespace SparkPost { @@ -6,8 +7,8 @@ public static class LeftRight { public static void SetValuesToMatch(object left, object right) { - var leftProperties = left.GetType().GetProperties(); - var rightProperties = left.GetType().GetProperties(); + var leftProperties = left.GetType().GetTypeInfo().GetProperties(); + var rightProperties = left.GetType().GetTypeInfo().GetProperties(); foreach (var rightProperty in rightProperties) { try diff --git a/src/SparkPost/MessageEvent.cs b/src/SparkPost/MessageEvent.cs index 666e7e7d..940c8652 100644 --- a/src/SparkPost/MessageEvent.cs +++ b/src/SparkPost/MessageEvent.cs @@ -26,7 +26,7 @@ public MessageEventType TypeEnum foreach (var typeName in Enum.GetNames(typeof(MessageEventType))) { var typeNameSnakeCase = SnakeCase.Convert(typeName); - if (string.Equals(Type, typeNameSnakeCase, StringComparison.InvariantCultureIgnoreCase)) + if (string.Equals(Type, typeNameSnakeCase, StringComparison.OrdinalIgnoreCase)) // check for an unmapped message event type here return (MessageEventType)Enum.Parse(typeof(MessageEventType), typeName); } diff --git a/src/SparkPost/RequestMethods/Get.cs b/src/SparkPost/RequestMethods/Get.cs index b49220fc..11867079 100644 --- a/src/SparkPost/RequestMethods/Get.cs +++ b/src/SparkPost/RequestMethods/Get.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using System.Web; using SparkPost.Utilities; namespace SparkPost.RequestMethods @@ -37,7 +36,7 @@ private string ConvertToQueryString(object data) dictionary[thing.Key] = thing.Value.ToString(); var values = dictionary - .Select(x => HttpUtility.UrlEncode(SnakeCase.Convert(x.Key)) + "=" + HttpUtility.UrlEncode(x.Value)); + .Select(x => UrlUtility.UrlEncode(SnakeCase.Convert(x.Key)) + "=" + UrlUtility.UrlEncode(x.Value)); return string.Join("&", values); } diff --git a/src/SparkPost/SendingDomains.cs b/src/SparkPost/SendingDomains.cs index 64b35f03..68fc87be 100644 --- a/src/SparkPost/SendingDomains.cs +++ b/src/SparkPost/SendingDomains.cs @@ -1,6 +1,5 @@ using System.Net; using System.Threading.Tasks; -using System.Web; using SparkPost.RequestSenders; using SparkPost.Utilities; @@ -114,7 +113,7 @@ public async Task Delete(string domain) if (response.StatusCode == HttpStatusCode.NoContent) { response.StatusCode = HttpStatusCode.OK; - response.ReasonPhrase = HttpWorkerRequest.GetStatusDescription((int)HttpStatusCode.OK); + response.ReasonPhrase = "OK"; } if (response.StatusCode != HttpStatusCode.OK) throw new ResponseException(response); diff --git a/src/SparkPost/SparkPost.csproj b/src/SparkPost/SparkPost.csproj index 0354bcc6..30145c39 100644 --- a/src/SparkPost/SparkPost.csproj +++ b/src/SparkPost/SparkPost.csproj @@ -18,7 +18,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;NET45 prompt 4 bin\Debug\SparkPost.xml @@ -97,7 +97,9 @@ + + diff --git a/src/SparkPost/Suppressions.cs b/src/SparkPost/Suppressions.cs index ceeb44ba..7b2e4efa 100644 --- a/src/SparkPost/Suppressions.cs +++ b/src/SparkPost/Suppressions.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using System.Web; using SparkPost.RequestSenders; using SparkPost.Utilities; @@ -54,7 +53,7 @@ public async Task Retrieve(string email) { var request = new Request { - Url = $"/api/{client.Version}/suppression-list/{HttpUtility.UrlEncode(email)}", + Url = $"/api/{client.Version}/suppression-list/{UrlUtility.UrlEncode(email)}", Method = "GET" }; @@ -113,7 +112,7 @@ public async Task Delete(string email) { var request = new Request { - Url = $"api/{client.Version}/suppression-list/{HttpUtility.UrlEncode(email)}", + Url = $"api/{client.Version}/suppression-list/{UrlUtility.UrlEncode(email)}", Method = "DELETE" }; diff --git a/src/SparkPost/Transmission.cs b/src/SparkPost/Transmission.cs index d01dd3db..298719e9 100644 --- a/src/SparkPost/Transmission.cs +++ b/src/SparkPost/Transmission.cs @@ -1,5 +1,7 @@ using System.Collections.Generic; +#if NET45 using System.Net.Mail; +#endif using SparkPost.Utilities; namespace SparkPost @@ -33,6 +35,7 @@ public Transmission() public int NumFailedGeneration { get; set; } public int NumInvalidRecipients { get; set; } +#if NET45 public static Transmission Parse(MailMessage message) { return MailMessageMapping.ToTransmission(message); @@ -42,5 +45,6 @@ public void LoadFrom(MailMessage message) { MailMessageMapping.ToTransmission(message, this); } +#endif } } \ No newline at end of file diff --git a/src/SparkPost/Utilities/MailMessageMapping.cs b/src/SparkPost/Utilities/MailMessageMapping.cs index 5c466d02..c1af7bd7 100644 --- a/src/SparkPost/Utilities/MailMessageMapping.cs +++ b/src/SparkPost/Utilities/MailMessageMapping.cs @@ -1,4 +1,5 @@ -using System; +#if NET45 +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -115,4 +116,5 @@ private static Recipient ConvertToARecipient(RecipientType type, MailAddress add }; } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/SparkPost/Utilities/MimeTypes.cs b/src/SparkPost/Utilities/MimeTypes.cs new file mode 100644 index 00000000..ffc3c96c --- /dev/null +++ b/src/SparkPost/Utilities/MimeTypes.cs @@ -0,0 +1,1025 @@ +using System; +using System.Collections.Generic; + +namespace SparkPost.Utilities +{ + public static class MimeTypes + { + /// + /// The fallback MIME-type. Defaults to application/octet-stream. + /// + public static string FallbackMimeType { get; set; } + + private static readonly Dictionary TypeMap; + + static MimeTypes() + { + FallbackMimeType = "application/octet-stream"; + + TypeMap = new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "123", "application/vnd.lotus-1-2-3" }, + { "3dml", "text/vnd.in3d.3dml" }, + { "3ds", "image/x-3ds" }, + { "3g2", "video/3gpp2" }, + { "3gp", "video/3gpp" }, + { "7z", "application/x-7z-compressed" }, + { "aab", "application/x-authorware-bin" }, + { "aac", "audio/x-aac" }, + { "aam", "application/x-authorware-map" }, + { "aas", "application/x-authorware-seg" }, + { "abw", "application/x-abiword" }, + { "ac", "application/pkix-attr-cert" }, + { "acc", "application/vnd.americandynamics.acc" }, + { "ace", "application/x-ace-compressed" }, + { "acu", "application/vnd.acucobol" }, + { "acutc", "application/vnd.acucorp" }, + { "adp", "audio/adpcm" }, + { "aep", "application/vnd.audiograph" }, + { "afm", "application/x-font-type1" }, + { "afp", "application/vnd.ibm.modcap" }, + { "ahead", "application/vnd.ahead.space" }, + { "ai", "application/postscript" }, + { "aif", "audio/x-aiff" }, + { "aifc", "audio/x-aiff" }, + { "aiff", "audio/x-aiff" }, + { "air", "application/vnd.adobe.air-application-installer-package+zip" }, + { "ait", "application/vnd.dvb.ait" }, + { "ami", "application/vnd.amiga.ami" }, + { "apk", "application/vnd.android.package-archive" }, + { "appcache", "text/cache-manifest" }, + { "application", "application/x-ms-application" }, + { "apr", "application/vnd.lotus-approach" }, + { "arc", "application/x-freearc" }, + { "asc", "application/pgp-signature" }, + { "asf", "video/x-ms-asf" }, + { "asm", "text/x-asm" }, + { "aso", "application/vnd.accpac.simply.aso" }, + { "asx", "video/x-ms-asf" }, + { "atc", "application/vnd.acucorp" }, + { "atom", "application/atom+xml" }, + { "atomcat", "application/atomcat+xml" }, + { "atomsvc", "application/atomsvc+xml" }, + { "atx", "application/vnd.antix.game-component" }, + { "au", "audio/basic" }, + { "avi", "video/x-msvideo" }, + { "aw", "application/applixware" }, + { "azf", "application/vnd.airzip.filesecure.azf" }, + { "azs", "application/vnd.airzip.filesecure.azs" }, + { "azw", "application/vnd.amazon.ebook" }, + { "bat", "application/x-msdownload" }, + { "bcpio", "application/x-bcpio" }, + { "bdf", "application/x-font-bdf" }, + { "bdm", "application/vnd.syncml.dm+wbxml" }, + { "bed", "application/vnd.realvnc.bed" }, + { "bh2", "application/vnd.fujitsu.oasysprs" }, + { "bin", "application/octet-stream" }, + { "blb", "application/x-blorb" }, + { "blorb", "application/x-blorb" }, + { "bmi", "application/vnd.bmi" }, + { "bmp", "image/bmp" }, + { "book", "application/vnd.framemaker" }, + { "box", "application/vnd.previewsystems.box" }, + { "boz", "application/x-bzip2" }, + { "bpk", "application/octet-stream" }, + { "btif", "image/prs.btif" }, + { "bz", "application/x-bzip" }, + { "bz2", "application/x-bzip2" }, + { "c", "text/x-c" }, + { "c11amc", "application/vnd.cluetrust.cartomobile-config" }, + { "c11amz", "application/vnd.cluetrust.cartomobile-config-pkg" }, + { "c4d", "application/vnd.clonk.c4group" }, + { "c4f", "application/vnd.clonk.c4group" }, + { "c4g", "application/vnd.clonk.c4group" }, + { "c4p", "application/vnd.clonk.c4group" }, + { "c4u", "application/vnd.clonk.c4group" }, + { "cab", "application/vnd.ms-cab-compressed" }, + { "caf", "audio/x-caf" }, + { "cap", "application/vnd.tcpdump.pcap" }, + { "car", "application/vnd.curl.car" }, + { "cat", "application/vnd.ms-pki.seccat" }, + { "cb7", "application/x-cbr" }, + { "cba", "application/x-cbr" }, + { "cbr", "application/x-cbr" }, + { "cbt", "application/x-cbr" }, + { "cbz", "application/x-cbr" }, + { "cc", "text/x-c" }, + { "cct", "application/x-director" }, + { "ccxml", "application/ccxml+xml" }, + { "cdbcmsg", "application/vnd.contact.cmsg" }, + { "cdf", "application/x-netcdf" }, + { "cdkey", "application/vnd.mediastation.cdkey" }, + { "cdmia", "application/cdmi-capability" }, + { "cdmic", "application/cdmi-container" }, + { "cdmid", "application/cdmi-domain" }, + { "cdmio", "application/cdmi-object" }, + { "cdmiq", "application/cdmi-queue" }, + { "cdx", "chemical/x-cdx" }, + { "cdxml", "application/vnd.chemdraw+xml" }, + { "cdy", "application/vnd.cinderella" }, + { "cer", "application/pkix-cert" }, + { "cfs", "application/x-cfs-compressed" }, + { "cgm", "image/cgm" }, + { "chat", "application/x-chat" }, + { "chm", "application/vnd.ms-htmlhelp" }, + { "chrt", "application/vnd.kde.kchart" }, + { "cif", "chemical/x-cif" }, + { "cii", "application/vnd.anser-web-certificate-issue-initiation" }, + { "cil", "application/vnd.ms-artgalry" }, + { "cla", "application/vnd.claymore" }, + { "class", "application/java-vm" }, + { "clkk", "application/vnd.crick.clicker.keyboard" }, + { "clkp", "application/vnd.crick.clicker.palette" }, + { "clkt", "application/vnd.crick.clicker.template" }, + { "clkw", "application/vnd.crick.clicker.wordbank" }, + { "clkx", "application/vnd.crick.clicker" }, + { "clp", "application/x-msclip" }, + { "cmc", "application/vnd.cosmocaller" }, + { "cmdf", "chemical/x-cmdf" }, + { "cml", "chemical/x-cml" }, + { "cmp", "application/vnd.yellowriver-custom-menu" }, + { "cmx", "image/x-cmx" }, + { "cod", "application/vnd.rim.cod" }, + { "com", "application/x-msdownload" }, + { "conf", "text/plain" }, + { "cpio", "application/x-cpio" }, + { "cpp", "text/x-c" }, + { "cpt", "application/mac-compactpro" }, + { "crd", "application/x-mscardfile" }, + { "crl", "application/pkix-crl" }, + { "crt", "application/x-x509-ca-cert" }, + { "cryptonote", "application/vnd.rig.cryptonote" }, + { "csh", "application/x-csh" }, + { "csml", "chemical/x-csml" }, + { "csp", "application/vnd.commonspace" }, + { "css", "text/css" }, + { "cst", "application/x-director" }, + { "csv", "text/csv" }, + { "cu", "application/cu-seeme" }, + { "curl", "text/vnd.curl" }, + { "cww", "application/prs.cww" }, + { "cxt", "application/x-director" }, + { "cxx", "text/x-c" }, + { "dae", "model/vnd.collada+xml" }, + { "daf", "application/vnd.mobius.daf" }, + { "dart", "application/vnd.dart" }, + { "dataless", "application/vnd.fdsn.seed" }, + { "davmount", "application/davmount+xml" }, + { "dbk", "application/docbook+xml" }, + { "dcr", "application/x-director" }, + { "dcurl", "text/vnd.curl.dcurl" }, + { "dd2", "application/vnd.oma.dd2+xml" }, + { "ddd", "application/vnd.fujixerox.ddd" }, + { "deb", "application/x-debian-package" }, + { "def", "text/plain" }, + { "deploy", "application/octet-stream" }, + { "der", "application/x-x509-ca-cert" }, + { "dfac", "application/vnd.dreamfactory" }, + { "dgc", "application/x-dgc-compressed" }, + { "dic", "text/x-c" }, + { "dir", "application/x-director" }, + { "dis", "application/vnd.mobius.dis" }, + { "dist", "application/octet-stream" }, + { "distz", "application/octet-stream" }, + { "djv", "image/vnd.djvu" }, + { "djvu", "image/vnd.djvu" }, + { "dll", "application/x-msdownload" }, + { "dmg", "application/x-apple-diskimage" }, + { "dmp", "application/vnd.tcpdump.pcap" }, + { "dms", "application/octet-stream" }, + { "dna", "application/vnd.dna" }, + { "doc", "application/msword" }, + { "docm", "application/vnd.ms-word.document.macroenabled.12" }, + { "docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document" }, + { "dot", "application/msword" }, + { "dotm", "application/vnd.ms-word.template.macroenabled.12" }, + { "dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template" }, + { "dp", "application/vnd.osgi.dp" }, + { "dpg", "application/vnd.dpgraph" }, + { "dra", "audio/vnd.dra" }, + { "dsc", "text/prs.lines.tag" }, + { "dssc", "application/dssc+der" }, + { "dtb", "application/x-dtbook+xml" }, + { "dtd", "application/xml-dtd" }, + { "dts", "audio/vnd.dts" }, + { "dtshd", "audio/vnd.dts.hd" }, + { "dump", "application/octet-stream" }, + { "dvb", "video/vnd.dvb.file" }, + { "dvi", "application/x-dvi" }, + { "dwf", "model/vnd.dwf" }, + { "dwg", "image/vnd.dwg" }, + { "dxf", "image/vnd.dxf" }, + { "dxp", "application/vnd.spotfire.dxp" }, + { "dxr", "application/x-director" }, + { "ecelp4800", "audio/vnd.nuera.ecelp4800" }, + { "ecelp7470", "audio/vnd.nuera.ecelp7470" }, + { "ecelp9600", "audio/vnd.nuera.ecelp9600" }, + { "ecma", "application/ecmascript" }, + { "edm", "application/vnd.novadigm.edm" }, + { "edx", "application/vnd.novadigm.edx" }, + { "efif", "application/vnd.picsel" }, + { "ei6", "application/vnd.pg.osasli" }, + { "elc", "application/octet-stream" }, + { "emf", "application/x-msmetafile" }, + { "eml", "message/rfc822" }, + { "emma", "application/emma+xml" }, + { "emz", "application/x-msmetafile" }, + { "eol", "audio/vnd.digital-winds" }, + { "eot", "application/vnd.ms-fontobject" }, + { "eps", "application/postscript" }, + { "epub", "application/epub+zip" }, + { "es3", "application/vnd.eszigno3+xml" }, + { "esa", "application/vnd.osgi.subsystem" }, + { "esf", "application/vnd.epson.esf" }, + { "et3", "application/vnd.eszigno3+xml" }, + { "etx", "text/x-setext" }, + { "eva", "application/x-eva" }, + { "evy", "application/x-envoy" }, + { "exe", "application/x-msdownload" }, + { "exi", "application/exi" }, + { "ext", "application/vnd.novadigm.ext" }, + { "ez", "application/andrew-inset" }, + { "ez2", "application/vnd.ezpix-album" }, + { "ez3", "application/vnd.ezpix-package" }, + { "f", "text/x-fortran" }, + { "f4v", "video/x-f4v" }, + { "f77", "text/x-fortran" }, + { "f90", "text/x-fortran" }, + { "fbs", "image/vnd.fastbidsheet" }, + { "fcdt", "application/vnd.adobe.formscentral.fcdt" }, + { "fcs", "application/vnd.isac.fcs" }, + { "fdf", "application/vnd.fdf" }, + { "fe_launch", "application/vnd.denovo.fcselayout-link" }, + { "fg5", "application/vnd.fujitsu.oasysgp" }, + { "fgd", "application/x-director" }, + { "fh", "image/x-freehand" }, + { "fh4", "image/x-freehand" }, + { "fh5", "image/x-freehand" }, + { "fh7", "image/x-freehand" }, + { "fhc", "image/x-freehand" }, + { "fig", "application/x-xfig" }, + { "flac", "audio/x-flac" }, + { "fli", "video/x-fli" }, + { "flo", "application/vnd.micrografx.flo" }, + { "flv", "video/x-flv" }, + { "flw", "application/vnd.kde.kivio" }, + { "flx", "text/vnd.fmi.flexstor" }, + { "fly", "text/vnd.fly" }, + { "fm", "application/vnd.framemaker" }, + { "fnc", "application/vnd.frogans.fnc" }, + { "for", "text/x-fortran" }, + { "fpx", "image/vnd.fpx" }, + { "frame", "application/vnd.framemaker" }, + { "fsc", "application/vnd.fsc.weblaunch" }, + { "fst", "image/vnd.fst" }, + { "ftc", "application/vnd.fluxtime.clip" }, + { "fti", "application/vnd.anser-web-funds-transfer-initiation" }, + { "fvt", "video/vnd.fvt" }, + { "fxp", "application/vnd.adobe.fxp" }, + { "fxpl", "application/vnd.adobe.fxp" }, + { "fzs", "application/vnd.fuzzysheet" }, + { "g2w", "application/vnd.geoplan" }, + { "g3", "image/g3fax" }, + { "g3w", "application/vnd.geospace" }, + { "gac", "application/vnd.groove-account" }, + { "gam", "application/x-tads" }, + { "gbr", "application/rpki-ghostbusters" }, + { "gca", "application/x-gca-compressed" }, + { "gdl", "model/vnd.gdl" }, + { "geo", "application/vnd.dynageo" }, + { "gex", "application/vnd.geometry-explorer" }, + { "ggb", "application/vnd.geogebra.file" }, + { "ggt", "application/vnd.geogebra.tool" }, + { "ghf", "application/vnd.groove-help" }, + { "gif", "image/gif" }, + { "gim", "application/vnd.groove-identity-message" }, + { "gml", "application/gml+xml" }, + { "gmx", "application/vnd.gmx" }, + { "gnumeric", "application/x-gnumeric" }, + { "gph", "application/vnd.flographit" }, + { "gpx", "application/gpx+xml" }, + { "gqf", "application/vnd.grafeq" }, + { "gqs", "application/vnd.grafeq" }, + { "gram", "application/srgs" }, + { "gramps", "application/x-gramps-xml" }, + { "gre", "application/vnd.geometry-explorer" }, + { "grv", "application/vnd.groove-injector" }, + { "grxml", "application/srgs+xml" }, + { "gsf", "application/x-font-ghostscript" }, + { "gtar", "application/x-gtar" }, + { "gtm", "application/vnd.groove-tool-message" }, + { "gtw", "model/vnd.gtw" }, + { "gv", "text/vnd.graphviz" }, + { "gxf", "application/gxf" }, + { "gxt", "application/vnd.geonext" }, + { "h", "text/x-c" }, + { "h261", "video/h261" }, + { "h263", "video/h263" }, + { "h264", "video/h264" }, + { "hal", "application/vnd.hal+xml" }, + { "hbci", "application/vnd.hbci" }, + { "hdf", "application/x-hdf" }, + { "hh", "text/x-c" }, + { "hlp", "application/winhlp" }, + { "hpgl", "application/vnd.hp-hpgl" }, + { "hpid", "application/vnd.hp-hpid" }, + { "hps", "application/vnd.hp-hps" }, + { "hqx", "application/mac-binhex40" }, + { "htke", "application/vnd.kenameaapp" }, + { "htm", "text/html" }, + { "html", "text/html" }, + { "hvd", "application/vnd.yamaha.hv-dic" }, + { "hvp", "application/vnd.yamaha.hv-voice" }, + { "hvs", "application/vnd.yamaha.hv-script" }, + { "i2g", "application/vnd.intergeo" }, + { "icc", "application/vnd.iccprofile" }, + { "ice", "x-conference/x-cooltalk" }, + { "icm", "application/vnd.iccprofile" }, + { "ico", "image/x-icon" }, + { "ics", "text/calendar" }, + { "ief", "image/ief" }, + { "ifb", "text/calendar" }, + { "ifm", "application/vnd.shana.informed.formdata" }, + { "iges", "model/iges" }, + { "igl", "application/vnd.igloader" }, + { "igm", "application/vnd.insors.igm" }, + { "igs", "model/iges" }, + { "igx", "application/vnd.micrografx.igx" }, + { "iif", "application/vnd.shana.informed.interchange" }, + { "imp", "application/vnd.accpac.simply.imp" }, + { "ims", "application/vnd.ms-ims" }, + { "in", "text/plain" }, + { "ink", "application/inkml+xml" }, + { "inkml", "application/inkml+xml" }, + { "install", "application/x-install-instructions" }, + { "iota", "application/vnd.astraea-software.iota" }, + { "ipfix", "application/ipfix" }, + { "ipk", "application/vnd.shana.informed.package" }, + { "irm", "application/vnd.ibm.rights-management" }, + { "irp", "application/vnd.irepository.package+xml" }, + { "iso", "application/x-iso9660-image" }, + { "itp", "application/vnd.shana.informed.formtemplate" }, + { "ivp", "application/vnd.immervision-ivp" }, + { "ivu", "application/vnd.immervision-ivu" }, + { "jad", "text/vnd.sun.j2me.app-descriptor" }, + { "jam", "application/vnd.jam" }, + { "jar", "application/java-archive" }, + { "java", "text/x-java-source" }, + { "jisp", "application/vnd.jisp" }, + { "jlt", "application/vnd.hp-jlyt" }, + { "jnlp", "application/x-java-jnlp-file" }, + { "joda", "application/vnd.joost.joda-archive" }, + { "jpe", "image/jpeg" }, + { "jpeg", "image/jpeg" }, + { "jpg", "image/jpeg" }, + { "jpgm", "video/jpm" }, + { "jpgv", "video/jpeg" }, + { "jpm", "video/jpm" }, + { "js", "application/javascript" }, + { "json", "application/json" }, + { "jsonml", "application/jsonml+json" }, + { "kar", "audio/midi" }, + { "karbon", "application/vnd.kde.karbon" }, + { "kfo", "application/vnd.kde.kformula" }, + { "kia", "application/vnd.kidspiration" }, + { "kml", "application/vnd.google-earth.kml+xml" }, + { "kmz", "application/vnd.google-earth.kmz" }, + { "kne", "application/vnd.kinar" }, + { "knp", "application/vnd.kinar" }, + { "kon", "application/vnd.kde.kontour" }, + { "kpr", "application/vnd.kde.kpresenter" }, + { "kpt", "application/vnd.kde.kpresenter" }, + { "kpxx", "application/vnd.ds-keypoint" }, + { "ksp", "application/vnd.kde.kspread" }, + { "ktr", "application/vnd.kahootz" }, + { "ktx", "image/ktx" }, + { "ktz", "application/vnd.kahootz" }, + { "kwd", "application/vnd.kde.kword" }, + { "kwt", "application/vnd.kde.kword" }, + { "lasxml", "application/vnd.las.las+xml" }, + { "latex", "application/x-latex" }, + { "lbd", "application/vnd.llamagraphics.life-balance.desktop" }, + { "lbe", "application/vnd.llamagraphics.life-balance.exchange+xml" }, + { "les", "application/vnd.hhe.lesson-player" }, + { "lha", "application/x-lzh-compressed" }, + { "link66", "application/vnd.route66.link66+xml" }, + { "list", "text/plain" }, + { "list3820", "application/vnd.ibm.modcap" }, + { "listafp", "application/vnd.ibm.modcap" }, + { "lnk", "application/x-ms-shortcut" }, + { "log", "text/plain" }, + { "lostxml", "application/lost+xml" }, + { "lrf", "application/octet-stream" }, + { "lrm", "application/vnd.ms-lrm" }, + { "ltf", "application/vnd.frogans.ltf" }, + { "lvp", "audio/vnd.lucent.voice" }, + { "lwp", "application/vnd.lotus-wordpro" }, + { "lzh", "application/x-lzh-compressed" }, + { "m13", "application/x-msmediaview" }, + { "m14", "application/x-msmediaview" }, + { "m1v", "video/mpeg" }, + { "m21", "application/mp21" }, + { "m2a", "audio/mpeg" }, + { "m2v", "video/mpeg" }, + { "m3a", "audio/mpeg" }, + { "m3u", "audio/x-mpegurl" }, + { "m3u8", "application/vnd.apple.mpegurl" }, + { "m4u", "video/vnd.mpegurl" }, + { "m4v", "video/x-m4v" }, + { "ma", "application/mathematica" }, + { "mads", "application/mads+xml" }, + { "mag", "application/vnd.ecowin.chart" }, + { "maker", "application/vnd.framemaker" }, + { "man", "text/troff" }, + { "mar", "application/octet-stream" }, + { "mathml", "application/mathml+xml" }, + { "mb", "application/mathematica" }, + { "mbk", "application/vnd.mobius.mbk" }, + { "mbox", "application/mbox" }, + { "mc1", "application/vnd.medcalcdata" }, + { "mcd", "application/vnd.mcd" }, + { "mcurl", "text/vnd.curl.mcurl" }, + { "mdb", "application/x-msaccess" }, + { "mdi", "image/vnd.ms-modi" }, + { "me", "text/troff" }, + { "mesh", "model/mesh" }, + { "meta4", "application/metalink4+xml" }, + { "metalink", "application/metalink+xml" }, + { "mets", "application/mets+xml" }, + { "mfm", "application/vnd.mfmp" }, + { "mft", "application/rpki-manifest" }, + { "mgp", "application/vnd.osgeo.mapguide.package" }, + { "mgz", "application/vnd.proteus.magazine" }, + { "mid", "audio/midi" }, + { "midi", "audio/midi" }, + { "mie", "application/x-mie" }, + { "mif", "application/vnd.mif" }, + { "mime", "message/rfc822" }, + { "mj2", "video/mj2" }, + { "mjp2", "video/mj2" }, + { "mk3d", "video/x-matroska" }, + { "mka", "audio/x-matroska" }, + { "mks", "video/x-matroska" }, + { "mkv", "video/x-matroska" }, + { "mlp", "application/vnd.dolby.mlp" }, + { "mmd", "application/vnd.chipnuts.karaoke-mmd" }, + { "mmf", "application/vnd.smaf" }, + { "mmr", "image/vnd.fujixerox.edmics-mmr" }, + { "mng", "video/x-mng" }, + { "mny", "application/x-msmoney" }, + { "mobi", "application/x-mobipocket-ebook" }, + { "mods", "application/mods+xml" }, + { "mov", "video/quicktime" }, + { "movie", "video/x-sgi-movie" }, + { "mp2", "audio/mpeg" }, + { "mp21", "application/mp21" }, + { "mp2a", "audio/mpeg" }, + { "mp3", "audio/mpeg" }, + { "mp4", "video/mp4" }, + { "mp4a", "audio/mp4" }, + { "mp4s", "application/mp4" }, + { "mp4v", "video/mp4" }, + { "mpc", "application/vnd.mophun.certificate" }, + { "mpe", "video/mpeg" }, + { "mpeg", "video/mpeg" }, + { "mpg", "video/mpeg" }, + { "mpg4", "video/mp4" }, + { "mpga", "audio/mpeg" }, + { "mpkg", "application/vnd.apple.installer+xml" }, + { "mpm", "application/vnd.blueice.multipass" }, + { "mpn", "application/vnd.mophun.application" }, + { "mpp", "application/vnd.ms-project" }, + { "mpt", "application/vnd.ms-project" }, + { "mpy", "application/vnd.ibm.minipay" }, + { "mqy", "application/vnd.mobius.mqy" }, + { "mrc", "application/marc" }, + { "mrcx", "application/marcxml+xml" }, + { "ms", "text/troff" }, + { "mscml", "application/mediaservercontrol+xml" }, + { "mseed", "application/vnd.fdsn.mseed" }, + { "mseq", "application/vnd.mseq" }, + { "msf", "application/vnd.epson.msf" }, + { "msh", "model/mesh" }, + { "msi", "application/x-msdownload" }, + { "msl", "application/vnd.mobius.msl" }, + { "msty", "application/vnd.muvee.style" }, + { "mts", "model/vnd.mts" }, + { "mus", "application/vnd.musician" }, + { "musicxml", "application/vnd.recordare.musicxml+xml" }, + { "mvb", "application/x-msmediaview" }, + { "mwf", "application/vnd.mfer" }, + { "mxf", "application/mxf" }, + { "mxl", "application/vnd.recordare.musicxml" }, + { "mxml", "application/xv+xml" }, + { "mxs", "application/vnd.triscape.mxs" }, + { "mxu", "video/vnd.mpegurl" }, + { "n3", "text/n3" }, + { "nb", "application/mathematica" }, + { "nbp", "application/vnd.wolfram.player" }, + { "nc", "application/x-netcdf" }, + { "ncx", "application/x-dtbncx+xml" }, + { "nfo", "text/x-nfo" }, + { "n-gage", "application/vnd.nokia.n-gage.symbian.install" }, + { "ngdat", "application/vnd.nokia.n-gage.data" }, + { "nitf", "application/vnd.nitf" }, + { "nlu", "application/vnd.neurolanguage.nlu" }, + { "nml", "application/vnd.enliven" }, + { "nnd", "application/vnd.noblenet-directory" }, + { "nns", "application/vnd.noblenet-sealer" }, + { "nnw", "application/vnd.noblenet-web" }, + { "npx", "image/vnd.net-fpx" }, + { "nsc", "application/x-conference" }, + { "nsf", "application/vnd.lotus-notes" }, + { "ntf", "application/vnd.nitf" }, + { "nzb", "application/x-nzb" }, + { "oa2", "application/vnd.fujitsu.oasys2" }, + { "oa3", "application/vnd.fujitsu.oasys3" }, + { "oas", "application/vnd.fujitsu.oasys" }, + { "obd", "application/x-msbinder" }, + { "obj", "application/x-tgif" }, + { "oda", "application/oda" }, + { "odb", "application/vnd.oasis.opendocument.database" }, + { "odc", "application/vnd.oasis.opendocument.chart" }, + { "odf", "application/vnd.oasis.opendocument.formula" }, + { "odft", "application/vnd.oasis.opendocument.formula-template" }, + { "odg", "application/vnd.oasis.opendocument.graphics" }, + { "odi", "application/vnd.oasis.opendocument.image" }, + { "odm", "application/vnd.oasis.opendocument.text-master" }, + { "odp", "application/vnd.oasis.opendocument.presentation" }, + { "ods", "application/vnd.oasis.opendocument.spreadsheet" }, + { "odt", "application/vnd.oasis.opendocument.text" }, + { "oga", "audio/ogg" }, + { "ogg", "audio/ogg" }, + { "ogv", "video/ogg" }, + { "ogx", "application/ogg" }, + { "omdoc", "application/omdoc+xml" }, + { "onepkg", "application/onenote" }, + { "onetmp", "application/onenote" }, + { "onetoc", "application/onenote" }, + { "onetoc2", "application/onenote" }, + { "opf", "application/oebps-package+xml" }, + { "opml", "text/x-opml" }, + { "oprc", "application/vnd.palm" }, + { "org", "application/vnd.lotus-organizer" }, + { "osf", "application/vnd.yamaha.openscoreformat" }, + { "osfpvg", "application/vnd.yamaha.openscoreformat.osfpvg+xml" }, + { "otc", "application/vnd.oasis.opendocument.chart-template" }, + { "otf", "application/x-font-otf" }, + { "otg", "application/vnd.oasis.opendocument.graphics-template" }, + { "oth", "application/vnd.oasis.opendocument.text-web" }, + { "oti", "application/vnd.oasis.opendocument.image-template" }, + { "otp", "application/vnd.oasis.opendocument.presentation-template" }, + { "ots", "application/vnd.oasis.opendocument.spreadsheet-template" }, + { "ott", "application/vnd.oasis.opendocument.text-template" }, + { "oxps", "application/oxps" }, + { "oxt", "application/vnd.openofficeorg.extension" }, + { "p", "text/x-pascal" }, + { "p10", "application/pkcs10" }, + { "p12", "application/x-pkcs12" }, + { "p7b", "application/x-pkcs7-certificates" }, + { "p7c", "application/pkcs7-mime" }, + { "p7m", "application/pkcs7-mime" }, + { "p7r", "application/x-pkcs7-certreqresp" }, + { "p7s", "application/pkcs7-signature" }, + { "p8", "application/pkcs8" }, + { "pas", "text/x-pascal" }, + { "paw", "application/vnd.pawaafile" }, + { "pbd", "application/vnd.powerbuilder6" }, + { "pbm", "image/x-portable-bitmap" }, + { "pcap", "application/vnd.tcpdump.pcap" }, + { "pcf", "application/x-font-pcf" }, + { "pcl", "application/vnd.hp-pcl" }, + { "pclxl", "application/vnd.hp-pclxl" }, + { "pct", "image/x-pict" }, + { "pcurl", "application/vnd.curl.pcurl" }, + { "pcx", "image/x-pcx" }, + { "pdb", "application/vnd.palm" }, + { "pdf", "application/pdf" }, + { "pfa", "application/x-font-type1" }, + { "pfb", "application/x-font-type1" }, + { "pfm", "application/x-font-type1" }, + { "pfr", "application/font-tdpfr" }, + { "pfx", "application/x-pkcs12" }, + { "pgm", "image/x-portable-graymap" }, + { "pgn", "application/x-chess-pgn" }, + { "pgp", "application/pgp-encrypted" }, + { "pic", "image/x-pict" }, + { "pkg", "application/octet-stream" }, + { "pki", "application/pkixcmp" }, + { "pkipath", "application/pkix-pkipath" }, + { "plb", "application/vnd.3gpp.pic-bw-large" }, + { "plc", "application/vnd.mobius.plc" }, + { "plf", "application/vnd.pocketlearn" }, + { "pls", "application/pls+xml" }, + { "pml", "application/vnd.ctc-posml" }, + { "png", "image/png" }, + { "pnm", "image/x-portable-anymap" }, + { "portpkg", "application/vnd.macports.portpkg" }, + { "pot", "application/vnd.ms-powerpoint" }, + { "potm", "application/vnd.ms-powerpoint.template.macroenabled.12" }, + { "potx", "application/vnd.openxmlformats-officedocument.presentationml.template" }, + { "ppam", "application/vnd.ms-powerpoint.addin.macroenabled.12" }, + { "ppd", "application/vnd.cups-ppd" }, + { "ppm", "image/x-portable-pixmap" }, + { "pps", "application/vnd.ms-powerpoint" }, + { "ppsm", "application/vnd.ms-powerpoint.slideshow.macroenabled.12" }, + { "ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow" }, + { "ppt", "application/vnd.ms-powerpoint" }, + { "pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12" }, + { "pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation" }, + { "pqa", "application/vnd.palm" }, + { "prc", "application/x-mobipocket-ebook" }, + { "pre", "application/vnd.lotus-freelance" }, + { "prf", "application/pics-rules" }, + { "ps", "application/postscript" }, + { "psb", "application/vnd.3gpp.pic-bw-small" }, + { "psd", "image/vnd.adobe.photoshop" }, + { "psf", "application/x-font-linux-psf" }, + { "pskcxml", "application/pskc+xml" }, + { "ptid", "application/vnd.pvi.ptid1" }, + { "pub", "application/x-mspublisher" }, + { "pvb", "application/vnd.3gpp.pic-bw-var" }, + { "pwn", "application/vnd.3m.post-it-notes" }, + { "pya", "audio/vnd.ms-playready.media.pya" }, + { "pyv", "video/vnd.ms-playready.media.pyv" }, + { "qam", "application/vnd.epson.quickanime" }, + { "qbo", "application/vnd.intu.qbo" }, + { "qfx", "application/vnd.intu.qfx" }, + { "qps", "application/vnd.publishare-delta-tree" }, + { "qt", "video/quicktime" }, + { "qwd", "application/vnd.quark.quarkxpress" }, + { "qwt", "application/vnd.quark.quarkxpress" }, + { "qxb", "application/vnd.quark.quarkxpress" }, + { "qxd", "application/vnd.quark.quarkxpress" }, + { "qxl", "application/vnd.quark.quarkxpress" }, + { "qxt", "application/vnd.quark.quarkxpress" }, + { "ra", "audio/x-pn-realaudio" }, + { "ram", "audio/x-pn-realaudio" }, + { "rar", "application/x-rar-compressed" }, + { "ras", "image/x-cmu-raster" }, + { "rcprofile", "application/vnd.ipunplugged.rcprofile" }, + { "rdf", "application/rdf+xml" }, + { "rdz", "application/vnd.data-vision.rdz" }, + { "rep", "application/vnd.businessobjects" }, + { "res", "application/x-dtbresource+xml" }, + { "rgb", "image/x-rgb" }, + { "rif", "application/reginfo+xml" }, + { "rip", "audio/vnd.rip" }, + { "ris", "application/x-research-info-systems" }, + { "rl", "application/resource-lists+xml" }, + { "rlc", "image/vnd.fujixerox.edmics-rlc" }, + { "rld", "application/resource-lists-diff+xml" }, + { "rm", "application/vnd.rn-realmedia" }, + { "rmi", "audio/midi" }, + { "rmp", "audio/x-pn-realaudio-plugin" }, + { "rms", "application/vnd.jcp.javame.midlet-rms" }, + { "rmvb", "application/vnd.rn-realmedia-vbr" }, + { "rnc", "application/relax-ng-compact-syntax" }, + { "roa", "application/rpki-roa" }, + { "roff", "text/troff" }, + { "rp9", "application/vnd.cloanto.rp9" }, + { "rpss", "application/vnd.nokia.radio-presets" }, + { "rpst", "application/vnd.nokia.radio-preset" }, + { "rq", "application/sparql-query" }, + { "rs", "application/rls-services+xml" }, + { "rsd", "application/rsd+xml" }, + { "rss", "application/rss+xml" }, + { "rtf", "application/rtf" }, + { "rtx", "text/richtext" }, + { "s", "text/x-asm" }, + { "s3m", "audio/s3m" }, + { "saf", "application/vnd.yamaha.smaf-audio" }, + { "sbml", "application/sbml+xml" }, + { "sc", "application/vnd.ibm.secure-container" }, + { "scd", "application/x-msschedule" }, + { "scm", "application/vnd.lotus-screencam" }, + { "scq", "application/scvp-cv-request" }, + { "scs", "application/scvp-cv-response" }, + { "scurl", "text/vnd.curl.scurl" }, + { "sda", "application/vnd.stardivision.draw" }, + { "sdc", "application/vnd.stardivision.calc" }, + { "sdd", "application/vnd.stardivision.impress" }, + { "sdkd", "application/vnd.solent.sdkm+xml" }, + { "sdkm", "application/vnd.solent.sdkm+xml" }, + { "sdp", "application/sdp" }, + { "sdw", "application/vnd.stardivision.writer" }, + { "see", "application/vnd.seemail" }, + { "seed", "application/vnd.fdsn.seed" }, + { "sema", "application/vnd.sema" }, + { "semd", "application/vnd.semd" }, + { "semf", "application/vnd.semf" }, + { "ser", "application/java-serialized-object" }, + { "setpay", "application/set-payment-initiation" }, + { "setreg", "application/set-registration-initiation" }, + { "sfd-hdstx", "application/vnd.hydrostatix.sof-data" }, + { "sfs", "application/vnd.spotfire.sfs" }, + { "sfv", "text/x-sfv" }, + { "sgi", "image/sgi" }, + { "sgl", "application/vnd.stardivision.writer-global" }, + { "sgm", "text/sgml" }, + { "sgml", "text/sgml" }, + { "sh", "application/x-sh" }, + { "shar", "application/x-shar" }, + { "shf", "application/shf+xml" }, + { "sid", "image/x-mrsid-image" }, + { "sig", "application/pgp-signature" }, + { "sil", "audio/silk" }, + { "silo", "model/mesh" }, + { "sis", "application/vnd.symbian.install" }, + { "sisx", "application/vnd.symbian.install" }, + { "sit", "application/x-stuffit" }, + { "sitx", "application/x-stuffitx" }, + { "skd", "application/vnd.koan" }, + { "skm", "application/vnd.koan" }, + { "skp", "application/vnd.koan" }, + { "skt", "application/vnd.koan" }, + { "sldm", "application/vnd.ms-powerpoint.slide.macroenabled.12" }, + { "sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide" }, + { "slt", "application/vnd.epson.salt" }, + { "sm", "application/vnd.stepmania.stepchart" }, + { "smf", "application/vnd.stardivision.math" }, + { "smi", "application/smil+xml" }, + { "smil", "application/smil+xml" }, + { "smv", "video/x-smv" }, + { "smzip", "application/vnd.stepmania.package" }, + { "snd", "audio/basic" }, + { "snf", "application/x-font-snf" }, + { "so", "application/octet-stream" }, + { "spc", "application/x-pkcs7-certificates" }, + { "spf", "application/vnd.yamaha.smaf-phrase" }, + { "spl", "application/x-futuresplash" }, + { "spot", "text/vnd.in3d.spot" }, + { "spp", "application/scvp-vp-response" }, + { "spq", "application/scvp-vp-request" }, + { "spx", "audio/ogg" }, + { "sql", "application/x-sql" }, + { "src", "application/x-wais-source" }, + { "srt", "application/x-subrip" }, + { "sru", "application/sru+xml" }, + { "srx", "application/sparql-results+xml" }, + { "ssdl", "application/ssdl+xml" }, + { "sse", "application/vnd.kodak-descriptor" }, + { "ssf", "application/vnd.epson.ssf" }, + { "ssml", "application/ssml+xml" }, + { "st", "application/vnd.sailingtracker.track" }, + { "stc", "application/vnd.sun.xml.calc.template" }, + { "std", "application/vnd.sun.xml.draw.template" }, + { "stf", "application/vnd.wt.stf" }, + { "sti", "application/vnd.sun.xml.impress.template" }, + { "stk", "application/hyperstudio" }, + { "stl", "application/vnd.ms-pki.stl" }, + { "str", "application/vnd.pg.format" }, + { "stw", "application/vnd.sun.xml.writer.template" }, + { "sus", "application/vnd.sus-calendar" }, + { "susp", "application/vnd.sus-calendar" }, + { "sv4cpio", "application/x-sv4cpio" }, + { "sv4crc", "application/x-sv4crc" }, + { "svc", "application/vnd.dvb.service" }, + { "svd", "application/vnd.svd" }, + { "svg", "image/svg+xml" }, + { "svgz", "image/svg+xml" }, + { "swa", "application/x-director" }, + { "swf", "application/x-shockwave-flash" }, + { "swi", "application/vnd.aristanetworks.swi" }, + { "sxc", "application/vnd.sun.xml.calc" }, + { "sxd", "application/vnd.sun.xml.draw" }, + { "sxg", "application/vnd.sun.xml.writer.global" }, + { "sxi", "application/vnd.sun.xml.impress" }, + { "sxm", "application/vnd.sun.xml.math" }, + { "sxw", "application/vnd.sun.xml.writer" }, + { "t", "text/troff" }, + { "t3", "application/x-t3vm-image" }, + { "taglet", "application/vnd.mynfc" }, + { "tao", "application/vnd.tao.intent-module-archive" }, + { "tar", "application/x-tar" }, + { "tcap", "application/vnd.3gpp2.tcap" }, + { "tcl", "application/x-tcl" }, + { "teacher", "application/vnd.smart.teacher" }, + { "tei", "application/tei+xml" }, + { "teicorpus", "application/tei+xml" }, + { "tex", "application/x-tex" }, + { "texi", "application/x-texinfo" }, + { "texinfo", "application/x-texinfo" }, + { "text", "text/plain" }, + { "tfi", "application/thraud+xml" }, + { "tfm", "application/x-tex-tfm" }, + { "tga", "image/x-tga" }, + { "thmx", "application/vnd.ms-officetheme" }, + { "tif", "image/tiff" }, + { "tiff", "image/tiff" }, + { "tmo", "application/vnd.tmobile-livetv" }, + { "torrent", "application/x-bittorrent" }, + { "tpl", "application/vnd.groove-tool-template" }, + { "tpt", "application/vnd.trid.tpt" }, + { "tr", "text/troff" }, + { "tra", "application/vnd.trueapp" }, + { "trm", "application/x-msterminal" }, + { "tsd", "application/timestamped-data" }, + { "tsv", "text/tab-separated-values" }, + { "ttc", "application/x-font-ttf" }, + { "ttf", "application/x-font-ttf" }, + { "ttl", "text/turtle" }, + { "twd", "application/vnd.simtech-mindmapper" }, + { "twds", "application/vnd.simtech-mindmapper" }, + { "txd", "application/vnd.genomatix.tuxedo" }, + { "txf", "application/vnd.mobius.txf" }, + { "txt", "text/plain" }, + { "u32", "application/x-authorware-bin" }, + { "udeb", "application/x-debian-package" }, + { "ufd", "application/vnd.ufdl" }, + { "ufdl", "application/vnd.ufdl" }, + { "ulx", "application/x-glulx" }, + { "umj", "application/vnd.umajin" }, + { "unityweb", "application/vnd.unity" }, + { "uoml", "application/vnd.uoml+xml" }, + { "uri", "text/uri-list" }, + { "uris", "text/uri-list" }, + { "urls", "text/uri-list" }, + { "ustar", "application/x-ustar" }, + { "utz", "application/vnd.uiq.theme" }, + { "uu", "text/x-uuencode" }, + { "uva", "audio/vnd.dece.audio" }, + { "uvd", "application/vnd.dece.data" }, + { "uvf", "application/vnd.dece.data" }, + { "uvg", "image/vnd.dece.graphic" }, + { "uvh", "video/vnd.dece.hd" }, + { "uvi", "image/vnd.dece.graphic" }, + { "uvm", "video/vnd.dece.mobile" }, + { "uvp", "video/vnd.dece.pd" }, + { "uvs", "video/vnd.dece.sd" }, + { "uvt", "application/vnd.dece.ttml+xml" }, + { "uvu", "video/vnd.uvvu.mp4" }, + { "uvv", "video/vnd.dece.video" }, + { "uvva", "audio/vnd.dece.audio" }, + { "uvvd", "application/vnd.dece.data" }, + { "uvvf", "application/vnd.dece.data" }, + { "uvvg", "image/vnd.dece.graphic" }, + { "uvvh", "video/vnd.dece.hd" }, + { "uvvi", "image/vnd.dece.graphic" }, + { "uvvm", "video/vnd.dece.mobile" }, + { "uvvp", "video/vnd.dece.pd" }, + { "uvvs", "video/vnd.dece.sd" }, + { "uvvt", "application/vnd.dece.ttml+xml" }, + { "uvvu", "video/vnd.uvvu.mp4" }, + { "uvvv", "video/vnd.dece.video" }, + { "uvvx", "application/vnd.dece.unspecified" }, + { "uvvz", "application/vnd.dece.zip" }, + { "uvx", "application/vnd.dece.unspecified" }, + { "uvz", "application/vnd.dece.zip" }, + { "vcard", "text/vcard" }, + { "vcd", "application/x-cdlink" }, + { "vcf", "text/x-vcard" }, + { "vcg", "application/vnd.groove-vcard" }, + { "vcs", "text/x-vcalendar" }, + { "vcx", "application/vnd.vcx" }, + { "vis", "application/vnd.visionary" }, + { "viv", "video/vnd.vivo" }, + { "vob", "video/x-ms-vob" }, + { "vor", "application/vnd.stardivision.writer" }, + { "vox", "application/x-authorware-bin" }, + { "vrml", "model/vrml" }, + { "vsd", "application/vnd.visio" }, + { "vsf", "application/vnd.vsf" }, + { "vss", "application/vnd.visio" }, + { "vst", "application/vnd.visio" }, + { "vsw", "application/vnd.visio" }, + { "vtu", "model/vnd.vtu" }, + { "vxml", "application/voicexml+xml" }, + { "w3d", "application/x-director" }, + { "wad", "application/x-doom" }, + { "wav", "audio/x-wav" }, + { "wax", "audio/x-ms-wax" }, + { "wbmp", "image/vnd.wap.wbmp" }, + { "wbs", "application/vnd.criticaltools.wbs+xml" }, + { "wbxml", "application/vnd.wap.wbxml" }, + { "wcm", "application/vnd.ms-works" }, + { "wdb", "application/vnd.ms-works" }, + { "wdp", "image/vnd.ms-photo" }, + { "weba", "audio/webm" }, + { "webm", "video/webm" }, + { "webp", "image/webp" }, + { "wg", "application/vnd.pmi.widget" }, + { "wgt", "application/widget" }, + { "wks", "application/vnd.ms-works" }, + { "wm", "video/x-ms-wm" }, + { "wma", "audio/x-ms-wma" }, + { "wmd", "application/x-ms-wmd" }, + { "wmf", "application/x-msmetafile" }, + { "wml", "text/vnd.wap.wml" }, + { "wmlc", "application/vnd.wap.wmlc" }, + { "wmls", "text/vnd.wap.wmlscript" }, + { "wmlsc", "application/vnd.wap.wmlscriptc" }, + { "wmv", "video/x-ms-wmv" }, + { "wmx", "video/x-ms-wmx" }, + { "woff", "application/font-woff" }, + { "wpd", "application/vnd.wordperfect" }, + { "wpl", "application/vnd.ms-wpl" }, + { "wps", "application/vnd.ms-works" }, + { "wqd", "application/vnd.wqd" }, + { "wri", "application/x-mswrite" }, + { "wrl", "model/vrml" }, + { "wsdl", "application/wsdl+xml" }, + { "wspolicy", "application/wspolicy+xml" }, + { "wtb", "application/vnd.webturbo" }, + { "wvx", "video/x-ms-wvx" }, + { "x32", "application/x-authorware-bin" }, + { "x3d", "model/x3d+xml" }, + { "x3db", "model/x3d+binary" }, + { "x3dbz", "model/x3d+binary" }, + { "x3dv", "model/x3d+vrml" }, + { "x3dvz", "model/x3d+vrml" }, + { "x3dz", "model/x3d+xml" }, + { "xaml", "application/xaml+xml" }, + { "xap", "application/x-silverlight-app" }, + { "xar", "application/vnd.xara" }, + { "xbap", "application/x-ms-xbap" }, + { "xbd", "application/vnd.fujixerox.docuworks.binder" }, + { "xbm", "image/x-xbitmap" }, + { "xdf", "application/xcap-diff+xml" }, + { "xdm", "application/vnd.syncml.dm+xml" }, + { "xdp", "application/vnd.adobe.xdp+xml" }, + { "xdssc", "application/dssc+xml" }, + { "xdw", "application/vnd.fujixerox.docuworks" }, + { "xenc", "application/xenc+xml" }, + { "xer", "application/patch-ops-error+xml" }, + { "xfdf", "application/vnd.adobe.xfdf" }, + { "xfdl", "application/vnd.xfdl" }, + { "xht", "application/xhtml+xml" }, + { "xhtml", "application/xhtml+xml" }, + { "xhvml", "application/xv+xml" }, + { "xif", "image/vnd.xiff" }, + { "xla", "application/vnd.ms-excel" }, + { "xlam", "application/vnd.ms-excel.addin.macroenabled.12" }, + { "xlc", "application/vnd.ms-excel" }, + { "xlf", "application/x-xliff+xml" }, + { "xlm", "application/vnd.ms-excel" }, + { "xls", "application/vnd.ms-excel" }, + { "xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12" }, + { "xlsm", "application/vnd.ms-excel.sheet.macroenabled.12" }, + { "xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }, + { "xlt", "application/vnd.ms-excel" }, + { "xltm", "application/vnd.ms-excel.template.macroenabled.12" }, + { "xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template" }, + { "xlw", "application/vnd.ms-excel" }, + { "xm", "audio/xm" }, + { "xml", "application/xml" }, + { "xo", "application/vnd.olpc-sugar" }, + { "xop", "application/xop+xml" }, + { "xpi", "application/x-xpinstall" }, + { "xpl", "application/xproc+xml" }, + { "xpm", "image/x-xpixmap" }, + { "xpr", "application/vnd.is-xpr" }, + { "xps", "application/vnd.ms-xpsdocument" }, + { "xpw", "application/vnd.intercon.formnet" }, + { "xpx", "application/vnd.intercon.formnet" }, + { "xsl", "application/xml" }, + { "xslt", "application/xslt+xml" }, + { "xsm", "application/vnd.syncml+xml" }, + { "xspf", "application/xspf+xml" }, + { "xul", "application/vnd.mozilla.xul+xml" }, + { "xvm", "application/xv+xml" }, + { "xvml", "application/xv+xml" }, + { "xwd", "image/x-xwindowdump" }, + { "xyz", "chemical/x-xyz" }, + { "xz", "application/x-xz" }, + { "yang", "application/yang" }, + { "yin", "application/yin+xml" }, + { "z1", "application/x-zmachine" }, + { "z2", "application/x-zmachine" }, + { "z3", "application/x-zmachine" }, + { "z4", "application/x-zmachine" }, + { "z5", "application/x-zmachine" }, + { "z6", "application/x-zmachine" }, + { "z7", "application/x-zmachine" }, + { "z8", "application/x-zmachine" }, + { "zaz", "application/vnd.zzazz.deck+xml" }, + { "zip", "application/zip" }, + { "zir", "application/vnd.zul" }, + { "zirz", "application/vnd.zul" }, + { "zmm", "application/vnd.handheld-entertainment+xml" }, + }; + } + + /// + /// Gets the MIME-type for the given file name, + /// or if a mapping doesn't exist. + /// + /// The name of the file. + /// The MIME-type for the given file name. + public static string GetMimeType(string fileName) + { + var dotIndex = fileName.LastIndexOf('.'); + + if (dotIndex != -1 && fileName.Length > dotIndex + 1) + { + string result; + if (TypeMap.TryGetValue(fileName.Substring(dotIndex + 1), out result)) + { + return result; + } + } + + return FallbackMimeType; + } + } +} \ No newline at end of file diff --git a/src/SparkPost/Utilities/UrlUtility.cs b/src/SparkPost/Utilities/UrlUtility.cs new file mode 100644 index 00000000..8c384474 --- /dev/null +++ b/src/SparkPost/Utilities/UrlUtility.cs @@ -0,0 +1,20 @@ +#if NET45 +using System.Web; +#else +using System.Net; +#endif + +namespace SparkPost.Utilities +{ + public static class UrlUtility + { + public static string UrlEncode(string value) + { +#if NET45 + return HttpUtility.UrlEncode(value); +#else + return WebUtility.UrlEncode(value); +#endif + } + } +} diff --git a/src/SparkPost/ValueMappers/AnonymousValueMapper.cs b/src/SparkPost/ValueMappers/AnonymousValueMapper.cs index a89cf3ea..de8e6ac0 100644 --- a/src/SparkPost/ValueMappers/AnonymousValueMapper.cs +++ b/src/SparkPost/ValueMappers/AnonymousValueMapper.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Reflection; namespace SparkPost.ValueMappers { @@ -20,7 +21,7 @@ public bool CanMap(Type propertyType, object value) public object Map(Type propertyType, object value) { var newValue = new Dictionary(); - foreach (var property in value.GetType().GetProperties()) + foreach (var property in value.GetType().GetTypeInfo().GetProperties()) newValue[property.Name] = property.GetValue(value); return dataMapper.GetTheValue(newValue.GetType(), newValue); } diff --git a/src/SparkPost/ValueMappers/EnumValueMapper.cs b/src/SparkPost/ValueMappers/EnumValueMapper.cs index 072d757d..ab79b0bd 100644 --- a/src/SparkPost/ValueMappers/EnumValueMapper.cs +++ b/src/SparkPost/ValueMappers/EnumValueMapper.cs @@ -1,4 +1,5 @@ using System; +using System.Reflection; namespace SparkPost.ValueMappers { @@ -6,7 +7,7 @@ public class EnumValueMapper : IValueMapper { public bool CanMap(Type propertyType, object value) { - return propertyType.IsEnum; + return propertyType.GetTypeInfo().IsEnum; } public object Map(Type propertyType, object value) diff --git a/src/SparkPost/ValueMappers/MapASetOfItemsUsingToDictionary.cs b/src/SparkPost/ValueMappers/MapASetOfItemsUsingToDictionary.cs index daab9d03..1d90fefa 100644 --- a/src/SparkPost/ValueMappers/MapASetOfItemsUsingToDictionary.cs +++ b/src/SparkPost/ValueMappers/MapASetOfItemsUsingToDictionary.cs @@ -32,8 +32,12 @@ public object Map(Type propertyType, object value) var list = (value as IEnumerable).ToList(); if (list.Any()) +#if NET45 value = list.Select(x => converter.Invoke(dataMapper, BindingFlags.Default, null, new[] {x}, CultureInfo.CurrentCulture)).ToList(); +#else + value = list.Select(x => converter.Invoke(dataMapper, new[] { x })).ToList(); +#endif else value = null; diff --git a/src/SparkPost/ValueMappers/MapASingleItemUsingToDictionary.cs b/src/SparkPost/ValueMappers/MapASingleItemUsingToDictionary.cs index d5f0a5c1..58734cd1 100644 --- a/src/SparkPost/ValueMappers/MapASingleItemUsingToDictionary.cs +++ b/src/SparkPost/ValueMappers/MapASingleItemUsingToDictionary.cs @@ -25,8 +25,12 @@ public bool CanMap(Type propertyType, object value) public object Map(Type propertyType, object value) { +#if NET45 return converters[propertyType].Invoke(dataMapper, BindingFlags.Default, null, new[] {value}, CultureInfo.CurrentCulture); +#else + return converters[propertyType].Invoke(dataMapper, new[] { value }); +#endif } } } \ No newline at end of file From b8d71fe0aa41e1007f4bbbbcca20c14dfe2d4727 Mon Sep 17 00:00:00 2001 From: Aaron Sherber Date: Thu, 26 Jan 2017 09:49:16 -0500 Subject: [PATCH 2/9] Update travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c6dab165..efe257be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ before_install: - sudo apt-get install nunit-console before_script: - nuget restore src/SparkPost.sln + - dotnet restore src/SparkPost.NetStandard script: - xbuild /p:Configuration=Release src/SparkPost.sln - nunit-console /home/travis/build/darrencauthon/csharp-sparkpost/src/SparkPost.Tests/bin/Release/SparkPost.Tests.dll From 35f3c0eb2ceb12391ce26a4af19196ae6228a7ed Mon Sep 17 00:00:00 2001 From: Aaron Sherber Date: Thu, 26 Jan 2017 14:30:20 -0500 Subject: [PATCH 3/9] Updating with changes from @Gorniv in #136 --- .travis.yml | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index efe257be..14e9fc8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,23 @@ language: csharp -solution: src/SparkPost.sln -before_install: - - sudo apt-get install nunit-console -before_script: - - nuget restore src/SparkPost.sln - - dotnet restore src/SparkPost.NetStandard -script: - - xbuild /p:Configuration=Release src/SparkPost.sln - - nunit-console /home/travis/build/darrencauthon/csharp-sparkpost/src/SparkPost.Tests/bin/Release/SparkPost.Tests.dll + +matrix: + include: + - mono: none + dotnet: 1.0.0-preview2-1-003177 + env: DOTNETCORE=1 + dist: trusty + solution: src/SparkPost.Dotnet.sln + sudo: required + script: + - dotnet restore src/SparkPost.NetStandard + - dotnet build src/SparkPost.NetStandard + + - mono: latest + solution: src/SparkPost.sln + before_install: + - sudo apt-get install nunit-console + before_script: + - nuget restore src/SparkPost.sln + script: + - xbuild /p:Configuration=Release src/SparkPost.sln + - nunit-console src/SparkPost.Tests/bin/Release/SparkPost.Tests.dll From 50607be1bd13ba480b280a13a37926f508eece4f Mon Sep 17 00:00:00 2001 From: Aaron Sherber Date: Thu, 26 Jan 2017 14:41:06 -0500 Subject: [PATCH 4/9] Add new build configuration and adjust travis.yml --- .travis.yml | 2 +- .../SparkPost.Acceptance.csproj | 9 +++++++++ src/SparkPost.NetStandard/project.json | 16 +++++++++++----- src/SparkPost.Tests/SparkPost.Tests.csproj | 9 +++++++++ src/SparkPost.sln | 9 +++++++++ src/SparkPost/SparkPost.csproj | 11 +++++++++++ 6 files changed, 50 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14e9fc8d..fd71b76b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,5 +19,5 @@ matrix: before_script: - nuget restore src/SparkPost.sln script: - - xbuild /p:Configuration=Release src/SparkPost.sln + - xbuild /p:Configuration=ReleaseNet45 src/SparkPost.sln - nunit-console src/SparkPost.Tests/bin/Release/SparkPost.Tests.dll diff --git a/src/SparkPost.Acceptance/SparkPost.Acceptance.csproj b/src/SparkPost.Acceptance/SparkPost.Acceptance.csproj index 84bebd8e..f5dc5025 100644 --- a/src/SparkPost.Acceptance/SparkPost.Acceptance.csproj +++ b/src/SparkPost.Acceptance/SparkPost.Acceptance.csproj @@ -29,6 +29,15 @@ prompt 4 + + bin\ReleaseNet45\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll diff --git a/src/SparkPost.NetStandard/project.json b/src/SparkPost.NetStandard/project.json index ad0d8950..0aaa6b76 100644 --- a/src/SparkPost.NetStandard/project.json +++ b/src/SparkPost.NetStandard/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.12.0-*", "buildOptions": { "compile": { @@ -14,10 +14,16 @@ } }, "Release": { - "buildOptions": { - "define": [ "TRACE" ], - "optimize": true - } + "buildOptions": { + "define": [ "TRACE" ], + "optimize": true + } + }, + "ReleaseNet45": { + "buildOptions": { + "define": [ "TRACE" ], + "optimize": true + } } }, "frameworks": { diff --git a/src/SparkPost.Tests/SparkPost.Tests.csproj b/src/SparkPost.Tests/SparkPost.Tests.csproj index 5a2d99f7..9ef43c52 100644 --- a/src/SparkPost.Tests/SparkPost.Tests.csproj +++ b/src/SparkPost.Tests/SparkPost.Tests.csproj @@ -30,6 +30,15 @@ prompt 4 + + bin\ReleaseNet45\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ..\packages\AutoMoq.1.7.1.0\lib\net40\AutoMoq.dll diff --git a/src/SparkPost.sln b/src/SparkPost.sln index 3b45128a..56e1eed4 100644 --- a/src/SparkPost.sln +++ b/src/SparkPost.sln @@ -15,24 +15,33 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + ReleaseNet45|Any CPU = ReleaseNet45|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A5DDA3E3-7B3D-46C3-B4BB-C627FBA37812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A5DDA3E3-7B3D-46C3-B4BB-C627FBA37812}.Debug|Any CPU.Build.0 = Debug|Any CPU {A5DDA3E3-7B3D-46C3-B4BB-C627FBA37812}.Release|Any CPU.ActiveCfg = Release|Any CPU {A5DDA3E3-7B3D-46C3-B4BB-C627FBA37812}.Release|Any CPU.Build.0 = Release|Any CPU + {A5DDA3E3-7B3D-46C3-B4BB-C627FBA37812}.ReleaseNet45|Any CPU.ActiveCfg = ReleaseNet45|Any CPU + {A5DDA3E3-7B3D-46C3-B4BB-C627FBA37812}.ReleaseNet45|Any CPU.Build.0 = ReleaseNet45|Any CPU {52F2F4F4-3DE2-49C6-87D8-BD6F825B9372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52F2F4F4-3DE2-49C6-87D8-BD6F825B9372}.Debug|Any CPU.Build.0 = Debug|Any CPU {52F2F4F4-3DE2-49C6-87D8-BD6F825B9372}.Release|Any CPU.ActiveCfg = Release|Any CPU {52F2F4F4-3DE2-49C6-87D8-BD6F825B9372}.Release|Any CPU.Build.0 = Release|Any CPU + {52F2F4F4-3DE2-49C6-87D8-BD6F825B9372}.ReleaseNet45|Any CPU.ActiveCfg = ReleaseNet45|Any CPU + {52F2F4F4-3DE2-49C6-87D8-BD6F825B9372}.ReleaseNet45|Any CPU.Build.0 = ReleaseNet45|Any CPU {8F62193B-1C44-4E92-96C7-8EBD610F7669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8F62193B-1C44-4E92-96C7-8EBD610F7669}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F62193B-1C44-4E92-96C7-8EBD610F7669}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F62193B-1C44-4E92-96C7-8EBD610F7669}.Release|Any CPU.Build.0 = Release|Any CPU + {8F62193B-1C44-4E92-96C7-8EBD610F7669}.ReleaseNet45|Any CPU.ActiveCfg = ReleaseNet45|Any CPU + {8F62193B-1C44-4E92-96C7-8EBD610F7669}.ReleaseNet45|Any CPU.Build.0 = ReleaseNet45|Any CPU {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Release|Any CPU.ActiveCfg = Release|Any CPU {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Release|Any CPU.Build.0 = Release|Any CPU + {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.ReleaseNet45|Any CPU.ActiveCfg = ReleaseNet45|Any CPU + {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.ReleaseNet45|Any CPU.Build.0 = ReleaseNet45|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/SparkPost/SparkPost.csproj b/src/SparkPost/SparkPost.csproj index 30145c39..b6839c7a 100644 --- a/src/SparkPost/SparkPost.csproj +++ b/src/SparkPost/SparkPost.csproj @@ -34,6 +34,17 @@ bin\Release\SparkPost.xml 1591 + + bin\ReleaseNet45\ + TRACE + bin\Release\SparkPost.xml + true + 1591 + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll From e6cca7256bbc9d940f3d52efaf4fb708e89fa6d5 Mon Sep 17 00:00:00 2001 From: Aaron Sherber Date: Thu, 26 Jan 2017 14:47:14 -0500 Subject: [PATCH 5/9] Set .NET Standard to not build in this configuration --- src/SparkPost.sln | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SparkPost.sln b/src/SparkPost.sln index 56e1eed4..f6d7138c 100644 --- a/src/SparkPost.sln +++ b/src/SparkPost.sln @@ -41,7 +41,6 @@ Global {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Release|Any CPU.ActiveCfg = Release|Any CPU {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.Release|Any CPU.Build.0 = Release|Any CPU {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.ReleaseNet45|Any CPU.ActiveCfg = ReleaseNet45|Any CPU - {9B252BA6-3D9F-4303-8003-9A3A73A70D63}.ReleaseNet45|Any CPU.Build.0 = ReleaseNet45|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 3006843d02caee5f2511fe825b09c2d18243c242 Mon Sep 17 00:00:00 2001 From: Aaron Sherber Date: Thu, 26 Jan 2017 15:49:28 -0500 Subject: [PATCH 6/9] Reverse all conditionals, for easier maintenance --- src/SparkPost.Acceptance/SparkPost.Acceptance.csproj | 3 +++ src/SparkPost/DataMapper.cs | 6 +++--- src/SparkPost/SparkPost.csproj | 2 +- src/SparkPost/Transmission.cs | 4 ++-- src/SparkPost/Utilities/MailMessageMapping.cs | 2 +- src/SparkPost/Utilities/UrlUtility.cs | 12 ++++++------ .../ValueMappers/MapASetOfItemsUsingToDictionary.cs | 6 +++--- .../ValueMappers/MapASingleItemUsingToDictionary.cs | 6 +++--- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/SparkPost.Acceptance/SparkPost.Acceptance.csproj b/src/SparkPost.Acceptance/SparkPost.Acceptance.csproj index f5dc5025..1e104e33 100644 --- a/src/SparkPost.Acceptance/SparkPost.Acceptance.csproj +++ b/src/SparkPost.Acceptance/SparkPost.Acceptance.csproj @@ -130,6 +130,9 @@ Always + + +