Skip to content
This repository has been archived by the owner on Jun 10, 2020. It is now read-only.

Commit

Permalink
Merge pull request #433 from Microsoft/develop
Browse files Browse the repository at this point in the history
Merge develop to master for 2.1.0-beta4 release.
  • Loading branch information
dnduffy authored May 11, 2017
2 parents 7329aa5 + 0ceb64e commit f5251fb
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
# Changelog

## Version 2.1.0-beta4

- [Made package meta-data URLs use HTTPS](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/390)
- Updated SDK version dependency to 2.4.0-beta3.

## Version 2.1.0-beta3

- [Removed the use of Platform Abstractions](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/410)
- [Correlation header injection disabled for standard Azure storage calls](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/416)
- UseAI and AddAI calls made idempotent
- [Made UseApplicationInsights and AddApplicationInsightsTelemetry calls idempotent](https://github.com/Microsoft/ApplicationInsights-aspnetcore/pull/419)

## Version 2.1.0-beta2

Expand Down
19 changes: 9 additions & 10 deletions src/Microsoft.ApplicationInsights.AspNetCore/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"summary": "Application Insights for ASP.NET Core web applications.",
"description": "Application Insights for ASP.NET Core web applications. See https://azure.microsoft.com/en-us/documentation/articles/app-insights-asp-net-five/ for more information. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156",
"authors": ["Microsoft"],
"version": "2.1.0-beta3",
"version": "2.1.0-beta4",
"copyright": "Copyright © Microsoft. All Rights Reserved.",
"packOptions": {
"projectUrl": "http://go.microsoft.com/fwlink/?LinkId=392727",
"licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=510709",
"projectUrl": "https://go.microsoft.com/fwlink/?LinkId=392727",
"licenseUrl": "https://go.microsoft.com/fwlink/?LinkID=510709",
"requireLicenseAcceptance": true,
"iconUrl": "http://appanacdn.blob.core.windows.net/cdn/icons/aic.png",
"iconUrl": "https://appanacdn.blob.core.windows.net/cdn/icons/aic.png",
"tags": ["Analytics", "ApplicationInsights", "Telemetry", "AppInsights", "aspnetcore"],
"repository": {
"type": "git",
Expand Down Expand Up @@ -79,8 +79,8 @@
"version": "1.2.0-beta2",
"type": "build"
},
"Microsoft.ApplicationInsights": "2.4.0-beta2",
"Microsoft.ApplicationInsights.DependencyCollector": "2.4.0-beta2"
"Microsoft.ApplicationInsights": "2.4.0-beta3",
"Microsoft.ApplicationInsights.DependencyCollector": "2.4.0-beta3"
//"Text.Analyzers": {
// "version": "1.2.0-beta2",
// "type": "build"
Expand All @@ -94,15 +94,14 @@
"net451": {
"dependencies": {
"System.Net.Http": "4.3.1",
"Microsoft.ApplicationInsights.PerfCounterCollector": "2.4.0-beta2",
"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.4.0-beta2"
"Microsoft.ApplicationInsights.PerfCounterCollector": "2.4.0-beta3",
"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.4.0-beta3"
}
},
"netstandard1.6": {
"dependencies": {
"NETStandard.Library": "1.6.1",
"System.Net.NameResolution": "4.0.0",
"System.Diagnostics.StackTrace": "4.3.0"
"System.Net.NameResolution": "4.3.0"
}
}
}
Expand Down

0 comments on commit f5251fb

Please sign in to comment.