diff --git a/core/tauri-config-schema/schema.json b/core/tauri-config-schema/schema.json index 1b6baaddbe04..6cb58cd362e9 100644 --- a/core/tauri-config-schema/schema.json +++ b/core/tauri-config-schema/schema.json @@ -248,7 +248,6 @@ }, "version": { "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field. If removed the version number from `Cargo.toml` is used.", - "default": null, "type": [ "string", "null" diff --git a/core/tests/app-updater/tests/fixtures/tauri-v1/Cargo.lock b/core/tests/app-updater/tests/fixtures/tauri-v1/Cargo.lock index 6180f5b715ba..80e222939641 100644 --- a/core/tests/app-updater/tests/fixtures/tauri-v1/Cargo.lock +++ b/core/tests/app-updater/tests/fixtures/tauri-v1/Cargo.lock @@ -3003,10 +3003,12 @@ dependencies = [ "ignore", "indexmap 1.9.3", "infer", + "log", "minisign-verify", "objc", "once_cell", "percent-encoding", + "plist", "rand 0.8.5", "raw-window-handle", "reqwest", diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Headers b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Headers new file mode 120000 index 000000000000..a177d2a6b926 --- /dev/null +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Modules b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Modules new file mode 120000 index 000000000000..5736f3186e79 --- /dev/null +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Modules @@ -0,0 +1 @@ +Versions/Current/Modules \ No newline at end of file diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Resources b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Resources new file mode 120000 index 000000000000..953ee36f3bb7 --- /dev/null +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Headers/test.h b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Headers/test.h new file mode 100644 index 000000000000..3539143d0dd8 --- /dev/null +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Headers/test.h @@ -0,0 +1,18 @@ +// +// test.h +// test +// +// Created by Trey Smith on 9/15/23. +// + +#import + +//! Project version number for test. +FOUNDATION_EXPORT double testVersionNumber; + +//! Project version string for test. +FOUNDATION_EXPORT const unsigned char testVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Modules/module.modulemap b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Modules/module.modulemap new file mode 100644 index 000000000000..f1545257a73d --- /dev/null +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module test { + umbrella header "test.h" + + export * + module * { export * } +} diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Resources/Info.plist b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Resources/Info.plist new file mode 100644 index 000000000000..6f736f0a2b46 --- /dev/null +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,46 @@ + + + + + BuildMachineOSBuild + 22D68 + CFBundleDevelopmentRegion + en + CFBundleExecutable + test + CFBundleIdentifier + com.tauri.test + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + test + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 1 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + + DTPlatformName + macosx + DTPlatformVersion + 13.3 + DTSDKBuild + 22E245 + DTSDKName + macosx13.3 + DTXcode + 1431 + DTXcodeBuild + 14E300c + LSMinimumSystemVersion + 13.2 + + diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/_CodeSignature/CodeResources b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/_CodeSignature/CodeResources new file mode 100644 index 000000000000..82d2063275e6 --- /dev/null +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/_CodeSignature/CodeResources @@ -0,0 +1,142 @@ + + + + + files + + Resources/Info.plist + + /aPV7Q20g0elr7OiZJoUNggTOcg= + + + files2 + + Headers/test.h + + hash2 + + 5RA6Mnq5sNoaC4wKcFe6zymVmEL5Vb44G4BGqFjgZMM= + + + Modules/module.modulemap + + hash2 + + C6uLLSnQu9M2qLElVCkeo2JpnvWMxtArinQzmlh3v2A= + + + Resources/Info.plist + + hash2 + + nPMotNIMgvMfHtkRdpeehzfBiCZLnksfiD3nldUPzTE= + + + + rules + + ^Resources/ + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Resources/Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^Resources/ + + weight + 20 + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Resources/Base\.lproj/ + + weight + 1010 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/test b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/test new file mode 100755 index 000000000000..687eb01d82bd Binary files /dev/null and b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/test differ diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/Current b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/Current new file mode 120000 index 000000000000..8c7e5a667f1b --- /dev/null +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/tauri.conf.json b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/tauri.conf.json index 43c2babfb81e..f4edb68d89d9 100644 --- a/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/tauri.conf.json +++ b/core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/tauri.conf.json @@ -14,7 +14,12 @@ "../../../../../../../examples/.icons/128x128@2x.png", "../../../../../../../examples/.icons/icon.icns", "../../../../../../../examples/.icons/icon.ico" - ] + ], + "macOS": { + "frameworks": [ + "./frameworks/test.framework" + ] + } }, "version": "1.0.0", "identifier": "com.tauri.updater", diff --git a/tooling/cli/schema.json b/tooling/cli/schema.json index 1b6baaddbe04..6cb58cd362e9 100644 --- a/tooling/cli/schema.json +++ b/tooling/cli/schema.json @@ -248,7 +248,6 @@ }, "version": { "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field. If removed the version number from `Cargo.toml` is used.", - "default": null, "type": [ "string", "null"