diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2024-03-02 10:48:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 10:48:25 +0100 |
| commit | f2045ba822bff7d34964901393581a3117c394a9 (patch) | |
| tree | ef4d0bac04a7831fc203679500c22d92f29a4e33 /modules | |
| parent | dad6c774b019ef8c5dccb4a1955c6a77b41a323e (diff) | |
| parent | 97851f03401537b7fa0affc50a5800eda351c4b8 (diff) | |
| download | redot-engine-f2045ba822bff7d34964901393581a3117c394a9.tar.gz | |
Merge pull request #88933 from raulsntos/dotnet/pre-commit
Move dotnet-format script to pre-commit
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj | 2 | ||||
| -rw-r--r-- | modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj index db16b1fe1d..d54942e654 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj @@ -142,5 +142,5 @@ 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" /> + <Import Condition=" '$(GodotSkipGenerated)' == '' " Project="Generated\GeneratedIncludes.props" /> </Project> diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj index 31e20e4ecd..c32cbcd3d1 100644 --- a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj @@ -44,5 +44,5 @@ 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" /> + <Import Condition=" '$(GodotSkipGenerated)' == '' " Project="Generated\GeneratedIncludes.props" /> </Project> |