Merge pull request #44135 from neikeq/godot-net-sdk-fixes-n-impr

Godot.NET.Sdk/3.2.4 - Fix targeting .NETFramework with .NET 5

modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj

@@ -6,8 +6,8 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>Godot.NET.Sdk</PackageId>
-    <Version>3.2.3</Version>
+    <Version>3.2.4</Version>
-    <PackageVersion>3.2.3</PackageVersion>
+    <PackageVersion>3.2.4</PackageVersion>
     <PackageProjectUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk</PackageProjectUrl>
     <PackageType>MSBuildSdk</PackageType>
     <PackageTags>MSBuildSdk</PackageTags>

modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props

@@ -2,8 +2,6 @@
   <PropertyGroup>
     <!-- Determines if we should import Microsoft.NET.Sdk, if it wasn't already imported. -->
     <GodotSdkImportsMicrosoftNetSdk Condition=" '$(UsingMicrosoftNETSdk)' != 'true' ">true</GodotSdkImportsMicrosoftNetSdk>
-
-    <GodotProjectTypeGuid>{8F3E2DF0-C35C-4265-82FC-BEA011F4A7ED}</GodotProjectTypeGuid>
   </PropertyGroup>
 
   <PropertyGroup>

modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets

@@ -1,11 +1,6 @@
 <Project>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" Condition=" '$(GodotSdkImportsMicrosoftNetSdk)' == 'true' " />
 
-  <PropertyGroup>
-    <EnableGodotProjectTypeGuid Condition=" '$(EnableGodotProjectTypeGuid)' == '' ">true</EnableGodotProjectTypeGuid>
-    <ProjectTypeGuids Condition=" '$(EnableGodotProjectTypeGuid)' == 'true' ">$(GodotProjectTypeGuid);$(DefaultProjectTypeGuid)</ProjectTypeGuids>
-  </PropertyGroup>
-
   <PropertyGroup>
     <!--
     Define constant to determine whether the real_t type in Godot is double precision or not.
@@ -16,7 +11,7 @@
   </PropertyGroup>
 
   <!-- Backported from newer Microsoft.NET.Sdk version -->
-  <Target Name="IncludeTargetingPackReference" BeforeTargets="_GetRestoreSettingsPerFramework;_CheckForInvalidConfigurationAndPlatform"
+  <Target Name="GodotIncludeTargetingPackReference" BeforeTargets="_GetRestoreSettingsPerFramework;_CheckForInvalidConfigurationAndPlatform"
           Condition=" '$(GodotUseNETFrameworkRefAssemblies)' == 'true' and '$(TargetFrameworkMoniker)' != '' and '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(AutomaticallyUseReferenceAssemblyPackages)' == 'true' ">
     <GetReferenceAssemblyPaths
         TargetFrameworkMoniker="$(TargetFrameworkMoniker)"

modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj

@@ -7,6 +7,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.Build" />
     <PackageReference Include="Microsoft.Build" Version="16.5.0" />
+    <PackageReference Include="semver" Version="2.0.6" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3.0" ExcludeAssets="runtime" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>

modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs

@@ -8,9 +8,8 @@ namespace GodotTools.ProjectEditor
 {
     public static class ProjectGenerator
     {
-        public const string GodotSdkVersionToUse = "3.2.3";
+        public const string GodotSdkVersionToUse = "3.2.4";
-
+        public const string GodotSdkNameToUse = "Godot.NET.Sdk";
-        public static string GodotSdkAttrValue => $"Godot.NET.Sdk/{GodotSdkVersionToUse}";
 
         public static ProjectRootElement GenGameProject(string name)
         {
@@ -19,7 +18,7 @@ namespace GodotTools.ProjectEditor
 
             var root = ProjectRootElement.Create(NewProjectFileOptions.None);
 
-            root.Sdk = GodotSdkAttrValue;
+            root.Sdk = $"{GodotSdkNameToUse}/{GodotSdkVersionToUse}";
 
             var mainGroup = root.AddPropertyGroup();
             mainGroup.AddProperty("TargetFramework", "net472");

modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs

@@ -4,11 +4,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Linq;
 using JetBrains.Annotations;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Globbing;
+using Semver;
 
 namespace GodotTools.ProjectEditor
 {
@@ -189,7 +191,7 @@ namespace GodotTools.ProjectEditor
                         continue;
 
 
-                    string normalizedRemove= item.Remove.NormalizePath();
+                    string normalizedRemove = item.Remove.NormalizePath();
 
                     var glob = MSBuildGlob.Parse(normalizedRemove);
 
@@ -233,7 +235,7 @@ namespace GodotTools.ProjectEditor
             if (!string.IsNullOrEmpty(root.Sdk))
                 return;
 
-            root.Sdk = ProjectGenerator.GodotSdkAttrValue;
+            root.Sdk = $"{ProjectGenerator.GodotSdkNameToUse}/{ProjectGenerator.GodotSdkVersionToUse}";
 
             root.ToolsVersion = null;
             root.DefaultTargets = null;
@@ -408,12 +410,33 @@ namespace GodotTools.ProjectEditor
 
         public static void EnsureGodotSdkIsUpToDate(MSBuildProject project)
         {
-            var root = project.Root;
+            string godotSdkAttrValue = $"{ProjectGenerator.GodotSdkNameToUse}/{ProjectGenerator.GodotSdkVersionToUse}";
-            string godotSdkAttrValue = ProjectGenerator.GodotSdkAttrValue;
 
-            if (!string.IsNullOrEmpty(root.Sdk) && root.Sdk.Trim().Equals(godotSdkAttrValue, StringComparison.OrdinalIgnoreCase))
+            var root = project.Root;
+            string rootSdk = root.Sdk?.Trim();
+
+            if (!string.IsNullOrEmpty(rootSdk))
+            {
+                // Check if the version is already the same.
+                if (rootSdk.Equals(godotSdkAttrValue, StringComparison.OrdinalIgnoreCase))
                     return;
 
+                // We also allow higher versions as long as the major and minor are the same.
+                var semVerToUse = SemVersion.Parse(ProjectGenerator.GodotSdkVersionToUse);
+                var godotSdkAttrLaxValueRegex = new Regex($@"^{ProjectGenerator.GodotSdkNameToUse}/(?<ver>.*)$");
+
+                var match = godotSdkAttrLaxValueRegex.Match(rootSdk);
+
+                if (match.Success &&
+                    SemVersion.TryParse(match.Groups["ver"].Value, out var semVerDetected) &&
+                    semVerDetected.Major == semVerToUse.Major &&
+                    semVerDetected.Minor == semVerToUse.Minor &&
+                    semVerDetected > semVerToUse)
+                {
+                    return;
+                }
+            }
+
             root.Sdk = godotSdkAttrValue;
             project.HasUnsavedChanges = true;
         }