C#: Upgrade TFM for net472 and some netstandard2.0 projects

godotengine · Jan 6, 2024 · 7a06390 · 7a06390
1 parent 13a0d6e
commit 7a06390
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <ProjectGuid>{6CE9A984-37B1-4F8A-8FE9-609F05F071B3}</ProjectGuid>
- <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>7.2</LangVersion>
+ <TargetFramework>net6.0</TargetFramework>
+ <LangVersion>10</LangVersion>
  </PropertyGroup>
  <ItemGroup>
  <PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" ExcludeAssets="runtime" />

diff --git a/...les/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/GodotTools.IdeMessaging.CLI.csproj b/...les/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/GodotTools.IdeMessaging.CLI.csproj
@@ -2,12 +2,9 @@
  <PropertyGroup>
  <ProjectGuid>{B06C2951-C8E3-4F28-80B2-717CF327EB19}</ProjectGuid>
  <OutputType>Exe</OutputType>
- <TargetFramework>net472</TargetFramework>
- <LangVersion>7.2</LangVersion>
+ <TargetFramework>net6.0</TargetFramework>
+ <LangVersion>10</LangVersion>
  </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\GodotTools.IdeMessaging\GodotTools.IdeMessaging.csproj" />
  </ItemGroup>

diff --git a/...les/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj b/...les/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj
@@ -1,12 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <ProjectGuid>{EAFFF236-FA96-4A4D-BD23-0E51EF988277}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <TargetFramework>net472</TargetFramework>
- <LangVersion>7.2</LangVersion>
- </PropertyGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
- <PackageReference Include="EnvDTE" Version="8.0.2" />
- </ItemGroup>
+ <PropertyGroup>
+ <ProjectGuid>{EAFFF236-FA96-4A4D-BD23-0E51EF988277}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>net6.0-windows</TargetFramework>
+ <LangVersion>10</LangVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="Exists('$(SolutionDir)/../../../../bin/GodotSharp/Api/Debug/GodotSharp.dll') And ('$(GodotPlatform)' == 'windows' Or ('$(GodotPlatform)' == '' And '$(OS)' == 'Windows_NT'))">
+ <OutputPath>$(SolutionDir)/../../../../bin/GodotSharp/Tools</OutputPath>
+ <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
+ </PropertyGroup>
+ <ItemGroup>
+ <PackageReference Include="EnvDTE" Version="17.8.37221" />
+ </ItemGroup>
 </Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs
@@ -129,7 +129,7 @@ private static int Main(string[] args)
  {
  var mainWindow = dte.MainWindow;
  mainWindow.Activate();
- SetForegroundWindow(new IntPtr(mainWindow.HWnd));
+ SetForegroundWindow(mainWindow.HWnd);
 
  MessageFilter.Revoke();
  }

diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj b/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj
@@ -49,7 +49,5 @@
  <ProjectReference Include="..\GodotTools.IdeMessaging\GodotTools.IdeMessaging.csproj" />
  <ProjectReference Include="..\GodotTools.ProjectEditor\GodotTools.ProjectEditor.csproj" />
  <ProjectReference Include="..\GodotTools.Core\GodotTools.Core.csproj" />
- <!-- Include it if this is an SCons build targeting Windows, or if it's not an SCons build but we're on Windows -->
- <ProjectReference Include="..\GodotTools.OpenVisualStudio\GodotTools.OpenVisualStudio.csproj" Condition=" '$(GodotPlatform)' == 'windows' Or ( '$(GodotPlatform)' == '' And '$(OS)' == 'Windows_NT' ) " />
  </ItemGroup>
 </Project>