Merge branch '3.0-dev' into joslobo/merge-for-april-update

Author: jslobodzian

.github/workflows/check-entangled-specs.yml

@@ -31,5 +31,9 @@ jobs:
       - name: Get Python dependencies
         run: python3 -m pip install -r toolkit/scripts/requirements.txt
 
-      - name: Run entanglement checking script
+      # Run unit test for check_entangled_specs.py before invoking it
+      - name: Unit test for spec entanglement check
+        run: PYTHONPATH=toolkit/scripts python3 toolkit/scripts/tests/test_check_entangled_specs.py
+
+      - name: Run spec entanglement checking script
         run: python3 toolkit/scripts/check_entangled_specs.py .

CONTRIBUTING.md

@@ -65,7 +65,7 @@ Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https:
 
 ## Develop for Azure Linux
 
-When starting to develop for Azure Linux, use the [Azure LinuxTutorials](https://github.com/microsoft/AzureLinux-Tutorials) repo. This repository guides developers on using Azure Linux's tools to customize or add new packages or images. Once you have confirmed your change builds and functions as expected, consider whether it should be added to the core repo, [Azure Linux](https://github.com/microsoft/azurelinux). Please see our [quickstart](toolkit/docs/quick_start/quickstart.md) for a tutorial and [building instructions](toolkit/docs/building/building.md) for an in-depth overview of building within Azure Linux. Please adhere to the [Pull Request guidelines](pull-request-guidelines) when contributing.
+When starting to develop for Azure Linux, use the [Azure LinuxTutorials](https://github.com/microsoft/AzureLinux-Tutorials) repo. This repository guides developers on using Azure Linux's tools to customize or add new packages or images. Once you have confirmed your change builds and functions as expected, consider whether it should be added to the core repo, [Azure Linux](https://github.com/microsoft/azurelinux). Please see our [quickstart](toolkit/docs/quick_start/quickstart.md) for a tutorial and [building instructions](toolkit/docs/building/building.md) for an in-depth overview of building within Azure Linux. Please adhere to the [Pull Request guidelines](#pull-request-guidelines) when contributing.
 
 ### Packages
 
@@ -95,25 +95,25 @@ We welcome documentation improvements. See [toolkit/docs](toolkit/docs) for the
 
 ## Pull Request Guidelines
 
-Please direct pull requests to the desired development branch. Development changes to `2.0` should target `main`. Development changes to `1.0` should target `1.0-dev`.
+Please direct pull requests to the desired development branch. Development changes to `3.0` should target `3.0-dev`. Development changes to `2.0` should target `main`. `1.0` is deprecated and should not be used.
 
 ### Branch structure
 
 An overview of how the branches are structured can be seen below
 
-| Branch / Tag | For PRs | Published | Notes
-|:-------------|:--------|:----------|:------------
-|main          |Yes       |No         | **Primary development branch**
-|2.0           |No       |Yes - eventually   | Staging branch for publishing
-|2.0-stable    |No       |  Yes      | Last published release
-|2.0-preview   |No       |No         | Publishing in progress
+| Git Ref      | Branch / Tag | For PRs | Published | Notes
+|:-------------|:-------------|:--------|:----------|:------------
+|3.0-dev       |Branch        |Yes      |No         | **Primary development branch**
+|3.0           |Branch        |No       |Yes - eventually | Staging branch for publishing
+|3.0-preview   |Tag           |No       |No         | Publishing in progress
+|3.0-stable    |Tag           |No       |Yes        | Last published release
 
-| Branch / Tag | For PRs | Published | Notes
-|:-------------|:--------|:----------|:------------
-|1.0-dev       |Yes      |No         | Development branch for 1.0
-|1.0           |No       |Yes - eventually    | Staging branch for publishing
-|1.0-stable    |No       |Yes        | Last published release
-|1.0-preview   |No       |No         | Publishing in progress
+| Git Ref      | Branch / Tag | For PRs | Published | Notes
+|:-------------|:-------------|:--------|:----------|:------------
+|main          |Branch        |Yes      |No         | **Primary development branch**
+|2.0           |Branch        |No       |Yes - eventually | Staging branch for publishing
+|2.0-preview   |Tag           |No       |No         | Publishing in progress
+|2.0-stable    |Tag           |No       |Yes        | Last published release
 
 ### PR Titles
 
@@ -134,7 +134,7 @@ Please avoid titles such as
 ```bash
 - package: <whatever you did to the package>
 - CVE-XXXX-YYYY (leaving off what package was patched or upgraded)
-- [1.0] (prefixing with branch or other information)
+- [2.0] (prefixing with branch or other information)
 ```
 
 ### PR Checklist

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -212,6 +212,7 @@
                 "enchant2",
                 "enscript",
                 "environment-modules",
+                "erofs-utils",
                 "evemu",
                 "execstack",
                 "exempi",
@@ -913,7 +914,7 @@
                 "microcode_ctl",
                 "microdnf",
                 "minicom",
-                "minizip",
+                "minizip-ng",
                 "mksh",
                 "mobile-broadband-provider-info",
                 "mock",
@@ -1594,6 +1595,7 @@
                 "pkgconf",
                 "plexus-cipher",
                 "plexus-containers",
+                "plexus-pom",
                 "plexus-sec-dispatcher",
                 "plotutils",
                 "pmdk-convert",
@@ -1643,6 +1645,7 @@
                 "python-aiodns",
                 "python-aiohttp",
                 "python-alsa",
+                "python-archspec",
                 "python-argcomplete",
                 "python-argparse-manpage",
                 "python-astroid",
@@ -1655,6 +1658,7 @@
                 "python-betamax",
                 "python-blinker",
                 "python-blivet",
+                "python-boltons",
                 "python-breathe",
                 "python-cached_property",
                 "python-cbor2",
@@ -1664,7 +1668,9 @@
                 "python-cmd2",
                 "python-colorama",
                 "python-CommonMark",
+                "python-conda-libmamba-solver",
                 "python-conda-package-handling",
+                "python-conda-package-streaming",
                 "python-configshell",
                 "python-cpuinfo",
                 "python-cups",
@@ -1747,6 +1753,7 @@
                 "python-mccabe",
                 "python-mdurl",
                 "python-memcached",
+                "python-menuinst",
                 "python-mimeparse",
                 "python-mock",
                 "python-monotonic",
@@ -1782,6 +1789,7 @@
                 "python-pymongo",
                 "python-PyMySQL",
                 "python-pyperclip",
+                "python-pyproject-api",
                 "python-pyproject-metadata",
                 "python-pyroute2",
                 "python-pyrsistent",
@@ -1888,6 +1896,7 @@
                 "python-yubico",
                 "python-zipp",
                 "python-zmq",
+                "python-zstandard",
                 "python-zstd",
                 "python3-mallard-ducktype",
                 "python3-pytest-asyncio",
@@ -2624,7 +2633,6 @@
                 "patterns-ceph-containers",
                 "plexus-classworlds",
                 "plexus-interpolation",
-                "plexus-pom",
                 "plexus-utils",
                 "proj",
                 "psl-make-dafsa",
@@ -2807,6 +2815,7 @@
                 "kernel",
                 "kernel-64k",
                 "kernel-headers",
+                "kernel-ipe",
                 "kernel-mshv",
                 "kernel-rt",
                 "kernel-uvm",