Skip to content

Commit 6a6c88d

Browse files
author
Nate McMaster
committed
Merge source code from aspnet/Diagnostics to this repo
2 parents f9bb5e5 + ed0b421 commit 6a6c88d

File tree

143 files changed

+15701
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+15701
-12
lines changed

‎.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
path = modules/CORS
1111
url = https://github.com/aspnet/CORS.git
1212
branch = release/2.1
13-
[submodule "modules/Diagnostics"]
14-
path = modules/Diagnostics
15-
url = https://github.com/aspnet/Diagnostics.git
16-
branch = release/2.1
1713
[submodule "modules/EntityFrameworkCore"]
1814
path = modules/EntityFrameworkCore
1915
url = https://github.com/aspnet/EntityFrameworkCore.git

‎build/artifacts.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@
6767
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection" AllMetapackage="true" AppMetapackage="true" Category="ship" />
6868
<PackageArtifact Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Category="shipoob" />
6969
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
70-
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Elm" Category="noship" />
7170
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" AllMetapackage="true" AppMetapackage="true" Category="ship" />
72-
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Category="noship" />
7371
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics" AllMetapackage="true" AppMetapackage="true" Category="ship" />
7472
<PackageArtifact Include="Microsoft.AspNetCore.HostFiltering" AllMetapackage="true" AppMetapackage="true" Category="ship" />
7573
<PackageArtifact Include="Microsoft.AspNetCore.Hosting.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
@@ -179,8 +177,6 @@
179177
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" AllMetapackage="true" AppMetapackage="true" Category="ship" />
180178
<PackageArtifact Include="Microsoft.EntityFrameworkCore" AllMetapackage="true" AppMetapackage="true" Category="ship" />
181179
<PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
182-
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Category="noship" />
183-
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="noship" />
184180
<PackageArtifact Include="Microsoft.Extensions.Identity.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
185181
<PackageArtifact Include="Microsoft.Extensions.Identity.Stores" AllMetapackage="true" AppMetapackage="true" Category="ship" />
186182
<PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<RepositoryBuildOrder Include="ResponseCaching" Order="11" />
2020
<RepositoryBuildOrder Include="Session" Order="11" RootPath="$(RepositoryRoot)src\Session\" />
2121
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
22-
<RepositoryBuildOrder Include="Diagnostics" Order="12" />
2322
<RepositoryBuildOrder Include="Localization" Order="12" />
2423
<RepositoryBuildOrder Include="Security" Order="13" />
2524
<RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />

‎build/dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
<MicrosoftExtensionsBuffersTestingSourcesPackageVersion>2.1.1</MicrosoftExtensionsBuffersTestingSourcesPackageVersion>
9393
<MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>2.1.1</MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>
9494
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.1</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
95+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
96+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
9597

9698
<!-- External and partner dependencies -->
9799
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
5454
<ShippedRepository Include="BasicMiddleware" />
5555
<ShippedRepository Include="CORS" />
56-
<ShippedRepository Include="Diagnostics" />
5756
<ShippedRepository Include="EntityFrameworkCore" />
5857
<ShippedRepository Include="HttpSysServer" />
5958
<ShippedRepository Include="Identity" />

‎eng/Baseline.props

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,34 @@
126126
<BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[4.5.0, )" />
127127
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
128128
</ItemGroup>
129+
<!-- Package: Microsoft.AspNetCore.Diagnostics.Abstractions-->
130+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.Abstractions' ">
131+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
132+
</PropertyGroup>
133+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' " />
134+
<!-- Package: Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore-->
135+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' ">
136+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
137+
</PropertyGroup>
138+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.0' ">
139+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1, )" />
140+
<BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[2.1.1, )" />
141+
</ItemGroup>
142+
<!-- Package: Microsoft.AspNetCore.Diagnostics-->
143+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics' ">
144+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
145+
</PropertyGroup>
146+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics' AND '$(TargetFramework)' == 'netstandard2.0' ">
147+
<BaselinePackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="[2.1.1, )" />
148+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
149+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
150+
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
151+
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[2.1.1, )" />
152+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
153+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
154+
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
155+
<BaselinePackageReference Include="System.Reflection.Metadata" Version="[1.6.0, )" />
156+
</ItemGroup>
129157
<!-- Package: Microsoft.AspNetCore.Hosting.Abstractions-->
130158
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.Abstractions' ">
131159
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -224,6 +252,15 @@
224252
<BaselinePackageReference Include="Microsoft.CSharp" Version="[4.5.0, )" />
225253
<BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
226254
</ItemGroup>
255+
<!-- Package: Microsoft.AspNetCore.MiddlewareAnalysis-->
256+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' ">
257+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
258+
</PropertyGroup>
259+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' AND '$(TargetFramework)' == 'netstandard2.0' ">
260+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
261+
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.1.1, )" />
262+
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
263+
</ItemGroup>
227264
<!-- Package: Microsoft.AspNetCore.Owin-->
228265
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' ">
229266
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>

‎eng/Dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<LatestPackageReference Include="Microsoft.AspNetCore.Certificates.Generation.Sources" Version="$(MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion)" />
1414
<LatestPackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
1515
<LatestPackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
16+
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
17+
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
1618
<LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
1719
<LatestPackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
1820
<LatestPackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />

‎eng/ProjectReferences.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
<ProjectReferenceProvider Include="dotnet-user-secrets" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-user-secrets\src\dotnet-user-secrets.csproj" />
4040
<ProjectReferenceProvider Include="dotnet-watch" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-watch\src\dotnet-watch.csproj" />
4141
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" ProjectPath="$(RepositoryRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj" />
42+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj" />
43+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj" />
44+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj" />
45+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.MiddlewareAnalysis" ProjectPath="$(RepositoryRoot)src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
4246
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
4347
</ItemGroup>
4448
</Project>

‎eng/dependencies.temp.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ This is required to provide dependencies for samples and tests.
44
-->
55
<Project>
66
<ItemGroup>
7-
<LatestPackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
87
<LatestPackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
98
<LatestPackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
109
</ItemGroup>

‎eng/tools/BaselineGenerator/baseline.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<Package Id="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.1" />
1616
<Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.1.1" />
1717
<Package Id="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
18+
<Package Id="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" />
19+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.1" />
20+
<Package Id="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
1821
<Package Id="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
1922
<Package Id="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.1" />
2023
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.1.1" />
@@ -25,6 +28,7 @@
2528
<Package Id="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
2629
<Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
2730
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" />
31+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.1" />
2832
<Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
2933
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
3034
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />

0 commit comments

Comments
 (0)