Skip to content

Commit e4a591a

Browse files
committed
Fix compilation of tests under Unity
1 parent 8f16fb2 commit e4a591a

File tree

54 files changed

+410
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+410
-117
lines changed

common/packaging.targets

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@
180180
ReplacementText=""revision": "$(GitCommitId)""
181181
Encoding="utf-8-without-bom" />
182182

183+
<FileUpdate
184+
Files="$(PublishTo)$(PackageName)\package.json"
185+
Regex="&quot;testPackages&quot;"
186+
ReplacementText="&quot;relatedPackages&quot;" />
187+
183188
</Target>
184189

185190
</Project>

src/com.unity.editor.tasks/Editor/Tasks/FuncTask.cs.meta renamed to src/com.unity.editor.tasks/Editor/Base/FuncTask.cs.meta

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com.unity.editor.tasks/Editor/Base/ExceptionExtensions.cs.meta renamed to src/com.unity.editor.tasks/Editor/Base/FuncTask_ctors.cs.meta

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com.unity.editor.tasks/Editor/Base/TaskCanceledExceptions.cs.meta

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

src/com.unity.editor.tasks/Editor/Base/TaskQueue.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com.unity.editor.tasks/Editor/Base/UnityUIThreadSynchronizationContext.cs.meta

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

src/com.unity.editor.tasks/Editor/Environment/RunLocationShim.cs.meta

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

src/com.unity.editor.tasks/Editor/Environment/TheEnvironment.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@
55

66
using System;
77

8+
#if UNITY_EDITOR
9+
using UnityEngine;
10+
using UnityEditor;
11+
#endif
12+
813
namespace Unity.Editor.Tasks
914
{
10-
using Unity.Editor.Tasks.Internal.IO;
11-
15+
using Internal.IO;
1216
#if !UNITY_EDITOR
1317

1418
public class SerializeFieldAttribute : Attribute

src/com.unity.editor.tasks/Editor/Exceptions.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com.unity.editor.tasks/Editor/Exceptions/DependentTaskFailedException.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)