diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index f3bbe3d333a..4c02119d4d4 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -35,7 +35,8 @@ jobs: build-mono: true doc-test: true proj-conv: true - api-compat: true + # FIXME: New versioning of godot-cpp breaks the logic for this test. + #api-compat: true artifact: true # Validate godot-cpp compatibility on one arbitrary editor build. godot-cpp: true diff --git a/misc/dist/macos_tools.app/Contents/Info.plist b/misc/dist/macos_tools.app/Contents/Info.plist index 9407e3e8684..0c7faac6ca2 100644 --- a/misc/dist/macos_tools.app/Contents/Info.plist +++ b/misc/dist/macos_tools.app/Contents/Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.6 + 4.7 CFBundleSignature GODO CFBundleVersion - 4.6 + 4.7 NSMicrophoneUsageDescription Microphone access is required to capture audio. NSCameraUsageDescription diff --git a/misc/dist/windows/godot.iss b/misc/dist/windows/godot.iss index 978ae020520..3aad2bd7c56 100644 --- a/misc/dist/windows/godot.iss +++ b/misc/dist/windows/godot.iss @@ -1,5 +1,5 @@ #define MyAppName "Godot Engine" -#define MyAppVersion "4.6" +#define MyAppVersion "4.7" #define MyAppPublisher "Godot Engine contributors" #define MyAppURL "https://godotengine.org/" #define MyAppExeName "godot.exe" diff --git a/misc/extension_api_validation/4.5-stable/GH-107167.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-107167.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-107167.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-107167.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-107954.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-107954.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-107954.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-107954.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-109302.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-109302.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-109302.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-109302.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-110120.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110120.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-110120.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-110120.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-110250.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110250.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-110250.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-110250.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-110433.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110433.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-110433.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-110433.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-110767.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110767.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-110767.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-110767.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-110867.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-110867.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-110867.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-110867.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-111117.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111117.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-111117.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-111117.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-111212.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111212.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-111212.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-111212.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-111439.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-111439.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-111439.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-111439.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-112290.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112290.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-112290.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-112290.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-112379.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112379.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-112379.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-112379.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-112539.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-112539.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-112539.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-112539.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-113172.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-113172.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-113172.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-113172.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-113459.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-113459.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-113459.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-113459.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-114053.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-114053.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-114053.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-114053.txt diff --git a/misc/extension_api_validation/4.5-stable/GH-90411.txt b/misc/extension_api_validation/4.5-stable_4.6-stable/GH-90411.txt similarity index 100% rename from misc/extension_api_validation/4.5-stable/GH-90411.txt rename to misc/extension_api_validation/4.5-stable_4.6-stable/GH-90411.txt diff --git a/misc/extension_api_validation/4.6-stable/GH-XXXXXX.txt b/misc/extension_api_validation/4.6-stable/GH-XXXXXX.txt new file mode 100644 index 00000000000..179085d974f --- /dev/null +++ b/misc/extension_api_validation/4.6-stable/GH-XXXXXX.txt @@ -0,0 +1,11 @@ +# This file should contain expected output of --validate-extension-api when run against the extension_api.json of the 4.6-stable tag. +# Only lines that start with "Validate extension JSON:" matter, everything else is considered a comment and ignored. +# They should instead be used to justify these changes and describe how users should work around these changes. + +GH-{PR_NUMBER} +-------------- + +Validate extension .... +Validate extension .... + +Description of changes. diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj index db527df44a5..b3d8bf3d26a 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj @@ -7,7 +7,7 @@ Godot Engine contributors Godot.NET.Sdk - 4.6.0 + 4.7.0 $(PackageVersion_Godot_NET_Sdk) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk $(RepositoryUrl) diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj index 8c311555f68..1a4f8bb205a 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj @@ -10,7 +10,7 @@ Godot Engine contributors Godot.SourceGenerators - 4.6.0 + 4.7.0 $(PackageVersion_Godot_SourceGenerators) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators $(RepositoryUrl) diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj index 9d0aa4ad48e..474fdc9c944 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj @@ -19,7 +19,7 @@ Godot Engine contributors GodotSharp - 4.6.0 + 4.7.0 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp $(RepositoryUrl) diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj index a163dcac025..011b74e595e 100644 --- a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj @@ -15,7 +15,7 @@ Godot Engine contributors GodotSharpEditor - 4.6.0 + 4.7.0 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor $(RepositoryUrl) diff --git a/version.py b/version.py index 30f4b372eb3..8cf4b011a8c 100644 --- a/version.py +++ b/version.py @@ -1,9 +1,9 @@ short_name = "godot" name = "Godot Engine" major = 4 -minor = 6 +minor = 7 patch = 0 -status = "stable" +status = "dev" module_config = "" website = "https://godotengine.org" -docs = "4.6" +docs = "latest"