From ca9d1241643067a8e95a0b8ca3a7fc4c28f4add7 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Mon, 13 Nov 2017 14:47:52 -0800 Subject: [PATCH 01/13] Enable ServiceBus Diagnostic source --- .../Extensions/ApplicationInsightsExtensions.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs b/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs index 764ececa..cd4ea2fe 100644 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs @@ -150,6 +150,9 @@ public static IServiceCollection AddApplicationInsightsTelemetry(this IServiceCo excludedDomains.Add("localhost"); excludedDomains.Add("127.0.0.1"); + var includedActivities = module.IncludeDiagnosticSourceActivities; + includedActivities.Add("Microsoft.Azure.ServiceBus"); + return module; }); From afee967e774b52e23ccdbaec9ce59fe2342ba1a4 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 15 Nov 2017 14:19:21 -0800 Subject: [PATCH 02/13] GH items added. --- .github/ISSUE_TEMPLATE.md | 18 +++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 13 +++++++++ Readme.md | 45 +++++++++----------------------- 3 files changed, 43 insertions(+), 33 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..36d317e0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,18 @@ +If you are reporting bug/issue, please provide detailed Repro instructions. + +## Repro Steps +1. +2. + +## Actual Behavior + + +## Expected Behavior + + +## Version Info +SDK Version : +.NET Version : +How Application was onboarded with SDK(VisualStudio/StatusMonitor/Azure Extension) : +OS : +Hosting Info (IIS/Azure WebApps/ etc) : \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..3d170516 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,13 @@ +Fix issue # . + +Short description of the fix: + +- [ ] I ran all tests locally. [Following contributer's guide] (https://github.com/Microsoft/ApplicationInsights-aspnetcore/blob/develop/Readme.md) +- [ ] CHANGELOG.md updated or do not need to be updated + - If not tell why: + + +For significant contributions please make sure you have completed the following items: + +- [ ] Changes in public surface reviewed +- [ ] The PR will trigger build, unit test, and functional tests automatically. If your PR submitted from fork - mention one of committers to initiate the build for you. diff --git a/Readme.md b/Readme.md index fbd0b4da..1e56a9d4 100644 --- a/Readme.md +++ b/Readme.md @@ -3,16 +3,12 @@ Microsoft Application Insights for ASP.NET Core applications This repository has a code for [Application Insights monitoring](http://azure.microsoft.com/en-us/services/application-insights/) of [ASP.NET Core](https://github.com/aspnet/home) applications. Read about contribution policies on Application Insights Home [repository](https://github.com/microsoft/ApplicationInsights-home) -Recent updates --------------- -**Microsoft.ApplicationInsights.AspNet** was renamed to **Microsoft.ApplicationInsights.AspNetCore**. We have updated the SDK to use the stable 1.0.0 release of the .NET Core CLI runtime environment. Please note that this version is not compatible with RC1 bits of DNX environment. Furthermore, metrics stream is enabled by default in .NET Framework of ASP.NET Core. - Getting Started --------------- [Application Insights monitoring](http://azure.microsoft.com/en-us/services/application-insights/) is a service that allows you to collect monitoring and diagnostics information about your application. The [getting started](https://github.com/Microsoft/ApplicationInsights-aspnet5/wiki/Getting-Started) guide shows how you can onboard your ASP.NET Core web application to use the Application Insights SDK. -Application Insights collects a lot of information out-of-the-box such as requests, exceptions, and usage. It also allows you to configure additional data collection. The [configure](https://github.com/Microsoft/ApplicationInsights-aspnet5/wiki/Configure) guide demonstrates the most common tasks you may want to do. +Application Insights collects a lot of information out-of-the-box such as requests, dependencies, exceptions, and usage. It also allows you to configure additional data collection. The [configure](https://github.com/Microsoft/ApplicationInsights-aspnet5/wiki/Configure) guide demonstrates the most common tasks you may want to do. Repository structure @@ -27,54 +23,38 @@ root\ test\ ApplicationInsights.AspNetCore.Tests - Unit tests - FunctionalTestUtils - test utilities for functional tests - MVCFramework45.FunctionalTests - functional tests for MVC application - WebApiShimFw46.FunctionalTests - functional tests for Web API application + FunctionalTestUtils - Test utilities for functional tests + MVCFramework.FunctionalTests - functional tests for MVC application targetting NetCore1.1,NetCore2.0 and NET45 + WebApi.FunctionalTests - functional tests for Web API application targetting NetCore1.1,NetCore2.0 and NET45 + EmptyApp.FunctionalTests - functional tests for an Empty application targetting NetCore1.1,NetCore2.0 and NET45 PerfTest - performance test ``` Developing ---------- - -**Note: The current version (Microsoft.ApplicationInsights.AspNetCore: 1.0.0) is no longer compatible with DNX runtime and ASP.NET 5 RC1 bits. Please visit [Migration to ASP.NET Core](https://docs.asp.net/en/latest/migration/index.html) to upgrade the application to ASP.NET Core 1.0.0.** - -## Pre-requisites -- [Visual Studio 2015 Update 3](https://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs.aspx). -- [Visual Studio 2015 CLI Tools](https://go.microsoft.com/fwlink/?LinkId=817245). -- [.NET Core CLI](https://www.microsoft.com/net/download). -- [Node.js](https://nodejs.org/download). -- [Git](http://git-scm.com/download). -- Source Code. +To successfully build the sources on your machine, make sure you've installed the following prerequisites: +* Visual Studio 2017 Community or Enterprise. Please make sure to install all the latest updates to Visual Studio +* .NET 4.6 +* .NET Core 2.0 ``` git clone https://github.com/Microsoft/ApplicationInsights-aspnetcore.git ``` ## Building -From Visual Studio 2015 +From Visual Studio 2017 ``` devenv ApplicationInsights.AspNetCore.sln ``` -From Visual Studio 2015 Developer Command Prompt: Navigate to the source project folder and use the following commands to build the project: +From Visual Studio 2017 Developer Command Prompt: Navigate to the source project folder and use the following commands to build the project: ``` -dotnet restore &REM Restores the dependency packages dotnet build &REM Builds the project ``` - If you get NPM package restore errors, make sure Node and NPM are added to PATH. - If you get Bower package restore errors, make sure Git is added to PATH. - If you get dotnet package restore errors, make sure [.NET Core CLI is installed](https://github.com/dotnet/cli/blob/rel/1.0.0/Documentation/cli-installation-scenarios.md) and the nuget feeds are up to date. -- In case of **.NET Core** applications, if you run into restore errors with respect to application insights dependency, please add ```"dnxcore50"``` and ```"portable-net45+win8" ``` to the imports list (if it does not exist), under ```frameworks``` section of ```project.json```, as described below. Please visit [Migrating from DNX](http://dotnet.github.io/docs/core-concepts/dnx-migration.html) for more details. -``` json -{ - "frameworks": { - "netcoreapp1.0": { - "imports": ["dnxcore50", "portable-net45+win8"] - } - } -} -``` ## Branches - We follow the [Git Flow](http://nvie.com/posts/a-successful-git-branching-model) model. @@ -96,8 +76,7 @@ Functional tests are regular web applications with unit tests integrated into th The following are modifications made to a regular web application to make it work this way: -Add dependencies to project.json: - +Add dependencies to .csproj: ``` "FunctionalTestUtils": "1.0.0-*", From db64927aec74b5ec9bb88e8a2250f3bb8d60f8ba Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Thu, 16 Nov 2017 15:32:58 -0800 Subject: [PATCH 03/13] minor wording change --- .github/PULL_REQUEST_TEMPLATE.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3d170516..d405c283 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,11 +3,10 @@ Fix issue # . Short description of the fix: - [ ] I ran all tests locally. [Following contributer's guide] (https://github.com/Microsoft/ApplicationInsights-aspnetcore/blob/develop/Readme.md) -- [ ] CHANGELOG.md updated or do not need to be updated - - If not tell why: +- [ ] CHANGELOG.md updated with one line description of the fix, and a link to the original issue. For significant contributions please make sure you have completed the following items: - [ ] Changes in public surface reviewed -- [ ] The PR will trigger build, unit test, and functional tests automatically. If your PR submitted from fork - mention one of committers to initiate the build for you. +- [ ] The PR will trigger build, unit test, and functional tests automatically. If your PR was submitted from a fork - mention one of committers to initiate the build for you. From cb7b5374fca35813bceae2185cf8376deb8a9f01 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Tue, 21 Nov 2017 13:28:12 -0800 Subject: [PATCH 04/13] Added intermediateoutput path to all projects without which 2.0 CLI had issues building. Also aded scripts to run builds and tests. --- Readme.md | 52 ++++--------------- RunTests.cmd | 12 +++++ build.cmd | 15 ------ buildDebug.cmd | 12 +++++ buildRelease.cmd | 12 +++++ findMsBuild.cmd | 27 ++++++++++ ...soft.ApplicationInsights.AspNetCore.csproj | 2 + .../ApplicationInsightsTypes.csproj | 5 +- .../EmptyApp.FunctionalTests.csproj | 1 + .../EmptyApp20.FunctionalTests.csproj | 1 + .../FunctionalTestUtils.csproj | 1 + .../FunctionalTestUtils20.csproj | 1 + .../MVCFramework.FunctionalTests.csproj | 1 + .../MVCFramework20.FunctionalTests.csproj | 1 + ...pplicationInsights.AspNetCore.Tests.csproj | 1 + .../WebApi.FunctionalTests.csproj | 1 + .../WebApi20.FunctionalTests.csproj | 1 + 17 files changed, 88 insertions(+), 58 deletions(-) create mode 100644 RunTests.cmd delete mode 100644 build.cmd create mode 100644 buildDebug.cmd create mode 100644 buildRelease.cmd create mode 100644 findMsBuild.cmd diff --git a/Readme.md b/Readme.md index 1e56a9d4..f2ba4df6 100644 --- a/Readme.md +++ b/Readme.md @@ -37,35 +37,22 @@ To successfully build the sources on your machine, make sure you've installed th * .NET 4.6 * .NET Core 2.0 -``` -git clone https://github.com/Microsoft/ApplicationInsights-aspnetcore.git -``` - ## Building -From Visual Studio 2017 -``` -devenv ApplicationInsights.AspNetCore.sln -``` +Once you've installed the prerequisites execute ```buildDebug.cmd``` or ```buildRelease.cmd``` script in the repository root to build the project locally. +You can also open the solution in Visual Studio and build the ApplicationInsights.AspNetCore.sln solution directly. -From Visual Studio 2017 Developer Command Prompt: Navigate to the source project folder and use the following commands to build the project: +## Testing/Debugging +Execute the ```runAllTests.cmd``` script in the repository root. -``` -dotnet build &REM Builds the project -``` -- If you get NPM package restore errors, make sure Node and NPM are added to PATH. -- If you get Bower package restore errors, make sure Git is added to PATH. -- If you get dotnet package restore errors, make sure [.NET Core CLI is installed](https://github.com/dotnet/cli/blob/rel/1.0.0/Documentation/cli-installation-scenarios.md) and the nuget feeds are up to date. +You can also open the solution in Visual Studio and run tests directly from Visual Studio Test Explorer. However, as the tests has multiple targets, Test Explorer only shows the first target +from in .csproj. To debug/run tests from a particular TargetFramework with Visual Studio, only option is to re-arrange the +such that the intented target comes first. This is a Visual Studio limitation and is likely removed in the future. -## Branches -- We follow the [Git Flow](http://nvie.com/posts/a-successful-git-branching-model) model. -- [master](https://github.com/Microsoft/ApplicationInsights-aspnetcore/tree/master) has the _latest_ version released on [NuGet.org](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore). -- [develop](https://github.com/Microsoft/ApplicationInsights-aspnetcore/tree/develop) has the code for the _next_ release. Running and writing tests ------------------------- There are two sets of tests unit tests and functional tests. Please use unit tests for all features testing. The purpose of functional tests is just end-to-end validation of functionality on sample applications. - *Functional tests* Functional tests are regular web applications with unit tests integrated into them. Application can be compiled as a regular web application as well as set of tests. Typical functional tests will do the following: @@ -96,27 +83,10 @@ Add this initialization logic to Startup.cs: services.AddFunctionalTestTelemetryChannel(); ``` -*Running Tests* -You can run unit tests using Visual Studio. - -You can run unit tests using .NET CLI from command line. The prerequisite to this is that you should make sure you have the latest version of .NET CLI. You can check the available runtime using the following command: -``` -dotnet --version -``` - -If you are seeing that ```dotnet``` is not available (or defined), install .NET CLI: [.NET Core + CLI tools (SDK)](https://github.com/dotnet/cli). - -After that you can open a developer command prompt, navigate to each test folder and run: -``` -dotnet restore &REM Restores the dependency packages -dotnet build &REM Builds the test project -dotnet test &REM Runs the tests within the test project -``` - -You can also run all tests using the following Powershell from root directory. -``` -powershell .\RunTestsCore.ps1 -``` +## Branches +- We follow the [Git Flow](http://nvie.com/posts/a-successful-git-branching-model) model. +- [master](https://github.com/Microsoft/ApplicationInsights-aspnetcore/tree/master) has the _latest_ version released on [NuGet.org](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore). +- [develop](https://github.com/Microsoft/ApplicationInsights-aspnetcore/tree/develop) has the code for the _next_ release. This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. diff --git a/RunTests.cmd b/RunTests.cmd new file mode 100644 index 00000000..849c7aad --- /dev/null +++ b/RunTests.cmd @@ -0,0 +1,12 @@ +@echo off + +IF NOT DEFINED MSBUILD CALL findMsBuild.cmd + +SET ToolsVersion=15.0 +SET ProjectName=Msbuild.All +SET Configuration=Debug +SET Platform="Any CPU" + +"%MSBUILD%" dirs.proj /nologo /m:1 /fl /toolsversion:%ToolsVersion% /flp:logfile=%ProjectName%.%Platform%.log;v=d /flp1:logfile=%ProjectName%.%Platform%.wrn;warningsonly /flp2:logfile=%ProjectName%.%Platform%.err;errorsonly /p:Configuration=%Configuration% /p:Platform=%Platform% /p:RunCodeAnalysis="False" /flp3:logfile=%ProjectName%.%Platform%.prf;performancesummary /flp4:logfile=%ProjectName%.%Platform%.exec.log;showcommandline /p:BuildSingleFilePackage=true /p:IsOfficialBuild=%IsOfficialBuild% /p:RunTests=True + +pause \ No newline at end of file diff --git a/build.cmd b/build.cmd deleted file mode 100644 index ed15ebcf..00000000 --- a/build.cmd +++ /dev/null @@ -1,15 +0,0 @@ -@echo off - -call "%VS140COMNTOOLS%\VsDevCmd.bat" -SET ProjectName=Msbuild.All -REM Set the configuration to either release or debug based on the requirement. Accepts this as a parameter to build.cmd. By default it is chosen to be Release. -SET Configuration=Release -if NOT "%1"=="" (SET Configuration=%1) -SET Platform=Any CPU -SET NugetOrg_Feed=https://www.nuget.org/api/v2/ -SET IsOfficialBuild=False -SET DefaultFeed=https://www.nuget.org/api/v2/ - -msbuild dirs.proj /nologo /m:1 /fl /flp:logfile="%ProjectName%.%Platform%.log";v=d /flp1:logfile="%ProjectName%.%Platform%.wrn";warningsonly /flp2:logfile="%ProjectName%.%Platform%.err";errorsonly /p:Configuration=%Configuration% /p:Platform="%Platform%" /p:RunCodeAnalysis="False" /flp3:logfile="%ProjectName%.%Platform%.prf";performancesummary /flp4:logfile="%ProjectName%.%Platform%.exec.log";showcommandline /p:BuildSingleFilePackage=true /p:IsOfficialBuild=%IsOfficialBuild% /p:RunTests=True - -pause \ No newline at end of file diff --git a/buildDebug.cmd b/buildDebug.cmd new file mode 100644 index 00000000..8af93bd6 --- /dev/null +++ b/buildDebug.cmd @@ -0,0 +1,12 @@ +@echo off + +IF NOT DEFINED MSBUILD CALL findMsBuild.cmd + +SET ToolsVersion=15.0 +SET ProjectName=Msbuild.All +SET Configuration=Debug +SET Platform="Any CPU" + +"%MSBUILD%" dirs.proj /nologo /m:1 /fl /toolsversion:%ToolsVersion% /flp:logfile=%ProjectName%.%Platform%.log;v=d /flp1:logfile=%ProjectName%.%Platform%.wrn;warningsonly /flp2:logfile=%ProjectName%.%Platform%.err;errorsonly /p:Configuration=%Configuration% /p:Platform=%Platform% /p:RunCodeAnalysis="False" /flp3:logfile=%ProjectName%.%Platform%.prf;performancesummary /flp4:logfile=%ProjectName%.%Platform%.exec.log;showcommandline /p:BuildSingleFilePackage=true /p:IsOfficialBuild=%IsOfficialBuild% /p:RunTests=False + +pause \ No newline at end of file diff --git a/buildRelease.cmd b/buildRelease.cmd new file mode 100644 index 00000000..a67d3c50 --- /dev/null +++ b/buildRelease.cmd @@ -0,0 +1,12 @@ +@echo off + +IF NOT DEFINED MSBUILD CALL findMsBuild.cmd + +SET ToolsVersion=15.0 +SET ProjectName=Msbuild.All +SET Configuration=Release +SET Platform="Any CPU" + +"%MSBUILD%" dirs.proj /nologo /m:1 /fl /toolsversion:%ToolsVersion% /flp:logfile=%ProjectName%.%Platform%.log;v=d /flp1:logfile=%ProjectName%.%Platform%.wrn;warningsonly /flp2:logfile=%ProjectName%.%Platform%.err;errorsonly /p:Configuration=%Configuration% /p:Platform=%Platform% /p:RunCodeAnalysis="False" /flp3:logfile=%ProjectName%.%Platform%.prf;performancesummary /flp4:logfile=%ProjectName%.%Platform%.exec.log;showcommandline /p:BuildSingleFilePackage=true /p:IsOfficialBuild=%IsOfficialBuild% /p:RunTests=False + +pause \ No newline at end of file diff --git a/findMsBuild.cmd b/findMsBuild.cmd new file mode 100644 index 00000000..c1286804 --- /dev/null +++ b/findMsBuild.cmd @@ -0,0 +1,27 @@ +@echo off + +IF NOT DEFINED VSVERSION SET VSVERSION=15.0 + +IF DEFINED MSBUILD ( + IF EXIST "%MSBUILD%" GOTO :eof +) + +SET VSWHERE=..\packages\vswhere\tools\vswhere.exe +IF NOT EXIST "%VSWHERE%" nuget.exe install vswhere -NonInteractive -ExcludeVersion -Source https://www.nuget.org/api/v2 > nul + +FOR /f "usebackq tokens=*" %%i in (`"%VSWHERE%" -version %VSVERSION% -products * -requires Microsoft.Component.MSBuild -property installationPath`) DO ( + SET MSBUILD=%%i\MSBuild\%VSVERSION%\Bin\MSBuild.exe +) + +IF NOT DEFINED MSBUILD ( + ECHO Could not find MSBuild %VSVERSION%. Please SET MSBUILD=^ and try again. + GOTO :eof +) + +IF NOT EXIST "%MSBUILD%" ( + ECHO vswhere.exe claims that MSBuild is at !MSBUILD! but it does not exist. + ECHO Please SET MSBUILD=^ and try again. + GOTO :eof +) + +ECHO Using MSBuild from %MSBUILD% diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index b6e41140..71fd05a3 100644 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -23,6 +23,8 @@ https://github.com/Microsoft/ApplicationInsights-aspnetcore.git 1.6.1 ..\..\artifacts\src\$(MSBuildProjectName) + ..\..\artifacts\obj\src\$(MSBuildProjectName) + diff --git a/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj b/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj index 1257e2dc..153f7758 100644 --- a/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj +++ b/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj @@ -2,7 +2,7 @@ 1.0.2 - net461;netstandard2.0 + net461;netstandard1.6 true true ApplicationInsightsTypes @@ -10,8 +10,9 @@ true true ApplicationInsightsTypes - 2.0.0 + 1.6.1 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) diff --git a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj index 0b0350b5..fcf05afa 100644 --- a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj +++ b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj @@ -14,6 +14,7 @@ true 1.1.1 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true diff --git a/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests.csproj b/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests.csproj index 979d17a1..626d447f 100644 --- a/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests.csproj +++ b/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests.csproj @@ -14,6 +14,7 @@ true 2.0.0 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true true diff --git a/test/FunctionalTestUtils/FunctionalTestUtils.csproj b/test/FunctionalTestUtils/FunctionalTestUtils.csproj index 286ae04e..c577f896 100644 --- a/test/FunctionalTestUtils/FunctionalTestUtils.csproj +++ b/test/FunctionalTestUtils/FunctionalTestUtils.csproj @@ -12,6 +12,7 @@ FunctionalTestUtils 1.6.1 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) diff --git a/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj b/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj index 00fd1ec8..3ab4d99e 100644 --- a/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj +++ b/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj @@ -12,6 +12,7 @@ FunctionalTestUtils 2.0.0 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) diff --git a/test/MVCFramework.FunctionalTests/MVCFramework.FunctionalTests.csproj b/test/MVCFramework.FunctionalTests/MVCFramework.FunctionalTests.csproj index bc85c73d..c4529e90 100644 --- a/test/MVCFramework.FunctionalTests/MVCFramework.FunctionalTests.csproj +++ b/test/MVCFramework.FunctionalTests/MVCFramework.FunctionalTests.csproj @@ -15,6 +15,7 @@ aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0 1.1.1 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) true true pdbonly diff --git a/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests.csproj b/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests.csproj index 2d59ffdf..46f848b4 100644 --- a/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests.csproj +++ b/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests.csproj @@ -15,6 +15,7 @@ aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0 2.0.0 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) true true pdbonly diff --git a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj index f6bd6812..2a7d697a 100644 --- a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj +++ b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj @@ -13,6 +13,7 @@ true 1.1.1 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true diff --git a/test/WebApi.FunctionalTests/WebApi.FunctionalTests.csproj b/test/WebApi.FunctionalTests/WebApi.FunctionalTests.csproj index 26b41517..6393887d 100644 --- a/test/WebApi.FunctionalTests/WebApi.FunctionalTests.csproj +++ b/test/WebApi.FunctionalTests/WebApi.FunctionalTests.csproj @@ -15,6 +15,7 @@ $(PackageTargetFallback);portable-net45+win8 1.1.1 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true diff --git a/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests.csproj b/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests.csproj index 0e105411..4fd53c20 100644 --- a/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests.csproj +++ b/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests.csproj @@ -14,6 +14,7 @@ true 2.0.0 ..\..\artifacts\test\$(MSBuildProjectName) + ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true From 2379735d4502b047bdd3c4b1cb25bdd421ec33fa Mon Sep 17 00:00:00 2001 From: Tomasz Milos Date: Fri, 24 Nov 2017 00:43:02 +0100 Subject: [PATCH 05/13] [DS] Enable EventHubs diagnostic source --- .../Extensions/ApplicationInsightsExtensions.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs b/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs index cd4ea2fe..486cd902 100644 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs @@ -151,6 +151,7 @@ public static IServiceCollection AddApplicationInsightsTelemetry(this IServiceCo excludedDomains.Add("127.0.0.1"); var includedActivities = module.IncludeDiagnosticSourceActivities; + includedActivities.Add("Microsoft.Azure.EventHubs"); includedActivities.Add("Microsoft.Azure.ServiceBus"); return module; From 04a70a517282139a3452f378fc3af782e9741884 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Tue, 28 Nov 2017 11:41:07 -0800 Subject: [PATCH 06/13] Bump version --- .../Microsoft.ApplicationInsights.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index 71fd05a3..d15e8973 100644 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -4,7 +4,7 @@ Application Insights for ASP.NET Core web applications. See https://azure.microsoft.com/documentation/articles/app-insights-asp-net-five/ for more information. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156 Copyright © Microsoft. All Rights Reserved. Application Insights for ASP.NET Core Web Applications - 2.2.0-beta1 + 2.2.0-beta2 Microsoft net451;net46;netstandard1.6 true From 2c26ca0b6561d28b95641250b94f7c48ba385d59 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Lee Date: Thu, 7 Dec 2017 10:10:50 -0800 Subject: [PATCH 07/13] update base and web references to 2.5.0-beta2 --- .../Microsoft.ApplicationInsights.AspNetCore.csproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index d15e8973..eccf11d9 100644 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -67,16 +67,16 @@ All - - - - + + + + - - + + From 75e55b806cedd9484786136d1d5e636af2bae72a Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 13 Dec 2017 14:33:28 -0800 Subject: [PATCH 08/13] beta3 name change --- .../Microsoft.ApplicationInsights.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index eccf11d9..633c363a 100644 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -4,7 +4,7 @@ Application Insights for ASP.NET Core web applications. See https://azure.microsoft.com/documentation/articles/app-insights-asp-net-five/ for more information. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156 Copyright © Microsoft. All Rights Reserved. Application Insights for ASP.NET Core Web Applications - 2.2.0-beta2 + 2.2.0-beta3 Microsoft net451;net46;netstandard1.6 true From cf178d8d3484c22dc5d0c36f8b0e5d7822d93559 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 13 Dec 2017 14:36:39 -0800 Subject: [PATCH 09/13] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 085299bd..9f556b01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Version 2.2.0-beta3 +- Updated Web/Base SDK version dependency to 2.5.0-beta2. + +## Version 2.2.0-beta2 +- Same bit as beta1. Only change is that the symbols for the binaries are indexed in Microsoft symbol servers. Beta1 symbols will not be available. + ## Version 2.2.0-beta1 - Project is upgraded to work with Visual Studio 2017. Also projects are modified to use csproj instead of project.json. From 0a705350eae83773894037a4c1f58d448c83f814 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 13 Dec 2017 14:38:27 -0800 Subject: [PATCH 10/13] typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f556b01..c23fe237 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Updated Web/Base SDK version dependency to 2.5.0-beta2. ## Version 2.2.0-beta2 -- Same bit as beta1. Only change is that the symbols for the binaries are indexed in Microsoft symbol servers. Beta1 symbols will not be available. +- Same bits as beta1. Only change is that the symbols for the binaries are indexed in Microsoft symbol servers. Beta1 symbols will not be available. ## Version 2.2.0-beta1 From 00f80861cc7d88775cb9bc3c4747d946fe270eaa Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 13 Dec 2017 14:41:56 -0800 Subject: [PATCH 11/13] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c23fe237..87d102bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Version 2.2.0-beta3 - Updated Web/Base SDK version dependency to 2.5.0-beta2. +- This version of Base SDK referred contains fix to a bug in ServerTelemetryChannel which caused application to crash on non-windows platforms. Details on fix and workaround(https://github.com/Microsoft/ApplicationInsights-dotnet/issues/654) Original issue (https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/551) ## Version 2.2.0-beta2 - Same bits as beta1. Only change is that the symbols for the binaries are indexed in Microsoft symbol servers. Beta1 symbols will not be available. From fa2d1e097a4b06702bf28d57ed1a9d2329249fda Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 13 Dec 2017 14:43:27 -0800 Subject: [PATCH 12/13] signing version fix. --- Signing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signing.props b/Signing.props index c52d23c9..c3bfcd2d 100644 --- a/Signing.props +++ b/Signing.props @@ -2,7 +2,7 @@ - $(BUILD_ARTIFACTSTAGINGDIRECTORY)\MicroBuild\Plugins\MicroBuild.Plugins.Signing.1.0.402\build\MicroBuild.Signing.dll + $(BUILD_ARTIFACTSTAGINGDIRECTORY)\MicroBuild\Plugins\MicroBuild.Plugins.Signing.1.0.447\build\MicroBuild.Signing.dll true true $(CommonBuildPropsLocation)\Keys\InternalKey.snk From 09debf02cca4c9358fc3c966289cae8604f6bb81 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Wed, 13 Dec 2017 14:44:48 -0800 Subject: [PATCH 13/13] Publish full symbols instead of portable symbols . --- .../Microsoft.ApplicationInsights.AspNetCore.csproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index 633c363a..c5055181 100644 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -23,10 +23,14 @@ https://github.com/Microsoft/ApplicationInsights-aspnetcore.git 1.6.1 ..\..\artifacts\src\$(MSBuildProjectName) - ..\..\artifacts\obj\src\$(MSBuildProjectName) - + ..\..\artifacts\obj\src\$(MSBuildProjectName) + + full + true + + All