Skip to content

Commit cb293cf

Browse files
authored
fix: Alias Editor dependencies (#1064)
1 parent 601e76a commit cb293cf

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

.github/workflows/ci.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,14 @@ jobs:
125125
- name: Build Sentry.Unity Solution
126126
run: docker exec unity dotnet build /p:AndroidSdkDirectory=$env:ANDROID_HOME /p:JavaSdkDirectory=$env:JAVA_HOME_11_X64 -c Release
127127

128-
- name: Assembly alias
129-
shell: bash
130-
run: |
131-
docker exec unity bash -c 'dotnet tool install --global Alias --version 0.4.3 && \
132-
~/.dotnet/tools/assemblyalias --target-directory "package-dev/Runtime" --internalize --prefix "Sentry." --assemblies-to-alias "Microsoft*;System*"'
128+
- name: Install assemblyalias
129+
run: docker exec unity dotnet tool install --global Alias --version 0.4.3
130+
131+
- name: Alias editor assemblies
132+
run: docker exec unity /home/gh/.dotnet/tools/assemblyalias --target-directory "package-dev/Editor" --internalize --prefix "Sentry." --assemblies-to-alias "Mono.Cecil*"
133+
134+
- name: Alias runtime assemblies
135+
run: docker exec unity /home/gh/.dotnet/tools/assemblyalias --target-directory "package-dev/Runtime" --internalize --prefix "Sentry." --assemblies-to-alias "Microsoft*;System*"
133136

134137
- name: Package for release
135138
if: ${{ matrix.unity-version == env.LOWEST_SUPPORTED_UNITY_VERSION }}

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### Fixes
6+
7+
- Resolved conflicting dependencies for Mono.Cecil ([#1064](https://github.com/getsentry/sentry-unity/pull/1064))
8+
59
### Dependencies
610

711
- Bump .NET SDK from v3.23.0 to v3.23.1 ([#1062](https://github.com/getsentry/sentry-unity/pull/1062))

scripts/repack.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
assemblyalias --target-directory "package-dev/Runtime" --internalize --prefix "Sentry." --assemblies-to-alias "Microsoft*;System*"
2+
assemblyalias --target-directory "package-dev/Editor" --internalize --prefix "Sentry." --assemblies-to-alias "Mono.Cecil*"
23

34
$unity_version = Get-Content ./samples/unity-of-bugs/ProjectSettings/ProjectVersion.txt | grep m_EditorVersion -m 1 | cut -d ' ' -f 2
45

test/Scripts.Tests/package-release.zip.snapshot

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Documentation~/index.md
22
Editor/iOS.meta
3-
Editor/Mono.Cecil.dll
4-
Editor/Mono.Cecil.dll.meta
5-
Editor/Mono.Cecil.Mdb.dll
6-
Editor/Mono.Cecil.Mdb.dll.meta
7-
Editor/Mono.Cecil.Pdb.dll
8-
Editor/Mono.Cecil.Pdb.dll.meta
9-
Editor/Mono.Cecil.Rocks.dll
10-
Editor/Mono.Cecil.Rocks.dll.meta
113
Editor/sentry-cli.meta
4+
Editor/Sentry.Mono.Cecil.dll
5+
Editor/Sentry.Mono.Cecil.dll.meta
6+
Editor/Sentry.Mono.Cecil.Mdb.dll
7+
Editor/Sentry.Mono.Cecil.Mdb.dll.meta
8+
Editor/Sentry.Mono.Cecil.Pdb.dll
9+
Editor/Sentry.Mono.Cecil.Pdb.dll.meta
10+
Editor/Sentry.Mono.Cecil.Rocks.dll
11+
Editor/Sentry.Mono.Cecil.Rocks.dll.meta
1212
Editor/Sentry.Unity.Editor.dll
1313
Editor/Sentry.Unity.Editor.dll.meta
1414
Editor/iOS/Sentry.Unity.Editor.iOS.dll

0 commit comments

Comments
 (0)