diff --git a/.yamato/vetting-test.yml b/.yamato/vetting-test.yml index 702d91737c..d58f03e817 100644 --- a/.yamato/vetting-test.yml +++ b/.yamato/vetting-test.yml @@ -1,13 +1,13 @@ {% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file. --- # DESCRIPTION-------------------------------------------------------------------------- -# This configuration defines vetting tests for the Tools package which allows to validate if the package is in releasable state. This is important in particular because of API validation that allows to detect if we are introducing any new APIs that will force us to bump package version to new minor +# This configuration defines vetting tests for the NGO package which allows to validate if the package is in releasable state. This is important in particular because of API validation that allows to detect if we are introducing any new APIs that will force us to bump package version to new minor # If this test fails with new API error we should either make those API internal OR bump package version to new minor (note that the package version reflects the current package state) # Note that we are packing the package only (no project context) so if package have any soft dependencies then project should be used to test it (to enable those APIs) {% for editor in validation_editors.minimal -%} vetting_test: - name: MP Tools - Vetting Test (Win, {{editor}} LTS) + name: NGO - Vetting Test (Win, {{editor}} LTS) agent: { type: Unity::VM, flavor: b1.large, image: package-ci/win11:v4 } commands: - npm install -g "upm-ci-utils@stable" --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm diff --git a/Tools/scripts/BuildAutomation/connect_services.py b/Tools/scripts/BuildAutomation/connect_services.py index ac2cfa01a0..db11eeff13 100644 --- a/Tools/scripts/BuildAutomation/connect_services.py +++ b/Tools/scripts/BuildAutomation/connect_services.py @@ -35,7 +35,7 @@ def main(): # Ensure the project is marked as connected content = re.sub(r"cloudEnabled:.*", "cloudEnabled: 1", content) - with open(args.project_settings_path, 'w') as f: + with open(args.project_settings_path, 'w', encoding='UTF-8', newline='\n') as f: f.write(content) print(f"[Linker] Successfully updated {args.project_settings_path} with Project ID: {args.cloud_project_ID}, Org ID: {args.organization_ID}, Project Name: {args.project_name}") diff --git a/Tools/scripts/BuildAutomation/disable-enable-burst.py b/Tools/scripts/BuildAutomation/disable-enable-burst.py index 38845c08a3..9c295bd5a5 100644 --- a/Tools/scripts/BuildAutomation/disable-enable-burst.py +++ b/Tools/scripts/BuildAutomation/disable-enable-burst.py @@ -43,7 +43,7 @@ def create_config(settings_path): } data = {'MonoBehaviour': monobehaviour} - with open(config_name, 'w') as f: + with open(config_name, 'w', encoding='UTF-8', newline='\n') as f: json.dump(data, f) return config_name @@ -87,7 +87,7 @@ def set_burst_AOT(config_file, status): assert config is not None, 'AOT settings not found; did the burst-enabled build finish successfully?' config['MonoBehaviour']['EnableBurstCompilation'] = status - with open(config_file, 'w') as f: + with open(config_file, 'w', encoding='UTF-8', newline='\n') as f: json.dump(config, f) diff --git a/Tools/scripts/BuildAutomation/manifest_update.py b/Tools/scripts/BuildAutomation/manifest_update.py index 045ddb1776..0ad8913b8e 100644 --- a/Tools/scripts/BuildAutomation/manifest_update.py +++ b/Tools/scripts/BuildAutomation/manifest_update.py @@ -30,7 +30,7 @@ def main(): local_path_normalized = args.local_package_path.replace(os.sep, '/') manifest_data["dependencies"][args.package_name] = f"file:{local_path_normalized}" - with open(args.manifest_path, 'w') as f: + with open(args.manifest_path, 'w', encoding='UTF-8', newline='\n') as f: json.dump(manifest_data, f, indent=4) print(f"Successfully updated manifest at '{args.manifest_path}'") diff --git a/Tools/scripts/Utils/general_utils.py b/Tools/scripts/Utils/general_utils.py index 088611108c..4f1a025357 100644 --- a/Tools/scripts/Utils/general_utils.py +++ b/Tools/scripts/Utils/general_utils.py @@ -69,7 +69,7 @@ def update_package_version_by_patch(package_manifest_path): package_manifest['version'] = new_package_version - with open(package_manifest_path, 'w', encoding='UTF-8') as f: + with open(package_manifest_path, 'w', encoding='UTF-8', newline='\n') as f: json.dump(package_manifest, f, indent=4) return new_package_version @@ -166,5 +166,5 @@ def update_changelog(changelog_path, new_version, add_unreleased_template=False) ) # Write the changes - with open(changelog_path, 'w', encoding='UTF-8') as file: + with open(changelog_path, 'w', encoding='UTF-8', newline='\n') as file: file.write(final_content)