diff --git a/Microsoft.ApplicationInsights.sln b/Microsoft.ApplicationInsights.sln index 5ab3eaecd..55166004e 100644 --- a/Microsoft.ApplicationInsights.sln +++ b/Microsoft.ApplicationInsights.sln @@ -36,43 +36,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServerTelemetryChannel", "S EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServerTelemetryChannel.Tests", "ServerTelemetryChannel.Tests", "{A61B048F-ECEA-4BED-A2ED-22834E7D4DFB}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Core.Shared", "src\Core\Managed\Shared\Core.Shared.shproj", "{C1AAA703-5E32-45C0-A69D-F46D1C659AE4}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Core.Shared.Tests", "Test\CoreSDK.Test\Shared\Core.Shared.Tests.shproj", "{C4A0DB5B-0988-4E04-B9B8-BCF3B0842000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Net40", "src\Core\Managed\Net40\Core.Net40.csproj", "{CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Net40.Tests", "Test\CoreSDK.Test\Net40\Core.Net40.Tests.csproj", "{394A78E5-2F8F-4D2D-AE08-027380C9F6B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Net45", "src\Core\Managed\Net45\Core.Net45.csproj", "{412659CA-49B0-4834-BFBF-8183055083C8}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTools", "src\BuildTools\BuildTools.csproj", "{08B950E4-EBDC-4AD8-8311-746F2E8DEAB2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Net45.Tests", "Test\CoreSDK.Test\Net45\Core.Net45.Tests.csproj", "{0927E682-4A56-45B6-8125-94FA066B2F57}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Net46", "src\Core\Managed\Net46\Core.Net46.csproj", "{958CFE53-53B7-4E26-846D-DA3F214013E6}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Net46.Tests", "Test\CoreSDK.Test\Net46\Core.Net46.Tests.csproj", "{0927E682-4A56-46B6-8125-94FA066B2F57}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Operation.CC.Shared", "src\Core\Managed\Operation.CC.Shared\Operation.CC.Shared.shproj", "{21350114-0BF7-4F90-9732-5395840E8CE0}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Operation.CC.Tests.Shared", "Test\CoreSDK.Test\Operation.CC.Shared.Tests\Operation.CC.Tests.Shared.shproj", "{4DC2927F-BB78-4363-8428-0F02955064BC}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Operation.AL.Shared", "src\Core\Managed\Operation.AL.Shared\Operation.AL.Shared.shproj", "{21350114-0BF7-4F90-9732-5395840E8CBB}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Operation.AL.Tests.Shared", "Test\CoreSDK.Test\Operation.AL.Shared.Tests\Operation.AL.Tests.Shared.shproj", "{4E54ED64-28B4-484F-AD5E-089FD2EC9B8B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.NuGet", "src\Core\NuGet\Core\Core.NuGet.csproj", "{B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}" - ProjectSection(ProjectDependencies) = postProject - {40CCD816-19FD-4B1D-9E24-AD2099351187} = {40CCD816-19FD-4B1D-9E24-AD2099351187} - {1B071D24-422B-4286-8793-50012916CF5B} = {1B071D24-422B-4286-8793-50012916CF5B} - {958CFE53-53B7-4E26-846D-DA3F214013E6} = {958CFE53-53B7-4E26-846D-DA3F214013E6} - {412659CA-49B0-4834-BFBF-8183055083C8} = {412659CA-49B0-4834-BFBF-8183055083C8} - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1} = {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DummyCore", "src\Core\Managed\DummyCore\DummyCore.csproj", "{40CCD816-19FD-4B1D-9E24-AD2099351187}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationInsightsTypes", "Test\CoreSDK.Test\ApplicationInsightsTypes\ApplicationInsightsTypes.csproj", "{4B0BC3B7-C7FC-4333-9E28-5790D9153F07}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared", "Test\TestFramework\Shared\TestFramework.Shared.shproj", "{F76C6CBD-29B0-4564-BDCB-C969F8FEC136}" @@ -93,7 +70,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared.Tests", "Test\Server EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TelemetryChannel.Nuget.Tests", "Test\ServerTelemetryChannel.Test\TelemetryChannel.Nuget.Tests\TelemetryChannel.Nuget.Tests.csproj", "{21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.NetStandard13", "src\Core\Managed\NetStandard13\Core.NetStandard13.csproj", "{1B071D24-422B-4286-8793-50012916CF5B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.NuGet", "src\Core\NuGet\Core.NuGet.csproj", "{32114B40-35BA-461F-93AC-A2DB7F7CE15B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DummyCore", "src\Core\DummyCore\DummyCore.csproj", "{40CCD816-19FD-4B1D-9E24-AD2099351187}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -105,24 +86,15 @@ Global Test\TestFramework\Shared\TestFramework.Shared.projitems*{0927e682-4a56-46b6-8125-94fa066b2f57}*SharedItemsImports = 4 src\TelemetryChannels\ServerTelemetryChannel\Shared\Shared.projitems*{18ce7397-7566-46d6-a52d-3b441363b326}*SharedItemsImports = 4 src\TelemetryChannels\ServerTelemetryChannel\Shared\Shared.projitems*{1ac957c0-e9a7-42bb-8820-ce2f6e5c937f}*SharedItemsImports = 4 - src\Core\Managed\Operation.AL.Shared\Operation.AL.Shared.projitems*{21350114-0bf7-4f90-9732-5395840e8cbb}*SharedItemsImports = 13 - src\Core\Managed\Operation.CC.Shared\Operation.CC.Shared.projitems*{21350114-0bf7-4f90-9732-5395840e8ce0}*SharedItemsImports = 13 Test\CoreSDK.Test\Operation.CC.Shared.Tests\Operation.CC.Tests.Shared.projitems*{394a78e5-2f8f-4d2d-ae08-027380c9f6b2}*SharedItemsImports = 4 Test\CoreSDK.Test\Shared\Core.Shared.Tests.projitems*{394a78e5-2f8f-4d2d-ae08-027380c9f6b2}*SharedItemsImports = 4 Test\TestFramework\Shared\TestFramework.Shared.projitems*{394a78e5-2f8f-4d2d-ae08-027380c9f6b2}*SharedItemsImports = 4 - src\Core\Managed\Operation.CC.Shared\Operation.CC.Shared.projitems*{412659ca-49b0-4834-bfbf-8183055083c8}*SharedItemsImports = 4 - src\Core\Managed\Shared\Shared.projitems*{412659ca-49b0-4834-bfbf-8183055083c8}*SharedItemsImports = 4 Test\CoreSDK.Test\Operation.CC.Shared.Tests\Operation.CC.Tests.Shared.projitems*{4dc2927f-bb78-4363-8428-0f02955064bc}*SharedItemsImports = 13 Test\CoreSDK.Test\Operation.AL.Shared.Tests\Operation.AL.Tests.Shared.projitems*{4e54ed64-28b4-484f-ad5e-089fd2ec9b8b}*SharedItemsImports = 13 - src\Core\Managed\Operation.AL.Shared\Operation.AL.Shared.projitems*{958cfe53-53b7-4e26-846d-da3f214013e6}*SharedItemsImports = 4 - src\Core\Managed\Shared\Shared.projitems*{958cfe53-53b7-4e26-846d-da3f214013e6}*SharedItemsImports = 4 Test\ServerTelemetryChannel.Test\Shared.Tests\Shared.Tests.projitems*{a7ccc704-cca9-492a-bb8a-3de5ee9aeac8}*SharedItemsImports = 4 Test\TestFramework\Shared\TestFramework.Shared.projitems*{a7ccc704-cca9-492a-bb8a-3de5ee9aeac8}*SharedItemsImports = 4 - src\Core\Managed\Shared\Shared.projitems*{c1aaa703-5e32-45c0-a69d-f46d1c659ae4}*SharedItemsImports = 13 Test\CoreSDK.Test\Shared\Core.Shared.Tests.projitems*{c4a0db5b-0988-4e04-b9b8-bcf3b0842000}*SharedItemsImports = 13 Test\ServerTelemetryChannel.Test\Shared.Tests\Shared.Tests.projitems*{c5a3f18f-1426-4941-9d81-d21062a2b8f2}*SharedItemsImports = 13 - src\Core\Managed\Operation.CC.Shared\Operation.CC.Shared.projitems*{cd752cd2-6711-4ad7-b5c8-f8c23cf076b1}*SharedItemsImports = 4 - src\Core\Managed\Shared\Shared.projitems*{cd752cd2-6711-4ad7-b5c8-f8c23cf076b1}*SharedItemsImports = 4 src\TelemetryChannels\ServerTelemetryChannel\Shared\Shared.projitems*{d03ac224-d6c9-4c64-9b82-619e28ff9ac6}*SharedItemsImports = 13 Test\ServerTelemetryChannel.Test\Shared.Tests\Shared.Tests.projitems*{dd9659be-7c0f-4298-82b2-5e957f95977a}*SharedItemsImports = 4 Test\TestFramework\Shared\TestFramework.Shared.projitems*{dd9659be-7c0f-4298-82b2-5e957f95977a}*SharedItemsImports = 4 @@ -141,22 +113,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Debug|x64.ActiveCfg = Debug|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Debug|x64.Build.0 = Debug|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Debug|x86.ActiveCfg = Debug|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Release|Any CPU.Build.0 = Release|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Release|ARM.ActiveCfg = Release|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Release|x64.ActiveCfg = Release|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Release|x64.Build.0 = Release|Any CPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1}.Release|x86.ActiveCfg = Release|Any CPU {394A78E5-2F8F-4D2D-AE08-027380C9F6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {394A78E5-2F8F-4D2D-AE08-027380C9F6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {394A78E5-2F8F-4D2D-AE08-027380C9F6B2}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -173,26 +129,6 @@ Global {394A78E5-2F8F-4D2D-AE08-027380C9F6B2}.Release|x64.ActiveCfg = Release|Any CPU {394A78E5-2F8F-4D2D-AE08-027380C9F6B2}.Release|x64.Build.0 = Release|Any CPU {394A78E5-2F8F-4D2D-AE08-027380C9F6B2}.Release|x86.ActiveCfg = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|ARM.ActiveCfg = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|ARM.Build.0 = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|x64.ActiveCfg = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|x64.Build.0 = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|x86.ActiveCfg = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Debug|x86.Build.0 = Debug|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|Any CPU.Build.0 = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|ARM.ActiveCfg = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|ARM.Build.0 = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|x64.ActiveCfg = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|x64.Build.0 = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|x86.ActiveCfg = Release|Any CPU - {412659CA-49B0-4834-BFBF-8183055083C8}.Release|x86.Build.0 = Release|Any CPU {08B950E4-EBDC-4AD8-8311-746F2E8DEAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {08B950E4-EBDC-4AD8-8311-746F2E8DEAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU {08B950E4-EBDC-4AD8-8311-746F2E8DEAB2}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -233,26 +169,6 @@ Global {0927E682-4A56-45B6-8125-94FA066B2F57}.Release|x64.Build.0 = Release|Any CPU {0927E682-4A56-45B6-8125-94FA066B2F57}.Release|x86.ActiveCfg = Release|Any CPU {0927E682-4A56-45B6-8125-94FA066B2F57}.Release|x86.Build.0 = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|ARM.Build.0 = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|x64.ActiveCfg = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|x64.Build.0 = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|x86.ActiveCfg = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Debug|x86.Build.0 = Debug|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|Any CPU.Build.0 = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|ARM.ActiveCfg = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|ARM.Build.0 = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|x64.ActiveCfg = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|x64.Build.0 = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|x86.ActiveCfg = Release|Any CPU - {958CFE53-53B7-4E26-846D-DA3F214013E6}.Release|x86.Build.0 = Release|Any CPU {0927E682-4A56-46B6-8125-94FA066B2F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0927E682-4A56-46B6-8125-94FA066B2F57}.Debug|Any CPU.Build.0 = Debug|Any CPU {0927E682-4A56-46B6-8125-94FA066B2F57}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -273,46 +189,6 @@ Global {0927E682-4A56-46B6-8125-94FA066B2F57}.Release|x64.Build.0 = Release|Any CPU {0927E682-4A56-46B6-8125-94FA066B2F57}.Release|x86.ActiveCfg = Release|Any CPU {0927E682-4A56-46B6-8125-94FA066B2F57}.Release|x86.Build.0 = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|ARM.Build.0 = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|x64.ActiveCfg = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|x64.Build.0 = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|x86.ActiveCfg = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Debug|x86.Build.0 = Debug|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|Any CPU.Build.0 = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|ARM.ActiveCfg = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|ARM.Build.0 = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|x64.ActiveCfg = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|x64.Build.0 = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|x86.ActiveCfg = Release|Any CPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B}.Release|x86.Build.0 = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|ARM.ActiveCfg = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|ARM.Build.0 = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|x64.ActiveCfg = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|x64.Build.0 = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|x86.ActiveCfg = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|x86.Build.0 = Debug|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|Any CPU.Build.0 = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|ARM.ActiveCfg = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|ARM.Build.0 = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|x64.ActiveCfg = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|x64.Build.0 = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|x86.ActiveCfg = Release|Any CPU - {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|x86.Build.0 = Release|Any CPU {4B0BC3B7-C7FC-4333-9E28-5790D9153F07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B0BC3B7-C7FC-4333-9E28-5790D9153F07}.Debug|Any CPU.Build.0 = Debug|Any CPU {4B0BC3B7-C7FC-4333-9E28-5790D9153F07}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -453,45 +329,77 @@ Global {21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC}.Release|x64.Build.0 = Release|Any CPU {21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC}.Release|x86.ActiveCfg = Release|Any CPU {21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC}.Release|x86.Build.0 = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|ARM.Build.0 = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|x64.ActiveCfg = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|x64.Build.0 = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|x86.ActiveCfg = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Debug|x86.Build.0 = Debug|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|Any CPU.Build.0 = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|ARM.ActiveCfg = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|ARM.Build.0 = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|x64.ActiveCfg = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|x64.Build.0 = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|x86.ActiveCfg = Release|Any CPU - {1B071D24-422B-4286-8793-50012916CF5B}.Release|x86.Build.0 = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|ARM.Build.0 = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|x64.ActiveCfg = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|x64.Build.0 = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|x86.ActiveCfg = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Debug|x86.Build.0 = Debug|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|Any CPU.Build.0 = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|ARM.ActiveCfg = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|ARM.Build.0 = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|x64.ActiveCfg = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|x64.Build.0 = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|x86.ActiveCfg = Release|Any CPU + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED}.Release|x86.Build.0 = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|ARM.Build.0 = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|x64.ActiveCfg = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|x64.Build.0 = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|x86.ActiveCfg = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Debug|x86.Build.0 = Debug|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|Any CPU.Build.0 = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|ARM.ActiveCfg = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|ARM.Build.0 = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|x64.ActiveCfg = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|x64.Build.0 = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|x86.ActiveCfg = Release|Any CPU + {32114B40-35BA-461F-93AC-A2DB7F7CE15B}.Release|x86.Build.0 = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|Any CPU.Build.0 = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|ARM.ActiveCfg = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|ARM.Build.0 = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|x64.ActiveCfg = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|x64.Build.0 = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|x86.ActiveCfg = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Debug|x86.Build.0 = Debug|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|Any CPU.ActiveCfg = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|Any CPU.Build.0 = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|ARM.ActiveCfg = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|ARM.Build.0 = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|x64.ActiveCfg = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|x64.Build.0 = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|x86.ActiveCfg = Release|Any CPU + {40CCD816-19FD-4B1D-9E24-AD2099351187}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {C1AAA703-5E32-45C0-A69D-F46D1C659AE4} = {68CC2924-E162-44BE-8D7A-DBA385365585} {C4A0DB5B-0988-4E04-B9B8-BCF3B0842000} = {C2FEEDE5-8CAE-41A4-8932-42D284A86EA7} - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1} = {68CC2924-E162-44BE-8D7A-DBA385365585} {394A78E5-2F8F-4D2D-AE08-027380C9F6B2} = {C2FEEDE5-8CAE-41A4-8932-42D284A86EA7} - {412659CA-49B0-4834-BFBF-8183055083C8} = {68CC2924-E162-44BE-8D7A-DBA385365585} {0927E682-4A56-45B6-8125-94FA066B2F57} = {C2FEEDE5-8CAE-41A4-8932-42D284A86EA7} - {958CFE53-53B7-4E26-846D-DA3F214013E6} = {68CC2924-E162-44BE-8D7A-DBA385365585} {0927E682-4A56-46B6-8125-94FA066B2F57} = {C2FEEDE5-8CAE-41A4-8932-42D284A86EA7} - {21350114-0BF7-4F90-9732-5395840E8CE0} = {68CC2924-E162-44BE-8D7A-DBA385365585} {4DC2927F-BB78-4363-8428-0F02955064BC} = {C2FEEDE5-8CAE-41A4-8932-42D284A86EA7} - {21350114-0BF7-4F90-9732-5395840E8CBB} = {68CC2924-E162-44BE-8D7A-DBA385365585} {4E54ED64-28B4-484F-AD5E-089FD2EC9B8B} = {C2FEEDE5-8CAE-41A4-8932-42D284A86EA7} - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B} = {05ACA4F0-E560-4E7A-BF50-1C248DAAA0D2} - {40CCD816-19FD-4B1D-9E24-AD2099351187} = {68CC2924-E162-44BE-8D7A-DBA385365585} {4B0BC3B7-C7FC-4333-9E28-5790D9153F07} = {BED5EB47-4AB1-4387-98B6-83CC327D6D16} {F76C6CBD-29B0-4564-BDCB-C969F8FEC136} = {C2FEEDE5-8CAE-41A4-8932-42D284A86EA7} {F98B49CB-9AC5-45C3-82D9-7F407AC08EF4} = {05ACA4F0-E560-4E7A-BF50-1C248DAAA0D2} @@ -502,6 +410,8 @@ Global {DD9659BE-7C0F-4298-82B2-5E957F95977A} = {A61B048F-ECEA-4BED-A2ED-22834E7D4DFB} {C5A3F18F-1426-4941-9D81-D21062A2B8F2} = {A61B048F-ECEA-4BED-A2ED-22834E7D4DFB} {21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC} = {A61B048F-ECEA-4BED-A2ED-22834E7D4DFB} - {1B071D24-422B-4286-8793-50012916CF5B} = {68CC2924-E162-44BE-8D7A-DBA385365585} + {E9ECEE96-DD50-42F6-9F33-0978CDFA15ED} = {68CC2924-E162-44BE-8D7A-DBA385365585} + {32114B40-35BA-461F-93AC-A2DB7F7CE15B} = {05ACA4F0-E560-4E7A-BF50-1C248DAAA0D2} + {40CCD816-19FD-4B1D-9E24-AD2099351187} = {68CC2924-E162-44BE-8D7A-DBA385365585} EndGlobalSection EndGlobal diff --git a/Test/CoreSDK.Test/Net40/Core.Net40.Tests.csproj b/Test/CoreSDK.Test/Net40/Core.Net40.Tests.csproj index 542cbc7d6..8dbcb8b30 100644 --- a/Test/CoreSDK.Test/Net40/Core.Net40.Tests.csproj +++ b/Test/CoreSDK.Test/Net40/Core.Net40.Tests.csproj @@ -56,9 +56,9 @@ - - {cd752cd2-6711-4ad7-b5c8-f8c23cf076b1} - Core.Net40 + + {e9ecee96-dd50-42f6-9f33-0978cdfa15ed} + Core {4b0bc3b7-c7fc-4333-9e28-5790d9153f07} diff --git a/Test/CoreSDK.Test/Net45/Core.Net45.Tests.csproj b/Test/CoreSDK.Test/Net45/Core.Net45.Tests.csproj index 302f2cc13..cede40dbf 100644 --- a/Test/CoreSDK.Test/Net45/Core.Net45.Tests.csproj +++ b/Test/CoreSDK.Test/Net45/Core.Net45.Tests.csproj @@ -36,7 +36,7 @@ - + ..\..\..\..\packages\xunit.assert.2.0.0-beta-build2650\lib\portable-net45+win+wpa81+wp80\xunit.assert.dll @@ -50,8 +50,9 @@ - - Core.Net45 + + {e9ecee96-dd50-42f6-9f33-0978cdfa15ed} + Core {4b0bc3b7-c7fc-4333-9e28-5790d9153f07} @@ -59,7 +60,10 @@ - + + + Designer + diff --git a/Test/CoreSDK.Test/Net45/app.config b/Test/CoreSDK.Test/Net45/app.config new file mode 100644 index 000000000..8460dd432 --- /dev/null +++ b/Test/CoreSDK.Test/Net45/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Test/CoreSDK.Test/Net45/packages.config b/Test/CoreSDK.Test/Net45/packages.config index b12359a86..51621f5cc 100644 --- a/Test/CoreSDK.Test/Net45/packages.config +++ b/Test/CoreSDK.Test/Net45/packages.config @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/Test/CoreSDK.Test/Net46/Core.Net46.Tests.csproj b/Test/CoreSDK.Test/Net46/Core.Net46.Tests.csproj index b59fc001b..f30de15a5 100644 --- a/Test/CoreSDK.Test/Net46/Core.Net46.Tests.csproj +++ b/Test/CoreSDK.Test/Net46/Core.Net46.Tests.csproj @@ -36,7 +36,7 @@ - + ..\..\..\..\packages\xunit.assert.2.0.0-beta-build2650\lib\portable-net45+win+wpa81+wp80\xunit.assert.dll @@ -48,9 +48,9 @@ - - {958cfe53-53b7-4e26-846d-da3f214013e6} - Core.Net46 + + {e9ecee96-dd50-42f6-9f33-0978cdfa15ed} + Core {4b0bc3b7-c7fc-4333-9e28-5790d9153f07} @@ -58,6 +58,7 @@ + diff --git a/Test/CoreSDK.Test/Net46/app.config b/Test/CoreSDK.Test/Net46/app.config new file mode 100644 index 000000000..8460dd432 --- /dev/null +++ b/Test/CoreSDK.Test/Net46/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Test/CoreSDK.Test/Net46/packages.config b/Test/CoreSDK.Test/Net46/packages.config index 90aba3007..607083b13 100644 --- a/Test/CoreSDK.Test/Net46/packages.config +++ b/Test/CoreSDK.Test/Net46/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/Test/ServerTelemetryChannel.Test/Net40.Tests/TelemetryChannel.Net40.Tests.csproj b/Test/ServerTelemetryChannel.Test/Net40.Tests/TelemetryChannel.Net40.Tests.csproj index 421088668..b27107ebf 100644 --- a/Test/ServerTelemetryChannel.Test/Net40.Tests/TelemetryChannel.Net40.Tests.csproj +++ b/Test/ServerTelemetryChannel.Test/Net40.Tests/TelemetryChannel.Net40.Tests.csproj @@ -75,9 +75,9 @@ - - {cd752cd2-6711-4ad7-b5c8-f8c23cf076b1} - Core.Net40 + + {e9ecee96-dd50-42f6-9f33-0978cdfa15ed} + Core {1ac957c0-e9a7-42bb-8820-ce2f6e5c937f} diff --git a/Test/ServerTelemetryChannel.Test/Net45.Tests/TelemetryChannel.Net45.Tests.csproj b/Test/ServerTelemetryChannel.Test/Net45.Tests/TelemetryChannel.Net45.Tests.csproj index 0ff88c83a..5c6217766 100644 --- a/Test/ServerTelemetryChannel.Test/Net45.Tests/TelemetryChannel.Net45.Tests.csproj +++ b/Test/ServerTelemetryChannel.Test/Net45.Tests/TelemetryChannel.Net45.Tests.csproj @@ -61,9 +61,9 @@ - - {412659ca-49b0-4834-bfbf-8183055083c8} - Core.Net45 + + {e9ecee96-dd50-42f6-9f33-0978cdfa15ed} + Core {18CE7397-7566-46D6-A52D-3B441363B326} diff --git a/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj b/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj index 55af2c298..6cc725253 100644 --- a/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj +++ b/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj @@ -50,9 +50,9 @@ - - {412659ca-49b0-4834-bfbf-8183055083c8} - Core.Net45 + + {e9ecee96-dd50-42f6-9f33-0978cdfa15ed} + Core {18ce7397-7566-46d6-a52d-3b441363b326} @@ -67,5 +67,5 @@ - + \ No newline at end of file diff --git a/buildDebug.cmd b/buildDebug.cmd index 38d2332bd..88cc6c86c 100644 --- a/buildDebug.cmd +++ b/buildDebug.cmd @@ -2,14 +2,12 @@ IF NOT DEFINED MSBUILD CALL findMsBuild.cmd -SET dotNetPath=%systemdrive%\Windows\Microsoft.NET\Framework\v4.0.30319\; -IF NOT "x!PATH:%dotNetPath%=!"=="x%PATH%" SET PATH=%PATH%;%dotNetPath% - SET ToolsVersion=15.0 SET ProjectName=Msbuild.All SET Configuration=Debug SET Platform="Mixed Platforms" +nuget.exe restore -NonInteractive "%MSBUILD%" dirs.proj /nologo /m:1 /fl /toolsversion:%ToolsVersion% /flp:logfile=%ProjectName%.%Platform%.log;v=d /flp1:logfile=%ProjectName%.%Platform%.wrn;warningsonly /flp2:logfile=%ProjectName%.%Platform%.err;errorsonly /p:Configuration=%Configuration% /p:Platform=%Platform% /p:RunCodeAnalysis="False" /flp3:logfile=%ProjectName%.%Platform%.prf;performancesummary /flp4:logfile=%ProjectName%.%Platform%.exec.log;showcommandline /p:BuildSingleFilePackage=true PAUSE diff --git a/buildRelease.cmd b/buildRelease.cmd index 1a97a1b1a..9f58c0b59 100644 --- a/buildRelease.cmd +++ b/buildRelease.cmd @@ -2,14 +2,12 @@ IF NOT DEFINED MSBUILD CALL findMsBuild.cmd -SET dotNetPath=%systemdrive%\Windows\Microsoft.NET\Framework\v4.0.30319\; -IF NOT "x!PATH:%dotNetPath%=!"=="x%PATH%" SET PATH=%PATH%;%dotNetPath% - SET ToolsVersion=15.0 SET ProjectName=Msbuild.All SET Configuration=Release SET Platform="Mixed Platforms" +nuget.exe restore -NonInteractive "%MSBUILD%" dirs.proj /nologo /m:1 /fl /toolsversion:%ToolsVersion% /flp:logfile=%ProjectName%.%Platform%.log;v=d /flp1:logfile=%ProjectName%.%Platform%.wrn;warningsonly /flp2:logfile=%ProjectName%.%Platform%.err;errorsonly /p:Configuration=%Configuration% /p:Platform=%Platform% /p:RunCodeAnalysis="False" /flp3:logfile=%ProjectName%.%Platform%.prf;performancesummary /flp4:logfile=%ProjectName%.%Platform%.exec.log;showcommandline /p:BuildSingleFilePackage=true PAUSE diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj new file mode 100644 index 000000000..68cb4bf46 --- /dev/null +++ b/src/Core/Core.csproj @@ -0,0 +1,49 @@ + + + + + + + Microsoft + Copyright © Microsoft. All Rights Reserved. + false + false + false + false + false + false + + net40;net45;net46;netstandard1.3 + false + $(DefaultItemExcludes);DummyCore\**;NuGet\** + + + $(DefineConstants);CORE_PCL + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Core/Managed/DummyCore/DummyCore.csproj b/src/Core/DummyCore/DummyCore.csproj similarity index 75% rename from src/Core/Managed/DummyCore/DummyCore.csproj rename to src/Core/DummyCore/DummyCore.csproj index 24c3ff785..66af2d4de 100644 --- a/src/Core/Managed/DummyCore/DummyCore.csproj +++ b/src/Core/DummyCore/DummyCore.csproj @@ -1,6 +1,6 @@  - + @@ -19,7 +19,7 @@ - ..\..\..\..\..\packages\Microsoft.ApplicationInsights.1.2.3\lib\net45\Microsoft.ApplicationInsights.dll + ..\..\..\..\packages\Microsoft.ApplicationInsights.1.2.3\lib\net45\Microsoft.ApplicationInsights.dll True @@ -43,8 +43,8 @@ - - + + @@ -54,5 +54,5 @@ - + \ No newline at end of file diff --git a/src/Core/Managed/DummyCore/Readme.cs b/src/Core/DummyCore/Readme.cs similarity index 100% rename from src/Core/Managed/DummyCore/Readme.cs rename to src/Core/DummyCore/Readme.cs diff --git a/src/Core/Managed/DummyCore/packages.config b/src/Core/DummyCore/packages.config similarity index 100% rename from src/Core/Managed/DummyCore/packages.config rename to src/Core/DummyCore/packages.config diff --git a/src/Core/Managed/Net40/Core.Net40.csproj b/src/Core/Managed/Net40/Core.Net40.csproj deleted file mode 100644 index f369181bb..000000000 --- a/src/Core/Managed/Net40/Core.Net40.csproj +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - Debug - AnyCPU - {CD752CD2-6711-4AD7-B5C8-F8C23CF076B1} - Library - Properties - v4.0 - 512 - ..\..\..\..\ - $(DefineConstants);NET40 - - - - - - ..\..\..\..\ApplicationInsightsSDKRules.ruleset - true - - - - - False - ..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll - True - - - - - - - - - - - - - Designer - - - Designer - - - - - Extensibility\Implementation\External\AjaxCallData.cs - - - Extensibility\Implementation\External\AvailabilityData.cs - - - Extensibility\Implementation\External\DataPoint.cs - - - Extensibility\Implementation\External\EventData.cs - - - Extensibility\Implementation\External\ExceptionData.cs - - - Extensibility\Implementation\External\MessageData.cs - - - Extensibility\Implementation\External\MetricData.cs - - - Extensibility\Implementation\External\PageViewData.cs - - - Extensibility\Implementation\External\PageViewPerfData.cs - - - Extensibility\Implementation\External\PerformanceCounterData.cs - - - Extensibility\Implementation\External\RemoteDependencyData.cs - - - Extensibility\Implementation\External\RequestData.cs - - - Extensibility\Implementation\External\SessionStateData.cs - - - Extensibility\Implementation\External\StackFrame.cs - - - Extensibility\Implementation\RichPayloadEventSource.cs - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Net40/Settings.StyleCop b/src/Core/Managed/Net40/Settings.StyleCop deleted file mode 100644 index bb05f99bc..000000000 --- a/src/Core/Managed/Net40/Settings.StyleCop +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Core/Managed/Net40/app.config b/src/Core/Managed/Net40/app.config deleted file mode 100644 index e03ea0a5f..000000000 --- a/src/Core/Managed/Net40/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Net40/packages.config b/src/Core/Managed/Net40/packages.config deleted file mode 100644 index b7bbf57be..000000000 --- a/src/Core/Managed/Net40/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Net45/Core.Net45.csproj b/src/Core/Managed/Net45/Core.Net45.csproj deleted file mode 100644 index 6f4de4fa8..000000000 --- a/src/Core/Managed/Net45/Core.Net45.csproj +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - Debug - AnyCPU - {412659CA-49B0-4834-BFBF-8183055083C8} - Library - Microsoft.ApplicationInsights - Microsoft.ApplicationInsights - v4.5 - 512 - - - - $(DefineConstants);NET45 - - - true - ..\..\..\..\ApplicationInsightsSDKRules.ruleset - - - - - - - - - - - - - - - - - - Extensibility\Platform\PlatformImplementation.cs - - - Extensibility\Implementation\TelemetryConfigurationFactory.cs - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Net45/packages.config b/src/Core/Managed/Net45/packages.config deleted file mode 100644 index 1dd29e65d..000000000 --- a/src/Core/Managed/Net45/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Net46/Core.Net46.csproj b/src/Core/Managed/Net46/Core.Net46.csproj deleted file mode 100644 index 627b78316..000000000 --- a/src/Core/Managed/Net46/Core.Net46.csproj +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - Debug - AnyCPU - {958CFE53-53B7-4E26-846D-DA3F214013E6} - Library - Microsoft.ApplicationInsights - Microsoft.ApplicationInsights - v4.6 - 512 - - - - $(DefineConstants);NET46; - - - true - ..\..\..\..\ApplicationInsightsSDKRules.ruleset - - - - - - - - - - - - - - - - - - Extensibility\Platform\PlatformImplementation.cs - - - Extensibility\Implementation\TelemetryConfigurationFactory.cs - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Net46/packages.config b/src/Core/Managed/Net46/packages.config deleted file mode 100644 index 46237b293..000000000 --- a/src/Core/Managed/Net46/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/NetStandard13/Core.NetStandard13.csproj b/src/Core/Managed/NetStandard13/Core.NetStandard13.csproj deleted file mode 100644 index cab4c4b20..000000000 --- a/src/Core/Managed/NetStandard13/Core.NetStandard13.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - netstandard1.3 - $(DefineConstants);CORE_PCL - Microsoft.ApplicationInsights - 1.6.0 - false - - - - - - - - - - - - - - - - - diff --git a/src/Core/Managed/Operation.AL.Shared/Operation.AL.Shared.projitems b/src/Core/Managed/Operation.AL.Shared/Operation.AL.Shared.projitems deleted file mode 100644 index 834962568..000000000 --- a/src/Core/Managed/Operation.AL.Shared/Operation.AL.Shared.projitems +++ /dev/null @@ -1,22 +0,0 @@ - - - - {C6425564-9EFE-49B3-B309-4D5FB55A53bb} - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 669e7e58-072d-4b0a-a4dd-4eb2ae2ea4bb - - - Microsoft.ApplicationInsights.Operation - - - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Operation.AL.Shared/Operation.AL.Shared.shproj b/src/Core/Managed/Operation.AL.Shared/Operation.AL.Shared.shproj deleted file mode 100644 index fae81b2e0..000000000 --- a/src/Core/Managed/Operation.AL.Shared/Operation.AL.Shared.shproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - 21350114-0bf7-4f90-9732-5395840e8cbb - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Operation.CC.Shared/Operation.CC.Shared.projitems b/src/Core/Managed/Operation.CC.Shared/Operation.CC.Shared.projitems deleted file mode 100644 index c26d0fedb..000000000 --- a/src/Core/Managed/Operation.CC.Shared/Operation.CC.Shared.projitems +++ /dev/null @@ -1,22 +0,0 @@ - - - - {C6425564-9EFE-49B3-B309-4D5FB55A5355} - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 669e7e58-072d-4b0a-a4dd-4eb2ae2ea4d4 - - - Microsoft.ApplicationInsights.Operation - - - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Operation.CC.Shared/Operation.CC.Shared.shproj b/src/Core/Managed/Operation.CC.Shared/Operation.CC.Shared.shproj deleted file mode 100644 index acb47de99..000000000 --- a/src/Core/Managed/Operation.CC.Shared/Operation.CC.Shared.shproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - 21350114-0bf7-4f90-9732-5395840e8ce0 - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Shared/Core.Shared.shproj b/src/Core/Managed/Shared/Core.Shared.shproj deleted file mode 100644 index 000050d75..000000000 --- a/src/Core/Managed/Shared/Core.Shared.shproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - c1aaa703-5e32-45c0-a69d-f46d1c659ae4 - - - - - - - - \ No newline at end of file diff --git a/src/Core/Managed/Shared/Shared.projitems b/src/Core/Managed/Shared/Shared.projitems deleted file mode 100644 index 9b92979e3..000000000 --- a/src/Core/Managed/Shared/Shared.projitems +++ /dev/null @@ -1,135 +0,0 @@ - - - - {775f88f7-23bf-4df6-85d9-7dc9822d29f4} - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - c1aaa703-5e32-45c0-a69d-f46d1c659ae4 - - - Microsoft.ApplicationInsights - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Core/NuGet/Core.NuGet.csproj b/src/Core/NuGet/Core.NuGet.csproj new file mode 100644 index 000000000..1d34c148e --- /dev/null +++ b/src/Core/NuGet/Core.NuGet.csproj @@ -0,0 +1,26 @@ + + + + + + net46 + false + true + false + $(MSBuildProjectDirectory)\Package.nuspec + $(BinRoot)\$(Configuration)\Core\net46\Microsoft.ApplicationInsights.dll + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Core/NuGet/Core/Core.NuGet.csproj b/src/Core/NuGet/Core/Core.NuGet.csproj deleted file mode 100644 index 5f77692c4..000000000 --- a/src/Core/NuGet/Core/Core.NuGet.csproj +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - Debug - AnyCPU - {B69CBB57-4D1F-4FBE-B4AB-FD87EDBEE12B} - Library - $(BinRoot)\$(Configuration)\Core\NuGet\Core - Microsoft.ApplicationInsights.NuGet - Microsoft.ApplicationInsights.NuGet - v4.6 - 512 - - 2008 - ..\..\..\..\ - $(MSBuildProjectDirectory)\Package.nuspec - $(BinRoot)\$(Configuration)\Core\Managed\Net40\Microsoft.ApplicationInsights.dll - - - - - - - - Designer - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/Core/NuGet/Core/packages.config b/src/Core/NuGet/Core/packages.config deleted file mode 100644 index 251e4b990..000000000 --- a/src/Core/NuGet/Core/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Core/NuGet/Core/Package.nuspec b/src/Core/NuGet/Package.nuspec similarity index 56% rename from src/Core/NuGet/Core/Package.nuspec rename to src/Core/NuGet/Package.nuspec index ad67d1786..5827ff014 100644 --- a/src/Core/NuGet/Core/Package.nuspec +++ b/src/Core/NuGet/Package.nuspec @@ -34,32 +34,32 @@ - - - + + + - - - + + + - - - + + + - - - + + + - + - + - + diff --git a/src/Core/Managed/Operation.AL.Shared/Extensibility/Implementation/AsyncLocalBasedOperationHolder.cs b/src/Core/Operation.AL.Shared/Extensibility/Implementation/AsyncLocalBasedOperationHolder.cs similarity index 100% rename from src/Core/Managed/Operation.AL.Shared/Extensibility/Implementation/AsyncLocalBasedOperationHolder.cs rename to src/Core/Operation.AL.Shared/Extensibility/Implementation/AsyncLocalBasedOperationHolder.cs diff --git a/src/Core/Managed/Operation.AL.Shared/Extensibility/Implementation/AsyncLocalHelpers.cs b/src/Core/Operation.AL.Shared/Extensibility/Implementation/AsyncLocalHelpers.cs similarity index 100% rename from src/Core/Managed/Operation.AL.Shared/Extensibility/Implementation/AsyncLocalHelpers.cs rename to src/Core/Operation.AL.Shared/Extensibility/Implementation/AsyncLocalHelpers.cs diff --git a/src/Core/Managed/Operation.AL.Shared/Extensibility/Implementation/OperationContextForAsyncLocal.cs b/src/Core/Operation.AL.Shared/Extensibility/Implementation/OperationContextForAsyncLocal.cs similarity index 100% rename from src/Core/Managed/Operation.AL.Shared/Extensibility/Implementation/OperationContextForAsyncLocal.cs rename to src/Core/Operation.AL.Shared/Extensibility/Implementation/OperationContextForAsyncLocal.cs diff --git a/src/Core/Managed/Operation.AL.Shared/Extensibility/OperationCorrelationTelemetryInitializer.cs b/src/Core/Operation.AL.Shared/Extensibility/OperationCorrelationTelemetryInitializer.cs similarity index 100% rename from src/Core/Managed/Operation.AL.Shared/Extensibility/OperationCorrelationTelemetryInitializer.cs rename to src/Core/Operation.AL.Shared/Extensibility/OperationCorrelationTelemetryInitializer.cs diff --git a/src/Core/Managed/Operation.AL.Shared/Extensibility/SdkInternalOperationsMonitor.cs b/src/Core/Operation.AL.Shared/Extensibility/SdkInternalOperationsMonitor.cs similarity index 100% rename from src/Core/Managed/Operation.AL.Shared/Extensibility/SdkInternalOperationsMonitor.cs rename to src/Core/Operation.AL.Shared/Extensibility/SdkInternalOperationsMonitor.cs diff --git a/src/Core/Managed/Operation.AL.Shared/TelemetryClientExtensions.cs b/src/Core/Operation.AL.Shared/TelemetryClientExtensions.cs similarity index 100% rename from src/Core/Managed/Operation.AL.Shared/TelemetryClientExtensions.cs rename to src/Core/Operation.AL.Shared/TelemetryClientExtensions.cs diff --git a/src/Core/Managed/Operation.CC.Shared/Extensibility/Implementation/CallContextBasedOperationHolder.cs b/src/Core/Operation.CC.Shared/Extensibility/Implementation/CallContextBasedOperationHolder.cs similarity index 100% rename from src/Core/Managed/Operation.CC.Shared/Extensibility/Implementation/CallContextBasedOperationHolder.cs rename to src/Core/Operation.CC.Shared/Extensibility/Implementation/CallContextBasedOperationHolder.cs diff --git a/src/Core/Managed/Operation.CC.Shared/Extensibility/Implementation/CallContextHelpers.cs b/src/Core/Operation.CC.Shared/Extensibility/Implementation/CallContextHelpers.cs similarity index 100% rename from src/Core/Managed/Operation.CC.Shared/Extensibility/Implementation/CallContextHelpers.cs rename to src/Core/Operation.CC.Shared/Extensibility/Implementation/CallContextHelpers.cs diff --git a/src/Core/Managed/Operation.CC.Shared/Extensibility/Implementation/OperationContextForCallContext.cs b/src/Core/Operation.CC.Shared/Extensibility/Implementation/OperationContextForCallContext.cs similarity index 100% rename from src/Core/Managed/Operation.CC.Shared/Extensibility/Implementation/OperationContextForCallContext.cs rename to src/Core/Operation.CC.Shared/Extensibility/Implementation/OperationContextForCallContext.cs diff --git a/src/Core/Managed/Operation.CC.Shared/Extensibility/OperationCorrelationTelemetryInitializer.cs b/src/Core/Operation.CC.Shared/Extensibility/OperationCorrelationTelemetryInitializer.cs similarity index 100% rename from src/Core/Managed/Operation.CC.Shared/Extensibility/OperationCorrelationTelemetryInitializer.cs rename to src/Core/Operation.CC.Shared/Extensibility/OperationCorrelationTelemetryInitializer.cs diff --git a/src/Core/Managed/Operation.CC.Shared/Extensibility/SdkInternalOperationsMonitor.cs b/src/Core/Operation.CC.Shared/Extensibility/SdkInternalOperationsMonitor.cs similarity index 100% rename from src/Core/Managed/Operation.CC.Shared/Extensibility/SdkInternalOperationsMonitor.cs rename to src/Core/Operation.CC.Shared/Extensibility/SdkInternalOperationsMonitor.cs diff --git a/src/Core/Managed/Operation.CC.Shared/TelemetryClientExtensions.cs b/src/Core/Operation.CC.Shared/TelemetryClientExtensions.cs similarity index 100% rename from src/Core/Managed/Operation.CC.Shared/TelemetryClientExtensions.cs rename to src/Core/Operation.CC.Shared/TelemetryClientExtensions.cs diff --git a/src/Core/Managed/Product.props b/src/Core/Product.props similarity index 100% rename from src/Core/Managed/Product.props rename to src/Core/Product.props diff --git a/src/Core/Managed/Shared/Channel/ITelemetry.cs b/src/Core/Shared/Channel/ITelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/Channel/ITelemetry.cs rename to src/Core/Shared/Channel/ITelemetry.cs diff --git a/src/Core/Managed/Shared/Channel/ITelemetryChannel.cs b/src/Core/Shared/Channel/ITelemetryChannel.cs similarity index 100% rename from src/Core/Managed/Shared/Channel/ITelemetryChannel.cs rename to src/Core/Shared/Channel/ITelemetryChannel.cs diff --git a/src/Core/Managed/Shared/Channel/InMemoryChannel.cs b/src/Core/Shared/Channel/InMemoryChannel.cs similarity index 100% rename from src/Core/Managed/Shared/Channel/InMemoryChannel.cs rename to src/Core/Shared/Channel/InMemoryChannel.cs diff --git a/src/Core/Managed/Shared/Channel/InMemoryTransmitter.cs b/src/Core/Shared/Channel/InMemoryTransmitter.cs similarity index 100% rename from src/Core/Managed/Shared/Channel/InMemoryTransmitter.cs rename to src/Core/Shared/Channel/InMemoryTransmitter.cs diff --git a/src/Core/Managed/Shared/Channel/TelemetryBuffer.cs b/src/Core/Shared/Channel/TelemetryBuffer.cs similarity index 100% rename from src/Core/Managed/Shared/Channel/TelemetryBuffer.cs rename to src/Core/Shared/Channel/TelemetryBuffer.cs diff --git a/src/Core/Managed/Shared/Channel/Transmission.cs b/src/Core/Shared/Channel/Transmission.cs similarity index 100% rename from src/Core/Managed/Shared/Channel/Transmission.cs rename to src/Core/Shared/Channel/Transmission.cs diff --git a/src/Core/Managed/Shared/Constants.cs b/src/Core/Shared/Constants.cs similarity index 100% rename from src/Core/Managed/Shared/Constants.cs rename to src/Core/Shared/Constants.cs diff --git a/src/Core/Managed/Shared/DataContracts/AvailabilityTelemetry.cs b/src/Core/Shared/DataContracts/AvailabilityTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/AvailabilityTelemetry.cs rename to src/Core/Shared/DataContracts/AvailabilityTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/DependencyTelemetry.cs b/src/Core/Shared/DataContracts/DependencyTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/DependencyTelemetry.cs rename to src/Core/Shared/DataContracts/DependencyTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/EventTelemetry.cs b/src/Core/Shared/DataContracts/EventTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/EventTelemetry.cs rename to src/Core/Shared/DataContracts/EventTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/ExceptionHandledAt.cs b/src/Core/Shared/DataContracts/ExceptionHandledAt.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/ExceptionHandledAt.cs rename to src/Core/Shared/DataContracts/ExceptionHandledAt.cs diff --git a/src/Core/Managed/Shared/DataContracts/ExceptionTelemetry.cs b/src/Core/Shared/DataContracts/ExceptionTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/ExceptionTelemetry.cs rename to src/Core/Shared/DataContracts/ExceptionTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/IJsonWriter.cs b/src/Core/Shared/DataContracts/IJsonWriter.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/IJsonWriter.cs rename to src/Core/Shared/DataContracts/IJsonWriter.cs diff --git a/src/Core/Managed/Shared/DataContracts/ISupportMetrics.cs b/src/Core/Shared/DataContracts/ISupportMetrics.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/ISupportMetrics.cs rename to src/Core/Shared/DataContracts/ISupportMetrics.cs diff --git a/src/Core/Managed/Shared/DataContracts/ISupportProperties.cs b/src/Core/Shared/DataContracts/ISupportProperties.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/ISupportProperties.cs rename to src/Core/Shared/DataContracts/ISupportProperties.cs diff --git a/src/Core/Managed/Shared/DataContracts/ISupportSampling.cs b/src/Core/Shared/DataContracts/ISupportSampling.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/ISupportSampling.cs rename to src/Core/Shared/DataContracts/ISupportSampling.cs diff --git a/src/Core/Managed/Shared/DataContracts/InnerExceptionCountExceededException.cs b/src/Core/Shared/DataContracts/InnerExceptionCountExceededException.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/InnerExceptionCountExceededException.cs rename to src/Core/Shared/DataContracts/InnerExceptionCountExceededException.cs diff --git a/src/Core/Managed/Shared/DataContracts/MetricTelemetry.cs b/src/Core/Shared/DataContracts/MetricTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/MetricTelemetry.cs rename to src/Core/Shared/DataContracts/MetricTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/PageViewTelemetry.cs b/src/Core/Shared/DataContracts/PageViewTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/PageViewTelemetry.cs rename to src/Core/Shared/DataContracts/PageViewTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/PerformanceCounterTelemetry.cs b/src/Core/Shared/DataContracts/PerformanceCounterTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/PerformanceCounterTelemetry.cs rename to src/Core/Shared/DataContracts/PerformanceCounterTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/RequestTelemetry.cs b/src/Core/Shared/DataContracts/RequestTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/RequestTelemetry.cs rename to src/Core/Shared/DataContracts/RequestTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/SessionState.cs b/src/Core/Shared/DataContracts/SessionState.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/SessionState.cs rename to src/Core/Shared/DataContracts/SessionState.cs diff --git a/src/Core/Managed/Shared/DataContracts/SessionStateTelemetry.cs b/src/Core/Shared/DataContracts/SessionStateTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/SessionStateTelemetry.cs rename to src/Core/Shared/DataContracts/SessionStateTelemetry.cs diff --git a/src/Core/Managed/Shared/DataContracts/SeverityLevel.cs b/src/Core/Shared/DataContracts/SeverityLevel.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/SeverityLevel.cs rename to src/Core/Shared/DataContracts/SeverityLevel.cs diff --git a/src/Core/Managed/Shared/DataContracts/TelemetryContext.cs b/src/Core/Shared/DataContracts/TelemetryContext.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/TelemetryContext.cs rename to src/Core/Shared/DataContracts/TelemetryContext.cs diff --git a/src/Core/Managed/Shared/DataContracts/TraceTelemetry.cs b/src/Core/Shared/DataContracts/TraceTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/DataContracts/TraceTelemetry.cs rename to src/Core/Shared/DataContracts/TraceTelemetry.cs diff --git a/src/Core/Managed/Shared/Extensibility/IDebugOutput.cs b/src/Core/Shared/Extensibility/IDebugOutput.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/IDebugOutput.cs rename to src/Core/Shared/Extensibility/IDebugOutput.cs diff --git a/src/Core/Managed/Shared/Extensibility/IMetricProcessor.cs b/src/Core/Shared/Extensibility/IMetricProcessor.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/IMetricProcessor.cs rename to src/Core/Shared/Extensibility/IMetricProcessor.cs diff --git a/src/Core/Managed/Shared/Extensibility/IOperationHolder.cs b/src/Core/Shared/Extensibility/IOperationHolder.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/IOperationHolder.cs rename to src/Core/Shared/Extensibility/IOperationHolder.cs diff --git a/src/Core/Managed/Shared/Extensibility/ITelemetryInitializer.cs b/src/Core/Shared/Extensibility/ITelemetryInitializer.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/ITelemetryInitializer.cs rename to src/Core/Shared/Extensibility/ITelemetryInitializer.cs diff --git a/src/Core/Managed/Shared/Extensibility/ITelemetryModule.cs b/src/Core/Shared/Extensibility/ITelemetryModule.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/ITelemetryModule.cs rename to src/Core/Shared/Extensibility/ITelemetryModule.cs diff --git a/src/Core/Managed/Shared/Extensibility/ITelemetryProcessor.cs b/src/Core/Shared/Extensibility/ITelemetryProcessor.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/ITelemetryProcessor.cs rename to src/Core/Shared/Extensibility/ITelemetryProcessor.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/CloudContext.cs b/src/Core/Shared/Extensibility/Implementation/CloudContext.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/CloudContext.cs rename to src/Core/Shared/Extensibility/Implementation/CloudContext.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/ComponentContext.cs b/src/Core/Shared/Extensibility/Implementation/ComponentContext.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/ComponentContext.cs rename to src/Core/Shared/Extensibility/Implementation/ComponentContext.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/DeviceContext.cs b/src/Core/Shared/Extensibility/Implementation/DeviceContext.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/DeviceContext.cs rename to src/Core/Shared/Extensibility/Implementation/DeviceContext.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/ExceptionConverter.cs b/src/Core/Shared/Extensibility/Implementation/ExceptionConverter.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/ExceptionConverter.cs rename to src/Core/Shared/Extensibility/Implementation/ExceptionConverter.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/AjaxCallData.cs b/src/Core/Shared/Extensibility/Implementation/External/AjaxCallData.cs similarity index 68% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/AjaxCallData.cs rename to src/Core/Shared/Extensibility/Implementation/External/AjaxCallData.cs index 05be53569..456aba5a6 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/AjaxCallData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/AjaxCallData.cs @@ -1,3 +1,8 @@ +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// @@ -11,4 +16,5 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External internal partial class AjaxCallData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/AvailabilityData.cs b/src/Core/Shared/Extensibility/Implementation/External/AvailabilityData.cs similarity index 56% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/AvailabilityData.cs rename to src/Core/Shared/Extensibility/Implementation/External/AvailabilityData.cs index cb2751445..eb1c8599e 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/AvailabilityData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/AvailabilityData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class AvailabilityData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/AvailabilityData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/AvailabilityData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/AvailabilityData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/AvailabilityData_types.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/Base_types.cs b/src/Core/Shared/Extensibility/Implementation/External/Base_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/Base_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/Base_types.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/ContextTagKeys.cs b/src/Core/Shared/Extensibility/Implementation/External/ContextTagKeys.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/ContextTagKeys.cs rename to src/Core/Shared/Extensibility/Implementation/External/ContextTagKeys.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/ContextTagKeys_types.cs b/src/Core/Shared/Extensibility/Implementation/External/ContextTagKeys_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/ContextTagKeys_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/ContextTagKeys_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/DataPoint.cs b/src/Core/Shared/Extensibility/Implementation/External/DataPoint.cs similarity index 51% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/DataPoint.cs rename to src/Core/Shared/Extensibility/Implementation/External/DataPoint.cs index 2de5fdbbb..f4e73d98f 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/DataPoint.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/DataPoint.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class DataPoint { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/DataPointType_types.cs b/src/Core/Shared/Extensibility/Implementation/External/DataPointType_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/DataPointType_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/DataPointType_types.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/DataPoint_types.cs b/src/Core/Shared/Extensibility/Implementation/External/DataPoint_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/DataPoint_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/DataPoint_types.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/Data_types.cs b/src/Core/Shared/Extensibility/Implementation/External/Data_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/Data_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/Data_types.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/Domain_types.cs b/src/Core/Shared/Extensibility/Implementation/External/Domain_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/Domain_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/Domain_types.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/Envelope_types.cs b/src/Core/Shared/Extensibility/Implementation/External/Envelope_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/Envelope_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/Envelope_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/EventData.cs b/src/Core/Shared/Extensibility/Implementation/External/EventData.cs similarity index 55% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/EventData.cs rename to src/Core/Shared/Extensibility/Implementation/External/EventData.cs index e4c973cbc..35b40284e 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/EventData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/EventData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class EventData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/EventData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/EventData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/EventData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/EventData_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/ExceptionData.cs b/src/Core/Shared/Extensibility/Implementation/External/ExceptionData.cs similarity index 55% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/ExceptionData.cs rename to src/Core/Shared/Extensibility/Implementation/External/ExceptionData.cs index 0d734847b..f9afab8e5 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/ExceptionData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/ExceptionData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 + // TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class ExceptionData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/ExceptionData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/ExceptionData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/ExceptionData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/ExceptionData_types.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/ExceptionDetails.cs b/src/Core/Shared/Extensibility/Implementation/External/ExceptionDetails.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/ExceptionDetails.cs rename to src/Core/Shared/Extensibility/Implementation/External/ExceptionDetails.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/ExceptionDetails_types.cs b/src/Core/Shared/Extensibility/Implementation/External/ExceptionDetails_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/ExceptionDetails_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/ExceptionDetails_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/MessageData.cs b/src/Core/Shared/Extensibility/Implementation/External/MessageData.cs similarity index 56% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/MessageData.cs rename to src/Core/Shared/Extensibility/Implementation/External/MessageData.cs index d2d8178fd..f6ab10ef1 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/MessageData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/MessageData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -12,3 +17,4 @@ { } } +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/MessageData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/MessageData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/MessageData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/MessageData_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/MetricData.cs b/src/Core/Shared/Extensibility/Implementation/External/MetricData.cs similarity index 55% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/MetricData.cs rename to src/Core/Shared/Extensibility/Implementation/External/MetricData.cs index b818af9e8..45811c67a 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/MetricData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/MetricData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class MetricData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/MetricData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/MetricData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/MetricData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/MetricData_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/PageViewData.cs b/src/Core/Shared/Extensibility/Implementation/External/PageViewData.cs similarity index 55% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/PageViewData.cs rename to src/Core/Shared/Extensibility/Implementation/External/PageViewData.cs index 0a974705b..b139f0ddf 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/PageViewData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/PageViewData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class PageViewData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/PageViewData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/PageViewData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/PageViewData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/PageViewData_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/PageViewPerfData.cs b/src/Core/Shared/Extensibility/Implementation/External/PageViewPerfData.cs similarity index 56% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/PageViewPerfData.cs rename to src/Core/Shared/Extensibility/Implementation/External/PageViewPerfData.cs index 8714a852d..68b195cd2 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/PageViewPerfData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/PageViewPerfData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class PageViewPerfData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/PageViewPerfData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/PageViewPerfData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/PageViewPerfData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/PageViewPerfData_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/PerformanceCounterData.cs b/src/Core/Shared/Extensibility/Implementation/External/PerformanceCounterData.cs similarity index 57% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/PerformanceCounterData.cs rename to src/Core/Shared/Extensibility/Implementation/External/PerformanceCounterData.cs index b08dc7555..86e945213 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/PerformanceCounterData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/PerformanceCounterData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class PerformanceCounterData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/RemoteDependencyData.cs b/src/Core/Shared/Extensibility/Implementation/External/RemoteDependencyData.cs similarity index 57% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/RemoteDependencyData.cs rename to src/Core/Shared/Extensibility/Implementation/External/RemoteDependencyData.cs index c6c08bfcd..13bd6f0e1 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/RemoteDependencyData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/RemoteDependencyData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class RemoteDependencyData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/RemoteDependencyData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/RemoteDependencyData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/RemoteDependencyData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/RemoteDependencyData_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/RequestData.cs b/src/Core/Shared/Extensibility/Implementation/External/RequestData.cs similarity index 55% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/RequestData.cs rename to src/Core/Shared/Extensibility/Implementation/External/RequestData.cs index 135dc8568..d677cd772 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/RequestData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/RequestData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class RequestData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/RequestData_types.cs b/src/Core/Shared/Extensibility/Implementation/External/RequestData_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/RequestData_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/RequestData_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/SessionStateData.cs b/src/Core/Shared/Extensibility/Implementation/External/SessionStateData.cs similarity index 56% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/SessionStateData.cs rename to src/Core/Shared/Extensibility/Implementation/External/SessionStateData.cs index 741414106..32ce5c87d 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/SessionStateData.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/SessionStateData.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class SessionStateData { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/SeverityLevel_types.cs b/src/Core/Shared/Extensibility/Implementation/External/SeverityLevel_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/SeverityLevel_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/SeverityLevel_types.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/External/StackFrame.cs b/src/Core/Shared/Extensibility/Implementation/External/StackFrame.cs similarity index 51% rename from src/Core/Managed/Net46/Extensibility/Implementation/External/StackFrame.cs rename to src/Core/Shared/Extensibility/Implementation/External/StackFrame.cs index 76c97340a..61b0275eb 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/External/StackFrame.cs +++ b/src/Core/Shared/Extensibility/Implementation/External/StackFrame.cs @@ -1,4 +1,9 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External +#if NET45 + // .Net 4.5 has a custom implementation of RichPayloadEventSource +#elif NETSTANDARD1_3 +// TODO: This file can be included once RichPayloadEventSource is in the netstandard1.3 project +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { /// /// Partial class to add the EventData attribute and any additional customizations to the generated type. @@ -11,4 +16,5 @@ internal partial class StackFrame { } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/StackFrame_types.cs b/src/Core/Shared/Extensibility/Implementation/External/StackFrame_types.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/StackFrame_types.cs rename to src/Core/Shared/Extensibility/Implementation/External/StackFrame_types.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/External/Tags.cs b/src/Core/Shared/Extensibility/Implementation/External/Tags.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/External/Tags.cs rename to src/Core/Shared/Extensibility/Implementation/External/Tags.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/HttpWebResponseWrapper.cs b/src/Core/Shared/Extensibility/Implementation/HttpWebResponseWrapper.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/HttpWebResponseWrapper.cs rename to src/Core/Shared/Extensibility/Implementation/HttpWebResponseWrapper.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/IPlatform.cs b/src/Core/Shared/Extensibility/Implementation/IPlatform.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/IPlatform.cs rename to src/Core/Shared/Extensibility/Implementation/IPlatform.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/IPlatformDispatcher.cs b/src/Core/Shared/Extensibility/Implementation/IPlatformDispatcher.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/IPlatformDispatcher.cs rename to src/Core/Shared/Extensibility/Implementation/IPlatformDispatcher.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/IRandomNumberBatchGenerator.cs b/src/Core/Shared/Extensibility/Implementation/IRandomNumberBatchGenerator.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/IRandomNumberBatchGenerator.cs rename to src/Core/Shared/Extensibility/Implementation/IRandomNumberBatchGenerator.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/InternalContext.cs b/src/Core/Shared/Extensibility/Implementation/InternalContext.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/InternalContext.cs rename to src/Core/Shared/Extensibility/Implementation/InternalContext.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/JsonSerializer.cs b/src/Core/Shared/Extensibility/Implementation/JsonSerializer.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/JsonSerializer.cs rename to src/Core/Shared/Extensibility/Implementation/JsonSerializer.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/JsonWriter.cs b/src/Core/Shared/Extensibility/Implementation/JsonWriter.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/JsonWriter.cs rename to src/Core/Shared/Extensibility/Implementation/JsonWriter.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/LocationContext.cs b/src/Core/Shared/Extensibility/Implementation/LocationContext.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/LocationContext.cs rename to src/Core/Shared/Extensibility/Implementation/LocationContext.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/OperationContext.cs b/src/Core/Shared/Extensibility/Implementation/OperationContext.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/OperationContext.cs rename to src/Core/Shared/Extensibility/Implementation/OperationContext.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/OperationTelemetry.cs b/src/Core/Shared/Extensibility/Implementation/OperationTelemetry.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/OperationTelemetry.cs rename to src/Core/Shared/Extensibility/Implementation/OperationTelemetry.cs diff --git a/src/Core/Managed/Net40/Extensibility/Implementation/Platform/PlatformImplementation.cs b/src/Core/Shared/Extensibility/Implementation/Platform/PlatformImplementation.cs similarity index 96% rename from src/Core/Managed/Net40/Extensibility/Implementation/Platform/PlatformImplementation.cs rename to src/Core/Shared/Extensibility/Implementation/Platform/PlatformImplementation.cs index ffd155541..38e551862 100644 --- a/src/Core/Managed/Net40/Extensibility/Implementation/Platform/PlatformImplementation.cs +++ b/src/Core/Shared/Extensibility/Implementation/Platform/PlatformImplementation.cs @@ -1,4 +1,7 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Platform +#if NETSTANDARD1_3 + // netstandard1.3 has it's own implementation +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Platform { using System; using System.Collections; @@ -132,3 +135,4 @@ } } } +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Platform/PlatformSingleton.cs b/src/Core/Shared/Extensibility/Implementation/Platform/PlatformSingleton.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Platform/PlatformSingleton.cs rename to src/Core/Shared/Extensibility/Implementation/Platform/PlatformSingleton.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Property.cs b/src/Core/Shared/Extensibility/Implementation/Property.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Property.cs rename to src/Core/Shared/Extensibility/Implementation/Property.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/RichPayloadEventSource.Keywords.cs b/src/Core/Shared/Extensibility/Implementation/RichPayloadEventSource.Keywords.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/RichPayloadEventSource.Keywords.cs rename to src/Core/Shared/Extensibility/Implementation/RichPayloadEventSource.Keywords.cs diff --git a/src/Core/Managed/Net46/Extensibility/Implementation/RichPayloadEventSource.cs b/src/Core/Shared/Extensibility/Implementation/RichPayloadEventSource.cs similarity index 98% rename from src/Core/Managed/Net46/Extensibility/Implementation/RichPayloadEventSource.cs rename to src/Core/Shared/Extensibility/Implementation/RichPayloadEventSource.cs index e9ab9a354..42c058787 100644 --- a/src/Core/Managed/Net46/Extensibility/Implementation/RichPayloadEventSource.cs +++ b/src/Core/Shared/Extensibility/Implementation/RichPayloadEventSource.cs @@ -1,4 +1,7 @@ -namespace Microsoft.ApplicationInsights.Extensibility.Implementation +#if NET45 + // .Net 4.5 has a private implementation of this +#else +namespace Microsoft.ApplicationInsights.Extensibility.Implementation { #if NET40 using System; @@ -296,4 +299,5 @@ } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/SdkVersionUtils.cs b/src/Core/Shared/Extensibility/Implementation/SdkVersionUtils.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/SdkVersionUtils.cs rename to src/Core/Shared/Extensibility/Implementation/SdkVersionUtils.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/SessionContext.cs b/src/Core/Shared/Extensibility/Implementation/SessionContext.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/SessionContext.cs rename to src/Core/Shared/Extensibility/Implementation/SessionContext.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/SeverityLevelExtensions.cs b/src/Core/Shared/Extensibility/Implementation/SeverityLevelExtensions.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/SeverityLevelExtensions.cs rename to src/Core/Shared/Extensibility/Implementation/SeverityLevelExtensions.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/SimpleMetricStatisticsAggregator.cs b/src/Core/Shared/Extensibility/Implementation/SimpleMetricStatisticsAggregator.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/SimpleMetricStatisticsAggregator.cs rename to src/Core/Shared/Extensibility/Implementation/SimpleMetricStatisticsAggregator.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/SnapshottingCollection.cs b/src/Core/Shared/Extensibility/Implementation/SnapshottingCollection.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/SnapshottingCollection.cs rename to src/Core/Shared/Extensibility/Implementation/SnapshottingCollection.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/SnapshottingList.cs b/src/Core/Shared/Extensibility/Implementation/SnapshottingList.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/SnapshottingList.cs rename to src/Core/Shared/Extensibility/Implementation/SnapshottingList.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TaskTimer.cs b/src/Core/Shared/Extensibility/Implementation/TaskTimer.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/TaskTimer.cs rename to src/Core/Shared/Extensibility/Implementation/TaskTimer.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TaskTimerInternal.cs b/src/Core/Shared/Extensibility/Implementation/TaskTimerInternal.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/TaskTimerInternal.cs rename to src/Core/Shared/Extensibility/Implementation/TaskTimerInternal.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Telemetry.cs b/src/Core/Shared/Extensibility/Implementation/Telemetry.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Telemetry.cs rename to src/Core/Shared/Extensibility/Implementation/Telemetry.cs diff --git a/src/Core/Managed/Net40/Extensibility/Implementation/TelemetryConfigurationFactory.cs b/src/Core/Shared/Extensibility/Implementation/TelemetryConfigurationFactory.cs similarity index 100% rename from src/Core/Managed/Net40/Extensibility/Implementation/TelemetryConfigurationFactory.cs rename to src/Core/Shared/Extensibility/Implementation/TelemetryConfigurationFactory.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TelemetryContextExtensions.cs b/src/Core/Shared/Extensibility/Implementation/TelemetryContextExtensions.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/TelemetryContextExtensions.cs rename to src/Core/Shared/Extensibility/Implementation/TelemetryContextExtensions.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TelemetryDebugWriter.cs b/src/Core/Shared/Extensibility/Implementation/TelemetryDebugWriter.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/TelemetryDebugWriter.cs rename to src/Core/Shared/Extensibility/Implementation/TelemetryDebugWriter.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TelemetryProcessorChain.cs b/src/Core/Shared/Extensibility/Implementation/TelemetryProcessorChain.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/TelemetryProcessorChain.cs rename to src/Core/Shared/Extensibility/Implementation/TelemetryProcessorChain.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TelemetryProcessorChainBuilder.cs b/src/Core/Shared/Extensibility/Implementation/TelemetryProcessorChainBuilder.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/TelemetryProcessorChainBuilder.cs rename to src/Core/Shared/Extensibility/Implementation/TelemetryProcessorChainBuilder.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/ApplicationNameProvider.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/ApplicationNameProvider.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/ApplicationNameProvider.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/ApplicationNameProvider.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/CoreEventSource.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/CoreEventSource.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/CoreEventSource.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/CoreEventSource.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventCounters.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventCounters.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventCounters.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventCounters.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottling.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottling.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottling.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottling.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingDefaults.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingDefaults.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingDefaults.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingDefaults.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingManager.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingManager.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingManager.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingManager.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingScheduler.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingScheduler.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingScheduler.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/DiagnoisticsEventThrottlingScheduler.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsEventListener.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/DiagnosticsEventListener.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsEventListener.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/DiagnosticsEventListener.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsListener.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/DiagnosticsListener.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsListener.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/DiagnosticsListener.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsTelemetryModule.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/DiagnosticsTelemetryModule.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/DiagnosticsTelemetryModule.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/DiagnosticsTelemetryModule.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/EventMetaData.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/EventMetaData.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/EventMetaData.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/EventMetaData.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/EventSourceKeywords.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/EventSourceKeywords.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/EventSourceKeywords.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/EventSourceKeywords.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/Extensions.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/Extensions.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/Extensions.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/Extensions.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottling.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottling.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottling.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottling.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottlingManager.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottlingManager.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottlingManager.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottlingManager.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottlingScheduler.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottlingScheduler.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottlingScheduler.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/IDiagnoisticsEventThrottlingScheduler.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/IDiagnosticsSender.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/IDiagnosticsSender.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/IDiagnosticsSender.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/IDiagnosticsSender.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsQueueSender.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsQueueSender.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsQueueSender.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsQueueSender.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsSender.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsSender.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsSender.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/PortalDiagnosticsSender.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/SpinWait.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/SpinWait.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/SpinWait.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/SpinWait.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/ThreadResourceLock.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/ThreadResourceLock.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/ThreadResourceLock.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/ThreadResourceLock.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/Tracing/TraceEvent.cs b/src/Core/Shared/Extensibility/Implementation/Tracing/TraceEvent.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/Tracing/TraceEvent.cs rename to src/Core/Shared/Extensibility/Implementation/Tracing/TraceEvent.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TransmissionProcessor.cs b/src/Core/Shared/Extensibility/Implementation/TransmissionProcessor.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/TransmissionProcessor.cs rename to src/Core/Shared/Extensibility/Implementation/TransmissionProcessor.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/TypeExtensions.cs b/src/Core/Shared/Extensibility/Implementation/TypeExtensions.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/TypeExtensions.cs rename to src/Core/Shared/Extensibility/Implementation/TypeExtensions.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/UserContext.cs b/src/Core/Shared/Extensibility/Implementation/UserContext.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/UserContext.cs rename to src/Core/Shared/Extensibility/Implementation/UserContext.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/WeakConcurrentRandom.cs b/src/Core/Shared/Extensibility/Implementation/WeakConcurrentRandom.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/WeakConcurrentRandom.cs rename to src/Core/Shared/Extensibility/Implementation/WeakConcurrentRandom.cs diff --git a/src/Core/Managed/Shared/Extensibility/Implementation/XorshiftRandomBatchGenerator.cs b/src/Core/Shared/Extensibility/Implementation/XorshiftRandomBatchGenerator.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Implementation/XorshiftRandomBatchGenerator.cs rename to src/Core/Shared/Extensibility/Implementation/XorshiftRandomBatchGenerator.cs diff --git a/src/Core/Managed/Shared/Extensibility/Metric.cs b/src/Core/Shared/Extensibility/Metric.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/Metric.cs rename to src/Core/Shared/Extensibility/Metric.cs diff --git a/src/Core/Managed/Shared/Extensibility/MetricManager.cs b/src/Core/Shared/Extensibility/MetricManager.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/MetricManager.cs rename to src/Core/Shared/Extensibility/MetricManager.cs diff --git a/src/Core/Managed/Shared/Extensibility/SequencePropertyInitializer.cs b/src/Core/Shared/Extensibility/SequencePropertyInitializer.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/SequencePropertyInitializer.cs rename to src/Core/Shared/Extensibility/SequencePropertyInitializer.cs diff --git a/src/Core/Managed/Shared/Extensibility/TelemetryConfiguration.cs b/src/Core/Shared/Extensibility/TelemetryConfiguration.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/TelemetryConfiguration.cs rename to src/Core/Shared/Extensibility/TelemetryConfiguration.cs diff --git a/src/Core/Managed/Shared/Extensibility/TelemetryModules.cs b/src/Core/Shared/Extensibility/TelemetryModules.cs similarity index 100% rename from src/Core/Managed/Shared/Extensibility/TelemetryModules.cs rename to src/Core/Shared/Extensibility/TelemetryModules.cs diff --git a/src/Core/Managed/Shared/GlobalSuppressions.cs b/src/Core/Shared/GlobalSuppressions.cs similarity index 100% rename from src/Core/Managed/Shared/GlobalSuppressions.cs rename to src/Core/Shared/GlobalSuppressions.cs diff --git a/src/Core/Managed/Shared/OperationTelemetryExtensions.cs b/src/Core/Shared/OperationTelemetryExtensions.cs similarity index 100% rename from src/Core/Managed/Shared/OperationTelemetryExtensions.cs rename to src/Core/Shared/OperationTelemetryExtensions.cs diff --git a/src/Core/Managed/Shared/Properties/AssemblyInfo.cs b/src/Core/Shared/Properties/AssemblyInfo.cs similarity index 91% rename from src/Core/Managed/Shared/Properties/AssemblyInfo.cs rename to src/Core/Shared/Properties/AssemblyInfo.cs index c9f8c1c4a..b64a9ee18 100644 --- a/src/Core/Managed/Shared/Properties/AssemblyInfo.cs +++ b/src/Core/Shared/Properties/AssemblyInfo.cs @@ -2,9 +2,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyCopyright("Copyright © Microsoft. All Rights Reserved.")] - [assembly: ComVisible(false)] [assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.Core.Net40.Tests" + AssemblyInfo.PublicKey)] diff --git a/src/Core/Managed/Shared/TelemetryClient.cs b/src/Core/Shared/TelemetryClient.cs similarity index 100% rename from src/Core/Managed/Shared/TelemetryClient.cs rename to src/Core/Shared/TelemetryClient.cs diff --git a/src/Core/Managed/Shared/Utils.cs b/src/Core/Shared/Utils.cs similarity index 100% rename from src/Core/Managed/Shared/Utils.cs rename to src/Core/Shared/Utils.cs diff --git a/src/Core/Managed/Net40/TaskEx.cs b/src/Core/net40/TaskEx.cs similarity index 100% rename from src/Core/Managed/Net40/TaskEx.cs rename to src/Core/net40/TaskEx.cs diff --git a/src/Core/Managed/Net40/Utils.cs b/src/Core/net40/Utils.cs similarity index 100% rename from src/Core/Managed/Net40/Utils.cs rename to src/Core/net40/Utils.cs diff --git a/src/Core/Managed/Net45/Extensibility/Implementation/RichPayloadEventSource.TelemetryHandler.cs b/src/Core/net45/Extensibility/Implementation/RichPayloadEventSource.TelemetryHandler.cs similarity index 100% rename from src/Core/Managed/Net45/Extensibility/Implementation/RichPayloadEventSource.TelemetryHandler.cs rename to src/Core/net45/Extensibility/Implementation/RichPayloadEventSource.TelemetryHandler.cs diff --git a/src/Core/Managed/Net45/Extensibility/Implementation/RichPayloadEventSource.cs b/src/Core/net45/Extensibility/Implementation/RichPayloadEventSource.cs similarity index 100% rename from src/Core/Managed/Net45/Extensibility/Implementation/RichPayloadEventSource.cs rename to src/Core/net45/Extensibility/Implementation/RichPayloadEventSource.cs diff --git a/src/Core/Managed/NetStandard13/Extensibility/Implementation/Platform/PlatformImplementation.cs b/src/Core/netstandard1.3/Extensibility/Implementation/Platform/PlatformImplementation.cs similarity index 100% rename from src/Core/Managed/NetStandard13/Extensibility/Implementation/Platform/PlatformImplementation.cs rename to src/Core/netstandard1.3/Extensibility/Implementation/Platform/PlatformImplementation.cs diff --git a/src/TelemetryChannels/ServerTelemetryChannel/Net40/TelemetryChannel.Net40.csproj b/src/TelemetryChannels/ServerTelemetryChannel/Net40/TelemetryChannel.Net40.csproj index 9cc05d138..f7b02630d 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/Net40/TelemetryChannel.Net40.csproj +++ b/src/TelemetryChannels/ServerTelemetryChannel/Net40/TelemetryChannel.Net40.csproj @@ -67,12 +67,6 @@ Designer - - - {cd752cd2-6711-4ad7-b5c8-f8c23cf076b1} - Core.Net40 - - @@ -80,6 +74,12 @@ + + + {e9ecee96-dd50-42f6-9f33-0978cdfa15ed} + Core + + diff --git a/src/TelemetryChannels/ServerTelemetryChannel/Net45/TelemetryChannel.Net45.csproj b/src/TelemetryChannels/ServerTelemetryChannel/Net45/TelemetryChannel.Net45.csproj index 5716cc0cb..1376e4c2a 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/Net45/TelemetryChannel.Net45.csproj +++ b/src/TelemetryChannels/ServerTelemetryChannel/Net45/TelemetryChannel.Net45.csproj @@ -36,16 +36,16 @@ Designer - - - {412659ca-49b0-4834-bfbf-8183055083c8} - Core.Net45 - - + + + {e9ecee96-dd50-42f6-9f33-0978cdfa15ed} + Core + + diff --git a/src/TelemetryChannels/ServerTelemetryChannel/NuGet/TelemetryChannel.NuGet.csproj b/src/TelemetryChannels/ServerTelemetryChannel/NuGet/TelemetryChannel.NuGet.csproj index 43fd5e680..579f7c921 100644 --- a/src/TelemetryChannels/ServerTelemetryChannel/NuGet/TelemetryChannel.NuGet.csproj +++ b/src/TelemetryChannels/ServerTelemetryChannel/NuGet/TelemetryChannel.NuGet.csproj @@ -16,7 +16,7 @@ 2008 ..\ $(MSBuildProjectDirectory)\Package.nuspec - $(BinRoot)\$(Configuration)\Core\Managed\Net40\Microsoft.ApplicationInsights.dll + $(BinRoot)\$(Configuration)\Core\net40\Microsoft.ApplicationInsights.dll