[main] Update dependencies from dotnet/arcade (#4352)

[main] Update dependencies from dotnet/arcade
dotnet · Oct 23, 2023 · 6d3c1bb · 6d3c1bb
1 parent 3f9c251
commit 6d3c1bb
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 22 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -14,14 +14,14 @@
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23510.4">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23518.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>0e89c8d7ddbb54510d9d0a757fda5126021b79f0</Sha>
+ <Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
  <SourceBuild RepoName="arcade" ManagedOnly="true" />
  </Dependency>
- <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23510.4">
+ <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23518.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>0e89c8d7ddbb54510d9d0a757fda5126021b79f0</Sha>
+ <Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
  </Dependency>
  <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
  <Uri>https://github.com/dotnet/arcade</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -62,7 +62,7 @@
  <SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
  <SystemTextJsonVersion>6.0.8</SystemTextJsonVersion>
  <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
- <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23510.4</MicrosoftDotNetCodeAnalysisVersion>
+ <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23518.2</MicrosoftDotNetCodeAnalysisVersion>
  <StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
  <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
  <cdbsosversion>10.0.18362</cdbsosversion>

diff --git a/eng/common/build.sh b/eng/common/build.sh
@@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
  -binarylog|-bl)
  binary_log=true
  ;;
- -excludeCIBinarylog|-nobl)
+ -excludecibinarylog|-nobl)
  exclude_ci_binary_log=true
  ;;
  -pipelineslog|-pl)

diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
@@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
  -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
  -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
  -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
- search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
+ search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
  fi
 
  # install all packages in one go

diff --git a/eng/common/cross/riscv64/tizen/tizen.patch b/eng/common/cross/riscv64/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
+--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+ OUTPUT_FORMAT(elf64-littleriscv)
+-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) )
++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) )
diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh
@@ -22,6 +22,10 @@ case "$ARCH" in
  TIZEN_ARCH="x86_64"
  LINK_ARCH="x86"
  ;;
+ riscv64)
+ TIZEN_ARCH="riscv64"
+ LINK_ARCH="riscv"
+ ;;
  *)
  echo "Unsupported architecture for tizen: $ARCH"
  exit 1
@@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR
 echo ">>Start configuring Tizen rootfs"
 ln -sfn asm-${LINK_ARCH} ./usr/include/asm
 patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
+if [[ "$TIZEN_ARCH" == "riscv64" ]]; then
+ echo "Fixing broken symlinks in $PWD"
+ rm ./usr/lib64/libresolv.so
+ ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so
+ rm ./usr/lib64/libpthread.so
+ ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so
+ rm ./usr/lib64/libdl.so
+ ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so
+ rm ./usr/lib64/libutil.so
+ ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so
+ rm ./usr/lib64/libm.so
+ ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so
+ rm ./usr/lib64/librt.so
+ ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so
+ rm ./lib/ld-linux-riscv64-lp64d.so.1
+ ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1
+fi
 echo "<<Finish configuring Tizen rootfs"
diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh
@@ -156,17 +156,28 @@ fetch_tizen_pkgs()
  done
 }
 
+if [ "$TIZEN_ARCH" == "riscv64" ]; then
+ BASE="Tizen-Base-RISCV"
+ UNIFIED="Tizen-Unified-RISCV"
+else
+ BASE="Tizen-Base"
+ UNIFIED="Tizen-Unified"
+fi
+
 Inform "Initialize ${TIZEN_ARCH} base"
-fetch_tizen_pkgs_init standard Tizen-Base
+fetch_tizen_pkgs_init standard $BASE
 Inform "fetch common packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
 Inform "fetch coreclr packages"
-fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
+fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
+if [ "$TIZEN_ARCH" != "riscv64" ]; then
+ fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
+fi
 Inform "fetch corefx packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
 
 Inform "Initialize standard unified"
-fetch_tizen_pkgs_init standard Tizen-Unified
+fetch_tizen_pkgs_init standard $UNIFIED
 Inform "fetch corefx packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
 
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
@@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
  set(TOOLCHAIN "arm-linux-gnueabihf")
  endif()
  if(TIZEN)
- set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
+ set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0")
  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
  set(CMAKE_SYSTEM_PROCESSOR aarch64)
@@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
  elseif(LINUX)
  set(TOOLCHAIN "aarch64-linux-gnu")
  if(TIZEN)
- set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
+ set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0")
  endif()
  elseif(FREEBSD)
  set(triple "aarch64-unknown-freebsd12")
@@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
  set(CMAKE_SYSTEM_PROCESSOR armv7l)
  set(TOOLCHAIN "arm-linux-gnueabi")
  if(TIZEN)
- set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
+ set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/13.1.0")
  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "armv6")
  set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -80,6 +80,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
  set(TOOLCHAIN "riscv64-alpine-linux-musl")
  else()
  set(TOOLCHAIN "riscv64-linux-gnu")
+ if(TIZEN)
+ set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
+ endif()
  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
  set(CMAKE_SYSTEM_PROCESSOR s390x)
@@ -95,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
  elseif(LINUX)
  set(TOOLCHAIN "x86_64-linux-gnu")
  if(TIZEN)
- set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
+ set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0")
  endif()
  elseif(FREEBSD)
  set(triple "x86_64-unknown-freebsd12")
@@ -112,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
  set(TOOLCHAIN "i686-linux-gnu")
  endif()
  if(TIZEN)
- set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
+ set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0")
  endif()
 else()
  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
@@ -144,6 +147,10 @@ if(TIZEN)
  include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
  include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
  endif()
+ if(TARGET_ARCH_NAME STREQUAL "riscv64")
+ include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
+ include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
+ endif()
 endif()
 
 if(ANDROID)
@@ -270,7 +277,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
  add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
  add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
  endif()
-elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
+elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
  if(TIZEN)
  add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
  add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")

diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
  $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
  }
  if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
- $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty
+ $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
  }
  if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
  $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
@@ -154,7 +154,7 @@ jobs:
  displayName: RichCodeNav Upload
  inputs:
  languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
- environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
+ environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
  richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
  uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
  continueOnError: true

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
  # If the version of msbuild is going to be xcopied,
  # use this version. Version matches a package here:
- # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1
- $defaultXCopyMSBuildVersion = '17.7.2-1'
+ # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
+ $defaultXCopyMSBuildVersion = '17.8.1-2'
 
  if (!$vsRequirements) {
  if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
  "tools": {
- "dotnet": "8.0.100-rc.1.23455.8",
+ "dotnet": "8.0.100-rtm.23506.1",
  "runtimes": {
  "dotnet": [
  "$(MicrosoftNETCoreApp60Version)",
@@ -16,6 +16,6 @@
  },
  "msbuild-sdks": {
  "Microsoft.Build.NoTargets": "3.5.0",
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.4"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2"
  }
 }