convert HostingStartup to PackageReference (#1007)
* convert to new project.
This commit is contained in:
MS-TimothyMothra
GitHub
Родитель
0e89f742ed
Коммит
68eb51e2d2
|
|
@ -60,4 +60,10 @@
|
|||
<Target Name="FixXmlDocumentation" AfterTargets="AfterBuild" DependsOnTargets="AfterBuild">
|
||||
<InjectXmlLanguage InputFiles="$(DocumentationFile)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="AddXmlDocToNugetPackage" Condition="$(OS) == 'Windows_NT'">
|
||||
<ItemGroup>
|
||||
<BuildOutputInPackage Include="$(OutputPath)$(TargetName).xml" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -34,4 +34,8 @@
|
|||
<PartitionPropertiesFile>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Partition.props'))\Partition.props</PartitionPropertiesFile>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(PartitionPropertiesFile)" Condition="Exists($(PartitionPropertiesFile))" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);AddXmlDocToNugetPackage</TargetsForTfmSpecificBuildOutput>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
<PackagesDir>$(EnlistmentRoot)\..\packages</PackagesDir>
|
||||
<PackagesDir>$([System.IO.Path]::GetFullPath( $(PackagesDir) ))</PackagesDir>
|
||||
|
||||
<MyGetPackageSource>https://www.myget.org/F/applicationinsights/api/v2</MyGetPackageSource>
|
||||
<MyGetPackageSource>https://www.myget.org/F/applicationinsights/api/v2</MyGetPackageSource>
|
||||
|
||||
<PowerShellExe Condition=" '$(PowerShellExe)'=='' ">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellExe>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
<!--
|
||||
Date when Semantic Version was changed.
|
||||
Update for every public release.
|
||||
|
||||
NOTE!!!!!! Do not update when updating PreReleaseMilestone update
|
||||
as it will restart file versions so 2.4.0-beta1 may have higher
|
||||
file version (like 2.4.0.2222) than 2.4.0-beta2 (like 2.4.0.1111)
|
||||
|
|
@ -22,4 +21,10 @@
|
|||
|
||||
<PreReleaseVersion Condition="'$(PreReleaseVersion)'==''">$([MSBuild]::Divide($([System.DateTime]::Now.Subtract($([System.DateTime]::Parse($(SemanticVersionDate)))).TotalMinutes), 5).ToString('F0'))</PreReleaseVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
<PropertyGroup Condition="'$(PackageVersion)'==''">
|
||||
<PackageVersion>$(SemanticVersionMajor).$(SemanticVersionMinor).$(SemanticVersionPatch)</PackageVersion>
|
||||
<PackageVersion Condition="'$(PreReleaseMilestone)' != ''">$(PackageVersion)-$(PreReleaseMilestone)</PackageVersion>
|
||||
<PackageVersion Condition="'$(StableRelease)' != 'True'">$(PackageVersion)-build$(PreReleaseVersion)</PackageVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<!-- Including this file will generate both the *.nupkg and *.symbols.nupkg -->
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- These are the common properties used when generating the nupkg -->
|
||||
<Company>Microsoft</Company>
|
||||
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
|
||||
<!-- <PackageVersion>Defined in GlobalStaticVersion.props</PackageVersion> -->
|
||||
<Authors>Microsoft</Authors>
|
||||
<Owners>Microsoft,AppInsightsSdk</Owners>
|
||||
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
|
||||
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
|
||||
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
|
||||
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
|
||||
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
|
||||
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
|
||||
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?LinkID=510709</PackageLicenseUrl>
|
||||
<PackageProjectUrl>https://go.microsoft.com/fwlink/?LinkId=392727</PackageProjectUrl>
|
||||
<PackageIconUrl>http://appanacdn.blob.core.windows.net/cdn/icons/aic.png</PackageIconUrl>
|
||||
<RepositoryUrl>https://github.com/Microsoft/ApplicationInsights-dotnet-server</RepositoryUrl>
|
||||
<RepositoryType>Git</RepositoryType>
|
||||
<PackageType>Dependency</PackageType>
|
||||
<ContentTargetFolders>content</ContentTargetFolders>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- These Properties are unique to the project and need to be set in the csproj -->
|
||||
<PackageId>UNDEFINED</PackageId>
|
||||
<Title>UNDEFINED</Title>
|
||||
<Description>UNDEFINED</Description>
|
||||
<PackageTags>UNDEFINED</PackageTags>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
|
|
@ -55,16 +54,16 @@
|
|||
<Compile Include="TraceSourceForEventSourceTest.cs" />
|
||||
<Compile Include="WebRequestTrackingModuleRegisterTest.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\HostingStartup.Net45\HostingStartup.Net45.csproj">
|
||||
<Project>{d90a51e3-949c-4304-adf9-25f6cb59f298}</Project>
|
||||
<Name>HostingStartup.Net45</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Analyzer Include="..\..\..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
|
||||
<Analyzer Include="..\..\..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\HostingStartup\HostingStartup.csproj">
|
||||
<Project>{80f0481a-66c7-4442-96d3-5fd841132c4b}</Project>
|
||||
<Name>HostingStartup</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Choose>
|
||||
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
|
||||
<ItemGroup>
|
||||
|
|
@ -86,12 +85,4 @@
|
|||
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>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}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" />
|
||||
</Project>
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{D90A51E3-949C-4304-ADF9-25F6CB59F298}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
|
||||
<DefineConstants>$(DefineConstants);NET45;ALLOW_AGGRESSIVE_INLIGNING_ATTRIBUTE</DefineConstants>
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<RunCodeAnalysis>true</RunCodeAnalysis>
|
||||
<CodeAnalysisRuleSet>..\..\..\ApplicationInsightsSDKRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.ApplicationInsights.2.8.0-beta2\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Web.Infrastructure">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Runtime.Caching" />
|
||||
<Reference Include="System.Web" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="Implementation\DiagnosticsEventListener.cs" />
|
||||
<Compile Include="FileDiagnosticsTelemetryModule.cs" />
|
||||
<Compile Include="Implementation\IEventListener.cs" />
|
||||
<Compile Include="Implementation\TraceSourceForEventSource.cs" />
|
||||
<Compile Include="Implementation\HostingStartupEventSource.cs" />
|
||||
<Compile Include="WebRequestTrackingModuleRegister.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config">
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Analyzer Include="..\..\..\..\packages\Desktop.Analyzers.1.1.0\analyzers\dotnet\cs\Desktop.Analyzers.dll" />
|
||||
<Analyzer Include="..\..\..\..\packages\Desktop.Analyzers.1.1.0\analyzers\dotnet\cs\Desktop.CSharp.Analyzers.dll" />
|
||||
<Analyzer Include="..\..\..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
|
||||
<Analyzer Include="..\..\..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>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}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets'))" />
|
||||
</Target>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" />
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" />
|
||||
</Project>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Desktop.Analyzers" version="1.1.0" targetFramework="net45" />
|
||||
<package id="MicroBuild.Core" version="0.3.0" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="Microsoft.ApplicationInsights" version="2.8.0-beta2" targetFramework="net45" />
|
||||
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.6.1" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="Microsoft.Diagnostics.Tracing.EventRegister" version="1.1.28" targetFramework="net45" />
|
||||
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
|
||||
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
// This file is used by Code Analysis to maintain SuppressMessage
|
||||
// attributes that are applied to this project.
|
||||
// Project-level suppressions either have no target or are given
|
||||
// a specific target and scoped to a namespace, type, member, etc.
|
||||
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1652:Enable XML documentation output", Justification = "Pre-existing condition")]
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Microsoft.ApplicationInsights.HostingStartup.Tests</RootNamespace>
|
||||
<AssemblyName>Microsoft.ApplicationInsights.HostingStartup.Tests</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
|
||||
<IsCodedUITest>False</IsCodedUITest>
|
||||
<TestProjectType>UnitTest</TestProjectType>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
|
||||
<DefineConstants>$(DefineConstants);NET45</DefineConstants>
|
||||
<TargetFrameworkProfile />
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Web.XmlTransform">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.XML" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="GlobalSuppressions.cs" />
|
||||
<Compile Include="WebConfigTransformTest.cs" />
|
||||
<Compile Include="WebConfigWithLocationTagTransformTest.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="..\HostingStartup.Nuget\web.config.install.xdt">
|
||||
<Link>Resources\web.config.install.xdt</Link>
|
||||
</EmbeddedResource>
|
||||
<None Include="packages.config">
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Analyzer Include="..\..\..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
|
||||
<Analyzer Include="..\..\..\..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
</Project>
|
||||
|
|
@ -1,598 +0,0 @@
|
|||
namespace Microsoft.ApplicationInsights.HostingStartup.Tests
|
||||
{
|
||||
using System.IO;
|
||||
using System.Xml.Linq;
|
||||
using Microsoft.Web.XmlTransform;
|
||||
using VisualStudio.TestTools.UnitTesting;
|
||||
|
||||
[TestClass]
|
||||
public class WebConfigWithLocationTagTransformTest
|
||||
{
|
||||
private const string InstallConfigTransformationResourceName = "Microsoft.ApplicationInsights.HostingStartup.Tests.Resources.web.config.install.xdt";
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationWhenNonGlobalLocationTagExists()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""a.aspx"">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
<modules>
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""a.aspx"">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules></httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
<modules>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationWhenGlobalAndNonGlobalLocationTagExists()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""a.aspx"">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""a.aspx"">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type""/>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web></system.web>
|
||||
<system.webServer></system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationToLocationTagWithDotPathAndExistingModules()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type""/>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web></system.web>
|
||||
<system.webServer></system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationToLocationTagWithEmptyPathAndExistingModules()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web></system.web>
|
||||
<system.webServer></system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type""/>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web></system.web>
|
||||
<system.webServer></system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationToLocationTagWithDotPathWithNoModules()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
<modules>
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
<httpModules></httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
<modules>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web></system.web>
|
||||
<system.webServer></system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationToLocationTagWithEmptyPathWithNoModules()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
<modules>
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location>
|
||||
<system.web>
|
||||
<httpModules></httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
<modules>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web></system.web>
|
||||
<system.webServer></system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationToLocationTagWithDotPathWithGlobalModules()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""."">
|
||||
<system.web></system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type""/>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationToLocationTagWithEmptyPathWithGlobalModules()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type""/>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationToLocationTagWithDotPathWithGlobalModulesAndExistingValidationTag()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location path=""."">
|
||||
<system.web>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type""/>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void VerifyInstallationToLocationTagWithEmptyPathWithGlobalModulesAndExistingValidationTag()
|
||||
{
|
||||
const string OriginalWebConfigContent = @"
|
||||
<configuration>
|
||||
<location>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
<add name=""TelemetryCorrelationHttpModule"" type=""Microsoft.AspNet.TelemetryCorrelation.TelemetryCorrelationHttpModule, Microsoft.AspNet.TelemetryCorrelation"" preCondition=""integratedMode,managedHandler"" />
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
<add name=""ApplicationInsightsWebTracking"" type=""Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"" preCondition=""managedHandler"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
const string ExpectedWebConfigContent = @"
|
||||
<configuration>
|
||||
<location>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration=""false"" />
|
||||
</system.webServer>
|
||||
</location>
|
||||
<system.web>
|
||||
<httpModules>
|
||||
<add name=""abc"" type=""type"" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<add name=""abc"" type=""type""/>
|
||||
<remove name=""ApplicationInsightsWebTracking"" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
</configuration>";
|
||||
|
||||
var transformedWebConfig = this.ApplyInstallTransformation(OriginalWebConfigContent, InstallConfigTransformationResourceName);
|
||||
this.VerifyTransformation(ExpectedWebConfigContent, transformedWebConfig);
|
||||
}
|
||||
|
||||
private XDocument ApplyInstallTransformation(string originalConfiguration, string resourceName)
|
||||
{
|
||||
return this.ApplyTransformation(originalConfiguration, resourceName);
|
||||
}
|
||||
|
||||
private XDocument ApplyUninstallTransformation(string originalConfiguration, string resourceName)
|
||||
{
|
||||
return this.ApplyTransformation(originalConfiguration, resourceName);
|
||||
}
|
||||
|
||||
private void VerifyTransformation(string expectedConfigContent, XDocument transformedWebConfig)
|
||||
{
|
||||
Assert.IsTrue(
|
||||
XNode.DeepEquals(
|
||||
transformedWebConfig.FirstNode,
|
||||
XDocument.Parse(expectedConfigContent).FirstNode));
|
||||
}
|
||||
|
||||
private XDocument ApplyTransformation(string originalConfiguration, string transformationResourceName)
|
||||
{
|
||||
XDocument result;
|
||||
Stream stream = null;
|
||||
try
|
||||
{
|
||||
stream = typeof(WebConfigTransformTest).Assembly.GetManifestResourceStream(transformationResourceName);
|
||||
var document = new XmlTransformableDocument();
|
||||
using (var transformation = new XmlTransformation(stream, null))
|
||||
{
|
||||
stream = null;
|
||||
document.LoadXml(originalConfiguration);
|
||||
transformation.Apply(document);
|
||||
result = XDocument.Parse(document.OuterXml);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (stream != null)
|
||||
{
|
||||
stream.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
|
||||
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net45" developmentDependency="true" />
|
||||
<package id="xunit" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
|
||||
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
|
||||
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Signing.props'))\Signing.props" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{6F167A87-55EA-4E8B-AFAF-91E1A1604446}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<RootNamespace>Microsoft.AspNet.ApplicationInsights.HostingStartup.NuGet</RootNamespace>
|
||||
<AssemblyName>Microsoft.AspNet.ApplicationInsights.HostingStartup.NuGet</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SccProjectName>SAK</SccProjectName>
|
||||
<SccLocalPath>SAK</SccLocalPath>
|
||||
<SccAuxPath>SAK</SccAuxPath>
|
||||
<SccProvider>SAK</SccProvider>
|
||||
<!-- Suppress the "CS2008: No source files specified" warning -->
|
||||
<NoWarn>2008</NoWarn>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
|
||||
<PackageSpecFile>$(MSBuildProjectDirectory)\Package.nuspec</PackageSpecFile>
|
||||
<PackageVersionFile>$(BinRoot)\$(Configuration)\Src\Web\Web.Net45\Microsoft.AI.Web.dll</PackageVersionFile>
|
||||
<TargetFrameworkProfile />
|
||||
<NuGetPackageImportStamp>7286ce46</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
|
||||
<ItemGroup>
|
||||
<None Include="Package.nuspec">
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
<None Include="web.config.install.xdt">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
<SubType>Designer</SubType>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System.Net" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Package.targets'))\Package.targets" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
<Import Project="..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" />
|
||||
<Target Name="Pack" AfterTargets="BuildNugetPackage">
|
||||
<!-- Keep the target name as "Pack", since the SignNuGetPackage target AfterTargets it: https://devdiv.visualstudio.com/DefaultCollection/Engineering/_git/MicroBuild?path=%2Fsrc%2FPlugins%2FSigning%2FbuildCrossTargeting%2FMicroBuild.Plugins.Signing.targets&version=GBmaster&_a=contents&line=10&lineStyle=plain&lineEnd=10&lineStartColumn=17&lineEndColumn=33 -->
|
||||
<!-- IsPackable & PackageOutputPath properties are required by SignNuGetPackage target: https://devdiv.visualstudio.com/DefaultCollection/Engineering/_git/MicroBuild?path=%2Fsrc%2FPlugins%2FSigning%2FbuildCrossTargeting%2FMicroBuild.Plugins.Signing.targets&version=GBmaster&_a=contents&line=10&lineStyle=plain&lineEnd=10&lineStartColumn=17&lineEndColumn=33 -->
|
||||
<PropertyGroup>
|
||||
<IsPackable>True</IsPackable>
|
||||
<PackageOutputPath>$(PackageOutputDir)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<SignNuGetPackFiles Include="$(PackageOutputPath)\**\*.nupkg">
|
||||
</SignNuGetPackFiles>
|
||||
</ItemGroup>
|
||||
<Message Text="Package Output Path: $(PackageOutputPath)" />
|
||||
<Message Text="Files to sign for HostingStartup: @(SignNuGetPackFiles)" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Microsoft.AspNet.ApplicationInsights.HostingStartup</id>
|
||||
<version>$version$</version>
|
||||
<title>Application Insights Hosting Startup for Web Applications</title>
|
||||
<authors>$author$</authors>
|
||||
<owners>$author$</owners>
|
||||
<licenseUrl>https://go.microsoft.com/fwlink/?LinkID=510709</licenseUrl>
|
||||
<projectUrl>https://go.microsoft.com/fwlink/?LinkId=392727</projectUrl>
|
||||
<iconUrl>$image$</iconUrl>
|
||||
<requireLicenseAcceptance>true</requireLicenseAcceptance>
|
||||
<summary>Application Insights Hosting Startup for .NET web applications.</summary>
|
||||
<description>Application Insights Hosting Startup for .NET web applications. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156</description>
|
||||
<copyright>$copyright$</copyright>
|
||||
<releaseNotes>For the release notes please follow http://go.microsoft.com/fwlink/?LinkId=535037</releaseNotes>
|
||||
<tags>Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights</tags>
|
||||
<dependencies>
|
||||
<dependency id="Microsoft.ApplicationInsights.Web" version="$version$" />
|
||||
<dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0"/>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="$configuration$\Src\HostingStartup\HostingStartup.Nuget\web.config.install.xdt" target="content\net45" />
|
||||
|
||||
<file src="$configuration$\Src\HostingStartup\HostingStartup.Net45\Microsoft.AspNet.ApplicationInsights.HostingStartup.dll" target="lib\net45" />
|
||||
</files>
|
||||
</package>
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Import Project="..\..\..\Common.props" />
|
||||
<Import Project="..\..\..\Nupkg.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<RootNamespace>Microsoft.ApplicationInsights.Extensibility.HostingStartup</RootNamespace>
|
||||
<AssemblyName>Microsoft.AspNet.ApplicationInsights.HostingStartup</AssemblyName>
|
||||
<DocumentationFile>$(OutputPath)\$(AssemblyName).XML</DocumentationFile>
|
||||
<TargetFramework>net45</TargetFramework>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<DefineConstants>$(DefineConstants);NET45;ALLOW_AGGRESSIVE_INLIGNING_ATTRIBUTE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!--Nupkg properties-->
|
||||
<PackageId>Microsoft.AspNet.ApplicationInsights.HostingStartup</PackageId>
|
||||
<Title>Application Insights Hosting Startup for Web Applications</Title>
|
||||
<Description>Application Insights Hosting Startup for .NET web applications. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156 </Description>
|
||||
<PackageTags>Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights</PackageTags>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!--TODO: Remove this as soon as all issues are resolved. Is true by default in Common.props-->
|
||||
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(Configuration)' == 'Release' And $(OS) == 'Windows_NT'">
|
||||
<!--Analyzers and Build Infrastructure-->
|
||||
<PackageReference Include="Desktop.Analyzers" Version="1.1.0">
|
||||
<PrivateAssets>All</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
|
||||
<PrivateAssets>All</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1">
|
||||
<PrivateAssets>All</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
|
||||
<PrivateAssets>All</PrivateAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!--Common Dependencies-->
|
||||
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.8.0-beta2" />
|
||||
<PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
|
||||
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(OS) == 'Windows_NT'">
|
||||
<!--Windows Only-->
|
||||
<PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!--Nuget Install Transformations-->
|
||||
<Content Include="web.config.install.xdt" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!--Framework References-->
|
||||
<Reference Include="System.Web" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
|
||||
</Project>
|
||||
|
|
@ -24,14 +24,9 @@
|
|||
/// <param name="sender">Event listener that will be called on every new event.</param>
|
||||
internal DiagnosticsEventListener(EventLevel logLevel, EventKeywords keywords, IEventListener sender)
|
||||
{
|
||||
if (sender == null)
|
||||
{
|
||||
throw new ArgumentNullException("sender");
|
||||
}
|
||||
|
||||
this.logLevel = logLevel;
|
||||
this.keywords = keywords;
|
||||
this.sender = sender;
|
||||
this.sender = sender ?? throw new ArgumentNullException(nameof(sender));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -1,12 +1,14 @@
|
|||
namespace Microsoft.ApplicationInsights.Extensibility.HostingStartup
|
||||
{
|
||||
using System;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Diagnostics.Tracing;
|
||||
|
||||
/// <summary>
|
||||
/// ETW EventSource tracing class.
|
||||
/// </summary>
|
||||
[EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-HostingStartup")]
|
||||
[SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
|
||||
internal sealed class HostingStartupEventSource : EventSource
|
||||
{
|
||||
/// <summary>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)\..', 'Product.props'))\Product.props" />
|
||||
<PropertyGroup>
|
||||
<RootNamespace>Microsoft.ApplicationInsights.Extensibility.HostingStartup</RootNamespace>
|
||||
<AssemblyName>Microsoft.AspNet.ApplicationInsights.HostingStartup</AssemblyName>
|
||||
<DocumentationFile>$(OutputPath)\$(AssemblyName).XML</DocumentationFile>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -108,15 +108,6 @@ EndProject
|
|||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyCollector.NetCore.Tests", "DependencyCollector\NetCore.Tests\DependencyCollector.NetCore.Tests.csproj", "{D831194B-6283-4F53-B351-D9C72FC03629}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostingStartup", "HostingStartup", "{701D2D4F-B581-45A2-AF29-4F34EC5F047B}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
HostingStartup\Product.props = HostingStartup\Product.props
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingStartup.Net45", "HostingStartup\HostingStartup.Net45\HostingStartup.Net45.csproj", "{D90A51E3-949C-4304-ADF9-25F6CB59F298}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingStartup.NuGet", "HostingStartup\HostingStartup.Nuget\HostingStartup.NuGet.csproj", "{6F167A87-55EA-4E8B-AFAF-91E1A1604446}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingStartup.Nuget.Tests", "HostingStartup\HostingStartup.Nuget.Tests\HostingStartup.Nuget.Tests.csproj", "{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingStartup.Net45.Tests", "HostingStartup\HostingStartup.Net45.Tests\HostingStartup.Net45.Tests.csproj", "{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}"
|
||||
EndProject
|
||||
|
|
@ -136,6 +127,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsServer.NetCore", "Wi
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsServer.NetCore.Tests", "WindowsServer\WindowsServer.NetCore.Tests\WindowsServer.NetCore.Tests.csproj", "{003691E1-D908-4F29-A9AA-8A98C878F951}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostingStartup", "HostingStartup\HostingStartup\HostingStartup.csproj", "{80F0481A-66C7-4442-96D3-5FD841132C4B}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{257fce5a-0779-45a5-b541-0ce43d79d009}*SharedItemsImports = 4
|
||||
|
|
@ -320,30 +313,6 @@ Global
|
|||
{D831194B-6283-4F53-B351-D9C72FC03629}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -384,6 +353,14 @@ Global
|
|||
{003691E1-D908-4F29-A9AA-8A98C878F951}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{003691E1-D908-4F29-A9AA-8A98C878F951}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{003691E1-D908-4F29-A9AA-8A98C878F951}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -414,9 +391,6 @@ Global
|
|||
{F254D4FB-428D-408E-8251-39BCA7B4B5CE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
{C6B569BC-6F19-42C9-A951-DA611BB0F4BE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
{D831194B-6283-4F53-B351-D9C72FC03629} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}
|
||||
{D90A51E3-949C-4304-ADF9-25F6CB59F298} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B}
|
||||
{6F167A87-55EA-4E8B-AFAF-91E1A1604446} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B}
|
||||
{AEB17FC1-6C66-468B-9D08-334F0E1AE7CB} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B}
|
||||
{9AB6BDFD-253C-4C97-8BB8-7234ADFCB601} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B}
|
||||
{85CFB0B2-3E43-4FC4-AD32-6D223C3E6428} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
{A78F50D4-F518-4DCB-878B-526FD54CCA35} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
|
|
@ -426,6 +400,7 @@ Global
|
|||
{9B524BD3-682D-4B6F-9251-D4B2911DF0FD} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
|
||||
{E13397C6-DF1D-45AF-A8D4-91BCFA398C73} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
|
||||
{003691E1-D908-4F29-A9AA-8A98C878F951} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
|
||||
{80F0481A-66C7-4442-96D3-5FD841132C4B} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {F99E0A07-C363-49BF-BFA7-C748391CE38E}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче