diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 46cabc05c..07b12e3cb 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -37,11 +37,11 @@ api_validation_-_cinemachine_-_2022_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 triggers: expression: push.branch match "^release/.*" cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index 8902d3f97..fb98bc281 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -23,8 +23,8 @@ package_pack_-_cinemachine: - upm-ci~/packages/**/* variables: UPMCI_ACK_LARGE_PACKAGE: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 2acffa24e..85927e400 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -19,7 +19,7 @@ all_preview_apv_jobs: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 2021.3 manifest (MacOS). preview_apv_-_2021_3_-_macos: @@ -65,10 +65,10 @@ preview_apv_-_2021_3_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 2021.3 manifest (Ubuntu). preview_apv_-_2021_3_-_ubuntu: @@ -114,10 +114,10 @@ preview_apv_-_2021_3_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 2021.3 manifest (Windows). preview_apv_-_2021_3_-_windows: @@ -163,10 +163,10 @@ preview_apv_-_2021_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 2022.3 manifest (MacOS). preview_apv_-_2022_3_-_macos: @@ -212,10 +212,10 @@ preview_apv_-_2022_3_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu). preview_apv_-_2022_3_-_ubuntu: @@ -261,10 +261,10 @@ preview_apv_-_2022_3_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 2022.3 manifest (Windows). preview_apv_-_2022_3_-_windows: @@ -310,10 +310,10 @@ preview_apv_-_2022_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos: @@ -359,10 +359,10 @@ preview_apv_-_6000_0_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu: @@ -408,10 +408,10 @@ preview_apv_-_6000_0_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_windows: @@ -457,8 +457,8 @@ preview_apv_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index ce7e08943..3376ba3a9 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -69,10 +69,10 @@ publish_cinemachine: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 # Publish Dry Run for cinemachine to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_dry_run_cinemachine: @@ -142,11 +142,11 @@ publish_dry_run_cinemachine: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 triggers: expression: push.branch match "^release/.*" cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 9d33b8a98..467205d36 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -53,10 +53,10 @@ validate_-_cinemachine_-_2022_3_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 labels: - Packages:cinemachine @@ -112,10 +112,10 @@ validate_-_cinemachine_-_2022_3_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 labels: - Packages:cinemachine @@ -171,10 +171,10 @@ validate_-_cinemachine_-_2022_3_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 labels: - Packages:cinemachine @@ -230,10 +230,10 @@ validate_-_cinemachine_-_6000_0_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 labels: - Packages:cinemachine @@ -289,10 +289,10 @@ validate_-_cinemachine_-_6000_0_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 labels: - Packages:cinemachine @@ -348,10 +348,10 @@ validate_-_cinemachine_-_6000_0_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.2.0 + UPMPVP_CONTEXT_WRENCH: 0.10.3.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.2.0 + Wrench: 0.10.3.0 labels: - Packages:cinemachine diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 75c15ef8c..7aeaffc21 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -22,6 +22,6 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_cinemachine", "branch_pattern": "ReleaseSlash", - "wrench_version": "0.10.2.0", + "wrench_version": "0.10.3.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json" } \ No newline at end of file diff --git a/Tools/CineMachine-Recipes/Cinemachine.Cookbook.csproj b/Tools/CineMachine-Recipes/Cinemachine.Cookbook.csproj index 1c359a010..9db0823d9 100644 --- a/Tools/CineMachine-Recipes/Cinemachine.Cookbook.csproj +++ b/Tools/CineMachine-Recipes/Cinemachine.Cookbook.csproj @@ -8,7 +8,7 @@ - + diff --git a/Tools/CineMachine-Recipes/Settings/CinemachineSettings.cs b/Tools/CineMachine-Recipes/Settings/CinemachineSettings.cs index 72fb27de3..ed4be1e80 100644 --- a/Tools/CineMachine-Recipes/Settings/CinemachineSettings.cs +++ b/Tools/CineMachine-Recipes/Settings/CinemachineSettings.cs @@ -6,7 +6,7 @@ namespace Cinemachine.Cookbook.Settings; public class CinemachineSettings { // Path from the root of the repository where packages are located. - string[] PackagesRootPath = { "." }; + string[] PackagesRootPaths = { "." }; // update this to list all packages in this repo that you want to release. Dictionary PackageOptions = new() @@ -30,7 +30,7 @@ public class CinemachineSettings public CinemachineSettings() { Wrench = new WrenchSettings( - PackagesRootPath, + PackagesRootPaths, PackageOptions, useLocalPvpExemptions: true );