godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

C#: Enable nullable environment for GodotTools

Browse Source
This commit is contained in:
Thaddeus Crews
2024-01-12 22:24:12 -06:00
parent 9adb7c7d13
commit 3314f8cc65
47 changed files with 349 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs
View File

@@ -53,6 +53,12 @@ namespace GodotTools.OpenVisualStudio
{
// Launch of VS 2022 failed, fallback to 2019
dte = TryVisualStudioLaunch("VisualStudio.DTE.16.0");
if (dte == null)
{
Console.Error.WriteLine("Visual Studio not found");
return 1;
}
}
dte.UserControl = true;
@@ -137,12 +143,12 @@ namespace GodotTools.OpenVisualStudio
return 0;
}
private static DTE TryVisualStudioLaunch(string version)
private static DTE? TryVisualStudioLaunch(string version)
{
try
{
var visualStudioDteType = Type.GetTypeFromProgID(version, throwOnError: true);
var dte = (DTE)Activator.CreateInstance(visualStudioDteType);
var dte = (DTE?)Activator.CreateInstance(visualStudioDteType!);
return dte;
}
@@ -152,7 +158,7 @@ namespace GodotTools.OpenVisualStudio
}
}
private static DTE FindInstanceEditingSolution(string solutionPath)
private static DTE? FindInstanceEditingSolution(string solutionPath)
{
if (GetRunningObjectTable(0, out IRunningObjectTable pprot) != 0)
return null;
@@ -218,7 +224,7 @@ namespace GodotTools.OpenVisualStudio
// Class containing the IOleMessageFilter
// thread error-handling functions
private static IOleMessageFilter _oldFilter;
private static IOleMessageFilter? _oldFilter;
// Start the filter
public static void Register()
@@ -268,7 +274,7 @@ namespace GodotTools.OpenVisualStudio
// Implement the IOleMessageFilter interface
[DllImport("ole32.dll")]
private static extern int CoRegisterMessageFilter(IOleMessageFilter newFilter, out IOleMessageFilter oldFilter);
private static extern int CoRegisterMessageFilter(IOleMessageFilter? newFilter, out IOleMessageFilter? oldFilter);
}
[ComImport(), Guid("00000016-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]