Skip to content

Commit 2eb0a05

Browse files
authored
Updated dependencies and added VS22 compatibility (#22)
* Dependencies updated to support VS22. * Close throws exception if not running on main thread. Roslyn dependency set. * Updated Visual Studio version to 2022 in README.md * Updated dependencies. May break previous VS19 builds. Works on VS22 17.0.4. * Updated dependencies, working properly with VS22, NOT WORKING WITH VS19, VISIT 1.X BRANCH TO WORK WITH VS19. * Requirements updated in README.md * Version updated to 2.0.0 * Reverted commit 35f18ad. Changed back Test project dependencies.
1 parent a23d19e commit 2eb0a05

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

GodotAddinVS/GodotAddinVS.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
<PackageReference Include="Clide" Version="4.1.1" ExcludeAssets="runtime" />
7979
<PackageReference Include="Clide.Windows" Version="4.1.1" ExcludeAssets="runtime" />
8080
<PackageReference Include="GodotTools.IdeMessaging" Version="1.1.1" />
81-
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.205" ExcludeAssets="runtime">
81+
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime">
8282
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8383
</PackageReference>
84-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.5.2044">
84+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5234">
8585
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8686
<PrivateAssets>all</PrivateAssets>
8787
</PackageReference>
@@ -119,4 +119,4 @@
119119
</Target>
120120
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
121121
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
122-
</Project>
122+
</Project>

GodotAddinVS/GodotMessaging/MessageHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected override async Task<Response> HandleOpenFile(OpenFileRequest request)
4444

4545
var mainWindow = dte.MainWindow;
4646
mainWindow.Activate();
47-
SetForegroundWindow(new IntPtr(mainWindow.HWnd));
47+
SetForegroundWindow(mainWindow.HWnd);
4848

4949
return new OpenFileResponse {Status = MessageStatus.Ok};
5050
}

GodotAddinVS/GodotSolutionEventsListener.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ private void DebuggerEvents_OnEnterDesignMode(dbgEventReason reason)
148148

149149
private void Close()
150150
{
151+
ThreadHelper.ThrowIfNotOnUIThread();
151152
if (GodotMessagingClient != null)
152153
{
153154
ServiceContainer.RemoveService(typeof(Client));

GodotAddinVS/source.extension.vsixmanifest

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="GodotAddinVS" Version="1.1.1" Language="en-US" Publisher="Ignacio Roldán Etcheverry" />
4+
<Identity Id="GodotAddinVS" Version="2.0.0" Language="en-US" Publisher="Ignacio Roldán Etcheverry" />
55
<DisplayName>Godot Support</DisplayName>
66
<Description xml:space="preserve">Support for Godot Engine C# projects, including debugging and extended code completion.</Description>
77
<License>LICENSE.txt</License>
88
<Icon>icon.png</Icon>
99
<Tags>Godot</Tags>
1010
</Metadata>
1111
<Installation>
12-
<InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Community" />
12+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Community">
13+
<ProductArchitecture>x86</ProductArchitecture>
14+
</InstallationTarget>
15+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Pro">
16+
<ProductArchitecture>x86</ProductArchitecture>
17+
</InstallationTarget>
18+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
19+
<ProductArchitecture>x86</ProductArchitecture>
20+
</InstallationTarget>
21+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Community">
22+
<ProductArchitecture>amd64</ProductArchitecture>
23+
</InstallationTarget>
24+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Pro">
25+
<ProductArchitecture>amd64</ProductArchitecture>
26+
</InstallationTarget>
27+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
28+
<ProductArchitecture>amd64</ProductArchitecture>
29+
</InstallationTarget>
1330
</Installation>
1431
<Assets>
1532
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GodotCompletionProviders" Path="|GodotCompletionProviders|" />
@@ -30,6 +47,6 @@
3047
As such, this extension sadly requires Xamarin to be installed as well for now. It's a quite
3148
bulky dependency, so we should continue looking for possible alternatives to this.
3249
-->
33-
<Prerequisite Id="Component.Xamarin" Version="[16.6.30013.169,17.0)" DisplayName="Xamarin" />
50+
<Prerequisite Id="Component.Xamarin" Version="[16.0,)" DisplayName="Xamarin" />
3451
</Prerequisites>
3552
</PackageManifest>

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Visual Studio extension for the Godot game engine C# projects.
55
## Requirements
66

77
- **Godot 3.2.3** or greater. Older versions of Godot are not supported and do not work.
8-
- **Visual Studio 2019**. VS 2017 or earlier are not supported.
8+
- **Visual Studio 2022**. VS 2019 or earlier are not supported.
9+
- **Visit 1.x** branch to get the **Visual Studio 2019** supported version.
910

1011
## Features
1112

0 commit comments

Comments
 (0)