Skip to content

Commit 384a4cd

Browse files
RussKieRussKie
committed
Merge remote-tracking branch 'origin/release/8.0'
2 parents 628bd8c + a1c25eb commit 384a4cd

27 files changed

+490
-88
lines changed

‎Directory.Build.props

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
33

44
<PropertyGroup>
5-
<!-- The latest TFM we're targeting overall -->
6-
<LatestTargetFramework>net$(MajorVersion).$(MinorVersion)</LatestTargetFramework>
7-
<!-- All the .NET TFMs we're building -->
8-
<NetCoreTargetFrameworks>$(LatestTargetFramework);net8.0</NetCoreTargetFrameworks>
9-
10-
<TargetFrameworks>$(NetCoreTargetFrameworks);net462</TargetFrameworks>
11-
125
<LangVersion>preview</LangVersion>
136
<Nullable>enable</Nullable>
147
<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -17,10 +10,30 @@
1710
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1811
<EnableXlfLocalization>false</EnableXlfLocalization>
1912
<UpdateXlfOnBuild>false</UpdateXlfOnBuild>
20-
2113
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2214
</PropertyGroup>
2315

16+
<!-- https://github.com/dotnet/aspnetcore/blob/72b0269372a/eng/Common.props#L3-L6 -->
17+
<PropertyGroup>
18+
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win</TargetOsName>
19+
<IsWindowsBuild>false</IsWindowsBuild>
20+
<IsWindowsBuild Condition=" '$(TargetOsName)' == 'win' ">true</IsWindowsBuild>
21+
</PropertyGroup>
22+
23+
<PropertyGroup>
24+
<!-- The latest TFM we're targeting overall -->
25+
<LatestTargetFramework>net$(MajorVersion).$(MinorVersion)</LatestTargetFramework>
26+
<NetCoreTargetFrameworks>$(LatestTargetFramework);net6.0</NetCoreTargetFrameworks>
27+
28+
<!-- All the .NET TFMs we're building -->
29+
<TargetFrameworks>$(NetCoreTargetFrameworks)</TargetFrameworks>
30+
<TargetFrameworks Condition=" '$(IsWindowsBuild)' == 'true' ">$(NetCoreTargetFrameworks);net462</TargetFrameworks>
31+
32+
<!-- All the .NET TFMs we're testing against -->
33+
<TestNetCoreTargetFrameworks>$(NetCoreTargetFrameworks)</TestNetCoreTargetFrameworks>
34+
<TestNetCoreTargetFrameworks Condition=" '$(IsWindowsBuild)' == 'true' ">$(TestNetCoreTargetFrameworks);net462</TestNetCoreTargetFrameworks>
35+
</PropertyGroup>
36+
2437
<PropertyGroup>
2538
<Product>Microsoft&#xAE; .NET Platform Extensions samples</Product>
2639
<Copyright>$(CopyrightNetFoundation)</Copyright>

‎NuGet.config

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-pub-dotnet-runtime-488a8a3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-488a8a35/nuget/v3/index.json" />
8+
<!-- End: Package sources from dotnet-runtime -->
9+
<!-- Begin: Package sources from dotnet-extensions -->
10+
<add key="darc-pub-dotnet-extensions-35e5d04" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-35e5d04e/nuget/v3/index.json" />
11+
<!-- End: Package sources from dotnet-extensions -->
12+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
513
<!-- Arcade -->
614
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
715
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
816
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
9-
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
10-
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
17+
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
18+
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1119
<!-- Used for the Rich Navigation indexing task -->
1220
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1321
</packageSources>

