diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bdaba62c..e4abe48ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,6 +153,11 @@ jobs: UNITY_VERSION: ${{ matrix.unity-version }} run: dotnet build -c Release + - name: Assembly alias + run: | + dotnet tool install --global Alias --version 0.2.0 + assemblyalias --target-directory "package-dev/Runtime" --internalize --prefix "Sentry." --assemblies-to-alias "Microsoft*;System*" + - name: Run Unity tests (playmode) # TODO: Run Play mode tests on 2022 once S.T.J loading issue resolved. # System.MissingMethodException : Method not found: System.Text.Json.JsonDocument System.Text.Json.JsonDocument.Parse(System.ReadOnlyMemory`1,System.Text.Json.JsonDocumentOptions) diff --git a/.gitignore b/.gitignore index ef01e63a9..d01f3732f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ package-dev/Plugins/Android/Sentry/* # Build output of Sentry.Unity sentry-unity/Assets/Plugins/Sentry/ sentry-unity/Assets/Editor/Sentry/ + +# ignore temp assemblia alias lookup file +package-dev/alias-references.txt \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2559ef3dd..fc6f311e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Features + +- Avoid DLL conflict with other Unity packages ([#425](https://github.com/getsentry/sentry-unity/issues/425)) + ## 0.6.2 - fix release packaging ([#417](https://github.com/getsentry/sentry-unity/pull/417)) diff --git a/package-dev/assembly-alias.ps1 b/package-dev/assembly-alias.ps1 new file mode 100644 index 000000000..1e1edecfc --- /dev/null +++ b/package-dev/assembly-alias.ps1 @@ -0,0 +1 @@ +assemblyalias --target-directory "Runtime" --internalize --prefix "Sentry." --assemblies-to-alias "Microsoft*;System*" \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c1997c776..9f12e1eb7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,8 +2,9 @@ - ../../$(DevPackageFolderName)/Runtime - ../../$(DevPackageFolderName)/Editor + ../../$(DevPackageFolderName) + $(DevPackagePath)/Runtime + $(DevPackagePath)/Editor diff --git a/src/Sentry.Unity/Sentry.Unity.csproj b/src/Sentry.Unity/Sentry.Unity.csproj index 3c2e827e8..12db8d23d 100644 --- a/src/Sentry.Unity/Sentry.Unity.csproj +++ b/src/Sentry.Unity/Sentry.Unity.csproj @@ -19,5 +19,12 @@ - + + + + +