From 1b247334864709e0e557eecdec0acf62b8e63e8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Dec 2024 09:05:41 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/razor build 20241229.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24574.1 -> To Version 7.0.0-preview.24629.6 --- NuGet.config | 3 +++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a7b728112d4..0ea5f2393081 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,6 +27,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4264b816e973..77a78c4758e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 47576478939fdd59b4400ad135f47938af486ab3 - + https://github.com/dotnet/razor - 0d10fb38d28484fc4189a5441d258d60c3cf2ca3 + 90608b56d9ba975bd83dd7527071ffac6c1ac7d3 - + https://github.com/dotnet/razor - 0d10fb38d28484fc4189a5441d258d60c3cf2ca3 + 90608b56d9ba975bd83dd7527071ffac6c1ac7d3 - + https://github.com/dotnet/razor - 0d10fb38d28484fc4189a5441d258d60c3cf2ca3 + 90608b56d9ba975bd83dd7527071ffac6c1ac7d3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bdb8f07c54d1..9528c1ca258a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ - 7.0.0-preview.24574.1 - 7.0.0-preview.24574.1 - 7.0.0-preview.24574.1 + 7.0.0-preview.24629.6 + 7.0.0-preview.24629.6 + 7.0.0-preview.24629.6 From 7acb0cb3b45b87fbfa0aa921971c0cbb65b59a21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Dec 2024 10:33:16 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/dotnet/roslyn build 20241229.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-7.24574.2 -> To Version 4.8.0-7.24629.8 --- NuGet.config | 3 +++ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 14 +++++++------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a7b728112d4..0ea5f2393081 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,6 +27,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4264b816e973..49cc9ba0962c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,32 +82,32 @@ 27f18656aab37d71839f562c0653afce07a2d2fd - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 diff --git a/eng/Versions.props b/eng/Versions.props index bdb8f07c54d1..9637f3b0122a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,13 +154,13 @@ - 4.8.0-7.24574.2 - 4.8.0-7.24574.2 - 4.8.0-7.24574.2 - 4.8.0-7.24574.2 - 4.8.0-7.24574.2 - 4.8.0-7.24574.2 - 4.8.0-7.24574.2 + 4.8.0-7.24629.8 + 4.8.0-7.24629.8 + 4.8.0-7.24629.8 + 4.8.0-7.24629.8 + 4.8.0-7.24629.8 + 4.8.0-7.24629.8 + 4.8.0-7.24629.8 $(MicrosoftNetCompilersToolsetPackageVersion) From f0f1d5a94962d83855c88a7bbb0fcf6c599156e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jan 2025 05:01:49 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/arcade build 20241223.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24570.5 -> To Version 8.0.0-beta.24623.2 --- NuGet.config | 3 ++ eng/Version.Details.xml | 16 ++++----- eng/Versions.props | 4 +-- eng/common/cross/toolchain.cmake | 61 ++++++++++++++++---------------- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 4 +-- 7 files changed, 47 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a7b728112d4..0ea5f2393081 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,6 +27,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4264b816e973..e7798750c4c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 3c7e11bf80279cde53a6251c4d0fa10e613fc739 + 278b1dda181ab18a9fbed73da998e50d128eae21 - + https://github.com/dotnet/arcade - 3c7e11bf80279cde53a6251c4d0fa10e613fc739 + 278b1dda181ab18a9fbed73da998e50d128eae21 - + https://github.com/dotnet/arcade - 3c7e11bf80279cde53a6251c4d0fa10e613fc739 + 278b1dda181ab18a9fbed73da998e50d128eae21 - + https://github.com/dotnet/arcade - 3c7e11bf80279cde53a6251c4d0fa10e613fc739 + 278b1dda181ab18a9fbed73da998e50d128eae21 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bdb8f07c54d1..b3362167a8eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24570.5 + 8.0.0-beta.24623.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24570.5 + 8.0.0-beta.24623.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 0998e875e5f7..dafabdcaef00 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -95,7 +95,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -112,7 +112,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -124,26 +124,25 @@ endif() # Specify include paths if(TIZEN) - if(TARGET_ARCH_NAME STREQUAL "arm") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) - endif() - if(TARGET_ARCH_NAME STREQUAL "armel") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) - endif() - if(TARGET_ARCH_NAME STREQUAL "arm64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x86") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) + function(find_toolchain_dir prefix) + # Dynamically find the version subdirectory + file(GLOB DIRECTORIES "${prefix}/*") + list(GET DIRECTORIES 0 FIRST_MATCH) + get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME) + + set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE) + endfunction() + + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + else() + 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() if(ANDROID) @@ -265,21 +264,21 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) @@ -288,10 +287,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() add_toolchain_linker_flag(-m32) if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a2dedaa5297a..60352ede194e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -321,7 +321,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3392e3a99921..b9b329ce37ff 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -234,7 +234,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then diff --git a/global.json b/global.json index 6dc38f7387fd..13ffec39d571 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24570.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24570.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24623.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24623.2" } } From e1b41628d79311672e631f2fde5e77775172363f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Jan 2025 03:53:22 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/roslyn build 20250106.18 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-7.24574.2 -> To Version 4.8.0-7.25056.18 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49cc9ba0962c..b619c860effa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 27f18656aab37d71839f562c0653afce07a2d2fd - + https://github.com/dotnet/roslyn - 4ff64493649bd045ced204661958393dc5575e96 + a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://github.com/dotnet/roslyn - 4ff64493649bd045ced204661958393dc5575e96 + a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://github.com/dotnet/roslyn - 4ff64493649bd045ced204661958393dc5575e96 + a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://github.com/dotnet/roslyn - 4ff64493649bd045ced204661958393dc5575e96 + a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://github.com/dotnet/roslyn - 4ff64493649bd045ced204661958393dc5575e96 + a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://github.com/dotnet/roslyn - 4ff64493649bd045ced204661958393dc5575e96 + a77b6e41d030878096fa496e00e4c0dffe5af9f0 - + https://github.com/dotnet/roslyn - 4ff64493649bd045ced204661958393dc5575e96 + a77b6e41d030878096fa496e00e4c0dffe5af9f0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9637f3b0122a..8d2dc22ea8c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,13 +154,13 @@ - 4.8.0-7.24629.8 - 4.8.0-7.24629.8 - 4.8.0-7.24629.8 - 4.8.0-7.24629.8 - 4.8.0-7.24629.8 - 4.8.0-7.24629.8 - 4.8.0-7.24629.8 + 4.8.0-7.25056.18 + 4.8.0-7.25056.18 + 4.8.0-7.25056.18 + 4.8.0-7.25056.18 + 4.8.0-7.25056.18 + 4.8.0-7.25056.18 + 4.8.0-7.25056.18 $(MicrosoftNetCompilersToolsetPackageVersion) From 887a296f7a02132d44d096269f0fab97ca9c7743 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 21:29:51 -0800 Subject: [PATCH 5/9] [release/8.0.1xx] Update dependencies from dotnet/msbuild (#45402) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 3 ++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a7b728112d4..f4c4381e37ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -27,6 +27,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4264b816e973..3bc4db55681d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk f6237140b33bf18c72dccfeda14be8d103c3b93e - + https://github.com/dotnet/msbuild - b5265ef370a651f8c3458110b804e5cbf869eeb5 + e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef - + https://github.com/dotnet/msbuild - b5265ef370a651f8c3458110b804e5cbf869eeb5 + e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef - + https://github.com/dotnet/msbuild - b5265ef370a651f8c3458110b804e5cbf869eeb5 + e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef diff --git a/eng/Versions.props b/eng/Versions.props index d95851652ea7..d7d78b945d2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.8.5 + 17.8.15 $(MicrosoftBuildPackageVersion) - 7.0.0-preview.24574.1 - 7.0.0-preview.24574.1 - 7.0.0-preview.24574.1 + 7.0.0-preview.24612.4 + 7.0.0-preview.24612.4 + 7.0.0-preview.24612.4 From d42b9f5333fe1ea0130f478e5c1a8057a6f03fda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:16:43 -0800 Subject: [PATCH 7/9] [release/8.0.1xx] Update dependencies from dotnet/templating (#45774) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99817089ef94..79d7c373e6e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,6 +26,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca6ae6dba9ee..fae72693b2b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 7e0acf900fbe1081a0cf8981b0139aba830b3318 + f8f1f8941c4d038d88f36c5bf67ea82101b0bb6c - + https://github.com/dotnet/templating - 7e0acf900fbe1081a0cf8981b0139aba830b3318 + f8f1f8941c4d038d88f36c5bf67ea82101b0bb6c - + https://github.com/dotnet/templating - 7e0acf900fbe1081a0cf8981b0139aba830b3318 + f8f1f8941c4d038d88f36c5bf67ea82101b0bb6c diff --git a/eng/Versions.props b/eng/Versions.props index 9f5f0cb8aa72..9af324b1573b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 8.0.112 + 8.0.113 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.112-servicing.24573.2 + 8.0.113-servicing.25057.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 3749bb44fd6e415337c9d3a120a2fb7a6710f6a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Jan 2025 05:02:07 +0000 Subject: [PATCH 8/9] Update dependencies from https://github.com/dotnet/templating build 20250107.10 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.309-servicing.25057.7 -> To Version 8.0.309-servicing.25057.10 --- NuGet.config | 6 +----- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index f6eafd54eb20..35a3470b6b72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,11 +27,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 672470149133..6f195f93a638 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 857c3d5e574872f4611bd24eb5a56cc95e2fef93 + 1277a47267b537f4be6d4cca46bd2f7a0bc72b28 - + https://github.com/dotnet/templating - 857c3d5e574872f4611bd24eb5a56cc95e2fef93 + 1277a47267b537f4be6d4cca46bd2f7a0bc72b28 - + https://github.com/dotnet/templating - 857c3d5e574872f4611bd24eb5a56cc95e2fef93 + 1277a47267b537f4be6d4cca46bd2f7a0bc72b28 diff --git a/eng/Versions.props b/eng/Versions.props index d0573f1ef6fb..4a52f9090aaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.309-servicing.25057.7 + 8.0.309-servicing.25057.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f87e4961f1415c68d9e06f89775386636fb72b36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jan 2025 05:01:35 +0000 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/templating build 20250109.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.309-servicing.25057.10 -> To Version 8.0.309-servicing.25059.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 35a3470b6b72..53c0750ca0d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f195f93a638..a15b8d1bbe57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 1277a47267b537f4be6d4cca46bd2f7a0bc72b28 + 18a72400977fc008e7e8f1dfa933c5fedb2d9729 - + https://github.com/dotnet/templating - 1277a47267b537f4be6d4cca46bd2f7a0bc72b28 + 18a72400977fc008e7e8f1dfa933c5fedb2d9729 - + https://github.com/dotnet/templating - 1277a47267b537f4be6d4cca46bd2f7a0bc72b28 + 18a72400977fc008e7e8f1dfa933c5fedb2d9729 diff --git a/eng/Versions.props b/eng/Versions.props index 4a52f9090aaa..bdff77131e8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.309-servicing.25057.10 + 8.0.309-servicing.25059.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion)