Resolved conflicts in merge from stabilization/2106 -> development.

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py

@@ -105,7 +105,7 @@ class TestGeneralGraphFunctionality(object):
 
     @pytest.mark.test_case_id("C17488412")
     @pytest.mark.SUITE_periodic
-    @pytest.mark.xfail      # https://github.com/o3de/o3de/issues/2201
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2201")
     def test_LandscapeCanvas_GraphClosed_OnEntityDelete(self, request, editor, level, launcher_platform):
         cfg_args = [level]
 

cmake/Packaging.cmake

@@ -129,7 +129,7 @@ install(FILES ${_cmake_package_dest}
 # the version string and git tags are intended to be synchronized so it should be safe to use that instead
 # of directly calling into git which could get messy in certain scenarios
 if(${CPACK_PACKAGE_VERSION} VERSION_GREATER "0.0.0.0")
-    set(_3rd_party_license_filename SPDX-Licenses.txt)
+    set(_3rd_party_license_filename NOTICES.txt)
 
     set(_3rd_party_license_url "https://raw.githubusercontent.com/o3de/3p-package-source/${CPACK_PACKAGE_VERSION}/${_3rd_party_license_filename}")
     set(_3rd_party_license_dest ${CPACK_BINARY_DIR}/${_3rd_party_license_filename})

cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in

@@ -4,15 +4,15 @@
     <Window Width="672" Height="500" HexStyle="100a0000" FontId="2">#(loc.WindowTitle)</Window>
 
     <!-- header font -->
-    <Font Id="0" Height="-24" Weight="500" Foreground="000000">Open Sans</Font>
+    <Font Id="0" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
     <!-- body font -->
-    <Font Id="1" Height="-12" Weight="500" Foreground="000000">Open Sans</Font>
+    <Font Id="1" Height="-12" Weight="500" Foreground="000000">Segoe UI</Font>
     <!-- special font -->
-    <Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Open Sans</Font>
+    <Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
     <!-- throwaway font for button bar -->
-    <Font Id="3" Height="-12" Weight="500" Foreground="EEEEEE" Background="EEEEEE">Open Sans</Font>
+    <Font Id="3" Height="-12" Weight="500" Foreground="EEEEEE" Background="EEEEEE">Segoe UI</Font>
     <!-- special font for install warning title -->
-    <Font Id="4" Height="-14" Weight="500" Foreground="000000">Open Sans</Font>
+    <Font Id="4" Height="-14" Weight="500" Foreground="000000">Segoe UI</Font>
 
     <!-- top banner -->
     <Image X="28" Y="24" Width="168" Height="64" ImageFile="logo.png" Visible="yes"/>

scripts/license_scanner/license_scanner.py

@@ -0,0 +1,129 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+import argparse
+import fnmatch
+import json
+import os
+import pathlib
+import re
+import sys
+
+
+class LicenseScanner:
+    """Class to contain license scanner.
+
+    Scans source tree for license files using provided filename patterns and generates a file
+    with the contents of all the licenses.
+
+    :param config_file: Config file with license patterns and scanner settings
+    """
+
+    DEFAULT_CONFIG_FILE = 'scanner_config.json'
+
+    def __init__(self, config_file=None):
+        self.config_file = config_file
+        self.config_data = self._load_config()
+        self.license_regex = self._load_license_regex()
+
+    def _load_config(self):
+        """Load config from the provided file. Sets default file if one is not provided."""
+        if self.config_file is None:
+            script_directory = os.path.dirname(os.path.abspath(__file__))  # Default file expected in same dir as script
+            self.config_file = os.path.join(script_directory, self.DEFAULT_CONFIG_FILE)
+
+        try:
+            with open(self.config_file) as f:
+                return json.load(f)
+        except FileNotFoundError:
+            print('Config file cannot be found')
+            raise
+
+    def _load_license_regex(self):
+        """Returns regex object with case-insensitive matching from the list of filename patterns."""
+        regex_patterns = []
+        for pattern in self.config_data['license_patterns']:
+            regex_patterns.append(fnmatch.translate(pattern))
+        return re.compile('|'.join(regex_patterns), re.IGNORECASE)
+
+    def scan(self, path=os.curdir):
+        """Scan directory tree for filenames matching license_regex.
+
+        :param path: Path of the directory to run scanner
+        :return: Package paths and their corresponding license file contents
+        :rtype: dict
+        """
+        licenses = 0
+        license_files = {}
+
+        for dirpath, dirnames, filenames in os.walk(path):
+            for file in filenames:
+                if self.license_regex.match(file):
+                    license_file_content = self._get_license_file_contents(os.path.join(dirpath, file))
+                    rel_dirpath = os.path.relpath(dirpath, path)  # Limit path inside scanned directory
+                    license_files[rel_dirpath] = license_file_content
+                    licenses += 1
+                    print(f'License file: {os.path.join(dirpath, file)}')
+
+            # Remove directories that should not be scanned
+            for dir in self.config_data['excluded_directories']:
+                if dir in dirnames:
+                    dirnames.remove(dir)
+        print(f'{licenses} license files found.')
+        return license_files
+
+    def _get_license_file_contents(self, filepath):
+        try:
+            with open(filepath, encoding='utf8') as f:
+                return f.read()
+        except UnicodeDecodeError:
+            print(f'Unable to read license file: {filepath}')
+            pass
+
+    def create_license_file(self, licenses, filepath='NOTICES.txt'):
+        """Creates file with all the provided license file contents.
+
+        :param licenses: Dict with package paths and their corresponding license file contents
+        :param filepath: Path to write the file
+       """
+        package_separator = '------------------------------------'
+        with open(filepath, 'w', encoding='utf8') as f:
+            for directory, license in licenses.items():
+                license_output = '\n\n'.join([
+                    f'{package_separator}',
+                    f'Package path: {directory}',
+                    'License:',
+                    f'{license}\n'
+                ])
+                f.write(license_output)
+        return None
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description='Script to run LicenseScanner and generate license file')
+    parser.add_argument('--config-file', '-c', type=pathlib.Path, help='Config file for LicenseScanner')
+    parser.add_argument('--license-file-path', '-l', type=pathlib.Path, help='Create license file in the provided path')
+    parser.add_argument('--scan-path', '-s', default=os.curdir, type=pathlib.Path, help='Path to scan')
+    return parser.parse_args()
+
+
+def main():
+    try:
+        args = parse_args()
+        ls = LicenseScanner(args.config_file)
+        licenses = ls.scan(args.scan_path)
+
+        if args.license_file_path:
+            ls.create_license_file(licenses, args.license_file_path)
+    except FileNotFoundError as e:
+        print(f'Type: {type(e).__name__}, Error: {e}')
+        return 1
+
+
+if __name__ == '__main__':
+    sys.exit(main())

scripts/license_scanner/scanner_config.json

@@ -0,0 +1,12 @@
+{
+    "excluded_directories": [
+        ".git",
+        ".venv",
+        "build",
+        "license_scanner"
+    ],
+    "license_patterns": [
+        "LICENSE*",
+        "COPYING*"
+    ]
+}