Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #6972

Merged
merged 38 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
aa8caad
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 5, 2023
37f734d
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 6, 2023
97a7f75
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 7, 2023
2bb1ddb
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 8, 2023
fc30165
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 9, 2023
c4b7091
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 10, 2023
4f6c9fb
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 11, 2023
b6fb44b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 12, 2023
bf6f4cf
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 13, 2023
b83d5f0
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 14, 2023
82a157c
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 15, 2023
5817fde
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 16, 2023
e32e24e
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 17, 2023
2de746a
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 18, 2023
31547ac
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 18, 2023
cd7dc65
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 19, 2023
a13e007
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 20, 2023
8b19b81
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 21, 2023
a0181e8
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 22, 2023
6cebe87
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 23, 2023
91b5929
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 24, 2023
5a3052c
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 25, 2023
86ca771
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 26, 2023
8b7f910
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 27, 2023
e5ba302
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 27, 2023
f405501
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 28, 2023
4a7661a
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 29, 2023
5974041
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 29, 2023
4e4ea41
Fix xliff tasks
Evangelink Oct 30, 2023
b132a3d
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 30, 2023
130384b
Fix analyzer warning
Evangelink Oct 30, 2023
c1ff732
Update VS version
Evangelink Oct 30, 2023
093570e
Merge branch 'main' into darc-main-26b612c3-8f00-4779-b975-ce5ca11f99d5
Evangelink Oct 30, 2023
685caba
Use preview machine for public CI
Evangelink Oct 30, 2023
3392972
Downgrade global.json tools->dotnet to 8.0.100-rc.2.23502.2
carlossanlop Oct 30, 2023
5f972bf
More revert
Evangelink Oct 31, 2023
85b6c01
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 31, 2023
9cf7d38
Revert again to 8.0.100-rc.2.23502.2
Evangelink Oct 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
_codeCoverage: False
pool:
name: NetCore-Public
demands: ImageOverride -equals windows.vs2022.amd64.open
demands: ImageOverride -equals windows.vs2022preview.amd64.open
timeoutInMinutes: 120

steps:
Expand Down
11 changes: 5 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23528.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<!-- Used in repo tooling. Not updated automatically -->
<Dependency Name="System.Composition" Version="8.0.0-preview.4.23259.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23528.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a4d49646dbac90883d3672f1c08134d84cca5707</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
-binarylog|-bl)
binary_log=true
;;
-excludeCIBinarylog|-nobl)
-excludecibinarylog|-nobl)
exclude_ci_binary_log=true
;;
-pipelineslog|-pl)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions eng/common/cross/riscv64/tizen/tizen.patch
Original file line number Diff line number Diff line change
@@ -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 ) )
21 changes: 21 additions & 0 deletions eng/common/cross/tizen-build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
17 changes: 14 additions & 3 deletions eng/common/cross/tizen-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

9 changes: 8 additions & 1 deletion eng/common/cross/toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/check-channel-consistency.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ try {
. $PSScriptRoot\post-build-utils.ps1

if ($PromoteToChannels -eq "") {
Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
ExitWithExitCode 0
}

Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0-2" -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
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
$env:DOTNET_MULTILEVEL_LOOKUP=0

# Disable first run since we do not need all ASP.NET packages restored.
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
$env:DOTNET_NOLOGO=1

# Disable telemetry on CI.
if ($ci) {
Expand Down Expand Up @@ -228,7 +228,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
Write-PipelinePrependPath -Path $dotnetRoot

Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'
Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'

return $global:_DotNetInstallDir = $dotnetRoot
}
Expand Down Expand Up @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
}

# Minimum VS version to require.
$vsMinVersionReqdStr = '17.6'
$vsMinVersionReqdStr = '17.7'
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)

# 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.6.0-2
$defaultXCopyMSBuildVersion = '17.6.0-2'
# 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') {
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function InitializeDotNetCli {
export DOTNET_MULTILEVEL_LOOKUP=0

# Disable first run since we want to control all package sources
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export DOTNET_NOLOGO=1

# Disable telemetry on CI
if [[ $ci == true ]]; then
Expand Down Expand Up @@ -165,7 +165,7 @@ function InitializeDotNetCli {
Write-PipelinePrependPath -path "$dotnet_root"

Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"

# return value
_InitializeDotNetCli="$dotnet_root"
Expand Down
10 changes: 5 additions & 5 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"tools": {
"dotnet": "8.0.100-preview.7.23376.3",
"dotnet": "8.0.100-rc.2.23502.2",
"runtimes": {
"dotnet": [
"3.1.7",
"6.0.11"
]
},
"vs": {
"version": "16.10"
"version": "17.7.0"
},
"xcopy-msbuild": "16.10.0-preview2"
"xcopy-msbuild": "17.7.4"
},
"sdk": {
"version": "8.0.100-preview.7.23376.3",
"version": "8.0.100-rc.2.23502.2",
"allowPrerelease": true,
"rollForward": "patch"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private static void Verify(string rulesetText, string expectedEditorconfigText,
if (!Equals(expectedEditorconfigText, actualEditorConfigText))
{
// Dump the entire expected and actual lines for easy update to baseline.
Assert.True(false, $"Expected:\r\n{expectedEditorconfigText}\r\n\r\nActual:\r\n{actualEditorConfigText}");
Assert.Fail($"Expected:\r\n{expectedEditorconfigText}\r\n\r\nActual:\r\n{actualEditorConfigText}");
}
}
finally
Expand Down