Skip to content

Commit 55dc430

Browse files
bitsandfoxesbitsandfoxes
authored
Merge branch 'main' into deps/src/sentry-dotnet/5.1.1
2 parents a71471c + 97a479f commit 55dc430

File tree

4 files changed

+87
-42
lines changed

4 files changed

+87
-42
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
- Bump CLI from v2.40.0 to v2.41.1 ([#1984](https://github.com/getsentry/sentry-unity/pull/1984))
2222
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2411)
2323
- [diff](https://github.com/getsentry/sentry-cli/compare/2.40.0...2.41.1)
24-
- Bump Cocoa SDK from v8.43.0 to v8.44.0 ([#2001](https://github.com/getsentry/sentry-unity/pull/2001))
25-
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8440)
26-
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.43.0...8.44.0)
24+
- Bump Cocoa SDK from v8.43.0 to v8.45.0 ([#2001](https://github.com/getsentry/sentry-unity/pull/2001), [#2017](https://github.com/getsentry/sentry-unity/pull/2017))
25+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8450)
26+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.43.0...8.45.0)
2727
- Bump .NET SDK from v5.0.1 to v5.1.1 ([#2005](https://github.com/getsentry/sentry-unity/pull/2005), [#2018](https://github.com/getsentry/sentry-unity/pull/2018))
2828
- [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#511)
2929
- [diff](https://github.com/getsentry/sentry-dotnet/compare/5.0.1...5.1.1)

‎Directory.Build.targets‎

Lines changed: 82 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,73 +24,118 @@
2424
<SentryWindowsArtifactsDestination>$(SentryArtifactsDestination)Windows/Sentry/</SentryWindowsArtifactsDestination>
2525
</PropertyGroup>
2626

27+
<PropertyGroup>
28+
<HubSecondaryInstallPathFile>$(AppData)\UnityHub\secondaryInstallPath.json</HubSecondaryInstallPathFile>
29+
<HubDefaultEditorFile>$(AppData)\UnityHub\defaultEditor.json</HubDefaultEditorFile>
30+
<HubDefaultEditor Condition="'$(HubDefaultEditor)' == ''"></HubDefaultEditor>
31+
<HubInstallDir Condition="'$(HubInstallDir)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">C:\Program Files\Unity\Hub\Editor</HubInstallDir>
32+
<HubInstallDir Condition="'$(HubInstallDir)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">\Applications\Unity\Hub\Editor</HubInstallDir>
33+
<HubInstallDir Condition="'$(HubInstallDir)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">$(Home)\Unity\Hub\Editor</HubInstallDir>
34+
<HubInstallDir Condition="!Exists('$(HubInstallDir)')"></HubInstallDir>
35+
</PropertyGroup>
36+
37+
<Target Name="FindHub"
38+
Condition="'$(HubInstallDir)' == '' AND Exists('$(HubSecondaryInstallPathFile)')"
39+
Returns="$(HubInstallDir);$(HubDefaultEditor)">
40+
41+
<ReadLinesFromFile File="$(HubSecondaryInstallPathFile)">
42+
<Output TaskParameter="Lines" ItemName="item1" />
43+
</ReadLinesFromFile>
44+
45+
<ReadLinesFromFile File="$(HubDefaultEditorFile)" Condition="Exists('$(HubDefaultEditorFile)')">
46+
<Output TaskParameter="Lines" ItemName="item2" />
47+
</ReadLinesFromFile>
48+
49+
<PropertyGroup>
50+
<HubInstallDir>@(item1->Replace('"', ''))</HubInstallDir>
51+
<HubInstallDir Condition=" !Exists('$(HubInstallDir)') "></HubInstallDir>
52+
53+
<HubDefaultEditor>@(item2->Replace('"', ''))</HubDefaultEditor>
54+
<HubDefaultEditor Condition=" !Exists('$(HubInstallDir)\$(HubDefaultEditor)') "></HubDefaultEditor>
55+
</PropertyGroup>
56+
</Target>
57+
2758
<!-- Use the Unity Editor version set in the sample project of the repo -->
28-
<Target Name="FindUnity">
59+
<Target Name="FindUnity" DependsOnTargets="FindHub" AfterTargets="FindHub">
2960
<Message Text="Unity Version: $(UnityVersion)" Importance="Normal" />
3061

62+
<!-- Find all the installations of Unity done by the Unity Hub -->
63+
<ItemGroup Condition="'$(HubInstallDir)' != '' AND '$(HubDefaultEditor)' == ''">
64+
<_AllUnityInstallDirs Include="$([System.IO.Directory]::GetDirectories('$(HubInstallDir)'))" />
65+
<_UnityInstalls Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Filename)', '^[\d]{4}.*$'))" Include="@(_AllUnityInstallDirs->'%(Filename)%(Extension)')" />
66+
</ItemGroup>
67+
68+
<!-- Pick the latest one if this version of the Hub doesn't record a default version -->
69+
<PropertyGroup Condition="'$(HubInstallDir)' != '' AND '$(HubDefaultEditor)' == ''">
70+
<HubDefaultEditor>%(_UnityInstalls.Identity)</HubDefaultEditor>
71+
</PropertyGroup>
72+
73+
<PropertyGroup>
74+
<_UnityInnerPath Condition="!$([MSBuild]::IsOSPlatform('OSX'))">Editor\Data</_UnityInnerPath>
75+
<_UnityInnerPath Condition="$([MSBuild]::IsOSPlatform('OSX'))">Unity.App\Contents</_UnityInnerPath>
76+
</PropertyGroup>
77+
78+
<ItemGroup>
79+
<_PotentialUnityPaths Condition="$([MSBuild]::IsOSPlatform('Linux')) AND '$(UNITY_PATH)' != ''" Include="$(UNITY_PATH)\$(_UnityInnerPath)\Managed\UnityEngine.dll" />
80+
<_PotentialUnityPaths Condition="'$(HubInstallDir)' != ''" Include="$(HubInstallDir)\$(UnityVersion)\$(_UnityInnerPath)\Managed\UnityEngine.dll" />
81+
<_PotentialUnityPaths Condition="'$(HubInstallDir)' != '' AND '$(HubDefaultEditor)' != '' AND '$(UnityVersion)' != '$(HubDefaultEditor)'" Include="$(HubInstallDir)\$(HubDefaultEditor)\$(_UnityInnerPath)\Managed\UnityEngine.dll" />
82+
<_PotentialUnityPaths Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="C:\Program Files\Unity\$(_UnityInnerPath)\Managed\UnityEngine.dll" />
83+
<_PotentialUnityPaths Condition="$([MSBuild]::IsOSPlatform('OSX'))" Include="\Applications\Unity\$(_UnityInnerPath)\Managed\UnityEngine.dll" />
84+
<_UnityPathsFound Include="@(_PotentialUnityPaths->Exists())" />
85+
<_UnityPathsFoundReversed Include="@(_UnityPathsFound->Reverse())" />
86+
</ItemGroup>
87+
88+
<PropertyGroup>
89+
<!--This is a little hack to grab the first item found on the list - properties are repeatedly set for each item on the list, so they end up with the last one (we reversed the list so we get the first one) -->
90+
<_UnityPathProp>%(_UnityPathsFoundReversed.Identity)</_UnityPathProp>
91+
</PropertyGroup>
92+
93+
<ItemGroup>
94+
<!-- Turn the property back into an item so we can use DirectoryName() below. -->
95+
<_UnityPath Include="$(_UnityPathProp)" />
96+
</ItemGroup>
97+
98+
<PropertyGroup Condition="'$(_UnityPathProp)' != ''">
99+
<UnityManagedPath>@(_UnityPath->DirectoryName())\</UnityManagedPath>
100+
<UnityDataPath>@(_UnityPath->DirectoryName()->DirectoryName())\</UnityDataPath>
101+
<UnityRoot>@(_UnityPath->DirectoryName()->DirectoryName()->DirectoryName())\</UnityRoot>
102+
<UnityLibcache>$(UnityDataPath)Resources\PackageManager\ProjectTemplates\libcache\</UnityLibcache>
103+
</PropertyGroup>
104+
105+
<Error Condition="'$(UnityRoot)' == ''" Text="UnityRoot not found. Ensure Unity is installed.
106+
See the CONTRIBUTING.md.
107+
UnityVersion: '$(UnityVersion)'
108+
Expected to exist:
109+
* @(_PotentialUnityPaths, '%0a or %0a * ')" />
110+
111+
31112
<!-- Unity paths on Windows -->
32113
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
33-
<UnityRoot Condition="Exists('C:\Program Files\Unity\Hub\Editor\$(UnityVersion)\Editor\Data\Managed\UnityEngine.dll')">C:\Program Files\Unity\Hub\Editor\$(UnityVersion)\Editor\</UnityRoot>
34-
<!--If not using Unity Hub, tries to pick whatever Unity version is installed on the machine-->
35-
<UnityRoot Condition="$(UnityRoot) == '' AND Exists('C:\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll')">C:\Program Files\Unity\Editor</UnityRoot>
36-
<UnityLibcache>$(UnityRoot)Data/Resources/PackageManager/ProjectTemplates/libcache/</UnityLibcache>
37-
<UnityManagedPath>$(UnityRoot)\Data\Managed</UnityManagedPath>
38114
<UnityExec>&quot;$(UnityRoot)\Unity.exe&quot;</UnityExec>
39115
<StandaloneBuildMethod>Builder.BuildWindowsIl2CPPPlayer</StandaloneBuildMethod>
40116
<StandaloneBuildPath>$(PlayerBuildPath)Windows/IL2CPP_Player.exe</StandaloneBuildPath>
41117
<StandaloneExecutablePath>$(StandaloneBuildPath)</StandaloneExecutablePath>
42118
<StandaloneDataPath>$(USERPROFILE)/AppData/LocalLow/DefaultCompany/unity-of-bugs/</StandaloneDataPath>
43119
</PropertyGroup>
44120

45-
<Error Condition="!Exists('$(UnityRoot)') AND $([MSBuild]::IsOSPlatform('Windows'))" Text="UnityRoot not found. Ensure Unity is installed.
46-
See the CONTRIBUTING.md.
47-
UnityVersion: '$(UnityVersion)'
48-
Resolved directory: '$(UnityRoot)'
49-
Expected to exist:
50-
* C:\Program Files\Unity\Hub\Editor\$(UnityVersion)\Editor\Data\Managed\UnityEngine.dll
51-
or
52-
* C:\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll" />
53121

54122
<!-- Unity paths on macOS -->
55123
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
56-
<UnityRoot Condition="Exists('/Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/Contents/Managed/UnityEngine.dll')">/Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/</UnityRoot>
57-
<!--If not using Unity Hub, tries to pick whatever Unity version is installed on the machine-->
58-
<UnityRoot Condition="$(UnityRoot) == '' AND Exists('/Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll')">/Applications/Unity/Unity.app/</UnityRoot>
59-
<UnityLibcache>$(UnityRoot)Contents/Resources/PackageManager/ProjectTemplates/libcache/</UnityLibcache>
60-
<UnityManagedPath>$(UnityRoot)Contents/Managed</UnityManagedPath>
61124
<UnityExec>&quot;$(UnityRoot)Contents/MacOS/Unity&quot;</UnityExec>
62125
<StandaloneBuildMethod>Builder.BuildMacIl2CPPPlayer</StandaloneBuildMethod>
63126
<StandaloneBuildPath>$(PlayerBuildPath)MacOS/IL2CPP_Player.app</StandaloneBuildPath>
64127
<StandaloneExecutablePath>$(StandaloneBuildPath)/Contents/MacOS/unity-of-bugs</StandaloneExecutablePath>
65128
</PropertyGroup>
66129

67-
<Error Condition="!Exists('$(UnityRoot)') AND $([MSBuild]::IsOSPlatform('OSX'))" Text="UnityRoot not found. Ensure Unity is installed.
68-
See the CONTRIBUTING.md.
69-
UnityVersion: '$(UnityVersion)'
70-
Resolved directory: '$(UnityRoot)'
71-
Expected to exist:
72-
* /Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/Contents/Managed/UnityEngine.dll
73-
or
74-
* /Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll" />
75130

76131
<!-- Unity paths on Linux -->
77132
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
78-
<UnityRoot Condition="Exists('$(Home)/Unity/Hub/Editor/$(UnityVersion)/Editor/Data/Managed/UnityEngine.dll')">$(Home)/Unity/Hub/Editor/$(UnityVersion)/Editor/</UnityRoot>
79-
<UnityRoot Condition="$(UNITY_PATH) != ''">$(UNITY_PATH)/Editor/</UnityRoot>
80-
<UnityLibcache>$(UnityRoot)Data/Resources/PackageManager/ProjectTemplates/libcache/</UnityLibcache>
81-
<UnityManagedPath>$(UnityRoot)Data/Managed</UnityManagedPath>
82133
<UnityExec>xvfb-run -ae /dev/stdout &quot;$(UnityRoot)Unity&quot;</UnityExec>
83134
<StandaloneBuildMethod>Builder.BuildLinuxIl2CPPPlayer</StandaloneBuildMethod>
84135
<StandaloneBuildPath>$(PlayerBuildPath)Linux/IL2CPP_Player</StandaloneBuildPath>
85136
<StandaloneExecutablePath>$(StandaloneBuildPath)</StandaloneExecutablePath>
86137
</PropertyGroup>
87138

88-
<Error Condition="!Exists('$(UnityRoot)') AND $([MSBuild]::IsOSPlatform('Linux'))" Text="UnityRoot not found. Ensure Unity is installed.
89-
See the CONTRIBUTING.md.
90-
UnityVersion: '$(UnityVersion)'
91-
Resolved directory: '$(UnityRoot)'
92-
Expected to exist:
93-
* $(Home)/Unity/Hub/Editor/$(UnityVersion)/Editor/Data/Managed/UnityEngine.dll" />
94139

95140
<LocateTestRunner UnityLibcache="$(UnityLibcache)">
96141
<Output PropertyName="TestRunnerPath" TaskParameter="TestRunnerPath" />

‎modules/sentry-cocoa.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = 8.44.0
1+
version = 8.45.0
22
repo = https://github.com/getsentry/sentry-cocoa

‎scripts/ci-env.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ switch ($name) {
2020
return "2023.2.20f1"
2121
}
2222
"unity6000" {
23-
return "6000.0.37f1"
23+
return "6000.0.38f1"
2424
}
2525
Default {
2626
throw "Unkown variable '$name'"

0 commit comments

Comments
 (0)