Skip to content

Commit

Permalink
C#: Discontinue GodotNuGetFallbackFolder
Browse files Browse the repository at this point in the history
  • Loading branch information
RedworkDE committed Apr 7, 2023
1 parent c151d32 commit 27124ed
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 311 deletions.
10 changes: 0 additions & 10 deletions modules/mono/editor/GodotTools/GodotTools/Build/BuildManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -317,16 +317,6 @@ public static bool EditorBuildCallback()
if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
return true; // No solution to build

try
{
// Make sure our packages are added to the fallback folder
NuGetUtils.AddBundledPackagesToFallbackFolder(NuGetUtils.GodotFallbackFolderPath);
}
catch (Exception e)
{
GD.PushError("Failed to setup Godot NuGet Offline Packages: " + e.Message);
}

if (GodotSharpEditor.Instance.SkipBuildBeforePlaying)
return true; // Requested play from an external editor/IDE which already built the project

Expand Down
20 changes: 0 additions & 20 deletions modules/mono/editor/GodotTools/GodotTools/Build/MSBuildPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,6 @@ public void BuildSolution()
if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
return; // No solution to build

try
{
// Make sure our packages are added to the fallback folder
NuGetUtils.AddBundledPackagesToFallbackFolder(NuGetUtils.GodotFallbackFolderPath);
}
catch (Exception e)
{
GD.PushError("Failed to setup Godot NuGet Offline Packages: " + e.Message);
}

if (!BuildManager.BuildProjectBlocking("Debug"))
return; // Build failed

Expand All @@ -62,16 +52,6 @@ private void RebuildSolution()
if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
return; // No solution to build

try
{
// Make sure our packages are added to the fallback folder
NuGetUtils.AddBundledPackagesToFallbackFolder(NuGetUtils.GodotFallbackFolderPath);
}
catch (Exception e)
{
GD.PushError("Failed to setup Godot NuGet Offline Packages: " + e.Message);
}

if (!BuildManager.BuildProjectBlocking("Debug", rebuild: true))
return; // Build failed

Expand Down
253 changes: 0 additions & 253 deletions modules/mono/editor/GodotTools/GodotTools/Build/NuGetUtils.cs

This file was deleted.

28 changes: 0 additions & 28 deletions modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,6 @@ private void _MenuOptionPressed(long id)
}
break;
}
case MenuOptions.SetupGodotNugetFallbackFolder:
{
try
{
string fallbackFolder = NuGetUtils.GodotFallbackFolderPath;
NuGetUtils.AddFallbackFolderToGodotNuGetConfigs(NuGetUtils.GodotFallbackFolderName,
fallbackFolder);
NuGetUtils.AddBundledPackagesToFallbackFolder(fallbackFolder);
}
catch (Exception e)
{
ShowErrorDialog("Failed to setup Godot NuGet Offline Packages: " + e.Message);
}

break;
}
default:
throw new ArgumentOutOfRangeException(nameof(id), id, "Invalid menu option");
}
Expand All @@ -168,7 +152,6 @@ private void BuildSolutionPressed()
private enum MenuOptions
{
CreateSln,
SetupGodotNugetFallbackFolder,
}

public void ShowErrorDialog(string message, string title = "Error")
Expand Down Expand Up @@ -533,17 +516,6 @@ public override void _EnablePlugin()
exportPlugin.RegisterExportSettings();
_exportPluginWeak = WeakRef(exportPlugin);

try
{
// At startup we make sure NuGet.Config files have our Godot NuGet fallback folder included
NuGetUtils.AddFallbackFolderToGodotNuGetConfigs(NuGetUtils.GodotFallbackFolderName,
NuGetUtils.GodotFallbackFolderPath);
}
catch (Exception e)
{
GD.PushError("Failed to add Godot NuGet Offline Packages to NuGet.Config: " + e.Message);
}

BuildManager.Initialize();
RiderPathManager.Initialize();

Expand Down

0 comments on commit 27124ed

Please sign in to comment.