Refactor dependency groups

- Rearrange the groups to match the comments.
- Use `GetTargetFrameworkIdentifier()` intrinsic for conditions.
- Use `Label` attribute instead of comments.

Author: martincostello

src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj

@@ -17,31 +17,22 @@
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
   </ItemGroup>
 
-  <!-- Stable instrumentation packages -->
-  <ItemGroup>
+  <ItemGroup Label="Stable Instrumentation Packages">
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
   </ItemGroup>
 
-  <!-- Non-stable instrumentation packages with no dependencies -->
-  <ItemGroup>
+  <ItemGroup Label="Non-stable instrumentation packages">
     <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.12.0-beta.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="1.12.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.12.0-beta.1" />
-  </ItemGroup>
-
-  <!-- Non-stable instrumentation packages with no dependencies, non netstandard2.0 -->
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
+    <PackageReference Include="OpenTelemetry.Resources.Container" Version="1.12.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Resources.Host" Version="1.12.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Resources.OperatingSystem" Version="1.12.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Resources.Process" Version="1.12.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" Version="1.12.0-beta.1" />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-    <PackageReference Include="OpenTelemetry.Resources.Container" Version="1.12.0-beta.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Grafana.OpenTelemetry.Tests</_Parameter1>

src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj

@@ -16,10 +16,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj" />
-    <PackageReference Include="MinVer" Version="6.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
   </ItemGroup>
 
   <!-- This dependency is pulled in by `OpenTelemetry.Instrumentation.Cassandra` with a minimum
@@ -30,14 +27,16 @@
     <PackageReference Include="CassandraCSharpDriver" Version="[3.17.0,)" />
   </ItemGroup>
 
-  <!-- Stable instrumentation packages with dependencies, only .NET -->
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" /> <!-- needed for AspNetCore -->
+  <ItemGroup Label="Stable instrumentation packages with dependencies">
+    <PackageReference Include="OpenTelemetry.Instrumentation.AWS" Version="1.12.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.12.0" />
   </ItemGroup>
 
-  <!-- Non-stable instrumentation packages with dependencies, both .NET framework and .NET -->
-  <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Instrumentation.AWS" Version="1.12.0" />
+  <ItemGroup Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' != '.NETFramework' ">
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" /> <!-- Needed for ASP.NET Core -->
+  </ItemGroup>
+
+  <ItemGroup Label="Non-stable instrumentation packages with dependencies">
     <PackageReference Include="OpenTelemetry.Instrumentation.Cassandra" Version="1.0.0-beta.2" />
     <PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
     <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.12.0-beta.1" />
@@ -48,21 +47,15 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.Wcf" Version="1.12.0-beta.1" />
   </ItemGroup>
 
-  <!-- Non-stable instrumentation packages with dependencies, only .NET -->
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
+  <ItemGroup Label="Non-stable instrumentation packages with dependencies, only .NET" Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' != '.NETFramework' ">
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
   </ItemGroup>
 
-  <!-- Non-stable instrumentation packages with dependencies, only .NET framework -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+  <ItemGroup Label="Non-stable instrumentation packages with dependencies, only .NET Framework" Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETFramework' ">
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.12.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Owin" Version="1.12.0-beta.1" />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-    <PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.12.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Grafana.OpenTelemetry.Tests</_Parameter1>