diff --git a/.gitignore b/.gitignore index e169d7ed..09713c44 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,9 @@ UnityProject/Build/* /UnityProject/HybridCLRData /UnityProject/UserSettings +# Unity package settings (local preferences) +/UnityProject/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json + # Unity Test Framework temporary scenes /UnityProject/Assets/InitTestScene*.unity /UnityProject/Assets/InitTestScene*.unity.meta diff --git a/UnityProject/Packages/com.jasonxudeveloper.jengine.core/Editor/CustomEditor/BuildManager.cs b/UnityProject/Packages/com.jasonxudeveloper.jengine.core/Editor/CustomEditor/BuildManager.cs index 95608c61..046a1356 100644 --- a/UnityProject/Packages/com.jasonxudeveloper.jengine.core/Editor/CustomEditor/BuildManager.cs +++ b/UnityProject/Packages/com.jasonxudeveloper.jengine.core/Editor/CustomEditor/BuildManager.cs @@ -237,6 +237,10 @@ private void ExecuteCurrentStep() CheckForErrorsExcluding("Step 3/4 failed - HybridCLR generation failed", "Create package main catalog file failed"); + // Reset error baseline after filtering excluded errors + // so subsequent steps don't see the ignored YooAsset catalog errors + _errorCountAtStart = GetUnityErrorCount(); + _currentStep = BuildStep.GeneratePolymorphicCodes; break; diff --git a/UnityProject/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/UnityProject/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json deleted file mode 100644 index ee83dca5..00000000 --- a/UnityProject/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "m_Dictionary": { - "m_DictionaryValues": [ - { - "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "IncludeAssemblies", - "value": "{\"m_Value\":\"JEngine.UI,JEngine.UI.Editor,JEngine.Util\"}" - }, - { - "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "Path", - "value": "{\"m_Value\":\"{ProjectPath}\"}" - }, - { - "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "HistoryPath", - "value": "{\"m_Value\":\"{ProjectPath}\"}" - }, - { - "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "PathsToInclude", - "value": "{\"m_Value\":\"\"}" - }, - { - "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "PathsToExclude", - "value": "{\"m_Value\":\"{ProjectPath}/Assets/Samples/**,{ProjectPath}/Packages/com.code-philosophy.hybridclr@8.9.0/**\"}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "EnableCodeCoverage", - "value": "{\"m_Value\":true}" - }, - { - "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "VerbosityLevel", - "value": "{\"m_Value\":1}" - } - ] - } -} \ No newline at end of file