Updates and Clean up

dellis1972 · Oct 10, 2024 · ae5c1a5 · ae5c1a5
1 parent 7bb9a2f
commit ae5c1a5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -105,7 +105,6 @@ jobs:
       - name: Test
         run: dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 5m -c Release --filter="TestCategory!=Audio"
         env:
-          #DOTNET_ROOT: ${{github.workspace}}/dotnet64
           MGFXC_WINE_PATH: /Users/runner/.winemonogame
           CI: true
         if: runner.os == 'macOS'

diff --git a/MonoGame.Framework.Content.Pipeline/ExternalTool.cs b/MonoGame.Framework.Content.Pipeline/ExternalTool.cs
@@ -47,7 +47,6 @@ public static void RestoreDotnetTool(string command, string toolName)
                 exe = Path.Combine(dotnetRoot, exe);
             }
             Run (exe, $"tool {command} {toolName} --tool-path .", out string stdOut, out string stdErr,  workingDirectory: path);
-            Debug.WriteLine($"DEBUG! {stdOut} {stdErr}");
         }
 
         public static void RestoreDotnetTools()
@@ -64,9 +63,7 @@ public static int RunDotnetTool(string toolName, string args, out string stdOut,
             RestoreDotnetTools ();
             var exe = FindCommand (toolName);
             var finalizedArgs =  args;
-            var r =  ExternalTool.Run(exe, finalizedArgs, out stdOut, out stdErr, stdIn, workingDirectory);
-            Debug.WriteLine($"DEBUG! {stdOut} {stdErr}");
-            return r;
+            return ExternalTool.Run(exe, finalizedArgs, out stdOut, out stdErr, stdIn, workingDirectory);
         }
 
         public static int Run(string command, string arguments, out string stdout, out string stderr, string stdin = null, string workingDirectory=null)
@@ -108,7 +105,6 @@ public static int Run(string command, string arguments, out string stdout, out s
 
             EnsureExecutable(fullPath);
 
-            Debug.WriteLine ($"DEBUG! Exec: {command} {arguments}");
             using (var process = new Process())
             {
                 process.StartInfo = processInfo;

diff --git a/Tools/MonoGame.Content.Builder/BuildContent.cs b/Tools/MonoGame.Content.Builder/BuildContent.cs
@@ -298,7 +298,7 @@ public void Build(out int successCount, out int errorCount)
             var intermediatePath = ReplaceSymbols(_intermediateDir);
             if (!Path.IsPathRooted(intermediatePath))
                 intermediatePath = PathHelper.Normalize(Path.GetFullPath(Path.Combine(projectDirectory, intermediatePath)));
-
+            
             _manager = new PipelineManager(projectDirectory, outputPath, intermediatePath);
             _manager.Logger = new ConsoleLogger();
             _manager.CompressContent = CompressContent;

diff --git a/Tools/MonoGame.Content.Builder/MonoGame.Content.Builder.csproj b/Tools/MonoGame.Content.Builder/MonoGame.Content.Builder.csproj
@@ -15,11 +15,6 @@
     <UseAppHost>true</UseAppHost>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\..\MonoGame.Framework\Platform\Utilities\CurrentPlatform.cs" />
-    <Compile Include="..\..\MonoGame.Framework.Content.Pipeline\ExternalTool.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.DesktopGL.csproj" />
     <ProjectReference Include="..\..\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.csproj" />

diff --git a/build/DeployTasks/UploadArtifactsTask.cs b/build/DeployTasks/UploadArtifactsTask.cs
@@ -17,6 +17,9 @@ public override async Task RunAsync(BuildContext context)
 
         // Clean up build tools if installed
         // otherwise we get permission issues after extraction
+        // because the zip removes all the permissions.
+        // Plus in windows hidden files (like the .store directory)
+        // are ignored. This causes `dotnet tool` to error.
         var path = System.IO.Path.Combine(context.BuildOutput, "Tests", "Tools", "Release", "tools");
         if (System.IO.Directory.Exists(path)) {
             context.Log.Information ($"Deleting: {path}");