‎Samples.sln

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LatencyMeasurement", "Laten
3030
EndProject
3131
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LatencyContext", "src\Telemetry\LatencyMeasurement\LatencyContext\LatencyContext.csproj", "{F8A03BBA-9846-4C9B-A4BE-9CBE8B416974}"
3232
EndProject
33+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logging", "Logging", "{248CB37C-2412-4231-96C0-092413C10D4B}"
34+
EndProject
35+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComplexObjectLogging", "ComplexObjectLogging", "{2B4A9009-DB4D-497A-BA1A-23A18EBC32E8}"
36+
EndProject
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComplexObjectLogging", "src\Telemetry\Logging\ComplexObjectLogging\ComplexObjectLogging.csproj", "{75034993-150B-4940-B633-4FEF73E30401}"
38+
EndProject
39+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpClientLogging", "HttpClientLogging", "{01EA865B-B3B0-4A2F-8361-8E59C004653B}"
40+
EndProject
41+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpClientLogging", "src\Telemetry\Logging\HttpClientLogging\HttpClientLogging.csproj", "{A8922F1D-0A30-45DA-ADD2-927455CB6549}"
42+
EndProject
3343
Global
3444
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3545
Debug|Any CPU = Debug|Any CPU
@@ -48,6 +58,14 @@ Global
4858
{F8A03BBA-9846-4C9B-A4BE-9CBE8B416974}.Debug|Any CPU.Build.0 = Debug|Any CPU
4959
{F8A03BBA-9846-4C9B-A4BE-9CBE8B416974}.Release|Any CPU.ActiveCfg = Release|Any CPU
5060
{F8A03BBA-9846-4C9B-A4BE-9CBE8B416974}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{75034993-150B-4940-B633-4FEF73E30401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{75034993-150B-4940-B633-4FEF73E30401}.Debug|Any CPU.Build.0 = Debug|Any CPU
63+
{75034993-150B-4940-B633-4FEF73E30401}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{75034993-150B-4940-B633-4FEF73E30401}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{A8922F1D-0A30-45DA-ADD2-927455CB6549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{A8922F1D-0A30-45DA-ADD2-927455CB6549}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{A8922F1D-0A30-45DA-ADD2-927455CB6549}.Release|Any CPU.ActiveCfg = Release|Any CPU
68+
{A8922F1D-0A30-45DA-ADD2-927455CB6549}.Release|Any CPU.Build.0 = Release|Any CPU
5169
EndGlobalSection
5270
GlobalSection(SolutionProperties) = preSolution
5371
HideSolutionNode = FALSE
@@ -60,6 +78,11 @@ Global
6078
{72B462BA-F903-4CA7-8A0A-6C030BE408BC} = {301296EC-54FF-4ADC-B2D1-281E0C7F2867}
6179
{CBA4C7B6-6F01-4BD4-BC90-7DB1F1D5034C} = {72B462BA-F903-4CA7-8A0A-6C030BE408BC}
6280
{F8A03BBA-9846-4C9B-A4BE-9CBE8B416974} = {CBA4C7B6-6F01-4BD4-BC90-7DB1F1D5034C}
81+
{248CB37C-2412-4231-96C0-092413C10D4B} = {72B462BA-F903-4CA7-8A0A-6C030BE408BC}
82+
{2B4A9009-DB4D-497A-BA1A-23A18EBC32E8} = {248CB37C-2412-4231-96C0-092413C10D4B}
83+
{75034993-150B-4940-B633-4FEF73E30401} = {2B4A9009-DB4D-497A-BA1A-23A18EBC32E8}
84+
{01EA865B-B3B0-4A2F-8361-8E59C004653B} = {248CB37C-2412-4231-96C0-092413C10D4B}
85+
{A8922F1D-0A30-45DA-ADD2-927455CB6549} = {01EA865B-B3B0-4A2F-8361-8E59C004653B}
6386
EndGlobalSection
6487
GlobalSection(ExtensibilityGlobals) = postSolution
6588
SolutionGuid = {6083D400-BF26-4ACE-86A8-778D26A8FA6A}

‎eng/Version.Details.xml

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,61 @@
11
<Dependencies>
22
<ProductDependencies>
33
<!-- dotnet/runtime -->
4-
<Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-alpha.1.23557.1" CoherentParentDependency="Microsoft.Extensions.AmbientMetadata.Application">
4+
<Dependency Name="Microsoft.Bcl.TimeProvider" Version="8.0.0">
55
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>0ecd2f4999661e3b95e93cb4bdfa860009c155ba</Sha>
6+
<Sha>488a8a3521610422e8fbe22d5cc66127f3dce3dc</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-alpha.1.23557.1" CoherentParentDependency="Microsoft.Extensions.AmbientMetadata.Application">
8+
<Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0">
99
<Uri>https://github.com/dotnet/runtime</Uri>
10-
<Sha>0ecd2f4999661e3b95e93cb4bdfa860009c155ba</Sha>
10+
<Sha>488a8a3521610422e8fbe22d5cc66127f3dce3dc</Sha>
1111
</Dependency>
12-
<!--
13-
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
14-
All Runtime.$rid packages should have the same version.
15-
-->
16-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23557.1" CoherentParentDependency="Microsoft.Extensions.AmbientMetadata.Application">
12+
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0">
1713
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>0ecd2f4999661e3b95e93cb4bdfa860009c155ba</Sha>
14+
<Sha>c88b3776d0fb3bb33fcd4192b476147c0895bd6f</Sha>
1915
</Dependency>
2016
<!-- dotnet/aspnetcore -->
21-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23557.6" CoherentParentDependency="Microsoft.Extensions.AmbientMetadata.Application">
22-
<Uri>https://github.com/dotnet/aspnetcore</Uri>
23-
<Sha>1a564a1504fdc9a982405cce0ca3583da797123a</Sha>
24-
</Dependency>
2517
<!-- dotnet/extensions -->
26-
<Dependency Name="Microsoft.AspNetCore.Diagnostics.Middleware" Version="9.0.0-alpha.1.23558.5">
18+
<Dependency Name="Microsoft.AspNetCore.Diagnostics.Middleware" Version="8.0.0">
2719
<Uri>https://github.com/dotnet/extensions</Uri>
28-
<Sha>dabc60031f2aa220fc9d5adcdfda146a32d28fed</Sha>
20+
<Sha>35e5d04e1f6cd80c85f50063856fcfc66f8a5051</Sha>
2921
</Dependency>
30-
<Dependency Name="Microsoft.Extensions.AmbientMetadata.Application" Version="9.0.0-alpha.1.23558.5">
22+
<Dependency Name="Microsoft.Extensions.Compliance.Redaction" Version="8.0.0">
3123
<Uri>https://github.com/dotnet/extensions</Uri>
32-
<Sha>dabc60031f2aa220fc9d5adcdfda146a32d28fed</Sha>
24+
<Sha>35e5d04e1f6cd80c85f50063856fcfc66f8a5051</Sha>
3325
</Dependency>
34-
<Dependency Name="Microsoft.Extensions.Compliance.Redaction" Version="9.0.0-alpha.1.23558.5">
26+
<Dependency Name="Microsoft.Extensions.Compliance.Testing" Version="8.0.0">
3527
<Uri>https://github.com/dotnet/extensions</Uri>
36-
<Sha>dabc60031f2aa220fc9d5adcdfda146a32d28fed</Sha>
28+
<Sha>35e5d04e1f6cd80c85f50063856fcfc66f8a5051</Sha>
3729
</Dependency>
38-
<Dependency Name="Microsoft.Extensions.Compliance.Testing" Version="9.0.0-alpha.1.23558.5">
30+
<Dependency Name="Microsoft.Extensions.Diagnostics.ExceptionSummarization" Version="8.0.0">
3931
<Uri>https://github.com/dotnet/extensions</Uri>
40-
<Sha>dabc60031f2aa220fc9d5adcdfda146a32d28fed</Sha>
32+
<Sha>35e5d04e1f6cd80c85f50063856fcfc66f8a5051</Sha>
4133
</Dependency>
42-
<Dependency Name="Microsoft.Extensions.Diagnostics.ExceptionSummarization" Version="9.0.0-alpha.1.23558.5">
34+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.0.0">
4335
<Uri>https://github.com/dotnet/extensions</Uri>
44-
<Sha>dabc60031f2aa220fc9d5adcdfda146a32d28fed</Sha>
36+
<Sha>35e5d04e1f6cd80c85f50063856fcfc66f8a5051</Sha>
4537
</Dependency>
46-
<Dependency Name="Microsoft.Extensions.Diagnostics.Extra" Version="9.0.0-alpha.1.23558.5">
38+
<Dependency Name="Microsoft.Extensions.Telemetry.Abstractions" Version="8.0.0">
4739
<Uri>https://github.com/dotnet/extensions</Uri>
48-
<Sha>dabc60031f2aa220fc9d5adcdfda146a32d28fed</Sha>
40+
<Sha>35e5d04e1f6cd80c85f50063856fcfc66f8a5051</Sha>
4941
</Dependency>
50-
<Dependency Name="Microsoft.Extensions.Diagnostics.ExtraAbstractions" Version="9.0.0-alpha.1.23558.5">
42+
<Dependency Name="Microsoft.Extensions.Telemetry" Version="8.0.0">
5143
<Uri>https://github.com/dotnet/extensions</Uri>
52-
<Sha>dabc60031f2aa220fc9d5adcdfda146a32d28fed</Sha>
44+
<Sha>35e5d04e1f6cd80c85f50063856fcfc66f8a5051</Sha>
5345
</Dependency>
54-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-alpha.1.23558.5">
46+
<Dependency Name="Microsoft.Extensions.Http.Diagnostics" Version="8.0.0">
5547
<Uri>https://github.com/dotnet/extensions</Uri>
56-
<Sha>dabc60031f2aa220fc9d5adcdfda146a32d28fed</Sha>
48+
<Sha>35e5d04e1f6cd80c85f50063856fcfc66f8a5051</Sha>
5749
</Dependency>
5850
</ProductDependencies>
5951
<ToolsetDependencies>
60-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23553.1">
52+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23525.4">
6153
<Uri>https://github.com/dotnet/arcade</Uri>
62-
<Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
54+
<Sha>a57022b44f3ff23de925530ea1d27da9701aed57</Sha>
6355
</Dependency>
64-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23553.1">
56+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23525.4">
6557
<Uri>https://github.com/dotnet/arcade</Uri>
66-
<Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
58+
<Sha>a57022b44f3ff23de925530ea1d27da9701aed57</Sha>
6759
</Dependency>
6860
</ToolsetDependencies>
6961
</Dependencies>

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<MajorVersion>9</MajorVersion>
3+
<MajorVersion>8</MajorVersion>
44
<MinorVersion>0</MinorVersion>
55
<PatchVersion>0</PatchVersion>
66
<!-- version in our package name #.#.#-below.#####.## -->
7-
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
8-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
7+
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
8+
<PreReleaseVersionIteration>
9+
</PreReleaseVersionIteration>
910
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1011
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
1112
<ValidateBaseline>true</ValidateBaseline>
@@ -26,20 +27,19 @@
2627
-->
2728
<PropertyGroup Label="Automated">
2829
<!-- dotnet/runtime -->
29-
<MicrosoftBclTimeProviderVersion>9.0.0-alpha.1.23557.1</MicrosoftBclTimeProviderVersion>
30-
<MicrosoftExtensionsHostingVersion>9.0.0-alpha.1.23557.1</MicrosoftExtensionsHostingVersion>
31-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-alpha.1.23557.1</MicrosoftNETCoreAppRuntimewinx64Version>
30+
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
31+
<MicrosoftExtensionsHostingVersion>8.0.0</MicrosoftExtensionsHostingVersion>
32+
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
3233
<!-- dotnet/aspnetcore -->
33-
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-alpha.1.23557.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
3434
<!-- dotnet/extensions -->
35-
<MicrosoftAspNetCoreDiagnosticsMiddlewareVersion>9.0.0-alpha.1.23558.5</MicrosoftAspNetCoreDiagnosticsMiddlewareVersion>
36-
<MicrosoftExtensionsAmbientMetadataApplicationVersion>9.0.0-alpha.1.23558.5</MicrosoftExtensionsAmbientMetadataApplicationVersion>
37-
<MicrosoftExtensionsComplianceRedactionVersion>9.0.0-alpha.1.23558.5</MicrosoftExtensionsComplianceRedactionVersion>
38-
<MicrosoftExtensionsComplianceTestingVersion>9.0.0-alpha.1.23558.5</MicrosoftExtensionsComplianceTestingVersion>
39-
<MicrosoftExtensionsDiagnosticsExceptionSummarizationVersion>9.0.0-alpha.1.23558.5</MicrosoftExtensionsDiagnosticsExceptionSummarizationVersion>
40-
<MicrosoftExtensionsDiagnosticsExtraAbstractionsVersion>9.0.0-alpha.1.23558.5</MicrosoftExtensionsDiagnosticsExtraAbstractionsVersion>
41-
<MicrosoftExtensionsDiagnosticsExtraVersion>9.0.0-alpha.1.23558.5</MicrosoftExtensionsDiagnosticsExtraVersion>
42-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.0.0-alpha.1.23558.5</MicrosoftExtensionsDiagnosticsTestingVersion>
35+
<MicrosoftAspNetCoreDiagnosticsMiddlewareVersion>8.0.0</MicrosoftAspNetCoreDiagnosticsMiddlewareVersion>
36+
<MicrosoftExtensionsComplianceRedactionVersion>8.0.0</MicrosoftExtensionsComplianceRedactionVersion>
37+
<MicrosoftExtensionsComplianceTestingVersion>8.0.0</MicrosoftExtensionsComplianceTestingVersion>
38+
<MicrosoftExtensionsDiagnosticsExceptionSummarizationVersion>8.0.0</MicrosoftExtensionsDiagnosticsExceptionSummarizationVersion>
39+
<MicrosoftExtensionsDiagnosticsTestingVersion>8.0.0</MicrosoftExtensionsDiagnosticsTestingVersion>
40+
<MicrosoftExtensionsTelemetryAbstractionsVersion>8.0.0</MicrosoftExtensionsTelemetryAbstractionsVersion>
41+
<MicrosoftExtensionsTelemetryVersion>8.0.0</MicrosoftExtensionsTelemetryVersion>
42+
<MicrosoftExtensionsHttpDiagnosticsVersion>8.0.0</MicrosoftExtensionsHttpDiagnosticsVersion>
4343
</PropertyGroup>
4444
<!--
4545

‎global.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-alpha.1.23504.14"
3+
"version": "8.0.100-rtm.23506.1"
44
},
55
"tools": {
6-
"dotnet": "9.0.100-alpha.1.23504.14",
6+
"dotnet": "8.0.100-rtm.23506.1",
77
"runtimes": {
88
"dotnet/x64": [
9-
"8.0.0-rtm.23475.7",
10-
"$(MicrosoftNETCoreAppRuntimewinx64Version)"
9+
"6.0.22"
1110
],
1211
"aspnetcore/x64": [
13-
"8.0.0-rtm.23475.5",
14-
"$(MicrosoftAspNetCoreAppRuntimewinx64Version)"
12+
"6.0.22"
1513
]
1614
}
1715
},
1816
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1",
20-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23553.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23525.4",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23525.4"
2119
}
2220
}

‎src/Telemetry/LatencyMeasurement/LatencyContext/LatencyContext.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.Middleware" Version="$(MicrosoftAspNetCoreDiagnosticsMiddlewareVersion)" />
11-
<PackageReference Include="Microsoft.Extensions.Diagnostics.Extra" Version="$(MicrosoftExtensionsDiagnosticsExtraVersion)" />
12-
<PackageReference Include="Microsoft.Extensions.Diagnostics.ExtraAbstractions" Version="$(MicrosoftExtensionsDiagnosticsExtraAbstractionsVersion)" />
11+
<PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" Version="$(MicrosoftExtensionsTelemetryAbstractionsVersion)" />
1312
</ItemGroup>
1413

1514
</Project>

‎src/Telemetry/Logging/ComplexObjectLogging/ComplexObjectLogging.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Demonstrates how to use complex object logging feature.</Description>
5+
<OutputType>Exe</OutputType>
6+
<TargetFrameworks>$(NetCoreTargetFrameworks)</TargetFrameworks>
7+
8+
<!-- Uncomment this to emit the actual source-generated files under "obj/[Debug|Release]/[net8.0|net6.0]/generated" folder -->
9+
<!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>-->
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.Extensions.Compliance.Redaction" Version="$(MicrosoftExtensionsComplianceRedactionVersion)" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
15+
<PackageReference Include="Microsoft.Extensions.Telemetry" Version="$(MicrosoftExtensionsTelemetryVersion)" />
16+
</ItemGroup>
17+
18+
</Project>

‎src/Telemetry/Logging/ComplexObjectLogging/DataFrameTagProvider.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Globalization;
5+
using ComplexObjectLogging.Models;
6+
using Microsoft.Extensions.Logging;
7+
8+
namespace ComplexObjectLogging;
9+
10+
internal static class DataFrameTagProvider
11+
{
12+
// A signature of a method that will be used to provide tags for a given data frame should match to this one.
13+
public static void Provide(ITagCollector collector, DataFrame dataFrame)
14+
{
15+
// You can provide any custom name for a tag if you want to.
16+
collector.Add("DataFrameType", dataFrame.Type.ToString(CultureInfo.InvariantCulture));
17+
collector.Add(nameof(dataFrame.PayloadLength), dataFrame.PayloadLength.ToString(CultureInfo.InvariantCulture));
18+
19+
// You can also use any logic to determine whether a tag should be added or not:
20+
if (dataFrame.StreamId != 0)
21+
{
22+
collector.Add(nameof(dataFrame.StreamId), dataFrame.StreamId.ToString(CultureInfo.InvariantCulture));
23+
}
24+
}
25+
}

0 commit comments

Comments
 (0)