wip

getsentry · Nov 19, 2023 · 0661bf6 · 0661bf6
1 parent f7ed3fa
commit 0661bf6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 29 deletions.
diff --git a/src/Sentry.Profiling/Sentry.Profiling.csproj b/src/Sentry.Profiling/Sentry.Profiling.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- TODO check and update the list of supported frameworks. -->
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <PackageTags>$(PackageTags);Profiling;Diagnostic</PackageTags>
     <Description>Performance profiling support for Sentry - Open-source error tracking that helps developers monitor and fix crashes in real time.</Description>
   </PropertyGroup>
@@ -14,44 +14,27 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Sentry\Sentry.csproj" />
     <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.452401" />
-<!--    <ProjectReference Include="../../modules/perfview/src/TraceEvent/TraceEvent.csproj" PrivateAssets="all" />-->
+    <!--  This triggers the build of this project and its dependencies. We don't need all of them but this is the easiest way -->
+    <!--  to make sure the project builds/cleans etc in tandem with this. Packaging copies the 2 DLLs we need below -->
+    <ProjectReference Include="../../modules/perfview/src/TraceEvent/TraceEvent.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <InternalsVisibleTo Include="Sentry.Benchmarks" PublicKey="$(SentryPublicKey)" />
     <InternalsVisibleTo Include="Sentry.Profiling.Tests" PublicKey="$(SentryPublicKey)" />
   </ItemGroup>
 
-<!--  <PropertyGroup>-->
-<!--    <TraceEventProjectPath>../../modules/perfview/src/TraceEvent/TraceEvent.csproj</TraceEventProjectPath>-->
-<!--  </PropertyGroup>-->
-<!--  <Target Name="BuildTraceEvent" Condition="!Exists('@(ProfilingDependency)')" BeforeTargets="Build">-->
-<!--    <MSBuild Projects="$(TraceEventProjectPath)"-->
-<!--             Targets="Build"-->
-<!--             Properties="Configuration=$(Configuration);Platform=$(Platform);OutDir=obj/TraceEvent/$(Configuration)/" />-->
-<!--  </Target>-->
-<!--  <Target Name="Clean">-->
-<!--    <MSBuild Projects="$(TraceEventProjectPath)" Targets="Clean" />-->
-<!--  </Target>-->
-
   <ItemGroup>
-<!--        <ProfilingDependency Include="obj/TraceEvent/$(Configuration)/netstandard2.0/Microsoft.Diagnostics.FastSerialization.dll" />-->
-
     <ProfilingDependency Include="..\..\modules\perfview\src\FastSerialization\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.FastSerialization.dll" />
-    <ProfilingDependency Include="..\..\modules\perfview\src\FastSerialization\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.FastSerialization.pdb" />
     <ProfilingDependency Include="..\..\modules\perfview\src\TraceEvent\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.Tracing.TraceEvent.dll" />
+    <ProfilingDependency Include="..\..\modules\perfview\src\FastSerialization\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.FastSerialization.pdb" />
     <ProfilingDependency Include="..\..\modules\perfview\src\TraceEvent\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.Tracing.TraceEvent.pdb" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="@(ProfilingDependency)" />
-  </ItemGroup>
-  <Target Name="PackDependencies" AfterTargets="Build">
     <ItemGroup>
-      <None Include="@(ProfilingDependency)">
+      <!-- TODO: pdb's are getting packed on the nupkg (as well as the snupkg), figure out a way to exclude from nupkg-->
+      <TfmSpecificPackageFile Include="@(ProfilingDependency)">
         <Pack>true</Pack>
         <PackagePath>lib\$(TargetFramework)</PackagePath>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
+      </TfmSpecificPackageFile>
     </ItemGroup>
-  </Target>
 </Project>
diff --git a/test/Sentry.Profiling.Tests/Sentry.Profiling.Tests.csproj b/test/Sentry.Profiling.Tests/Sentry.Profiling.Tests.csproj
@@ -10,10 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProfilingDependency Include="..\..\modules\perfview\src\FastSerialization\bin\Release\netstandard2.0\Microsoft.Diagnostics.FastSerialization.dll" />
-    <ProfilingDependency Include="..\..\modules\perfview\src\FastSerialization\bin\Release\netstandard2.0\Microsoft.Diagnostics.FastSerialization.pdb" />
-    <ProfilingDependency Include="..\..\modules\perfview\src\TraceEvent\bin\Release\netstandard2.0\Microsoft.Diagnostics.Tracing.TraceEvent.dll" />
-    <ProfilingDependency Include="..\..\modules\perfview\src\TraceEvent\bin\Release\netstandard2.0\Microsoft.Diagnostics.Tracing.TraceEvent.pdb" />
+    <ProfilingDependency Include="..\..\modules\perfview\src\FastSerialization\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.FastSerialization.dll" />
+    <ProfilingDependency Include="..\..\modules\perfview\src\FastSerialization\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.FastSerialization.pdb" />
+    <ProfilingDependency Include="..\..\modules\perfview\src\TraceEvent\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.Tracing.TraceEvent.dll" />
+    <ProfilingDependency Include="..\..\modules\perfview\src\TraceEvent\bin\$(Configuration)\netstandard2.0\Microsoft.Diagnostics.Tracing.TraceEvent.pdb" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="@(ProfilingDependency)" />