From c7d55a5938904ddccb3ea8649b7a9a91b421ec02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jun 2026 02:05:41 +0000 Subject: [PATCH 1/4] Update dependencies from build 320053 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.9.0-1.26322.110 -> 5.9.0-1.26324.102) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-preview.6.26322.110 -> 11.0.100-preview.6.26324.102) 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.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.26322.110 -> 11.0.0-beta.26324.102) Microsoft.DotNet.Cecil (Version 0.11.5-preview.26322.110 -> 0.11.5-preview.26324.102) Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26322.110 -> 2.9.3-beta.26324.102) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 11.0.0-preview.6.26322.110 -> 11.0.0-preview.6.26324.102) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.9.0-rc.32310 -> 7.9.0-rc.32502) System.CommandLine (Version 3.0.0-preview.6.26322.110 -> 3.0.0-preview.6.26324.102) [[ commit created by automation ]] --- eng/Version.Details.props | 78 +++++++-------- eng/Version.Details.xml | 158 +++++++++++++++---------------- eng/common/cross/build-rootfs.sh | 3 +- eng/common/cross/toolchain.cmake | 16 ++-- global.json | 12 +-- 5 files changed, 134 insertions(+), 133 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 18628a56559b72..10a1759b3ee397 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,46 +6,46 @@ This file should be imported by eng/Versions.props - 5.9.0-1.26322.110 - 5.9.0-1.26322.110 - 5.9.0-1.26322.110 - 5.9.0-1.26322.110 - 11.0.100-preview.6.26322.110 - 11.0.100-preview.6.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 0.11.5-preview.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 - 11.0.0-beta.26322.110 + 5.9.0-1.26324.102 + 5.9.0-1.26324.102 + 5.9.0-1.26324.102 + 5.9.0-1.26324.102 + 11.0.100-preview.6.26324.102 + 11.0.100-preview.6.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 0.11.5-preview.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 + 11.0.0-beta.26324.102 3.2.2-beta.26257.113 - 2.9.3-beta.26322.110 - 11.0.0-beta.26322.110 - 5.9.0-1.26322.110 - 11.0.0-preview.6.26322.110 - 11.0.100-preview.6.26322.110 - 11.0.0-preview.6.26322.110 - 11.0.0-preview.6.26322.110 - 7.9.0-rc.32310 - 7.9.0-rc.32310 - 7.9.0-rc.32310 - 7.9.0-rc.32310 - 11.0.0-preview.6.26322.110 - 3.0.0-preview.6.26322.110 - 11.0.0-preview.6.26322.110 - 11.0.0-preview.6.26322.110 - 11.0.0-preview.6.26322.110 + 2.9.3-beta.26324.102 + 11.0.0-beta.26324.102 + 5.9.0-1.26324.102 + 11.0.0-preview.6.26324.102 + 11.0.100-preview.6.26324.102 + 11.0.0-preview.6.26324.102 + 11.0.0-preview.6.26324.102 + 7.9.0-rc.32502 + 7.9.0-rc.32502 + 7.9.0-rc.32502 + 7.9.0-rc.32502 + 11.0.0-preview.6.26324.102 + 3.0.0-preview.6.26324.102 + 11.0.0-preview.6.26324.102 + 11.0.0-preview.6.26324.102 + 11.0.0-preview.6.26324.102 11.0.0-alpha.0.26180.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f19e350ffeee32..f2948ad89dd5c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,91 +37,91 @@ https://github.com/dotnet/llvm-project 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb https://github.com/dotnet/dotnet 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb https://github.com/dotnet/runtime-assets @@ -259,33 +259,33 @@ https://github.com/dotnet/llvm-project 64a0a6a5130929ccaa47b52ad28997b7922920cc - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness a0534aec8f776d258392f0266cbdb9cc97e1dd98 - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -327,33 +327,33 @@ https://github.com/dotnet/runtime-assets 741cd9b2bf5a322b38c37367bc26c4e97ab16abe - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb - + https://github.com/dotnet/dotnet - e92aef9c9fd05991d32c4f2a1525710fef4aa9df + 1d4910780fe728cf5affade170fe51fc8f96f9fb https://github.com/dotnet/node diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 3150ccac6fcd78..273cae651a2b1e 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -88,9 +88,8 @@ __FreeBSDPackages+=" terminfo-db" __OpenBSDVersion="7.8" __OpenBSDPackages="heimdal-libs" __OpenBSDPackages+=" icu4c" -__OpenBSDPackages+=" libinotify" +__OpenBSDPackages+=" inotify-tools" __OpenBSDPackages+=" openssl" -__OpenBSDPackages+=" e2fsprogs" __IllumosPackages="icu" __IllumosPackages+=" mit-krb5" diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ead7fe3ef26319..99d6dfe82dde38 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -59,9 +59,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") endif() elseif(FREEBSD) - set(TOOLCHAIN "aarch64-unknown-freebsd14") + set(triple "aarch64-unknown-freebsd12") elseif(OPENBSD) - set(TOOLCHAIN "aarch64-unknown-openbsd") + set(triple "aarch64-unknown-openbsd") endif() elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) @@ -117,9 +117,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") endif() elseif(FREEBSD) - set(TOOLCHAIN "x86_64-unknown-freebsd14") + set(triple "x86_64-unknown-freebsd12") elseif(OPENBSD) - set(TOOLCHAIN "x86_64-unknown-openbsd") + set(triple "x86_64-unknown-openbsd") elseif(ILLUMOS) set(TOOLCHAIN "x86_64-illumos") elseif(HAIKU) @@ -160,6 +160,8 @@ if(TIZEN) find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() + message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}") + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++) include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() @@ -204,9 +206,9 @@ if(ANDROID) include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake) elseif(FREEBSD OR OPENBSD) # we cross-compile by instructing clang - set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) - set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) - set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) + set(CMAKE_C_COMPILER_TARGET ${triple}) + set(CMAKE_CXX_COMPILER_TARGET ${triple}) + set(CMAKE_ASM_COMPILER_TARGET ${triple}) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") diff --git a/global.json b/global.json index d02abc3e04ccd5..08c0552eb0a218 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-preview.5.26227.104", + "version": "11.0.100-preview.5.26302.115", "allowPrerelease": true, "rollForward": "major", "paths": [ @@ -10,14 +10,14 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.sh (Unix) or eng\\common\\dotnet.cmd (Windows) to install it." }, "tools": { - "dotnet": "11.0.100-preview.5.26227.104" + "dotnet": "11.0.100-preview.5.26302.115" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26322.110", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26322.110", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26322.110", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26324.102", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26324.102", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26324.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.6.26322.110" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.6.26324.102" } } From ef01d97c7fe0749c9e373db02c644914ae698aec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jun 2026 14:07:31 +0000 Subject: [PATCH 2/4] Backflow from https://github.com/dotnet/dotnet / 1358fe9 build 320196 Diff: https://github.com/dotnet/dotnet/compare/1d4910780fe728cf5affade170fe51fc8f96f9fb..1358fe9202089df7bdb79282a191c9dbbb773a06 From: https://github.com/dotnet/dotnet/commit/1d4910780fe728cf5affade170fe51fc8f96f9fb To: https://github.com/dotnet/dotnet/commit/1358fe9202089df7bdb79282a191c9dbbb773a06 [[ commit created by automation ]] --- eng/Subsets.props | 4 - eng/Versions.props | 2 +- src/coreclr/CMakeLists.txt | 2 +- src/workloads/VSSetup.props | 42 --- src/workloads/VSSetup.targets | 49 ---- src/workloads/mono_wasm_mobile.vsmanproj | 68 ----- src/workloads/readme.md | 2 - src/workloads/workloads.csproj | 327 ----------------------- 8 files changed, 2 insertions(+), 494 deletions(-) delete mode 100644 src/workloads/VSSetup.props delete mode 100644 src/workloads/VSSetup.targets delete mode 100644 src/workloads/mono_wasm_mobile.vsmanproj delete mode 100644 src/workloads/readme.md delete mode 100644 src/workloads/workloads.csproj diff --git a/eng/Subsets.props b/eng/Subsets.props index f81c5e0661cf5d..fd3156ed8ad2cc 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -609,10 +609,6 @@ - - - - diff --git a/eng/Versions.props b/eng/Versions.props index 4625dbb9864ccb..f5b7df0d987aa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,7 +15,7 @@ 7.0.20 6.0.36 preview - 6 + 7 false release diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 4c275c6611ef91..60fe8cee3fcac4 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -156,7 +156,7 @@ endif () if(NOT CLR_CROSS_COMPONENTS_BUILD) # NativeAOT is buildable for all CoreCLR-supported configurations except a known reject list. # Keep this in sync with the NativeAotSupported reject list in eng/common/native/NativeAotSupported.props. - if(NOT (CLR_CMAKE_HOST_ARCH_WASM OR (CLR_CMAKE_HOST_ARCH_I386 AND NOT CLR_CMAKE_HOST_WIN32))) + if(NOT (CLR_CMAKE_HOST_ARCH_WASM OR CLR_CMAKE_HOST_ARCH_S390X OR CLR_CMAKE_HOST_ARCH_POWERPC64 OR (CLR_CMAKE_HOST_ARCH_I386 AND NOT CLR_CMAKE_HOST_WIN32))) add_subdirectory(nativeaot) endif() endif(NOT CLR_CROSS_COMPONENTS_BUILD) diff --git a/src/workloads/VSSetup.props b/src/workloads/VSSetup.props deleted file mode 100644 index 6cfb80b3951c1b..00000000000000 --- a/src/workloads/VSSetup.props +++ /dev/null @@ -1,42 +0,0 @@ - - - - 1 - - - - https://vsdrop.corp.microsoft.com/file/v1/ - https://devdiv.artifacts.visualstudio.com/ - $(MSBuildThisDirectory)Tools\Drop.App\lib\net45\Drop.exe - - 10 - $([System.DateTime]::Now.AddYears($(DropExpiration)).ToString("M/d/yyyy h:m:s tt")) - - 10 - - verbose - - - -s "$(DropServiceUri)" - --timeout "$(DropTimeout)" - --tracelevel "$(DropTraceLevel)" - -x "$(DropExpirationDate)" - - -a - - - - dotnet - installer - local_build - $([System.DateTime]::Now.ToString("yyMMdd")).1 - - - - https://vsdrop.corp.microsoft.com/file/v1/Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber); - - - - $(OutputPath)\obj\$(MSBuildProject) - - diff --git a/src/workloads/VSSetup.targets b/src/workloads/VSSetup.targets deleted file mode 100644 index 3aa4709342e598..00000000000000 --- a/src/workloads/VSSetup.targets +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber) - - -n "$(DropName)" - -d "$(VSDropSource)" - - $(DropExe) Upgrade $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) - $(DropExe) Create $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamExpirationDate) $(DropParamName) - $(DropExe) Publish $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) $(DropParamSource) - $(DropExe) Finalize $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) - $(DropExe) Update $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) --neverExpire - - - - - - - - - - - - - - - - diff --git a/src/workloads/mono_wasm_mobile.vsmanproj b/src/workloads/mono_wasm_mobile.vsmanproj deleted file mode 100644 index 95f1f2400181c8..00000000000000 --- a/src/workloads/mono_wasm_mobile.vsmanproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - false - false - false - build-manifest - true - false - DotNetOptionalWorkloads - vs - 42.42.42 - true - $(ManifestOutputPath) - - - - - / - - - /CHS/ - - - /CHT/ - - - /CSY/ - - - /DEU/ - - - /ENU/ - - - /ESN/ - - - /FRA/ - - - /ITA/ - - - /JPN/ - - - /KOR/ - - - /PLK/ - - - /PTB/ - - - /RUS/ - - - /TRK/ - - - - - diff --git a/src/workloads/readme.md b/src/workloads/readme.md deleted file mode 100644 index 0f82ab54eccff0..00000000000000 --- a/src/workloads/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Building -The workloads project can only be built using .NET Framework msbuild. To build locally, run ```.\build.cmd -project src\workloads\workloads.csproj -msbuildEngine vs``` diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj deleted file mode 100644 index 11c978d593f64e..00000000000000 --- a/src/workloads/workloads.csproj +++ /dev/null @@ -1,327 +0,0 @@ - - - - - $(NetCoreAppCurrent) - false - false - - $(ArtifactsObjDir)workloads/ - $(WorkloadIntermediateOutputPath)VS/ - $(ArtifactsBinDir)workloads/ - $(ArtifactsShippingPackagesDir) - false - - - - - - $(ArtifactsObjDir)/LightCommandPackages - - $(ArtifactsNonShippingPackagesDir) - - - - $(PkgMicrosoft_Signed_Wix)\tools - $(PkgMicroBuild_Plugins_SwixBuild_Dotnet) - $(SwixPluginPath)\build\MicroBuild.Plugins.SwixBuild.targets - - - - - - - - - - - - - - - <_ComponentResources Include="microsoft-net-runtime-mono-tooling" Title=".NET 10.0 Shared Mobile Build Tools" - Description="Shared build tasks for mobile platform development."/> - <_ComponentResources Include="wasm-tools" Title=".NET 10.0 WebAssembly Build Tools" - Description="Build tools for WebAssembly ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="wasm-experimental" Title=".NET 10.0 WebAssembly Experimental Tools" - Description=".NET 10.0 WebAssembly experimental tooling"/> - <_ComponentResources Include="wasi-experimental" Title=".NET 10.0 Wasi Experimental" - Description=".NET 10.0 Experimental SDK and tooling for WASI"/> - <_ComponentResources Include="microsoft-net-runtime-android" Title=".NET 10.0 Android Build Tools" - Description="Build tools for Android compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-android-aot" Title=".NET 10.0 Android Build Tools (AoT)" - Description="Build tools for Android ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-ios" Title=".NET 10.0 iOS Build Tools" - Description="Build tools for iOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-tvos" Title=".NET 10.0 tvOS Build Tools" - Description="Build tools for tvOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-maccatalyst" Title=".NET 10.0 Mac Catalyst Build Tools" - Description="Build tools for Mac Catalyst compilation and native linking."/> - <_ComponentResources Include="runtimes-ios" Title=".NET 10.0 iOS Runtimes" - Description=".NET 10.0 runtime components for iOS execution."/> - <_ComponentResources Include="runtimes-tvos" Title=".NET 10.0 tvOS Build Tools" - Description=".NET 10.0 runtime components for tvOS execution."/> - <_ComponentResources Include="runtimes-maccatalyst" Title=".NET 10.0 Mac Catalyst Build Tools" - Description=".NET 10.0 runtime components for Mac Catalyst execution."/> - - <_ComponentResources Include="microsoft-net-runtime-mono-tooling-net9" Title=".NET 9.0 Shared Mobile Build Tools" - Description="Shared build tasks for mobile platform development."/> - <_ComponentResources Include="wasm-tools-net9" Title=".NET 9.0 WebAssembly Build Tools" - Description="Build tools for WebAssembly ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="wasm-experimental-net9" Title=".NET 9.0 WebAssembly Experimental Tools" - Description=".NET 9.0 WebAssembly experimental tooling"/> - <_ComponentResources Include="wasi-experimental-net9" Title=".NET 9.0 Wasi Experimental" - Description=".NET 9.0 Experimental SDK and tooling for WASI"/> - <_ComponentResources Include="microsoft-net-runtime-android-net9" Title=".NET 9.0 Android Build Tools" - Description="Build tools for Android compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-android-aot-net9" Title=".NET 9.0 Android Build Tools (AoT)" - Description="Build tools for Android ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-ios-net9" Title=".NET 9.0 iOS Build Tools" - Description="Build tools for iOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-tvos-net9" Title=".NET 9.0 tvOS Build Tools" - Description="Build tools for tvOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-maccatalyst-net9" Title=".NET 9.0 Mac Catalyst Build Tools" - Description="Build tools for Mac Catalyst compilation and native linking."/> - <_ComponentResources Include="runtimes-ios-net9" Title=".NET 9.0 iOS Runtimes" - Description=".NET 9.0 runtime components for iOS execution."/> - <_ComponentResources Include="runtimes-tvos-net9" Title=".NET 9.0 tvOS Build Tools" - Description=".NET 9.0 runtime components for tvOS execution."/> - <_ComponentResources Include="runtimes-maccatalyst-net9" Title=".NET 9.0 Mac Catalyst Build Tools" - Description=".NET 9.0 runtime components for Mac Catalyst execution."/> - - <_ComponentResources Include="microsoft-net-runtime-mono-tooling-net8" Title=".NET 8.0 Shared Mobile Build Tools" - Description="Shared build tasks for mobile platform development."/> - <_ComponentResources Include="wasm-tools-net8" Title=".NET 8.0 WebAssembly Build Tools" - Description="Build tools for WebAssembly ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="wasm-experimental-net8" Title=".NET 8.0 WebAssembly Experimental Tools" - Description=".NET 8.0 WebAssembly experimental tooling"/> - <_ComponentResources Include="wasi-experimental-net8" Title=".NET 8.0 Wasi Experimental" - Description=".NET 8.0 Experimental SDK and tooling for WASI"/> - <_ComponentResources Include="microsoft-net-runtime-android-net8" Title=".NET 8.0 Android Build Tools" - Description="Build tools for Android compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-android-aot-net8" Title=".NET 8.0 Android Build Tools (AoT)" - Description="Build tools for Android ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-ios-net8" Title=".NET 8.0 iOS Build Tools" - Description="Build tools for iOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-tvos-net8" Title=".NET 8.0 tvOS Build Tools" - Description="Build tools for tvOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-maccatalyst-net8" Title=".NET 8.0 Mac Catalyst Build Tools" - Description="Build tools for Mac Catalyst compilation and native linking."/> - <_ComponentResources Include="runtimes-ios-net8" Title=".NET 8.0 iOS Runtimes" - Description=".NET 8.0 runtime components for iOS execution."/> - <_ComponentResources Include="runtimes-tvos-net8" Title=".NET 8.0 tvOS Build Tools" - Description=".NET 8.0 runtime components for tvOS execution."/> - <_ComponentResources Include="runtimes-maccatalyst-net8" Title=".NET 8.0 Mac Catalyst Build Tools" - Description=".NET 8.0 runtime components for Mac Catalyst execution."/> - <_ComponentResources Include="runtimes-windows-net8" Title=".NET 8.0 Windows Runtimes" - Description=".NET 8.0 runtime components for Windows execution."/> - - <_ComponentResources Include="microsoft-net-runtime-mono-tooling-net7" Title=".NET 7.0 Shared Mobile Build Tools" - Description="Shared build tasks for mobile platform development."/> - <_ComponentResources Include="wasm-tools-net7" Title=".NET 7.0 WebAssembly Build Tools" - Description="Build tools for net6.0 WebAssembly ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-android-net7" Title=".NET 7.0 Android Build Tools" - Description="Build tools for net6.0 Android compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-android-aot-net7" Title=".NET 7.0 Android Build Tools (AoT)" - Description="Build tools for net6.0 Android ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-ios-net7" Title=".NET 7.0 iOS Build Tools" - Description="Build tools for net7.0 iOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-tvos-net7" Title=".NET 7.0 tvOS Build Tools" - Description="Build tools for net7.0 tvOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-maccatalyst-net7" Title=".NET 7.0 Mac Catalyst Build Tools" - Description="Build tools for net7.0 Mac Catalyst compilation and native linking."/> - <_ComponentResources Include="runtimes-ios-net7" Title=".NET 7.0 iOS Runtimes" - Description=".NET 7.0 runtime components for iOS execution."/> - <_ComponentResources Include="runtimes-tvos-net7" Title=".NET 7.0 tvOS Build Tools" - Description=".NET 7.0 runtime components for tvOS execution."/> - <_ComponentResources Include="runtimes-maccatalyst-net7" Title=".NET 7.0 Mac Catalyst Build Tools" - Description=".NET 7.0 runtime components for Mac Catalyst execution."/> - <_ComponentResources Include="runtimes-windows-net7" Title=".NET 7.0 Windows Runtimes" - Description=".NET 7.0 runtime components for Windows execution."/> - - <_ComponentResources Include="microsoft-net-runtime-mono-tooling-net6" Title=".NET 6.0 Shared Mobile Build Tools" - Description="Shared build tasks for mobile platform development."/> - <_ComponentResources Include="wasm-tools-net6" Title=".NET 6.0 WebAssembly Build Tools" - Description="Build tools for net6.0 WebAssembly ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-android-net6" Title=".NET 6.0 Android Build Tools" - Description="Build tools for net6.0 Android compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-android-aot-net6" Title=".NET 6.0 Android Build Tools (AoT)" - Description="Build tools for net6.0 Android ahead-of-time (AoT) compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-ios-net6" Title=".NET 6.0 iOS Build Tools" - Description="Build tools for net6.0 iOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-tvos-net" Title=".NET 6.0 tvOS Build Tools" - Description="Build tools for net6.0 tvOS compilation and native linking."/> - <_ComponentResources Include="microsoft-net-runtime-maccatalyst-net6" Title=".NET 6.0 Mac Catalyst Build Tools" - Description="Build tools for net6.0 Mac Catalyst compilation and native linking."/> - <_ComponentResources Include="runtimes-ios-net6" Title=".NET 6.0 iOS Runtimes" - Description=".NET 6.0 runtime components for iOS execution."/> - <_ComponentResources Include="runtimes-tvos-net6" Title=".NET 6.0 tvOS Build Tools" - Description=".NET 6.0 runtime components for tvOS execution."/> - <_ComponentResources Include="runtimes-maccatalyst-net6" Title=".NET 6.0 Mac Catalyst Build Tools" - Description=".NET 6.0 runtime components for Mac Catalyst execution."/> - <_ComponentResources Include="runtimes-windows-net6" Title=".NET 6.0 Windows Runtimes" - Description=".NET 6.0 runtime components for Windows execution."/> - - - - - - - $(VisualStudioSetupInsertionPath)$(SDKBundleVersion)\ - - - - - - - Mono. - - - Mono. - - - Microsoft - - - Microsoft - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_WixObj Include="$(_WixObjDir)\**\*.wixobj" /> - - - - - - - - - - - - - - - - - - - <_MajorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Major) - <_MinorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Minor) - <_PatchVersion>$([System.Version]::Parse('$(AssemblyVersion)').Build) - <_BuildNumber>$([System.Version]::Parse('$(AssemblyVersion)').Revision) - - - - - - 5 - - 1996-04-01 - - - - - - - - - - - - From 67b995825f6a5f7d0d469a5ba13d68ca393b300b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 25 Jun 2026 21:04:58 +0200 Subject: [PATCH 3/4] Fix restore failures from RemoteExecutor bump - Bump Microsoft.Diagnostics.NETCore.Client and Microsoft.Diagnostics.Runtime to match versions required transitively by Microsoft.DotNet.RemoteExecutor, resolving an NU1605 downgrade in System.Diagnostics.Tracing.Tests. - Suppress NU1703 on the RemoteExecutor PackageReference to work around the deprecated MonoAndroid asset in System.Security.Cryptography.ProtectedData 4.5.0 (pulled in transitively via Azure.Identity -> Microsoft.Identity.Client.Extensions.Msal). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Versions.props | 4 ++-- eng/testing/xunit/xunit.props | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 632d0b765f31ce..0c191d4275e95c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -128,7 +128,7 @@ 2.0.0 17.10.0-beta1.24272.1 3.1.28 - 0.2.621003 + 0.2.661903 2.1.0 2.0.3 1.0.4-preview6.19326.1 @@ -153,7 +153,7 @@ 13.0.4 1.0.2 4.18.4 - 4.0.722401 + 4.0.727802 8.0.2 2.14.3 2.9.1 diff --git a/eng/testing/xunit/xunit.props b/eng/testing/xunit/xunit.props index 47148592eedff2..10c1822e691db6 100644 --- a/eng/testing/xunit/xunit.props +++ b/eng/testing/xunit/xunit.props @@ -17,7 +17,10 @@ - + + $(NoWarn);xUnit1051 + + $(NoWarn);NU1703 @@ -17,10 +21,8 @@ - - + +