From 26832c224cf8bd1506a45141a243ee10a8498d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Wed, 3 Nov 2021 16:34:52 +0100 Subject: [PATCH 1/4] Reenable codedom tests on trunk --- Assets/Tests/InputSystem/CoreTests_Editor.cs | 4 ---- Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef | 5 ----- 2 files changed, 9 deletions(-) diff --git a/Assets/Tests/InputSystem/CoreTests_Editor.cs b/Assets/Tests/InputSystem/CoreTests_Editor.cs index ad9a83746c..cdf90cb5a5 100644 --- a/Assets/Tests/InputSystem/CoreTests_Editor.cs +++ b/Assets/Tests/InputSystem/CoreTests_Editor.cs @@ -2098,7 +2098,6 @@ public void Editor_ActionTree_CompositesAreShownWithNiceNames() #if UNITY_STANDALONE // CodeDom API not available in most players. We only build and run this in the editor but we're // still affected by the current platform. -#if !TEMP_DISABLE_EDITOR_TESTS_ON_TRUNK // Temporary: Disables tests while net-profile passed from UTR to trunk is overridden to netstandard (missing CodeDom) [Test] [Category("Editor")] [TestCase("MyControls (2)", "MyNamespace", "", "MyNamespace.MyControls2")] @@ -2138,7 +2137,6 @@ public void Editor_CanGenerateCodeWrapperForInputAsset(string assetName, string Assert.That(set1map.ToJson(), Is.EqualTo(map1.ToJson())); } -#endif #endif // Can take any given registered layout and generate a cross-platform C# struct for it @@ -2796,7 +2794,6 @@ private void AssertAssetIsUnmodifiedAfterExitingPlayMode(Action Date: Mon, 15 Nov 2021 14:56:14 +0100 Subject: [PATCH 2/4] Attempting to explicitly specify NET_4_8 instead of NET_4_6 --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index d083da9d91..fe61b4ae4b 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -33,7 +33,7 @@ - mv ./Packages/com.unity.inputsystem/Samples ./Assets - mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - upm-ci~/tools/utr/utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_4_6 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - upm-ci~/tools/utr/utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_4_8 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: From 1720e7e97270ac63f39b4c5857f3b99667e695da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Mon, 15 Nov 2021 15:25:38 +0100 Subject: [PATCH 3/4] Changed netfx devpack version to 4.8 --- .yamato/config.metadata | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index b709297623..53d86a0717 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -8,13 +8,13 @@ platforms: type: Unity::VM image: package-ci/win10:v1.15.0-713263 flavor: b1.large - netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local + netinstall: choco install netfx-4.8-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local - name: win_standalone type: Unity::VM image: package-ci/win10:v1.15.0-713263 flavor: b1.large runtime: StandaloneWindows64 - netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local + netinstall: choco install netfx-4.8-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local - name: win_standalone_il2cpp type: Unity::VM image: package-ci/win10:v1.15.0-713263 @@ -22,7 +22,7 @@ platforms: runtime: StandaloneWindows64 scripting-backend: Il2Cpp installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP -w -u - netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local + netinstall: choco install netfx-4.8-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local - name: mac type: Unity::VM::osx image: package-ci/mac:stable From f867e681b447ffc9a93caddf8890b2ea2e53a712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Sidenvall?= Date: Mon, 15 Nov 2021 15:33:40 +0100 Subject: [PATCH 4/4] Corrected NET arg for 4_8 --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index fe61b4ae4b..6f28c0e2db 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -33,7 +33,7 @@ - mv ./Packages/com.unity.inputsystem/Samples ./Assets - mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - upm-ci~/tools/utr/utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_4_8 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - upm-ci~/tools/utr/utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_UNITY_4_8 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: