From 148d629e5128929cd2a063e49cd35bd925dd24fd Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Mon, 24 Jun 2019 16:49:26 -0700 Subject: [PATCH 01/15] AddEntityRenderer and AddGeneralRenderer take initialized renderers --- encompass-cs/WorldBuilder.cs | 6 ++---- encompass-cs/exceptions/ComponentTypeMismatchException.cs | 2 +- test/EntityRendererTest.cs | 6 +++--- test/GeneralRendererTest.cs | 4 ++-- test/WorldTest.cs | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/encompass-cs/WorldBuilder.cs b/encompass-cs/WorldBuilder.cs index f1331fc..da38ed6 100644 --- a/encompass-cs/WorldBuilder.cs +++ b/encompass-cs/WorldBuilder.cs @@ -97,9 +97,8 @@ namespace Encompass return engine; } - public TRenderer AddEntityRenderer() where TRenderer : Renderer, new() + public TRenderer AddEntityRenderer(TRenderer renderer) where TRenderer : Renderer { - var renderer = new TRenderer(); renderer.AssignEntityManager(entityManager); renderer.AssignComponentManager(componentManager); @@ -112,9 +111,8 @@ namespace Encompass return renderer; } - public TRenderer AddGeneralRenderer(int layer) where TRenderer : GeneralRenderer, new() + public TRenderer AddGeneralRenderer(TRenderer renderer, int layer) where TRenderer : GeneralRenderer { - var renderer = new TRenderer(); renderer.AssignEntityManager(entityManager); renderer.AssignComponentManager(componentManager); diff --git a/encompass-cs/exceptions/ComponentTypeMismatchException.cs b/encompass-cs/exceptions/ComponentTypeMismatchException.cs index d28e7c4..17caf96 100644 --- a/encompass-cs/exceptions/ComponentTypeMismatchException.cs +++ b/encompass-cs/exceptions/ComponentTypeMismatchException.cs @@ -1,6 +1,6 @@ using System; -namespace Encompass +namespace Encompass.Exceptions { public class ComponentTypeMismatchException : Exception { diff --git a/test/EntityRendererTest.cs b/test/EntityRendererTest.cs index ceaf243..009528f 100644 --- a/test/EntityRendererTest.cs +++ b/test/EntityRendererTest.cs @@ -25,7 +25,7 @@ namespace Tests public void CheckAndTrackEntities() { var worldBuilder = new WorldBuilder(); - var renderer = worldBuilder.AddEntityRenderer(); + var renderer = worldBuilder.AddEntityRenderer(new TestRenderer()); AComponent aComponent; BComponent bComponent; @@ -68,7 +68,7 @@ namespace Tests public void InactiveDrawComponent() { var worldBuilder = new WorldBuilder(); - var renderer = worldBuilder.AddEntityRenderer(); + var renderer = worldBuilder.AddEntityRenderer(new TestRenderer()); AComponent aComponent; BComponent bComponent; @@ -110,7 +110,7 @@ namespace Tests public void RenderMethodCalledOnWorldDraw() { var worldBuilder = new WorldBuilder(); - var renderer = worldBuilder.AddEntityRenderer(); + var renderer = worldBuilder.AddEntityRenderer(new CalledRenderer()); AComponent aComponent; CComponent cComponent; diff --git a/test/GeneralRendererTest.cs b/test/GeneralRendererTest.cs index 3ada80c..3319043 100644 --- a/test/GeneralRendererTest.cs +++ b/test/GeneralRendererTest.cs @@ -27,7 +27,7 @@ namespace Tests public void SingletonComponent() { var worldBuilder = new WorldBuilder(); - worldBuilder.AddGeneralRenderer(1); + worldBuilder.AddGeneralRenderer(new TestRenderer(), 1); AComponent aComponent; @@ -46,7 +46,7 @@ namespace Tests public void MultipleComponents() { var worldBuilder = new WorldBuilder(); - worldBuilder.AddGeneralRenderer(1); + worldBuilder.AddGeneralRenderer(new TestRenderer(), 1); AComponent aComponent; AComponent aComponentTwo; diff --git a/test/WorldTest.cs b/test/WorldTest.cs index f403608..675a75e 100644 --- a/test/WorldTest.cs +++ b/test/WorldTest.cs @@ -37,8 +37,8 @@ namespace Tests public void DrawOrder() { var worldBuilder = new WorldBuilder(); - worldBuilder.AddEntityRenderer(); - var testGeneralRenderer = worldBuilder.AddGeneralRenderer(7); + worldBuilder.AddEntityRenderer(new TestEntityRenderer()); + var testGeneralRenderer = worldBuilder.AddGeneralRenderer(new TestGeneralRenderer(), 7); TestComponent testComponent; TestDrawComponent testDrawComponent = default(TestDrawComponent); From 51c014eb1e96dc7112db9567f4b947d92109e72b Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Mon, 24 Jun 2019 16:53:54 -0700 Subject: [PATCH 02/15] 0.4.1 --- encompass-cs/encompass-cs.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/encompass-cs/encompass-cs.csproj b/encompass-cs/encompass-cs.csproj index 1d1dbdd..210fe8f 100644 --- a/encompass-cs/encompass-cs.csproj +++ b/encompass-cs/encompass-cs.csproj @@ -4,7 +4,7 @@ netstandard2.0 Encompass EncompassECS.Framework - 0.4.0 + 0.4.1 Evan Hemsley true Moonside Games From 1586245d8bd5c76e14942bba735d0428860dcef8 Mon Sep 17 00:00:00 2001 From: thatcosmonaut <2342303+thatcosmonaut@users.noreply.github.com> Date: Tue, 25 Jun 2019 18:36:36 -0700 Subject: [PATCH 03/15] Update TODO --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index 8afe268..ff167bf 100644 --- a/TODO +++ b/TODO @@ -6,4 +6,6 @@ - maybe AddEngine should take a constructed engine similarly to AddComponent? +- component getters should return ValueTuple instead of KeyValuePair so we can do destructuring assignments + - docs From 205c5fcfc541f8526b1dc0545bfacb43281edbba Mon Sep 17 00:00:00 2001 From: Evan Hemsley <2342303+ehemsley@users.noreply.github.com> Date: Wed, 26 Jun 2019 22:21:04 -0700 Subject: [PATCH 04/15] circleCI --- .circleci/config.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..b415d24 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,43 @@ +version: 2.1 + +defaults: &defaults + working_directory: ~/repo + docker: + - image: mcr.microsoft.com/dotnet/core/sdk:2.2 + environment: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + +jobs: + test: + <<: *defaults + steps: + - checkout + - run: dotnet restore + - run: dotnet build -c Release + - run: dotnet test -c Release + + deploy: + <<: *defaults + steps: + - checkout + - attach_workspace: + at: . + - run: + name: deploy to NuGet + command: | + dotnet nuget push ./encompass-cs/bin/Release/EncompassECS.Framework.*.nupkg -k $API_KEY -s $NUGET_SOURCE + +workflows: + version: 2 + test_and_deploy: + jobs: + - test + - deploy: + requires: + - test + filters: + branches: + ignore: /.*/ + tags: + only: /^[0-9]\.[0-9]\.[0-9]$/ From fbc0dffc4eaf5e5d1dc213b0e5635f29e0592a6b Mon Sep 17 00:00:00 2001 From: Evan Hemsley <2342303+ehemsley@users.noreply.github.com> Date: Wed, 26 Jun 2019 22:29:41 -0700 Subject: [PATCH 05/15] more CI --- .circleci/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b415d24..d07daea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,6 +16,8 @@ jobs: - run: dotnet restore - run: dotnet build -c Release - run: dotnet test -c Release + - persist_to_workspace: + root: . deploy: <<: *defaults @@ -23,16 +25,13 @@ jobs: - checkout - attach_workspace: at: . - - run: - name: deploy to NuGet - command: | - dotnet nuget push ./encompass-cs/bin/Release/EncompassECS.Framework.*.nupkg -k $API_KEY -s $NUGET_SOURCE + - run: dotnet nuget push ./encompass-cs/bin/Release/EncompassECS.Framework.*.nupkg -k $API_KEY -s $NUGET_SOURCE workflows: version: 2 test_and_deploy: jobs: - - test + test - deploy: requires: - test From 4556587c74fab73244ddab120a14996f9c037717 Mon Sep 17 00:00:00 2001 From: Evan Hemsley <2342303+ehemsley@users.noreply.github.com> Date: Wed, 26 Jun 2019 22:31:12 -0700 Subject: [PATCH 06/15] even more CI its fun!! --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d07daea..2e93680 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ workflows: version: 2 test_and_deploy: jobs: - test + - test - deploy: requires: - test From cd8654187ecb6024140b71cb73ca757ee78be236 Mon Sep 17 00:00:00 2001 From: Evan Hemsley <2342303+ehemsley@users.noreply.github.com> Date: Wed, 26 Jun 2019 22:42:29 -0700 Subject: [PATCH 07/15] hmmm --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e93680..08ba272 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,10 +33,10 @@ workflows: jobs: - test - deploy: - requires: - - test - filters: - branches: - ignore: /.*/ - tags: - only: /^[0-9]\.[0-9]\.[0-9]$/ + requires: + - test + filters: + branches: + ignore: /.*/ + tags: + only: /^[0-9]\.[0-9]\.[0-9]$/ From 68e01239d6ead0a44608e3d1891698ff928446cf Mon Sep 17 00:00:00 2001 From: Evan Hemsley <2342303+ehemsley@users.noreply.github.com> Date: Wed, 26 Jun 2019 22:43:44 -0700 Subject: [PATCH 08/15] one more time!!! --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 08ba272..cdcd508 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,14 +17,14 @@ jobs: - run: dotnet build -c Release - run: dotnet test -c Release - persist_to_workspace: - root: . + root: . deploy: <<: *defaults steps: - checkout - attach_workspace: - at: . + at: . - run: dotnet nuget push ./encompass-cs/bin/Release/EncompassECS.Framework.*.nupkg -k $API_KEY -s $NUGET_SOURCE workflows: From 5546b846d5cc3fe0efc124574622ac5a558eee6a Mon Sep 17 00:00:00 2001 From: Evan Hemsley <2342303+ehemsley@users.noreply.github.com> Date: Wed, 26 Jun 2019 22:45:36 -0700 Subject: [PATCH 09/15] maybe this is the one!!! --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cdcd508..3bf160f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,7 @@ jobs: - run: dotnet test -c Release - persist_to_workspace: root: . + paths: ./encompass-cs/bin deploy: <<: *defaults From 87c5a785c7a5800c017908ab4f0685ea63cb19b8 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Thu, 27 Jun 2019 16:55:12 -0700 Subject: [PATCH 10/15] changing KeyValueTuple component returns to ValueTuple --- encompass-cs/ComponentManager.cs | 25 ++++++++++---------- encompass-cs/Engine.cs | 4 ++-- encompass-cs/Entity.cs | 4 ++-- encompass-cs/Renderer.cs | 4 ++-- test/EngineTest.cs | 40 +++++++++++++++----------------- test/EntityRendererTest.cs | 4 ++-- test/EntityTest.cs | 10 ++++---- test/GeneralRendererTest.cs | 6 ++--- 8 files changed, 47 insertions(+), 50 deletions(-) diff --git a/encompass-cs/ComponentManager.cs b/encompass-cs/ComponentManager.cs index 8ba9fa6..2e386ee 100644 --- a/encompass-cs/ComponentManager.cs +++ b/encompass-cs/ComponentManager.cs @@ -81,38 +81,38 @@ namespace Encompass Enumerable.Empty(); } - internal IEnumerable> GetComponentsByEntity(Guid entityID) + internal IEnumerable> GetComponentsByEntity(Guid entityID) { - return GetComponentIDsByEntityID(entityID).Intersect(activeComponents).Select((id) => new KeyValuePair(id, IDToComponent[id])); + return GetComponentIDsByEntityID(entityID).Intersect(activeComponents).Select((id) => new ValueTuple(id, IDToComponent[id])); } - internal IEnumerable> GetActiveComponentsByType() where TComponent : struct, IComponent + internal IEnumerable> GetActiveComponentsByType() where TComponent : struct, IComponent { return typeToComponentIDs.ContainsKey(typeof(TComponent)) ? - typeToComponentIDs[typeof(TComponent)].Select((id) => new KeyValuePair(id, (TComponent)IDToComponent[id])) : - Enumerable.Empty>(); + typeToComponentIDs[typeof(TComponent)].Select((id) => new ValueTuple(id, (TComponent)IDToComponent[id])) : + Enumerable.Empty>(); } - internal IEnumerable> GetActiveComponentsByType(Type type) + internal IEnumerable> GetActiveComponentsByType(Type type) { return typeToComponentIDs.ContainsKey(type) ? - typeToComponentIDs[type].Select((id) => new KeyValuePair(id, IDToComponent[id])) : - Enumerable.Empty>(); + typeToComponentIDs[type].Select((id) => new ValueTuple(id, IDToComponent[id])) : + Enumerable.Empty>(); } - internal KeyValuePair GetActiveComponentByType() where TComponent : struct, IComponent + internal ValueTuple GetActiveComponentByType() where TComponent : struct, IComponent { return GetActiveComponentsByType().Single(); } - internal IEnumerable> GetComponentsByEntityAndType(Guid entityID) where TComponent : struct, IComponent + internal IEnumerable> GetComponentsByEntityAndType(Guid entityID) where TComponent : struct, IComponent { - var entityComponentsByType = GetComponentsByEntity(entityID).Where((pair) => componentIDToType[pair.Key] == typeof(TComponent)).Select((pair) => new KeyValuePair(pair.Key, (TComponent)pair.Value)); + var entityComponentsByType = GetComponentsByEntity(entityID).Where((pair) => componentIDToType[pair.Item1] == typeof(TComponent)).Select((pair) => new ValueTuple(pair.Item1, (TComponent)pair.Item2)); var activeComponentsByType = GetActiveComponentsByType(); return activeComponentsByType.Intersect(entityComponentsByType); } - internal IEnumerable> GetComponentsByEntityAndType(Guid entityID, Type type) + internal IEnumerable> GetComponentsByEntityAndType(Guid entityID, Type type) { var entityComponents = GetComponentsByEntity(entityID); var activeComponentsByType = GetActiveComponentsByType(type); @@ -151,7 +151,6 @@ namespace Encompass internal void UpdateComponent(Guid componentID, TComponent newComponentValue) where TComponent : struct, IComponent { - var entityID = GetEntityIDByComponentID(componentID); IDToComponent[componentID] = newComponentValue; } diff --git a/encompass-cs/Engine.cs b/encompass-cs/Engine.cs index 80c9b30..efd6e0d 100644 --- a/encompass-cs/Engine.cs +++ b/encompass-cs/Engine.cs @@ -86,12 +86,12 @@ namespace Encompass } } - protected IEnumerable> ReadComponents() where TComponent : struct, IComponent + protected IEnumerable> ReadComponents() where TComponent : struct, IComponent { return componentManager.GetActiveComponentsByType(); } - protected KeyValuePair ReadComponent() where TComponent : struct, IComponent + protected ValueTuple ReadComponent() where TComponent : struct, IComponent { return componentManager.GetActiveComponentByType(); } diff --git a/encompass-cs/Entity.cs b/encompass-cs/Entity.cs index c39ce78..20b3101 100644 --- a/encompass-cs/Entity.cs +++ b/encompass-cs/Entity.cs @@ -26,12 +26,12 @@ namespace Encompass return componentManager.AddDrawComponent(id, component, layer); } - public IEnumerable> GetComponents() where TComponent : struct, IComponent + public IEnumerable> GetComponents() where TComponent : struct, IComponent { return componentManager.GetComponentsByEntityAndType(id); } - public KeyValuePair GetComponent() where TComponent : struct, IComponent + public ValueTuple GetComponent() where TComponent : struct, IComponent { return GetComponents().First(); } diff --git a/encompass-cs/Renderer.cs b/encompass-cs/Renderer.cs index 1cf3351..9f4c860 100644 --- a/encompass-cs/Renderer.cs +++ b/encompass-cs/Renderer.cs @@ -24,12 +24,12 @@ namespace Encompass return entityManager.GetEntity(entityID); } - protected IEnumerable> ReadComponents() where TComponent : struct, IComponent + protected IEnumerable> ReadComponents() where TComponent : struct, IComponent { return componentManager.GetActiveComponentsByType(); } - protected KeyValuePair ReadComponent() where TComponent : struct, IComponent + protected ValueTuple ReadComponent() where TComponent : struct, IComponent { return componentManager.GetActiveComponentByType(); } diff --git a/test/EngineTest.cs b/test/EngineTest.cs index 50f2b22..88b58ec 100644 --- a/test/EngineTest.cs +++ b/test/EngineTest.cs @@ -12,7 +12,7 @@ namespace Tests { public class EngineTest { - static List> resultComponents; + static List> resultComponents; static MockComponent resultComponent; static List resultMessages; @@ -21,7 +21,7 @@ namespace Tests { public override void Update(double dt) { - resultComponents = this.ReadComponents().ToList(); + resultComponents = ReadComponents().ToList(); } } @@ -29,7 +29,7 @@ namespace Tests { public override void Update(double dt) { - resultComponent = this.ReadComponent().Value; + resultComponent = ReadComponent().Item2; } } @@ -56,7 +56,7 @@ namespace Tests world.Update(0.01f); - var resultComponentValues = resultComponents.Select((kv) => kv.Value); + var resultComponentValues = resultComponents.Select((kv) => kv.Item2); resultComponentValues.Should().Contain(mockComponent); resultComponentValues.Should().Contain(mockComponentB); } @@ -111,13 +111,13 @@ namespace Tests { public override void Update(double dt) { - (var componentID, var component) = this.ReadComponent(); + (var componentID, var component) = ReadComponent(); component.myInt = 420; component.myString = "blaze it"; - this.UpdateComponent(componentID, component); + UpdateComponent(componentID, component); - resultComponent = this.ReadComponent().Value; + resultComponent = ReadComponent().Item2; } } @@ -151,9 +151,9 @@ namespace Tests component.myInt = 420; component.myString = "blaze it"; - this.UpdateComponent(componentID, component); + UpdateComponent(componentID, component); - component = this.ReadComponent().Value; + component = ReadComponent().Item2; } } @@ -320,8 +320,8 @@ namespace Tests Assert.Throws(() => world.Update(0.01f)); } - static KeyValuePair pairA; - static KeyValuePair pairB; + static ValueTuple pairA; + static ValueTuple pairB; class SameValueComponentReadEngine : Engine { @@ -357,10 +357,10 @@ namespace Tests world.Update(0.01f); Assert.That(pairA, Is.Not.EqualTo(pairB)); - Assert.That(pairA.Value, Is.EqualTo(pairB.Value)); + Assert.That(pairA.Item2, Is.EqualTo(pairB.Item2)); } - static IEnumerable> emptyComponentReadResult; + static IEnumerable> emptyComponentReadResult; class ReadEmptyMockComponentsEngine : Engine { @@ -388,18 +388,16 @@ namespace Tests { public override void Update(double dt) { - var componentPairs = ReadComponents(); - - foreach (var componentPair in componentPairs) + foreach (var componentPair in ReadComponents()) { - var componentID = componentPair.Key; + var componentID = componentPair.Item1; var entityID = GetEntityIDByComponentID(componentID); Destroy(entityID); } } } - static IEnumerable> results; + static IEnumerable> results; class ReaderEngine : Engine { public override void Update(double dt) @@ -442,7 +440,7 @@ namespace Tests { public override void Update(double dt) { - var componentID = ReadComponent().Key; + var componentID = ReadComponent().Item1; entityFromComponentIDResult = GetEntityByComponentID(componentID); } } @@ -471,7 +469,7 @@ namespace Tests { public override void Update(double dt) { - var componentID = ReadComponent().Key; + var componentID = ReadComponent().Item1; mockComponentByIDResult = GetComponentByID(componentID); } } @@ -500,7 +498,7 @@ namespace Tests { public override void Update(double dt) { - var componentID = ReadComponent().Key; + var componentID = ReadComponent().Item1; GetComponentByID(componentID); } } diff --git a/test/EntityRendererTest.cs b/test/EntityRendererTest.cs index 009528f..75367cf 100644 --- a/test/EntityRendererTest.cs +++ b/test/EntityRendererTest.cs @@ -95,7 +95,7 @@ namespace Tests } static bool calledOnDraw = false; - static IEnumerable> resultComponents; + static IEnumerable> resultComponents; [Renders(typeof(TestDrawComponent), typeof(AComponent), typeof(CComponent))] class CalledRenderer : EntityRenderer { @@ -128,7 +128,7 @@ namespace Tests Assert.IsTrue(renderer.IsTracking(entity.id)); Assert.IsTrue(calledOnDraw); - resultComponents.Should().Contain(new KeyValuePair(testDrawComponentID, testDrawComponent)); + resultComponents.Should().Contain(new ValueTuple(testDrawComponentID, testDrawComponent)); } } } diff --git a/test/EntityTest.cs b/test/EntityTest.cs index 445bc51..bbd4d9e 100644 --- a/test/EntityTest.cs +++ b/test/EntityTest.cs @@ -30,7 +30,7 @@ namespace Tests var world = worldBuilder.Build(); Assert.IsTrue(entity.HasComponent()); - Assert.That(entity.GetComponent().Value, Is.EqualTo(mockComponent)); + Assert.That(entity.GetComponent().Item2, Is.EqualTo(mockComponent)); } [Test] @@ -58,9 +58,9 @@ namespace Tests var world = worldBuilder.Build(); var components = entity.GetComponents(); - components.Should().Contain(new KeyValuePair(componentAID, mockComponentA)); - components.Should().Contain(new KeyValuePair(componentBID, mockComponentB)); - components.Should().Contain(new KeyValuePair(componentCID, mockComponentC)); + components.Should().Contain(new ValueTuple(componentAID, mockComponentA)); + components.Should().Contain(new ValueTuple(componentBID, mockComponentB)); + components.Should().Contain(new ValueTuple(componentCID, mockComponentC)); } [Test] @@ -77,7 +77,7 @@ namespace Tests var world = worldBuilder.Build(); - Assert.AreEqual(new KeyValuePair(componentID, mockComponent), entity.GetComponent()); + Assert.AreEqual(new ValueTuple(componentID, mockComponent), entity.GetComponent()); } [Test] diff --git a/test/GeneralRendererTest.cs b/test/GeneralRendererTest.cs index 3319043..fd0e099 100644 --- a/test/GeneralRendererTest.cs +++ b/test/GeneralRendererTest.cs @@ -7,13 +7,13 @@ using Encompass; namespace Tests { - public class GeneralRendererTest + public static class GeneralRendererTest { struct AComponent : IComponent { } public class SingletonRead { - static KeyValuePair result; + static ValueTuple result; class TestRenderer : GeneralRenderer { @@ -39,7 +39,7 @@ namespace Tests world.Update(0.01f); world.Draw(); - Assert.That(result, Is.EqualTo(new KeyValuePair(componentID, aComponent))); + Assert.That(result, Is.EqualTo(new ValueTuple(componentID, aComponent))); } [Test] From 302ed3d69d7894f86c2318a467e052f9e606fae0 Mon Sep 17 00:00:00 2001 From: thatcosmonaut <2342303+thatcosmonaut@users.noreply.github.com> Date: Thu, 27 Jun 2019 16:57:58 -0700 Subject: [PATCH 11/15] Delete .travis.yml --- .travis.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 22fb9ab..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -dist: xenial -language: csharp -solution: encompass-cs.sln -mono: none -dotnet: 2.1.502 - -script: - - dotnet restore - - dotnet build -c Release - - dotnet test -c Release - -deploy: - skip_cleanup: true - provider: script - script: dotnet nuget push ./encompass-cs/bin/Release/EncompassECS.Framework.*.nupkg -k $API_KEY -s $NUGET_SOURCE - on: - tags: true - repo: encompass-ecs/encompass-cs From d6fd4695634b9f9e1f76106a40f9d5d2a302ad06 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Thu, 27 Jun 2019 16:59:52 -0700 Subject: [PATCH 12/15] 0.5.0 --- encompass-cs/encompass-cs.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/encompass-cs/encompass-cs.csproj b/encompass-cs/encompass-cs.csproj index 210fe8f..8f1ba02 100644 --- a/encompass-cs/encompass-cs.csproj +++ b/encompass-cs/encompass-cs.csproj @@ -4,7 +4,7 @@ netstandard2.0 Encompass EncompassECS.Framework - 0.4.1 + 0.5.0 Evan Hemsley true Moonside Games From b23fd5b4e68c6fa9e30902df97903927551a36c4 Mon Sep 17 00:00:00 2001 From: thatcosmonaut <2342303+thatcosmonaut@users.noreply.github.com> Date: Thu, 27 Jun 2019 17:08:03 -0700 Subject: [PATCH 13/15] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3bf160f..0ac7db8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,4 +40,4 @@ workflows: branches: ignore: /.*/ tags: - only: /^[0-9]\.[0-9]\.[0-9]$/ + only: /^\d+\.\d+\.\d+$/ From c74ef27fa224218bc1a4dc900c8ccd1fe3b57f97 Mon Sep 17 00:00:00 2001 From: thatcosmonaut <2342303+thatcosmonaut@users.noreply.github.com> Date: Thu, 27 Jun 2019 17:18:10 -0700 Subject: [PATCH 14/15] Update config.yml --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ac7db8..58c44c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,10 @@ workflows: version: 2 test_and_deploy: jobs: - - test + - test: + filters: + branches: + only: /.*/ - deploy: requires: - test From 4f7053e6f3c01cd71dded06455c9305a663ea0c0 Mon Sep 17 00:00:00 2001 From: thatcosmonaut <2342303+thatcosmonaut@users.noreply.github.com> Date: Thu, 27 Jun 2019 17:22:43 -0700 Subject: [PATCH 15/15] i hate configuring CI so much --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 58c44c3..1e8d0c9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ workflows: jobs: - test: filters: - branches: + tags: only: /.*/ - deploy: requires: