Merge branch 'develop' into master

Author: cijothomas

.vsts/linux-build.yml

@@ -1,6 +1,6 @@
-queue:
-  name: Hosted Linux
-steps:  
+pool:
+  vmImage: 'ubuntu-16.04'
+steps:
 
 - task: DotNetCoreInstaller@0
   displayName: install dotnet core 2.1.500
@@ -31,17 +31,17 @@ steps:
 - task: DotNetCoreInstaller@0
   displayName: install dotnet core 1.1.5
   inputs:
-    version: "1.1.5"  
-    
+    version: "1.1.5"
+
 - task: DotNetCoreCLI@1
   displayName: Test 1.1.5
   continueOnError: true
   inputs:
     command: "test"
     projects: "test/**/*Tests.csproj"
     arguments: "--configuration Release -l trx --filter Category!=WindowsOnly"
-    
-    
+
+
 - task: PublishTestResults@2
   inputs:
     testRunner: "VSTest"
@@ -55,9 +55,9 @@ steps:
 - task: DotNetCoreCLI@1
   displayName: Package Nuget
   inputs:
-    command: "pack" 
+    command: "pack"
     projects: "src/**/**.csproj"
-    arguments: "--configuration Release --include-symbols --output $(build.artifactstagingdirectory)"    
+    arguments: "--configuration Release --include-symbols --output $(build.artifactstagingdirectory)"
 
 - task: PublishBuildArtifacts@1
   inputs:

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 2.7.0-beta1
+- Added NetStandard2.0 target.
+
 ## Version 2.6.0
 - Updated Web/Base SDK version dependency to 2.9.0
 - [Fix: TypeInitializationException when Microsoft.AspNetCore.Hosting and Microsoft.AspNetCore.Hosting.Abstractions versions do not match](https://github.com/Microsoft/ApplicationInsights-aspnetcore/pull/821)

src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj

@@ -9,8 +9,8 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/Microsoft/ApplicationInsights-aspnetcore.git</RepositoryUrl>
 
-    <TargetFrameworks>net451;net46;netstandard1.6</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net451;net46;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.6;netstandard2.0</TargetFrameworks>
 
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>	
 	  <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\src\$(MSBuildProjectName)</OutputPath>
@@ -94,13 +94,21 @@
     <PackageReference Include="System.Text.Encodings.Web" Version="4.3.1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
+  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
+  <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.0.0" />
+  <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
+  <PackageReference Include="System.Text.Encodings.Web" Version="4.3.1" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net46' ">
     <PackageReference Include="System.Net.Http" Version="4.3.2" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' OR '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
   </ItemGroup>
 

src/Microsoft.ApplicationInsights.AspNetCore/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializer.cs

@@ -34,7 +34,7 @@ private string GetMachineName()
             string hostName = Dns.GetHostName();
 
             // Issue #61: For dnxcore machine name does not have domain name like in full framework 
-#if !NETSTANDARD1_6
+#if NET451 || NET46
             string domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName;
             if (!hostName.EndsWith(domainName, StringComparison.OrdinalIgnoreCase))
             {

test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj

@@ -44,6 +44,17 @@
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />

test/Microsoft.ApplicationInsights.AspNetCore.Tests/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializerTests.cs

@@ -24,7 +24,7 @@ public void RoleInstanceNameIsSetToDomainAndHost()
 
             string hostName = Dns.GetHostName();
 
-#if NET451 || NET46
+#if NET46
             string domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName;
             if (hostName.EndsWith(domainName, StringComparison.OrdinalIgnoreCase) == false)
             {