From b104e8c5f3f680089e970d43058fa0b623a03c1b Mon Sep 17 00:00:00 2001 From: sebas77 Date: Wed, 13 Jan 2021 11:29:34 +0000 Subject: [PATCH] fix compiling issues with some version of unity renamed file --- Svelto.Common | 2 +- Svelto.ECS/Core/CheckEntityUtilities.cs | 1 + ...UECSSubmissionEngine.cs => SubmissionEngine.cs} | 1 - .../DOTS/UECS/SveltoUECSEntitiesSubmissionGroup.cs | 1 - Svelto.ECS/Svelto.ECS.asmdef | 14 ++++++++++++-- Svelto.ECS/package.json | 4 ++-- Svelto.ECS/version.json | 2 +- 7 files changed, 17 insertions(+), 8 deletions(-) rename Svelto.ECS/Extensions/Unity/DOTS/UECS/{IUECSSubmissionEngine.cs => SubmissionEngine.cs} (88%) diff --git a/Svelto.Common b/Svelto.Common index 33e1d93..1b2f3cb 160000 --- a/Svelto.Common +++ b/Svelto.Common @@ -1 +1 @@ -Subproject commit 33e1d93b187a07825fb53f94d537fc66ffa0a819 +Subproject commit 1b2f3cb581a502aa6879b8d6afa4ae83a0fe0391 diff --git a/Svelto.ECS/Core/CheckEntityUtilities.cs b/Svelto.ECS/Core/CheckEntityUtilities.cs index 0016ac8..1860f01 100644 --- a/Svelto.ECS/Core/CheckEntityUtilities.cs +++ b/Svelto.ECS/Core/CheckEntityUtilities.cs @@ -1,5 +1,6 @@ #if !DEBUG || PROFILE_SVELTO #define DONT_USE +using System.Diagnostics; #endif using System; using System.Collections.Generic; diff --git a/Svelto.ECS/Extensions/Unity/DOTS/UECS/IUECSSubmissionEngine.cs b/Svelto.ECS/Extensions/Unity/DOTS/UECS/SubmissionEngine.cs similarity index 88% rename from Svelto.ECS/Extensions/Unity/DOTS/UECS/IUECSSubmissionEngine.cs rename to Svelto.ECS/Extensions/Unity/DOTS/UECS/SubmissionEngine.cs index 9e7e4bb..089431a 100644 --- a/Svelto.ECS/Extensions/Unity/DOTS/UECS/IUECSSubmissionEngine.cs +++ b/Svelto.ECS/Extensions/Unity/DOTS/UECS/SubmissionEngine.cs @@ -17,7 +17,6 @@ namespace Svelto.ECS.Extensions.Unity } public EntityCommandBuffer ECB { get; internal set; } - protected EntityManager EM => this.EntityManager; public string name => TypeToString.Name(this); } diff --git a/Svelto.ECS/Extensions/Unity/DOTS/UECS/SveltoUECSEntitiesSubmissionGroup.cs b/Svelto.ECS/Extensions/Unity/DOTS/UECS/SveltoUECSEntitiesSubmissionGroup.cs index 1f0a8d3..dd1c619 100644 --- a/Svelto.ECS/Extensions/Unity/DOTS/UECS/SveltoUECSEntitiesSubmissionGroup.cs +++ b/Svelto.ECS/Extensions/Unity/DOTS/UECS/SveltoUECSEntitiesSubmissionGroup.cs @@ -1,5 +1,4 @@ #if UNITY_ECS -using System.Collections; using Svelto.Common; using Svelto.DataStructures; using Svelto.ECS.Schedulers; diff --git a/Svelto.ECS/Svelto.ECS.asmdef b/Svelto.ECS/Svelto.ECS.asmdef index b836337..593ef33 100644 --- a/Svelto.ECS/Svelto.ECS.asmdef +++ b/Svelto.ECS/Svelto.ECS.asmdef @@ -18,6 +18,11 @@ "autoReferenced": true, "defineConstraints": [], "versionDefines": [ + { + "name": "Unity", + "expression": "2019.3", + "define": "UNITY_JOBS" + }, { "name": "com.unity.entities", "expression": "", @@ -49,8 +54,13 @@ "define": "UNITY_NATIVE" }, { - "name": "Unity", - "expression": "2019.3.0", + "name": "com.unity.burst", + "expression": "", + "define": "UNITY_JOBS" + }, + { + "name": "com.sebaslab.svelto.ecs", + "expression": "", "define": "UNITY_JOBS" } ], diff --git a/Svelto.ECS/package.json b/Svelto.ECS/package.json index 58d61f5..022bbbe 100644 --- a/Svelto.ECS/package.json +++ b/Svelto.ECS/package.json @@ -3,13 +3,13 @@ "category": "Svelto", "description": "Svelto ECS C# Lightweight Data Oriented Entity Component System Framework", "dependencies": { - "com.sebaslab.svelto.common": "3.1.0" + "com.sebaslab.svelto.common": "3.1.1" }, "keywords": [ "svelto" ], "name": "com.sebaslab.svelto.ecs", - "version": "3.1.0", + "version": "3.1.1", "type": "library", "unity": "2019.3" } \ No newline at end of file diff --git a/Svelto.ECS/version.json b/Svelto.ECS/version.json index f1745a8..13717ab 100644 --- a/Svelto.ECS/version.json +++ b/Svelto.ECS/version.json @@ -1,3 +1,3 @@ { - "version": "3.1.0" + "version": "3.1.1" }