Fix possbile deadlock caused by not reading stdout. (#63)

* Fix possible deadlock caused by not reading stdout. Redirecting and not reading from stdout can cause a deadlock when the stdout pipe buffer is too small. * Introduce GetDotnetArguments - Fixes #64 's issue of no obj/bin files being created with #63 * Update version --------- Co-authored-by: Abdul-Kadir Coskun <[email protected]>
Chizaruu · Jul 30, 2023 · a04cd20 · a04cd20
1 parent bd14ea8
commit a04cd20
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,90 +1,94 @@
 # Code Editor Package for Visual Studio Code
 
+## [1.4.3] - 2023-07-29
+
+-   Fix possible deadlock caused by not reading stdout
+
 ## [1.4.2] - 2023-06-13
 
-- Restrict Shell Compatibility for Project Generation's Dotnet Build (Mac/Linux)
+-   Restrict Shell Compatibility for Project Generation's Dotnet Build (Mac/Linux)
 
 ## [1.4.1] - 2023-06-05
 
-- Added .jslib to default extensions for VSCode.
-- Refactored configuration defaults and removed redundant options from omnisharp.json. - Thanks @ershn
-- Added support for renaming methods and classes using Omnisharp.
-- Updated settings.json to correctly utilize useModernNet, sdkIncludePrereleases, and organizeImportsOnFormat.
+-   Added .jslib to default extensions for VSCode.
+-   Refactored configuration defaults and removed redundant options from omnisharp.json. - Thanks @ershn
+-   Added support for renaming methods and classes using Omnisharp.
+-   Updated settings.json to correctly utilize useModernNet, sdkIncludePrereleases, and organizeImportsOnFormat.
 
 ## [1.4.0] - 2023-06-04
 
-- Refactored code to improve platform compatibility
+-   Refactored code to improve platform compatibility
 
 ## [1.3.9] - 2023-05-18
 
-- .csproj files are separated into their own folders within a main folder called "CSProjFolders" - Thanks @frarees
-- The ProjectReference element now includes a direct path to the file.
-  - Project element added
-  - Name element added
-- Compile element now includes a direct path to the file.
-- GenerateAssemblyInfo property set to false
-- Start of `dotnet build` support
+-   .csproj files are separated into their own folders within a main folder called "CSProjFolders" - Thanks @frarees
+-   The ProjectReference element now includes a direct path to the file.
+    -   Project element added
+    -   Name element added
+-   Compile element now includes a direct path to the file.
+-   GenerateAssemblyInfo property set to false
+-   Start of `dotnet build` support
 
 ## [1.3.7] - 2023-05-16
 
-- Added the option to disable adding Analyzers to all packages
-  - This means that it will only be added to .csproj files originating from the Assets Folder.
+-   Added the option to disable adding Analyzers to all packages
+    -   This means that it will only be added to .csproj files originating from the Assets Folder.
 
 ## [1.3.6] - 2023-05-10
 
-- [Added config section to Externals Tools](https://github.com/Chizaruu/com.tsk.ide.vscode/commit/8da03f5885c268eaecdfd904e6a324be9bf9b82a)
-- [Added Foldouts to remove visual clutter](https://github.com/Chizaruu/com.tsk.ide.vscode/commit/ba73359980ad49f8eca6d485eda6f54e76a2bbff)
-- A "TSKDoNotDelete" text file is generated when the package is first added. This was done to counter the constant auto-generation that occurred when you would delete the config files.
-- [Added Configurable Config Settings](https://github.com/Chizaruu/com.tsk.ide.vscode/commit/d7a33951346235a91606e258cb206cc68e65e723)
+-   [Added config section to Externals Tools](https://github.com/Chizaruu/com.tsk.ide.vscode/commit/8da03f5885c268eaecdfd904e6a324be9bf9b82a)
+-   [Added Foldouts to remove visual clutter](https://github.com/Chizaruu/com.tsk.ide.vscode/commit/ba73359980ad49f8eca6d485eda6f54e76a2bbff)
+-   A "TSKDoNotDelete" text file is generated when the package is first added. This was done to counter the constant auto-generation that occurred when you would delete the config files.
+-   [Added Configurable Config Settings](https://github.com/Chizaruu/com.tsk.ide.vscode/commit/d7a33951346235a91606e258cb206cc68e65e723)
 
 ## [1.3.4] - 2023-04-07
 
-- Minimum Unity version is now 2021.3
-- Added support for 2021/2022 NetStandard Editor Assemblies Compatibility Level (Not really, it's just a workaround until users start using 2023)
-- Added toggle for preferred default arguments for opening VSCode (You can choose between user or workspace)
-- Restructured the repository to be more in line with Unity's architecture (See <https://github.com/Unity-Technologies/com.unity.cinemachine> for more info)
+-   Minimum Unity version is now 2021.3
+-   Added support for 2021/2022 NetStandard Editor Assemblies Compatibility Level (Not really, it's just a workaround until users start using 2023)
+-   Added toggle for preferred default arguments for opening VSCode (You can choose between user or workspace)
+-   Restructured the repository to be more in line with Unity's architecture (See <https://github.com/Unity-Technologies/com.unity.cinemachine> for more info)
 
 ## [1.3.2] - 2023-04-05
 
-- Removed koalafied Microsoft.Unity.Analyzers dll
-- Removed LocationPaths option from omnisharp.json
-- Added support for Nuget package Microsoft.Unity.Analyzers (See ProjectGeneration.cs for more info)
+-   Removed koalafied Microsoft.Unity.Analyzers dll
+-   Removed LocationPaths option from omnisharp.json
+-   Added support for Nuget package Microsoft.Unity.Analyzers (See ProjectGeneration.cs for more info)
 
 ## [1.3.1] - 2023-04-01
 
-- Moved .omnisharp, .editorconfig, and analyzer generation to ProjectGeneration.cs to be in line with the rest of the project
-- Simplified XElement creation in ProjectGeneration.cs to be more readable
+-   Moved .omnisharp, .editorconfig, and analyzer generation to ProjectGeneration.cs to be in line with the rest of the project
+-   Simplified XElement creation in ProjectGeneration.cs to be more readable
 
 ## [1.3.0] - 2023-04-01
 
-- Added complete SDK support, this allows you to use Omnisharp's useModernNet in your project (Special thanks to Andrew Spiering @wackoisgod)
-- Added more predefined variables for the omnisharp.json file
-- Going forward, 2021.3 and below will only be able to use .Net Framework API compatibility level
-- Added support for .Net 4.8 API compatibility level for 2022.1 and above
-- Fixed failure while loading the analyzer reference 'Unity.SourceGenerators'
+-   Added complete SDK support, this allows you to use Omnisharp's useModernNet in your project (Special thanks to Andrew Spiering @wackoisgod)
+-   Added more predefined variables for the omnisharp.json file
+-   Going forward, 2021.3 and below will only be able to use .Net Framework API compatibility level
+-   Added support for .Net 4.8 API compatibility level for 2022.1 and above
+-   Fixed failure while loading the analyzer reference 'Unity.SourceGenerators'
 
 ## [1.2.7] - 2023-03-19
 
-- Added Unity Roslyn analyzers support (See <https://code.visualstudio.com/docs/other/unity#_enabling-unity-warnings>)
-- Added Formatting support (See CreateOmniSharpConfig() in VSCodeScriptEditor.cs)
-- Removed Rider Package (Spits)
-- Updated Text-Framework to 1.3.3
-- Start of Community Support
+-   Added Unity Roslyn analyzers support (See <https://code.visualstudio.com/docs/other/unity#_enabling-unity-warnings>)
+-   Added Formatting support (See CreateOmniSharpConfig() in VSCodeScriptEditor.cs)
+-   Removed Rider Package (Spits)
+-   Updated Text-Framework to 1.3.3
+-   Start of Community Support
 
 ## [1.2.6] - 2023-03-10
 
-- Added workspace file generation
-- End of Unity Support
+-   Added workspace file generation
+-   End of Unity Support
 
 ## [1.2.5] - 2022-02-07
 
-- Introduce OnGeneratedCSProjectFiles, OnGeneratedCSProject and OnGeneratedSlnSolution callbacks.
-- Always use forward slash in source paths
-- Analyzers use absolute paths
-- Ruleset files for roslyn analyzers
-- Extra snap search paths on Ubuntu
-- Specific c# language version for specific unity versions
-- No longer hide .gitignore in VSCode file explorer
+-   Introduce OnGeneratedCSProjectFiles, OnGeneratedCSProject and OnGeneratedSlnSolution callbacks.
+-   Always use forward slash in source paths
+-   Analyzers use absolute paths
+-   Ruleset files for roslyn analyzers
+-   Extra snap search paths on Ubuntu
+-   Specific c# language version for specific unity versions
+-   No longer hide .gitignore in VSCode file explorer
 
 ## [1.2.3] - 2020-10-23
 

diff --git a/Editor/ProjectGeneration/ProjectGeneration.cs b/Editor/ProjectGeneration/ProjectGeneration.cs
@@ -1026,12 +1026,21 @@ void GenerateNugetJsonSourceFiles()
                 return;
             }
 
+            string dotnetArguments = GetDotnetArguments();
+
+            if (dotnetArguments == null)
+            {
+                Debug.Log(
+                    "Could not find a compatible dotnet arguments. Aborting Nuget Json generation."
+                );
+                return;
+            }
+
             using var process = new System.Diagnostics.Process();
             var processStartInfo = new System.Diagnostics.ProcessStartInfo
             {
                 FileName = dotnetCommand,
-                Arguments = "-c \"dotnet build\"",
-                RedirectStandardOutput = true,
+                Arguments = dotnetArguments,
                 UseShellExecute = false,
                 CreateNoWindow = true
             };
@@ -1049,6 +1058,19 @@ string GetDotnetCommand()
             return "/bin/bash";
 #elif UNITY_EDITOR_OSX
             return "/bin/zsh";
+#else
+            return null;
+#endif
+        }
+
+        string GetDotnetArguments()
+        {
+#if UNITY_EDITOR_WIN
+            return "build";
+#elif UNITY_EDITOR_LINUX || UNITY_EDITOR_OSX
+            return "-c \"dotnet build\"";
+#else
+            return null;
 #endif
         }
     }

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "com.tsk.ide.vscode",
     "displayName": "TSK VSCode Editor",
     "description": "Unofficial code editor integration for supporting Visual Studio Code as code editor for Unity. Adds support for generating csproj files for intellisense purposes, auto discovery of installations, etc.",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "unity": "2021.3",
     "dependencies": {},
     "author": {