better incorporating of side by side mode

Author: thompson-tomo

.github/workflows/ci.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches: [ 'main' ]
   pull_request:
-    branches: [ 'main2*', 'instrumentation*', 'exporter*', 'extensions*' ]
+    branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ]
+    paths:
+      - '!modules/**'
 
 permissions:
   contents: read

Directory.Build.props

@@ -3,5 +3,8 @@
     <IsTestProject>true</IsTestProject>
     <SupportedNetTargets>net9.0;net8.0</SupportedNetTargets>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'opentelemetry-dotnet-contrib.sln'))\build\Common.prod.props" />
+  <Import Condition="'$(IsTestProject)' != 'true'"
+    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'opentelemetry-dotnet-contrib.sln'))\build\Common.prod.props" />
+  <Import Condition="'$(IsTestProject)' == 'true'"
+    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'opentelemetry-dotnet-contrib.sln'))\build\Common.nonprod.props" />
 </Project>

build/Common.prod.props

@@ -11,22 +11,15 @@
     <PackageIcon>opentelemetry-icon-color.png</PackageIcon>
     <Authors>OpenTelemetry Authors</Authors>
     <Copyright>Copyright The OpenTelemetry Authors</Copyright>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/OpenTelemetryContrib.prod.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>$(NoWarn);1573;1712</NoWarn>
     <PackageOutputPath Condition="$(Build_ArtifactStagingDirectory) != ''">$(Build_ArtifactStagingDirectory)</PackageOutputPath>
     <!--<MinVerVerbosity>detailed</MinVerVerbosity>-->
     <PackageTags>Observability;OpenTelemetry;Monitoring;Telemetry</PackageTags>
     <EnablePackageValidation Condition="'$(EnablePackageValidation)' == ''">false</EnablePackageValidation>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageChangelogFile>CHANGELOG.md</PackageChangelogFile>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(IsTestProject)' != 'true'">
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/OpenTelemetryContrib.prod.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>$(NoWarn);1573;1712</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
-    <IsPackable>false</IsPackable>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/OpenTelemetryContrib.test.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>$(NoWarn),1574,1591;CA1515</NoWarn>
-  </PropertyGroup>
 
   <ItemGroup Condition="'$(IsCPM)' != 'true'">
     <PackageReference Include="MinVer" Version="$(MinVerPkgVer)" PrivateAssets="All" Condition="'$(IntegrationBuild)' != 'true'" />

src/Directory.Build.props

@@ -1,4 +1,3 @@
 <Project>
   <Import Project="..\Directory.Build.props" Condition="Exists('..\Directory.Build.props')" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'opentelemetry-dotnet-contrib.sln'))\build\Common.prod.props" />
 </Project>

src/Directory.Build.targets

@@ -1,7 +1,6 @@
 <Project>
 
   <Import Project="..\Directory.Build.targets" Condition="Exists('..\Directory.Build.targets')" />
-  <Import Project="$(RepoRoot)\build\Common.targets" />
 
   <PropertyGroup>
     <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>

test/Directory.Build.props

@@ -1,4 +1,6 @@
 <Project>
+  <PropertyGroup>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
   <Import Project="..\Directory.Build.props" Condition="Exists('..\Directory.Build.props')" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'opentelemetry-dotnet-contrib.sln'))\build\Common.nonprod.props" />
 </Project>

test/Directory.Build.targets

@@ -1,4 +1,3 @@
 <Project>
   <Import Project="..\Directory.Build.targets" Condition="Exists('..\Directory.Build.targets')" />
-  <Import Project="$(RepoRoot)\build\Common.targets" />
 </Project>