diff --git a/samples/Sentry.Samples.Aws.Lambda.AspNetCoreServer/Sentry.Samples.Aws.Lambda.AspNetCoreServer.csproj b/samples/Sentry.Samples.Aws.Lambda.AspNetCoreServer/Sentry.Samples.Aws.Lambda.AspNetCoreServer.csproj
index c9150b1b76..fe9b9dc377 100644
--- a/samples/Sentry.Samples.Aws.Lambda.AspNetCoreServer/Sentry.Samples.Aws.Lambda.AspNetCoreServer.csproj
+++ b/samples/Sentry.Samples.Aws.Lambda.AspNetCoreServer/Sentry.Samples.Aws.Lambda.AspNetCoreServer.csproj
@@ -10,10 +10,6 @@
     <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.7" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Controllers" />
-  </ItemGroup>
-
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <SentryOrg>sentry-sdks</SentryOrg>
     <SentryProject>sentry-dotnet</SentryProject>
diff --git a/src/Sentry.Android.AssemblyReader/Sentry.Android.AssemblyReader.csproj b/src/Sentry.Android.AssemblyReader/Sentry.Android.AssemblyReader.csproj
index fa94fec130..2630fb81c7 100644
--- a/src/Sentry.Android.AssemblyReader/Sentry.Android.AssemblyReader.csproj
+++ b/src/Sentry.Android.AssemblyReader/Sentry.Android.AssemblyReader.csproj
@@ -27,7 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="ElfSharp\" />
+    <Compile Update="V2\StoreReader.Classes.cs">
+      <DependentUpon>StoreReader.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
 
 </Project>
diff --git a/src/Sentry.Serilog/Sentry.Serilog.csproj b/src/Sentry.Serilog/Sentry.Serilog.csproj
index 60c27e77f7..c0f1f9dd10 100644
--- a/src/Sentry.Serilog/Sentry.Serilog.csproj
+++ b/src/Sentry.Serilog/Sentry.Serilog.csproj
@@ -39,4 +39,10 @@
     <InternalsVisibleTo Include="Sentry.Serilog.Tests" PublicKey="$(SentryPublicKey)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="SentrySink.Structured.cs">
+      <DependentUpon>SentrySink.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index a2b75db0ae..b4b6e3be73 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -184,6 +184,24 @@
     <None Include="buildTransitive\Sentry.targets" Pack="true" PackagePath="build\Sentry.targets" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="PlatformAbstractions\FrameworkInfo.NetFx.cs;PlatformAbstractions\FrameworkInfo.NetStandard.cs">
+      <DependentUpon>FrameworkInfo.cs</DependentUpon>
+    </Compile>
+    <Compile Update="MeasurementUnit.Duration.cs;MeasurementUnit.Fraction.cs;MeasurementUnit.Information.cs">
+      <DependentUpon>MeasurementUnit.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SentryMetric.Factory.cs;SentryMetric.Generic.cs">
+      <DependentUpon>SentryMetric.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SentryMetricEmitter.Counter.cs;SentryMetricEmitter.Distribution.cs;SentryMetricEmitter.Gauge.cs">
+      <DependentUpon>SentryMetricEmitter.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SentryStructuredLogger.Format.cs">
+      <DependentUpon>SentryStructuredLogger.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Sentry.Compiler.Extensions\Sentry.Compiler.Extensions.csproj"
                       OutputItemType="Analyzer"
diff --git a/test/Sentry.AspNetCore.Tests/Sentry.AspNetCore.Tests.csproj b/test/Sentry.AspNetCore.Tests/Sentry.AspNetCore.Tests.csproj
index 77c4d3735e..9c19ad2df0 100644
--- a/test/Sentry.AspNetCore.Tests/Sentry.AspNetCore.Tests.csproj
+++ b/test/Sentry.AspNetCore.Tests/Sentry.AspNetCore.Tests.csproj
@@ -16,4 +16,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="IntegrationsTests.EventProcessor.cs">
+      <DependentUpon>IntegrationsTests.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/test/Sentry.Maui.Tests/Sentry.Maui.Tests.csproj b/test/Sentry.Maui.Tests/Sentry.Maui.Tests.csproj
index 45ba512c3f..18c443a29d 100644
--- a/test/Sentry.Maui.Tests/Sentry.Maui.Tests.csproj
+++ b/test/Sentry.Maui.Tests/Sentry.Maui.Tests.csproj
@@ -21,4 +21,13 @@
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="MauiEventsBinderTests.Application.cs;MauiEventsBinderTests.Element.cs;MauiEventsBinderTests.Page.cs;MauiEventsBinderTests.Shell.cs;MauiEventsBinderTests.VisualElement.cs;MauiEventsBinderTests.Window.cs">
+      <DependentUpon>MauiEventsBinderTests.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SentryMauiAppBuilderExtensionsTests.Android.cs;SentryMauiAppBuilderExtensionsTests.Cocoa.cs">
+      <DependentUpon>SentryMauiAppBuilderExtensionsTests.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/test/Sentry.Serilog.Tests/Sentry.Serilog.Tests.csproj b/test/Sentry.Serilog.Tests/Sentry.Serilog.Tests.csproj
index c4ed3357bb..ea7b7b84c3 100644
--- a/test/Sentry.Serilog.Tests/Sentry.Serilog.Tests.csproj
+++ b/test/Sentry.Serilog.Tests/Sentry.Serilog.Tests.csproj
@@ -26,4 +26,10 @@
     <Using Include="Microsoft.AspNetCore.Hosting" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="SentrySinkTests.Structured.cs">
+      <DependentUpon>SentrySinkTests.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/test/Sentry.Tests/Sentry.Tests.csproj b/test/Sentry.Tests/Sentry.Tests.csproj
index 1a6e4f3ef8..8e536bf1af 100644
--- a/test/Sentry.Tests/Sentry.Tests.csproj
+++ b/test/Sentry.Tests/Sentry.Tests.csproj
@@ -39,6 +39,12 @@
       <ParentFile>$([System.String]::Copy('%(FileName)').Split('.')[0])</ParentFile>
       <DependentUpon>HintTests.cs</DependentUpon>
     </None>
+    <Compile Update="SentryMetricEmitterTests.Options.cs;SentryMetricEmitterTests.Types.cs;SentryMetricEmitterTests.Values.cs">
+      <DependentUpon>SentryMetricEmitterTests.cs</DependentUpon>
+    </Compile>
+    <Compile Update="SentryStructuredLoggerTests.Format.cs">
+      <DependentUpon>SentryStructuredLoggerTests.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net48'">