Skip to content

Commit a725890

Browse files
SergeyKanzhelevSergeyKanzhelev
authored
Merge pull request #39 from aspnet/sergkanz/cleanup
a bit more follow up clean up
2 parents 59c8735 + ca241ef commit a725890

File tree

9 files changed

+18
-181
lines changed

9 files changed

+18
-181
lines changed

‎.nuget/NuGet.Config‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<solution>
4-
<add key="disableSourceControlIntegration" value="true" />
5-
</solution>
63
<packageSources>
7-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
85
</packageSources>
9-
<packageRestore>
10-
<!-- Disables command-line, automatic, and MSBuild-Integrated restore -->
11-
<add key="enabled" value="True" />
12-
</packageRestore>
136
</configuration>

‎.nuget/NuGet.exe‎

-18 KB
Binary file not shown.

‎.nuget/NuGet.targets‎

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎NuGet.Config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<!--Use this configuration file to get preview packages from other
5+
sources like MyGet -->
6+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
7+
</packageSources>
8+
</configuration>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ See http protocol [specifications][http-protocol-specification] for
5252
details.
5353

5454
This http module is used by Application Insights. See
55-
[documentation][usage-in-ai-code-docs] and [code][usage-in-ai-code].
55+
[documentation][usage-in-ai-docs] and [code][usage-in-ai-code].
5656

5757
[http-protocol-specification]: https://github.com/dotnet/corefx/blob/master/src/System.Diagnostics.DiagnosticSource/src/HttpCorrelationProtocol.md
5858
[usage-in-ai-docs]: https://docs.microsoft.com/azure/application-insights/application-insights-correlation

‎src/Microsoft.AspNet.TelemetryCorrelation/Microsoft.AspNet.TelemetryCorrelation.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
2-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.AspNet.TelemetryCorrelation.sln))\tools\Microsoft.AspNet.TelemetryCorrelation.settings.props" />
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.AspNet.TelemetryCorrelation.sln))\tools\Common.props" />
33
<PropertyGroup>
44
<ProjectGuid>{4C8E592C-C532-4CF2-80EF-3BDD0D788D12}</ProjectGuid>
55
<OutputType>Library</OutputType>
@@ -67,11 +67,9 @@
6767
<Reference Include="Microsoft.CSharp" />
6868
<Reference Include="System.Net.Http" />
6969
<Reference Include="System.Xml" />
70-
<!--
7170
<PackageReference Include="Desktop.Analyzers" Version="1.1.0">
7271
<PrivateAssets>All</PrivateAssets>
7372
</PackageReference>
74-
-->
7573
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
7674
<PrivateAssets>All</PrivateAssets>
7775
</PackageReference>
@@ -85,7 +83,6 @@
8583
</ItemGroup>
8684
<ItemGroup>
8785
<None Include="Microsoft.AspNet.TelemetryCorrelation.ruleset" />
88-
<None Include="35MSSharedLib1024.snk" />
8986
</ItemGroup>
9087
<ItemGroup>
9188
<Content Include="web.config.install.xdt"/>

‎src/Microsoft.AspNet.TelemetryCorrelation/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
using System.Runtime.CompilerServices;
1+
using System;
2+
using System.Runtime.CompilerServices;
23
using System.Runtime.InteropServices;
34

45
// Setting ComVisible to false makes the types in this assembly not visible
56
// to COM components. If you need to access a type in this assembly from
67
// COM, set the ComVisible attribute to true on that type.
78
[assembly: ComVisible(false)]
89

9-
// The following GUID is for the ID of the typelib if this project is exposed to COM
10-
[assembly: Guid("4c8e592c-c532-4cf2-80ef-3bdd0d788d12")]
10+
[assembly: CLSCompliant(true)]
1111

