move to the new Core
This commit is contained in:
Sergey Kanzhelev
Родитель
6fdb37657b
Коммит
12e887c9e3
|
|
@ -96,7 +96,7 @@
|
|||
<NugetVersionFilePath>$(MSBuildThisFileDirectory).nugetVersion</NugetVersionFilePath>
|
||||
<BuildNugetVersion Condition="Exists($(NugetVersionFilePath))">$([System.IO.File]::ReadAllText($(NugetVersionFilePath)))</BuildNugetVersion>
|
||||
|
||||
<CoreSdkVersion>2.2.0-beta2</CoreSdkVersion>
|
||||
<CoreSdkVersion>2.2.0-beta2-build31642</CoreSdkVersion>
|
||||
|
||||
<!-- Forces EventRegister target to generate ETW manifest file -->
|
||||
<EtwManifestForceAll>true</EtwManifestForceAll>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import "Domain.bond"
|
||||
import "TestResult.bond"
|
||||
|
||||
namespace AI
|
||||
|
||||
[Description("Instances of AvailabilityData represent the result of executing an availability test.")]
|
||||
struct AvailabilityData
|
||||
: Domain
|
||||
{
|
||||
|
|
@ -10,33 +10,31 @@ struct AvailabilityData
|
|||
10: required int32 ver = 2;
|
||||
|
||||
[MaxStringLength("64")]
|
||||
[Question("This is a new limit. Verify it's ok")]
|
||||
20: required string testRunId;
|
||||
|
||||
[JSType("Date")]
|
||||
[CSType("DateTimeOffset")]
|
||||
30: required string testTimeStamp;
|
||||
[Description("Identifier of a test run. Use it to correlate steps of test run and telemetry generated by the service.")]
|
||||
[ActAsRequired("Renaming testRunId to id.")]
|
||||
21: required string id;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Question("This is a new limit. Verify it's ok")]
|
||||
40: required string testName;
|
||||
[Description("Name of the test that these availability results represents.")]
|
||||
[ActAsRequired("Renaming testName to name.")]
|
||||
41: required string name;
|
||||
|
||||
[Description("Duration in TimeSpan 'G' (general long) format: d:hh:mm:ss.fffffff")]
|
||||
[CSType("TimeSpan")]
|
||||
50: required string duration;
|
||||
|
||||
60: required AI.TestResult result;
|
||||
[ActAsRequired("Renaming result to success.")]
|
||||
[Description("Success flag.")]
|
||||
61: required bool success;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Question("This is a new limit. Verify it's ok")]
|
||||
[Description("Name of the location where the test was run from.")]
|
||||
70: string runLocation;
|
||||
|
||||
[MaxStringLength("8192")]
|
||||
[Question("This is a new limit. Verify it's ok")]
|
||||
[Description("Diagnostic message for the result.")]
|
||||
80: string message;
|
||||
|
||||
90: double dataSize;
|
||||
|
||||
[Description("Collection of custom properties.")]
|
||||
[MaxKeyLength("150")]
|
||||
[MaxValueLength("8192")]
|
||||
|
|
|
|||
|
|
@ -13,36 +13,23 @@ struct ContextTagKeys
|
|||
[MaxStringLength("1024")]
|
||||
100: string DeviceId = "ai.device.id";
|
||||
|
||||
110: string DeviceLanguage = "ai.device.language";
|
||||
|
||||
[Description("Device locale using <language>-<REGION> pattern, following RFC 5646. Example 'en-US'.")]
|
||||
[MaxStringLength("64")]
|
||||
115: string DeviceLocale = "ai.device.locale";
|
||||
|
||||
[Description("Model of the device end user of the application using. Used for client scenarios. If empty, derived from user agent.")]
|
||||
[Description("Model of the device the end user of the application is using. Used for client scenarios. If this field is empty then it is derived from the user agent.")]
|
||||
[MaxStringLength("256")]
|
||||
120: string DeviceModel = "ai.device.model";
|
||||
|
||||
125: string DeviceNetwork = "ai.device.network";
|
||||
|
||||
[Description("Client device OEM name taken from the browser.")]
|
||||
[MaxStringLength("256")]
|
||||
130: string DeviceOEMName = "ai.device.oemName";
|
||||
|
||||
[Description("Operation system name and version of the device end user of the application using. If empty derived from user agent. Example 'Windows 10 Pro 10.0.10586.0'")]
|
||||
[Description("Operating system name and version of the device the end user of the application is using. If this field is empty then it is derived from the user agent. Example 'Windows 10 Pro 10.0.10586.0'")]
|
||||
[MaxStringLength("256")]
|
||||
140: string DeviceOSVersion = "ai.device.osVersion";
|
||||
|
||||
[Description("Name of the instance where application is running. Computer name for on-premisis, instance name for Azure.")]
|
||||
[MaxStringLength("256")]
|
||||
145: string DeviceRoleInstance = "ai.device.roleInstance";
|
||||
|
||||
[Description("Name of the role application is part of. Maps directly to the role name in azure.")]
|
||||
[MaxStringLength("256")]
|
||||
150: string DeviceRoleName = "ai.device.roleName";
|
||||
|
||||
155: string DeviceScreenResolution = "ai.device.screenResolution";
|
||||
|
||||
[Description("Type of the device end user of the application is using. Used primarily to distinguish JavaScript telemetry from server side telemetry. Examples: 'PC', 'Phone', 'Browser'. 'PC' is a default value.")]
|
||||
[Description("The type of the device the end user of the application is using. Used primarily to distinguish JavaScript telemetry from server side telemetry. Examples: 'PC', 'Phone', 'Browser'. 'PC' is the default value.")]
|
||||
[MaxStringLength("64")]
|
||||
160: string DeviceType = "ai.device.type";
|
||||
|
||||
|
|
@ -66,7 +53,7 @@ struct ContextTagKeys
|
|||
[MaxStringLength("1024")]
|
||||
320: string OperationSyntheticSource = "ai.operation.syntheticSource";
|
||||
|
||||
[Description("The cV is a light weight vector clock which can be used to identify and order related events across clients and services.")]
|
||||
[Description("The correlation vector is a light weight vector clock which can be used to identify and order related events across clients and services.")]
|
||||
[MaxStringLength("64")]
|
||||
330: string OperationCorrelationVector = "ai.operation.correlationVector";
|
||||
|
||||
|
|
@ -79,27 +66,27 @@ struct ContextTagKeys
|
|||
[Question("Should it be marked as JSType-bool for breeze?")]
|
||||
405: string SessionIsFirst = "ai.session.isFirst";
|
||||
|
||||
[Description("In multi-tenant applications account ID or name that user is acting with. Examples may be subscription ID for Azure portal or blog name blogging platform.")]
|
||||
[Description("In multi-tenant applications this is the account ID or name which the user is acting with. Examples may be subscription ID for Azure portal or blog name blogging platform.")]
|
||||
[MaxStringLength("1024")]
|
||||
505: string UserAccountId = "ai.user.accountId";
|
||||
|
||||
[Description("The browser's user agent string as reported by the browser. This property will be used to extract informaiton regarding customer browser, but will not be stored. Use custom properties to store the original user agent.")]
|
||||
[Description("The browser's user agent string as reported by the browser. This property will be used to extract informaiton regarding the customer's browser but will not be stored. Use custom properties to store the original user agent.")]
|
||||
[MaxStringLength("2048")]
|
||||
510: string UserAgent = "ai.user.userAgent";
|
||||
|
||||
[Description("Anonymous user id. Represents the end user of the application. When telemetry is sent from a service, the user context is about the user than initiated the operation in the service.")]
|
||||
[Description("Anonymous user id. Represents the end user of the application. When telemetry is sent from a service, the user context is about the user that initiated the operation in the service.")]
|
||||
[MaxStringLength("128")]
|
||||
515: string UserId = "ai.user.id";
|
||||
|
||||
[Description("Authenticated user id. As opposite to ai.user.id represents the user with by the friendly name. Since it's PII information it is not collected by default by most SDKs.")]
|
||||
[Description("Authenticated user id. The opposite of ai.user.id, this represents the user with a friendly name. Since it's PII information it is not collected by default by most SDKs.")]
|
||||
[MaxStringLength("1024")]
|
||||
525: string UserAuthUserId = "ai.user.authUserId";
|
||||
|
||||
[Description("Name of the role application is part of. Maps directly to the role name in azure.")]
|
||||
[Description("Name of the role the application is a part of. Maps directly to the role name in azure.")]
|
||||
[MaxStringLength("256")]
|
||||
705: string CloudRole = "ai.cloud.role";
|
||||
|
||||
[Description("Name of the instance where application is running. Computer name for on-premisis, instance name for Azure.")]
|
||||
[Description("Name of the instance where the application is running. Computer name for on-premisis, instance name for Azure.")]
|
||||
[MaxStringLength("256")]
|
||||
715: string CloudRoleInstance = "ai.cloud.roleInstance";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
namespace AI
|
||||
|
||||
[Description("Identifies the type of dependency.")]
|
||||
enum DependencyKind
|
||||
{
|
||||
SQL,
|
||||
Http,
|
||||
Other,
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
namespace AI
|
||||
|
||||
[Description("Identifies the source of the dependency.")]
|
||||
enum DependencySourceType
|
||||
{
|
||||
Undefined,
|
||||
Aic,
|
||||
Apmc,
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ struct Envelope
|
|||
[MaxStringLength("1024")]
|
||||
20: required string name;
|
||||
|
||||
[Description("The UTC time the telemetry item was created. ISO 8601 zero offset date-time string. Example: 2009-06-15T13:45:30.0000000Z")]
|
||||
[Description("Event date time when telemetry item was created. This is the wall clock time on the client when the event was generated. There is no guarantee that the client's time is accurate. This field must be formatted in UTC ISO 8601 format, with a trailing 'Z' character, as described publicly on https://en.wikipedia.org/wiki/ISO_8601#UTC. Note: the number of decimal seconds digits provided are variable (and unspecified). Consumers should handle this, i.e. managed code consumers should not use format 'O' for parsing as it specifies a fixed length. Example: 2009-06-15T13:45:30.0000000Z.")]
|
||||
[Name("DateTime")]
|
||||
[CSType("DateTimeOffset")]
|
||||
[JSType("Date")]
|
||||
|
|
@ -24,7 +24,7 @@ struct Envelope
|
|||
30: required string time;
|
||||
|
||||
[Name("SamplingRate")]
|
||||
[Description("Sampling rate used in application. This telemetry item represents 1 / sampleRate actual telemetry item.")]
|
||||
[Description("Sampling rate used in application. This telemetry item represents 1 / sampleRate actual telemetry items.")]
|
||||
40: double sampleRate = 100.0;
|
||||
|
||||
[Description("Sequence field used to track absolute order of uploaded events.")]
|
||||
|
|
|
|||
|
|
@ -4,17 +4,13 @@ import "SeverityLevel.bond"
|
|||
|
||||
namespace AI
|
||||
|
||||
[Description("Instance of Exception represents handled or unhandled exception that occurred during execution of the monitored application.")]
|
||||
[Description("An instance of Exception represents a handled or unhandled exception that occurred during execution of the monitored application.")]
|
||||
struct ExceptionData
|
||||
: Domain
|
||||
{
|
||||
[Description("Schema version")]
|
||||
10: required int32 ver = 2;
|
||||
|
||||
[Description("Indication of where exception was caught to assess it's severity. Possible values are 'user code' (UserCode), 'framework' (Platform) or 'unhandled' (Unhandled)")]
|
||||
[MaxStringLength("1024")]
|
||||
20: required string handledAt;
|
||||
|
||||
[Description("Exception chain - list of inner exceptions.")]
|
||||
50: required vector<ExceptionDetails> exceptions;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ struct ExceptionDetails
|
|||
[MaxStringLength("1024")]
|
||||
40: required string message;
|
||||
|
||||
[Description("Indicates if full exception stack is provided in the exception. Stack may be trimmed, such as in the case of StackOverflow exception.")]
|
||||
[Description("Indicates if full exception stack is provided in the exception. The stack may be trimmed, such as in the case of a StackOverflow exception.")]
|
||||
50: bool hasFullStack = true;
|
||||
|
||||
[Description("Text describing the stack. Either stack or parsedStack should have a value.")]
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import "SeverityLevel.bond"
|
|||
|
||||
namespace AI
|
||||
|
||||
[Description("Instances of Message represent printf-like trace statements that are text-searched. Log4Net, NLog and other text-based log file entries are be translated into intances of this type. The message does not have measurements.")]
|
||||
[Description("Instances of Message represent printf-like trace statements that are text-searched. Log4Net, NLog and other text-based log file entries are translated into intances of this type. The message does not have measurements.")]
|
||||
struct MessageData
|
||||
: Domain
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import "DataPoint.bond"
|
|||
|
||||
namespace AI
|
||||
|
||||
[Description("Instance of the Metric item is a list of measurements (single data points) and/or aggregations")]
|
||||
[Description("An instance of the Metric item is a list of measurements (single data points) and/or aggregations.")]
|
||||
struct MetricData
|
||||
: Domain
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@ import "EventData.bond"
|
|||
|
||||
namespace AI
|
||||
|
||||
[Description("Instance of PageView represents a generic action on a page like a button click. It is also the base type for PageView.")]
|
||||
[Description("An instance of PageView represents a generic action on a page like a button click. It is also the base type for PageView.")]
|
||||
[Alias("PageviewData;PageEventData")]
|
||||
struct PageViewData
|
||||
: EventData
|
||||
{
|
||||
[MaxStringLength("2048")]
|
||||
[Description("Request url with all query string parameters")]
|
||||
[Description("Request URL with all query string parameters")]
|
||||
10: string url;
|
||||
|
||||
[CSType("TimeSpan")]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import "PageViewData.bond"
|
|||
|
||||
namespace AI
|
||||
|
||||
[Description("Instance of PageView represents: page view with no performance data, page view with performance data, just the performance data of an earlier page request")]
|
||||
[Description("An instance of PageViewPerf represents: a page view with no performance data, a page view with performance data, or just the performance data of an earlier page request.")]
|
||||
[Alias("PageViewPerformanceData;PageviewPerformanceData")]
|
||||
struct PageViewPerfData
|
||||
: PageViewData
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
import "Domain.bond"
|
||||
import "DataPointType.bond"
|
||||
import "DependencyKind.bond"
|
||||
|
||||
namespace AI
|
||||
|
||||
[Description("Instance of Remote Dependency represents an interaction of the monitored component with a remote component/service like SQL or http endpoint.")]
|
||||
[Description("An instance of Remote Dependency represents an interaction of the monitored component with a remote component/service like SQL or an HTTP endpoint.")]
|
||||
struct RemoteDependencyData
|
||||
: Domain
|
||||
{
|
||||
|
|
@ -12,7 +10,7 @@ struct RemoteDependencyData
|
|||
10: required int32 ver = 2;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Description("Name of the command initiated with this dependency call. Low cardinality value. Example are stored procedure name, url path template.")]
|
||||
[Description("Name of the command initiated with this dependency call. Low cardinality value. Examples are stored procedure name and URL path template.")]
|
||||
20: required string name;
|
||||
|
||||
[MaxStringLength("128")]
|
||||
|
|
@ -20,35 +18,24 @@ struct RemoteDependencyData
|
|||
30: string id;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Description("Result code of a dependency call. Examples are SQL error code, http status code.")]
|
||||
[Description("Result code of a dependency call. Examples are SQL error code and HTTP status code.")]
|
||||
40: string resultCode;
|
||||
|
||||
50: AI.DataPointType kind = Measurement;
|
||||
|
||||
60: double value;
|
||||
|
||||
[CSType("TimeSpan")]
|
||||
[Description("Request duration in TimeSpan 'G' (general long) format: d:hh:mm:ss.fffffff.")]
|
||||
[ActAsRequired("Renaming value to duration.")]
|
||||
61: required string duration;
|
||||
|
||||
110: required AI.DependencyKind dependencyKind = Other;
|
||||
|
||||
[Description("Indication of successfull or unsuccessfull call.")]
|
||||
120: nullable<bool> success = true;
|
||||
|
||||
130: nullable<bool> async;
|
||||
|
||||
[MaxStringLength("8192")]
|
||||
150: string commandName;
|
||||
|
||||
[MaxStringLength("8192")]
|
||||
[Description("Command initiated by this dependency call. Examples are SQL statement, http url with all query parameters.")]
|
||||
[Description("Command initiated by this dependency call. Examples are SQL statement and HTTP URL's with all query parameters.")]
|
||||
151: string data;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Description("Dependency type name. Very low cardinality value for logical grouping of dependencies and interpretation of other fields like commandName and resultCode. Examples are SQL, Azure table, HTTP.")]
|
||||
160: string dependencyTypeName;
|
||||
[Description("Dependency type name. Very low cardinality value for logical grouping of dependencies and interpretation of other fields like commandName and resultCode. Examples are SQL, Azure table, and HTTP.")]
|
||||
162: string type;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Description("Target site of a dependency call. Examples are server name, host address.")]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import "Domain.bond"
|
|||
|
||||
namespace AI
|
||||
|
||||
[Description("Instance of Request represents completion of an external request to the application to do work, and contains a summary of that request execution and the results.")]
|
||||
[Description("An instance of Request represents completion of an external request to the application to do work and contains a summary of that request execution and the results.")]
|
||||
struct RequestData
|
||||
: Domain
|
||||
{
|
||||
|
|
@ -18,29 +18,18 @@ struct RequestData
|
|||
50: required string duration;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Description("Result of a request execution. Http status code for http requests.")]
|
||||
[Description("Result of a request execution. HTTP status code for HTTP requests.")]
|
||||
60: required string responseCode;
|
||||
|
||||
[Description("Indication of successfull or unsuccessfull call.")]
|
||||
70: required bool success;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Description("Source of the request. Examples are instrumentation key of the caller, ip address of the caller.")]
|
||||
29: string source;
|
||||
|
||||
[MaxStringLength("1024")]
|
||||
[Description("Name of the request. Represents code path taken to process request. Low cardinality value to allow better grouping of requests. For http requests represents http method and url path template like 'GET /values/{id}'.")]
|
||||
[Description("Name of the request. Represents code path taken to process request. Low cardinality value to allow better grouping of requests. For HTTP requests it represents the HTTP method and URL path template like 'GET /values/{id}'.")]
|
||||
30: string name;
|
||||
|
||||
[Description("Request start time in DateTimeOffset 'O' (round-trip) format: yyyy-mm-ddThh:mm:ss.fffffff-hh:mm")]
|
||||
[JSType("Date")]
|
||||
[CSType("DateTimeOffset")]
|
||||
40: string startTime;
|
||||
|
||||
80: string httpMethod;
|
||||
|
||||
[MaxStringLength("2048")]
|
||||
[Description("Request url with all query string parameters")]
|
||||
[Description("Request URL with all query string parameters.")]
|
||||
90: string url;
|
||||
|
||||
[Description("Collection of custom properties.")]
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ struct StackFrame
|
|||
[MaxStringLength("1024")]
|
||||
30: string assembly;
|
||||
|
||||
[Description("File name or Url of the method implementation.")]
|
||||
[Description("File name or URL of the method implementation.")]
|
||||
[MaxStringLength("1024")]
|
||||
50: string fileName;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
namespace AI
|
||||
|
||||
[Description("Instances of AvailabilityData represent the result of executing an availability test")]
|
||||
enum TestResult
|
||||
{
|
||||
Pass,
|
||||
Fail,
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ del "$currentDir\PublicSchema\*.bond"
|
|||
|
||||
if ($localPublicSchema) {
|
||||
# Generate public schema using bond generator
|
||||
& "$generatorPath\BondSchemaGenerator.exe" -v -i "$schemasPath\AppInsightsTypes.bond" -i "$schemasPath\ContextTagKeys.bond" -o "$currentDir\PublicSchema\" -e BondLanguage -t BondLayout -n test --flatten false
|
||||
& "$generatorPath\BondSchemaGenerator.exe" -v -i "$schemasPath\AppInsightsTypes.bond" -i "$schemasPath\PerformanceCounterData.bond" -i "$schemasPath\SessionStateData.bond" -i "$schemasPath\ContextTagKeys.bond" -o "$currentDir\PublicSchema\" -e BondLanguage -t BondLayout -n test --flatten false
|
||||
} else {
|
||||
# Download public schema from the github
|
||||
@(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -103,4 +103,4 @@
|
|||
</Target>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net40" developmentDependency="true" />
|
||||
<package id="xunit" version="1.9.2" targetFramework="net40" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -100,4 +100,4 @@
|
|||
<Import Project="..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net40" />
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.1" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
|
|
@ -10,4 +10,4 @@
|
|||
<package id="Microsoft.Diagnostics.Tracing.EventRegister" version="1.1.28" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net40" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -91,4 +91,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
var item = (DependencyTelemetry)sentTelemetry;
|
||||
Assert.AreEqual(Url, item.Name, "Reported Url must be " + Url);
|
||||
Assert.IsTrue(item.Duration > TimeSpan.FromMilliseconds(0), "Duration has to be positive");
|
||||
Assert.AreEqual("Http", item.DependencyKind, "HttpAny has to be dependency kind as it includes http and azure calls");
|
||||
Assert.AreEqual("Http", item.Type, "HttpAny has to be dependency kind as it includes http and azure calls");
|
||||
Assert.IsTrue(
|
||||
DateTime.UtcNow.Subtract(item.Timestamp.UtcDateTime).TotalMilliseconds < TimeSpan.FromMinutes(1).TotalMilliseconds, "timestamp < now");
|
||||
Assert.IsTrue(
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
var item = (DependencyTelemetry)sentTelemetry;
|
||||
Assert.AreEqual(Url, item.Name, "Reported Url must be " + Url);
|
||||
Assert.IsTrue(item.Duration > TimeSpan.FromMilliseconds(0), "Duration has to be positive");
|
||||
Assert.AreEqual("Http", item.DependencyKind, "HttpAny has to be dependency kind as it includes http and azure calls");
|
||||
Assert.AreEqual("Http", item.Type, "HttpAny has to be dependency kind as it includes http and azure calls");
|
||||
Assert.IsTrue(
|
||||
DateTime.UtcNow.Subtract(item.Timestamp.UtcDateTime).TotalMilliseconds < TimeSpan.FromMinutes(1).TotalMilliseconds, "timestamp < now");
|
||||
Assert.IsTrue(
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
var item = (DependencyTelemetry)sentTelemetry;
|
||||
Assert.AreEqual(Url, item.Name, "Reported Url must be " + Url);
|
||||
Assert.IsTrue(item.Duration > TimeSpan.FromMilliseconds(0), "Duration has to be positive");
|
||||
Assert.AreEqual("Http", item.DependencyKind, "HttpAny has to be dependency kind as it includes http and azure calls");
|
||||
Assert.AreEqual("Http", item.Type, "HttpAny has to be dependency kind as it includes http and azure calls");
|
||||
Assert.IsTrue(
|
||||
DateTime.UtcNow.Subtract(item.Timestamp.UtcDateTime).TotalMilliseconds < TimeSpan.FromMinutes(1).TotalMilliseconds, "timestamp < now");
|
||||
Assert.IsTrue(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net451" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net451" developmentDependency="true" />
|
||||
<package id="xunit" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
|
||||
|
|
@ -8,4 +8,4 @@
|
|||
<package id="xunit.core" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -75,4 +75,4 @@
|
|||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net45" />
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.1" targetFramework="net45" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -102,4 +102,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
|
||||
|
|
@ -10,4 +10,4 @@
|
|||
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
public void BeginWebTrackingReturnsOperationItemWithTelemetryItem()
|
||||
{
|
||||
var telemetry = ClientServerDependencyTracker.BeginTracking(this.telemetryClient);
|
||||
Assert.AreEqual(telemetry.StartTime, telemetry.StartTime);
|
||||
Assert.AreEqual(telemetry.Timestamp, telemetry.Timestamp);
|
||||
}
|
||||
|
||||
|
|
@ -220,7 +219,6 @@
|
|||
|
||||
private void ValidateSentTelemetry(DependencyTelemetry telemetry)
|
||||
{
|
||||
Assert.AreEqual(telemetry.StartTime, telemetry.StartTime);
|
||||
Assert.AreEqual(telemetry.Timestamp, telemetry.Timestamp);
|
||||
Assert.IsTrue(telemetry.Duration.Milliseconds >= 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
|
|||
DependencyTelemetry remoteDependencyTelemetryActual, string name, RemoteDependencyKind kind, bool? success, double valueMin, string statusCode)
|
||||
{
|
||||
Assert.AreEqual(name, remoteDependencyTelemetryActual.Name, true, "Resource name in the sent telemetry is wrong");
|
||||
Assert.AreEqual(kind.ToString(), remoteDependencyTelemetryActual.DependencyKind, "DependencyKind in the sent telemetry is wrong");
|
||||
Assert.AreEqual(kind.ToString(), remoteDependencyTelemetryActual.Type, "DependencyKind in the sent telemetry is wrong");
|
||||
Assert.AreEqual(success, remoteDependencyTelemetryActual.Success, "Success in the sent telemetry is wrong");
|
||||
Assert.AreEqual(statusCode, remoteDependencyTelemetryActual.ResultCode, "ResultCode in the sent telemetry is wrong");
|
||||
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
|
|||
DependencyTelemetry remoteDependencyTelemetryActual, string name, RemoteDependencyKind kind, bool success, double valueMin, string errorCode)
|
||||
{
|
||||
Assert.AreEqual(name, remoteDependencyTelemetryActual.Name, true, "Resource name in the sent telemetry is wrong");
|
||||
Assert.AreEqual(kind.ToString(), remoteDependencyTelemetryActual.DependencyKind, "DependencyKind in the sent telemetry is wrong");
|
||||
Assert.AreEqual(kind.ToString(), remoteDependencyTelemetryActual.Type, "DependencyKind in the sent telemetry is wrong");
|
||||
Assert.AreEqual(success, remoteDependencyTelemetryActual.Success, "Success in the sent telemetry is wrong");
|
||||
Assert.AreEqual(errorCode, remoteDependencyTelemetryActual.ResultCode, "ResultCode in the sent telemetry is wrong");
|
||||
|
||||
|
|
|
|||
|
|
@ -613,7 +613,7 @@
|
|||
DependencyTelemetry remoteDependencyTelemetryActual, Uri uri, RemoteDependencyKind kind, bool success, double expectedValue, string resultCode)
|
||||
{
|
||||
Assert.AreEqual("GET " + uri, remoteDependencyTelemetryActual.Name, true, "Resource name in the sent telemetry is wrong");
|
||||
Assert.AreEqual(kind.ToString(), remoteDependencyTelemetryActual.DependencyKind, "DependencyKind in the sent telemetry is wrong");
|
||||
Assert.AreEqual(kind.ToString(), remoteDependencyTelemetryActual.Type, "DependencyKind in the sent telemetry is wrong");
|
||||
Assert.AreEqual(success, remoteDependencyTelemetryActual.Success, "Success in the sent telemetry is wrong");
|
||||
Assert.AreEqual(resultCode, remoteDependencyTelemetryActual.ResultCode, "ResultCode in the sent telemetry is wrong");
|
||||
|
||||
|
|
|
|||
|
|
@ -715,7 +715,7 @@
|
|||
DependencyTelemetry remoteDependencyTelemetryActual, string name, RemoteDependencyKind kind, bool success, double valueMin, string resultCode)
|
||||
{
|
||||
Assert.AreEqual(name, remoteDependencyTelemetryActual.Name, true, "Resource name in the sent telemetry is wrong");
|
||||
Assert.AreEqual(kind.ToString(), remoteDependencyTelemetryActual.DependencyKind, "DependencyKind in the sent telemetry is wrong");
|
||||
Assert.AreEqual(kind.ToString(), remoteDependencyTelemetryActual.Type, "DependencyKind in the sent telemetry is wrong");
|
||||
Assert.AreEqual(success, remoteDependencyTelemetryActual.Success, "Success in the sent telemetry is wrong");
|
||||
Assert.AreEqual(resultCode, remoteDependencyTelemetryActual.ResultCode, "ResultCode in the sent telemetry is wrong");
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
{
|
||||
this.TelemetryTable.Remove(id);
|
||||
DependencyTelemetry telemetry = telemetryTuple.Item1;
|
||||
telemetry.DependencyKind = RemoteDependencyKind.Http.ToString();
|
||||
telemetry.Type = RemoteDependencyKind.Http.ToString();
|
||||
|
||||
if (statusCode.HasValue)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
bool isCustomCreated = false;
|
||||
var telemetry = ClientServerDependencyTracker.BeginTracking(this.telemetryClient);
|
||||
telemetry.Name = resourceName;
|
||||
telemetry.DependencyKind = RemoteDependencyKind.SQL.ToString();
|
||||
telemetry.Type = RemoteDependencyKind.SQL.ToString();
|
||||
this.TelemetryTable.Store(id, new Tuple<DependencyTelemetry, bool>(telemetry, isCustomCreated));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@
|
|||
var telemetry = ClientServerDependencyTracker.BeginTracking(this.telemetryClient);
|
||||
|
||||
telemetry.Name = resourceName;
|
||||
telemetry.DependencyKind = RemoteDependencyKind.Http.ToString();
|
||||
telemetry.Type = RemoteDependencyKind.Http.ToString();
|
||||
|
||||
this.TelemetryTable.Store(thisObj, new Tuple<DependencyTelemetry, bool>(telemetry, isCustomCreated));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -291,8 +291,8 @@
|
|||
var telemetry = ClientServerDependencyTracker.BeginTracking(this.telemetryClient);
|
||||
|
||||
telemetry.Name = resourceName;
|
||||
telemetry.DependencyKind = RemoteDependencyKind.SQL.ToString();
|
||||
telemetry.CommandName = commandText;
|
||||
telemetry.Type = RemoteDependencyKind.SQL.ToString();
|
||||
telemetry.Data = commandText;
|
||||
|
||||
// We use weaktables to store the thisObj for correlating begin with end call.
|
||||
this.TelemetryTable.Store(thisObj, new Tuple<DependencyTelemetry, bool>(telemetry, isCustomCreated));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -95,4 +95,4 @@
|
|||
<Import Project="..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net40" />
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventRegister" version="1.1.28" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net40" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -71,4 +71,4 @@
|
|||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net45" />
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -191,12 +191,10 @@
|
|||
Timestamp = requestTelemetry.Timestamp,
|
||||
OperationId = TruncateValue(requestTelemetry.Context?.Operation?.Id),
|
||||
Name = TruncateValue(requestTelemetry.Name),
|
||||
StartTime = requestTelemetry.StartTime,
|
||||
Success = IsRequestSuccessful(requestTelemetry),
|
||||
Duration = requestTelemetry.Duration,
|
||||
ResponseCode = requestTelemetry.ResponseCode,
|
||||
Url = requestTelemetry.Url,
|
||||
HttpMethod = requestTelemetry.HttpMethod,
|
||||
Properties = GetProperties(requestTelemetry)
|
||||
};
|
||||
}
|
||||
|
|
@ -209,14 +207,12 @@
|
|||
Version = TelemetryDocumentContractVersion,
|
||||
Timestamp = dependencyTelemetry.Timestamp,
|
||||
Name = TruncateValue(dependencyTelemetry.Name),
|
||||
StartTime = dependencyTelemetry.StartTime,
|
||||
Success = dependencyTelemetry.Success,
|
||||
Duration = dependencyTelemetry.Duration,
|
||||
OperationId = TruncateValue(dependencyTelemetry.Context?.Operation?.Id),
|
||||
ResultCode = dependencyTelemetry.ResultCode,
|
||||
CommandName = TruncateValue(dependencyTelemetry.CommandName),
|
||||
DependencyTypeName = dependencyTelemetry.DependencyTypeName,
|
||||
DependencyKind = dependencyTelemetry.DependencyKind,
|
||||
CommandName = TruncateValue(dependencyTelemetry.Data),
|
||||
DependencyTypeName = dependencyTelemetry.Type,
|
||||
Properties = GetProperties(dependencyTelemetry, SpecialDependencyPropertyName)
|
||||
};
|
||||
}
|
||||
|
|
@ -231,7 +227,6 @@
|
|||
exceptionTelemetry.SeverityLevel != null
|
||||
? exceptionTelemetry.SeverityLevel.Value.ToString()
|
||||
: null,
|
||||
HandledAt = exceptionTelemetry.HandledAt.ToString(),
|
||||
Exception =
|
||||
exceptionTelemetry.Exception != null
|
||||
? TruncateValue(exceptionTelemetry.Exception.ToString())
|
||||
|
|
|
|||
|
|
@ -792,17 +792,23 @@
|
|||
|
||||
// ACT
|
||||
var dependencyShort = new DependencyTelemetry(
|
||||
new string('c', MaxFieldLength),
|
||||
new string('c', MaxFieldLength),
|
||||
new string('c', MaxFieldLength),
|
||||
new string('c', MaxFieldLength),
|
||||
DateTimeOffset.Now,
|
||||
TimeSpan.FromSeconds(1),
|
||||
new string('c', MaxFieldLength),
|
||||
false) { Context = { InstrumentationKey = instrumentationKey } };
|
||||
|
||||
var dependencyLong = new DependencyTelemetry(
|
||||
new string('c', MaxFieldLength + 1),
|
||||
new string('c', MaxFieldLength + 1),
|
||||
new string('c', MaxFieldLength + 1),
|
||||
new string('c', MaxFieldLength + 1),
|
||||
DateTimeOffset.Now,
|
||||
TimeSpan.FromSeconds(1),
|
||||
new string('c', MaxFieldLength + 1),
|
||||
false) { Context = { InstrumentationKey = instrumentationKey } };
|
||||
|
||||
// process in the opposite order to allow for an easier validation order
|
||||
|
|
@ -812,8 +818,8 @@
|
|||
// ASSERT
|
||||
var telemetryDocuments = accumulatorManager.CurrentDataAccumulator.TelemetryDocuments.Cast<DependencyTelemetryDocument>().ToList();
|
||||
|
||||
Assert.AreEqual(telemetryDocuments[0].CommandName, dependencyShort.CommandName);
|
||||
Assert.AreEqual(telemetryDocuments[1].CommandName, dependencyLong.CommandName.Substring(0, MaxFieldLength));
|
||||
Assert.AreEqual(telemetryDocuments[0].CommandName, dependencyShort.Data);
|
||||
Assert.AreEqual(telemetryDocuments[1].CommandName, dependencyLong.Data.Substring(0, MaxFieldLength));
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
|
|
@ -830,18 +836,24 @@
|
|||
|
||||
// ACT
|
||||
var dependencyShort = new DependencyTelemetry(
|
||||
new string('c', MaxFieldLength),
|
||||
new string('c', MaxFieldLength),
|
||||
new string('c', MaxFieldLength),
|
||||
new string('c', MaxFieldLength),
|
||||
DateTimeOffset.Now,
|
||||
TimeSpan.FromSeconds(1),
|
||||
new string('c', MaxFieldLength),
|
||||
false)
|
||||
{ Context = { InstrumentationKey = instrumentationKey } };
|
||||
|
||||
var dependencyLong = new DependencyTelemetry(
|
||||
new string('c', MaxFieldLength + 1),
|
||||
new string('c', MaxFieldLength + 1),
|
||||
new string('c', MaxFieldLength + 1),
|
||||
new string('c', MaxFieldLength + 1),
|
||||
DateTimeOffset.Now,
|
||||
TimeSpan.FromSeconds(1),
|
||||
new string('c', MaxFieldLength + 1),
|
||||
false)
|
||||
{ Context = { InstrumentationKey = instrumentationKey } };
|
||||
|
||||
|
|
@ -870,10 +882,13 @@
|
|||
|
||||
// ACT
|
||||
var dependencyShort = new DependencyTelemetry(
|
||||
"dependencyShort",
|
||||
"dependencyShort",
|
||||
"dependencyShort",
|
||||
"dependencyShort",
|
||||
DateTimeOffset.Now,
|
||||
TimeSpan.FromSeconds(1),
|
||||
"dependencyShort",
|
||||
false)
|
||||
{
|
||||
Properties = { { new string('p', MaxFieldLength), new string('v', MaxFieldLength) } },
|
||||
|
|
@ -881,10 +896,13 @@
|
|||
};
|
||||
|
||||
var dependencyLong = new DependencyTelemetry(
|
||||
"dependencyLong",
|
||||
"dependencyLong",
|
||||
"dependencyLong",
|
||||
"dependencyLong",
|
||||
DateTimeOffset.Now,
|
||||
TimeSpan.FromSeconds(1),
|
||||
"dependencyLong",
|
||||
false)
|
||||
{
|
||||
Properties = { { new string('p', MaxFieldLength + 1), new string('v', MaxFieldLength + 1) } },
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -124,4 +124,4 @@
|
|||
</Target>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net45" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -106,4 +106,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -73,4 +73,4 @@
|
|||
</Target>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net40" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -47,4 +47,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -104,4 +104,4 @@
|
|||
</Target>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net40" developmentDependency="true" />
|
||||
<package id="xunit" version="1.9.2" targetFramework="net40" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -98,4 +98,4 @@
|
|||
<Import Project="..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net40" />
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net4" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventRegister" version="1.1.28" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net40" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
|
|
@ -88,4 +88,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net451" />
|
||||
<package id="OpenCover" version="4.6.519" targetFramework="net451" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net451" developmentDependency="true" />
|
||||
<package id="xunit" version="2.1.0" targetFramework="net451" />
|
||||
|
|
@ -9,4 +9,4 @@
|
|||
<package id="xunit.core" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
|
||||
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -63,4 +63,4 @@
|
|||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net45" />
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Web.XmlTransform">
|
||||
|
|
@ -105,4 +105,4 @@
|
|||
</Target>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
|
||||
|
|
@ -12,4 +12,4 @@
|
|||
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -72,21 +72,6 @@
|
|||
Assert.Equal(SeverityLevel.Critical, ((ExceptionTelemetry)this.sendItems[0]).SeverityLevel);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void OnErrorSetsHandledAtToPlatform()
|
||||
{
|
||||
var platformContext = HttpModuleHelper.GetFakeHttpContext();
|
||||
platformContext.AddError(new Exception());
|
||||
|
||||
using (var module = new TestableExceptionTrackingTelemetryModule(platformContext))
|
||||
{
|
||||
module.Initialize(this.configuration);
|
||||
module.OnError(null);
|
||||
}
|
||||
|
||||
Assert.Equal(ExceptionHandledAt.Platform, ((ExceptionTelemetry)this.sendItems[0]).HandledAt);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void OnErrorDoesNotThrowOnNullContext()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
var context = HttpModuleHelper.GetFakeHttpContext();
|
||||
var requestTelemetry = context.CreateRequestTelemetryPrivate();
|
||||
requestTelemetry.StartTime = startTime;
|
||||
requestTelemetry.Timestamp = startTime;
|
||||
|
||||
using (var module = new TestableRequestTrackingTelemetryModule(context))
|
||||
{
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
{
|
||||
var context = HttpModuleHelper.GetFakeHttpContext();
|
||||
var requestTelemetry = context.CreateRequestTelemetryPrivate();
|
||||
requestTelemetry.StartTime = default(DateTimeOffset);
|
||||
requestTelemetry.Timestamp = default(DateTimeOffset);
|
||||
|
||||
using (var module = new TestableRequestTrackingTelemetryModule(context))
|
||||
{
|
||||
|
|
@ -147,25 +147,7 @@
|
|||
Assert.Equal("http://test/", requestTelemetry.Url.OriginalString);
|
||||
}
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void OnEndDoesNotOverrideHttpMethod()
|
||||
{
|
||||
var context = HttpModuleHelper.GetFakeHttpContext();
|
||||
|
||||
using (var module = new TestableRequestTrackingTelemetryModule(context))
|
||||
{
|
||||
module.Initialize(TelemetryConfiguration.CreateDefault());
|
||||
module.OnBeginRequest(null);
|
||||
var requestTelemetry = context.GetRequestTelemetry();
|
||||
requestTelemetry.HttpMethod = "Test";
|
||||
|
||||
module.OnEndRequest(null);
|
||||
|
||||
Assert.Equal("Test", requestTelemetry.HttpMethod);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[TestMethod]
|
||||
public void OnEndSetsResponseCode()
|
||||
{
|
||||
|
|
@ -197,19 +179,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void OnEndSetsHttpMethod()
|
||||
{
|
||||
var context = HttpModuleHelper.GetFakeHttpContext();
|
||||
|
||||
var module = new TestableRequestTrackingTelemetryModule(context);
|
||||
module.Initialize(TelemetryConfiguration.CreateDefault());
|
||||
module.OnBeginRequest(null);
|
||||
module.OnEndRequest(null);
|
||||
|
||||
Assert.Equal(context.Request.HttpMethod, context.GetRequestTelemetry().HttpMethod);
|
||||
}
|
||||
|
||||
public void OnEndTracksRequest()
|
||||
{
|
||||
var sendItems = new List<ITelemetry>();
|
||||
|
|
|
|||
|
|
@ -61,10 +61,7 @@
|
|||
{
|
||||
foreach (Exception exp in errors)
|
||||
{
|
||||
var exceptionTelemetry = new ExceptionTelemetry(exp)
|
||||
{
|
||||
HandledAt = ExceptionHandledAt.Platform
|
||||
};
|
||||
var exceptionTelemetry = new ExceptionTelemetry(exp);
|
||||
|
||||
if (platformContext.Response.StatusCode >= 500)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
|
||||
// NB! Whatever is saved in RequestTelemetry on Begin is not guaranteed to be sent because Begin may not be called; Keep it in context
|
||||
// In WCF there will be 2 Begins and 1 End. We need time from the first one
|
||||
if (requestTelemetry.StartTime == DateTimeOffset.MinValue)
|
||||
if (requestTelemetry.Timestamp == DateTimeOffset.MinValue)
|
||||
{
|
||||
requestTelemetry.Start();
|
||||
}
|
||||
|
|
@ -102,17 +102,6 @@
|
|||
requestTelemetry.Url = platformContext.Request.UnvalidatedGetUrl();
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(requestTelemetry.HttpMethod))
|
||||
{
|
||||
requestTelemetry.HttpMethod = platformContext.Request.HttpMethod;
|
||||
}
|
||||
|
||||
// Temporarily put UserAgent string back. We will remove it in 2.2-beta2 again
|
||||
if (string.IsNullOrEmpty(requestTelemetry.Context.User.UserAgent))
|
||||
{
|
||||
requestTelemetry.Context.User.UserAgent = platformContext.Request.UserAgent;
|
||||
}
|
||||
|
||||
this.telemetryClient.TrackRequest(requestTelemetry);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -107,4 +107,4 @@
|
|||
</Target>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net40" developmentDependency="true" />
|
||||
<package id="xunit" version="1.9.2" targetFramework="net40" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
|
|
@ -95,4 +95,4 @@
|
|||
<Import Project="..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net40" />
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventRegister" version="1.1.28" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net40" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -82,4 +82,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="xunit" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
|
||||
|
|
@ -8,4 +8,4 @@
|
|||
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -62,4 +62,4 @@
|
|||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net45" />
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Web.XmlTransform">
|
||||
|
|
@ -97,4 +97,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
|
||||
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="xunit" version="2.1.0" targetFramework="net45" />
|
||||
|
|
@ -9,4 +9,4 @@
|
|||
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
|
|
@ -57,4 +57,4 @@
|
|||
<Error Condition="!Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net45" developmentDependency="true" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -33,17 +33,5 @@
|
|||
|
||||
Assert.Equal(hostName, id);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void DeviceContextReaderAssignedNetwork()
|
||||
{
|
||||
var requestTelemetry = new RequestTelemetry();
|
||||
|
||||
new DeviceTelemetryInitializer().Initialize(requestTelemetry);
|
||||
|
||||
string networkType = requestTelemetry.Context.Device.NetworkType;
|
||||
|
||||
Assert.True(Enum.IsDefined(typeof(NetworkInterfaceType), networkType));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@
|
|||
telemetry.Context.Device.Id = reader.GetDeviceUniqueId();
|
||||
telemetry.Context.Device.OemName = reader.GetOemName();
|
||||
telemetry.Context.Device.Model = reader.GetDeviceModel();
|
||||
telemetry.Context.Device.NetworkType = reader.GetNetworkType();
|
||||
telemetry.Context.Device.Language = reader.GetHostSystemLocale();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,7 +93,6 @@
|
|||
|
||||
var exp = new ExceptionTelemetry(unhandledExceptionEventArgs.ExceptionObject as Exception)
|
||||
{
|
||||
HandledAt = ExceptionHandledAt.Unhandled,
|
||||
SeverityLevel = SeverityLevel.Critical,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,6 @@
|
|||
|
||||
var exp = new ExceptionTelemetry(unobservedTaskExceptionEventArgs.Exception)
|
||||
{
|
||||
HandledAt = ExceptionHandledAt.Unhandled,
|
||||
SeverityLevel = SeverityLevel.Critical,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -72,12 +72,6 @@
|
|||
<BondCodegen Include="..\..\Schema\PublicSchema\DataPointType.bond">
|
||||
<Link>DataPointType.bond</Link>
|
||||
</BondCodegen>
|
||||
<BondCodegen Include="..\..\Schema\PublicSchema\DependencyKind.bond">
|
||||
<Link>DependencyKind.bond</Link>
|
||||
</BondCodegen>
|
||||
<BondCodegen Include="..\..\Schema\PublicSchema\DependencySourceType.bond">
|
||||
<Link>DependencySourceType.bond</Link>
|
||||
</BondCodegen>
|
||||
<BondCodegen Include="..\..\Schema\PublicSchema\Domain.bond">
|
||||
<Link>Domain.bond</Link>
|
||||
</BondCodegen>
|
||||
|
|
@ -117,9 +111,6 @@
|
|||
<BondCodegen Include="..\..\Schema\PublicSchema\StackFrame.bond">
|
||||
<Link>StackFrame.bond</Link>
|
||||
</BondCodegen>
|
||||
<BondCodegen Include="..\..\Schema\PublicSchema\TestResult.bond">
|
||||
<Link>TestResult.bond</Link>
|
||||
</BondCodegen>
|
||||
<None Include="app.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Bond.Core.CSharp" version="4.2.1" targetFramework="net40" requireReinstallation="true" />
|
||||
<package id="Bond.CSharp" version="4.2.1" targetFramework="net40" />
|
||||
<package id="Bond.Runtime.CSharp" version="4.2.1" targetFramework="net40" requireReinstallation="true" />
|
||||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\..\packages\WiX.3.10.1\build\wix.props" Condition="Exists('..\..\..\..\..\packages\WiX.3.10.1\build\wix.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.Common.props'))\Test.Common.props" />
|
||||
|
|
@ -169,4 +169,4 @@
|
|||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
private static bool isInitialized;
|
||||
|
||||
public static DependencySourceType ExpectedSource { get; private set; }
|
||||
public static string ExpectedSDKPrefix { get; private set; }
|
||||
|
||||
public static HttpListenerObservable SdkEventListener { get; private set; }
|
||||
|
||||
|
|
@ -89,13 +89,13 @@
|
|||
if (RegistryCheck.IsNet46Installed)
|
||||
{
|
||||
// .NET 4.6 onwards, there is no need of installing agent
|
||||
ExpectedSource = !RegistryCheck.IsStatusMonitorInstalled
|
||||
? DependencySourceType.Aic
|
||||
: DependencySourceType.Apmc;
|
||||
ExpectedSDKPrefix = !RegistryCheck.IsStatusMonitorInstalled
|
||||
? "rddf"
|
||||
: "rddp";
|
||||
}
|
||||
else
|
||||
{
|
||||
ExpectedSource = DependencySourceType.Apmc;
|
||||
ExpectedSDKPrefix = "rddp";
|
||||
|
||||
if (!RegistryCheck.IsStatusMonitorInstalled)
|
||||
{
|
||||
|
|
@ -170,15 +170,10 @@
|
|||
bool successFlagExpected)
|
||||
{
|
||||
string actualSdkVersion = itemToValidate.tags[new ContextTagKeys().InternalSdkVersion];
|
||||
Assert.IsTrue(
|
||||
DependencySourceType.Apmc == DeploymentAndValidationTools.ExpectedSource
|
||||
? actualSdkVersion.Contains("rddp")
|
||||
: actualSdkVersion.Contains("rddf"), "Actual version:" + actualSdkVersion);
|
||||
Assert.IsTrue(actualSdkVersion.Contains(DeploymentAndValidationTools.ExpectedSDKPrefix), "Actual version:" + actualSdkVersion);
|
||||
|
||||
// Validate is within expected limits
|
||||
var ticks = (long)(itemToValidate.data.baseData.value * 10000);
|
||||
|
||||
var accessTime = TimeSpan.FromTicks(ticks);
|
||||
var accessTime = TimeSpan.Parse(itemToValidate.data.baseData.duration);
|
||||
|
||||
// DNS resolution may take up to 15 seconds https://msdn.microsoft.com/en-us/library/system.net.httpwebrequest.timeout(v=vs.110).aspx.
|
||||
// In future when tests will be refactored we should re-think failed http calls validation policy - need to validate resposnes that actually fails on GetResponse,
|
||||
|
|
|
|||
|
|
@ -389,7 +389,7 @@
|
|||
DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
|
||||
var httpItems =
|
||||
allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.Http).ToArray();
|
||||
allItems.Where(i => i.data.baseData.type == "Http").ToArray();
|
||||
|
||||
Assert.AreEqual(
|
||||
3*count,
|
||||
|
|
@ -422,7 +422,7 @@
|
|||
//// The above request would have trigged RDD module to monitor and create RDD telemetry
|
||||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var httpItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.Http).ToArray();
|
||||
var httpItems = allItems.Where(i => i.data.baseData.type == "Http").ToArray();
|
||||
|
||||
Assert.AreEqual(
|
||||
count,
|
||||
|
|
@ -448,7 +448,7 @@
|
|||
//// The above request would have trigged RDD module to monitor and create RDD telemetry
|
||||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var httpItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.Http).ToArray();
|
||||
var httpItems = allItems.Where(i => i.data.baseData.type == "Http").ToArray();
|
||||
|
||||
Assert.AreEqual(
|
||||
1,
|
||||
|
|
@ -481,7 +481,7 @@
|
|||
//// The above request would have trigged RDD module to monitor and create RDD telemetry
|
||||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var httpItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.Http).ToArray();
|
||||
var httpItems = allItems.Where(i => i.data.baseData.type == "Http").ToArray();
|
||||
|
||||
// Validate the RDD Telemetry properties
|
||||
Assert.AreEqual(
|
||||
|
|
@ -514,7 +514,7 @@
|
|||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var httpItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.Http).ToArray();
|
||||
var httpItems = allItems.Where(i => i.data.baseData.type == "Http").ToArray();
|
||||
|
||||
// Validate the RDD Telemetry properties
|
||||
Assert.AreEqual(
|
||||
|
|
@ -543,7 +543,7 @@
|
|||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var httpItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.Http).ToArray();
|
||||
var httpItems = allItems.Where(i => i.data.baseData.type == "Http").ToArray();
|
||||
|
||||
// Validate the RDD Telemetry properties
|
||||
Assert.AreEqual(
|
||||
|
|
@ -571,13 +571,13 @@
|
|||
//// The above request would have trigged RDD module to monitor and create RDD telemetry
|
||||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var httpItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.Http).ToArray();
|
||||
var httpItems = allItems.Where(i => i.data.baseData.type == "Http").ToArray();
|
||||
int countItem = 0;
|
||||
|
||||
foreach (var httpItem in httpItems)
|
||||
{
|
||||
var accessTime = httpItem.data.baseData.value;
|
||||
Assert.IsTrue(accessTime >= 0, "Access time should be above zero for azure calls");
|
||||
TimeSpan accessTime = TimeSpan.Parse(httpItem.data.baseData.duration);
|
||||
Assert.IsTrue(accessTime.TotalMilliseconds >= 0, "Access time should be above zero for azure calls");
|
||||
|
||||
var url = httpItem.data.baseData.name;
|
||||
if (url.Contains(expectedUrl))
|
||||
|
|
@ -602,7 +602,7 @@
|
|||
bool successFlagExpected,
|
||||
string verb)
|
||||
{
|
||||
if (DependencySourceType.Apmc == DeploymentAndValidationTools.ExpectedSource)
|
||||
if ("rddp" == DeploymentAndValidationTools.ExpectedSDKPrefix)
|
||||
{
|
||||
Assert.AreEqual(verb + " " + remoteDependencyNameExpected, itemToValidate.data.baseData.name, "For StatusMonitor implementation we expect verb to be collected.");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
//// The above request would have trigged RDD module to monitor and create RDD telemetry
|
||||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.SQL).ToArray();
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.type == "SQL").ToArray();
|
||||
Assert.AreEqual(1, sqlItems.Length, "Total Count of Remote Dependency items for SQL collected is wrong.");
|
||||
this.Validate(
|
||||
sqlItems[0],
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
application.ExecuteAnonymousRequest("?type=TestExecuteReaderTwice&count=1");
|
||||
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.SQL).ToArray();
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.type == "SQL").ToArray();
|
||||
|
||||
Assert.AreEqual(0, sqlItems.Length, "We don't have to collect any rdd as it is impossible to execute on the same command two async methods at the same time");
|
||||
});
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
//// The above request would have trigged RDD module to monitor and create RDD telemetry
|
||||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.SQL).ToArray();
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.type == "SQL").ToArray();
|
||||
Assert.AreEqual(1, sqlItems.Length, "We should only report 1 dependency call");
|
||||
});
|
||||
}
|
||||
|
|
@ -318,7 +318,7 @@
|
|||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.SQL).ToArray();
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.type == "SQL").ToArray();
|
||||
Assert.AreEqual(1, sqlItems.Length, "Total Count of Remote Dependency items for SQL collected is wrong.");
|
||||
|
||||
string queryToValidate = success ? string.Empty : InvalidSqlQueryToApmDatabase + extraClauseForFailureCase;
|
||||
|
|
@ -369,7 +369,7 @@
|
|||
//// Listen in the fake endpoint and see if the RDDTelemtry is captured
|
||||
|
||||
var allItems = DeploymentAndValidationTools.SdkEventListener.ReceiveAllItemsDuringTimeOfType<TelemetryItem<RemoteDependencyData>>(DeploymentAndValidationTools.SleepTimeForSdkToSendEvents);
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.dependencyKind == DependencyKind.SQL).ToArray();
|
||||
var sqlItems = allItems.Where(i => i.data.baseData.type == "SQL").ToArray();
|
||||
|
||||
|
||||
Assert.AreEqual(
|
||||
|
|
@ -407,7 +407,7 @@
|
|||
Assert.AreEqual(sqlErrorCodeExpected, itemToValidate.data.baseData.resultCode);
|
||||
|
||||
//If the command name is expected to be empty, the deserializer will make the CommandName null
|
||||
if (DependencySourceType.Apmc == DeploymentAndValidationTools.ExpectedSource)
|
||||
if ("rddp" == DeploymentAndValidationTools.ExpectedSDKPrefix)
|
||||
{
|
||||
// Additional checks for profiler collection
|
||||
if (!string.IsNullOrEmpty(sqlErrorMessageExpected))
|
||||
|
|
@ -417,11 +417,11 @@
|
|||
|
||||
if (string.IsNullOrEmpty(commandNameExpected))
|
||||
{
|
||||
Assert.IsNull(itemToValidate.data.baseData.commandName);
|
||||
Assert.IsNull(itemToValidate.data.baseData.data);
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.IsTrue(itemToValidate.data.baseData.commandName.Equals(commandNameExpected), "The command name is incorrect");
|
||||
Assert.IsTrue(itemToValidate.data.baseData.data.Equals(commandNameExpected), "The command name is incorrect");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
|
||||
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
|
||||
|
|
@ -12,4 +12,4 @@
|
|||
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
|
||||
<package id="WindowsAzure.Storage" version="4.2.1" targetFramework="net45" />
|
||||
<package id="WiX" version="3.10.1" targetFramework="net45" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.Common.props'))\Test.Common.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -33,12 +33,12 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="Microsoft.AI.ServerTelemetryChannel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2\lib\net40\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2-build31642\lib\net40\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
|
|
@ -259,4 +259,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="AspNet.ScriptManager.jQuery" version="1.8.2" targetFramework="net40" />
|
||||
<package id="AspNet.ScriptManager.jQuery.UI.Combined" version="1.8.24" targetFramework="net40" />
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
<package id="EntityFramework" version="5.0.0" targetFramework="net40" />
|
||||
<package id="jQuery" version="1.8.2" targetFramework="net40" />
|
||||
<package id="jQuery.UI.Combined" version="1.8.24" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.0" targetFramework="net40" />
|
||||
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.0" targetFramework="net40" />
|
||||
<package id="Microsoft.AspNet.Membership.OpenAuth" version="1.0.2" targetFramework="net40" />
|
||||
|
|
@ -29,4 +29,4 @@
|
|||
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
|
||||
<package id="Modernizr" version="2.6.2" targetFramework="net40" />
|
||||
<package id="System.Spatial" version="5.6.0" targetFramework="net40" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.Common.props'))\Test.Common.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -33,12 +33,12 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="Microsoft.AI.ServerTelemetryChannel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2-build31642\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -261,4 +261,4 @@
|
|||
copy "$(TargetDir)" "$(ProjectDir)bin"
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
|
||||
<package id="AspNet.ScriptManager.bootstrap" version="3.0.0" targetFramework="net45" />
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
|
||||
<package id="EntityFramework" version="6.1.0" targetFramework="net45" />
|
||||
<package id="jQuery" version="1.10.2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2-build31642" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.Identity.Core" version="2.0.0" targetFramework="net45" />
|
||||
|
|
@ -39,4 +39,4 @@
|
|||
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
|
||||
<package id="WebGrease" version="1.5.2" targetFramework="net45" />
|
||||
<package id="WindowsAzure.Storage" version="4.2.1" targetFramework="net45" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.Common.props'))\Test.Common.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -36,12 +36,12 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="Microsoft.AI.ServerTelemetryChannel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2-build31642\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -272,4 +272,4 @@
|
|||
copy "$(TargetDir)" "$(ProjectDir)bin"
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Antlr" version="3.4.1.9004" targetFramework="net451" />
|
||||
<package id="AspNet.ScriptManager.bootstrap" version="3.0.0" targetFramework="net451" />
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
<package id="bootstrap" version="3.0.0" targetFramework="net451" />
|
||||
<package id="EntityFramework" version="6.1.0" targetFramework="net451" />
|
||||
<package id="jQuery" version="1.10.2" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2-build31642" targetFramework="net451" />
|
||||
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net451" />
|
||||
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net451" />
|
||||
<package id="Microsoft.AspNet.Identity.Core" version="2.0.0" targetFramework="net451" />
|
||||
|
|
@ -39,4 +39,4 @@
|
|||
<package id="System.Spatial" version="5.6.0" targetFramework="net451" />
|
||||
<package id="WebGrease" version="1.5.2" targetFramework="net451" />
|
||||
<package id="WindowsAzure.Storage" version="4.2.1" targetFramework="net451" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'EnlistmentRoot.marker'))\Global.props" />
|
||||
|
|
@ -192,4 +192,4 @@
|
|||
</Target>
|
||||
<Import Project="..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(SolutionDir)\Test.Common.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -42,12 +42,12 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="Microsoft.AI.ServerTelemetryChannel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2\lib\net40\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2-build31642\lib\net40\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -198,4 +198,4 @@
|
|||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2-build31642" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net40" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(SolutionDir)\Test.Common.props" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -42,11 +42,11 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="Microsoft.AI.ServerTelemetryChannel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0-beta2-build31642\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<HintPath>..\..\..\..\..\..\packages\Microsoft.ApplicationInsights.2.2.0-beta2-build31642\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -174,4 +174,4 @@
|
|||
copy "$(TargetDir)" "$(ProjectDir)bin"
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.2.0-beta2-build31642" targetFramework="net451" />
|
||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.2.0-beta2-build31642" targetFramework="net451" />
|
||||
<package id="Microsoft.AspNet.WebApi" version="5.1.2" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi.Client" version="5.1.2" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi.Core" version="5.1.2" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.1.2" targetFramework="net45" />
|
||||
<package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="1.0.41" targetFramework="net45" />
|
||||
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
|
||||
|
|
@ -6,4 +6,4 @@
|
|||
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
|
||||
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
|
||||
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
|
||||
</packages>
|
||||
</packages>
|
||||
|
|
|
|||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче