Skip to content

Commit

Permalink
add System.Diagnostics.DiagnosticSource 9.0.0 (#1101)
Browse files Browse the repository at this point in the history
* add DiagnosticSource 9.0.0

* remove scoped keyword in netstandard2.0

* remove scoped everywhere, add IsExternalInit to netstandard2.0

* Microsoft.NETCore.App.Ref to baseline?

* Add Microsoft.NETCore.App.Ref.9.0.0 as a dependent package project

* Remove analyers from FrameworkList.xml

* Utilize common IsExternalInit.cs

---------

Co-authored-by: Michael Simons <[email protected]>
  • Loading branch information
JanProvaznik and MichaelSimons authored Dec 20, 2024
1 parent b24c3aa commit 44f3339
Show file tree
Hide file tree
Showing 12 changed files with 2,882 additions and 13 deletions.
4 changes: 4 additions & 0 deletions eng/Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Runtime.CompilerServices.Unsafe.6.1.0.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Memory.4.6.0.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Threading.Tasks.Extensions.4.6.0.csproj" />

<DependencyPackageProjects Include="$(RepoRoot)src\targetPacks\ILsrc\**\Microsoft.NETCore.App.Ref.9.0.0.csproj" />

<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Diagnostics.DiagnosticSource.9.0.0.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(BuildDependencyPackageProjects)' == 'true'">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;netstandard2.0</TargetFrameworks>
<AssemblyName>System.Diagnostics.DiagnosticSource</AssemblyName>
<StrongNameKeyId>Open</StrongNameKeyId>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<Compile Include="$(CommonSrc)IsExternalInit.cs" />
</ItemGroup>

</Project>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>System.Diagnostics.DiagnosticSource</id>
<version>9.0.0</version>
<authors>Microsoft</authors>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<projectUrl>https://dot.net/</projectUrl>
<description>Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools)

Commonly Used Types:
System.Diagnostics.DiagnosticListener
System.Diagnostics.DiagnosticSource</description>
<releaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</releaseNotes>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<serviceable>true</serviceable>
<repository type="git" url="https://github.com/dotnet/runtime" commit="9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3" />
<dependencies>
<group targetFramework="net8.0" />
<group targetFramework="net9.0" />
<group targetFramework=".NETStandard2.0">
<dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
<contentFiles>
<files include="any/net462/ILLink/ILLink.Descriptors.LibraryBuild.xml" buildAction="Content" />
<files include="any/net8.0/ILLink/ILLink.Descriptors.LibraryBuild.xml" buildAction="Content" />
<files include="any/net9.0/ILLink/ILLink.Descriptors.LibraryBuild.xml" buildAction="Content" />
<files include="any/netstandard2.0/ILLink/ILLink.Descriptors.LibraryBuild.xml" buildAction="Content" />
</contentFiles>
</metadata>
</package>
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<FileList Name="ASP.NET Core 9.0" TargetFrameworkIdentifier=".NETCoreApp" TargetFrameworkVersion="9.0" FrameworkName="Microsoft.AspNetCore.App">
<File Path="ref/net9.0/Microsoft.AspNetCore.Antiforgery.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Antiforgery" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.dll" Language="cs" Type="Analyzer" AssemblyName="Microsoft.AspNetCore.App.Analyzers" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.dll" Language="cs" Type="Analyzer" AssemblyName="Microsoft.AspNetCore.App.CodeFixes" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Authentication.Abstractions.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Authentication.Abstractions" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Authentication.BearerToken.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Authentication.BearerToken" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Authentication.Cookies.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Authentication.Cookies" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
Expand All @@ -10,7 +8,6 @@
<File Path="ref/net9.0/Microsoft.AspNetCore.Authentication.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Authentication" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Authorization.Policy.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Authorization.Policy" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Authorization.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Authorization" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.dll" Language="cs" Type="Analyzer" AssemblyName="Microsoft.AspNetCore.Components.Analyzers" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Components.Authorization.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Components.Authorization" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Components.Endpoints.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Components.Endpoints" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Components.Forms.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Components.Forms" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
Expand Down Expand Up @@ -38,7 +35,6 @@
<File Path="ref/net9.0/Microsoft.AspNetCore.Http.Connections.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Http.Connections" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Http.Extensions.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Http.Extensions" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Http.Features.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Http.Features" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="analyzers/dotnet/cs/Microsoft.AspNetCore.Http.RequestDelegateGenerator.dll" Language="cs" Type="Analyzer" AssemblyName="Microsoft.AspNetCore.Http.RequestDelegateGenerator" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Http.Results.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Http.Results" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.Http.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.Http" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.AspNetCore.HttpLogging.dll" Type="Managed" AssemblyName="Microsoft.AspNetCore.HttpLogging" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
Expand Down Expand Up @@ -93,7 +89,6 @@
<File Path="ref/net9.0/Microsoft.Extensions.Caching.Abstractions.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Caching.Abstractions" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Caching.Memory.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Caching.Memory" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Configuration.Abstractions" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="analyzers/dotnet/cs/Microsoft.Extensions.Configuration.Binder.SourceGeneration.dll" Language="cs" Type="Analyzer" AssemblyName="Microsoft.Extensions.Configuration.Binder.SourceGeneration" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Path="ref/net9.0/Microsoft.Extensions.Configuration.Binder.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Configuration.Binder" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Configuration.CommandLine.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Configuration.CommandLine" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Configuration.EnvironmentVariables" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
Expand Down Expand Up @@ -129,13 +124,11 @@
<File Path="ref/net9.0/Microsoft.Extensions.Logging.Debug.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Logging.Debug" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Logging.EventLog.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Logging.EventLog" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Logging.EventSource.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Logging.EventSource" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="analyzers/dotnet/roslyn4.4/cs/Microsoft.Extensions.Logging.Generators.dll" Language="cs" Type="Analyzer" AssemblyName="Microsoft.Extensions.Logging.Generators" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Path="ref/net9.0/Microsoft.Extensions.Logging.TraceSource.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Logging.TraceSource" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Logging.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Logging" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.ObjectPool.dll" Type="Managed" AssemblyName="Microsoft.Extensions.ObjectPool" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
<File Path="ref/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Options.ConfigurationExtensions" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Options.DataAnnotations.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Options.DataAnnotations" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="analyzers/dotnet/roslyn4.4/cs/Microsoft.Extensions.Options.SourceGeneration.dll" Language="cs" Type="Analyzer" AssemblyName="Microsoft.Extensions.Options.SourceGeneration" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Path="ref/net9.0/Microsoft.Extensions.Options.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Options" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.Primitives.dll" Type="Managed" AssemblyName="Microsoft.Extensions.Primitives" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Path="ref/net9.0/Microsoft.Extensions.WebEncoders.dll" Type="Managed" AssemblyName="Microsoft.Extensions.WebEncoders" PublicKeyToken="adb9793829ddae60" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52903" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
<FileList TargetFrameworkIdentifier=".NETCoreApp" TargetFrameworkVersion="9.0" FrameworkName="Microsoft.NETCore.App" Name=".NET Runtime">
<File Type="Analyzer" Path="analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll" Language="cs" AssemblyName="Microsoft.Interop.ComInterfaceGenerator" PublicKeyToken="b03f5f7f11d50a3a" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Type="Analyzer" Path="analyzers/dotnet/cs/Microsoft.Interop.JavaScript.JSImportGenerator.dll" Language="cs" AssemblyName="Microsoft.Interop.JavaScript.JSImportGenerator" PublicKeyToken="b03f5f7f11d50a3a" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Type="Analyzer" Path="analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.dll" Language="cs" AssemblyName="Microsoft.Interop.LibraryImportGenerator" PublicKeyToken="b03f5f7f11d50a3a" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Type="Analyzer" Path="analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.dll" Language="cs" AssemblyName="Microsoft.Interop.SourceGeneration" PublicKeyToken="b03f5f7f11d50a3a" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Type="Analyzer" Path="analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll" Language="cs" AssemblyName="System.Text.Json.SourceGeneration" PublicKeyToken="cc7b13ffcd2ddd51" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Type="Analyzer" Path="analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll" Language="cs" AssemblyName="System.Text.RegularExpressions.Generator" PublicKeyToken="b03f5f7f11d50a3a" AssemblyVersion="9.0.11.2809" FileVersion="9.0.11.2809" />
<File Type="Managed" Path="ref/net9.0/Microsoft.CSharp.dll" AssemblyName="Microsoft.CSharp" PublicKeyToken="b03f5f7f11d50a3a" AssemblyVersion="9.0.0.0" FileVersion="9.0.24.52809" />
<File Type="Managed" Path="ref/net9.0/Microsoft.VisualBasic.Core.dll" AssemblyName="Microsoft.VisualBasic.Core" PublicKeyToken="b03f5f7f11d50a3a" AssemblyVersion="14.0.0.0" FileVersion="14.0.24.52809" />
<File Type="Managed" Path="ref/net9.0/Microsoft.VisualBasic.dll" AssemblyName="Microsoft.VisualBasic" PublicKeyToken="b03f5f7f11d50a3a" AssemblyVersion="10.0.0.0" FileVersion="9.0.24.52809" />
Expand Down

0 comments on commit 44f3339

Please sign in to comment.