From 11889fbe15425f905ecf9e46d9c631452c1d34aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:44:38 +0000 Subject: [PATCH 01/24] Update dependencies from https://github.com/dotnet/arcade build 20230405.4 (#1565) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9d41414..5c57e96d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index c1bda549..93d86d78 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23177.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23205.4" } } From 48ef1c888a8701c6e917b5d3d6bf0718f35c95fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:58:32 +0000 Subject: [PATCH 02/24] Update dependencies from https://github.com/dotnet/arcade build 20230410.3 (#1569) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c57e96d..0b500051 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e5c569253a4cecd110830acbf1ffae96d5a37cc6 - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e5c569253a4cecd110830acbf1ffae96d5a37cc6 - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e5c569253a4cecd110830acbf1ffae96d5a37cc6 - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e5c569253a4cecd110830acbf1ffae96d5a37cc6 - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e5c569253a4cecd110830acbf1ffae96d5a37cc6 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 93d86d78..e6009c1c 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23205.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.3" } } From 0dadb4bd632febb508d88fa1facbf37dd6e80048 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 15:57:19 +0000 Subject: [PATCH 03/24] Update dependencies from https://github.com/dotnet/arcade build 20230411.8 (#1570) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b500051..56607e09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 - + https://github.com/dotnet/arcade - e5c569253a4cecd110830acbf1ffae96d5a37cc6 + 17d9eee32f20a6af0ebb620254a22f601d159578 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index e6009c1c..78598ed6 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-preview.1.23115.2", + "dotnet": "8.0.100-preview.3.23178.7", "runtimes": { "dotnet": [ "6.0.0" @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8" } } From b522c16ae3e5e40496697672f1e0267e350e823c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 15:35:28 +0000 Subject: [PATCH 04/24] Update dependencies from https://github.com/dotnet/arcade build 20230413.1 (#1571) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/cross/toolchain.cmake | 6 ++++-- global.json | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56607e09..b67e54b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 17d9eee32f20a6af0ebb620254a22f601d159578 + fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 - + https://github.com/dotnet/arcade - 17d9eee32f20a6af0ebb620254a22f601d159578 + fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 - + https://github.com/dotnet/arcade - 17d9eee32f20a6af0ebb620254a22f601d159578 + fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 - + https://github.com/dotnet/arcade - 17d9eee32f20a6af0ebb620254a22f601d159578 + fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 - + https://github.com/dotnet/arcade - 17d9eee32f20a6af0ebb620254a22f601d159578 + fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index d813dde6..1c9d212d 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -76,7 +76,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x") set(TOOLCHAIN "s390x-linux-gnu") elseif(TARGET_ARCH_NAME STREQUAL "x64") set(CMAKE_SYSTEM_PROCESSOR x86_64) - if(LINUX) + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl) + set(TOOLCHAIN "x86_64-alpine-linux-musl") + elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") @@ -279,7 +281,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/global.json b/global.json index 78598ed6..b6a64506 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23213.1" } } From 66a7e6d5c4845c16b3f6f6f10965d29a17fadb84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 16:27:32 +0000 Subject: [PATCH 05/24] Update dependencies from https://github.com/dotnet/arcade build 20230417.1 (#1573) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b67e54b9..ae6ef71d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 + cb54ca21431ee8d96f91abfbc42237bcb001f9d1 - + https://github.com/dotnet/arcade - fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 + cb54ca21431ee8d96f91abfbc42237bcb001f9d1 - + https://github.com/dotnet/arcade - fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 + cb54ca21431ee8d96f91abfbc42237bcb001f9d1 - + https://github.com/dotnet/arcade - fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 + cb54ca21431ee8d96f91abfbc42237bcb001f9d1 - + https://github.com/dotnet/arcade - fb14cae30eacbe844468ac297b3d4c61e0bb9dc0 + cb54ca21431ee8d96f91abfbc42237bcb001f9d1 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index b6a64506..28639214 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23213.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23217.1" } } From d9f788be7824e46fcfaae00ad9b4c5a1f12861c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 12:25:53 +0000 Subject: [PATCH 06/24] Update dependencies from https://github.com/dotnet/arcade build 20230419.2 (#1574) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae6ef71d..44bc1599 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - cb54ca21431ee8d96f91abfbc42237bcb001f9d1 + dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 - + https://github.com/dotnet/arcade - cb54ca21431ee8d96f91abfbc42237bcb001f9d1 + dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 - + https://github.com/dotnet/arcade - cb54ca21431ee8d96f91abfbc42237bcb001f9d1 + dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 - + https://github.com/dotnet/arcade - cb54ca21431ee8d96f91abfbc42237bcb001f9d1 + dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 - + https://github.com/dotnet/arcade - cb54ca21431ee8d96f91abfbc42237bcb001f9d1 + dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 28639214..b9e7a516 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23217.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23219.2" } } From 61224488ae467f76d7e1923fbdf20dca8e4ec971 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 12:25:46 +0000 Subject: [PATCH 07/24] Update dependencies from https://github.com/dotnet/arcade build 20230420.2 (#1575) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/common/templates/job/job.yml | 15 ++++++++------ .../templates/steps/component-governance.yml | 13 ++++++++++++ global.json | 2 +- 4 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44bc1599..dfaa95ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 + d75baf71a09ed067b48f484f29efc4e7f3e3df13 - + https://github.com/dotnet/arcade - dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 + d75baf71a09ed067b48f484f29efc4e7f3e3df13 - + https://github.com/dotnet/arcade - dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 + d75baf71a09ed067b48f484f29efc4e7f3e3df13 - + https://github.com/dotnet/arcade - dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 + d75baf71a09ed067b48f484f29efc4e7f3e3df13 - + https://github.com/dotnet/arcade - dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7 + d75baf71a09ed067b48f484f29efc4e7f3e3df13 https://github.com/dotnet/arcade-services diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index b214a31d..a21533fd 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -25,7 +25,7 @@ parameters: enablePublishTestResults: false enablePublishUsingPipelines: false enableBuildRetry: false - disableComponentGovernance: false + disableComponentGovernance: '' componentGovernanceIgnoreDirectories: '' mergeTestResults: false testRunTitle: '' @@ -155,11 +155,14 @@ jobs: uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true - inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 00000000..0ecec47b --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,13 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file diff --git a/global.json b/global.json index b9e7a516..57fe57e7 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23219.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23220.2" } } From 0b85befe79129697d3c7fec8b62d9439c4040414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Apr 2023 12:24:55 +0000 Subject: [PATCH 08/24] Update dependencies from https://github.com/dotnet/arcade build 20230421.8 (#1576) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/cross/build-rootfs.sh | 2 +- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfaa95ce..d13da614 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - d75baf71a09ed067b48f484f29efc4e7f3e3df13 + fc43dcf6508c135e6743889311d86992da080f30 - + https://github.com/dotnet/arcade - d75baf71a09ed067b48f484f29efc4e7f3e3df13 + fc43dcf6508c135e6743889311d86992da080f30 - + https://github.com/dotnet/arcade - d75baf71a09ed067b48f484f29efc4e7f3e3df13 + fc43dcf6508c135e6743889311d86992da080f30 - + https://github.com/dotnet/arcade - d75baf71a09ed067b48f484f29efc4e7f3e3df13 + fc43dcf6508c135e6743889311d86992da080f30 - + https://github.com/dotnet/arcade - d75baf71a09ed067b48f484f29efc4e7f3e3df13 + fc43dcf6508c135e6743889311d86992da080f30 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 1deadcc6..79bb058a 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -70,7 +70,7 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="12.3-RELEASE" +__FreeBSDBase="12.4-RELEASE" __FreeBSDPkg="1.17.0" __FreeBSDABI="12" __FreeBSDPackages="libunwind" diff --git a/global.json b/global.json index 57fe57e7..c73618c2 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23220.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23221.8" } } From f2ecc82b3f96e1fc44b2f89da56313863fd02432 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Apr 2023 12:23:19 +0000 Subject: [PATCH 09/24] Update dependencies from https://github.com/dotnet/arcade build 20230422.1 (#1577) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d13da614..e8a7122e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - fc43dcf6508c135e6743889311d86992da080f30 + 19edd2a515c37b90e90ceab9ce842847ce75b460 - + https://github.com/dotnet/arcade - fc43dcf6508c135e6743889311d86992da080f30 + 19edd2a515c37b90e90ceab9ce842847ce75b460 - + https://github.com/dotnet/arcade - fc43dcf6508c135e6743889311d86992da080f30 + 19edd2a515c37b90e90ceab9ce842847ce75b460 - + https://github.com/dotnet/arcade - fc43dcf6508c135e6743889311d86992da080f30 + 19edd2a515c37b90e90ceab9ce842847ce75b460 - + https://github.com/dotnet/arcade - fc43dcf6508c135e6743889311d86992da080f30 + 19edd2a515c37b90e90ceab9ce842847ce75b460 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index c73618c2..c04d58ce 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23221.8" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23222.1" } } From 52ac9d2129c107c1f26eeadac455cf51943fced2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 12:23:44 +0000 Subject: [PATCH 10/24] Update dependencies from https://github.com/dotnet/arcade build 20230424.1 (#1578) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8a7122e..7a528ec2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 19edd2a515c37b90e90ceab9ce842847ce75b460 + d14c4adbdbb8c7ee060f9e333883fc9890939b66 - + https://github.com/dotnet/arcade - 19edd2a515c37b90e90ceab9ce842847ce75b460 + d14c4adbdbb8c7ee060f9e333883fc9890939b66 - + https://github.com/dotnet/arcade - 19edd2a515c37b90e90ceab9ce842847ce75b460 + d14c4adbdbb8c7ee060f9e333883fc9890939b66 - + https://github.com/dotnet/arcade - 19edd2a515c37b90e90ceab9ce842847ce75b460 + d14c4adbdbb8c7ee060f9e333883fc9890939b66 - + https://github.com/dotnet/arcade - 19edd2a515c37b90e90ceab9ce842847ce75b460 + d14c4adbdbb8c7ee060f9e333883fc9890939b66 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index c04d58ce..eab4c3d3 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23222.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.1" } } From 41a8a165bc13d3f82b9a7e321b6a4518527e148d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 12:24:12 +0000 Subject: [PATCH 11/24] Update dependencies from https://github.com/dotnet/arcade build 20230424.3 (#1579) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a528ec2..f3cd3342 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index eab4c3d3..1a523ebc 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.3" } } From 0cc0991fb94b81bcab5df31aa544e85227caa7a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 12:25:21 +0000 Subject: [PATCH 12/24] Update dependencies from https://github.com/dotnet/arcade build 20230424.5 (#1580) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/templates/job/job.yml | 2 ++ global.json | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3cd3342..699656db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 https://github.com/dotnet/arcade-services diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index a21533fd..1279a8b1 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -162,6 +162,8 @@ jobs: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: diff --git a/global.json b/global.json index 1a523ebc..938d7ed2 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.5" } } From 456a01861647a490537cd81767a2e5fb5e0d3bd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 12:30:09 +0000 Subject: [PATCH 13/24] Update dependencies from https://github.com/dotnet/arcade build 20230426.4 (#1581) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/cross/build-rootfs.sh | 2 +- eng/common/templates/job/job.yml | 2 +- global.json | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 699656db..b821bffc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 79bb058a..6a59f753 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -330,7 +330,7 @@ while :; do ;; freebsd13) __CodeName=freebsd - __FreeBSDBase="13.0-RELEASE" + __FreeBSDBase="13.2-RELEASE" __FreeBSDABI="13" __SkipUnmount=1 ;; diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 1279a8b1..a7bbf0f1 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -158,7 +158,7 @@ jobs: - template: /eng/common/templates/steps/component-governance.yml parameters: ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true diff --git a/global.json b/global.json index 938d7ed2..c6629ed1 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4" } } From dc265d4b9caf08436d0ff589d27f3e4ceba8bdd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 May 2023 12:36:58 +0000 Subject: [PATCH 14/24] Update dependencies from https://github.com/dotnet/arcade build 20230503.3 (#1582) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/common/cross/toolchain.cmake | 32 +++++++++++++++++++++++++----- eng/common/native/init-compiler.sh | 2 +- eng/common/templates/job/job.yml | 2 +- global.json | 2 +- 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b821bffc..dddf38e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 + 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 - + https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 + 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 - + https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 + 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 - + https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 + 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 - + https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 + 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 1c9d212d..ce01673c 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -67,13 +67,25 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6") endif() elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) - set(TOOLCHAIN "powerpc64le-linux-gnu") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl) + set(TOOLCHAIN "powerpc64le-alpine-linux-musl") + else() + set(TOOLCHAIN "powerpc64le-linux-gnu") + endif() elseif(TARGET_ARCH_NAME STREQUAL "riscv64") set(CMAKE_SYSTEM_PROCESSOR riscv64) - set(TOOLCHAIN "riscv64-linux-gnu") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl) + set(TOOLCHAIN "riscv64-alpine-linux-musl") + else() + set(TOOLCHAIN "riscv64-linux-gnu") + endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") set(CMAKE_SYSTEM_PROCESSOR s390x) - set(TOOLCHAIN "s390x-linux-gnu") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl) + set(TOOLCHAIN "s390x-alpine-linux-musl") + else() + set(TOOLCHAIN "s390x-linux-gnu") + endif() elseif(TARGET_ARCH_NAME STREQUAL "x64") set(CMAKE_SYSTEM_PROCESSOR x86_64) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl) @@ -92,7 +104,11 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") set(CMAKE_SYSTEM_PROCESSOR i686) - set(TOOLCHAIN "i686-linux-gnu") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) + set(TOOLCHAIN "i586-alpine-linux-musl") + else() + set(TOOLCHAIN "i686-linux-gnu") + endif() if(TIZEN) set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() @@ -266,8 +282,11 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) + add_toolchain_linker_flag("--target=${TOOLCHAIN}") + add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") + endif() add_toolchain_linker_flag(-m32) - if(TIZEN) add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") @@ -307,6 +326,9 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") add_compile_options(-mfloat-abi=softfp) endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) + add_compile_options(--target=${TOOLCHAIN}) + endif() add_compile_options(-m32) add_compile_options(-Wno-error=unused-command-line-argument) endif() diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 7aee4213..517401b6 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -64,7 +64,7 @@ if [ -z "$CLR_CC" ]; then if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" - elif [ "$compiler" = "gcc" ]; then versions="12 11 10 9 8 7 6 5 4.9"; fi + elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do _major="${version%%.*}" diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index a7bbf0f1..44ad26ab 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -158,7 +158,7 @@ jobs: - template: /eng/common/templates/steps/component-governance.yml parameters: ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true diff --git a/global.json b/global.json index c6629ed1..d5fcd5cb 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.3" } } From 82174a3a7e699aa4225e964741345fdf276b2d80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 12:40:13 +0000 Subject: [PATCH 15/24] Update dependencies from https://github.com/dotnet/arcade build 20230503.5 (#1584) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.ps1 | 3 ++- global.json | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dddf38e2..86b85c35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 + 39d795a2d83c7ee351a26c4544f5352e62e30da1 - + https://github.com/dotnet/arcade - 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 + 39d795a2d83c7ee351a26c4544f5352e62e30da1 - + https://github.com/dotnet/arcade - 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 + 39d795a2d83c7ee351a26c4544f5352e62e30da1 - + https://github.com/dotnet/arcade - 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 + 39d795a2d83c7ee351a26c4544f5352e62e30da1 - + https://github.com/dotnet/arcade - 5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075 + 39d795a2d83c7ee351a26c4544f5352e62e30da1 https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 8ad03be3..050735a5 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -399,7 +399,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements if ($vsInfo -ne $null) { - $vsInstallDir = $vsInfo.installationPath + # Ensure vsInstallDir has a trailing slash + $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion diff --git a/global.json b/global.json index d5fcd5cb..c96f1712 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.5" } } From 54cda868c28787c905f975a79ae351a497cc7bbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 12:35:25 +0000 Subject: [PATCH 16/24] Update dependencies from https://github.com/dotnet/arcade build 20230505.1 (#1586) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86b85c35..e3ec62b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 39d795a2d83c7ee351a26c4544f5352e62e30da1 + 94d40fc8f3d17444772d90db73469d795a68a421 - + https://github.com/dotnet/arcade - 39d795a2d83c7ee351a26c4544f5352e62e30da1 + 94d40fc8f3d17444772d90db73469d795a68a421 - + https://github.com/dotnet/arcade - 39d795a2d83c7ee351a26c4544f5352e62e30da1 + 94d40fc8f3d17444772d90db73469d795a68a421 - + https://github.com/dotnet/arcade - 39d795a2d83c7ee351a26c4544f5352e62e30da1 + 94d40fc8f3d17444772d90db73469d795a68a421 - + https://github.com/dotnet/arcade - 39d795a2d83c7ee351a26c4544f5352e62e30da1 + 94d40fc8f3d17444772d90db73469d795a68a421 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index c96f1712..7c2bb6f0 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23255.1" } } From 8cb0763190478d86691d21330e00d97c6bdc1b3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 6 May 2023 12:40:08 +0000 Subject: [PATCH 17/24] Update dependencies from https://github.com/dotnet/arcade build 20230505.2 (#1587) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.ps1 | 25 ++++++++++++++++++++++--- eng/common/tools.sh | 35 ++++++++++++++++++++++++++++++++--- global.json | 2 +- 4 files changed, 65 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3ec62b8..1d5439d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 94d40fc8f3d17444772d90db73469d795a68a421 + 5dff25b814b90abb85c847ed274cf4afb2c1b276 - + https://github.com/dotnet/arcade - 94d40fc8f3d17444772d90db73469d795a68a421 + 5dff25b814b90abb85c847ed274cf4afb2c1b276 - + https://github.com/dotnet/arcade - 94d40fc8f3d17444772d90db73469d795a68a421 + 5dff25b814b90abb85c847ed274cf4afb2c1b276 - + https://github.com/dotnet/arcade - 94d40fc8f3d17444772d90db73469d795a68a421 + 5dff25b814b90abb85c847ed274cf4afb2c1b276 - + https://github.com/dotnet/arcade - 94d40fc8f3d17444772d90db73469d795a68a421 + 5dff25b814b90abb85c847ed274cf4afb2c1b276 https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 050735a5..38cf94ff 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -287,6 +287,25 @@ function InstallDotNet([string] $dotnetRoot, [string] $runtimeSourceFeedKey = '', [switch] $noPath) { + $dotnetVersionLabel = "'sdk v$version'" + + if ($runtime -ne '' -and $runtime -ne 'sdk') { + $runtimePath = $dotnetRoot + $runtimePath = $runtimePath + "\shared" + if ($runtime -eq "dotnet") { $runtimePath = $runtimePath + "\Microsoft.NETCore.App" } + if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } + if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } + $runtimePath = $runtimePath + "\" + $version + + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" + + if (Test-Path $runtimePath) { + Write-Host " Runtime toolset '$runtime/$architecture v$version' already installed." + $installSuccess = $true + Exit + } + } + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -323,18 +342,18 @@ function InstallDotNet([string] $dotnetRoot, } else { $location = "public location"; } - Write-Host "Attempting to install dotnet from $location." + Write-Host " Attempting to install $dotnetVersionLabel from $location." try { & $installScript @variation $installSuccess = $true break } catch { - Write-Host "Failed to install dotnet from $location." + Write-Host " Failed to install $dotnetVersionLabel from $location." } } if (-not $installSuccess) { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations." + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install $dotnetVersionLabel from any of the specified locations." ExitWithExitCode 1 } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index cf9fb1ea..e8d47894 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -184,6 +184,35 @@ function InstallDotNetSdk { function InstallDotNet { local root=$1 local version=$2 + local runtime=$4 + + local dotnetVersionLabel="'$runtime v$version'" + if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then + runtimePath="$root" + runtimePath="$runtimePath/shared" + case "$runtime" in + dotnet) + runtimePath="$runtimePath/Microsoft.NETCore.App" + ;; + aspnetcore) + runtimePath="$runtimePath/Microsoft.AspNetCore.App" + ;; + windowsdesktop) + runtimePath="$runtimePath/Microsoft.WindowsDesktop.App" + ;; + *) + ;; + esac + runtimePath="$runtimePath/$version" + + dotnetVersionLabel="runtime toolset '$runtime/$architecture v$version'" + + if [ -d "$runtimePath" ]; then + echo " Runtime toolset '$runtime/$architecture v$version' already installed." + local installSuccess=1 + return + fi + fi GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript @@ -228,17 +257,17 @@ function InstallDotNet { for variationName in "${variations[@]}"; do local name="$variationName[@]" local variation=("${!name}") - echo "Attempting to install dotnet from $variationName." + echo " Attempting to install $dotnetVersionLabel from $variationName." bash "$install_script" "${variation[@]}" && installSuccess=1 if [[ "$installSuccess" -eq 1 ]]; then break fi - echo "Failed to install dotnet from $variationName." + echo " Failed to install $dotnetVersionLabel from $variationName." done if [[ "$installSuccess" -eq 0 ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations." + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install $dotnetVersionLabel from any of the specified locations." ExitWithExitCode 1 fi } diff --git a/global.json b/global.json index 7c2bb6f0..bf7bce18 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23255.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23255.2" } } From 88f462482739741cd5768bc7961eaaff12ed021a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 12:56:38 +0000 Subject: [PATCH 18/24] Update dependencies from https://github.com/dotnet/arcade build 20230509.1 (#1589) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d5439d9..7f82c353 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 5dff25b814b90abb85c847ed274cf4afb2c1b276 + 833d08dde7eca1590731085b73245a81de96bd10 - + https://github.com/dotnet/arcade - 5dff25b814b90abb85c847ed274cf4afb2c1b276 + 833d08dde7eca1590731085b73245a81de96bd10 - + https://github.com/dotnet/arcade - 5dff25b814b90abb85c847ed274cf4afb2c1b276 + 833d08dde7eca1590731085b73245a81de96bd10 - + https://github.com/dotnet/arcade - 5dff25b814b90abb85c847ed274cf4afb2c1b276 + 833d08dde7eca1590731085b73245a81de96bd10 - + https://github.com/dotnet/arcade - 5dff25b814b90abb85c847ed274cf4afb2c1b276 + 833d08dde7eca1590731085b73245a81de96bd10 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index bf7bce18..9d4e5f22 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23255.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.1" } } From 9f94851d725edf3f5a144582a34140281f75fe34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 12:36:46 +0000 Subject: [PATCH 19/24] Update dependencies from https://github.com/dotnet/arcade build 20230509.5 (#1590) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f82c353..5f394dfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 833d08dde7eca1590731085b73245a81de96bd10 + 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff - + https://github.com/dotnet/arcade - 833d08dde7eca1590731085b73245a81de96bd10 + 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff - + https://github.com/dotnet/arcade - 833d08dde7eca1590731085b73245a81de96bd10 + 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff - + https://github.com/dotnet/arcade - 833d08dde7eca1590731085b73245a81de96bd10 + 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff - + https://github.com/dotnet/arcade - 833d08dde7eca1590731085b73245a81de96bd10 + 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 9d4e5f22..bccda1c3 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.5" } } From 3ad6218c7eb5420e98d0656bf5d8e6ff01c8c6ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 12:36:58 +0000 Subject: [PATCH 20/24] Update dependencies from https://github.com/dotnet/arcade build 20230510.3 (#1591) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f394dfa..6c737830 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff + 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 - + https://github.com/dotnet/arcade - 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff + 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 - + https://github.com/dotnet/arcade - 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff + 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 - + https://github.com/dotnet/arcade - 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff + 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 - + https://github.com/dotnet/arcade - 08f0d9daf5c5a422b5a22db601ee9fde7068c7ff + 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index bccda1c3..634b6c56 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23260.3" } } From 780395944848cf853c1d3f25b95cf4c56f7bb9f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 12:40:04 +0000 Subject: [PATCH 21/24] Update dependencies from https://github.com/dotnet/arcade build 20230511.4 (#1592) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c737830..1c7ca0c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 + 06faa97f3e5232df0ddad42caaf28eea39d4ad1a - + https://github.com/dotnet/arcade - 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 + 06faa97f3e5232df0ddad42caaf28eea39d4ad1a - + https://github.com/dotnet/arcade - 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 + 06faa97f3e5232df0ddad42caaf28eea39d4ad1a - + https://github.com/dotnet/arcade - 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 + 06faa97f3e5232df0ddad42caaf28eea39d4ad1a - + https://github.com/dotnet/arcade - 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 + 06faa97f3e5232df0ddad42caaf28eea39d4ad1a https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 634b6c56..97597f4b 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23260.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23261.4" } } From dfb97f0e55781e25f2456955b5cdf565b4bef2d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 May 2023 12:40:52 +0000 Subject: [PATCH 22/24] Update dependencies from https://github.com/dotnet/arcade build 20230512.5 (#1593) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++---- eng/common/cross/build-rootfs.sh | 94 +++++++++++++++----------------- eng/common/cross/toolchain.cmake | 13 +++-- global.json | 2 +- 4 files changed, 64 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c7ca0c7..f7c8923c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 06faa97f3e5232df0ddad42caaf28eea39d4ad1a + 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 - + https://github.com/dotnet/arcade - 06faa97f3e5232df0ddad42caaf28eea39d4ad1a + 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 - + https://github.com/dotnet/arcade - 06faa97f3e5232df0ddad42caaf28eea39d4ad1a + 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 - + https://github.com/dotnet/arcade - 06faa97f3e5232df0ddad42caaf28eea39d4ad1a + 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 - + https://github.com/dotnet/arcade - 06faa97f3e5232df0ddad42caaf28eea39d4ad1a + 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 6a59f753..9caf9b02 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -27,6 +27,7 @@ __AlpineArch=armv7 __FreeBSDArch=arm __FreeBSDMachineArch=armv7 __IllumosArch=arm7 +__HaikuArch=arm __QEMUArch=arm __UbuntuArch=armhf __UbuntuRepo="http://ports.ubuntu.com/" @@ -85,8 +86,12 @@ __IllumosPackages+=" mit-krb5" __IllumosPackages+=" openssl" __IllumosPackages+=" zlib" -__HaikuPackages="gmp" +__HaikuPackages="gcc_syslibs" +__HaikuPackages+=" gcc_syslibs_devel" +__HaikuPackages+=" gmp" __HaikuPackages+=" gmp_devel" +__HaikuPackages+=" icu66" +__HaikuPackages+=" icu66_devel" __HaikuPackages+=" krb5" __HaikuPackages+=" krb5_devel" __HaikuPackages+=" libiconv" @@ -95,6 +100,10 @@ __HaikuPackages+=" llvm12_libunwind" __HaikuPackages+=" llvm12_libunwind_devel" __HaikuPackages+=" mpfr" __HaikuPackages+=" mpfr_devel" +__HaikuPackages+=" openssl" +__HaikuPackages+=" openssl_devel" +__HaikuPackages+=" zlib" +__HaikuPackages+=" zlib_devel" # ML.NET dependencies __UbuntuPackages+=" libomp5" @@ -210,6 +219,7 @@ while :; do __FreeBSDArch=amd64 __FreeBSDMachineArch=amd64 __illumosArch=x86_64 + __HaikuArch=x86_64 __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; x86) @@ -340,7 +350,6 @@ while :; do ;; haiku) __CodeName=haiku - __BuildArch=x64 __SkipUnmount=1 ;; --skipunmount) @@ -559,67 +568,54 @@ elif [[ "$__CodeName" == "illumos" ]]; then elif [[ "$__CodeName" == "haiku" ]]; then JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} - echo "Building Haiku sysroot for x86_64" + echo "Building Haiku sysroot for $__HaikuArch" mkdir -p "$__RootfsDir/tmp" - cd "$__RootfsDir/tmp" - git clone -b hrev56235 https://review.haiku-os.org/haiku - git clone -b btrev43195 https://review.haiku-os.org/buildtools - cd "$__RootfsDir/tmp/buildtools" && git checkout 7487388f5110021d400b9f3b88e1a7f310dc066d - - # Fetch some unmerged patches - cd "$__RootfsDir/tmp/haiku" - ## Add development build profile (slimmer than nightly) - git fetch origin refs/changes/64/4164/1 && git -c commit.gpgsign=false cherry-pick FETCH_HEAD - - # Build jam - cd "$__RootfsDir/tmp/buildtools/jam" - make - - # Configure cross tools - echo "Building cross-compiler" - mkdir -p "$__RootfsDir/generated" - cd "$__RootfsDir/generated" - "$__RootfsDir/tmp/haiku/configure" -j"$JOBS" --sysroot "$__RootfsDir" --cross-tools-source "$__RootfsDir/tmp/buildtools" --build-cross-tools x86_64 - - # Build Haiku packages - echo "Building Haiku" - echo 'HAIKU_BUILD_PROFILE = "development-raw" ;' > UserProfileConfig - "$__RootfsDir/tmp/buildtools/jam/jam0" -j"$JOBS" -q 'package' 'Haiku' - - BaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" - - # Download additional packages - echo "Downloading additional required packages" + pushd "$__RootfsDir/tmp" + + mkdir "$__RootfsDir/tmp/download" + + echo "Downloading Haiku package tool" + git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 $__RootfsDir/tmp/script + wget -O "$__RootfsDir/tmp/download/hosttools.zip" $($__RootfsDir/tmp/script/fetch.sh --hosttools) + unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin" + + DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" + HpkgBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current" + + # Download Haiku packages + echo "Downloading Haiku packages" read -ra array <<<"$__HaikuPackages" for package in "${array[@]}"; do echo "Downloading $package..." # API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60 # The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598 - hpkgDownloadUrl="$(wget -qO- --post-data='{"name":"'"$package"'","repositorySourceCode":"haikuports_x86_64","versionType":"LATEST","naturalLanguageCode":"en"}' \ - --header='Content-Type:application/json' "$BaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" - wget -P "$__RootfsDir/generated/download" "$hpkgDownloadUrl" + hpkgDownloadUrl="$(wget -qO- --post-data='{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ + --header='Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" + wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + done + for package in haiku haiku_devel; do + echo "Downloading $package..." + hpkgVersion="$(wget -qO- $HpkgBaseUrl | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" done - # Setup the sysroot - echo "Setting up sysroot and extracting needed packages" + # Set up the sysroot + echo "Setting up sysroot and extracting required packages" mkdir -p "$__RootfsDir/boot/system" - for file in "$__RootfsDir/generated/objects/haiku/x86_64/packaging/packages/"*.hpkg; do - "$__RootfsDir/generated/objects/linux/x86_64/release/tools/package/package" extract -C "$__RootfsDir/boot/system" "$file" - done - for file in "$__RootfsDir/generated/download/"*.hpkg; do - "$__RootfsDir/generated/objects/linux/x86_64/release/tools/package/package" extract -C "$__RootfsDir/boot/system" "$file" + for file in "$__RootfsDir/tmp/download/"*.hpkg; do + echo "Extracting $file..." + LD_LIBRARY_PATH="$__RootfsDir/tmp/bin" "$__RootfsDir/tmp/bin/package" extract -C "$__RootfsDir/boot/system" "$file" done + # Download buildtools + echo "Downloading Haiku buildtools" + wget -O "$__RootfsDir/tmp/download/buildtools.zip" $($__RootfsDir/tmp/script/fetch.sh --buildtools --arch=$__HaikuArch) + unzip -o "$__RootfsDir/tmp/download/buildtools.zip" -d "$__RootfsDir" + # Cleaning up temporary files echo "Cleaning up temporary files" + popd rm -rf "$__RootfsDir/tmp" - for name in "$__RootfsDir/generated/"*; do - if [[ "$name" =~ "cross-tools-" ]]; then - : # Keep the cross-compiler - else - rm -rf "$name" - fi - done elif [[ -n "$__CodeName" ]]; then if [[ "$__SkipSigCheck" == "0" ]]; then diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ce01673c..a88d643c 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -6,6 +6,7 @@ unset(FREEBSD) unset(ILLUMOS) unset(ANDROID) unset(TIZEN) +unset(HAIKU) set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) @@ -16,6 +17,7 @@ elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc) set(ILLUMOS 1) elseif(EXISTS ${CROSS_ROOTFS}/boot/system/develop/headers/config/HaikuConfig.h) set(CMAKE_SYSTEM_NAME Haiku) + set(HAIKU 1) else() set(CMAKE_SYSTEM_NAME Linux) set(LINUX 1) @@ -76,7 +78,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64") set(CMAKE_SYSTEM_PROCESSOR riscv64) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl) set(TOOLCHAIN "riscv64-alpine-linux-musl") - else() + else() set(TOOLCHAIN "riscv64-linux-gnu") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") @@ -100,7 +102,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(ILLUMOS) set(TOOLCHAIN "x86_64-illumos") elseif(HAIKU) - set(TOOLCHAIN "x64_64-unknown-haiku") + set(TOOLCHAIN "x86_64-unknown-haiku") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") set(CMAKE_SYSTEM_PROCESSOR i686) @@ -214,10 +216,8 @@ elseif(HAIKU) return() endif() - set(SEARCH_PATH "${CROSS_ROOTFS}/generated/cross-tools-x86_64/bin") - find_program(EXEC_LOCATION_${exec} - PATHS ${SEARCH_PATH} + PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin" NAMES "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" "${TOOLSET_PREFIX}${exec}") @@ -296,6 +296,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib") +elseif(HAIKU) + add_toolchain_linker_flag("-lnetwork") + add_toolchain_linker_flag("-lroot") endif() # Specify compile options diff --git a/global.json b/global.json index 97597f4b..0a88473f 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23261.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23262.5" } } From 2ff79fb0cfa14c0ccccd08161e8201da89dca04c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 12:41:42 +0000 Subject: [PATCH 23/24] Update dependencies from https://github.com/dotnet/arcade build 20230515.1 (#1594) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7c8923c..16dc3ad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/arcade - 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index 0a88473f..5f921cf8 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23262.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23265.1" } } From ff4d89db4586bcb9598348efd56ee1a99aab5494 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 00:50:02 +0000 Subject: [PATCH 24/24] Bump socket.io-parser in /samples/apps-with-core-angular/MoviesApp Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.2.1 to 4.2.3. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/4.2.1...4.2.3) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../MoviesApp/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/apps-with-core-angular/MoviesApp/package-lock.json b/samples/apps-with-core-angular/MoviesApp/package-lock.json index 75396c60..e8b48bf5 100644 --- a/samples/apps-with-core-angular/MoviesApp/package-lock.json +++ b/samples/apps-with-core-angular/MoviesApp/package-lock.json @@ -12366,9 +12366,9 @@ "dev": true }, "node_modules/socket.io-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", - "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz", + "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==", "dev": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", @@ -23025,9 +23025,9 @@ "dev": true }, "socket.io-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", - "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz", + "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==", "dev": true, "requires": { "@socket.io/component-emitter": "~3.1.0",