You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-09 12:50:35 +00:00
3.2 New csproj style with backport of Godot.NET.Sdk
This is a cherry-pick of
ced77b1e9b
with several 3.2 specific alterations.
There are a lot of build issues coming from
old style projects. At this point fixing every
single one of those would require adding patch
after patch to the project file, which is a
considerable amount work and makes the csproj
even more bloated than it already is.
As such I decided this effort would be better
spent back-porting the Sdk style support that's
already available in 4.0-dev to the 3.2 branch.
This will prevent many issues, but it will also
introduce other benefits, among them:
- While target framework stays as .NET Framework
v4.7.2, it can be changed to .NET Standard 2.0
or greater if desired.
- It makes it much easier to add future patches.
They are added to Godot.NET.Sdk and the only
change required in Godot code is to update the
Sdk version to use.
- Default Godot define constants are also
backported, which fixes IDE issues with the
preprocessor.
There are a few differences in the changes
applied during patching of the csproj compared
to 4.0 with the purpose of preventing breaking
builds:
- 'TargetFramework' stays net472 both for new
projects and when importing old ones. It can
be manually changed to netstandard 2.0+ if
desired though.
The following features are enabled by default for
new projects. Enabling them in imported projects
may result in errors that must be fixed manually:
- 'EnableDefaultCompileItems' is disabled as it
can result in undesired C# source files being
included. Existing include items are kept.
As long as 'EnableDefaultCompileItems' remains
disabled, Godot will continue taking care of
adding and removing C# files to the csproj.
- 'GenerateAssemblyInfo' is disabled as it
guarantees a build error because of conflicts
between the existing 'AssemblyInfo.cs' and the
auto-generated one.
- 'Deterministic' is disabled because it doesn't
like wildcards in the assembly version (1.0.*)
that was in the old 'AssemblyInfo.cs'.
Of importance:
This is a breaking change. A great effort was
put in avoiding build errors after upgrading a
project, but there may still be exceptions.
This also breaks forward compatibility. Projects
opened with Godot 3.2.3 won't work out of the box
with older Godot versions. This was already the
case with changes introduced in 3.2.2.
Albeit C# support in 3.2.x was still labeled as
alpha, we've been trying to treat it as stable
for some time. Still the amount of problems this
change solves justifies it, but no more changes
that break project compatibility are to be
introduced from now on (at least for 3.x).
This commit is contained in:
Ignacio Etcheverry
@@ -20,3 +20,7 @@ indent_size = 4
|
|||||||
[.travis.yml]
|
[.travis.yml]
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.{csproj,props,targets,nuspec}]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|||||||
16
modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln
Normal file
16
modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.NET.Sdk", "Godot.NET.Sdk\Godot.NET.Sdk.csproj", "{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<Project Sdk="Microsoft.Build.NoTargets/2.0.1">
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netstandard2.0</TargetFramework>
|
||||||
|
|
||||||
|
<Description>MSBuild .NET Sdk for Godot projects.</Description>
|
||||||
|
<Authors>Godot Engine contributors</Authors>
|
||||||
|
|
||||||
|
<PackageId>Godot.NET.Sdk</PackageId>
|
||||||
|
<Version>3.2.3</Version>
|
||||||
|
<PackageVersion>3.2.3</PackageVersion>
|
||||||
|
<PackageProjectUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk</PackageProjectUrl>
|
||||||
|
<PackageType>MSBuildSdk</PackageType>
|
||||||
|
<PackageTags>MSBuildSdk</PackageTags>
|
||||||
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<NuspecFile>Godot.NET.Sdk.nuspec</NuspecFile>
|
||||||
|
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuSpecProperties</GenerateNuspecDependsOn>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Target Name="SetNuSpecProperties" Condition=" Exists('$(NuspecFile)') ">
|
||||||
|
<PropertyGroup>
|
||||||
|
<NuspecProperties>
|
||||||
|
id=$(PackageId);
|
||||||
|
description=$(Description);
|
||||||
|
authors=$(Authors);
|
||||||
|
version=$(PackageVersion);
|
||||||
|
packagetype=$(PackageType);
|
||||||
|
tags=$(PackageTags);
|
||||||
|
projecturl=$(PackageProjectUrl)
|
||||||
|
</NuspecProperties>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Target>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
|
||||||
|
<metadata>
|
||||||
|
<id>$id$</id>
|
||||||
|
<version>$version$</version>
|
||||||
|
<description>$description$</description>
|
||||||
|
<authors>$authors$</authors>
|
||||||
|
<owners>$authors$</owners>
|
||||||
|
<projectUrl>$projecturl$</projectUrl>
|
||||||
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
|
<license type="expression">MIT</license>
|
||||||
|
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
|
||||||
|
<tags>$tags$</tags>
|
||||||
|
<packageTypes>
|
||||||
|
<packageType name="$packagetype$" />
|
||||||
|
</packageTypes>
|
||||||
|
<repository url="$projecturl$" />
|
||||||
|
</metadata>
|
||||||
|
<files>
|
||||||
|
<file src="Sdk\**" target="Sdk" />\
|
||||||
|
</files>
|
||||||
|
</package>
|
||||||
119
modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
Normal file
119
modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
<Project>
|
||||||
|
<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>
|
||||||
|
<Configurations>Debug;ExportDebug;ExportRelease</Configurations>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
|
||||||
|
<GodotProjectDir Condition=" '$(SolutionDir)' != '' ">$(SolutionDir)</GodotProjectDir>
|
||||||
|
<GodotProjectDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildProjectDirectory)</GodotProjectDir>
|
||||||
|
<GodotProjectDir>$([MSBuild]::EnsureTrailingSlash('$(GodotProjectDir)'))</GodotProjectDir>
|
||||||
|
|
||||||
|
<!-- Custom output paths for Godot projects. In brief, 'bin\' and 'obj\' are moved to '$(GodotProjectDir)\.mono\temp\'. -->
|
||||||
|
<BaseOutputPath>$(GodotProjectDir).mono\temp\bin\</BaseOutputPath>
|
||||||
|
<OutputPath>$(GodotProjectDir).mono\temp\bin\$(Configuration)\</OutputPath>
|
||||||
|
<!--
|
||||||
|
Use custom IntermediateOutputPath and BaseIntermediateOutputPath only if it wasn't already set.
|
||||||
|
Otherwise the old values may have already been changed by MSBuild which can cause problems with NuGet.
|
||||||
|
-->
|
||||||
|
<IntermediateOutputPath Condition=" '$(IntermediateOutputPath)' == '' ">$(GodotProjectDir).mono\temp\obj\$(Configuration)\</IntermediateOutputPath>
|
||||||
|
<BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">$(GodotProjectDir).mono\temp\obj\</BaseIntermediateOutputPath>
|
||||||
|
|
||||||
|
<!-- Do not append the target framework name to the output path. -->
|
||||||
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" Condition=" '$(GodotSdkImportsMicrosoftNetSdk)' == 'true' " />
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
The Microsoft.NET.Sdk only understands of the Debug and Release configurations.
|
||||||
|
We need to set the following properties manually for ExportDebug and ExportRelease.
|
||||||
|
-->
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' or '$(Configuration)' == 'ExportDebug' ">
|
||||||
|
<DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
|
||||||
|
<Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'ExportRelease' ">
|
||||||
|
<Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<GodotApiConfiguration Condition=" '$(Configuration)' != 'ExportRelease' ">Debug</GodotApiConfiguration>
|
||||||
|
<GodotApiConfiguration Condition=" '$(Configuration)' == 'ExportRelease' ">Release</GodotApiConfiguration>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- Auto-detect the target Godot platform if it was not specified. -->
|
||||||
|
<PropertyGroup Condition=" '$(GodotTargetPlatform)' == '' ">
|
||||||
|
<GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(Linux))' ">x11</GodotTargetPlatform>
|
||||||
|
<GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(FreeBSD))' ">x11</GodotTargetPlatform>
|
||||||
|
<GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(OSX))' ">osx</GodotTargetPlatform>
|
||||||
|
<GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(Windows))' ">windows</GodotTargetPlatform>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<GodotRealTIsDouble Condition=" '$(GodotRealTIsDouble)' == '' ">false</GodotRealTIsDouble>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- Godot DefineConstants. -->
|
||||||
|
<PropertyGroup>
|
||||||
|
<!-- Define constant to identify Godot builds. -->
|
||||||
|
<GodotDefineConstants>GODOT</GodotDefineConstants>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Define constant to determine the target Godot platform. This includes the
|
||||||
|
recognized platform names and the platform category (PC, MOBILE or WEB).
|
||||||
|
-->
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'windows' ">GODOT_WINDOWS;GODOT_PC</GodotPlatformConstants>
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'x11' ">GODOT_X11;GODOT_PC</GodotPlatformConstants>
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'osx' ">GODOT_OSX;GODOT_MACOS;GODOT_PC</GodotPlatformConstants>
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'server' ">GODOT_SERVER;GODOT_PC</GodotPlatformConstants>
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'uwp' ">GODOT_UWP;GODOT_PC</GodotPlatformConstants>
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'haiku' ">GODOT_HAIKU;GODOT_PC</GodotPlatformConstants>
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'android' ">GODOT_ANDROID;GODOT_MOBILE</GodotPlatformConstants>
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'iphone' ">GODOT_IPHONE;GODOT_IOS;GODOT_MOBILE</GodotPlatformConstants>
|
||||||
|
<GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'javascript' ">GODOT_JAVASCRIPT;GODOT_HTML5;GODOT_WASM;GODOT_WEB</GodotPlatformConstants>
|
||||||
|
|
||||||
|
<GodotDefineConstants>$(GodotDefineConstants);$(GodotPlatformConstants)</GodotDefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<!-- ExportDebug also defines DEBUG like Debug does. -->
|
||||||
|
<DefineConstants Condition=" '$(Configuration)' == 'ExportDebug' ">$(DefineConstants);DEBUG</DefineConstants>
|
||||||
|
<!-- Debug defines TOOLS to differenciate between Debug and ExportDebug configurations. -->
|
||||||
|
<DefineConstants Condition=" '$(Configuration)' == 'Debug' ">$(DefineConstants);TOOLS</DefineConstants>
|
||||||
|
|
||||||
|
<DefineConstants>$(GodotDefineConstants);$(DefineConstants)</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<!--
|
||||||
|
TODO:
|
||||||
|
We should consider a nuget package for reference assemblies. This is difficult because the
|
||||||
|
Godot scripting API is continuaslly breaking backwards compatibility even in patch releases.
|
||||||
|
-->
|
||||||
|
<Reference Include="GodotSharp">
|
||||||
|
<Private>false</Private>
|
||||||
|
<HintPath>$(GodotProjectDir).mono\assemblies\$(GodotApiConfiguration)\GodotSharp.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="GodotSharpEditor" Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
|
<Private>false</Private>
|
||||||
|
<HintPath>$(GodotProjectDir).mono\assemblies\$(GodotApiConfiguration)\GodotSharpEditor.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition=" '$(AutomaticallyUseReferenceAssemblyPackages)' == '' and '$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)' == '' ">
|
||||||
|
<!-- Old 'Microsoft.NET.Sdk' so we reference the 'Microsoft.NETFramework.ReferenceAssemblies' package ourselves. -->
|
||||||
|
<AutomaticallyUseReferenceAssemblyPackages>true</AutomaticallyUseReferenceAssemblyPackages>
|
||||||
|
<MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion>1.0.0</MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion>
|
||||||
|
<GodotUseNETFrameworkRefAssemblies>true</GodotUseNETFrameworkRefAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<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.
|
||||||
|
By default this is false, like the official Godot builds. If someone is using a custom
|
||||||
|
Godot build where real_t is double, they can override the GodotRealTIsDouble property.
|
||||||
|
-->
|
||||||
|
<DefineConstants Condition=" '$(GodotRealTIsDouble)' == 'true' ">GODOT_REAL_T_IS_DOUBLE;$(DefineConstants)</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!-- Backported from newer Microsoft.NET.Sdk version -->
|
||||||
|
<Target Name="IncludeTargetingPackReference" BeforeTargets="_GetRestoreSettingsPerFramework;_CheckForInvalidConfigurationAndPlatform"
|
||||||
|
Condition=" '$(GodotUseNETFrameworkRefAssemblies)' == 'true' and '$(TargetFrameworkMoniker)' != '' and '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(AutomaticallyUseReferenceAssemblyPackages)' == 'true' ">
|
||||||
|
<GetReferenceAssemblyPaths
|
||||||
|
TargetFrameworkMoniker="$(TargetFrameworkMoniker)"
|
||||||
|
RootPath="$(TargetFrameworkRootPath)"
|
||||||
|
TargetFrameworkFallbackSearchPaths="$(TargetFrameworkFallbackSearchPaths)"
|
||||||
|
BypassFrameworkInstallChecks="$(BypassFrameworkInstallChecks)"
|
||||||
|
SuppressNotFoundError="true">
|
||||||
|
<Output TaskParameter="FullFrameworkReferenceAssemblyPaths" PropertyName="_FullFrameworkReferenceAssemblyPaths"/>
|
||||||
|
</GetReferenceAssemblyPaths>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)" IsImplicitlyDefined="true" Condition="'$(_FullFrameworkReferenceAssemblyPaths)' == ''"/>
|
||||||
|
</ItemGroup>
|
||||||
|
</Target>
|
||||||
|
</Project>
|
||||||
@@ -19,7 +19,10 @@ namespace GodotTools.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (attempt > maxAttempts + 1)
|
if (attempt > maxAttempts + 1)
|
||||||
return;
|
{
|
||||||
|
// Overwrite the oldest one
|
||||||
|
backupPath = backupPathBase;
|
||||||
|
}
|
||||||
|
|
||||||
File.Copy(filePath, backupPath, overwrite: true);
|
File.Copy(filePath, backupPath, overwrite: true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.Build" />
|
<Reference Include="Microsoft.Build" />
|
||||||
<PackageReference Include="Microsoft.Build" Version="16.5.0" />
|
<PackageReference Include="Microsoft.Build" Version="16.5.0" />
|
||||||
|
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3.0" ExcludeAssets="runtime" PrivateAssets="all" />
|
||||||
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
|
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -22,6 +22,37 @@ namespace GodotTools.ProjectEditor
|
|||||||
return string.Join(".", identifiers);
|
return string.Join(".", identifiers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Skips invalid identifier characters including decimal digit numbers at the start of the identifier.
|
||||||
|
/// </summary>
|
||||||
|
private static void SkipInvalidCharacters(string source, int startIndex, StringBuilder outputBuilder)
|
||||||
|
{
|
||||||
|
for (int i = startIndex; i < source.Length; i++)
|
||||||
|
{
|
||||||
|
char @char = source[i];
|
||||||
|
|
||||||
|
switch (char.GetUnicodeCategory(@char))
|
||||||
|
{
|
||||||
|
case UnicodeCategory.UppercaseLetter:
|
||||||
|
case UnicodeCategory.LowercaseLetter:
|
||||||
|
case UnicodeCategory.TitlecaseLetter:
|
||||||
|
case UnicodeCategory.ModifierLetter:
|
||||||
|
case UnicodeCategory.LetterNumber:
|
||||||
|
case UnicodeCategory.OtherLetter:
|
||||||
|
outputBuilder.Append(@char);
|
||||||
|
break;
|
||||||
|
case UnicodeCategory.NonSpacingMark:
|
||||||
|
case UnicodeCategory.SpacingCombiningMark:
|
||||||
|
case UnicodeCategory.ConnectorPunctuation:
|
||||||
|
case UnicodeCategory.DecimalDigitNumber:
|
||||||
|
// Identifiers may start with underscore
|
||||||
|
if (outputBuilder.Length > startIndex || @char == '_')
|
||||||
|
outputBuilder.Append(@char);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static string SanitizeIdentifier(string identifier, bool allowEmpty)
|
public static string SanitizeIdentifier(string identifier, bool allowEmpty)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(identifier))
|
if (string.IsNullOrEmpty(identifier))
|
||||||
@@ -44,30 +75,7 @@ namespace GodotTools.ProjectEditor
|
|||||||
startIndex += 1;
|
startIndex += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = startIndex; i < identifier.Length; i++)
|
SkipInvalidCharacters(identifier, startIndex, identifierBuilder);
|
||||||
{
|
|
||||||
char @char = identifier[i];
|
|
||||||
|
|
||||||
switch (Char.GetUnicodeCategory(@char))
|
|
||||||
{
|
|
||||||
case UnicodeCategory.UppercaseLetter:
|
|
||||||
case UnicodeCategory.LowercaseLetter:
|
|
||||||
case UnicodeCategory.TitlecaseLetter:
|
|
||||||
case UnicodeCategory.ModifierLetter:
|
|
||||||
case UnicodeCategory.LetterNumber:
|
|
||||||
case UnicodeCategory.OtherLetter:
|
|
||||||
identifierBuilder.Append(@char);
|
|
||||||
break;
|
|
||||||
case UnicodeCategory.NonSpacingMark:
|
|
||||||
case UnicodeCategory.SpacingCombiningMark:
|
|
||||||
case UnicodeCategory.ConnectorPunctuation:
|
|
||||||
case UnicodeCategory.DecimalDigitNumber:
|
|
||||||
// Identifiers may start with underscore
|
|
||||||
if (identifierBuilder.Length > startIndex || @char == '_')
|
|
||||||
identifierBuilder.Append(@char);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (identifierBuilder.Length == startIndex)
|
if (identifierBuilder.Length == startIndex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ using GodotTools.Core;
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
using Microsoft.Build.Construction;
|
using Microsoft.Build.Construction;
|
||||||
using Microsoft.Build.Globbing;
|
using Microsoft.Build.Globbing;
|
||||||
|
|
||||||
@@ -32,6 +33,7 @@ namespace GodotTools.ProjectEditor
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ProjectItemElement FindItemOrNullAbs(this ProjectRootElement root, string itemType, string include, bool noCondition = false)
|
public static ProjectItemElement FindItemOrNullAbs(this ProjectRootElement root, string itemType, string include, bool noCondition = false)
|
||||||
{
|
{
|
||||||
string normalizedInclude = Path.GetFullPath(include).NormalizePath();
|
string normalizedInclude = Path.GetFullPath(include).NormalizePath();
|
||||||
@@ -113,5 +115,19 @@ namespace GodotTools.ProjectEditor
|
|||||||
|
|
||||||
return Guid.Empty;
|
return Guid.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static bool AreDefaultCompileItemsEnabled(this ProjectRootElement root)
|
||||||
|
{
|
||||||
|
var enableDefaultCompileItemsProps = root.PropertyGroups
|
||||||
|
.Where(g => string.IsNullOrEmpty(g.Condition))
|
||||||
|
.SelectMany(g => g.Properties
|
||||||
|
.Where(p => p.Name == "EnableDefaultCompileItems" && string.IsNullOrEmpty(p.Condition)));
|
||||||
|
|
||||||
|
bool enableDefaultCompileItems = true;
|
||||||
|
foreach (var prop in enableDefaultCompileItemsProps)
|
||||||
|
enableDefaultCompileItems = prop.Value.Equals("true", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
return enableDefaultCompileItems;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,174 +1,49 @@
|
|||||||
using GodotTools.Core;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Reflection;
|
|
||||||
using Microsoft.Build.Construction;
|
using Microsoft.Build.Construction;
|
||||||
|
using Microsoft.Build.Evaluation;
|
||||||
|
|
||||||
namespace GodotTools.ProjectEditor
|
namespace GodotTools.ProjectEditor
|
||||||
{
|
{
|
||||||
public static class ProjectGenerator
|
public static class ProjectGenerator
|
||||||
{
|
{
|
||||||
private const string CoreApiProjectName = "GodotSharp";
|
public const string GodotSdkVersionToUse = "3.2.3";
|
||||||
private const string EditorApiProjectName = "GodotSharpEditor";
|
|
||||||
|
|
||||||
public const string CSharpProjectTypeGuid = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}";
|
public static string GodotSdkAttrValue => $"Godot.NET.Sdk/{GodotSdkVersionToUse}";
|
||||||
public const string GodotProjectTypeGuid = "{8F3E2DF0-C35C-4265-82FC-BEA011F4A7ED}";
|
|
||||||
|
|
||||||
public static readonly string GodotDefaultProjectTypeGuids = $"{GodotProjectTypeGuid};{CSharpProjectTypeGuid}";
|
public static ProjectRootElement GenGameProject(string name)
|
||||||
|
|
||||||
public static string GenGameProject(string dir, string name, IEnumerable<string> compileItems)
|
|
||||||
{
|
{
|
||||||
string path = Path.Combine(dir, name + ".csproj");
|
if (name.Length == 0)
|
||||||
|
throw new ArgumentException("Project name is empty", nameof(name));
|
||||||
|
|
||||||
ProjectPropertyGroupElement mainGroup;
|
var root = ProjectRootElement.Create(NewProjectFileOptions.None);
|
||||||
var root = CreateLibraryProject(name, "Debug", out mainGroup);
|
|
||||||
|
|
||||||
mainGroup.SetProperty("ProjectTypeGuids", GodotDefaultProjectTypeGuids);
|
root.Sdk = GodotSdkAttrValue;
|
||||||
mainGroup.SetProperty("OutputPath", Path.Combine(".mono", "temp", "bin", "$(Configuration)"));
|
|
||||||
mainGroup.SetProperty("BaseIntermediateOutputPath", Path.Combine(".mono", "temp", "obj"));
|
|
||||||
mainGroup.SetProperty("IntermediateOutputPath", Path.Combine("$(BaseIntermediateOutputPath)", "$(Configuration)"));
|
|
||||||
mainGroup.SetProperty("ApiConfiguration", "Debug").Condition = " '$(Configuration)' != 'ExportRelease' ";
|
|
||||||
mainGroup.SetProperty("ApiConfiguration", "Release").Condition = " '$(Configuration)' == 'ExportRelease' ";
|
|
||||||
|
|
||||||
var debugGroup = root.AddPropertyGroup();
|
var mainGroup = root.AddPropertyGroup();
|
||||||
debugGroup.Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ";
|
mainGroup.AddProperty("TargetFramework", "net472");
|
||||||
debugGroup.AddProperty("DebugSymbols", "true");
|
|
||||||
debugGroup.AddProperty("DebugType", "portable");
|
|
||||||
debugGroup.AddProperty("Optimize", "false");
|
|
||||||
debugGroup.AddProperty("DefineConstants", "$(GodotDefineConstants);GODOT;DEBUG;TOOLS;");
|
|
||||||
debugGroup.AddProperty("ErrorReport", "prompt");
|
|
||||||
debugGroup.AddProperty("WarningLevel", "4");
|
|
||||||
debugGroup.AddProperty("ConsolePause", "false");
|
|
||||||
|
|
||||||
var coreApiRef = root.AddItem("Reference", CoreApiProjectName);
|
string sanitizedName = IdentifierUtils.SanitizeQualifiedIdentifier(name, allowEmptyIdentifiers: true);
|
||||||
coreApiRef.AddMetadata("HintPath", Path.Combine("$(ProjectDir)", ".mono", "assemblies", "$(ApiConfiguration)", CoreApiProjectName + ".dll"));
|
|
||||||
coreApiRef.AddMetadata("Private", "False");
|
|
||||||
|
|
||||||
var editorApiRef = root.AddItem("Reference", EditorApiProjectName);
|
// If the name is not a valid namespace, manually set RootNamespace to a sanitized one.
|
||||||
editorApiRef.Condition = " '$(Configuration)' == 'Debug' ";
|
if (sanitizedName != name)
|
||||||
editorApiRef.AddMetadata("HintPath", Path.Combine("$(ProjectDir)", ".mono", "assemblies", "$(ApiConfiguration)", EditorApiProjectName + ".dll"));
|
mainGroup.AddProperty("RootNamespace", sanitizedName);
|
||||||
editorApiRef.AddMetadata("Private", "False");
|
|
||||||
|
|
||||||
GenAssemblyInfoFile(root, dir, name);
|
|
||||||
|
|
||||||
foreach (var item in compileItems)
|
|
||||||
{
|
|
||||||
root.AddItem("Compile", item.RelativeToPath(dir).Replace("/", "\\"));
|
|
||||||
}
|
|
||||||
|
|
||||||
root.Save(path);
|
|
||||||
|
|
||||||
return root.GetGuid().ToString().ToUpper();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void GenAssemblyInfoFile(ProjectRootElement root, string dir, string name, string[] assemblyLines = null, string[] usingDirectives = null)
|
|
||||||
{
|
|
||||||
string propertiesDir = Path.Combine(dir, "Properties");
|
|
||||||
if (!Directory.Exists(propertiesDir))
|
|
||||||
Directory.CreateDirectory(propertiesDir);
|
|
||||||
|
|
||||||
string usingDirectivesText = string.Empty;
|
|
||||||
|
|
||||||
if (usingDirectives != null)
|
|
||||||
{
|
|
||||||
foreach (var usingDirective in usingDirectives)
|
|
||||||
usingDirectivesText += "\nusing " + usingDirective + ";";
|
|
||||||
}
|
|
||||||
|
|
||||||
string assemblyLinesText = string.Empty;
|
|
||||||
|
|
||||||
if (assemblyLines != null)
|
|
||||||
assemblyLinesText += string.Join("\n", assemblyLines) + "\n";
|
|
||||||
|
|
||||||
string content = string.Format(AssemblyInfoTemplate, usingDirectivesText, name, assemblyLinesText);
|
|
||||||
|
|
||||||
string assemblyInfoFile = Path.Combine(propertiesDir, "AssemblyInfo.cs");
|
|
||||||
|
|
||||||
File.WriteAllText(assemblyInfoFile, content);
|
|
||||||
|
|
||||||
root.AddItem("Compile", assemblyInfoFile.RelativeToPath(dir).Replace("/", "\\"));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ProjectRootElement CreateLibraryProject(string name, string defaultConfig, out ProjectPropertyGroupElement mainGroup)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(name))
|
|
||||||
throw new ArgumentException($"{nameof(name)} cannot be empty", nameof(name));
|
|
||||||
|
|
||||||
var root = ProjectRootElement.Create();
|
|
||||||
root.DefaultTargets = "Build";
|
|
||||||
|
|
||||||
mainGroup = root.AddPropertyGroup();
|
|
||||||
mainGroup.AddProperty("Configuration", defaultConfig).Condition = " '$(Configuration)' == '' ";
|
|
||||||
mainGroup.AddProperty("Platform", "AnyCPU").Condition = " '$(Platform)' == '' ";
|
|
||||||
mainGroup.AddProperty("ProjectGuid", "{" + Guid.NewGuid().ToString().ToUpper() + "}");
|
|
||||||
mainGroup.AddProperty("OutputType", "Library");
|
|
||||||
mainGroup.AddProperty("OutputPath", Path.Combine("bin", "$(Configuration)"));
|
|
||||||
mainGroup.AddProperty("RootNamespace", IdentifierUtils.SanitizeQualifiedIdentifier(name, allowEmptyIdentifiers: true));
|
|
||||||
mainGroup.AddProperty("AssemblyName", name);
|
|
||||||
mainGroup.AddProperty("TargetFrameworkVersion", "v4.7");
|
|
||||||
mainGroup.AddProperty("GodotProjectGeneratorVersion", Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
|
||||||
|
|
||||||
var exportDebugGroup = root.AddPropertyGroup();
|
|
||||||
exportDebugGroup.Condition = " '$(Configuration)|$(Platform)' == 'ExportDebug|AnyCPU' ";
|
|
||||||
exportDebugGroup.AddProperty("DebugSymbols", "true");
|
|
||||||
exportDebugGroup.AddProperty("DebugType", "portable");
|
|
||||||
exportDebugGroup.AddProperty("Optimize", "false");
|
|
||||||
exportDebugGroup.AddProperty("DefineConstants", "$(GodotDefineConstants);GODOT;DEBUG;");
|
|
||||||
exportDebugGroup.AddProperty("ErrorReport", "prompt");
|
|
||||||
exportDebugGroup.AddProperty("WarningLevel", "4");
|
|
||||||
exportDebugGroup.AddProperty("ConsolePause", "false");
|
|
||||||
|
|
||||||
var exportReleaseGroup = root.AddPropertyGroup();
|
|
||||||
exportReleaseGroup.Condition = " '$(Configuration)|$(Platform)' == 'ExportRelease|AnyCPU' ";
|
|
||||||
exportReleaseGroup.AddProperty("DebugType", "portable");
|
|
||||||
exportReleaseGroup.AddProperty("Optimize", "true");
|
|
||||||
exportReleaseGroup.AddProperty("DefineConstants", "$(GodotDefineConstants);GODOT;");
|
|
||||||
exportReleaseGroup.AddProperty("ErrorReport", "prompt");
|
|
||||||
exportReleaseGroup.AddProperty("WarningLevel", "4");
|
|
||||||
exportReleaseGroup.AddProperty("ConsolePause", "false");
|
|
||||||
|
|
||||||
// References
|
|
||||||
var referenceGroup = root.AddItemGroup();
|
|
||||||
referenceGroup.AddItem("Reference", "System");
|
|
||||||
var frameworkRefAssembliesItem = referenceGroup.AddItem("PackageReference", "Microsoft.NETFramework.ReferenceAssemblies");
|
|
||||||
|
|
||||||
// Use metadata (child nodes) instead of attributes for the PackageReference.
|
|
||||||
// This is for compatibility with 3.2, where GodotTools uses an old Microsoft.Build.
|
|
||||||
frameworkRefAssembliesItem.AddMetadata("Version", "1.0.0");
|
|
||||||
frameworkRefAssembliesItem.AddMetadata("PrivateAssets", "All");
|
|
||||||
|
|
||||||
root.AddImport(Path.Combine("$(MSBuildBinPath)", "Microsoft.CSharp.targets").Replace("/", "\\"));
|
|
||||||
|
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
|
|
||||||
private const string AssemblyInfoTemplate =
|
public static string GenAndSaveGameProject(string dir, string name)
|
||||||
@"using System.Reflection;{0}
|
{
|
||||||
|
if (name.Length == 0)
|
||||||
|
throw new ArgumentException("Project name is empty", nameof(name));
|
||||||
|
|
||||||
// Information about this assembly is defined by the following attributes.
|
string path = Path.Combine(dir, name + ".csproj");
|
||||||
// Change them to the values specific to your project.
|
|
||||||
|
|
||||||
[assembly: AssemblyTitle(""{1}"")]
|
var root = GenGameProject(name);
|
||||||
[assembly: AssemblyDescription("""")]
|
|
||||||
[assembly: AssemblyConfiguration("""")]
|
|
||||||
[assembly: AssemblyCompany("""")]
|
|
||||||
[assembly: AssemblyProduct("""")]
|
|
||||||
[assembly: AssemblyCopyright("""")]
|
|
||||||
[assembly: AssemblyTrademark("""")]
|
|
||||||
[assembly: AssemblyCulture("""")]
|
|
||||||
|
|
||||||
// The assembly version has the format ""{{Major}}.{{Minor}}.{{Build}}.{{Revision}}"".
|
root.Save(path);
|
||||||
// The form ""{{Major}}.{{Minor}}.*"" will automatically update the build and revision,
|
|
||||||
// and ""{{Major}}.{{Minor}}.{{Build}}.*"" will update just the revision.
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion(""1.0.*"")]
|
return Guid.NewGuid().ToString().ToUpper();
|
||||||
|
}
|
||||||
// The following attributes are used to specify the signing key for the assembly,
|
|
||||||
// if desired. See the Mono documentation for more information about signing.
|
|
||||||
|
|
||||||
//[assembly: AssemblyDelaySign(false)]
|
|
||||||
//[assembly: AssemblyKeyFile("""")]
|
|
||||||
{2}";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
|
using System;
|
||||||
using GodotTools.Core;
|
using GodotTools.Core;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
using System.Xml;
|
||||||
|
using System.Xml.Linq;
|
||||||
|
using JetBrains.Annotations;
|
||||||
using Microsoft.Build.Construction;
|
using Microsoft.Build.Construction;
|
||||||
using Microsoft.Build.Globbing;
|
using Microsoft.Build.Globbing;
|
||||||
|
|
||||||
@@ -11,7 +14,7 @@ namespace GodotTools.ProjectEditor
|
|||||||
{
|
{
|
||||||
public sealed class MSBuildProject
|
public sealed class MSBuildProject
|
||||||
{
|
{
|
||||||
public ProjectRootElement Root { get; }
|
internal ProjectRootElement Root { get; set; }
|
||||||
|
|
||||||
public bool HasUnsavedChanges { get; set; }
|
public bool HasUnsavedChanges { get; set; }
|
||||||
|
|
||||||
@@ -31,12 +34,20 @@ namespace GodotTools.ProjectEditor
|
|||||||
return root != null ? new MSBuildProject(root) : null;
|
return root != null ? new MSBuildProject(root) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[PublicAPI]
|
||||||
public static void AddItemToProjectChecked(string projectPath, string itemType, string include)
|
public static void AddItemToProjectChecked(string projectPath, string itemType, string include)
|
||||||
{
|
{
|
||||||
var dir = Directory.GetParent(projectPath).FullName;
|
var dir = Directory.GetParent(projectPath).FullName;
|
||||||
var root = ProjectRootElement.Open(projectPath);
|
var root = ProjectRootElement.Open(projectPath);
|
||||||
Debug.Assert(root != null);
|
Debug.Assert(root != null);
|
||||||
|
|
||||||
|
if (root.AreDefaultCompileItemsEnabled())
|
||||||
|
{
|
||||||
|
// No need to add. It's already included automatically by the MSBuild Sdk.
|
||||||
|
// This assumes the source file is inside the project directory and not manually excluded in the csproj
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var normalizedInclude = include.RelativeToPath(dir).Replace("/", "\\");
|
var normalizedInclude = include.RelativeToPath(dir).Replace("/", "\\");
|
||||||
|
|
||||||
if (root.AddItemChecked(itemType, normalizedInclude))
|
if (root.AddItemChecked(itemType, normalizedInclude))
|
||||||
@@ -49,6 +60,13 @@ namespace GodotTools.ProjectEditor
|
|||||||
var root = ProjectRootElement.Open(projectPath);
|
var root = ProjectRootElement.Open(projectPath);
|
||||||
Debug.Assert(root != null);
|
Debug.Assert(root != null);
|
||||||
|
|
||||||
|
if (root.AreDefaultCompileItemsEnabled())
|
||||||
|
{
|
||||||
|
// No need to add. It's already included automatically by the MSBuild Sdk.
|
||||||
|
// This assumes the source file is inside the project directory and not manually excluded in the csproj
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var normalizedOldInclude = oldInclude.NormalizePath();
|
var normalizedOldInclude = oldInclude.NormalizePath();
|
||||||
var normalizedNewInclude = newInclude.NormalizePath();
|
var normalizedNewInclude = newInclude.NormalizePath();
|
||||||
|
|
||||||
@@ -66,6 +84,13 @@ namespace GodotTools.ProjectEditor
|
|||||||
var root = ProjectRootElement.Open(projectPath);
|
var root = ProjectRootElement.Open(projectPath);
|
||||||
Debug.Assert(root != null);
|
Debug.Assert(root != null);
|
||||||
|
|
||||||
|
if (root.AreDefaultCompileItemsEnabled())
|
||||||
|
{
|
||||||
|
// No need to add. It's already included automatically by the MSBuild Sdk.
|
||||||
|
// This assumes the source file is inside the project directory and not manually excluded in the csproj
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var normalizedInclude = include.NormalizePath();
|
var normalizedInclude = include.NormalizePath();
|
||||||
|
|
||||||
if (root.RemoveItemChecked(itemType, normalizedInclude))
|
if (root.RemoveItemChecked(itemType, normalizedInclude))
|
||||||
@@ -78,6 +103,13 @@ namespace GodotTools.ProjectEditor
|
|||||||
var root = ProjectRootElement.Open(projectPath);
|
var root = ProjectRootElement.Open(projectPath);
|
||||||
Debug.Assert(root != null);
|
Debug.Assert(root != null);
|
||||||
|
|
||||||
|
if (root.AreDefaultCompileItemsEnabled())
|
||||||
|
{
|
||||||
|
// No need to add. It's already included automatically by the MSBuild Sdk.
|
||||||
|
// This assumes the source file is inside the project directory and not manually excluded in the csproj
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
bool dirty = false;
|
bool dirty = false;
|
||||||
|
|
||||||
var oldFolderNormalized = oldFolder.NormalizePath();
|
var oldFolderNormalized = oldFolder.NormalizePath();
|
||||||
@@ -102,6 +134,13 @@ namespace GodotTools.ProjectEditor
|
|||||||
var root = ProjectRootElement.Open(projectPath);
|
var root = ProjectRootElement.Open(projectPath);
|
||||||
Debug.Assert(root != null);
|
Debug.Assert(root != null);
|
||||||
|
|
||||||
|
if (root.AreDefaultCompileItemsEnabled())
|
||||||
|
{
|
||||||
|
// No need to add. It's already included automatically by the MSBuild Sdk.
|
||||||
|
// This assumes the source file is inside the project directory and not manually excluded in the csproj
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var folderNormalized = folder.NormalizePath();
|
var folderNormalized = folder.NormalizePath();
|
||||||
|
|
||||||
var itemsToRemove = root.FindAllItemsInFolder(itemType, folderNormalized).ToList();
|
var itemsToRemove = root.FindAllItemsInFolder(itemType, folderNormalized).ToList();
|
||||||
@@ -136,6 +175,29 @@ namespace GodotTools.ProjectEditor
|
|||||||
var root = ProjectRootElement.Open(projectPath);
|
var root = ProjectRootElement.Open(projectPath);
|
||||||
Debug.Assert(root != null);
|
Debug.Assert(root != null);
|
||||||
|
|
||||||
|
if (root.AreDefaultCompileItemsEnabled())
|
||||||
|
{
|
||||||
|
var excluded = new List<string>();
|
||||||
|
result = GetAllFilesRecursive(Path.GetDirectoryName(projectPath), "*.cs").ToList();
|
||||||
|
|
||||||
|
foreach (var item in root.Items)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(item.Condition))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (item.ItemType != itemType)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
string normalizedExclude = item.Exclude.NormalizePath();
|
||||||
|
|
||||||
|
var glob = MSBuildGlob.Parse(normalizedExclude);
|
||||||
|
|
||||||
|
excluded.AddRange(result.Where(includedFile => glob.IsMatch(includedFile)));
|
||||||
|
}
|
||||||
|
|
||||||
|
result.RemoveAll(f => excluded.Contains(f));
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var itemGroup in root.ItemGroups)
|
foreach (var itemGroup in root.ItemGroups)
|
||||||
{
|
{
|
||||||
if (itemGroup.Condition.Length != 0)
|
if (itemGroup.Condition.Length != 0)
|
||||||
@@ -150,8 +212,6 @@ namespace GodotTools.ProjectEditor
|
|||||||
|
|
||||||
var glob = MSBuildGlob.Parse(normalizedInclude);
|
var glob = MSBuildGlob.Parse(normalizedInclude);
|
||||||
|
|
||||||
// TODO Check somehow if path has no blob to avoid the following loop...
|
|
||||||
|
|
||||||
foreach (var existingFile in existingFiles)
|
foreach (var existingFile in existingFiles)
|
||||||
{
|
{
|
||||||
if (glob.IsMatch(existingFile))
|
if (glob.IsMatch(existingFile))
|
||||||
@@ -165,222 +225,186 @@ namespace GodotTools.ProjectEditor
|
|||||||
return result.ToArray();
|
return result.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void EnsureHasProjectTypeGuids(MSBuildProject project)
|
public static void MigrateToProjectSdksStyle(MSBuildProject project, string projectName)
|
||||||
{
|
{
|
||||||
var root = project.Root;
|
var root = project.Root;
|
||||||
|
|
||||||
bool found = root.PropertyGroups.Any(pg =>
|
if (!string.IsNullOrEmpty(root.Sdk))
|
||||||
string.IsNullOrEmpty(pg.Condition) && pg.Properties.Any(p => p.Name == "ProjectTypeGuids"));
|
|
||||||
|
|
||||||
if (found)
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
root.AddProperty("ProjectTypeGuids", ProjectGenerator.GodotDefaultProjectTypeGuids);
|
root.Sdk = ProjectGenerator.GodotSdkAttrValue;
|
||||||
|
|
||||||
|
root.ToolsVersion = null;
|
||||||
|
root.DefaultTargets = null;
|
||||||
|
|
||||||
|
root.AddProperty("TargetFramework", "net472");
|
||||||
|
|
||||||
|
// Remove obsolete properties, items and elements. We're going to be conservative
|
||||||
|
// here to minimize the chances of introducing breaking changes. As such we will
|
||||||
|
// only remove elements that could potentially cause issues with the Godot.NET.Sdk.
|
||||||
|
|
||||||
|
void RemoveElements(IEnumerable<ProjectElement> elements)
|
||||||
|
{
|
||||||
|
foreach (var element in elements)
|
||||||
|
element.Parent.RemoveChild(element);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default Configuration
|
||||||
|
|
||||||
|
RemoveElements(root.PropertyGroups.SelectMany(g => g.Properties)
|
||||||
|
.Where(p => p.Name == "Configuration" && p.Condition.Trim() == "'$(Configuration)' == ''" && p.Value == "Debug"));
|
||||||
|
|
||||||
|
// Default Platform
|
||||||
|
|
||||||
|
RemoveElements(root.PropertyGroups.SelectMany(g => g.Properties)
|
||||||
|
.Where(p => p.Name == "Platform" && p.Condition.Trim() == "'$(Platform)' == ''" && p.Value == "AnyCPU"));
|
||||||
|
|
||||||
|
// Simple properties
|
||||||
|
|
||||||
|
var yabaiProperties = new[]
|
||||||
|
{
|
||||||
|
"OutputPath",
|
||||||
|
"BaseIntermediateOutputPath",
|
||||||
|
"IntermediateOutputPath",
|
||||||
|
"TargetFrameworkVersion",
|
||||||
|
"ProjectTypeGuids",
|
||||||
|
"ApiConfiguration"
|
||||||
|
};
|
||||||
|
|
||||||
|
RemoveElements(root.PropertyGroups.SelectMany(g => g.Properties)
|
||||||
|
.Where(p => yabaiProperties.Contains(p.Name)));
|
||||||
|
|
||||||
|
// Configuration dependent properties
|
||||||
|
|
||||||
|
var yabaiPropertiesForConfigs = new[]
|
||||||
|
{
|
||||||
|
"DebugSymbols",
|
||||||
|
"DebugType",
|
||||||
|
"Optimize",
|
||||||
|
"DefineConstants",
|
||||||
|
"ErrorReport",
|
||||||
|
"WarningLevel",
|
||||||
|
"ConsolePause"
|
||||||
|
};
|
||||||
|
|
||||||
|
foreach (var config in new[] {"ExportDebug", "ExportRelease", "Debug"})
|
||||||
|
{
|
||||||
|
var group = root.PropertyGroups
|
||||||
|
.First(g => g.Condition.Trim() == $"'$(Configuration)|$(Platform)' == '{config}|AnyCPU'");
|
||||||
|
|
||||||
|
RemoveElements(group.Properties.Where(p => yabaiPropertiesForConfigs.Contains(p.Name)));
|
||||||
|
|
||||||
|
if (group.Count == 0)
|
||||||
|
{
|
||||||
|
// No more children, safe to delete the group
|
||||||
|
group.Parent.RemoveChild(group);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Godot API References
|
||||||
|
|
||||||
|
var apiAssemblies = new[] {ApiAssemblyNames.Core, ApiAssemblyNames.Editor};
|
||||||
|
|
||||||
|
RemoveElements(root.ItemGroups.SelectMany(g => g.Items)
|
||||||
|
.Where(i => i.ItemType == "Reference" && apiAssemblies.Contains(i.Include)));
|
||||||
|
|
||||||
|
// Microsoft.NETFramework.ReferenceAssemblies PackageReference
|
||||||
|
|
||||||
|
RemoveElements(root.ItemGroups.SelectMany(g => g.Items).Where(i =>
|
||||||
|
i.ItemType == "PackageReference" &&
|
||||||
|
i.Include.Equals("Microsoft.NETFramework.ReferenceAssemblies", StringComparison.OrdinalIgnoreCase)));
|
||||||
|
|
||||||
|
// Imports
|
||||||
|
|
||||||
|
var yabaiImports = new[]
|
||||||
|
{
|
||||||
|
"$(MSBuildBinPath)/Microsoft.CSharp.targets",
|
||||||
|
"$(MSBuildBinPath)Microsoft.CSharp.targets"
|
||||||
|
};
|
||||||
|
|
||||||
|
RemoveElements(root.Imports.Where(import => yabaiImports.Contains(
|
||||||
|
import.Project.Replace("\\", "/").Replace("//", "/"))));
|
||||||
|
|
||||||
|
// 'EnableDefaultCompileItems' and 'GenerateAssemblyInfo' are kept enabled by default
|
||||||
|
// on new projects, but when migrating old projects we disable them to avoid errors.
|
||||||
|
root.AddProperty("EnableDefaultCompileItems", "false");
|
||||||
|
root.AddProperty("GenerateAssemblyInfo", "false");
|
||||||
|
|
||||||
|
// Older AssemblyInfo.cs cause the following error:
|
||||||
|
// 'Properties/AssemblyInfo.cs(19,28): error CS8357:
|
||||||
|
// The specified version string contains wildcards, which are not compatible with determinism.
|
||||||
|
// Either remove wildcards from the version string, or disable determinism for this compilation.'
|
||||||
|
// We disable deterministic builds to prevent this. The user can then fix this manually when desired
|
||||||
|
// by fixing 'AssemblyVersion("1.0.*")' to not use wildcards.
|
||||||
|
root.AddProperty("Deterministic", "false");
|
||||||
|
|
||||||
project.HasUnsavedChanges = true;
|
project.HasUnsavedChanges = true;
|
||||||
|
|
||||||
|
var xDoc = XDocument.Parse(root.RawXml);
|
||||||
|
|
||||||
|
if (xDoc.Root == null)
|
||||||
|
return; // Too bad, we will have to keep the xmlns/namespace and xml declaration
|
||||||
|
|
||||||
|
XElement GetElement(XDocument doc, string name, string value, string parentName)
|
||||||
|
{
|
||||||
|
foreach (var node in doc.DescendantNodes())
|
||||||
|
{
|
||||||
|
if (!(node is XElement element))
|
||||||
|
continue;
|
||||||
|
if (element.Name.LocalName.Equals(name) && element.Value == value &&
|
||||||
|
element.Parent != null && element.Parent.Name.LocalName.Equals(parentName))
|
||||||
|
{
|
||||||
|
return element;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add comment about Microsoft.NET.Sdk properties disabled during migration
|
||||||
|
|
||||||
|
GetElement(xDoc, name: "EnableDefaultCompileItems", value: "false", parentName: "PropertyGroup")
|
||||||
|
.AddBeforeSelf(new XComment("The following properties were overriden during migration to prevent errors.\n" +
|
||||||
|
" Enabling them may require other manual changes to the project and its files."));
|
||||||
|
|
||||||
|
void RemoveNamespace(XElement element)
|
||||||
|
{
|
||||||
|
element.Attributes().Where(x => x.IsNamespaceDeclaration).Remove();
|
||||||
|
element.Name = element.Name.LocalName;
|
||||||
|
|
||||||
|
foreach (var node in element.DescendantNodes())
|
||||||
|
{
|
||||||
|
if (node is XElement xElement)
|
||||||
|
{
|
||||||
|
// Need to do the same for all children recursively as it adds it to them for some reason...
|
||||||
|
RemoveNamespace(xElement);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove xmlns/namespace
|
||||||
|
RemoveNamespace(xDoc.Root);
|
||||||
|
|
||||||
|
// Remove xml declaration
|
||||||
|
xDoc.Nodes().FirstOrDefault(node => node.NodeType == XmlNodeType.XmlDeclaration)?.Remove();
|
||||||
|
|
||||||
|
string projectFullPath = root.FullPath;
|
||||||
|
|
||||||
|
root = ProjectRootElement.Create(xDoc.CreateReader());
|
||||||
|
root.FullPath = projectFullPath;
|
||||||
|
|
||||||
|
project.Root = root;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Simple function to make sure the Api assembly references are configured correctly
|
public static void EnsureGodotSdkIsUpToDate(MSBuildProject project)
|
||||||
public static void FixApiHintPath(MSBuildProject project)
|
|
||||||
{
|
{
|
||||||
var root = project.Root;
|
var root = project.Root;
|
||||||
|
string godotSdkAttrValue = ProjectGenerator.GodotSdkAttrValue;
|
||||||
|
|
||||||
void AddPropertyIfNotPresent(string name, string condition, string value)
|
if (!string.IsNullOrEmpty(root.Sdk) && root.Sdk.Trim().Equals(godotSdkAttrValue, StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
|
||||||
if (root.PropertyGroups
|
|
||||||
.Any(g => (string.IsNullOrEmpty(g.Condition) || g.Condition.Trim() == condition) &&
|
|
||||||
g.Properties
|
|
||||||
.Any(p => p.Name == name &&
|
|
||||||
p.Value == value &&
|
|
||||||
(p.Condition.Trim() == condition || g.Condition.Trim() == condition))))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
root.AddProperty(name, value).Condition = " " + condition + " ";
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
AddPropertyIfNotPresent(name: "ApiConfiguration",
|
|
||||||
condition: "'$(Configuration)' != 'ExportRelease'",
|
|
||||||
value: "Debug");
|
|
||||||
AddPropertyIfNotPresent(name: "ApiConfiguration",
|
|
||||||
condition: "'$(Configuration)' == 'ExportRelease'",
|
|
||||||
value: "Release");
|
|
||||||
|
|
||||||
void SetReferenceHintPath(string referenceName, string condition, string hintPath)
|
|
||||||
{
|
|
||||||
foreach (var itemGroup in root.ItemGroups.Where(g =>
|
|
||||||
g.Condition.Trim() == string.Empty || g.Condition.Trim() == condition))
|
|
||||||
{
|
|
||||||
var references = itemGroup.Items.Where(item =>
|
|
||||||
item.ItemType == "Reference" &&
|
|
||||||
item.Include == referenceName &&
|
|
||||||
(item.Condition.Trim() == condition || itemGroup.Condition.Trim() == condition));
|
|
||||||
|
|
||||||
var referencesWithHintPath = references.Where(reference =>
|
|
||||||
reference.Metadata.Any(m => m.Name == "HintPath"));
|
|
||||||
|
|
||||||
if (referencesWithHintPath.Any(reference => reference.Metadata
|
|
||||||
.Any(m => m.Name == "HintPath" && m.Value == hintPath)))
|
|
||||||
{
|
|
||||||
// Found a Reference item with the right HintPath
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var referenceWithHintPath = referencesWithHintPath.FirstOrDefault();
|
|
||||||
if (referenceWithHintPath != null)
|
|
||||||
{
|
|
||||||
// Found a Reference item with a wrong HintPath
|
|
||||||
foreach (var metadata in referenceWithHintPath.Metadata.ToList()
|
|
||||||
.Where(m => m.Name == "HintPath"))
|
|
||||||
{
|
|
||||||
// Safe to remove as we duplicate with ToList() to loop
|
|
||||||
referenceWithHintPath.RemoveChild(metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
referenceWithHintPath.AddMetadata("HintPath", hintPath);
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var referenceWithoutHintPath = references.FirstOrDefault();
|
|
||||||
if (referenceWithoutHintPath != null)
|
|
||||||
{
|
|
||||||
// Found a Reference item without a HintPath
|
|
||||||
referenceWithoutHintPath.AddMetadata("HintPath", hintPath);
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Found no Reference item at all. Add it.
|
|
||||||
root.AddItem("Reference", referenceName).Condition = " " + condition + " ";
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
const string coreProjectName = "GodotSharp";
|
|
||||||
const string editorProjectName = "GodotSharpEditor";
|
|
||||||
|
|
||||||
const string coreCondition = "";
|
|
||||||
const string editorCondition = "'$(Configuration)' == 'Debug'";
|
|
||||||
|
|
||||||
var coreHintPath = $"$(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/{coreProjectName}.dll";
|
|
||||||
var editorHintPath = $"$(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/{editorProjectName}.dll";
|
|
||||||
|
|
||||||
SetReferenceHintPath(coreProjectName, coreCondition, coreHintPath);
|
|
||||||
SetReferenceHintPath(editorProjectName, editorCondition, editorHintPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void MigrateFromOldConfigNames(MSBuildProject project)
|
|
||||||
{
|
|
||||||
var root = project.Root;
|
|
||||||
|
|
||||||
bool hasGodotProjectGeneratorVersion = false;
|
|
||||||
bool foundOldConfiguration = false;
|
|
||||||
|
|
||||||
foreach (var propertyGroup in root.PropertyGroups.Where(g => string.IsNullOrEmpty(g.Condition)))
|
|
||||||
{
|
|
||||||
if (!hasGodotProjectGeneratorVersion && propertyGroup.Properties.Any(p => p.Name == "GodotProjectGeneratorVersion"))
|
|
||||||
hasGodotProjectGeneratorVersion = true;
|
|
||||||
|
|
||||||
foreach (var configItem in propertyGroup.Properties
|
|
||||||
.Where(p => p.Condition.Trim() == "'$(Configuration)' == ''" && p.Value == "Tools"))
|
|
||||||
{
|
|
||||||
configItem.Value = "Debug";
|
|
||||||
foundOldConfiguration = true;
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!hasGodotProjectGeneratorVersion)
|
|
||||||
{
|
|
||||||
root.PropertyGroups.First(g => string.IsNullOrEmpty(g.Condition))?
|
|
||||||
.AddProperty("GodotProjectGeneratorVersion", Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!foundOldConfiguration)
|
|
||||||
{
|
|
||||||
var toolsConditions = new[]
|
|
||||||
{
|
|
||||||
"'$(Configuration)|$(Platform)' == 'Tools|AnyCPU'",
|
|
||||||
"'$(Configuration)|$(Platform)' != 'Tools|AnyCPU'",
|
|
||||||
"'$(Configuration)' == 'Tools'",
|
|
||||||
"'$(Configuration)' != 'Tools'"
|
|
||||||
};
|
|
||||||
|
|
||||||
foundOldConfiguration = root.PropertyGroups
|
|
||||||
.Any(g => toolsConditions.Any(c => c == g.Condition.Trim()));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (foundOldConfiguration)
|
|
||||||
{
|
|
||||||
void MigrateConfigurationConditions(string oldConfiguration, string newConfiguration)
|
|
||||||
{
|
|
||||||
void MigrateConditions(string oldCondition, string newCondition)
|
|
||||||
{
|
|
||||||
foreach (var propertyGroup in root.PropertyGroups.Where(g => g.Condition.Trim() == oldCondition))
|
|
||||||
{
|
|
||||||
propertyGroup.Condition = " " + newCondition + " ";
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var propertyGroup in root.PropertyGroups)
|
|
||||||
{
|
|
||||||
foreach (var prop in propertyGroup.Properties.Where(p => p.Condition.Trim() == oldCondition))
|
|
||||||
{
|
|
||||||
prop.Condition = " " + newCondition + " ";
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var itemGroup in root.ItemGroups.Where(g => g.Condition.Trim() == oldCondition))
|
|
||||||
{
|
|
||||||
itemGroup.Condition = " " + newCondition + " ";
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var itemGroup in root.ItemGroups)
|
|
||||||
{
|
|
||||||
foreach (var item in itemGroup.Items.Where(item => item.Condition.Trim() == oldCondition))
|
|
||||||
{
|
|
||||||
item.Condition = " " + newCondition + " ";
|
|
||||||
project.HasUnsavedChanges = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var op in new[] {"==", "!="})
|
|
||||||
{
|
|
||||||
MigrateConditions($"'$(Configuration)|$(Platform)' {op} '{oldConfiguration}|AnyCPU'", $"'$(Configuration)|$(Platform)' {op} '{newConfiguration}|AnyCPU'");
|
|
||||||
MigrateConditions($"'$(Configuration)' {op} '{oldConfiguration}'", $"'$(Configuration)' {op} '{newConfiguration}'");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MigrateConfigurationConditions("Debug", "ExportDebug");
|
|
||||||
MigrateConfigurationConditions("Release", "ExportRelease");
|
|
||||||
MigrateConfigurationConditions("Tools", "Debug"); // Must be last
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void EnsureHasNugetNetFrameworkRefAssemblies(MSBuildProject project)
|
|
||||||
{
|
|
||||||
var root = project.Root;
|
|
||||||
|
|
||||||
bool found = root.ItemGroups.Any(g => string.IsNullOrEmpty(g.Condition) && g.Items.Any(
|
|
||||||
item => item.ItemType == "PackageReference" && item.Include == "Microsoft.NETFramework.ReferenceAssemblies"));
|
|
||||||
|
|
||||||
if (found)
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var frameworkRefAssembliesItem = root.AddItem("PackageReference", "Microsoft.NETFramework.ReferenceAssemblies");
|
root.Sdk = godotSdkAttrValue;
|
||||||
|
|
||||||
// Use metadata (child nodes) instead of attributes for the PackageReference.
|
|
||||||
// This is for compatibility with 3.2, where GodotTools uses an old Microsoft.Build.
|
|
||||||
frameworkRefAssembliesItem.AddMetadata("Version", "1.0.0");
|
|
||||||
frameworkRefAssembliesItem.AddMetadata("PrivateAssets", "All");
|
|
||||||
|
|
||||||
project.HasUnsavedChanges = true;
|
project.HasUnsavedChanges = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,48 +24,50 @@ namespace GodotTools
|
|||||||
private ToolButton errorsBtn;
|
private ToolButton errorsBtn;
|
||||||
private Button viewLogBtn;
|
private Button viewLogBtn;
|
||||||
|
|
||||||
|
private void _UpdateBuildTab(int index, int? currentTab)
|
||||||
|
{
|
||||||
|
var tab = (BuildTab)buildTabs.GetChild(index);
|
||||||
|
|
||||||
|
string itemName = Path.GetFileNameWithoutExtension(tab.BuildInfo.Solution);
|
||||||
|
itemName += " [" + tab.BuildInfo.Configuration + "]";
|
||||||
|
|
||||||
|
buildTabsList.AddItem(itemName, tab.IconTexture);
|
||||||
|
|
||||||
|
string itemTooltip = "Solution: " + tab.BuildInfo.Solution;
|
||||||
|
itemTooltip += "\nConfiguration: " + tab.BuildInfo.Configuration;
|
||||||
|
itemTooltip += "\nStatus: ";
|
||||||
|
|
||||||
|
if (tab.BuildExited)
|
||||||
|
itemTooltip += tab.BuildResult == BuildTab.BuildResults.Success ? "Succeeded" : "Errored";
|
||||||
|
else
|
||||||
|
itemTooltip += "Running";
|
||||||
|
|
||||||
|
if (!tab.BuildExited || tab.BuildResult == BuildTab.BuildResults.Error)
|
||||||
|
itemTooltip += $"\nErrors: {tab.ErrorCount}";
|
||||||
|
|
||||||
|
itemTooltip += $"\nWarnings: {tab.WarningCount}";
|
||||||
|
|
||||||
|
buildTabsList.SetItemTooltip(index, itemTooltip);
|
||||||
|
|
||||||
|
// If this tab was already selected before the changes or if no tab was selected
|
||||||
|
if (currentTab == null || currentTab == index)
|
||||||
|
{
|
||||||
|
buildTabsList.Select(index);
|
||||||
|
_BuildTabsItemSelected(index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void _UpdateBuildTabsList()
|
private void _UpdateBuildTabsList()
|
||||||
{
|
{
|
||||||
buildTabsList.Clear();
|
buildTabsList.Clear();
|
||||||
|
|
||||||
int currentTab = buildTabs.CurrentTab;
|
int? currentTab = buildTabs.CurrentTab;
|
||||||
|
|
||||||
bool noCurrentTab = currentTab < 0 || currentTab >= buildTabs.GetTabCount();
|
if (currentTab < 0 || currentTab >= buildTabs.GetTabCount())
|
||||||
|
currentTab = null;
|
||||||
|
|
||||||
for (int i = 0; i < buildTabs.GetChildCount(); i++)
|
for (int i = 0; i < buildTabs.GetChildCount(); i++)
|
||||||
{
|
_UpdateBuildTab(i, currentTab);
|
||||||
var tab = (BuildTab)buildTabs.GetChild(i);
|
|
||||||
|
|
||||||
if (tab == null)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
string itemName = Path.GetFileNameWithoutExtension(tab.BuildInfo.Solution);
|
|
||||||
itemName += " [" + tab.BuildInfo.Configuration + "]";
|
|
||||||
|
|
||||||
buildTabsList.AddItem(itemName, tab.IconTexture);
|
|
||||||
|
|
||||||
string itemTooltip = "Solution: " + tab.BuildInfo.Solution;
|
|
||||||
itemTooltip += "\nConfiguration: " + tab.BuildInfo.Configuration;
|
|
||||||
itemTooltip += "\nStatus: ";
|
|
||||||
|
|
||||||
if (tab.BuildExited)
|
|
||||||
itemTooltip += tab.BuildResult == BuildTab.BuildResults.Success ? "Succeeded" : "Errored";
|
|
||||||
else
|
|
||||||
itemTooltip += "Running";
|
|
||||||
|
|
||||||
if (!tab.BuildExited || tab.BuildResult == BuildTab.BuildResults.Error)
|
|
||||||
itemTooltip += $"\nErrors: {tab.ErrorCount}";
|
|
||||||
|
|
||||||
itemTooltip += $"\nWarnings: {tab.WarningCount}";
|
|
||||||
|
|
||||||
buildTabsList.SetItemTooltip(i, itemTooltip);
|
|
||||||
|
|
||||||
if (noCurrentTab || currentTab == i)
|
|
||||||
{
|
|
||||||
buildTabsList.Select(i);
|
|
||||||
_BuildTabsItemSelected(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public BuildTab GetBuildTabFor(BuildInfo buildInfo)
|
public BuildTab GetBuildTabFor(BuildInfo buildInfo)
|
||||||
@@ -160,13 +162,7 @@ namespace GodotTools
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var godotDefines = new[]
|
bool buildSuccess = BuildManager.BuildProjectBlocking("Debug");
|
||||||
{
|
|
||||||
OS.GetName(),
|
|
||||||
Internal.GodotIs32Bits() ? "32" : "64"
|
|
||||||
};
|
|
||||||
|
|
||||||
bool buildSuccess = BuildManager.BuildProjectBlocking("Debug", godotDefines);
|
|
||||||
|
|
||||||
if (!buildSuccess)
|
if (!buildSuccess)
|
||||||
return;
|
return;
|
||||||
@@ -272,7 +268,7 @@ namespace GodotTools
|
|||||||
};
|
};
|
||||||
panelTabs.AddChild(panelBuildsTab);
|
panelTabs.AddChild(panelBuildsTab);
|
||||||
|
|
||||||
var toolBarHBox = new HBoxContainer { SizeFlagsHorizontal = (int)SizeFlags.ExpandFill };
|
var toolBarHBox = new HBoxContainer {SizeFlagsHorizontal = (int)SizeFlags.ExpandFill};
|
||||||
panelBuildsTab.AddChild(toolBarHBox);
|
panelBuildsTab.AddChild(toolBarHBox);
|
||||||
|
|
||||||
var buildProjectBtn = new Button
|
var buildProjectBtn = new Button
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ using GodotTools.Build;
|
|||||||
using GodotTools.Ides.Rider;
|
using GodotTools.Ides.Rider;
|
||||||
using GodotTools.Internals;
|
using GodotTools.Internals;
|
||||||
using GodotTools.Utils;
|
using GodotTools.Utils;
|
||||||
|
using JetBrains.Annotations;
|
||||||
using static GodotTools.Internals.Globals;
|
using static GodotTools.Internals.Globals;
|
||||||
using File = GodotTools.Utils.File;
|
using File = GodotTools.Utils.File;
|
||||||
|
|
||||||
@@ -152,7 +153,7 @@ namespace GodotTools
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool BuildProjectBlocking(string config, IEnumerable<string> godotDefines)
|
public static bool BuildProjectBlocking(string config, [CanBeNull] string platform = null)
|
||||||
{
|
{
|
||||||
if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
|
if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
|
||||||
return true; // No solution to build
|
return true; // No solution to build
|
||||||
@@ -168,29 +169,18 @@ namespace GodotTools
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
|
|
||||||
var buildTool = (BuildTool)editorSettings.GetSetting("mono/builds/build_tool");
|
|
||||||
|
|
||||||
using (var pr = new EditorProgress("mono_project_debug_build", "Building project solution...", 1))
|
using (var pr = new EditorProgress("mono_project_debug_build", "Building project solution...", 1))
|
||||||
{
|
{
|
||||||
pr.Step("Building project solution", 0);
|
pr.Step("Building project solution", 0);
|
||||||
|
|
||||||
var buildInfo = new BuildInfo(GodotSharpDirs.ProjectSlnPath, new[] {"Build"}, config, restore: true);
|
var buildInfo = new BuildInfo(GodotSharpDirs.ProjectSlnPath, new[] {"Build"}, config, restore: true);
|
||||||
|
|
||||||
bool escapeNeedsDoubleBackslash = buildTool == BuildTool.MsBuildMono || buildTool == BuildTool.DotnetCli;
|
// If a platform was not specified, try determining the current one. If that fails, let MSBuild auto-detect it.
|
||||||
|
if (platform != null || OS.PlatformNameMap.TryGetValue(Godot.OS.GetName(), out platform))
|
||||||
// Add Godot defines
|
buildInfo.CustomProperties.Add($"GodotTargetPlatform={platform}");
|
||||||
string constants = !escapeNeedsDoubleBackslash ? "GodotDefineConstants=\"" : "GodotDefineConstants=\\\"";
|
|
||||||
|
|
||||||
foreach (var godotDefine in godotDefines)
|
|
||||||
constants += $"GODOT_{godotDefine.ToUpper().Replace("-", "_").Replace(" ", "_").Replace(";", "_")};";
|
|
||||||
|
|
||||||
if (Internal.GodotIsRealTDouble())
|
if (Internal.GodotIsRealTDouble())
|
||||||
constants += "GODOT_REAL_T_IS_DOUBLE;";
|
buildInfo.CustomProperties.Add("GodotRealTIsDouble=true");
|
||||||
|
|
||||||
constants += !escapeNeedsDoubleBackslash ? "\"" : "\\\"";
|
|
||||||
|
|
||||||
buildInfo.CustomProperties.Add(constants);
|
|
||||||
|
|
||||||
if (!Build(buildInfo))
|
if (!Build(buildInfo))
|
||||||
{
|
{
|
||||||
@@ -233,13 +223,7 @@ namespace GodotTools
|
|||||||
return true; // Requested play from an external editor/IDE which already built the project
|
return true; // Requested play from an external editor/IDE which already built the project
|
||||||
}
|
}
|
||||||
|
|
||||||
var godotDefines = new[]
|
return BuildProjectBlocking("Debug");
|
||||||
{
|
|
||||||
Godot.OS.GetName(),
|
|
||||||
Internal.GodotIs32Bits() ? "32" : "64"
|
|
||||||
};
|
|
||||||
|
|
||||||
return BuildProjectBlocking("Debug", godotDefines);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Initialize()
|
public static void Initialize()
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
using Godot;
|
using Godot;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using Godot.Collections;
|
using Godot.Collections;
|
||||||
using GodotTools.Internals;
|
using GodotTools.Internals;
|
||||||
using GodotTools.ProjectEditor;
|
using GodotTools.ProjectEditor;
|
||||||
using static GodotTools.Internals.Globals;
|
|
||||||
using File = GodotTools.Utils.File;
|
using File = GodotTools.Utils.File;
|
||||||
using Directory = GodotTools.Utils.Directory;
|
using Directory = GodotTools.Utils.Directory;
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ namespace GodotTools
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return ProjectGenerator.GenGameProject(dir, name, compileItems: new string[] { });
|
return ProjectGenerator.GenAndSaveGameProject(dir, name);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
@@ -24,14 +24,6 @@ namespace GodotTools
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void AddItem(string projectPath, string itemType, string include)
|
|
||||||
{
|
|
||||||
if (!(bool)GlobalDef("mono/project/auto_update_project", true))
|
|
||||||
return;
|
|
||||||
|
|
||||||
ProjectUtils.AddItemToProjectChecked(projectPath, itemType, include);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
|
private static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
|
||||||
private static ulong ConvertToTimestamp(this DateTime value)
|
private static ulong ConvertToTimestamp(this DateTime value)
|
||||||
@@ -40,81 +32,77 @@ namespace GodotTools
|
|||||||
return (ulong)elapsedTime.TotalSeconds;
|
return (ulong)elapsedTime.TotalSeconds;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool TryParseFileMetadata(string includeFile, ulong modifiedTime, out Dictionary fileMetadata)
|
||||||
|
{
|
||||||
|
fileMetadata = null;
|
||||||
|
|
||||||
|
var parseError = ScriptClassParser.ParseFile(includeFile, out var classes, out string errorStr);
|
||||||
|
|
||||||
|
if (parseError != Error.Ok)
|
||||||
|
{
|
||||||
|
GD.PushError($"Failed to determine namespace and class for script: {includeFile}. Parse error: {errorStr ?? parseError.ToString()}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
string searchName = System.IO.Path.GetFileNameWithoutExtension(includeFile);
|
||||||
|
|
||||||
|
var firstMatch = classes.FirstOrDefault(classDecl =>
|
||||||
|
classDecl.BaseCount != 0 && // If it doesn't inherit anything, it can't be a Godot.Object.
|
||||||
|
classDecl.SearchName != searchName // Filter by the name we're looking for
|
||||||
|
);
|
||||||
|
|
||||||
|
if (firstMatch == null)
|
||||||
|
return false; // Not found
|
||||||
|
|
||||||
|
fileMetadata = new Dictionary
|
||||||
|
{
|
||||||
|
["modified_time"] = $"{modifiedTime}",
|
||||||
|
["class"] = new Dictionary
|
||||||
|
{
|
||||||
|
["namespace"] = firstMatch.Namespace,
|
||||||
|
["class_name"] = firstMatch.Name,
|
||||||
|
["nested"] = firstMatch.Nested
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public static void GenerateScriptsMetadata(string projectPath, string outputPath)
|
public static void GenerateScriptsMetadata(string projectPath, string outputPath)
|
||||||
{
|
{
|
||||||
if (File.Exists(outputPath))
|
var metadataDict = Internal.GetScriptsMetadataOrNothing().Duplicate();
|
||||||
File.Delete(outputPath);
|
|
||||||
|
|
||||||
var oldDict = Internal.GetScriptsMetadataOrNothing();
|
bool IsUpToDate(string includeFile, ulong modifiedTime)
|
||||||
var newDict = new Godot.Collections.Dictionary<string, object>();
|
|
||||||
|
|
||||||
foreach (var includeFile in ProjectUtils.GetIncludeFiles(projectPath, "Compile"))
|
|
||||||
{
|
{
|
||||||
string projectIncludeFile = ("res://" + includeFile).SimplifyGodotPath();
|
return metadataDict.TryGetValue(includeFile, out var oldFileVar) &&
|
||||||
|
ulong.TryParse(((Dictionary)oldFileVar)["modified_time"] as string,
|
||||||
ulong modifiedTime = File.GetLastWriteTime(projectIncludeFile).ConvertToTimestamp();
|
out ulong storedModifiedTime) && storedModifiedTime == modifiedTime;
|
||||||
|
|
||||||
if (oldDict.TryGetValue(projectIncludeFile, out var oldFileVar))
|
|
||||||
{
|
|
||||||
var oldFileDict = (Dictionary)oldFileVar;
|
|
||||||
|
|
||||||
if (ulong.TryParse(oldFileDict["modified_time"] as string, out ulong storedModifiedTime))
|
|
||||||
{
|
|
||||||
if (storedModifiedTime == modifiedTime)
|
|
||||||
{
|
|
||||||
// No changes so no need to parse again
|
|
||||||
newDict[projectIncludeFile] = oldFileDict;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Error parseError = ScriptClassParser.ParseFile(projectIncludeFile, out var classes, out string errorStr);
|
|
||||||
if (parseError != Error.Ok)
|
|
||||||
{
|
|
||||||
GD.PushError($"Failed to determine namespace and class for script: {projectIncludeFile}. Parse error: {errorStr ?? parseError.ToString()}");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
string searchName = System.IO.Path.GetFileNameWithoutExtension(projectIncludeFile);
|
|
||||||
|
|
||||||
var classDict = new Dictionary();
|
|
||||||
|
|
||||||
foreach (var classDecl in classes)
|
|
||||||
{
|
|
||||||
if (classDecl.BaseCount == 0)
|
|
||||||
continue; // Does not inherit nor implement anything, so it can't be a script class
|
|
||||||
|
|
||||||
string classCmp = classDecl.Nested ?
|
|
||||||
classDecl.Name.Substring(classDecl.Name.LastIndexOf(".", StringComparison.Ordinal) + 1) :
|
|
||||||
classDecl.Name;
|
|
||||||
|
|
||||||
if (classCmp != searchName)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
classDict["namespace"] = classDecl.Namespace;
|
|
||||||
classDict["class_name"] = classDecl.Name;
|
|
||||||
classDict["nested"] = classDecl.Nested;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (classDict.Count == 0)
|
|
||||||
continue; // Not found
|
|
||||||
|
|
||||||
newDict[projectIncludeFile] = new Dictionary { ["modified_time"] = $"{modifiedTime}", ["class"] = classDict };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newDict.Count > 0)
|
var outdatedFiles = ProjectUtils.GetIncludeFiles(projectPath, "Compile")
|
||||||
|
.Select(path => ("res://" + path).SimplifyGodotPath())
|
||||||
|
.ToDictionary(path => path, path => File.GetLastWriteTime(path).ConvertToTimestamp())
|
||||||
|
.Where(pair => !IsUpToDate(includeFile: pair.Key, modifiedTime: pair.Value))
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
foreach (var pair in outdatedFiles)
|
||||||
{
|
{
|
||||||
string json = JSON.Print(newDict);
|
metadataDict.Remove(pair.Key);
|
||||||
|
|
||||||
string baseDir = outputPath.GetBaseDir();
|
string includeFile = pair.Key;
|
||||||
|
|
||||||
if (!Directory.Exists(baseDir))
|
if (TryParseFileMetadata(includeFile, modifiedTime: pair.Value, out var fileMetadata))
|
||||||
Directory.CreateDirectory(baseDir);
|
metadataDict[includeFile] = fileMetadata;
|
||||||
|
|
||||||
File.WriteAllText(outputPath, json);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string json = metadataDict.Count <= 0 ? "{}" : JSON.Print(metadataDict);
|
||||||
|
|
||||||
|
string baseDir = outputPath.GetBaseDir();
|
||||||
|
|
||||||
|
if (!Directory.Exists(baseDir))
|
||||||
|
Directory.CreateDirectory(baseDir);
|
||||||
|
|
||||||
|
File.WriteAllText(outputPath, json);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ using System.Linq;
|
|||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using GodotTools.Core;
|
using GodotTools.Core;
|
||||||
using GodotTools.Internals;
|
using GodotTools.Internals;
|
||||||
|
using JetBrains.Annotations;
|
||||||
using static GodotTools.Internals.Globals;
|
using static GodotTools.Internals.Globals;
|
||||||
using Directory = GodotTools.Utils.Directory;
|
using Directory = GodotTools.Utils.Directory;
|
||||||
using File = GodotTools.Utils.File;
|
using File = GodotTools.Utils.File;
|
||||||
@@ -145,9 +146,7 @@ namespace GodotTools.Export
|
|||||||
if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
|
if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
string platform = DeterminePlatformFromFeatures(features);
|
if (!DeterminePlatformFromFeatures(features, out string platform))
|
||||||
|
|
||||||
if (platform == null)
|
|
||||||
throw new NotSupportedException("Target platform not supported");
|
throw new NotSupportedException("Target platform not supported");
|
||||||
|
|
||||||
string outputDir = new FileInfo(path).Directory?.FullName ??
|
string outputDir = new FileInfo(path).Directory?.FullName ??
|
||||||
@@ -160,10 +159,7 @@ namespace GodotTools.Export
|
|||||||
|
|
||||||
AddFile(scriptsMetadataPath, scriptsMetadataPath);
|
AddFile(scriptsMetadataPath, scriptsMetadataPath);
|
||||||
|
|
||||||
// Turn export features into defines
|
if (!BuildManager.BuildProjectBlocking(buildConfig, platform))
|
||||||
var godotDefines = features;
|
|
||||||
|
|
||||||
if (!BuildManager.BuildProjectBlocking(buildConfig, godotDefines))
|
|
||||||
throw new Exception("Failed to build project");
|
throw new Exception("Failed to build project");
|
||||||
|
|
||||||
// Add dependency assemblies
|
// Add dependency assemblies
|
||||||
@@ -289,6 +285,7 @@ namespace GodotTools.Export
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[NotNull]
|
||||||
private static string ExportDataDirectory(string[] features, string platform, bool isDebug, string outputDir)
|
private static string ExportDataDirectory(string[] features, string platform, bool isDebug, string outputDir)
|
||||||
{
|
{
|
||||||
string target = isDebug ? "release_debug" : "release";
|
string target = isDebug ? "release_debug" : "release";
|
||||||
@@ -343,18 +340,19 @@ namespace GodotTools.Export
|
|||||||
private static bool PlatformHasTemplateDir(string platform)
|
private static bool PlatformHasTemplateDir(string platform)
|
||||||
{
|
{
|
||||||
// OSX export templates are contained in a zip, so we place our custom template inside it and let Godot do the rest.
|
// OSX export templates are contained in a zip, so we place our custom template inside it and let Godot do the rest.
|
||||||
return !new[] { OS.Platforms.OSX, OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5 }.Contains(platform);
|
return !new[] {OS.Platforms.OSX, OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5}.Contains(platform);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string DeterminePlatformFromFeatures(IEnumerable<string> features)
|
private static bool DeterminePlatformFromFeatures(IEnumerable<string> features, out string platform)
|
||||||
{
|
{
|
||||||
foreach (var feature in features)
|
foreach (var feature in features)
|
||||||
{
|
{
|
||||||
if (OS.PlatformNameMap.TryGetValue(feature, out string platform))
|
if (OS.PlatformNameMap.TryGetValue(feature, out platform))
|
||||||
return platform;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
platform = null;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetBclProfileDir(string profile)
|
private static string GetBclProfileDir(string profile)
|
||||||
@@ -391,7 +389,7 @@ namespace GodotTools.Export
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private static bool PlatformRequiresCustomBcl(string platform)
|
private static bool PlatformRequiresCustomBcl(string platform)
|
||||||
{
|
{
|
||||||
if (new[] { OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5 }.Contains(platform))
|
if (new[] {OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5}.Contains(platform))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// The 'net_4_x' BCL is not compatible between Windows and the other platforms.
|
// The 'net_4_x' BCL is not compatible between Windows and the other platforms.
|
||||||
|
|||||||
@@ -403,6 +403,37 @@ namespace GodotTools
|
|||||||
return BuildManager.EditorBuildCallback();
|
return BuildManager.EditorBuildCallback();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ApplyNecessaryChangesToSolution()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Migrate solution from old configuration names to: Debug, ExportDebug and ExportRelease
|
||||||
|
DotNetSolution.MigrateFromOldConfigNames(GodotSharpDirs.ProjectSlnPath);
|
||||||
|
|
||||||
|
var msbuildProject = ProjectUtils.Open(GodotSharpDirs.ProjectCsProjPath)
|
||||||
|
?? throw new Exception("Cannot open C# project");
|
||||||
|
|
||||||
|
// NOTE: The order in which changes are made to the project is important
|
||||||
|
|
||||||
|
// Migrate to MSBuild project Sdks style if using the old style
|
||||||
|
ProjectUtils.MigrateToProjectSdksStyle(msbuildProject, ProjectAssemblyName);
|
||||||
|
|
||||||
|
ProjectUtils.EnsureGodotSdkIsUpToDate(msbuildProject);
|
||||||
|
|
||||||
|
if (msbuildProject.HasUnsavedChanges)
|
||||||
|
{
|
||||||
|
// Save a copy of the project before replacing it
|
||||||
|
FileUtils.SaveBackupCopy(GodotSharpDirs.ProjectCsProjPath);
|
||||||
|
|
||||||
|
msbuildProject.Save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
GD.PushError(e.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public override void EnablePlugin()
|
public override void EnablePlugin()
|
||||||
{
|
{
|
||||||
base.EnablePlugin();
|
base.EnablePlugin();
|
||||||
@@ -478,42 +509,7 @@ namespace GodotTools
|
|||||||
|
|
||||||
if (File.Exists(GodotSharpDirs.ProjectSlnPath) && File.Exists(GodotSharpDirs.ProjectCsProjPath))
|
if (File.Exists(GodotSharpDirs.ProjectSlnPath) && File.Exists(GodotSharpDirs.ProjectCsProjPath))
|
||||||
{
|
{
|
||||||
try
|
ApplyNecessaryChangesToSolution();
|
||||||
{
|
|
||||||
// Migrate solution from old configuration names to: Debug, ExportDebug and ExportRelease
|
|
||||||
DotNetSolution.MigrateFromOldConfigNames(GodotSharpDirs.ProjectSlnPath);
|
|
||||||
|
|
||||||
var msbuildProject = ProjectUtils.Open(GodotSharpDirs.ProjectCsProjPath)
|
|
||||||
?? throw new Exception("Cannot open C# project");
|
|
||||||
|
|
||||||
// NOTE: The order in which changes are made to the project is important
|
|
||||||
|
|
||||||
// Migrate csproj from old configuration names to: Debug, ExportDebug and ExportRelease
|
|
||||||
ProjectUtils.MigrateFromOldConfigNames(msbuildProject);
|
|
||||||
|
|
||||||
// Apply the other fixes only after configurations have been migrated
|
|
||||||
|
|
||||||
// Make sure the existing project has the ProjectTypeGuids property (for VisualStudio)
|
|
||||||
ProjectUtils.EnsureHasProjectTypeGuids(msbuildProject);
|
|
||||||
|
|
||||||
// Make sure the existing project has Api assembly references configured correctly
|
|
||||||
ProjectUtils.FixApiHintPath(msbuildProject);
|
|
||||||
|
|
||||||
// Make sure the existing project references the Microsoft.NETFramework.ReferenceAssemblies nuget package
|
|
||||||
ProjectUtils.EnsureHasNugetNetFrameworkRefAssemblies(msbuildProject);
|
|
||||||
|
|
||||||
if (msbuildProject.HasUnsavedChanges)
|
|
||||||
{
|
|
||||||
// Save a copy of the project before replacing it
|
|
||||||
FileUtils.SaveBackupCopy(GodotSharpDirs.ProjectCsProjPath);
|
|
||||||
|
|
||||||
msbuildProject.Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
GD.PushError(e.ToString());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,6 +15,10 @@ namespace GodotTools.Internals
|
|||||||
public bool Nested { get; }
|
public bool Nested { get; }
|
||||||
public int BaseCount { get; }
|
public int BaseCount { get; }
|
||||||
|
|
||||||
|
public string SearchName => Nested ?
|
||||||
|
Name.Substring(Name.LastIndexOf(".", StringComparison.Ordinal) + 1) :
|
||||||
|
Name;
|
||||||
|
|
||||||
public ClassDecl(string name, string @namespace, bool nested, int baseCount)
|
public ClassDecl(string name, string @namespace, bool nested, int baseCount)
|
||||||
{
|
{
|
||||||
Name = name;
|
Name = name;
|
||||||
|
|||||||
@@ -45,7 +45,6 @@
|
|||||||
#include "../mono_gd/gd_mono_marshal.h"
|
#include "../mono_gd/gd_mono_marshal.h"
|
||||||
#include "../utils/path_utils.h"
|
#include "../utils/path_utils.h"
|
||||||
#include "../utils/string_utils.h"
|
#include "../utils/string_utils.h"
|
||||||
#include "csharp_project.h"
|
|
||||||
|
|
||||||
#define CS_INDENT " " // 4 whitespaces
|
#define CS_INDENT " " // 4 whitespaces
|
||||||
|
|
||||||
|
|||||||
@@ -1,38 +1,16 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
||||||
<ProjectGuid>{AEBF0036-DA76-4341-B651-A3F2856AB2FA}</ProjectGuid>
|
<ProjectGuid>{AEBF0036-DA76-4341-B651-A3F2856AB2FA}</ProjectGuid>
|
||||||
<OutputType>Library</OutputType>
|
|
||||||
<OutputPath>bin/$(Configuration)</OutputPath>
|
<OutputPath>bin/$(Configuration)</OutputPath>
|
||||||
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<RootNamespace>Godot</RootNamespace>
|
<RootNamespace>Godot</RootNamespace>
|
||||||
<AssemblyName>GodotSharp</AssemblyName>
|
<TargetFramework>netstandard2.0</TargetFramework>
|
||||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
|
||||||
<DocumentationFile>$(OutputPath)/$(AssemblyName).xml</DocumentationFile>
|
<DocumentationFile>$(OutputPath)/$(AssemblyName).xml</DocumentationFile>
|
||||||
<BaseIntermediateOutputPath>obj</BaseIntermediateOutputPath>
|
<EnableDefaultItems>false</EnableDefaultItems>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup>
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DefineConstants>$(DefineConstants);GODOT</DefineConstants>
|
||||||
<DebugType>portable</DebugType>
|
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<DefineConstants>$(GodotDefineConstants);GODOT;DEBUG;</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
<ConsolePause>false</ConsolePause>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<DebugType>portable</DebugType>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<DefineConstants>$(GodotDefineConstants);GODOT;</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
<ConsolePause>false</ConsolePause>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
|
|
||||||
<Reference Include="System" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Core\AABB.cs" />
|
<Compile Include="Core\AABB.cs" />
|
||||||
<Compile Include="Core\Array.cs" />
|
<Compile Include="Core\Array.cs" />
|
||||||
@@ -82,5 +60,4 @@
|
|||||||
Fortunately code completion, go to definition and such still work.
|
Fortunately code completion, go to definition and such still work.
|
||||||
-->
|
-->
|
||||||
<Import Project="Generated\GeneratedIncludes.props" />
|
<Import Project="Generated\GeneratedIncludes.props" />
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,27 +1,3 @@
|
|||||||
using System.Reflection;
|
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
// Information about this assembly is defined by the following attributes.
|
|
||||||
// Change them to the values specific to your project.
|
|
||||||
|
|
||||||
[assembly: AssemblyTitle("GodotSharp")]
|
|
||||||
[assembly: AssemblyDescription("")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("")]
|
|
||||||
[assembly: AssemblyCopyright("")]
|
|
||||||
[assembly: AssemblyTrademark("")]
|
|
||||||
[assembly: AssemblyCulture("")]
|
|
||||||
|
|
||||||
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
|
|
||||||
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
|
|
||||||
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
||||||
// The following attributes are used to specify the signing key for the assembly,
|
|
||||||
// if desired. See the Mono documentation for more information about signing.
|
|
||||||
|
|
||||||
//[assembly: AssemblyDelaySign(false)]
|
|
||||||
//[assembly: AssemblyKeyFile("")]
|
|
||||||
[assembly: InternalsVisibleTo("GodotSharpEditor")]
|
[assembly: InternalsVisibleTo("GodotSharpEditor")]
|
||||||
|
|||||||
@@ -1,46 +1,26 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
||||||
<ProjectGuid>{8FBEC238-D944-4074-8548-B3B524305905}</ProjectGuid>
|
<ProjectGuid>{8FBEC238-D944-4074-8548-B3B524305905}</ProjectGuid>
|
||||||
<OutputType>Library</OutputType>
|
|
||||||
<OutputPath>bin/$(Configuration)</OutputPath>
|
<OutputPath>bin/$(Configuration)</OutputPath>
|
||||||
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<RootNamespace>Godot</RootNamespace>
|
<RootNamespace>Godot</RootNamespace>
|
||||||
<AssemblyName>GodotSharpEditor</AssemblyName>
|
<TargetFramework>netstandard2.0</TargetFramework>
|
||||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
|
||||||
<DocumentationFile>$(OutputPath)/$(AssemblyName).xml</DocumentationFile>
|
<DocumentationFile>$(OutputPath)/$(AssemblyName).xml</DocumentationFile>
|
||||||
<BaseIntermediateOutputPath>obj</BaseIntermediateOutputPath>
|
<EnableDefaultItems>false</EnableDefaultItems>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup>
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DefineConstants>$(DefineConstants);GODOT</DefineConstants>
|
||||||
<DebugType>portable</DebugType>
|
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<DefineConstants>$(GodotDefineConstants);GODOT;DEBUG;</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
<ConsolePause>false</ConsolePause>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<DebugType>portable</DebugType>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<DefineConstants>$(GodotDefineConstants);GODOT;</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
<ConsolePause>false</ConsolePause>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
|
|
||||||
<Reference Include="System" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="Generated\GeneratedIncludes.props" />
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\GodotSharp\GodotSharp.csproj">
|
<ProjectReference Include="..\GodotSharp\GodotSharp.csproj">
|
||||||
<Private>False</Private>
|
<Private>false</Private>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<!--
|
||||||
|
We import a props file with auto-generated includes. This works well with Rider.
|
||||||
|
However, Visual Studio and MonoDevelop won't list them in the solution explorer.
|
||||||
|
We can't use wildcards as there may be undesired old files still hanging around.
|
||||||
|
Fortunately code completion, go to definition and such still work.
|
||||||
|
-->
|
||||||
|
<Import Project="Generated\GeneratedIncludes.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
using System.Reflection;
|
|
||||||
|
|
||||||
// Information about this assembly is defined by the following attributes.
|
|
||||||
// Change them to the values specific to your project.
|
|
||||||
|
|
||||||
[assembly: AssemblyTitle("GodotSharpEditor")]
|
|
||||||
[assembly: AssemblyDescription("")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("")]
|
|
||||||
[assembly: AssemblyCopyright("")]
|
|
||||||
[assembly: AssemblyTrademark("")]
|
|
||||||
[assembly: AssemblyCulture("")]
|
|
||||||
|
|
||||||
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
|
|
||||||
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
|
|
||||||
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
||||||
// The following attributes are used to specify the signing key for the assembly,
|
|
||||||
// if desired. See the Mono documentation for more information about signing.
|
|
||||||
|
|
||||||
//[assembly: AssemblyDelaySign(false)]
|
|
||||||
//[assembly: AssemblyKeyFile("")]
|
|
||||||
Reference in New Issue
Block a user