From 1080780923ecf3d3f74486bbb859a9dabcaa4074 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 11:17:39 -0700 Subject: [PATCH 01/33] [release/9.0-staging] Disable release assert on disallowed thread re-initialization for managed C++ (#118842) * IJW workaround --------- Co-authored-by: Jan Kotas Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/coreclr/vm/ceeload.cpp | 9 +++++++++ src/coreclr/vm/ceeload.h | 2 ++ src/coreclr/vm/ceemain.cpp | 12 +++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/coreclr/vm/ceeload.cpp b/src/coreclr/vm/ceeload.cpp index eb3a2d8015ccd5..50b44b6ff6761f 100644 --- a/src/coreclr/vm/ceeload.cpp +++ b/src/coreclr/vm/ceeload.cpp @@ -3746,10 +3746,19 @@ void SaveManagedCommandLine(LPCWSTR pwzAssemblyPath, int argc, LPCWSTR *argv) #endif } +static bool g_fIJWLoaded = false; + void Module::SetIsIJWFixedUp() { LIMITED_METHOD_CONTRACT; InterlockedOr((LONG*)&m_dwTransientFlags, IS_IJW_FIXED_UP); + g_fIJWLoaded = true; +} + +bool Module::HasAnyIJWBeenLoaded() +{ + LIMITED_METHOD_CONTRACT; + return g_fIJWLoaded; } #endif // !DACCESS_COMPILE diff --git a/src/coreclr/vm/ceeload.h b/src/coreclr/vm/ceeload.h index 5fee2e09f4bf79..0f9936e47f864c 100644 --- a/src/coreclr/vm/ceeload.h +++ b/src/coreclr/vm/ceeload.h @@ -1476,6 +1476,8 @@ class Module : public ModuleBase BOOL IsIJWFixedUp() { return m_dwTransientFlags & IS_IJW_FIXED_UP; } void SetIsIJWFixedUp(); + static bool HasAnyIJWBeenLoaded(); + BOOL IsBeingUnloaded() { return m_dwTransientFlags & IS_BEING_UNLOADED; } void SetBeingUnloaded(); void StartUnload(); diff --git a/src/coreclr/vm/ceemain.cpp b/src/coreclr/vm/ceemain.cpp index 3df24664ff2df5..a75353ec28f990 100644 --- a/src/coreclr/vm/ceemain.cpp +++ b/src/coreclr/vm/ceemain.cpp @@ -1815,7 +1815,17 @@ static void OsAttachThread(void* thread) if (t_flsState == FLS_STATE_INVOKED) { - _ASSERTE_ALL_BUILDS(!"Attempt to execute managed code after the .NET runtime thread state has been destroyed."); + // Managed C++ may run managed code in DllMain (e.g. during DLL_PROCESS_DETACH to run global destructors). This is + // not supported and unreliable. Historically, it happened to work most of the time. For backward compatibility, + // suppress this assert in release builds if we have encountered any mixed mode binaries. + if (Module::HasAnyIJWBeenLoaded()) + { + _ASSERTE(!"Attempt to execute managed code after the .NET runtime thread state has been destroyed."); + } + else + { + _ASSERTE_ALL_BUILDS(!"Attempt to execute managed code after the .NET runtime thread state has been destroyed."); + } } t_flsState = FLS_STATE_ARMED; From 76ece90d9ed77bbbd4057015be5a9dd5d4cba0c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 24 Aug 2025 17:37:19 +0200 Subject: [PATCH 02/33] [release/9.0-staging] [wasm][AOT] fix codegen for small structs on stack (#118416) --- src/mono/mono/mini/mini-wasm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mono/mono/mini/mini-wasm.c b/src/mono/mono/mini/mini-wasm.c index a0587570fe2bdf..55d9fceba4cbf2 100644 --- a/src/mono/mono/mini/mini-wasm.c +++ b/src/mono/mono/mini/mini-wasm.c @@ -798,7 +798,7 @@ mini_wasm_is_scalar_vtype (MonoType *type, MonoType **etype) } else if (MONO_TYPE_ISSTRUCT (t)) { if (!mini_wasm_is_scalar_vtype (t, etype)) return FALSE; - } else if (!((MONO_TYPE_IS_PRIMITIVE (t) || MONO_TYPE_IS_REFERENCE (t) || MONO_TYPE_IS_POINTER (t)))) { + } else if (!(MONO_TYPE_IS_PRIMITIVE (t) || MONO_TYPE_IS_REFERENCE (t) || MONO_TYPE_IS_POINTER (t))) { return FALSE; } else { if (etype) @@ -806,10 +806,12 @@ mini_wasm_is_scalar_vtype (MonoType *type, MonoType **etype) } } - if (etype) { - if (!(*etype)) - *etype = mono_get_int32_type (); + // empty struct + if (nfields == 0 && etype) { + *etype = m_class_get_byval_arg (mono_defaults.sbyte_class); } + g_assert (!etype || *etype); + return TRUE; } From a10b79061845b903555f5b277a0e80568a383424 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 10:56:53 +0000 Subject: [PATCH 03/33] Don't use vfork on android (#118331) When we start the child process, we clear all signal handlers. This operations ends up clearing the signal handlers also for the parent process. Revert to just using fork for simplicity. Co-authored-by: Vlad Brezae --- src/native/libs/System.Native/pal_process.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/native/libs/System.Native/pal_process.c b/src/native/libs/System.Native/pal_process.c index fa5e522c36205e..ca982ebbf48a23 100644 --- a/src/native/libs/System.Native/pal_process.c +++ b/src/native/libs/System.Native/pal_process.c @@ -314,7 +314,11 @@ int32_t SystemNative_ForkAndExecProcess(const char* filename, sigfillset(&signal_set); pthread_sigmask(SIG_SETMASK, &signal_set, &old_signal_set); -#if HAVE_VFORK && !(defined(__APPLE__)) // We don't trust vfork on OS X right now. +// vfork on OS X is deprecated +// On Android, signal handlers between parent and child processes are shared with vfork, so when we reset +// the signal handlers during child startup, we end up incorrectly clearing also the ones for the parent. +#if HAVE_VFORK && !defined(__APPLE__) && !defined(TARGET_ANDROID) + // This platform has vfork(). vfork() is either a synonym for fork or provides shared memory // semantics. For a one gigabyte process, the expected performance gain of using shared memory // vfork() rather than fork() is 99.5% merely due to avoiding page faults as the kernel does not From 58cc46dfeaa14f46dc07b9917ff1b04cf133d14f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 10:57:28 +0000 Subject: [PATCH 04/33] [release/9.0-staging] [mono][debugger] Fix assertion when stepping (#118459) * Fix assertion when stepping * Backport of https://github.com/dotnet/runtime/pull/118542/ --------- Co-authored-by: Thays Grazia --- src/mono/mono/mini/mini-arm64.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mono/mono/mini/mini-arm64.c b/src/mono/mono/mini/mini-arm64.c index c42684ce693527..8410f0939f85c5 100644 --- a/src/mono/mono/mini/mini-arm64.c +++ b/src/mono/mono/mini/mini-arm64.c @@ -4204,7 +4204,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb) arm_ldrx (code, ARMREG_IP1, info_var->inst_basereg, GTMREG_TO_INT (info_var->inst_offset)); /* Add the bp_tramp_offset */ - val = ((bp_tramp_offset / 4) * sizeof (target_mgreg_t)) + MONO_STRUCT_OFFSET (SeqPointInfo, bp_addrs); + val = (bp_tramp_offset * sizeof (target_mgreg_t)) + MONO_STRUCT_OFFSET (SeqPointInfo, bp_addrs); /* Load the info->bp_addrs [bp_tramp_offset], which is either 0 or the address of the bp trampoline */ code = emit_ldrx (code, ARMREG_IP1, ARMREG_IP1, val); /* Skip the load if its 0 */ @@ -6873,9 +6873,7 @@ mono_arch_set_breakpoint (MonoJitInfo *ji, guint8 *ip) if (enable_ptrauth) NOT_IMPLEMENTED; - g_assert (native_offset % 4 == 0); - g_assert (info->bp_addrs [native_offset / 4] == 0); - info->bp_addrs [native_offset / 4] = (guint8*)mini_get_breakpoint_trampoline (); + info->bp_addrs [native_offset] = (guint8*)mini_get_breakpoint_trampoline (); } else { /* ip points to an ldrx */ code += 4; @@ -6898,8 +6896,7 @@ mono_arch_clear_breakpoint (MonoJitInfo *ji, guint8 *ip) if (enable_ptrauth) NOT_IMPLEMENTED; - g_assert (native_offset % 4 == 0); - info->bp_addrs [native_offset / 4] = NULL; + info->bp_addrs [native_offset] = NULL; } else { /* ip points to an ldrx */ code += 4; @@ -6967,7 +6964,7 @@ mono_arch_get_seq_point_info (guint8 *code) ji = mini_jit_info_table_find (code); g_assert (ji); - info = g_malloc0 (sizeof (SeqPointInfo) + (ji->code_size / 4) * sizeof(guint8*)); + info = g_malloc0 (sizeof (SeqPointInfo) + (ji->code_size) * sizeof(guint8*)); info->ss_tramp_addr = &ss_trampoline; From 89f3ed10a95a9a94b731a99501e0a54cf2c4dc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 4 Sep 2025 12:59:56 +0200 Subject: [PATCH 05/33] [maccatalyst] Check for -Wno-overriding-option for compatibility with clang in Xcode 16.3+ (#119260) (#119301) https://github.com/llvm/llvm-project/commit/1c66d08b0137cef7761b8220d3b7cb7833f57cdb renamed the option `-Wno-overriding-t-option` to `-Wno-overriding-option`. This caused some configure time checks in CMake to fail because of hitting an unknown compiler option. (cherry picked from commit 4b8a47869b384ccdb4e885d8efcf6a53c3467dd3) --- eng/native/configurecompiler.cmake | 18 +++++++++++++++--- src/mono/CMakeLists.txt | 21 +++++++++++++++++++++ src/mono/mono.proj | 2 -- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index ebb4a427f2896f..109b947e4eb6fb 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -666,9 +666,21 @@ if (CLR_CMAKE_HOST_UNIX) # a value for mmacosx-version-min (blank CMAKE_OSX_DEPLOYMENT_TARGET gets # replaced with a default value, and always gets expanded to an OS version. # https://gitlab.kitware.com/cmake/cmake/-/issues/20132 - # We need to disable the warning that -tagret replaces -mmacosx-version-min - set(DISABLE_OVERRIDING_MIN_VERSION_ERROR -Wno-overriding-t-option) - add_link_options(-Wno-overriding-t-option) + # We need to disable the warning that -target replaces -mmacosx-version-min + # + # With https://github.com/llvm/llvm-project/commit/1c66d08b0137cef7761b8220d3b7cb7833f57cdb clang renamed the option so we need to check for both + check_c_compiler_flag("-Wno-overriding-option" COMPILER_SUPPORTS_W_NO_OVERRIDING_OPTION) + if (COMPILER_SUPPORTS_W_NO_OVERRIDING_OPTION) + set(DISABLE_OVERRIDING_MIN_VERSION_ERROR -Wno-overriding-option) + else() + check_c_compiler_flag("-Wno-overriding-t-option" COMPILER_SUPPORTS_W_NO_OVERRIDING_T_OPTION) + if (COMPILER_SUPPORTS_W_NO_OVERRIDING_T_OPTION) + set(DISABLE_OVERRIDING_MIN_VERSION_ERROR -Wno-overriding-t-option) + else() + message(FATAL_ERROR "Compiler does not support -Wno-overriding-option or -Wno-overriding-t-option, needed for Mac Catalyst builds.") + endif() + endif() + add_link_options(${DISABLE_OVERRIDING_MIN_VERSION_ERROR}) if(CLR_CMAKE_HOST_ARCH_ARM64) set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "arm64-apple-ios15.0-macabi") add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET}) diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index fabeafa41e3e79..89597c85659fd8 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -552,6 +552,27 @@ if(GCC) set(WARNINGS "${WARNINGS} -Qunused-arguments -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign -Wno-return-stack-address -Wno-constant-logical-operand -Wno-zero-length-array -Wno-asm-operand-widths") endif() + if (HOST_MACCAT) + # Somewhere between CMake 3.17 and 3.19.4, it became impossible to not pass + # a value for mmacosx-version-min (blank CMAKE_OSX_DEPLOYMENT_TARGET gets + # replaced with a default value, and always gets expanded to an OS version. + # https://gitlab.kitware.com/cmake/cmake/-/issues/20132 + # We need to disable the warning that -target replaces -mmacosx-version-min + # + # With https://github.com/llvm/llvm-project/commit/1c66d08b0137cef7761b8220d3b7cb7833f57cdb clang renamed the option so we need to check for both + check_c_compiler_flag("-Wno-overriding-option" COMPILER_SUPPORTS_W_NO_OVERRIDING_OPTION) + if (COMPILER_SUPPORTS_W_NO_OVERRIDING_OPTION) + set(WARNINGS "${WARNINGS} -Wno-overriding-option") + else() + check_c_compiler_flag("-Wno-overriding-t-option" COMPILER_SUPPORTS_W_NO_OVERRIDING_T_OPTION) + if (COMPILER_SUPPORTS_W_NO_OVERRIDING_T_OPTION) + set(WARNINGS "${WARNINGS} -Wno-overriding-t-option") + else() + message(FATAL_ERROR "Compiler does not support -Wno-overriding-option or -Wno-overriding-t-option, needed for Mac Catalyst builds.") + endif() + endif() + endif() + check_c_compiler_flag("-Werror=incompatible-pointer-types" WERROR_INCOMPATIBLE_POINTER_TYPES) if(WERROR_INCOMPATIBLE_POINTER_TYPES) set(WERROR_C "${WERROR_C} -Werror=incompatible-pointer-types") diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 8bfbb710823937..d039812dfe45b0 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -540,8 +540,6 @@ JS_ENGINES = [NODE_JS] <_MonoCMakeArgs Include="-DCMAKE_SYSTEM_VARIANT=maccatalyst" /> - - <_MonoCPPFLAGS Include="-Wno-overriding-t-option" /> <_MonoCFlags Condition="'$(TargetArchitecture)' == 'arm64'" Include="-target arm64-apple-ios$(MacCatalystVersionMin)-macabi" /> <_MonoCFlags Condition="'$(TargetArchitecture)' == 'x64'" Include="-target x86_64-apple-ios$(MacCatalystVersionMin)-macabi" /> <_MonoCFLAGS Condition="'$(TargetArchitecture)' == 'arm64'" Include="-arch arm64" /> From 981a6107de2b1d1ae04d540b2c5918ac4edc73a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marie=20P=C3=ADchov=C3=A1?= <11718369+ManickaP@users.noreply.github.com> Date: Tue, 9 Sep 2025 08:28:40 +0200 Subject: [PATCH 06/33] [release/9.0-staging][HTTP] Stress fix for docker compose (#119455) * [HTTP] Stress fix for docker compose Backport of #119274 to release/10.0 /cc @ManickaP ## Customer Impact - [ ] Customer reported - [x] Found internally Wind down docker compose between individual runs in HTTP stress. ## Regression - [x] Yes - [ ] No Infra update. ## Testing CI stress runs. ## Risk Low. Test only change. * Remove unnecessary docker-compose down commands Removed 'docker-compose down' command from HTTP 1.1 and 2.0 stress test configurations. --- eng/pipelines/libraries/stress/http.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index fdfd004b96eb3e..9beb1e26c2fc2f 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -73,6 +73,7 @@ extends: export SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/2.0" export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 2.0" export HTTPSTRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 2.0" + docker-compose down docker-compose up --abort-on-container-exit --no-color displayName: Run HttpStress - HTTP 2.0 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) @@ -83,6 +84,7 @@ extends: export SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/1.1" export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 1.1" export HTTPSTRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 1.1" + docker-compose down docker-compose up --abort-on-container-exit --no-color displayName: Run HttpStress - HTTP 1.1 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) From df7805bc5811f3dc6c9ecc122d48716c784624dc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 10 Sep 2025 12:01:45 -0700 Subject: [PATCH 07/33] Preserve lock id members (#119281) --- .../src/ILLink/ILLink.Descriptors.Shared.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml index a6c2ad4619d923..eb94f795ab2dd6 100644 --- a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml +++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml @@ -72,6 +72,11 @@ + + + + + From 97c8123a8689604808537bb5540df2861fec3300 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 15:57:21 +0200 Subject: [PATCH 08/33] [release/9.0-staging] Update dependencies from dotnet/hotreload-utils (#118151) * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250728.3 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25378.3 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250804.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25404.2 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250811.3 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25411.3 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250818.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25418.2 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250825.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25425.2 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250901.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25451.2 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 ---- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce3b78795e70f2..00cd886597dd2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,9 @@ - - - - - + https://github.com/dotnet/cecil - 788a8a7481c01a7d235110cdea2ca5bfb34210d4 + fe6e09f8a1f50c772f619a60d0940e0f0a47922a diff --git a/eng/Versions.props b/eng/Versions.props index e067b160f5435b..3d1f2c05806a3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,7 +215,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25370.2 + 0.11.5-alpha.25431.3 9.0.0-rtm.24511.16 From 912f1399c9d570a43f45aa27fd9572144446b070 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 16:11:00 +0200 Subject: [PATCH 10/33] [release/9.0-staging] Update dependencies from dotnet/icu (#118423) * Update dependencies from https://github.com/dotnet/icu build 20250804.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25404.1 * Update dependencies from https://github.com/dotnet/icu build 20250808.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25408.2 * Update dependencies from https://github.com/dotnet/icu build 20250811.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25411.1 * Update dependencies from https://github.com/dotnet/icu build 20250814.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25414.1 * Update dependencies from https://github.com/dotnet/icu build 20250816.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25416.1 * Update dependencies from https://github.com/dotnet/icu build 20250818.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25418.2 * Update dependencies from https://github.com/dotnet/icu build 20250820.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25420.1 * Update dependencies from https://github.com/dotnet/icu build 20250901.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25451.1 * Update dependencies from https://github.com/dotnet/icu build 20250902.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25452.1 * Update dependencies from https://github.com/dotnet/icu build 20250903.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25453.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1ba96ac7d6538..133b6b03c3f5d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 8651fab55b69849f0a4001949df126fea4d4b419 + 0df8449153b9b92de618c4c3f5b2590aae9d6ff2 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 3d1f2c05806a3c..74dbfccac7dee2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,7 +219,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25371.1 + 9.0.0-rtm.25453.1 9.0.0-rtm.24466.4 2.4.8 From 99d8772dd743bb6d32baaa6321d0853952796ab8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 16:12:49 +0200 Subject: [PATCH 11/33] [release/9.0-staging] Update dependencies from dotnet/roslyn (#118193) * Update dependencies from https://github.com/dotnet/roslyn build 20250729.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25379.5 * Update dependencies from https://github.com/dotnet/roslyn build 20250804.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25404.5 * Update dependencies from https://github.com/dotnet/roslyn build 20250813.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25413.4 * Update dependencies from https://github.com/dotnet/roslyn build 20250824.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25424.2 * Update dependencies from https://github.com/dotnet/roslyn build 20250829.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25429.9 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 133b6b03c3f5d2..d5be48b96b95d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -360,17 +360,17 @@ https://github.com/dotnet/runtime-assets c77fd5058ea46e9d0b58f5c11b6808d6170e4e32 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + 75273243e5beb19c5e2ae8e58999b21b451c22fe - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + 75273243e5beb19c5e2ae8e58999b21b451c22fe - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + 75273243e5beb19c5e2ae8e58999b21b451c22fe https://github.com/dotnet/roslyn-analyzers @@ -381,9 +381,9 @@ 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + 75273243e5beb19c5e2ae8e58999b21b451c22fe diff --git a/eng/Versions.props b/eng/Versions.props index 74dbfccac7dee2..f6bbfa0b55ab64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,9 +44,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 + 4.12.0-3.25429.9 + 4.12.0-3.25429.9 + 4.12.0-3.25429.9 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 1.0.0-prerelease.24462.2 1.0.0-prerelease.24462.2 From 95816374ff9a512b2f7e56f906f0ce301c41be31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 08:34:16 -0700 Subject: [PATCH 13/33] Update dependencies from https://github.com/dotnet/icu build 20250911.2 (#119619) Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25453.1 -> To Version 9.0.0-rtm.25461.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 496fafc9e7133c..be771a4c4b96a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 0df8449153b9b92de618c4c3f5b2590aae9d6ff2 + 14d2dd6de03ab7cdd95b8ca5dd47feeefa951103 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index f9efaf04487933..59994f388182fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,7 +219,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25453.1 + 9.0.0-rtm.25461.2 9.0.0-rtm.24466.4 2.4.8 From 41a48abc04508bb5992cb0c6310ac51a8c9dde3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 08:34:42 -0700 Subject: [PATCH 14/33] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250902.2 (#119598) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.25272.2 -> To Version 9.0.0-alpha.1.25452.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be771a4c4b96a9..e38d38148b9b17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,9 +79,9 @@ - + https://github.com/dotnet/source-build-reference-packages - 9859d82ffce48f49b5e93fa46a38bdddc4ba26be + 745de7d839fdd3b5884d72e953badcfb15493d13 From 76ce7a11f683f1edb4ac3e821d3abcebc5b70ef8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 08:37:20 -0700 Subject: [PATCH 15/33] Update dependencies from https://github.com/dotnet/cecil build 20250911.1 (#119620) Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil From Version 0.11.5-alpha.25431.3 -> To Version 0.11.5-alpha.25461.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e38d38148b9b17..d91f7b29b7d626 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,14 +54,14 @@ 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - fe6e09f8a1f50c772f619a60d0940e0f0a47922a + 026a4f32987a274633ed0885ea8b54e790fc94f4 - + https://github.com/dotnet/cecil - fe6e09f8a1f50c772f619a60d0940e0f0a47922a + 026a4f32987a274633ed0885ea8b54e790fc94f4 diff --git a/eng/Versions.props b/eng/Versions.props index 59994f388182fc..04fc9356ccb7a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,7 +215,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25431.3 + 0.11.5-alpha.25461.1 9.0.0-rtm.24511.16 From 735e535d45822c9e32aa70f94fcd25d4955a877e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:07:36 -0700 Subject: [PATCH 16/33] [release/9.0-staging] Update dependencies from dotnet/xharness (#119051) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/xharness build 20250817.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.25375.3 -> To Version 9.0.0-prerelease.25417.1 * Update dependencies from https://github.com/dotnet/xharness build 20250826.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.25375.3 -> To Version 9.0.0-prerelease.25426.1 * Fix merge --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alexander Köplinger --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 8 +++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3bff7a26fb1843..7fcec77f199e6e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.25375.3", + "version": "9.0.0-prerelease.25426.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d91f7b29b7d626..0bcf65da517b97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -320,17 +320,17 @@ https://github.com/dotnet/runtime b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/xharness - 604c13925074041a51e4533959477c8b6888dcf5 + 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/xharness - 604c13925074041a51e4533959477c8b6888dcf5 + 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/xharness - 604c13925074041a51e4533959477c8b6888dcf5 + 7b6f58237ff2355392960408f4d9fd98dfe58f9b https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 04fc9356ccb7a2..a805223ecec0aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -184,9 +184,11 @@ 1.4.0 17.4.0-preview-20220707-01 - 9.0.0-prerelease.25375.3 - 9.0.0-prerelease.25375.3 - 9.0.0-prerelease.25375.3 + + 9.0.0-prerelease.25426.1 + 9.0.0-prerelease.25426.1 + 9.0.0-prerelease.25426.1 + 9.0.0-alpha.0.25451.2 3.12.0 4.5.0 From 11c443c31bc3e70f4edc3602be473f92b5986c27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 13 Sep 2025 10:50:21 -0700 Subject: [PATCH 17/33] [automated] Merge branch 'release/9.0' => 'release/9.0-staging' (#118492) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/emsdk build 20250721.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.8-servicing.25371.3 * Recover the SDK feed in the NuGet.org * Update dependencies from https://github.com/dotnet/emsdk build 20250804.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25404.4 * Update branding to 9.0.9 (#118349) * Merging internal commits for release/9.0 (#118451) Co-authored-by: Mirroring * Update dependencies from https://github.com/dotnet/emsdk build 20250811.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25411.3 * Update dependencies from https://github.com/dotnet/emsdk build 20250811.5 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25411.5 * Update dependencies from https://github.com/dotnet/emsdk build 20250814.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25414.2 * Update dependencies from https://github.com/dotnet/emsdk build 20250815.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25415.4 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 19.1.0-alpha.1.25313.1 -> To Version 19.1.0-alpha.1.25414.3 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport * Update dependencies from https://github.com/dotnet/emsdk build 20250818.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25418.4 * Update branding to 9.0.10 (#119280) * Update branding to 9.0.10 * Updating ImporterTests to account for the longer version string --------- Co-authored-by: Tanner Gooding * [release/9.0] Update dependencies from dotnet/emsdk (#118940) * Update dependencies from https://github.com/dotnet/emsdk build 20250820.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.9-servicing.25420.3 * Update dependencies from https://github.com/dotnet/emsdk build 20250901.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.9-servicing.25451.3 * Update dependencies from https://github.com/dotnet/emsdk build 20250902.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.10-servicing.25452.4 * Update dependencies from https://github.com/dotnet/emsdk build 20250903.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.10-servicing.25453.2 --------- Co-authored-by: dotnet-maestro[bot] --------- Co-authored-by: Mirroring Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com> Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: David Cantú Co-authored-by: Tanner Gooding Co-authored-by: Sean Reeser Co-authored-by: Tanner Gooding Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> --- NuGet.config | 1 + eng/Version.Details.xml | 100 +++++++++--------- eng/Versions.props | 52 ++++----- .../Schema/Import/ImporterTests.cs | 6 +- 4 files changed, 80 insertions(+), 79 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00cd886597dd2b..2cab12d8cb54e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bcf65da517b97..6f1b295ec30c0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 https://github.com/dotnet/command-line-api @@ -64,18 +64,18 @@ 026a4f32987a274633ed0885ea8b54e790fc94f4 - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets ea395c81a91ed32f9d4573707b326dc0d966d984 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a805223ecec0aa..ecc51fe7d54c2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 9.0.8 + 9.0.10 9 0 - 8 + 10 9.0.100 8.0.$([MSBuild]::Add($(PatchVersion),11)) 7.0.20 @@ -227,39 +227,39 @@ 2.4.8 9.0.0-alpha.1.24167.3 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 - 9.0.8-servicing.25353.1 - 9.0.8 + 9.0.10-servicing.25453.2 + 9.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 3.1.7 1.0.406601 diff --git a/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs b/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs index 79d9c1f65078e9..f8a945c3a57c7a 100644 --- a/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs +++ b/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs @@ -112,13 +112,13 @@ public static IEnumerable Import_MemberData() int newlineSize = Environment.NewLine.Length; // Import(XmlSchemaSet) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas), 5060 + (168 * newlineSize) }; // 168 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas), 5064 + (168 * newlineSize) }; // 168 lines // Import(XmlSchemaSet, ICollection) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, new XmlQualifiedName[] { SchemaUtils.ValidTypeNames[0] }), 1515 + (50 * newlineSize) }; // 50 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, new XmlQualifiedName[] { SchemaUtils.ValidTypeNames[0] }), 1516 + (50 * newlineSize) }; // 50 lines // Import(XmlSchemaSet, XmlQualifiedName) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, SchemaUtils.ValidTypeNames[0]), 1515 + (50 * newlineSize) }; // 50 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, SchemaUtils.ValidTypeNames[0]), 1516 + (50 * newlineSize) }; // 50 lines // Import(XmlSchemaSet, XmlSchemaElement) // TODO From 8d99e410bcb8dfba0f2f576587743ae6189ad559 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 09:56:54 +0200 Subject: [PATCH 18/33] Do not check status, it's irrelevant whether to asses if H/3 is working. (#119522) Co-authored-by: ManickaP --- .../tests/FunctionalTests/HttpClientHandlerTest.Http3.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs index 358c1a0c7ff287..56a1159483f73d 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs @@ -780,7 +780,6 @@ public async Task Public_Interop_ExactVersion_Success(string uri) }; using HttpResponseMessage response = await client.SendAsync(request).WaitAsync(TimeSpan.FromSeconds(20)); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal(3, response.Version.Major); } @@ -799,7 +798,6 @@ public async Task Public_Interop_ExactVersion_BufferContent_Success(string uri) }; using HttpResponseMessage response = await client.SendAsync(request, HttpCompletionOption.ResponseContentRead).WaitAsync(TimeSpan.FromSeconds(20)); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal(3, response.Version.Major); var content = await response.Content.ReadAsStringAsync(); From b96e87d503567005c3c24b15ec1c7dfd0b1164ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 13:51:11 +0000 Subject: [PATCH 19/33] Disable test parallelization in OleDB tests (#119626) Attempts to fix #87783 Co-authored-by: Shay Rojansky --- src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs diff --git a/src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs b/src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs new file mode 100644 index 00000000000000..6349558b2d1c35 --- /dev/null +++ b/src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs @@ -0,0 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Xunit; + +// The OleDB tests use the ACE driver, which has issues with concurrency. +[assembly: CollectionBehavior(DisableTestParallelization = true)] From 02031bbe2a1a16801613d97ae2ea65ae80f7f37f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 08:41:06 -0700 Subject: [PATCH 20/33] Update dependencies from https://github.com/dotnet/icu build 20250912.2 (#119690) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25461.2 -> To Version 9.0.0-rtm.25462.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f1b295ec30c0c..a8c2f92ac49f25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 14d2dd6de03ab7cdd95b8ca5dd47feeefa951103 + fb10ef725c9521c67c21e01e025ce263498f7e0b https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index ecc51fe7d54c2d..417d469d6b4996 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25461.2 + 9.0.0-rtm.25462.2 9.0.0-rtm.24466.4 2.4.8 From a4bcef78b0bcc0923e97dd6f695c1e20adf43e7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:41:20 +0000 Subject: [PATCH 21/33] [release/9.0-staging] Update dependencies from dotnet/arcade (#118224) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/arcade build 20250730.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25380.1 * Update dependencies from https://github.com/dotnet/arcade build 20250806.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25406.1 * Update dependencies from https://github.com/dotnet/arcade build 20250807.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25407.2 * Update dependencies from https://github.com/dotnet/arcade build 20250815.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25415.3 * Update dependencies from https://github.com/dotnet/arcade build 20250828.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25428.3 * Bump SdkVersionForWorkloadTesting * Update dependencies from https://github.com/dotnet/arcade build 20250910.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25460.1 * Bump SdkVersionForWorkloadTesting * Update dependencies from https://github.com/dotnet/arcade build 20250912.4 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25462.4 Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner From Version 2.9.0-beta.25366.1 -> To Version 2.9.0-beta.25462.4 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alexander Köplinger --- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 34 ++++---- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 18 ++-- eng/common/core-templates/job/onelocbuild.yml | 6 +- .../job/publish-build-assets.yml | 19 +++-- .../core-templates/job/source-build.yml | 4 + .../job/source-index-stage1.yml | 2 +- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 4 + .../core-templates/jobs/source-build.yml | 5 ++ .../core-templates/post-build/post-build.yml | 8 +- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +-- .../core-templates/steps/generate-sbom.yml | 2 +- .../core-templates/steps/publish-logs.yml | 14 ++-- .../core-templates/steps/source-build.yml | 11 ++- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- global.json | 10 +-- 23 files changed, 143 insertions(+), 112 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8c2f92ac49f25..93948128919525 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 417d469d6b4996..1942115c017c3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 2.9.0-beta.25366.1 - 9.0.0-beta.25366.1 - 2.9.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 2.9.0-beta.25462.4 + 9.0.0-beta.25462.4 + 2.9.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 1.4.0 @@ -265,7 +265,7 @@ 1.0.406601 - 9.0.107 + 9.0.110 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2f3e..792b60b49d424d 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b0323ae..facb415ca6ff35 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0e09c9..8da43d3b5837a1 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' @@ -164,7 +166,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -187,7 +189,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -198,7 +200,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -242,7 +244,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 00feec8ebbc3ab..edefa789d360f3 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -115,7 +115,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' publishLocation: Container artifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e3196727..a58c8a418e8a99 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -32,6 +32,10 @@ parameters: is1ESPipeline: '' + repositoryAlias: self + + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -54,6 +58,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -72,7 +81,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -93,12 +102,12 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -113,7 +122,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -142,7 +151,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d47f09d58fd9a8..5baedac1e03dd4 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -33,6 +33,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -93,3 +96,4 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} platform: ${{ parameters.platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8b833332b3ee96..662b9fcce154fc 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -66,7 +66,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index f2144252cc65c8..4571a7864df6bf 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -25,7 +25,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index ea69be4341c62f..bf33cdc2cc7787 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,8 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -117,3 +119,5 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee6de6e..0b408a67bd51cd 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -47,6 +50,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -55,4 +59,5 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b9214e5..2ee8bbfff54553 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -149,7 +149,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -206,7 +206,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -256,7 +256,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -311,7 +311,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe721..a7abd58c4bb609 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3cf1..4085512b690910 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 56a090094824f4..7f5b84c4cb827f 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 80788c5231912f..0623ac6e112309 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -42,7 +42,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 37133b55b7541b..0718e4ba902e8f 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -11,6 +11,10 @@ parameters: # for details. The entire object is described in the 'job' template for simplicity, even though # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: false steps: @@ -97,7 +101,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,5 +130,8 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0ba88..4bf4cf41bd7c76 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 817555505aa602..81ea7a261f2d4a 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b3a0..f1311bbb1b33d9 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index d1aeb92fcea519..5bdd3dd85fd2be 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -75,7 +75,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index fbcea3f120a495..cdac5c7bdcad75 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.107", + "version": "9.0.110", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.107" + "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25462.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 81289e992f6d0845343857c9794deb0c413f2428 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 08:45:15 -0700 Subject: [PATCH 22/33] Update dependencies from https://github.com/dotnet/runtime-assets build 20250912.1 (#119677) On relative base path root Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 9.0.0-beta.25414.2 -> To Version 9.0.0-beta.25462.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93948128919525..a6d171b992a999 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,57 +174,57 @@ https://github.com/dotnet/arcade e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b https://github.com/dotnet/llvm-project @@ -356,9 +356,9 @@ https://github.com/dotnet/hotreload-utils ecd239d9752aaa9e56878af38b499e0a987a11d1 - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 1942115c017c3e..e2146b7407cbce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,20 +141,20 @@ 8.0.0 8.0.0 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 1.0.0-prerelease.24462.2 1.0.0-prerelease.24462.2 From 003505d3b9493cefcb8f32caa4bea46597f4da51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 08:48:03 -0700 Subject: [PATCH 23/33] Update dependencies from https://github.com/dotnet/hotreload-utils build 20250912.1 (#119635) On relative base path root Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25451.2 -> To Version 9.0.0-alpha.0.25462.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tanner Gooding --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6d171b992a999..f87b3a1ef63268 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -352,9 +352,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 9d7532585ce71e30ab55f0364d3cecccaf0775d1 - + https://github.com/dotnet/hotreload-utils - ecd239d9752aaa9e56878af38b499e0a987a11d1 + 0334eb13c37ab4d8d1b405952e838fc8cad195be https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index e2146b7407cbce..3a2e40730936a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -189,7 +189,7 @@ 9.0.0-prerelease.25426.1 9.0.0-prerelease.25426.1 - 9.0.0-alpha.0.25451.2 + 9.0.0-alpha.0.25462.1 3.12.0 4.5.0 6.0.0 From e35719215f21756c39d3dd0a7f74c6ae45728beb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 11:50:46 -0700 Subject: [PATCH 24/33] Fix recursion issue found in 109779 (#119128) Co-authored-by: Mike McLaughlin --- src/coreclr/pal/src/thread/process.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/coreclr/pal/src/thread/process.cpp b/src/coreclr/pal/src/thread/process.cpp index 9504e6995c5506..01f67342cc1a54 100644 --- a/src/coreclr/pal/src/thread/process.cpp +++ b/src/coreclr/pal/src/thread/process.cpp @@ -2444,8 +2444,11 @@ PROCCreateCrashDump( size_t previousThreadId = InterlockedCompareExchange(&g_crashingThreadId, currentThreadId, 0); if (previousThreadId != 0) { - // Should never reenter or recurse - _ASSERTE(previousThreadId != currentThreadId); + // Return error if reenter this code + if (previousThreadId == currentThreadId) + { + return false; + } // The first thread generates the crash info and any other threads are blocked while (true) From ac81459d96b1558152b03f5fd70a81d3a7bf4e44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 08:41:59 -0700 Subject: [PATCH 25/33] Update dependencies from https://github.com/dotnet/cecil build 20250914.3 (#119742) On relative base path root Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil From Version 0.11.5-alpha.25461.1 -> To Version 0.11.5-alpha.25464.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f87b3a1ef63268..c2a7d325e278b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,14 +54,14 @@ 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - 026a4f32987a274633ed0885ea8b54e790fc94f4 + e5381291dd01d040b5b111f3a2ee8508ec990d78 - + https://github.com/dotnet/cecil - 026a4f32987a274633ed0885ea8b54e790fc94f4 + e5381291dd01d040b5b111f3a2ee8508ec990d78 diff --git a/eng/Versions.props b/eng/Versions.props index 3a2e40730936a0..ebf9e1c0d06218 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25461.1 + 0.11.5-alpha.25464.3 9.0.0-rtm.24511.16 From 1b50e48a3da291ecbc525b3f5443108a4a4ba07f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 12:52:19 -0700 Subject: [PATCH 26/33] Update dependencies from https://github.com/dotnet/icu build 20250916.4 (#119793) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25462.2 -> To Version 9.0.0-rtm.25466.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f41de6149d204b..fb75e5c100a749 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - fb10ef725c9521c67c21e01e025ce263498f7e0b + 6616e7baa325ada1cedfac75e4f68e376050e9d0 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 52553c113f9034..aa3e12306bd860 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25462.2 + 9.0.0-rtm.25466.4 9.0.0-rtm.24466.4 2.4.8 From fd6707b0fd95eeaf35ac74214529ee216d5de581 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 06:38:27 -0700 Subject: [PATCH 27/33] Update dependencies from https://github.com/dotnet/icu build 20250916.5 (#119832) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25466.4 -> To Version 9.0.0-rtm.25466.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb75e5c100a749..2ddf04fb3ca756 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 6616e7baa325ada1cedfac75e4f68e376050e9d0 + 068a21dda3860a7055585fc5977c7c615d035360 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index aa3e12306bd860..59300b55d85f5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25466.4 + 9.0.0-rtm.25466.5 9.0.0-rtm.24466.4 2.4.8 From 6347934c15c73d0dee64452c9f286280d359e7fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 11:45:14 -0700 Subject: [PATCH 28/33] Update dependencies from https://github.com/dotnet/roslyn build 20250917.18 (#119830) On relative base path root Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25429.9 -> To Version 4.12.0-3.25467.18 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ddf04fb3ca756..67360a3d2b76ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -360,17 +360,17 @@ https://github.com/dotnet/runtime-assets 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/roslyn - 75273243e5beb19c5e2ae8e58999b21b451c22fe + dcf9af2b54e4469b94697b1b92d31354ce698f66 - + https://github.com/dotnet/roslyn - 75273243e5beb19c5e2ae8e58999b21b451c22fe + dcf9af2b54e4469b94697b1b92d31354ce698f66 - + https://github.com/dotnet/roslyn - 75273243e5beb19c5e2ae8e58999b21b451c22fe + dcf9af2b54e4469b94697b1b92d31354ce698f66 https://github.com/dotnet/roslyn-analyzers @@ -381,9 +381,9 @@ 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn - 75273243e5beb19c5e2ae8e58999b21b451c22fe + dcf9af2b54e4469b94697b1b92d31354ce698f66 diff --git a/eng/Versions.props b/eng/Versions.props index 59300b55d85f5a..0896ee5342e190 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,9 +44,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.12.0-3.25429.9 - 4.12.0-3.25429.9 - 4.12.0-3.25429.9 + 4.12.0-3.25467.18 + 4.12.0-3.25467.18 + 4.12.0-3.25467.18 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0896ee5342e190..3d1d6a9eb627b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 2.9.0-beta.25462.4 - 9.0.0-beta.25462.4 - 2.9.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 2.9.0-beta.25465.2 + 9.0.0-beta.25465.2 + 2.9.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 1.4.0 diff --git a/global.json b/global.json index cdac5c7bdcad75..13b3031d87d5cb 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25465.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25465.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 6c1a72790a79e8293ce969bff08af08675d49bb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:38:53 -0700 Subject: [PATCH 31/33] Update dependencies from https://github.com/dotnet/icu build 20250917.1 (#119872) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25466.5 -> To Version 9.0.0-rtm.25467.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad505278075427..664908235134e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 068a21dda3860a7055585fc5977c7c615d035360 + e98ff8e38ba86538c2a7cd2e2ee32cce4f8e01cb https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 3d1d6a9eb627b7..c9af8c73172aa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25466.5 + 9.0.0-rtm.25467.1 9.0.0-rtm.24466.4 2.4.8 From 86b870784bc00ba0b06e6b38eb7a34c594d68eaa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 13:30:20 +0200 Subject: [PATCH 32/33] [release/9.0-staging] Disable Multicast SocketOption Test (#119889) Co-authored-by: Ahmet Ibrahim Aksoy --- .../tests/FunctionalTests/SocketOptionNameTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs index 2d7139a05803cb..3cc68756604955 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs @@ -68,6 +68,7 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286 [ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))] [ActiveIssue("https://github.com/dotnet/runtime/issues/113827", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))] + [SkipOnPlatform(TestPlatforms.OSX, "Multicast interface selection fails on macOS 14+ due to changes in how the system handles network interface parameters")] public async Task MulticastInterface_Set_AnyInterface_Succeeds() { // On all platforms, index 0 means "any interface" From ae5e3f887d8b2c0837a796c5cb7a5fd42be70baf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 08:26:20 -0700 Subject: [PATCH 33/33] Update dependencies from https://github.com/dotnet/icu build 20250919.1 (#119932) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25467.1 -> To Version 9.0.0-rtm.25469.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 664908235134e6..2bdfb23f2ac007 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - e98ff8e38ba86538c2a7cd2e2ee32cce4f8e01cb + 4ca307e1d07b3b76d1aa66c15d67de89bcca0cd8 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index c9af8c73172aa7..a826e5319d2428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25467.1 + 9.0.0-rtm.25469.1 9.0.0-rtm.24466.4 2.4.8