diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1b6f5039820890..c5d639c282f8f1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23505.1", + "version": "8.0.0-prerelease.23516.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69ae8a8bda28cf..0f5fd17881635c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,9 +95,9 @@ 97568ad0e2120f194df7ac3895e9589fcc8a255b - + https://github.com/dotnet/source-build-reference-packages - 05ffbf9df6c1dc621665ee1864874c4fe6de874c + 5d89368fe132c3f6210d661e18087db782b74f2d @@ -107,135 +107,135 @@ - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/xliff-tasks - 4f761bf529f4be49842b13d7efcef9af87f0a973 + d66a09c8b11e1235273c8e6cd946e5c8e247f189 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f https://github.com/dotnet/llvm-project @@ -293,46 +293,46 @@ https://github.com/dotnet/llvm-project bf6a0c836451372d987b49a6a67db84e5b93c727 - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + b9159ab91a5dbd124dd15d78ed073c52eba8c31b - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + b9159ab91a5dbd124dd15d78ed073c52eba8c31b - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + b9159ab91a5dbd124dd15d78ed073c52eba8c31b - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + b9159ab91a5dbd124dd15d78ed073c52eba8c31b - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + b9159ab91a5dbd124dd15d78ed073c52eba8c31b - + https://github.com/dotnet/runtime - 26a809adb958c604ac773d39f2c253cf0dd12e1e + b9159ab91a5dbd124dd15d78ed073c52eba8c31b - + https://github.com/dotnet/xharness - 0672f8ce90040d589f29edc37d9e817d67cd4533 + 02098f6cf81169134770ee47acc2aca0910635bb - + https://github.com/dotnet/xharness - 0672f8ce90040d589f29edc37d9e817d67cd4533 + 02098f6cf81169134770ee47acc2aca0910635bb - + https://github.com/dotnet/xharness - 0672f8ce90040d589f29edc37d9e817d67cd4533 + 02098f6cf81169134770ee47acc2aca0910635bb - + https://github.com/dotnet/arcade - 53e7d39f4fb3e1f244282251120b3639bdc805fc + 6a5ca678aef84f34a1fccc46f76623f41da56553 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -350,13 +350,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 9d70382f52bc311fa51e523bb066ebb012bf8035 - + https://github.com/dotnet/hotreload-utils - 0808f735fcb35276120b2e1221d6c3395d5543d6 + f58fecdac3665482f35ca7f5e0f8e7019a7377e8 - + https://github.com/dotnet/runtime-assets - 3b91a0e7b0284777a4a95a89c76c03074050eb41 + b625b0ba60ba9e759caf77311cd9fd60fdc8914f https://github.com/dotnet/roslyn @@ -379,9 +379,9 @@ https://github.com/dotnet/roslyn-analyzers 8b1675a20d889de99684bfced2e0cbc1296c7853 - + https://github.com/dotnet/sdk - f3143488131043ba6788f72044b7b28bbcc462dd + 61867967918ee4bd6519e1ae4bbc7dfefbc38ce4 diff --git a/eng/Versions.props b/eng/Versions.props index 230643a858f921..6a15eb999521a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,31 +80,31 @@ 0.2.0 - 9.0.100-alpha.1.23510.2 + 9.0.100-alpha.1.23519.18 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 2.5.1-beta.23510.1 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 - 9.0.0-beta.23512.4 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 2.5.1-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 + 9.0.0-beta.23518.2 6.0.0-preview.1.102 - 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23515.3 6.0.0 - 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23515.3 16.0.5-alpha.1.23477.2 16.0.5-alpha.1.23477.2 16.0.5-alpha.1.23477.2 @@ -131,27 +131,27 @@ 5.0.0 5.0.0 7.0.0 - 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23515.3 6.0.0 7.0.0 4.5.4 4.5.0 - 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23515.3 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 - 8.0.0-beta.23502.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 + 8.0.0-beta.23516.1 1.0.0-prerelease.23507.6 1.0.0-prerelease.23507.6 @@ -178,10 +178,10 @@ 1.1.0 17.4.0-preview-20220707-01 - 8.0.0-prerelease.23505.1 - 8.0.0-prerelease.23505.1 - 8.0.0-prerelease.23505.1 - 8.0.0-alpha.0.23509.1 + 8.0.0-prerelease.23516.1 + 8.0.0-prerelease.23516.1 + 8.0.0-prerelease.23516.1 + 9.0.0-alpha.0.23518.1 3.12.0 4.1.0 6.0.0 @@ -205,7 +205,7 @@ 0.11.4-alpha.23509.2 - 9.0.0-alpha.1.23508.5 + 9.0.0-alpha.1.23515.3 9.0.0-alpha.1.23509.3 diff --git a/eng/common/build.sh b/eng/common/build.sh index 50af40cdd2ce60..2c17ba529b913b 100755 --- 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 index 9caf9b021dbdd3..4228f202e5bfa5 100755 --- 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 new file mode 100644 index 00000000000000..eb6d1c07470bff --- /dev/null +++ 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 index ac84173d44fc30..ba31c93285f631 100755 --- 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 "< $(InstallWorkloadUsingArtifactsDependsOn); _ProvisionDotNetForWorkloadTesting; + _InstallSharedFrameworksForWorkloadTesting; _GetDotNetVersion; _SetPackageVersionForWorkloadsTesting; GetNuGetsToBuildForWorkloadTesting; @@ -23,9 +24,11 @@ + - + + <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" /> <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" /> @@ -83,18 +86,17 @@ IgnoreStandardErrorWarningFormat="true" Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallCommand)"' /> - - - <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles - - - + + + + + Command="$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles %(AdditionalSharedFrameworkToInstallArguments.Identity)" /> - + Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles %(AdditionalSharedFrameworkToInstallArguments.Identity)"' /> diff --git a/global.json b/global.json index 6b42175fa4c3aa..9b3283f546e9b1 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "8.0.100-rc.1.23463.5", + "version": "8.0.100-rtm.23506.1", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-rc.1.23463.5" + "dotnet": "8.0.100-rtm.23506.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23512.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23512.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23512.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23518.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23518.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23508.5" + "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23515.3" } } diff --git a/src/libraries/Microsoft.Extensions.Diagnostics/tests/DefaultMetricsFactoryTests.cs b/src/libraries/Microsoft.Extensions.Diagnostics/tests/DefaultMetricsFactoryTests.cs index f73b197136bd7e..41277ced0c7fa0 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics/tests/DefaultMetricsFactoryTests.cs +++ b/src/libraries/Microsoft.Extensions.Diagnostics/tests/DefaultMetricsFactoryTests.cs @@ -104,6 +104,7 @@ public void NegativeTest() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/93754", TestPlatforms.Browser)] public void MeterDisposeTest() { ServiceCollection services = new ServiceCollection(); diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs index ad948df53200ba..74b7a1c5b06850 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs @@ -875,6 +875,7 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri => } } + [ActiveIssue("https://github.com/dotnet/runtime/issues/93754", TestPlatforms.Browser)] public class HttpMetricsTest_Http11_Async : HttpMetricsTest_Http11 { public HttpMetricsTest_Http11_Async(ITestOutputHelper output) : base(output)