Skip to content

Commit

Permalink
Merge pull request #43 from SeanFeldman/unnecessary-custom-preprocess…
Browse files Browse the repository at this point in the history
…or-define

Custom preprocessor define NESTANDARD is not needed.
  • Loading branch information
serkantkaraca committed Oct 28, 2016
2 parents 7126c7f + d9e6e7c commit 89104cc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion src/Microsoft.Azure.EventHubs/Primitives/ClientInfo.cs
Expand Up @@ -23,7 +23,7 @@ static ClientInfo()
product = GetAssemblyAttributeValue<AssemblyProductAttribute>(assembly, p => p.Product);
version = GetAssemblyAttributeValue<AssemblyFileVersionAttribute>(assembly, v => v.Version);
framework = GetAssemblyAttributeValue<TargetFrameworkAttribute>(assembly, f => f.FrameworkName);
#if NETSTANDARD
#if NETSTANDARD1_3
platform = System.Runtime.InteropServices.RuntimeInformation.OSDescription;
#else
platform = Environment.OSVersion.VersionString;
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.Azure.EventHubs/project.json
Expand Up @@ -29,9 +29,6 @@
},
"netstandard1.3": {
"imports": "dnxcore50",
"buildOptions": {
"define": [ "NETSTANDARD" ]
},
"dependencies": {
"NETStandard.Library": "1.6.0",
"System.Reflection": "4.1.0",
Expand Down

0 comments on commit 89104cc

Please sign in to comment.