1212
#if PUBLIC_RELEASE
1313
[assembly: InternalsVisibleTo("Microsoft.AspNet.TelemetryCorrelation.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

‎test/Microsoft.AspNet.TelemetryCorrelation.Tests/Microsoft.AspNet.TelemetryCorrelation.Tests.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
2-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.AspNet.TelemetryCorrelation.sln))\tools\Microsoft.AspNet.TelemetryCorrelation.settings.props" />
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.AspNet.TelemetryCorrelation.sln))\tools\Common.props" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectGuid>{9FAE5C43-F56C-4D87-A23C-6D2D57B4ABED}</ProjectGuid>
77
<OutputType>Library</OutputType>
8-
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>Microsoft.AspNet.TelemetryCorrelation.Tests</RootNamespace>
10-
<AssemblyName>Microsoft.AspNet.TelemetryCorrelation.Tests</AssemblyName>
118
<TargetFrameworks>net452</TargetFrameworks>
129
<FileAlignment>512</FileAlignment>
1310
<ErrorReport>prompt</ErrorReport>
@@ -72,18 +69,13 @@
7269
</ProjectReference>
7370
</ItemGroup>
7471
<ItemGroup>
75-
<None Include="35MSSharedLib1024.snk" />
76-
<None Include="packages.config" />
7772
<EmbeddedResource Include="..\..\src\Microsoft.AspNet.TelemetryCorrelation\web.config.install.xdt">
7873
<Link>Resources\web.config.install.xdt</Link>
7974
</EmbeddedResource>
8075
<EmbeddedResource Include="..\..\src\Microsoft.AspNet.TelemetryCorrelation\web.config.uninstall.xdt">
8176
<Link>Resources\web.config.uninstall.xdt</Link>
8277
</EmbeddedResource>
8378
</ItemGroup>
84-
<ItemGroup>
85-
<None Include="35MSSharedLib1024.snk" />
86-
</ItemGroup>
8779
<ItemGroup>
8880
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
8981
</ItemGroup>

tools/Microsoft.AspNet.TelemetryCorrelation.settings.props renamed to tools/Common.props

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212
<IntermediateOutputPath>$(ObjPath)$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
1313
</PropertyGroup>
1414

15-
<PropertyGroup>
16-
<AssemblyPath Condition="'$(CodeSignEnabled)' == 'true'">$(CodeSignOutputPath)</AssemblyPath>
17-
<AssemblyPath Condition="'$(AssemblyPath)' == ''">$(OutputPath)</AssemblyPath>
18-
</PropertyGroup>
19-
20-
15+
<!--VERSION -->
2116
<PropertyGroup>
2217
<BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
2318
<VersionStartYear>2018</VersionStartYear>
@@ -28,27 +23,23 @@
2823
<VersionBuild Condition="'$(VersionBuild)' == '' OR '$(VersionBuild)' == '0'">$([MSBuild]::Add(1, $([MSBuild]::Subtract($([System.DateTime]::Now.Year), $(VersionStartYear)))))$([System.DateTime]::Now.ToString("MMdd"))</VersionBuild>
2924
<VersionRevision Condition="'$(VersionRevision)' == ''">0</VersionRevision>
3025
<VersionRelease Condition="'$(VersionRelease)' == ''">0</VersionRelease>
31-
32-
<CustomBeforeProjectTargets>$(MSBuildThisFileDirectory)Microsoft.AspNet.TelemetryCorrelation.Extensions.settings.targets</CustomBeforeProjectTargets>
33-
<VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
3426
</PropertyGroup>
3527

3628
<PropertyGroup>
3729
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionRelease)</VersionPrefix>
38-
<VersionSuffix Condition="'$(BuildQuality)' != 'rtm'">-$(BuildQuality)</VersionSuffix>
30+
<VersionSuffix Condition="'$(BuildQuality)' != 'rtm'">$(BuildQuality)</VersionSuffix>
3931
<FileVersion>$(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision)</FileVersion>
4032
<InformationalVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease)-$(VersionBuild)</InformationalVersion>
4133
<AssemblyVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease).0</AssemblyVersion>
4234
</PropertyGroup>
4335

44-
<Import Project="$(CustomBeforeProjectTargets)" Condition="Exists('$(CustomBeforeProjectTargets)')" Label="Pre-targets Build Extensibility Point"/>
45-
4636
<PropertyGroup Label="Common Configuration">
4737
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
4838
<OutputPath>$(RepositoryRoot)bin\$(Configuration)\</OutputPath>
4939
<IntermediateOutputPath>$(RepositoryRoot)obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
5040
</PropertyGroup>
5141

42+
<!-- SIGNING -->
5243
<ItemDefinitionGroup>
5344
<FilesToSign>
5445
<!-- Microsoft authenticode certificate for all file types -->

0 commit comments

Comments
 (0)