Merge remote-tracking branch 'upstream/main' into lg/postgres-win-update

This commit is contained in:
lawrencegripper
2025-01-14 09:30:03 +00:00
36 changed files with 550 additions and 457 deletions

View File

@@ -17,14 +17,13 @@
"arch": "x64",
"platform" : "win32",
"versions": [
"3.7.*",
"3.8.*",
"3.9.*",
"3.10.*",
"3.11.*",
"3.12.*"
],
"default": "3.7.*"
"default": "3.9.*"
},
{
"name": "Python",
@@ -32,7 +31,6 @@
"arch": "x86",
"platform" : "win32",
"versions": [
"3.7.*",
"3.8.*",
"3.9.*",
"3.10.*",
@@ -410,7 +408,6 @@
"dotnet": {
"versions": [
"6.0",
"7.0",
"8.0",
"9.0"
],
@@ -452,7 +449,7 @@
"default": "18.*"
},
"maven": {
"version": "3.8"
"version": "3.9"
},
"mysql": {
"version": "5.7",

View File

@@ -17,7 +17,6 @@
"arch": "x64",
"platform" : "win32",
"versions": [
"3.7.*",
"3.8.*",
"3.9.*",
"3.10.*",
@@ -32,7 +31,6 @@
"arch": "x86",
"platform" : "win32",
"versions": [
"3.7.*",
"3.8.*",
"3.9.*",
"3.10.*",
@@ -321,7 +319,6 @@
"dotnet": {
"versions": [
"6.0",
"7.0",
"8.0",
"9.0"
],
@@ -362,7 +359,7 @@
"default": "18.*"
},
"maven": {
"version": "3.8"
"version": "3.9"
},
"mysql": {
"version": "8.0",

View File

@@ -86,8 +86,8 @@
"android": {
"commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-12266719_latest.zip",
"hash": "F9088C04A44F1F37A8A3A228A7663E11AE9445FA07529C96CEF38ACB985A88F3",
"platform_min_version": "35",
"build_tools_min_version": "35.0.0",
"platform_min_version": "34",
"build_tools_min_version": "34.0.0",
"extras": [
"android;m2repository",
"google;m2repository",
@@ -136,8 +136,6 @@
"Component.Linux.CMake",
"Component.UnityEngine.x64",
"Microsoft.Component.VC.Runtime.UCRTSDK",
"Microsoft.Net.Component.4.7.TargetingPack",
"Microsoft.Net.Component.4.7.2.TargetingPack",
"Microsoft.Net.Component.4.8.1.SDK",
"Microsoft.Net.Component.4.8.1.TargetingPack",
"Microsoft.VisualStudio.Component.AspNet45",