Skip to content

Commit 7e99c06

Browse files
committed
.
1 parent 4301815 commit 7e99c06

4 files changed

Lines changed: 4 additions & 87 deletions

File tree

test/Scripts.Integration.Test/DependencyConflictPackage/DependencyConflictPackage.csproj

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,17 @@
88
<AssemblyName>DependencyConflictPackage</AssemblyName>
99
<RootNamespace>DependencyConflictPackage</RootNamespace>
1010

11-
<!-- Drop the build output straight into the nested UPM package. The
12-
transitive System.*/Microsoft.* DLLs ride along thanks to
13-
CopyLocalLockFileAssemblies, exactly mirroring how package-dev carries
14-
them - except here they are plain (unaliased) and version-skewed. -->
1511
<OutDir>$(MSBuildThisFileDirectory)DependencyConflict/Runtime</OutDir>
1612
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1713
<GenerateDependencyFile>false</GenerateDependencyFile>
1814
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
19-
<!-- This is a deliberately old test dependency; the STJ advisory is irrelevant here. -->
2015
<NoWarn>$(NoWarn);NU1903</NoWarn>
21-
<!-- No PDB in the shipped package - keeps Unity from flagging a meta-less asset. -->
2216
<DebugType>none</DebugType>
2317
<DebugSymbols>false</DebugSymbols>
2418
</PropertyGroup>
2519

26-
<!--
27-
Versions that DIFFER from what the real Sentry SDK ships in package-dev -
28-
just enough mismatch, in enough places, to cause friction. Not a dramatic
29-
downgrade; the point is plain (unaliased) copies that clash with Sentry's
30-
aliased ones when both packages land in the same Unity project.
31-
32-
package-dev: System.Text.Json 8.0.5 (assembly 8.0.0.0)
33-
System.Collections.Immutable 5.0.0
34-
Microsoft.Bcl.AsyncInterfaces 8.0 (transitive)
35-
DependencyConflictPackage: System.Text.Json 8.0.4 - same major, different patch (mild)
36-
System.Collections.Immutable 7.0.0 - assembly 7.0.0.0 (clear skew)
37-
Microsoft.Bcl.AsyncInterfaces left transitive from STJ
38-
-->
3920
<ItemGroup>
40-
<PackageReference Include="System.Text.Json" Version="8.0.4" />
21+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
4122
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
4223
</ItemGroup>
4324

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<Project>
22
<!--
33
Intentionally does NOT import the repo-root Directory.Build.props.
4-
MiniSentry is a standalone "adversary" package used to stress-test the
5-
assembly aliasing of the real Sentry SDK. It must stay isolated from the
6-
Sentry build configuration (analyzers, Unity engine reference,
7-
TreatWarningsAsErrors, etc.) so its only job is to drag plain, UNALIASED
8-
System.*/Microsoft.* assemblies at LOWER versions into a Unity project.
94
-->
105
</Project>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<Project>
2-
<!-- See Directory.Build.props: deliberately isolated from the repo-root build. -->
2+
<!--
3+
Intentionally does NOT import the repo-root Directory.Build.props.
4+
-->
35
</Project>

test/Scripts.Integration.Test/DependencyConflictPackage/README.md

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)