diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a35525c98f82e7..e6c25edd830580 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,86 +6,86 @@ This file should be imported by eng/Versions.props - 5.7.0-1.26257.113 - 5.7.0-1.26257.113 - 5.7.0-1.26257.113 - 11.0.100-preview.5.26257.113 - 11.0.100-preview.5.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 0.11.5-preview.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 11.0.0-beta.26257.113 - 3.2.2-beta.26257.113 - 2.9.3-beta.26257.113 - 11.0.0-beta.26257.113 - 5.7.0-1.26257.113 - 11.0.0-preview.5.26257.113 - 11.0.100-preview.5.26257.113 - 11.0.0-preview.5.26257.113 - 11.0.0-preview.5.26257.113 - 7.7.0-rc.25813 - 7.7.0-rc.25813 - 7.7.0-rc.25813 - 7.7.0-rc.25813 - 11.0.0-preview.5.26257.113 - 3.0.0-preview.5.26257.113 - 11.0.0-preview.5.26257.113 - 11.0.0-preview.5.26257.113 - 11.0.0-preview.5.26257.113 + 5.8.0-1.26266.103 + 5.8.0-1.26266.103 + 5.8.0-1.26266.103 + 11.0.100-preview.5.26266.103 + 11.0.100-preview.5.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 0.11.5-preview.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 11.0.0-beta.26266.103 + 3.2.2-beta.26258.110 + 2.9.3-beta.26266.103 + 11.0.0-beta.26266.103 + 5.8.0-1.26266.103 + 11.0.0-preview.5.26266.103 + 11.0.100-preview.5.26266.103 + 11.0.0-preview.5.26266.103 + 11.0.0-preview.5.26266.103 + 7.8.0-rc.26703 + 7.8.0-rc.26703 + 7.8.0-rc.26703 + 7.8.0-rc.26703 + 11.0.0-preview.5.26266.103 + 3.0.0-preview.5.26266.103 + 11.0.0-preview.5.26266.103 + 11.0.0-preview.5.26266.103 + 11.0.0-preview.5.26266.103 11.0.0-alpha.1.26181.1 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 - 19.1.0-alpha.1.26208.2 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 + 19.1.0-alpha.1.26256.1 - 11.0.0-alpha.1.26208.5 - 11.0.0-alpha.1.26208.5 - 11.0.0-alpha.1.26208.5 - 11.0.0-alpha.1.26208.5 - 11.0.0-alpha.1.26208.5 - 11.0.0-alpha.1.26208.5 - 11.0.0-alpha.1.26208.5 - 11.0.0-alpha.1.26208.5 + 11.0.0-alpha.1.26257.1 + 11.0.0-alpha.1.26257.1 + 11.0.0-alpha.1.26257.1 + 11.0.0-alpha.1.26257.1 + 11.0.0-alpha.1.26257.1 + 11.0.0-alpha.1.26257.1 + 11.0.0-alpha.1.26257.1 + 11.0.0-alpha.1.26257.1 1.0.0-prerelease.26080.1 1.0.0-prerelease.26080.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a357698eefc928..40ee18032e5b9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,127 +1,127 @@ - + https://github.com/dotnet/icu 8fe317e707aaa0ab5afeafa926b03cb8deb22d09 - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a https://github.com/dotnet/runtime-assets @@ -175,117 +175,117 @@ https://github.com/dotnet/runtime-assets 509fb52c027cd46fab093f10c89691cda982edc4 - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/llvm-project - db9a80a3e25e21268d55cf3385298dc03cfbed4d + 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness 0668c80ec27851f3c7f1b3e4536110a1d39af587 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -323,29 +323,29 @@ https://github.com/dotnet/runtime-assets 509fb52c027cd46fab093f10c89691cda982edc4 - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -357,53 +357,53 @@ - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/dotnet - 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf + 3a62cc842c76761d4742f1d103892f19fd06dd3a - + https://github.com/dotnet/node - cfe285c85ac61bde50792e8d516e31b302846f53 + a4f7001208c9c58890b2f07ccee93112a44f8934 - + https://github.com/dotnet/node - cfe285c85ac61bde50792e8d516e31b302846f53 + a4f7001208c9c58890b2f07ccee93112a44f8934 - + https://github.com/dotnet/node - cfe285c85ac61bde50792e8d516e31b302846f53 + a4f7001208c9c58890b2f07ccee93112a44f8934 - + https://github.com/dotnet/node - cfe285c85ac61bde50792e8d516e31b302846f53 + a4f7001208c9c58890b2f07ccee93112a44f8934 - + https://github.com/dotnet/node - cfe285c85ac61bde50792e8d516e31b302846f53 + a4f7001208c9c58890b2f07ccee93112a44f8934 - + https://github.com/dotnet/node - cfe285c85ac61bde50792e8d516e31b302846f53 + a4f7001208c9c58890b2f07ccee93112a44f8934 - + https://github.com/dotnet/node - cfe285c85ac61bde50792e8d516e31b302846f53 + a4f7001208c9c58890b2f07ccee93112a44f8934 - + https://github.com/dotnet/node - cfe285c85ac61bde50792e8d516e31b302846f53 + a4f7001208c9c58890b2f07ccee93112a44f8934 https://github.com/dotnet/runtime-assets diff --git a/eng/common/AGENTS.md b/eng/common/AGENTS.md new file mode 100644 index 00000000000000..a5ed8f72926d3d --- /dev/null +++ b/eng/common/AGENTS.md @@ -0,0 +1,5 @@ +# `eng/common` + +Files under `eng/common` come from [Arcade](https://github.com/dotnet/arcade). +Edits in `eng/common` will be overwritten by automation unless the changes are made directly in the Arcade repository. +For more information, see the [Arcade documentation](https://github.com/dotnet/arcade/tree/main/Documentation). diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index eefed3b667a4fb..86ea9f63504243 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -22,6 +22,7 @@ parameters: GitHubOrg: dotnet MirrorRepo: '' MirrorBranch: main + xLocCustomPowerShellScript: '' condition: '' JobNameSuffix: '' is1ESPipeline: '' @@ -97,6 +98,8 @@ jobs: gitHubOrganization: ${{ parameters.GitHubOrg }} mirrorRepo: ${{ parameters.MirrorRepo }} mirrorBranch: ${{ parameters.MirrorBranch }} + ${{ if ne(parameters.xLocCustomPowerShellScript, '') }}: + xLocCustomPowerShellScript: ${{ parameters.xLocCustomPowerShellScript }} condition: ${{ parameters.condition }} # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 84a1922c73f392..5fc099a1143dff 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -33,8 +33,6 @@ steps: '$(publishing-dnceng-devdiv-code-r-build-re)' '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' - '$(microsoft-symbol-server-pat)' - '$(symweb-symbol-server-pat)' '$(dnceng-symbol-server-pat)' '$(dn-bot-all-orgs-build-rw-code-rw)' '$(System.AccessToken)' diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 314c93c57598d8..cef5d2d6716aa3 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -5,7 +5,7 @@ set -e usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" - echo "BuildArch can be: arm(default), arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64, x86" + echo "BuildArch can be: arm(default), arm64, loongarch64, ppc64le, riscv64, s390x, x64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" echo " for alpine can be specified with version: alpineX.YY or alpineedge" echo " for FreeBSD can be: freebsd13, freebsd14" @@ -139,7 +139,6 @@ __AlpineKeys=' 616db30d:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0\nlIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm\na6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw\ntO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C\nUS/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP\nhP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv\nLSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0\nx9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF\nwmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG\nLPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV\nGZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C\n8CM1S15HxV78s9dFntEqIokCAwEAAQ== 66ba20fe:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtfB12w4ZgqsXWZDfUAV/\n6Y4aHUKIu3q4SXrNZ7CXF9nXoAVYrS7NAxJdAodsY3vPCN0g5O8DFXR+390LdOuQ\n+HsGKCc1k5tX5ZXld37EZNTNSbR0k+NKhd9h6X3u6wqPOx7SIKxwAQR8qeeFq4pP\nrt9GAGlxtuYgzIIcKJPwE0dZlcBCg+GnptCUZXp/38BP1eYC+xTXSL6Muq1etYfg\nodXdb7Yl+2h1IHuOwo5rjgY5kpY7GcAs8AjGk3lDD/av60OTYccknH0NCVSmPoXK\nvrxDBOn0LQRNBLcAfnTKgHrzy0Q5h4TNkkyTgxkoQw5ObDk9nnabTxql732yy9BY\ns+hM9+dSFO1HKeVXreYSA2n1ndF18YAvAumzgyqzB7I4pMHXq1kC/8bONMJxwSkS\nYm6CoXKyavp7RqGMyeVpRC7tV+blkrrUml0BwNkxE+XnwDRB3xDV6hqgWe0XrifD\nYTfvd9ScZQP83ip0r4IKlq4GMv/R5shcCRJSkSZ6QSGshH40JYSoiwJf5FHbj9ND\n7do0UAqebWo4yNx63j/wb2ULorW3AClv0BCFSdPsIrCStiGdpgJDBR2P2NZOCob3\nG9uMj+wJD6JJg2nWqNJxkANXX37Qf8plgzssrhrgOvB0fjjS7GYhfkfmZTJ0wPOw\nA8+KzFseBh4UFGgue78KwgkCAwEAAQ== ' -__Keyring= __KeyringFile="/usr/share/keyrings/ubuntu-archive-keyring.gpg" __SkipSigCheck=0 __SkipEmulation=0 @@ -162,6 +161,10 @@ while :; do __AlpineArch=armv7 __QEMUArch=arm ;; + armel) + # this is only used for tizen-build-rootfs.sh + __BuildArch=armel + ;; arm64) __BuildArch=arm64 __UbuntuArch=arm64 @@ -172,31 +175,6 @@ while :; do __OpenBSDArch=arm64 __OpenBSDMachineArch=aarch64 ;; - armel) - __BuildArch=armel - __UbuntuArch=armel - __UbuntuRepo="http://archive.debian.org/debian/" - __CodeName=buster - __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" - __LLDB_Package="liblldb-6.0-dev" - __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" - __UbuntuPackages="${__UbuntuPackages// libomp5/}" - __UbuntuSuites= - ;; - armv6) - __BuildArch=armv6 - __UbuntuArch=armhf - __QEMUArch=arm - __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/" - __CodeName=buster - __KeyringFile="/usr/share/keyrings/raspbian-archive-keyring.gpg" - __LLDB_Package="liblldb-6.0-dev" - __UbuntuSuites= - - if [[ -e "$__KeyringFile" ]]; then - __Keyring="--keyring $__KeyringFile" - fi - ;; loongarch64) __BuildArch=loongarch64 __AlpineArch=loongarch64 @@ -204,10 +182,6 @@ while :; do __UbuntuArch=loong64 __UbuntuSuites=unreleased __LLDB_Package="liblldb-19-dev" - - if [[ "$__CodeName" == "sid" ]]; then - __UbuntuRepo="http://ftp.ports.debian.org/debian-ports/" - fi ;; riscv64) __BuildArch=riscv64 @@ -223,7 +197,7 @@ while :; do __AlpineArch=ppc64le __QEMUArch=ppc64le __UbuntuArch=ppc64el - __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" + __UbuntuRepo="https://ports.ubuntu.com/ubuntu-ports/" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" @@ -234,7 +208,7 @@ while :; do __AlpineArch=s390x __QEMUArch=s390x __UbuntuArch=s390x - __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" + __UbuntuRepo="https://ports.ubuntu.com/ubuntu-ports/" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" @@ -250,13 +224,13 @@ while :; do __OpenBSDMachineArch=amd64 __illumosArch=x86_64 __HaikuArch=x86_64 - __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" + __UbuntuRepo="https://archive.ubuntu.com/ubuntu/" ;; x86) __BuildArch=x86 __UbuntuArch=i386 __AlpineArch=x86 - __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" + __UbuntuRepo="https://archive.ubuntu.com/ubuntu/" ;; lldb*) version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" @@ -316,7 +290,7 @@ while :; do __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ftp.debian.org/debian/" + __UbuntuRepo="https://archive.debian.org/debian/" fi ;; buster) # Debian 10 @@ -325,7 +299,7 @@ while :; do __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://archive.debian.org/debian/" + __UbuntuRepo="https://archive.debian.org/debian/" fi ;; bullseye) # Debian 11 @@ -333,7 +307,7 @@ while :; do __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ftp.debian.org/debian/" + __UbuntuRepo="https://ftp.debian.org/debian/" fi ;; bookworm) # Debian 12 @@ -341,7 +315,7 @@ while :; do __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ftp.debian.org/debian/" + __UbuntuRepo="https://ftp.debian.org/debian/" fi ;; sid) # Debian sid @@ -350,25 +324,21 @@ while :; do # Debian-Ports architectures need different values case "$__UbuntuArch" in - amd64|arm64|armel|armhf|i386|mips64el|ppc64el|riscv64|s390x) + amd64|arm64|armhf|i386|mips64el|ppc64el|riscv64|s390x) __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ftp.debian.org/debian/" + __UbuntuRepo="https://ftp.debian.org/debian/" fi ;; *) __KeyringFile="/usr/share/keyrings/debian-ports-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ftp.ports.debian.org/debian-ports/" + __UbuntuRepo="https://ftp.debian.org/debian-ports/" fi ;; esac - - if [[ -e "$__KeyringFile" ]]; then - __Keyring="--keyring $__KeyringFile" - fi ;; tizen) __CodeName= @@ -472,7 +442,7 @@ fi __UbuntuPackages+=" ${__LLDB_Package:-}" if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ports.ubuntu.com/" + __UbuntuRepo="https://ports.ubuntu.com/" fi if [[ -n "$__LLVM_MajorVersion" ]]; then @@ -559,15 +529,15 @@ if [[ "$__CodeName" == "alpine" ]]; then # initialize DB # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -X "https://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "https://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then # shellcheck disable=SC2086 __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -X "https://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "https://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')" fi @@ -575,8 +545,8 @@ if [[ "$__CodeName" == "alpine" ]]; then # install all packages in one go # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -X "https://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "https://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" $__NoEmulationArg \ add $__AlpinePackages @@ -593,7 +563,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version fi echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf - echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf + echo "FreeBSD: { url: \"pkg+https://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf mkdir -p "$__RootfsDir"/tmp # get and build package manager if [[ "$__hasWget" == 1 ]]; then @@ -830,6 +800,14 @@ elif [[ "$__CodeName" == "haiku" ]]; then elif [[ -n "$__CodeName" ]]; then __Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)" + __SigCheckArgs= + if [[ "$__SkipSigCheck" == "0" ]]; then + if [[ -e "$__KeyringFile" ]]; then + __SigCheckArgs="--keyring $__KeyringFile" + fi + __SigCheckArgs="$__SigCheckArgs --force-check-gpg" + fi + if [[ "$__SkipEmulation" == "1" ]]; then if [[ -z "$AR" ]]; then if command -v ar &>/dev/null; then @@ -845,31 +823,23 @@ elif [[ -n "$__CodeName" ]]; then PYTHON=${PYTHON_EXECUTABLE:-python3} # shellcheck disable=SC2086,SC2046 - echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \ + echo running "$PYTHON" "$__CrossDir/install-debs.py" $__SigCheckArgs --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \ $(for suite in $__Suites; do echo -n "--suite $suite "; done) \ $__UbuntuPackages # shellcheck disable=SC2086,SC2046 - "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \ + "$PYTHON" "$__CrossDir/install-debs.py" $__SigCheckArgs --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \ $(for suite in $__Suites; do echo -n "--suite $suite "; done) \ $__UbuntuPackages exit 0 fi - __UpdateOptions= - if [[ "$__SkipSigCheck" == "0" ]]; then - __Keyring="$__Keyring --force-check-gpg" - else - __Keyring= - __UpdateOptions="--allow-unauthenticated --allow-insecure-repositories" - fi - # shellcheck disable=SC2086 - echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" + echo running debootstrap "--variant=minbase" $__SigCheckArgs --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" # shellcheck disable=SC2086 - if ! debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"; then + if ! debootstrap "--variant=minbase" $__SigCheckArgs --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"; then echo "debootstrap failed! dumping debootstrap.log" cat "$__RootfsDir/debootstrap/debootstrap.log" exit 1 @@ -887,6 +857,11 @@ Components: main universe Signed-By: $__KeyringFile EOF + __UpdateOptions= + if [[ "$__SkipSigCheck" == "1" ]]; then + __UpdateOptions="--allow-unauthenticated --allow-insecure-repositories" + fi + # shellcheck disable=SC2086 chroot "$__RootfsDir" apt-get update $__UpdateOptions chroot "$__RootfsDir" apt-get -f -y install diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py index c81eb37e522efc..100c4378da3b71 100755 --- a/eng/common/cross/install-debs.py +++ b/eng/common/cross/install-debs.py @@ -4,6 +4,7 @@ import asyncio import aiohttp import gzip +import hashlib import os import re import shutil @@ -16,7 +17,7 @@ from collections import deque from functools import cmp_to_key -async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, timeout=60): +async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, timeout=60, checksum=None): """Asynchronous file download with retries.""" attempt = 0 while attempt < max_retries: @@ -25,19 +26,25 @@ async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, t if response.status == 200: with open(dest_path, "wb") as f: content = await response.read() + + # verify checksum if provided + if checksum: + sha256 = hashlib.sha256(content).hexdigest() + if sha256 != checksum: + raise Exception(f"SHA256 mismatch for {url}: expected {checksum}, got {sha256}") + f.write(content) print(f"Downloaded {url} at {dest_path}") return else: - print(f"Failed to download {url}, Status Code: {response.status}") - break + raise Exception(f"Failed to download {url}, Status Code: {response.status}") except (asyncio.CancelledError, asyncio.TimeoutError, aiohttp.ClientError) as e: print(f"Error downloading {url}: {type(e).__name__} - {e}. Retrying...") attempt += 1 await asyncio.sleep(retry_delay) - print(f"Failed to download {url} after {max_retries} attempts.") + raise Exception(f"Failed to download {url} after {max_retries} attempts.") async def download_deb_files_parallel(mirror, packages, tmp_dir): """Download .deb files in parallel.""" @@ -51,11 +58,11 @@ async def download_deb_files_parallel(mirror, packages, tmp_dir): if filename: url = f"{mirror}/{filename}" dest_path = os.path.join(tmp_dir, os.path.basename(filename)) - tasks.append(asyncio.create_task(download_file(session, url, dest_path))) + tasks.append(asyncio.create_task(download_file(session, url, dest_path, checksum=info.get("SHA256")))) await asyncio.gather(*tasks) -async def download_package_index_parallel(mirror, arch, suites): +async def download_package_index_parallel(mirror, arch, suites, check_sig, keyring): """Download package index files for specified suites and components entirely in memory.""" tasks = [] timeout = aiohttp.ClientTimeout(total=60) @@ -63,10 +70,9 @@ async def download_package_index_parallel(mirror, arch, suites): async with aiohttp.ClientSession(timeout=timeout) as session: for suite in suites: for component in ["main", "universe"]: - url = f"{mirror}/dists/{suite}/{component}/binary-{arch}/Packages.gz" - tasks.append(fetch_and_decompress(session, url)) + tasks.append(fetch_and_decompress(session, mirror, arch, suite, component, check_sig, keyring)) - results = await asyncio.gather(*tasks, return_exceptions=True) + results = await asyncio.gather(*tasks) merged_content = "" for result in results: @@ -77,20 +83,71 @@ async def download_package_index_parallel(mirror, arch, suites): return merged_content -async def fetch_and_decompress(session, url): +async def fetch_and_decompress(session, mirror, arch, suite, component, check_sig, keyring): """Fetch and decompress the Packages.gz file.""" - try: - async with session.get(url) as response: - if response.status == 200: - compressed_data = await response.read() - decompressed_data = gzip.decompress(compressed_data).decode('utf-8') - print(f"Downloaded index: {url}") - return decompressed_data - else: - print(f"Skipped index: {url} (doesn't exist)") - return None - except Exception as e: - print(f"Error fetching {url}: {e}") + + path = f"{component}/binary-{arch}/Packages.gz" + url = f"{mirror}/dists/{suite}/{path}" + + async with session.get(url) as response: + if response.status == 200: + compressed_data = await response.read() + decompressed_data = gzip.decompress(compressed_data).decode('utf-8') + print(f"Downloaded index: {url}") + + if check_sig: + # Verify the package index against the sha256 recorded in the Release file + release_file_content = await fetch_release_file(session, mirror, suite, keyring) + packages_sha = parse_release_file(release_file_content, path) + + sha256 = hashlib.sha256(compressed_data).hexdigest() + if sha256 != packages_sha: + raise Exception(f"SHA256 mismatch for {path}: expected {packages_sha}, got {sha256}") + print(f"Checksum verified for {path}") + + return decompressed_data + else: + print(f"Skipped index: {url} (doesn't exist)") + return None + +async def fetch_release_file(session, mirror, suite, keyring): + """Fetch Release and Release.gpg files and verify the signature.""" + + release_url = f"{mirror}/dists/{suite}/Release" + release_gpg_url = f"{mirror}/dists/{suite}/Release.gpg" + + with tempfile.NamedTemporaryFile() as release_file, tempfile.NamedTemporaryFile() as release_gpg_file: + await download_file(session, release_url, release_file.name) + await download_file(session, release_gpg_url, release_gpg_file.name) + + print("Verifying signature of Release with Release.gpg.") + verify_command = ["gpg"] + if keyring: + verify_command += ["--keyring", keyring] + verify_command += ["--verify", release_gpg_file.name, release_file.name] + result = subprocess.run(verify_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + if result.returncode != 0: + raise Exception(f"Signature verification failed: {result.stderr.decode('utf-8')}") + + print("Signature verified successfully.") + + with open(release_file.name) as f: + return f.read() + +def parse_release_file(content, path): + """Parses the Release file and returns sha256 checksum of the specified path.""" + + # data looks like this: + # + matches = re.findall(r'^ (\S*) +(\S*) +(\S*)$', content, re.MULTILINE) + + for entry in matches: + # the file has both md5 and sha256 checksums, we want sha256 which has a length of 64 + if entry[2] == path and len(entry[0]) == 64: + return entry[0] + + raise Exception(f"Could not find checksum for {path} in Release file.") def parse_debian_version(version): """Parse a Debian package version into epoch, upstream version, and revision.""" @@ -171,13 +228,15 @@ def parse_package_index(content): filename = fields.get("Filename") depends = fields.get("Depends") provides = fields.get("Provides", None) + sha256 = fields.get("SHA256") # Only update if package_name is not in packages or if the new version is higher if package_name not in packages or compare_debian_versions(version, packages[package_name]["Version"]) > 0: packages[package_name] = { "Version": version, "Filename": filename, - "Depends": depends + "Depends": depends, + "SHA256": sha256 } # Update aliases if package provides any alternatives @@ -233,7 +292,7 @@ def extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool): os.makedirs(extract_dir, exist_ok=True) with tempfile.TemporaryDirectory(dir=tmp_dir) as tmp_subdir: - result = subprocess.run(f"{ar_tool} t {os.path.abspath(deb_file)}", cwd=tmp_subdir, check=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + result = subprocess.run([ar_tool, "t", os.path.abspath(deb_file)], cwd=tmp_subdir, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) tar_filename = None for line in result.stdout.decode().splitlines(): @@ -247,7 +306,8 @@ def extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool): tar_file_path = os.path.join(tmp_subdir, tar_filename) print(f"Extracting {tar_filename} from {deb_file}..") - subprocess.run(f"{ar_tool} p {os.path.abspath(deb_file)} {tar_filename} > {tar_file_path}", check=True, shell=True) + with open(tar_file_path, "wb") as outfile: + subprocess.run([ar_tool, "p", os.path.abspath(deb_file), tar_filename], check=True, stdout=outfile, stderr=subprocess.PIPE) file_extension = os.path.splitext(tar_file_path)[1].lower() @@ -268,7 +328,7 @@ def extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool): raise ValueError(f"Unsupported compression format: {file_extension}") with tarfile.open(tar_file_path, mode) as tar: - tar.extractall(path=extract_dir, filter='fully_trusted') + tar.extractall(path=extract_dir, filter='tar') def finalize_setup(rootfsdir): lib_dir = os.path.join(rootfsdir, 'lib') @@ -295,24 +355,17 @@ def finalize_setup(rootfsdir): if __name__ == "__main__": parser = argparse.ArgumentParser(description="Generate rootfs for .NET runtime on Debian-like OS") - parser.add_argument("--distro", required=False, help="Distro name (e.g., debian, ubuntu, etc.)") parser.add_argument("--arch", required=True, help="Architecture (e.g., amd64, loong64, etc.)") parser.add_argument("--rootfsdir", required=True, help="Destination directory.") parser.add_argument('--suite', required=True, action='append', help='Specify one or more repository suites to collect index data.') - parser.add_argument("--mirror", required=False, help="Mirror (e.g., http://ftp.debian.org/debian-ports etc.)") + parser.add_argument("--mirror", required=True, help="Mirror (e.g., http://ftp.debian.org/debian-ports etc.)") parser.add_argument("--artool", required=False, default="ar", help="ar tool to extract debs (e.g., ar, llvm-ar etc.)") + parser.add_argument("--force-check-gpg", required=False, action='store_true', help="Verify the packages against signatures in Release file.") + parser.add_argument("--keyring", required=False, default='', help="Keyring file to check signature of Release file.") parser.add_argument("packages", nargs="+", help="List of package names to be installed.") args = parser.parse_args() - if args.mirror is None: - if args.distro == "ubuntu": - args.mirror = "http://archive.ubuntu.com/ubuntu" if args.arch in ["amd64", "i386"] else "http://ports.ubuntu.com/ubuntu-ports" - elif args.distro == "debian": - args.mirror = "http://ftp.debian.org/debian-ports" - else: - raise Exception("Unsupported distro") - DESIRED_PACKAGES = args.packages + [ # base packages "dpkg", "busybox", @@ -322,9 +375,16 @@ def finalize_setup(rootfsdir): "debianutils" ] - print(f"Creating rootfs. rootfsdir: {args.rootfsdir}, distro: {args.distro}, arch: {args.arch}, suites: {args.suite}, mirror: {args.mirror}") + print(f"Creating rootfs. rootfsdir: {args.rootfsdir}, arch: {args.arch}, suites: {args.suite}, mirror: {args.mirror}") + + check_sig = args.force_check_gpg + if check_sig and not args.keyring: + print("ERROR: --force-check-gpg requires --keyring to specify a keyring file for signature verification.") + print("Install the appropriate keyring package (e.g., debian-ports-archive-keyring, ubuntu-archive-keyring)") + print("or pass --skipsigcheck to build-rootfs.sh to disable signature checking.") + sys.exit(1) - package_index_content = asyncio.run(download_package_index_parallel(args.mirror, args.arch, args.suite)) + package_index_content = asyncio.run(download_package_index_parallel(args.mirror, args.arch, args.suite, check_sig, args.keyring)) packages_info, aliases = parse_package_index(package_index_content) diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ff2dfdb4a5bf60..99d6dfe82dde38 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -225,13 +225,19 @@ elseif(ILLUMOS) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) elseif(HAIKU) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") - set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") - locate_toolchain_exec(gcc CMAKE_C_COMPILER) - locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) + if ($ENV{CCC_CC} MATCHES ".*gcc.*") + set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") + locate_toolchain_exec(gcc CMAKE_C_COMPILER) + locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) + else() + set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64") + set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64") + set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64") + endif() # let CMake set up the correct search paths include(Platform/Haiku) diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 811f0f717f736a..50ae62737687c5 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -10,7 +10,11 @@ Param( . $PSScriptRoot\tools.ps1 -$dotnetRoot = Join-Path $RepoRoot '.dotnet' +if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) { + $dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR +} else { + $dotnetRoot = Join-Path $RepoRoot '.dotnet' +} $installdir = $dotnetRoot try { diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 61f302bb677560..1cb3f5abac2864 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -80,7 +80,11 @@ case $cpuname in ;; esac -dotnetRoot="${repo_root}.dotnet" +if [[ -n "${DOTNET_GLOBAL_INSTALL_DIR:-}" ]]; then + dotnetRoot="$DOTNET_GLOBAL_INSTALL_DIR" +else + dotnetRoot="${repo_root}.dotnet" +fi if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then dotnetRoot="$dotnetRoot/$architecture" fi diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 65adefc7f26871..0e281df8cae5cd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -168,6 +168,12 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 } + # Keep repo builds isolated from machine-installed SDK state and workload advertising. + # This avoids preview SDK builds picking up mismatched workloads on CI images. + $env:DOTNET_MULTILEVEL_LOOKUP = '0' + $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1' + $env:DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE = '1' + # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { $dotnetExecutable = GetExecutableFileName 'dotnet' @@ -230,6 +236,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' + Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } @@ -619,11 +628,7 @@ function GetSdkTaskProject([string]$taskName) { if (Test-Path $proj) { return $proj } - # TODO: Remove this fallback once all supported versions use the new layout. - $legacyProj = Join-Path $toolsetDir "SdkTasks\$taskName.proj" - if (Test-Path $legacyProj) { - return $legacyProj - } + throw "Unable to find $taskName.proj in toolset at: $toolsetDir" } @@ -699,23 +704,14 @@ function InitializeToolset() { $packageDir = Join-Path $nugetCache (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion) $packageToolsetDir = Join-Path $packageDir 'toolset' - $packageToolsDir = Join-Path $packageDir 'tools' - # TODO: Remove the tools/ check once all supported versions have the toolset folder. - if (!(Test-Path $packageToolsetDir) -and !(Test-Path $packageToolsDir)) { + if (!(Test-Path $packageToolsetDir)) { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Arcade SDK package does not contain a toolset or tools folder: $packageDir" ExitWithExitCode 3 } New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null - - # Copy toolset if present at the package root (new layout), otherwise fall back to tools - if (Test-Path $packageToolsetDir) { - Copy-Item -Path "$packageToolsetDir\*" -Destination $toolsetToolsDir -Recurse -Force - } else { - # TODO: Remove this fallback once all supported versions have the toolset folder. - Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force - } + Copy-Item -Path "$packageToolsetDir\*" -Destination $toolsetToolsDir -Recurse -Force if (Test-Path $buildProjPath) { $toolsetBuildProj = $buildProjPath @@ -842,6 +838,10 @@ function MSBuild-Core() { $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" + if ($ci -and $buildTool.Tool -eq 'dotnet') { + $cmdArgs += ' /p:MSBuildEnableWorkloadResolver=false' + } + # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable if ($env:MSBUILD_MT_ENABLED -eq "1") { $cmdArgs += ' -mt' @@ -952,6 +952,12 @@ Create-Directory $ToolsetDir Create-Directory $TempDir Create-Directory $LogDir +# Direct MSBuild crash diagnostics (MSB4166 failure.txt files) to a known location +# under artifacts/log so they are captured as build artifacts in CI. +if (-not $env:MSBUILDDEBUGPATH) { + $env:MSBUILDDEBUGPATH = Join-Path $LogDir 'MsbuildDebugLogs' +} + Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 95c55ce9b4d914..5ff37cfb700010 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -126,6 +126,12 @@ function InitializeDotNetCli { export DOTNET_CLI_TELEMETRY_OPTOUT=1 fi + # Keep repo builds isolated from machine-installed SDK state and workload advertising. + # This avoids preview SDK builds picking up mismatched workloads on CI images. + export DOTNET_MULTILEVEL_LOOKUP=0 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=1 + # LTTNG is the logging infrastructure used by Core CLR. Need this variable set # so it doesn't output warnings to the console. export LTTNG_HOME="$HOME" @@ -171,6 +177,9 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" + Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" + Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE" -value "1" # return value _InitializeDotNetCli="$dotnet_root" @@ -449,21 +458,13 @@ function InitializeToolset { local package_dir="$_GetNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version" - # TODO: Remove the tools/ check once all supported versions have the toolset folder. - if [[ ! -d "$package_dir/toolset" && ! -d "$package_dir/tools" ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset or tools folder: $package_dir" + if [[ ! -d "$package_dir/toolset" ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset folder: $package_dir" ExitWithExitCode 3 fi mkdir -p "$toolset_tools_dir" - - # Copy toolset if present at the package root (new layout), otherwise fall back to tools - if [[ -d "$package_dir/toolset" ]]; then - cp -r "$package_dir/toolset/." "$toolset_tools_dir" - else - # TODO: Remove this fallback once all supported versions have the toolset folder. - cp -r "$package_dir/tools/." "$toolset_tools_dir" - fi + cp -r "$package_dir/toolset/." "$toolset_tools_dir" if [[ -a "$toolset_tools_dir/Build.proj" ]]; then toolset_build_proj="$toolset_tools_dir/Build.proj" @@ -590,7 +591,12 @@ function MSBuild-Core { warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error" fi - RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" + local workload_resolver_switch="" + if [[ "$ci" == true && -n "${_InitializeBuildToolCommand:-}" ]]; then + workload_resolver_switch="/p:MSBuildEnableWorkloadResolver=false" + fi + + RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch $workload_resolver_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" } function GetDarc { @@ -615,12 +621,7 @@ function GetSdkTaskProject { echo "$proj" return fi - # TODO: Remove this fallback once all supported versions use the new layout. - local legacyProj="$toolsetDir/SdkTasks/$taskName.proj" - if [[ -a "$legacyProj" ]]; then - echo "$legacyProj" - return - fi + Write-PipelineTelemetryError -category 'Build' "Unable to find $taskName.proj in toolset at: $toolsetDir" ExitWithExitCode 3 } @@ -660,6 +661,12 @@ mkdir -p "$toolset_dir" mkdir -p "$temp_dir" mkdir -p "$log_dir" +# Direct MSBuild crash diagnostics (MSB4166 failure.txt files) to a known location +# under artifacts/log so they are captured as build artifacts in CI. +if [[ -z "${MSBUILDDEBUGPATH:-}" ]]; then + export MSBUILDDEBUGPATH="$log_dir/MsbuildDebugLogs" +fi + Write-PipelineSetVariable -name "Artifacts" -value "$artifacts_dir" Write-PipelineSetVariable -name "Artifacts.Toolset" -value "$toolset_dir" Write-PipelineSetVariable -name "Artifacts.Log" -value "$log_dir" diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index a5af228a5bab4c..457a1b0d28e457 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -17,13 +17,6 @@ trigger: - PATENTS.TXT - THIRD-PARTY-NOTICES.TXT -schedules: -- cron: "0 9 * * *" - displayName: Daily SourceIndex - branches: - include: - - main - # This is an official pipeline that should not be triggerable from a PR, # there is no public pipeline associated with it. pr: none @@ -55,18 +48,6 @@ extends: LclSource: lclFilesfromPackage LclPackageId: 'LCL-JUNO-PROD-RUNTIME' - - ${{ if or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual')) }}: - - stage: Source_Index - dependsOn: [] - displayName: Source Index - jobs: - # - # Source Index Build - # - - template: /eng/common/templates-official/job/source-index-stage1.yml - parameters: - sourceIndexBuildCommand: build.cmd -subset libs.sfx+libs.oob -binarylog -os linux -ci /p:SkipLibrariesNativeRuntimePackages=true - - stage: Publish dependsOn: [] jobs: diff --git a/global.json b/global.json index 01f9d078a1fb65..0ef19e72f0f644 100644 --- a/global.json +++ b/global.json @@ -13,11 +13,11 @@ "dotnet": "11.0.100-preview.5.26227.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26257.113", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26257.113", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26257.113", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26266.103", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26266.103", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26266.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.5.26257.113" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.5.26266.103" } } diff --git a/src/installer/pkg/sfx/installers.proj b/src/installer/pkg/sfx/installers.proj index c172f12ea8fcaa..7a03d9088cd116 100644 --- a/src/installer/pkg/sfx/installers.proj +++ b/src/installer/pkg/sfx/installers.proj @@ -10,6 +10,7 @@ + diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-azl.4.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-azl.4.proj new file mode 100644 index 00000000000000..8a8beec76e7646 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-azl.4.proj @@ -0,0 +1,11 @@ + + + false + true + azl.4 + + + + + + diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets index e4218ebb7b53f4..a0e57f66aac71d 100644 --- a/src/installer/tests/Directory.Build.targets +++ b/src/installer/tests/Directory.Build.targets @@ -93,8 +93,8 @@ - - + + OuterLoopRanges() foreach (object[] parms in Ranges(OuterLoopCounts)) yield return parms; } - public static IEnumerable Ranges(int[] counts) - { - foreach (object[] parms in Ranges(counts.Cast())) yield return parms; - } - public static IEnumerable Ranges(IEnumerable counts) { foreach (object[] parms in Ranges(0, counts)) yield return parms; diff --git a/src/libraries/System.Linq.Parallel/tests/Helpers/UnorderedSources.cs b/src/libraries/System.Linq.Parallel/tests/Helpers/UnorderedSources.cs index 3b7da85ee9abf4..2c220acd6f6274 100644 --- a/src/libraries/System.Linq.Parallel/tests/Helpers/UnorderedSources.cs +++ b/src/libraries/System.Linq.Parallel/tests/Helpers/UnorderedSources.cs @@ -72,19 +72,6 @@ public static IEnumerable Ranges(int start, IEnumerable counts) foreach (object[] parms in Ranges(x => start, counts)) yield return parms; } - /// - /// Get a set of ranges, starting at 0, and running for each count in `counts`. - /// - /// This version is a wrapper for use from the MemberData attribute. - /// The sizes of ranges to return. - /// Entries for test data. - /// The first element is the Labeled{ParallelQuery{int}} range, - /// and the second element is the count - public static IEnumerable Ranges(int[] counts) - { - foreach (object[] parms in Ranges(counts.Cast())) yield return parms; - } - /// /// Get a set of ranges, starting at 0, and having OuterLoopCount elements. /// @@ -96,34 +83,6 @@ public static IEnumerable OuterLoopRanges() foreach (object[] parms in Ranges(new[] { Sources.OuterLoopCount })) yield return parms; } - /// - /// Get a set of ranges, starting at `start`, and running for each count in `counts`. - /// - /// This version is a wrapper for use from the MemberData attribute. - /// The starting element of the range. - /// The sizes of ranges to return. - /// Entries for test data. - /// The first element is the Labeled{ParallelQuery{int}} range, - /// the second element is the count, and the third is the start. - public static IEnumerable Ranges(int start, int[] counts) - { - foreach (object[] parms in Ranges(start, counts.Cast())) yield return parms; - } - - /// - /// Return pairs of ranges, both from 0 to each respective count in `counts`. - /// - /// This version is a wrapper for use from the MemberData attribute. - /// The sizes of left ranges to return. - /// The sizes of right ranges to return. - /// Entries for test data. - /// The first element is the left Labeled{ParallelQuery{int}} range, the second element is the left count, - /// the third element is the right Labeled{ParallelQuery{int}} range, and the fourth element is the right count, . - public static IEnumerable BinaryRanges(int[] leftCounts, int[] rightCounts) - { - foreach (object[] parms in BinaryRanges(leftCounts.Cast(), rightCounts.Cast())) yield return parms; - } - /// /// Get a set of ranges, starting at 0, and running for each count in `counts`. /// diff --git a/src/tests/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.cs b/src/tests/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.cs index ac65593a9648b3..4a989029468696 100644 --- a/src/tests/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.cs +++ b/src/tests/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.cs @@ -8,6 +8,8 @@ public class ClosedStatic { public int scale; + public ClosedStatic() { } + private ClosedStatic(int scale) { this.scale = scale; diff --git a/src/tests/GC/API/GC/CollectionCountTest.cs b/src/tests/GC/API/GC/CollectionCountTest.cs index 8dba9df5b97be7..840aa8f18da06c 100644 --- a/src/tests/GC/API/GC/CollectionCountTest.cs +++ b/src/tests/GC/API/GC/CollectionCountTest.cs @@ -22,7 +22,7 @@ public class CollectionCountTest private Int32[] _negValues = { -1, -10, -10000, Int32.MinValue }; private Int32[] _largeValues = { GC.MaxGeneration + 1, Int32.MaxValue / 2, Int32.MaxValue - 1, Int32.MaxValue }; - private CollectionCountTest() + public CollectionCountTest() { } diff --git a/src/tests/GC/Scenarios/NDPin/ndpin.cs b/src/tests/GC/Scenarios/NDPin/ndpin.cs index a9a9a0a7e01b8c..193069366405ef 100644 --- a/src/tests/GC/Scenarios/NDPin/ndpin.cs +++ b/src/tests/GC/Scenarios/NDPin/ndpin.cs @@ -13,6 +13,8 @@ public class NDPin internal static NDPin m_n; internal static Object m_o; + public NDPin () { } + internal NDPin (Object p) { this.p = p; diff --git a/src/tests/GC/Scenarios/ReflectObj/reflectobj.cs b/src/tests/GC/Scenarios/ReflectObj/reflectobj.cs index 930f10093b216a..186cf81f5fd62c 100644 --- a/src/tests/GC/Scenarios/ReflectObj/reflectobj.cs +++ b/src/tests/GC/Scenarios/ReflectObj/reflectobj.cs @@ -34,7 +34,7 @@ public ReflectObj() icCreat++; } - public ReflectObj( int l ) + internal ReflectObj( int l ) { obj = new long[l]; icCreat++; @@ -69,7 +69,7 @@ public static int TestEntryPoint() class CreateObj { private Object[] v; - [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] + [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] private Type myClass; private Type [] rtype; private ConstructorInfo CInfo; @@ -81,7 +81,7 @@ public CreateObj() for( int i=0; i< 2000; i++ ) { v[0] = i; - Activator.CreateInstance(myClass, v ); + Activator.CreateInstance(myClass, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, v, null); } } diff --git a/src/tests/GC/Scenarios/Rootmem/rootmem.cs b/src/tests/GC/Scenarios/Rootmem/rootmem.cs index 993674f74697ec..98cb93dbd3ab63 100644 --- a/src/tests/GC/Scenarios/Rootmem/rootmem.cs +++ b/src/tests/GC/Scenarios/Rootmem/rootmem.cs @@ -82,6 +82,8 @@ public static int TestEntryPoint() return 1; } + public RootMem() { } + private RootMem( int i ) { if( i> 0) diff --git a/src/tests/JIT/CodeGenBringUpTests/Rotate.cs b/src/tests/JIT/CodeGenBringUpTests/Rotate.cs index efde861d46af4d..cdf0a6298e69a9 100644 --- a/src/tests/JIT/CodeGenBringUpTests/Rotate.cs +++ b/src/tests/JIT/CodeGenBringUpTests/Rotate.cs @@ -227,6 +227,8 @@ uint rol32ushort(int amount) return ((uint)usfield << amount) | ((uint)usfield >> (32 - amount)); } + public Test_Rotate() { } + Test_Rotate(ulong i, uint j, ushort k) { field = i; diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs b/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs index f193693bf6475b..6f0351438e3797 100644 --- a/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs +++ b/src/tests/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs @@ -24,7 +24,7 @@ public class IntrinsicTest private static long s_idjunk = 0; [MethodImpl(MethodImplOptions.NoInlining)] - private IntrinsicTest() { _instanceCounter = 3245; _instanceCounter64 = 3245; _id_instanceCounter = 3245; _id_instanceCounter64 = 3245; } + public IntrinsicTest() { _instanceCounter = 3245; _instanceCounter64 = 3245; _id_instanceCounter = 3245; _id_instanceCounter64 = 3245; } public int GetValue() { s_temp++; return (int)0x1ceddeed; } [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres.cs b/src/tests/JIT/Methodical/Arrays/misc/arrres.cs index f453c0ee4672cd..1b48f1ebdf224a 100644 --- a/src/tests/JIT/Methodical/Arrays/misc/arrres.cs +++ b/src/tests/JIT/Methodical/Arrays/misc/arrres.cs @@ -13,6 +13,8 @@ public class Test public bool m_die; private static Test[] s_arr = new Test[50]; + public Test() { } + private Test(int indx) { _indx = indx; } internal virtual void CheckValid() diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance.cs b/src/tests/JIT/Methodical/Boxing/callconv/instance.cs index 0c70cc18945bc0..7eeab34d001d96 100644 --- a/src/tests/JIT/Methodical/Boxing/callconv/instance.cs +++ b/src/tests/JIT/Methodical/Boxing/callconv/instance.cs @@ -38,6 +38,8 @@ protected override object Fibonacci2(object num, object flag) return N; } + public Test() { } + private Test(object num) { _num = (float)(double)num; diff --git a/src/tests/JIT/Methodical/VT/etc/ctor_recurse.cs b/src/tests/JIT/Methodical/VT/etc/ctor_recurse.cs index 9c7e2bb59bb727..9f847fe48dcca0 100644 --- a/src/tests/JIT/Methodical/VT/etc/ctor_recurse.cs +++ b/src/tests/JIT/Methodical/VT/etc/ctor_recurse.cs @@ -22,9 +22,7 @@ public struct T private void DoMethod() { } - [Fact] - [OuterLoop] - public static void TestEntryPoint() + public static void Run() { s_stat = new T(new S(new T(new S(new T(new S(new T(new S(new T(new S( @@ -43,4 +41,14 @@ public static void TestEntryPoint() ; } } + + public class CtorRecurseTest + { + [Fact] + [OuterLoop] + public static void TestEntryPoint() + { + T.Run(); + } + } } diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor.cs b/src/tests/JIT/Methodical/VT/etc/han3_ctor.cs index 872964542e23f1..2aa275ce60988a 100644 --- a/src/tests/JIT/Methodical/VT/etc/han3_ctor.cs +++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor.cs @@ -69,9 +69,7 @@ private static int move(Column from, Column to, Column temp, int num) return C; } - [Fact] - [OuterLoop] - public static int TestEntryPoint() + public static int Run() { return move(new Column(17, 17), new Column(17, 0), @@ -79,4 +77,14 @@ public static int TestEntryPoint() 17) - 130971; } } + + public class Han3CtorTest + { + [Fact] + [OuterLoop] + public static int TestEntryPoint() + { + return Column.Run(); + } + } } diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref.cs b/src/tests/JIT/Methodical/VT/etc/han3_ref.cs index cdee3fdd4f5dab..6f85c4f7359e5a 100644 --- a/src/tests/JIT/Methodical/VT/etc/han3_ref.cs +++ b/src/tests/JIT/Methodical/VT/etc/han3_ref.cs @@ -69,9 +69,7 @@ private static int move(ref Column from, ref Column to, ref Column temp, int num return C; } - [Fact] - [OuterLoop] - public static int TestEntryPoint() + public static int Run() { Column c1 = new Column(17, 17); Column c2 = new Column(17, 0); @@ -83,4 +81,14 @@ public static int TestEntryPoint() return ec; } } + + public class Han3RefTest + { + [Fact] + [OuterLoop] + public static int TestEntryPoint() + { + return Column.Run(); + } + } } diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.cs b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.cs index 06c6a7e28ef0af..2a3d1c55e0e022 100644 --- a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.cs +++ b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.cs @@ -26,7 +26,7 @@ public class Test private int _temp; private static int s_result = 100; - private Test() + public Test() { _temp = 101; } diff --git a/src/tests/JIT/Methodical/refany/gcreport.cs b/src/tests/JIT/Methodical/refany/gcreport.cs index 4d9c814462bc21..c5f6715c5eb573 100644 --- a/src/tests/JIT/Methodical/refany/gcreport.cs +++ b/src/tests/JIT/Methodical/refany/gcreport.cs @@ -17,7 +17,7 @@ public class StressTest { private StressTest2 _m_internal; - private StressTest() + public StressTest() { _m_internal = new StressTest2(); _m_internal.m_parent = this; diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs index 9d72d90b222cbe..be7d90d1c52888 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pidigits-3.cs @@ -35,6 +35,8 @@ public class pidigits StringBuilder strBuf = new StringBuilder(40), lastBuf = null; int n; + public pidigits() { } + pidigits(int n) { this.n = n; diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.cs b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.cs index d52c0f3a731b26..02f3e22fadd499 100644 --- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.cs +++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.cs @@ -32,6 +32,8 @@ public static void TestEntryPoint() } } + public RootMem() { } + private RootMem(int i) { if (i > 0) diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.cs b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.cs index b0f483e8c7117b..7000acfae2ed0c 100644 --- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.cs +++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.cs @@ -17,7 +17,7 @@ public class PerfNotIf bool m_i; - PerfNotIf() + public PerfNotIf() { m_i = true; /* JVM diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_10940/GitHub_10940.cs b/src/tests/JIT/Regression/JitBlue/GitHub_10940/GitHub_10940.cs index 39b79edf5464e7..9a6d6eea0ac6a9 100644 --- a/src/tests/JIT/Regression/JitBlue/GitHub_10940/GitHub_10940.cs +++ b/src/tests/JIT/Regression/JitBlue/GitHub_10940/GitHub_10940.cs @@ -43,6 +43,8 @@ public override int GetReturnValue() } } + public Test_GitHub_10940() { } + Test_GitHub_10940(string s, decimal d) { } diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_18887/GitHub_18887.cs b/src/tests/JIT/Regression/JitBlue/GitHub_18887/GitHub_18887.cs index 8ff0078bd7d60f..a7822b0f9d93fe 100644 --- a/src/tests/JIT/Regression/JitBlue/GitHub_18887/GitHub_18887.cs +++ b/src/tests/JIT/Regression/JitBlue/GitHub_18887/GitHub_18887.cs @@ -54,7 +54,7 @@ public class Program bool forceUpload; BufferState currentState; - Program() + public Program() { this.forceUpload = false; this.currentState = new BufferState(); diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_19537/GitHub_19537.cs b/src/tests/JIT/Regression/JitBlue/GitHub_19537/GitHub_19537.cs index 7dd1e3f2f217e9..26967070bacdc8 100644 --- a/src/tests/JIT/Regression/JitBlue/GitHub_19537/GitHub_19537.cs +++ b/src/tests/JIT/Regression/JitBlue/GitHub_19537/GitHub_19537.cs @@ -384,9 +384,7 @@ public override string ToString() M41, M42, M43, M44); } - [OuterLoop] - [Fact] - public static int TestEntryPoint() + public static int Run() { Matrix4x4 m1 = new Matrix4x4(1.0F,2.0F,3.0F,4.0F, 5.0F,6.0F,7.0F,8.0F, @@ -418,5 +416,14 @@ public static int TestEntryPoint() } } -} + public class GitHub_19537_Test + { + [OuterLoop] + [Fact] + public static int TestEntryPoint() + { + return Matrix4x4.Run(); + } + } +} diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_22556/GitHub_22556.cs b/src/tests/JIT/Regression/JitBlue/GitHub_22556/GitHub_22556.cs index 88af3e419574da..0b63db49902897 100644 --- a/src/tests/JIT/Regression/JitBlue/GitHub_22556/GitHub_22556.cs +++ b/src/tests/JIT/Regression/JitBlue/GitHub_22556/GitHub_22556.cs @@ -13,6 +13,8 @@ public class Test_GitHub_22556 { int f; + public Test_GitHub_22556() { } + Test_GitHub_22556(int f) { this.f = f; diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_27923/GitHub_27923.cs b/src/tests/JIT/Regression/JitBlue/GitHub_27923/GitHub_27923.cs index 895ca5ced0b305..87900a919a8b65 100644 --- a/src/tests/JIT/Regression/JitBlue/GitHub_27923/GitHub_27923.cs +++ b/src/tests/JIT/Regression/JitBlue/GitHub_27923/GitHub_27923.cs @@ -14,7 +14,7 @@ public class Writer public int Position { get; set; } [MethodImpl(MethodImplOptions.NoInlining)] - Writer() + public Writer() { Data = new int[] { 100, -1, -2, -3 }; Position = 4; diff --git a/src/tests/JIT/opt/Inline/tests/Inline_NewObj.cs b/src/tests/JIT/opt/Inline/tests/Inline_NewObj.cs index e8433f5822c628..33d7a335bd680e 100644 --- a/src/tests/JIT/opt/Inline/tests/Inline_NewObj.cs +++ b/src/tests/JIT/opt/Inline/tests/Inline_NewObj.cs @@ -9,6 +9,8 @@ public class MainApp_Inline { private int _v; + public MainApp_Inline() { } + private MainApp_Inline(int i) { switch (i) diff --git a/src/tests/Loader/ContextualReflection/ContextualReflection.cs b/src/tests/Loader/ContextualReflection/ContextualReflection.cs index 616606283f94ba..394309165bad18 100644 --- a/src/tests/Loader/ContextualReflection/ContextualReflection.cs +++ b/src/tests/Loader/ContextualReflection/ContextualReflection.cs @@ -49,7 +49,7 @@ public Program() InitializeIsolation(true); } - public Program(bool isolated) + internal Program(bool isolated) { InitializeIsolation(isolated); } diff --git a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorTwoThreadsThreeCC.cs b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorTwoThreadsThreeCC.cs index 3b3081c910ad4d..b0bd9ef51579ac 100644 --- a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorTwoThreadsThreeCC.cs +++ b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorTwoThreadsThreeCC.cs @@ -86,6 +86,8 @@ public static Coordinator CreateThread(bool xThenY, SlotConstants threadTag) public readonly Thread Thread; private static readonly Barrier s_barrier = new (3); + public Coordinator() { } + private Coordinator(bool xThenY, SlotConstants threadTag) { var t = new Thread(() => { diff --git a/src/tests/Regressions/coreclr/GitHub_17398/test17398.cs b/src/tests/Regressions/coreclr/GitHub_17398/test17398.cs index b4c777d354daf0..715c5127b71298 100644 --- a/src/tests/Regressions/coreclr/GitHub_17398/test17398.cs +++ b/src/tests/Regressions/coreclr/GitHub_17398/test17398.cs @@ -16,6 +16,8 @@ public class X public override string ToString() => s; + public X() { } + [MethodImpl(MethodImplOptions.NoInlining)] X(int x) { diff --git a/src/tests/baseservices/compilerservices/dynamicobjectproperties/test448035.cs b/src/tests/baseservices/compilerservices/dynamicobjectproperties/test448035.cs index ce8d837cb23248..674c6e7a54bc8d 100644 --- a/src/tests/baseservices/compilerservices/dynamicobjectproperties/test448035.cs +++ b/src/tests/baseservices/compilerservices/dynamicobjectproperties/test448035.cs @@ -8,6 +8,8 @@ public class Test_test448035 { int countdown; + public Test_test448035() { } + Test_test448035(int n) { countdown = n; diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.cs b/src/tests/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.cs index 9a07cf1fb86e3c..fa0741f73b38cc 100644 --- a/src/tests/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.cs +++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.cs @@ -54,6 +54,8 @@ public UserException4(int id) : base(id) public class RethrowException { private int ThreadId; + public RethrowException() { } + private RethrowException(int id){ ThreadId = id; } diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.cs b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.cs index bc7a917f69b4c7..6242f7139a88e8 100644 --- a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.cs +++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.cs @@ -41,6 +41,8 @@ public UserException4(int id){ public class HandlerException { private int ThreadId; + public HandlerException() { } + private HandlerException(int id){ ThreadId = id; } diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.cs b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.cs index c7112b85949446..e7a3bfc9fd446c 100644 --- a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.cs +++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.cs @@ -16,6 +16,8 @@ public UserException(int id){ public class MultipleException { private int ThreadId; + public MultipleException() { } + private MultipleException(int id){ ThreadId = id; } diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.cs b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.cs index 3f0af2599433ac..b7d4904c3650b6 100644 --- a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.cs +++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.cs @@ -41,6 +41,8 @@ public UserException4(int id){ public class NestedException { private int ThreadId; + public NestedException() { } + private NestedException(int id){ ThreadId = id; }