From 749afddd027145e1c9ff8ae06c6d5a3938752de0 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 11:51:37 -0500 Subject: [PATCH 01/81] Initial attempt at a Mac build --- eng/pipelines/templates/jobs/vmr-build.yml | 18 ++++++++- .../templates/stages/vmr-cross-build.yml | 38 +++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index a92b4dca5..ef9827d71 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -210,7 +210,14 @@ jobs: echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet" fi - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs + # Only use Docker stuff on Linux + if [[ "`uname -s`" == "Linux" ]]; then + dockerPrefix='docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }}' + else + dockerPrefix='' + fi + + $dockerPrefix ./prep.sh $customPrepArgs displayName: Prep the Build - script: | @@ -252,7 +259,14 @@ jobs: extraBuildProperties="$extraBuildProperties /p:OverrideTargetRid=${{ parameters.targetRid }}" fi - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + # Only use Docker stuff on Linux + if [[ "`uname -s`" == "Linux" ]]; then + dockerPrefix='docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }}' + else + dockerPrefix='' + fi + + ${dockerPrefix} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties displayName: Build # Don't run tests if overriding RID, we don't support that for now diff --git a/eng/pipelines/templates/stages/vmr-cross-build.yml b/eng/pipelines/templates/stages/vmr-cross-build.yml index 758bdaaf2..e4c7d45a0 100644 --- a/eng/pipelines/templates/stages/vmr-cross-build.yml +++ b/eng/pipelines/templates/stages/vmr-cross-build.yml @@ -34,6 +34,10 @@ parameters: name: NetCore-Public-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + # Mac + poolMac: + vmImage: 'macos-12' + stages: - stage: VMR_PoC_Build displayName: VMR PoC-Build @@ -105,3 +109,37 @@ stages: withPreviousSDK: false # 🚫 crossRootFs: '/crossrootfs/arm64' # 📝 targetRid: 'linux-arm64' # 📝 + + - template: ../jobs/vmr-build.yml + parameters: + # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline + buildName: OSXCrossX64_Online_MsftSdk + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: + vmImage: ${{ parameters.poolMac }} + buildFromArchive: false # 🚫 + enablePoison: false # 🚫 + excludeOmniSharpTests: true # ✅ + runOnline: true # ✅ + useMonoRuntime: true # ✅ + withPreviousSDK: false # 🚫 + targetRid: 'osx-x64' # 📝 + + - template: ../jobs/vmr-build.yml + parameters: + # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline + buildName: OSXCrossArm64_Online_MsftSdk + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: + vmImage: ${{ parameters.poolMac }} + buildFromArchive: false # 🚫 + enablePoison: false # 🚫 + excludeOmniSharpTests: true # ✅ + runOnline: true # ✅ + useMonoRuntime: true # ✅ + withPreviousSDK: false # 🚫 + targetRid: 'osx-arm64' # 📝 From 84c4a02d4a2388d5340a40f65205646ba73cee18 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 11:54:40 -0500 Subject: [PATCH 02/81] Try an empty container to appease template --- eng/pipelines/templates/stages/vmr-cross-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/templates/stages/vmr-cross-build.yml b/eng/pipelines/templates/stages/vmr-cross-build.yml index e4c7d45a0..1e8755d5b 100644 --- a/eng/pipelines/templates/stages/vmr-cross-build.yml +++ b/eng/pipelines/templates/stages/vmr-cross-build.yml @@ -119,6 +119,7 @@ stages: architecture: x64 pool: vmImage: ${{ parameters.poolMac }} + container: '' buildFromArchive: false # 🚫 enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ @@ -136,6 +137,7 @@ stages: architecture: x64 pool: vmImage: ${{ parameters.poolMac }} + container: '' buildFromArchive: false # 🚫 enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ From ff83a564335680cae0de240762dcffb56eb87cee Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 11:56:29 -0500 Subject: [PATCH 03/81] Weird quoting --- eng/pipelines/templates/stages/vmr-cross-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-cross-build.yml b/eng/pipelines/templates/stages/vmr-cross-build.yml index 1e8755d5b..428ac3659 100644 --- a/eng/pipelines/templates/stages/vmr-cross-build.yml +++ b/eng/pipelines/templates/stages/vmr-cross-build.yml @@ -36,7 +36,7 @@ parameters: # Mac poolMac: - vmImage: 'macos-12' + vmImage: macos-12 stages: - stage: VMR_PoC_Build From a4e452697e4397d68465e2c739e744e014e91ee5 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 11:59:56 -0500 Subject: [PATCH 04/81] Fix child object mistake --- eng/pipelines/templates/stages/vmr-cross-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/stages/vmr-cross-build.yml b/eng/pipelines/templates/stages/vmr-cross-build.yml index 428ac3659..37361c117 100644 --- a/eng/pipelines/templates/stages/vmr-cross-build.yml +++ b/eng/pipelines/templates/stages/vmr-cross-build.yml @@ -36,7 +36,7 @@ parameters: # Mac poolMac: - vmImage: macos-12 + vmImage: 'macos-12' stages: - stage: VMR_PoC_Build @@ -118,7 +118,7 @@ stages: vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: - vmImage: ${{ parameters.poolMac }} + vmImage: ${{ parameters.poolMac.vmImage }} container: '' buildFromArchive: false # 🚫 enablePoison: false # 🚫 @@ -136,7 +136,7 @@ stages: vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: - vmImage: ${{ parameters.poolMac }} + vmImage: ${{ parameters.poolMac.vmImage }} container: '' buildFromArchive: false # 🚫 enablePoison: false # 🚫 From 4bea2900552a1ee16a994188632d8de86fb17ff7 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 12:12:49 -0500 Subject: [PATCH 05/81] Flatten docker stuff a bit --- eng/pipelines/templates/jobs/vmr-build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index ef9827d71..3046488bc 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -212,12 +212,10 @@ jobs: # Only use Docker stuff on Linux if [[ "`uname -s`" == "Linux" ]]; then - dockerPrefix='docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }}' + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs else - dockerPrefix='' + ./prep.sh $customPrepArgs fi - - $dockerPrefix ./prep.sh $customPrepArgs displayName: Prep the Build - script: | @@ -261,12 +259,10 @@ jobs: # Only use Docker stuff on Linux if [[ "`uname -s`" == "Linux" ]]; then - dockerPrefix='docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }}' + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties else - dockerPrefix='' + ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties fi - - ${dockerPrefix} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties displayName: Build # Don't run tests if overriding RID, we don't support that for now From af8e0cc0224926413d03231f36ddfa64c08ec813 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 13:02:00 -0500 Subject: [PATCH 06/81] copy-paste error --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 3046488bc..7ecefb049 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -259,7 +259,7 @@ jobs: # Only use Docker stuff on Linux if [[ "`uname -s`" == "Linux" ]]; then - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties else ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties fi From deecc351cfa15a6301e37a5309b37c203a08c3bb Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 13:04:38 -0500 Subject: [PATCH 07/81] Add debug spew to figure out unreproducible Mac failure --- eng/vmr-sync.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index 0e0a5b275..2421fcc66 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -66,15 +66,20 @@ source="${BASH_SOURCE[0]}" +echo "*** DEBUG source=$source" + # resolve $source until the file is no longer a symlink while [[ -h "$source" ]]; do scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +echo "*** DEBUG scriptroot=$scriptroot" source="$(readlink "$source")" +echo "*** DEBUG source=$source" # if $source was a relative symlink, we need to resolve it relative to the path where the # symlink file was located [[ $source != /* ]] && source="$scriptroot/$source" done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +echo "*** DEBUG scriptroot=$scriptroot" function print_help () { sed -n '/^### /,/^$/p' "$source" | cut -b 5- @@ -95,6 +100,7 @@ function highlight () { } installer_dir=$(realpath "$scriptroot/../") +echo "*** DEBUG installer_dir=$installer_dir" tmp_dir='' vmr_dir='' From fc3bfe570bbe4a6817f62d83003957b5f5ddfab1 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 13:11:15 -0500 Subject: [PATCH 08/81] testing --- eng/vmr-sync.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index 2421fcc66..a90a853c3 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -66,20 +66,15 @@ source="${BASH_SOURCE[0]}" -echo "*** DEBUG source=$source" - # resolve $source until the file is no longer a symlink while [[ -h "$source" ]]; do scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -echo "*** DEBUG scriptroot=$scriptroot" source="$(readlink "$source")" -echo "*** DEBUG source=$source" # if $source was a relative symlink, we need to resolve it relative to the path where the # symlink file was located [[ $source != /* ]] && source="$scriptroot/$source" done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -echo "*** DEBUG scriptroot=$scriptroot" function print_help () { sed -n '/^### /,/^$/p' "$source" | cut -b 5- @@ -99,8 +94,8 @@ function highlight () { echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" } +which realpath installer_dir=$(realpath "$scriptroot/../") -echo "*** DEBUG installer_dir=$installer_dir" tmp_dir='' vmr_dir='' From 06c4afe326b76a9dce750bcf21190b5d0fbb7920 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 15:39:37 -0500 Subject: [PATCH 09/81] more testing --- eng/vmr-sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index a90a853c3..3f668a4cf 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -94,7 +94,7 @@ function highlight () { echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" } -which realpath +echo "*** DEBUG $(which realpath)" installer_dir=$(realpath "$scriptroot/../") tmp_dir='' From 38f4b80a0eaeff681028fc330486af1abf904c0c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 15:51:29 -0500 Subject: [PATCH 10/81] Make VMR sync work on macOS 12, hopefully --- eng/vmr-sync.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index 3f668a4cf..a9f902180 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -94,8 +94,8 @@ function highlight () { echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" } -echo "*** DEBUG $(which realpath)" -installer_dir=$(realpath "$scriptroot/../") +# realpath is not available in macOS 12, try horrible-but-portable workaround +installer_dir=$(cd "$scriptroot/../"; pwd -P) tmp_dir='' vmr_dir='' @@ -239,7 +239,8 @@ set -e highlight 'Installing .NET, preparing the tooling..' source "$scriptroot/common/tools.sh" InitializeDotNetCli true -dotnet=$(realpath "$scriptroot/../.dotnet/dotnet") +dotnetDir=$( cd $scriptroot/../.dotnet/; pwd -P ) +dotnet=$dotnetDir/dotnet "$dotnet" tool restore highlight "Starting the synchronization of '$repository'.." From 2ab68b2bdc8c8052b1edc3af0c204c9e57da09d8 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 8 Dec 2023 15:58:57 -0500 Subject: [PATCH 11/81] `cd` to build directory, since we aren't setting a Docker workdir --- eng/pipelines/templates/jobs/vmr-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 7ecefb049..46067ab61 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -214,6 +214,7 @@ jobs: if [[ "`uname -s`" == "Linux" ]]; then docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs else + cd $(sourcesPath) ./prep.sh $customPrepArgs fi displayName: Prep the Build @@ -261,6 +262,7 @@ jobs: if [[ "`uname -s`" == "Linux" ]]; then docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties else + cd $(sourcesPath) ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties fi displayName: Build From c912a505d9a5b004524326d90bd7e9e4b68a332e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 11:19:35 +0000 Subject: [PATCH 12/81] Update dependencies from https://github.com/dotnet/test-templates build 20231212.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23607.1 -> To Version 1.1.0-rc.23612.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a7311b86..aa47486cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d diff --git a/eng/Versions.props b/eng/Versions.props index b3032cb5f..11d4ad1bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.23607.1 - 1.1.0-rc.23607.1 - 1.1.0-rc.23607.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 From d450a51e85368835e8d8eda72c7aebf878af90da Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 12 Dec 2023 15:44:05 -0500 Subject: [PATCH 13/81] Gotta pass CROSSCOMPILE=1 for x64 Macs to build osx-arm64 --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 46067ab61..37457a9d6 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -263,7 +263,7 @@ jobs: docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties else cd $(sourcesPath) - ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + CROSSCOMPILE=1 ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties fi displayName: Build From e8105db7a03df8408c1d961af0679170d1760637 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:18:56 +0000 Subject: [PATCH 14/81] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17942) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.200-beta.23608.3 to 12.8.200-beta.23611.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23608.3 to 8.0.200-beta.23611.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23606-01 to 17.9.0-preview-23610-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a7311b86..ecb755232 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - e479cbe697a26f864e60ea49f02c278a8331f7bc + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/dotnet/fsharp - e479cbe697a26f864e60ea49f02c278a8331f7bc + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/microsoft/vstest - 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 + 50c0f7889fdd8d13381d325bdbb6d253e33da1ff diff --git a/eng/Versions.props b/eng/Versions.props index b3032cb5f..d274ff29b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23610.2 - 8.0.200-preview.23610.2 - 8.0.200-preview.23610.2 + 8.0.200-preview.23612.6 + 8.0.200-preview.23612.6 + 8.0.200-preview.23612.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23606-01 + 17.9.0-preview-23610-02 8.0.0-alpha.1.22557.12 From 680d9fd886f9165c8c278353c1a8f51bae140b43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 22:14:32 +0000 Subject: [PATCH 15/81] Update dependencies from https://github.com/dotnet/sdk build 20231212.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecb755232..eea1d97d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d diff --git a/eng/Versions.props b/eng/Versions.props index d274ff29b..94d2dfb73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23612.6 - 8.0.200-preview.23612.6 - 8.0.200-preview.23612.6 + 8.0.200-preview.23612.9 + 8.0.200-preview.23612.9 + 8.0.200-preview.23612.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23608.9 + 4.9.0-3.23611.13 From 3232b64c14cbc13b1666d0b8ddb71489ac67f85d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 23:19:24 +0000 Subject: [PATCH 16/81] Update dependencies from https://github.com/dotnet/sdk build 20231212.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (parent: Microsoft.NET.Sdk --- 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 eea1d97d1..117189307 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 94d2dfb73..f632de489 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.9 - 8.0.200-preview.23612.9 - 8.0.200-preview.23612.9 + 8.0.200-preview.23612.11 + 8.0.200-preview.23612.11 + 8.0.200-preview.23612.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a76328b8fcb5a48cfeae67790b374db5140d0327 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 00:13:26 +0000 Subject: [PATCH 17/81] Update dependencies from https://github.com/dotnet/sdk build 20231212.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.12 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (parent: Microsoft.NET.Sdk --- 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 117189307..048dc57a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f632de489..cf53c8370 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.11 - 8.0.200-preview.23612.11 - 8.0.200-preview.23612.11 + 8.0.200-preview.23612.12 + 8.0.200-preview.23612.12 + 8.0.200-preview.23612.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From daa880ab595bd66269944e69da54fc992908164e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 18:14:26 +0000 Subject: [PATCH 18/81] [release/8.0.1xx] Remove global CheckEolTargetFramework=false (#17964) Co-authored-by: Ella Hathaway --- src/SourceBuild/content/repo-projects/Directory.Build.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 165f87523..4b2215bd4 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -110,9 +110,6 @@ - - - From cff8d4f08d7735dd86215513d0009da81a18bcf3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 21:15:36 +0000 Subject: [PATCH 19/81] Update dependencies from https://github.com/dotnet/sdk build 20231213.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.12 -> To Version 8.0.200-preview.23613.4 --- 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 5774a15b6..22a94aa46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 13f8e564f..5c44d3754 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.12 - 8.0.200-preview.23612.12 - 8.0.200-preview.23612.12 + 8.0.200-preview.23613.4 + 8.0.200-preview.23613.4 + 8.0.200-preview.23613.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c9dc3fb1806f4d0f422a3afdbc95ef9c3b592158 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 02:57:43 +0000 Subject: [PATCH 20/81] Update dependencies from https://github.com/dotnet/sdk build 20231213.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.4 -> To Version 8.0.200-preview.23613.8 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 17.9.0-preview-23610-02 -> To Version 17.9.0-preview-23612-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22a94aa46..2c705685a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/microsoft/vstest - 50c0f7889fdd8d13381d325bdbb6d253e33da1ff + dc8fe3865011cef3a0891f5f55c1fc5c7f401066 @@ -155,13 +155,13 @@ 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/msbuild - 2f3d37672a69142a13a62856b09034a915bedc70 + eea84ad7cf250b9dbf80f0981c594155d55de0b7 - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe diff --git a/eng/Versions.props b/eng/Versions.props index 5c44d3754..56011947b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23613.4 - 8.0.200-preview.23613.4 - 8.0.200-preview.23613.4 + 8.0.200-preview.23613.8 + 8.0.200-preview.23613.8 + 8.0.200-preview.23613.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.50 + 6.9.0-preview.1.52 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23610-02 + 17.9.0-preview-23612-01 8.0.0-alpha.1.22557.12 From 04c50a4008f5e9ef9214c5a6f45881be20cf2bd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 06:32:57 +0000 Subject: [PATCH 21/81] Update dependencies from https://github.com/dotnet/sdk build 20231213.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.8 -> To Version 8.0.200-preview.23613.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23611.3 -> To Version 12.8.200-beta.23613.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c705685a..d662d5b45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 diff --git a/eng/Versions.props b/eng/Versions.props index 56011947b..243ee7a6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23613.8 - 8.0.200-preview.23613.8 - 8.0.200-preview.23613.8 + 8.0.200-preview.23613.11 + 8.0.200-preview.23613.11 + 8.0.200-preview.23613.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23611.13 + 4.9.0-3.23612.11 From e61e75584adb35dea25f93fdda67f5384940a9f1 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 14 Dec 2023 09:24:20 -0500 Subject: [PATCH 22/81] Override RID in SDK, currently it misbehaves for Mac cross builds --- src/SourceBuild/content/repo-projects/sdk.proj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index a77e3f092..e1e865d7b 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -6,6 +6,11 @@ $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk + $(TargetRid) + osx-$(Platform) + freebsd-$(Platform) + win-$(Platform) + <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) <_baseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) @@ -13,7 +18,7 @@ <_targetPortableArch>$(Platform) <_targetPortableArch Condition="'$(OverrideTargetArch)' != ''">$(OverrideTargetArch) $(BuildCommandArgs) /p:PortableRid=$(_baseOS)-$(_targetPortableArch) - $(BuildCommandArgs) /p:TargetRid=$(TargetRid) + $(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid) $(BuildCommandArgs) /p:NativeAotSupported=false From 1a4672e257b68010c91af3b4c1ff94ab1740945c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 14 Dec 2023 09:28:14 -0500 Subject: [PATCH 23/81] More portable conditional --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 37457a9d6..d3ea0738d 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -211,7 +211,7 @@ jobs: fi # Only use Docker stuff on Linux - if [[ "`uname -s`" == "Linux" ]]; then + if [[ -n "${{ parameters.container }}" ]]; then docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs else cd $(sourcesPath) From f880dfdb0c4514cbb6f1312b5a69f8fbc2527986 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:14:34 -0600 Subject: [PATCH 24/81] Fixes SDK diff after release of Aspire (#17893) --- .../assets/SdkFileDiffExclusions.txt | 1 - .../assets/baselines/MsftToSbSdkFiles.diff | 8 -------- 2 files changed, 9 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 3000c80e8..6cf694f75 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -45,7 +45,6 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? # missing workload manifests - https://github.com/dotnet/source-build/issues/3242 msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* -msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index 434883537..4c2d7775b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -44,14 +44,6 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll - ./sdk-manifests/ - ./sdk-manifests/x.y.z/ --./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/WorkloadManifest.json @@ ------------ @@ ./sdk/x.y.z/.version ./sdk/x.y.z/AppHostTemplate/ From 461c7766428ba2782725d89d95d3f4f414ff8c92 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:14:56 -0600 Subject: [PATCH 25/81] Do not reuse existing installation of .NET CLI in SB prep script (#17892) --- src/SourceBuild/content/prep.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 472c348ae..a842566b2 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -156,6 +156,7 @@ function BootstrapArtifacts { # Check for the version of dotnet to install if [ "$installDotnet" == true ]; then echo " Installing dotnet..." + use_installed_dotnet_cli=false (source ./eng/common/tools.sh && InitializeDotNetCli true) fi From 598774040361d6a942fc31f9dd9cdddbb43ec25e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 18:25:01 +0000 Subject: [PATCH 26/81] Update dependencies from https://github.com/dotnet/sdk build 20231214.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.11 -> To Version 8.0.200-preview.23614.3 --- 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 d662d5b45..53b98a1a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 243ee7a6c..bec0a08ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23613.11 - 8.0.200-preview.23613.11 - 8.0.200-preview.23613.11 + 8.0.200-preview.23614.3 + 8.0.200-preview.23614.3 + 8.0.200-preview.23614.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d954a396ff696fad9e24be022eada7094d1cac0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 19:30:47 +0000 Subject: [PATCH 27/81] Update dependencies from https://github.com/dotnet/sdk build 20231214.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.11 -> To Version 8.0.200-preview.23614.5 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.9.0-preview-23613-03 -> To Version 17.9.0-preview-23613-14 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b98a1a3..60add4c85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e https://github.com/dotnet/test-templates @@ -155,13 +155,13 @@ 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/msbuild - eea84ad7cf250b9dbf80f0981c594155d55de0b7 + fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c diff --git a/eng/Versions.props b/eng/Versions.props index bec0a08ee..b94a88920 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23614.3 - 8.0.200-preview.23614.3 - 8.0.200-preview.23614.3 + 8.0.200-preview.23614.5 + 8.0.200-preview.23614.5 + 8.0.200-preview.23614.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.52 + 6.9.0-preview.1.54 From d7393e0fb89faed666dc34a3c95354a61ee1486e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 07:39:32 +0000 Subject: [PATCH 28/81] Update dependencies from https://github.com/dotnet/sdk build 20231214.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.5 -> To Version 8.0.200-preview.23614.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23612.11 -> To Version 4.9.0-3.23613.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60add4c85..d0bff5a06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 diff --git a/eng/Versions.props b/eng/Versions.props index b94a88920..b38c17dec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23614.5 - 8.0.200-preview.23614.5 - 8.0.200-preview.23614.5 + 8.0.200-preview.23614.11 + 8.0.200-preview.23614.11 + 8.0.200-preview.23614.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23612.11 + 4.9.0-3.23613.8 From 726df15ef2ff9624d3b7312d013cab44132797b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 08:32:45 +0000 Subject: [PATCH 29/81] Update dependencies from https://github.com/dotnet/sdk build 20231214.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.5 -> To Version 8.0.200-preview.23614.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23613.1 -> To Version 12.8.200-beta.23613.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0bff5a06..79e5e1d3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 - + https://github.com/dotnet/fsharp - e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 diff --git a/eng/Versions.props b/eng/Versions.props index b38c17dec..561f0b515 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23614.11 - 8.0.200-preview.23614.11 - 8.0.200-preview.23614.11 + 8.0.200-preview.23614.13 + 8.0.200-preview.23614.13 + 8.0.200-preview.23614.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 077478e8228aadc815fd0319fd1ac76ddf6228e2 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 15 Dec 2023 09:07:49 -0500 Subject: [PATCH 30/81] Genericize build script a bit better, for easier sharing between Linux/Mac --- eng/pipelines/templates/jobs/vmr-build.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index d3ea0738d..dbe9d9b5b 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -245,13 +245,18 @@ jobs: customBuildArgs="$customBuildArgs --use-mono-runtime" fi - if [[ ! -z '${{ parameters.crossRootFs }}' || ! -z '${{ parameters.targetRid }}' ]]; then + if [[ -n "${{ parameters.container }}" ]]; then + useDocker=true + fi + + if [[ ! -z '${{ parameters.targetRid }}' ]]; then extraBuildProperties="--" + customEnvVars="$customEnvVars CROSSCOMPILE=1" + extraBuildProperties="$extraBuildProperties /p:PortableBuild=true /p:DotNetBuildVertical=true" fi if [[ ! -z '${{ parameters.crossRootFs }}' ]]; then - customRunArgs="$customRunArgs -e CROSSCOMPILE=1 -e ROOTFS_DIR=${{ parameters.crossRootFs}}" - extraBuildProperties="$extraBuildProperties /p:PortableBuild=true /p:DotNetBuildVertical=true" + customEnvVars="$customEnvVars ROOTFS_DIR=${{ parameters.crossRootFs}}" fi if [[ ! -z '${{ parameters.targetRid }}' ]]; then @@ -259,11 +264,14 @@ jobs: fi # Only use Docker stuff on Linux - if [[ "`uname -s`" == "Linux" ]]; then - docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customRunArgs ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + if [[ "$useDocker" == "true" ]]; then + for envVar in $customEnvVars; do + customEnvVarsWithDockerSyntax="$customEnvVarsWithDockerSyntax -e $envVar" + done + docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customEnvVarsWithDockerSyntax ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties else cd $(sourcesPath) - CROSSCOMPILE=1 ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + $customEnvVars ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties fi displayName: Build From 711f7265a65f39c9f41bc0eb3b11814db97ad2b9 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 15 Dec 2023 09:36:46 -0500 Subject: [PATCH 31/81] Maybe fix env var issue on Mac --- eng/pipelines/templates/jobs/vmr-build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index dbe9d9b5b..1d601dfcd 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -270,8 +270,11 @@ jobs: done docker run --rm -v "$(sourcesPath):/vmr" -w /vmr $customEnvVarsWithDockerSyntax ${{ parameters.container }} ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties else + for envVar in $customEnvVars; do + customEnvVarsWithBashSyntax="$customEnvVarsWithBashSyntax export $envVar;" + done cd $(sourcesPath) - $customEnvVars ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + $customEnvVarsWithBashSyntax ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties fi displayName: Build From 71b3db97040ffcf670af2eabcf61522a9971ff6a Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 15 Dec 2023 09:46:52 -0500 Subject: [PATCH 32/81] Use eval --- eng/pipelines/templates/jobs/vmr-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 1d601dfcd..e327ce3e0 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -274,7 +274,8 @@ jobs: customEnvVarsWithBashSyntax="$customEnvVarsWithBashSyntax export $envVar;" done cd $(sourcesPath) - $customEnvVarsWithBashSyntax ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties + eval $customEnvVarsWithBashSyntax + ./build.sh --clean-while-building $(additionalBuildArgs) $customBuildArgs $extraBuildProperties fi displayName: Build From 92881248bf570dc25974e59adfdd0c506a9372ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 16:25:43 +0000 Subject: [PATCH 33/81] Update dependencies from https://github.com/dotnet/symreader build 20231208.1 Microsoft.SourceBuild.Intermediate.symreader From Version 2.1.0-beta.23253.1 -> To Version 2.1.0-beta.23608.1 --- 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 93aa3ec04..56f6324b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,9 +195,9 @@ bc555088c6b4862ad0b93fbc245ef0628e661256 - + https://github.com/dotnet/symreader - 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 + aa31e333b952f53910dc6bd08d80596eaaf89360 From 82af839034e9e8fe429c86719c8fa4bc080d851f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 20:13:58 +0000 Subject: [PATCH 34/81] Update dependencies from https://github.com/dotnet/sdk build 20231215.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23615.6 --- 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 79e5e1d3c..020e64f37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 08056b1bb57e3f445355346f8dc60bdfd745293f + a6fd3852455d396598bb927837ac8a1a84060c0c - + https://github.com/dotnet/sdk - 08056b1bb57e3f445355346f8dc60bdfd745293f + a6fd3852455d396598bb927837ac8a1a84060c0c - + https://github.com/dotnet/sdk - 08056b1bb57e3f445355346f8dc60bdfd745293f + a6fd3852455d396598bb927837ac8a1a84060c0c - + https://github.com/dotnet/sdk - 08056b1bb57e3f445355346f8dc60bdfd745293f + a6fd3852455d396598bb927837ac8a1a84060c0c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 561f0b515..187e47fb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23614.13 - 8.0.200-preview.23614.13 - 8.0.200-preview.23614.13 + 8.0.200-preview.23615.6 + 8.0.200-preview.23615.6 + 8.0.200-preview.23615.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 22839d007b44c5640df385470ff0a006107b6a89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 22:54:42 +0000 Subject: [PATCH 35/81] Update dependencies from https://github.com/dotnet/sdk build 20231215.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23615.8 --- 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 020e64f37..a5a3d3aac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 187e47fb2..982af7ded 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23615.6 - 8.0.200-preview.23615.6 - 8.0.200-preview.23615.6 + 8.0.200-preview.23615.8 + 8.0.200-preview.23615.8 + 8.0.200-preview.23615.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef89c6bb5659892d874a7aa0dd4ff10a8a0e4ea3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 23:51:20 +0000 Subject: [PATCH 36/81] Update dependencies from https://github.com/dotnet/sdk build 20231215.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23615.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.200-beta.23613.4 -> To Version 12.8.200-beta.23614.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5a3d3aac..f95ef5580 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 https://github.com/dotnet/test-templates @@ -132,32 +132,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/msbuild - fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa + b0e2b79230019c8f28ad7bedd82ecaa85a114761 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 982af7ded..e8b5bd4da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23615.8 - 8.0.200-preview.23615.8 - 8.0.200-preview.23615.8 + 8.0.200-preview.23615.10 + 8.0.200-preview.23615.10 + 8.0.200-preview.23615.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23613.8 + 4.9.0-3.23614.9 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23612-01 + 17.9.0-preview-23614-02 8.0.0-alpha.1.22557.12 From 9279b070cd297b91e8eb358aaf9e1a62ed151d09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 00:53:31 +0000 Subject: [PATCH 37/81] [main] Update dependencies from dotnet/sdk (#17990) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.8.200-beta.23613.4 to 12.8.200-beta.23614.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23613.4 to 8.0.200-beta.23614.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23612-01 to 17.9.0-preview-23614-02 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0-preview-23613-04 to 17.10.0-preview-23615-03 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.9.0-preview.1.54 to 6.9.0-preview.1.63 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62557d883..1cc9696e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 https://github.com/dotnet/runtime @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://github.com/dotnet/wpf 8e3e1a550c591a7732df79f075716b88af692b43 - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 @@ -155,14 +155,14 @@ 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/msbuild - f97064d3b83485628dec0769659e786b55f6835a + abc2f4620f6749289cafeed7c9a9a80eaeb38e28 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 diff --git a/eng/Versions.props b/eng/Versions.props index 4ae3963b4..66a788056 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 0.2.0 - 9.0.100-alpha.1.23615.3 - 9.0.100-alpha.1.23615.3 - 9.0.100-alpha.1.23615.3 + 9.0.100-alpha.1.23615.9 + 9.0.100-alpha.1.23615.9 + 9.0.100-alpha.1.23615.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,10 +113,10 @@ - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 @@ -128,7 +128,7 @@ - 6.9.0-preview.1.54 + 6.9.0-preview.1.63 @@ -246,7 +246,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23612-01 + 17.9.0-preview-23614-02 8.0.0-alpha.1.22557.12 9.0.0-preview.23613.1 From 4ee18b14edc2c741b286fe9ea347989a4790a764 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 00:54:38 +0000 Subject: [PATCH 38/81] [main] Update dependencies from dotnet/source-build-reference-packages (#17992) [main] Update dependencies from dotnet/source-build-reference-packages --- 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 1cc9696e3..b60b35e3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -240,9 +240,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a9a44d16c43525b354da1808ab73c514b3b05e7d + ad274914920e8e51c5269d215a641e592af8182c From 9e820eb7bb33582161f959359960b7e0eb0fcc77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 00:19:40 +0000 Subject: [PATCH 39/81] [main] Update dependencies from dotnet/arcade (#17995) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/sdl/trim-assets-version.ps1 | 2 -- global.json | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b60b35e3f..329da5abc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 66a788056..4539c4946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23614.6 + 9.0.0-beta.23615.2 diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index 1f3c531b2..0daa2a9e9 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -61,8 +61,6 @@ try { ExitWithExitCode 1 } - # Remove the ROLL FORWARD env var with a future Arcade.Sdk update in Arcade. - $env:DOTNET_ROLL_FORWARD = "Major" Exec-BlockVerbosely { & "$dotnet" $CliToolName trim-assets-version ` --assets-path $InputPath ` diff --git a/global.json b/global.json index 88ad3b49e..88f595d05 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-alpha.1.23613.1", + "dotnet": "9.0.100-alpha.1.23615.4", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23614.6", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23614.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23615.2" } } From 72eaeded6d49d32984191518cee4c2bc7a9e6321 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 00:20:03 +0000 Subject: [PATCH 40/81] [main] Update dependencies from dotnet/sdk (#17994) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.9.0-3.23614.9 to 4.9.0-3.23615.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 329da5abc..087fafcdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/sdk - da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 + 91a440681da35b13a1528bd6dcf35c64a2c221ab - + https://github.com/dotnet/sdk - da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 + 91a440681da35b13a1528bd6dcf35c64a2c221ab - + https://github.com/dotnet/sdk - da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 + 91a440681da35b13a1528bd6dcf35c64a2c221ab - + https://github.com/dotnet/sdk - da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 + 91a440681da35b13a1528bd6dcf35c64a2c221ab https://github.com/dotnet/test-templates @@ -146,13 +146,13 @@ 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 diff --git a/eng/Versions.props b/eng/Versions.props index 4539c4946..bc830baa2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,41 +73,41 @@ - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 0.2.0 - 9.0.100-alpha.1.23615.9 - 9.0.100-alpha.1.23615.9 - 9.0.100-alpha.1.23615.9 + 9.0.100-alpha.1.23616.1 + 9.0.100-alpha.1.23616.1 + 9.0.100-alpha.1.23616.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23614.9 + 4.9.0-3.23615.7 - 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23615.12 8.0.0-rc.1.23414.4 2.1.0 From dc0381c8fa6475f124c4784173563e32cb2c6110 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 03:04:29 +0000 Subject: [PATCH 41/81] Update dependencies from https://github.com/dotnet/sdk build 20231217.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23617.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.200-beta.23613.4 -> To Version 12.8.200-beta.23615.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f95ef5580..c6b5f5467 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 https://github.com/dotnet/msbuild b0e2b79230019c8f28ad7bedd82ecaa85a114761 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + 2a234707a663f731e4de93cba4014ed1a8259def diff --git a/eng/Versions.props b/eng/Versions.props index e8b5bd4da..4bb59dadb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23615.10 - 8.0.200-preview.23615.10 - 8.0.200-preview.23615.10 + 8.0.200-preview.23617.3 + 8.0.200-preview.23617.3 + 8.0.200-preview.23617.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23614.9 + 4.9.0-3.23615.7 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.54 + 6.9.0-preview.1.64 From fae23c657143810dcbd2c950109631ed8787e972 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 18 Dec 2023 07:02:42 -0600 Subject: [PATCH 42/81] Remove Arcade net9.0 workarounds (#17987) --- src/SourceBuild/content/Directory.Build.props | 2 - src/SourceBuild/content/build.sh | 7 ++- .../0001-Explicitly-set-TFM-to-net9.0.patch | 51 ------------------- .../0001-Explicitly-set-net9.0-TFM.patch | 23 --------- ...plicitly-target-net9.0-for-NoOp-proj.patch | 23 --------- .../0001-Explicitly-use-net9.0-TFM.patch | 51 ------------------- 6 files changed, 6 insertions(+), 151 deletions(-) delete mode 100644 src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch delete mode 100644 src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch delete mode 100644 src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch delete mode 100644 src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 2efe17577..9d05322e9 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -8,8 +8,6 @@ - - net9.0 netstandard2.0 diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index a1224e436..c56c5085d 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -259,7 +259,12 @@ if [ "$alternateTarget" == "true" ]; then export NUGET_PACKAGES=$NUGET_PACKAGES/smoke-tests "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog" -flp:"LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log" -clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else - "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # BuildXPlatTasks uses NetCurrent but that is not set since Arcade isn't used here. + # Bootstrap NetCurrent by deriving it from the installed .NET CLI version. + netCurrent="$($CLI_ROOT/dotnet --version | while IFS='.' read major minor _; do echo "net$major.$minor"; done)" + + "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -p:NetCurrent=$netCurrent -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver "$CLI_ROOT/dotnet" build-server shutdown diff --git a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch deleted file mode 100644 index ac34d9338..000000000 --- a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 12:50:21 -0500 -Subject: [PATCH] Explicitly set TFM to net9.0 - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - perf/dotnet-format.Performance.csproj | 2 +- - src/dotnet-format.csproj | 2 +- - tests/dotnet-format.UnitTests.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj -index 677b7b9a..3e1387d1 100644 ---- a/perf/dotnet-format.Performance.csproj -+++ b/perf/dotnet-format.Performance.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Exe - true - Release -diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj -index 5549fb71..8a77d03f 100644 ---- a/src/dotnet-format.csproj -+++ b/src/dotnet-format.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Exe - Microsoft.CodeAnalysis.Tools - true -diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj -index c4311a1a..5b1bcfb9 100644 ---- a/tests/dotnet-format.UnitTests.csproj -+++ b/tests/dotnet-format.UnitTests.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Microsoft.CodeAnalysis.Tools.Tests - - diff --git a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch deleted file mode 100644 index 295561075..000000000 --- a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 10:58:11 -0500 -Subject: [PATCH] Explicitly set net9.0 TFM - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index bf6754f23..d76f449be 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -66,7 +66,7 @@ - --> - - -- $(NetCurrent) -+ net9.0 - $(DefaultNetCoreTargetFramework) - - diff --git a/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch b/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch deleted file mode 100644 index 6438c7678..000000000 --- a/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Tue, 7 Nov 2023 12:40:49 -0600 -Subject: [PATCH] Explicitly target net9.0 for NoOp proj - -https://github.com/dotnet/source-build/issues/3663 ---- - eng/NoOp.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/NoOp.csproj b/eng/NoOp.csproj -index 659aa00a..3ecefd43 100644 ---- a/eng/NoOp.csproj -+++ b/eng/NoOp.csproj -@@ -5,7 +5,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - - diff --git a/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch b/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch deleted file mode 100644 index 78ebca72a..000000000 --- a/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Thu, 19 Oct 2023 08:29:45 -0500 -Subject: [PATCH] Explicitly use net9.0 TFM - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.targets | 2 +- - .../Microsoft.TestPlatform.Build.csproj | 2 +- - .../Microsoft.TestPlatform.CLI.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index b720568b..617ca4fc 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -6,7 +6,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - $(NetCurrent) - -diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -index a93852ce..945b1ac2 100644 ---- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -@@ -12,7 +12,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - - -diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -index b8f6849b..b56b993c 100644 ---- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - - - From b75062f476bebd9b971ae3c0fdfffdfd1ad99978 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 15:05:09 +0100 Subject: [PATCH 43/81] [main] Update dependencies from dotnet/sdk (#17996) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 112 +++++++++--------- eng/Versions.props | 48 ++++---- ...-source-build-inner-clone-paths-5543.patch | 38 ------ ...ride-of-build-tool-framework-version.patch | 28 ----- 4 files changed, 80 insertions(+), 146 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch delete mode 100644 src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21d285e64..9295b0217 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/sdk - 91a440681da35b13a1528bd6dcf35c64a2c221ab + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - 91a440681da35b13a1528bd6dcf35c64a2c221ab + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - 91a440681da35b13a1528bd6dcf35c64a2c221ab + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - 91a440681da35b13a1528bd6dcf35c64a2c221ab + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - e1393ed208a58a6a2f864ac5ae9cd8ae965d236c + 338ec5bd57538304c4cf372c4389b7c9c57cbecd - + https://github.com/dotnet/wpf - 8e3e1a550c591a7732df79f075716b88af692b43 + 4fc9cd4d737f87b4b0604c80961a32aab47feb0b - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 @@ -146,9 +146,9 @@ 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e https://github.com/dotnet/roslyn @@ -160,18 +160,18 @@ abc2f4620f6749289cafeed7c9a9a80eaeb38e28 - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 487a0a43dbe6e83f07b200b7523447222bb2137b + e5721f8f058db60052ff7298d1a5acd69347b5db diff --git a/eng/Versions.props b/eng/Versions.props index bc830baa2..0b2f1d577 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23605.3 + 9.0.0-alpha.1.23616.1 - 9.0.0-alpha.1.23606.2 + 9.0.0-alpha.1.23616.2 @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 0.2.0 - 9.0.100-alpha.1.23616.1 - 9.0.100-alpha.1.23616.1 - 9.0.100-alpha.1.23616.1 + 9.0.100-alpha.1.23618.1 + 9.0.100-alpha.1.23618.1 + 9.0.100-alpha.1.23618.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,24 +99,24 @@ - 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23617.4 - 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 @@ -128,7 +128,7 @@ - 6.9.0-preview.1.63 + 6.9.0-preview.1.64 @@ -262,7 +262,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23617.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch b/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch deleted file mode 100644 index 340c374c1..000000000 --- a/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> -Date: Fri, 15 Dec 2023 10:01:14 -0800 -Subject: [PATCH] Shorten source-build inner clone paths (#5543) - -Backport: https://github.com/NuGet/NuGet.Client/pull/5543 ---- - eng/pipelines/templates/Source_Build.yml | 2 +- - eng/source-build/build.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/eng/pipelines/templates/Source_Build.yml b/eng/pipelines/templates/Source_Build.yml -index 7163c617e..842904c4f 100644 ---- a/eng/pipelines/templates/Source_Build.yml -+++ b/eng/pipelines/templates/Source_Build.yml -@@ -12,7 +12,7 @@ steps: - condition: "or(failed(), eq(variables['System.debug'], 'true'))" - continueOnError: true - inputs: -- PathToPublish: "artifacts/source-build/self/log/source-build.binlog" -+ PathToPublish: "artifacts/sb/log/source-build.binlog" - ArtifactName: "Source-build log" - ArtifactType: Container - -diff --git a/eng/source-build/build.sh b/eng/source-build/build.sh -index 292b0fff8..cdf226b06 100755 ---- a/eng/source-build/build.sh -+++ b/eng/source-build/build.sh -@@ -85,7 +85,7 @@ ReadGlobalVersion Microsoft.DotNet.Arcade.Sdk - export ARCADE_VERSION=$_ReadGlobalVersion - - if [ -z "$DotNetBuildFromSourceFlavor" ] || [ "$DotNetBuildFromSourceFlavor" != "Product" ]; then -- export NUGET_PACKAGES=$scriptroot/../../artifacts/source-build/self/package-cache/ -+ export NUGET_PACKAGES=$scriptroot/../../artifacts/sb/package-cache/ - fi - --"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" $args -+"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/sb/log/source-build.binlog" $args diff --git a/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch b/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch deleted file mode 100644 index 4a351587d..000000000 --- a/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 30 Oct 2023 22:52:31 +0000 -Subject: [PATCH] Allow override of build tool framework version - -Backport: https://github.com/dotnet/aspnetcore/issues/51753 ---- - eng/common/tools.sh | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 17f0a36..343490c 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -312,7 +312,12 @@ function InitializeBuildTool { - # return values - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" - _InitializeBuildToolCommand="msbuild" -- _InitializeBuildToolFramework="netcoreapp3.1" -+ # use override if it exists - commonly set by source-build -+ if [[ -z "${_OverrideArcadeInitializeBuildToolFramework}" ]]; then -+ _InitializeBuildToolFramework="netcoreapp3.1" -+ else -+ _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" -+ fi - } - - # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 From a356166e981231294e2dedb82369b9c7cc9706ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 15:11:09 +0000 Subject: [PATCH 44/81] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231218.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.23615.3 -> To Version 9.0.0-alpha.1.23618.1 --- 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 9295b0217..102003df0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -240,9 +240,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - ad274914920e8e51c5269d215a641e592af8182c + d395d2ec5cd6b107e56f98f8d47db3abf2e58618 From 83eca7203976df3f45b3b28b480ca7befa2caa0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 16:12:40 +0000 Subject: [PATCH 45/81] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231218.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.23615.3 -> To Version 9.0.0-alpha.1.23618.2 --- 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 102003df0..08c1a8cdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -240,9 +240,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - d395d2ec5cd6b107e56f98f8d47db3abf2e58618 + c49c1f4e461b4b57d6d3449671942786bf8fcbb6 From a5fc87496a8c04be2131266ae7da272740000a6e Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 18 Dec 2023 15:44:13 -0500 Subject: [PATCH 46/81] Move build commit to CustomEnvVars, or it's squashed by Docker vs Bash logic --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index e327ce3e0..b07e1540a 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -224,7 +224,7 @@ jobs: df -h # Allows Arcade to have access to the commit for the build - customRunArgs="-e BUILD_SOURCEVERSION" + customEnvVars="BUILD_SOURCEVERSION=$BUILD_SOURCEVERSION" customBuildArgs= if [[ '${{ parameters.runOnline }}' == 'True' ]]; then customBuildArgs='--online' From 4ce220694eee1df9dbd0a848adfb6e6a8c1a03d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 18:48:51 +0100 Subject: [PATCH 47/81] [main] Update dependencies from dotnet/sdk (#18000) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Premek Vysoky --- eng/Version.Details.xml | 112 +++++++++--------- eng/Versions.props | 50 ++++---- ...Set-NETCoreTargetFramework-to-net9.0.patch | 23 ---- 3 files changed, 81 insertions(+), 104 deletions(-) delete mode 100644 src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08c1a8cdb..cc26e798f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 418db4267f07091b065fd5065b24207876bcc89f + 303604bac4454ea8aaa7440c91b9f7884717d92f - + https://github.com/dotnet/windowsdesktop - 418db4267f07091b065fd5065b24207876bcc89f + 303604bac4454ea8aaa7440c91b9f7884717d92f - + https://github.com/dotnet/windowsdesktop - 418db4267f07091b065fd5065b24207876bcc89f + 303604bac4454ea8aaa7440c91b9f7884717d92f - + https://github.com/dotnet/windowsdesktop - 418db4267f07091b065fd5065b24207876bcc89f + 303604bac4454ea8aaa7440c91b9f7884717d92f - + https://github.com/dotnet/runtime - 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e + c282395b63c1757d4f4c1dc2e236680cfe2e7f96 - + https://github.com/dotnet/runtime - 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e + c282395b63c1757d4f4c1dc2e236680cfe2e7f96 - + https://github.com/dotnet/runtime - 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e + c282395b63c1757d4f4c1dc2e236680cfe2e7f96 - + https://github.com/dotnet/runtime - 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e + c282395b63c1757d4f4c1dc2e236680cfe2e7f96 - + https://github.com/dotnet/runtime - 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e + c282395b63c1757d4f4c1dc2e236680cfe2e7f96 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e + c282395b63c1757d4f4c1dc2e236680cfe2e7f96 - + https://github.com/dotnet/aspnetcore - 889b89f6000b60ac6310c152f799e90a3f1ee245 + 640e12221629f0cf5226370bb48064203491e11e - + https://github.com/dotnet/aspnetcore - 889b89f6000b60ac6310c152f799e90a3f1ee245 + 640e12221629f0cf5226370bb48064203491e11e - + https://github.com/dotnet/aspnetcore - 889b89f6000b60ac6310c152f799e90a3f1ee245 + 640e12221629f0cf5226370bb48064203491e11e - + https://github.com/dotnet/aspnetcore - 889b89f6000b60ac6310c152f799e90a3f1ee245 + 640e12221629f0cf5226370bb48064203491e11e - + https://github.com/dotnet/aspnetcore - 889b89f6000b60ac6310c152f799e90a3f1ee245 + 640e12221629f0cf5226370bb48064203491e11e - + https://github.com/dotnet/aspnetcore - 889b89f6000b60ac6310c152f799e90a3f1ee245 + 640e12221629f0cf5226370bb48064203491e11e - + https://github.com/dotnet/aspnetcore - 889b89f6000b60ac6310c152f799e90a3f1ee245 + 640e12221629f0cf5226370bb48064203491e11e - + https://github.com/dotnet/sdk - 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 + 7a23eb71c9afea23d3261eba01368a394329bcd3 - + https://github.com/dotnet/sdk - 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 + 7a23eb71c9afea23d3261eba01368a394329bcd3 - + https://github.com/dotnet/sdk - 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 + 7a23eb71c9afea23d3261eba01368a394329bcd3 - + https://github.com/dotnet/sdk - 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 + 7a23eb71c9afea23d3261eba01368a394329bcd3 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - 338ec5bd57538304c4cf372c4389b7c9c57cbecd + bbfb1383bf849d887b4b7d3e566c745756437fd1 - + https://github.com/dotnet/wpf - 4fc9cd4d737f87b4b0604c80961a32aab47feb0b + f3f1756e8f4808a8e0c3ff56f07aecb1b156e5c2 https://github.com/dotnet/fsharp @@ -146,13 +146,13 @@ 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/dotnet/runtime - 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e + c282395b63c1757d4f4c1dc2e236680cfe2e7f96 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 @@ -169,9 +169,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - e5721f8f058db60052ff7298d1a5acd69347b5db + 13ad0749b943e56246a8c40aea3e58648dfa0996 @@ -179,15 +179,15 @@ 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/deployment-tools - 0d6c22d227b318fb253c967e1ac041b8e68e7e7d + fdef0932d9953ee12367c8dac9ef638b573d4f42 - + https://github.com/dotnet/deployment-tools - 0d6c22d227b318fb253c967e1ac041b8e68e7e7d + fdef0932d9953ee12367c8dac9ef638b573d4f42 diff --git a/eng/Versions.props b/eng/Versions.props index 0b2f1d577..f2b5433af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23616.1 + 9.0.0-alpha.1.23618.1 - 9.0.0-alpha.1.23616.2 + 9.0.0-alpha.1.23618.1 @@ -73,50 +73,50 @@ - 9.0.0-alpha.1.23617.2 - 9.0.0-alpha.1.23617.2 - 9.0.0-alpha.1.23617.2 - 9.0.0-alpha.1.23617.2 - 9.0.0-alpha.1.23617.2 - 9.0.0-alpha.1.23617.2 - 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23618.5 + 9.0.0-alpha.1.23618.5 + 9.0.0-alpha.1.23618.5 + 9.0.0-alpha.1.23618.5 + 9.0.0-alpha.1.23618.5 + 9.0.0-alpha.1.23618.5 + 9.0.0-alpha.1.23618.5 0.2.0 - 9.0.100-alpha.1.23618.1 - 9.0.100-alpha.1.23618.1 - 9.0.100-alpha.1.23618.1 + 9.0.100-alpha.1.23619.2 + 9.0.100-alpha.1.23619.2 + 9.0.100-alpha.1.23619.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23615.7 + 4.9.0-3.23618.7 - 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23618.7 - 9.0.0-alpha.1.23617.4 - 9.0.0-alpha.1.23617.4 - 9.0.0-alpha.1.23617.4 - 9.0.0-alpha.1.23617.4 - 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23618.7 + 9.0.0-alpha.1.23618.7 + 9.0.0-alpha.1.23618.7 + 9.0.0-alpha.1.23618.7 + 9.0.0-alpha.1.23618.7 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23617.1 - 9.0.0-alpha.1.23617.1 - 9.0.0-alpha.1.23617.1 - 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23618.2 + 9.0.0-alpha.1.23618.2 + 9.0.0-alpha.1.23618.2 + 9.0.0-alpha.1.23618.2 @@ -132,7 +132,7 @@ - 2.0.0-preview.1.23601.1 + 2.0.0-preview.1.23612.2 @@ -262,7 +262,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch b/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch deleted file mode 100644 index f0d6531ee..000000000 --- a/src/SourceBuild/patches/templating/0001-Set-NETCoreTargetFramework-to-net9.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Tue, 12 Dec 2023 10:49:01 -0600 -Subject: [PATCH] Set NETCoreTargetFramework to net9.0 - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 6370d08a9..7292506cd 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -5,7 +5,7 @@ - - - preview -- net8.0 -+ net9.0 - netstandard2.0 - net48 - Microsoft .NET Core From 58e5a37be6edeca35d6389fde0c855465c627cbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Dec 2023 20:22:12 +0000 Subject: [PATCH 48/81] Update dependencies from https://github.com/dotnet/arcade-services build 20231219.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.23578.2 -> To Version 1.1.0-beta.23619.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9394fd31e..1b8a767bc 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23578.2", + "version": "1.1.0-beta.23619.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc26e798f..1ff76a80d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -224,13 +224,13 @@ https://github.com/dotnet/arcade 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade-services - 5263b603d90991a0c200aca8b8892c3d7cfe4751 + 57c61af10606819426d205193aa0e9f2f1672050 - + https://github.com/dotnet/arcade-services - 5263b603d90991a0c200aca8b8892c3d7cfe4751 + 57c61af10606819426d205193aa0e9f2f1672050 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index f2b5433af..e5d029721 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.23578.2 + 1.1.0-beta.23619.2 From dac1a0f7869b3fe742b212c1b340e95e26ecfbb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 21:23:52 +0000 Subject: [PATCH 49/81] [main] Update dependencies from dotnet/arcade (#18002) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 16 +++---- eng/Versions.props | 2 +- eng/common/build.cmd | 3 ++ eng/common/templates/steps/publish-logs.yml | 49 +++++++++++---------- global.json | 4 +- 5 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 eng/common/build.cmd diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc26e798f..df1eecba7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 7e95c635fb04fb81595c777ab6f3701474b9da43 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 7e95c635fb04fb81595c777ab6f3701474b9da43 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 7e95c635fb04fb81595c777ab6f3701474b9da43 https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 7e95c635fb04fb81595c777ab6f3701474b9da43 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f2b5433af..7dbd344c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23615.2 + 9.0.0-beta.23619.4 diff --git a/eng/common/build.cmd b/eng/common/build.cmd new file mode 100644 index 000000000..99daf368a --- /dev/null +++ b/eng/common/build.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*" +exit /b %ErrorLevel% diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index dadf1c464..d5e96ed09 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -15,30 +15,31 @@ steps: Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/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 - # 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' - # 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' - -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' - '$(publishing-dnceng-devdiv-code-r-build-re)' - '$(MaestroAccessToken)' - '$(dn-bot-all-orgs-artifact-feeds-rw)' - '$(akams-client-id)' - '$(akams-client-secret)' - '$(microsoft-symbol-server-pat)' - '$(symweb-symbol-server-pat)' - '$(dn-bot-all-orgs-build-rw-code-rw)' - ${{parameters.CustomSensitiveDataList}} - continueOnError: true - condition: always() - + +# TODO: Disabled - https://github.com/dotnet/dnceng/issues/1675 +# - task: PowerShell@2 +# displayName: Redact Logs +# inputs: +# filePath: $(Build.SourcesDirectory)/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' +# # 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' +# -BinlogToolVersion ${{parameters.BinlogToolVersion}} +# -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' +# '$(publishing-dnceng-devdiv-code-r-build-re)' +# '$(MaestroAccessToken)' +# '$(dn-bot-all-orgs-artifact-feeds-rw)' +# '$(akams-client-id)' +# '$(akams-client-secret)' +# '$(microsoft-symbol-server-pat)' +# '$(symweb-symbol-server-pat)' +# '$(dn-bot-all-orgs-build-rw-code-rw)' +# ${{parameters.CustomSensitiveDataList}} +# continueOnError: true +# condition: always() + - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: diff --git a/global.json b/global.json index 88f595d05..7390e41a3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23615.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23619.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23619.4" } } From 81177d715906006961ff34ca62d0e5baab05f9e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 06:00:59 +0100 Subject: [PATCH 50/81] [main] Update dependencies from dotnet/sdk (#18003) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df1eecba7..5a638fcfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime c282395b63c1757d4f4c1dc2e236680cfe2e7f96 - + https://github.com/dotnet/aspnetcore - 640e12221629f0cf5226370bb48064203491e11e + 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c - + https://github.com/dotnet/aspnetcore - 640e12221629f0cf5226370bb48064203491e11e + 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c - + https://github.com/dotnet/aspnetcore - 640e12221629f0cf5226370bb48064203491e11e + 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c - + https://github.com/dotnet/aspnetcore - 640e12221629f0cf5226370bb48064203491e11e + 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c - + https://github.com/dotnet/aspnetcore - 640e12221629f0cf5226370bb48064203491e11e + 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c - + https://github.com/dotnet/aspnetcore - 640e12221629f0cf5226370bb48064203491e11e + 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c - + https://github.com/dotnet/aspnetcore - 640e12221629f0cf5226370bb48064203491e11e + 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c - + https://github.com/dotnet/sdk - 7a23eb71c9afea23d3261eba01368a394329bcd3 + f0ea4553fa84b1dcd61594cb45c70bd461d3588a - + https://github.com/dotnet/sdk - 7a23eb71c9afea23d3261eba01368a394329bcd3 + f0ea4553fa84b1dcd61594cb45c70bd461d3588a - + https://github.com/dotnet/sdk - 7a23eb71c9afea23d3261eba01368a394329bcd3 + f0ea4553fa84b1dcd61594cb45c70bd461d3588a - + https://github.com/dotnet/sdk - 7a23eb71c9afea23d3261eba01368a394329bcd3 + f0ea4553fa84b1dcd61594cb45c70bd461d3588a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7dbd344c5..a9793fa7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23618.5 - 9.0.0-alpha.1.23618.5 - 9.0.0-alpha.1.23618.5 - 9.0.0-alpha.1.23618.5 - 9.0.0-alpha.1.23618.5 - 9.0.0-alpha.1.23618.5 - 9.0.0-alpha.1.23618.5 + 9.0.0-alpha.1.23619.4 + 9.0.0-alpha.1.23619.4 + 9.0.0-alpha.1.23619.4 + 9.0.0-alpha.1.23619.4 + 9.0.0-alpha.1.23619.4 + 9.0.0-alpha.1.23619.4 + 9.0.0-alpha.1.23619.4 0.2.0 - 9.0.100-alpha.1.23619.2 - 9.0.100-alpha.1.23619.2 - 9.0.100-alpha.1.23619.2 + 9.0.100-alpha.1.23619.4 + 9.0.100-alpha.1.23619.4 + 9.0.100-alpha.1.23619.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d730bb539bd28a0963222dd43d50d21f520908d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 07:55:07 +0000 Subject: [PATCH 51/81] [main] Update dependencies from dotnet/sdk (#18006) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91de59204..7d1246eee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 303604bac4454ea8aaa7440c91b9f7884717d92f + 5a03532e727957d135370ee3ed6f01dbf5a46b69 - + https://github.com/dotnet/windowsdesktop - 303604bac4454ea8aaa7440c91b9f7884717d92f + 5a03532e727957d135370ee3ed6f01dbf5a46b69 - + https://github.com/dotnet/windowsdesktop - 303604bac4454ea8aaa7440c91b9f7884717d92f + 5a03532e727957d135370ee3ed6f01dbf5a46b69 - + https://github.com/dotnet/windowsdesktop - 303604bac4454ea8aaa7440c91b9f7884717d92f + 5a03532e727957d135370ee3ed6f01dbf5a46b69 https://github.com/dotnet/runtime @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime c282395b63c1757d4f4c1dc2e236680cfe2e7f96 - + https://github.com/dotnet/aspnetcore - 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c + 496e975d0996c5ad53e374ce3ef74840fa8555c7 - + https://github.com/dotnet/aspnetcore - 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c + 496e975d0996c5ad53e374ce3ef74840fa8555c7 - + https://github.com/dotnet/aspnetcore - 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c + 496e975d0996c5ad53e374ce3ef74840fa8555c7 - + https://github.com/dotnet/aspnetcore - 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c + 496e975d0996c5ad53e374ce3ef74840fa8555c7 - + https://github.com/dotnet/aspnetcore - 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c + 496e975d0996c5ad53e374ce3ef74840fa8555c7 - + https://github.com/dotnet/aspnetcore - 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c + 496e975d0996c5ad53e374ce3ef74840fa8555c7 - + https://github.com/dotnet/aspnetcore - 78f5db43b267ec6cb446f2b57b3cf6fb60e5804c + 496e975d0996c5ad53e374ce3ef74840fa8555c7 - + https://github.com/dotnet/sdk - f0ea4553fa84b1dcd61594cb45c70bd461d3588a + 891c2d332a05848c8c73d39520850110c01b584e - + https://github.com/dotnet/sdk - f0ea4553fa84b1dcd61594cb45c70bd461d3588a + 891c2d332a05848c8c73d39520850110c01b584e - + https://github.com/dotnet/sdk - f0ea4553fa84b1dcd61594cb45c70bd461d3588a + 891c2d332a05848c8c73d39520850110c01b584e - + https://github.com/dotnet/sdk - f0ea4553fa84b1dcd61594cb45c70bd461d3588a + 891c2d332a05848c8c73d39520850110c01b584e https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - bbfb1383bf849d887b4b7d3e566c745756437fd1 + bd7cd69c5d8c4522aa4ae510a83e8784050c36f7 - + https://github.com/dotnet/wpf - f3f1756e8f4808a8e0c3ff56f07aecb1b156e5c2 + 964689acf5948e5f6677085655efad6120246014 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 53b0f3c36..a5a69d2cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23618.1 + 9.0.0-alpha.1.23618.7 - 9.0.0-alpha.1.23618.1 + 9.0.0-alpha.1.23619.1 @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23619.4 - 9.0.0-alpha.1.23619.4 - 9.0.0-alpha.1.23619.4 - 9.0.0-alpha.1.23619.4 - 9.0.0-alpha.1.23619.4 - 9.0.0-alpha.1.23619.4 - 9.0.0-alpha.1.23619.4 + 9.0.0-alpha.1.23619.10 + 9.0.0-alpha.1.23619.10 + 9.0.0-alpha.1.23619.10 + 9.0.0-alpha.1.23619.10 + 9.0.0-alpha.1.23619.10 + 9.0.0-alpha.1.23619.10 + 9.0.0-alpha.1.23619.10 0.2.0 - 9.0.100-alpha.1.23619.4 - 9.0.100-alpha.1.23619.4 - 9.0.100-alpha.1.23619.4 + 9.0.100-alpha.1.23619.6 + 9.0.100-alpha.1.23619.6 + 9.0.100-alpha.1.23619.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,10 +113,10 @@ - 9.0.0-alpha.1.23618.2 - 9.0.0-alpha.1.23618.2 - 9.0.0-alpha.1.23618.2 - 9.0.0-alpha.1.23618.2 + 9.0.0-alpha.1.23619.3 + 9.0.0-alpha.1.23619.3 + 9.0.0-alpha.1.23619.3 + 9.0.0-alpha.1.23619.3 From b5770dd0315a5a48d7bd5c8526739817187978c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 13:28:17 +0000 Subject: [PATCH 52/81] [main] Update dependencies from dotnet/sdk (#18008) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++--------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d1246eee..b457c3b1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 5a03532e727957d135370ee3ed6f01dbf5a46b69 - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + 6f4f268d0b46fa5dbcee46b7220919defb148127 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/aspnetcore - 496e975d0996c5ad53e374ce3ef74840fa8555c7 + 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e - + https://github.com/dotnet/aspnetcore - 496e975d0996c5ad53e374ce3ef74840fa8555c7 + 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e - + https://github.com/dotnet/aspnetcore - 496e975d0996c5ad53e374ce3ef74840fa8555c7 + 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e - + https://github.com/dotnet/aspnetcore - 496e975d0996c5ad53e374ce3ef74840fa8555c7 + 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e - + https://github.com/dotnet/aspnetcore - 496e975d0996c5ad53e374ce3ef74840fa8555c7 + 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e - + https://github.com/dotnet/aspnetcore - 496e975d0996c5ad53e374ce3ef74840fa8555c7 + 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e - + https://github.com/dotnet/aspnetcore - 496e975d0996c5ad53e374ce3ef74840fa8555c7 + 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e - + https://github.com/dotnet/sdk - 891c2d332a05848c8c73d39520850110c01b584e + 27be622f6e257aa9314e9eebc06e802cadf227c5 - + https://github.com/dotnet/sdk - 891c2d332a05848c8c73d39520850110c01b584e + 27be622f6e257aa9314e9eebc06e802cadf227c5 - + https://github.com/dotnet/sdk - 891c2d332a05848c8c73d39520850110c01b584e + 27be622f6e257aa9314e9eebc06e802cadf227c5 - + https://github.com/dotnet/sdk - 891c2d332a05848c8c73d39520850110c01b584e + 27be622f6e257aa9314e9eebc06e802cadf227c5 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://github.com/dotnet/wpf 964689acf5948e5f6677085655efad6120246014 - + https://github.com/dotnet/fsharp - 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 + 0c489541068f311e23b582410c1df3ff86f1d526 - + https://github.com/dotnet/fsharp - 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 + 0c489541068f311e23b582410c1df3ff86f1d526 @@ -146,13 +146,13 @@ 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/dotnet/runtime - c282395b63c1757d4f4c1dc2e236680cfe2e7f96 + 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc diff --git a/eng/Versions.props b/eng/Versions.props index a5a69d2cf..3324049f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,41 +73,41 @@ - 9.0.0-alpha.1.23619.10 - 9.0.0-alpha.1.23619.10 - 9.0.0-alpha.1.23619.10 - 9.0.0-alpha.1.23619.10 - 9.0.0-alpha.1.23619.10 - 9.0.0-alpha.1.23619.10 - 9.0.0-alpha.1.23619.10 + 9.0.0-alpha.1.23619.11 + 9.0.0-alpha.1.23619.11 + 9.0.0-alpha.1.23619.11 + 9.0.0-alpha.1.23619.11 + 9.0.0-alpha.1.23619.11 + 9.0.0-alpha.1.23619.11 + 9.0.0-alpha.1.23619.11 0.2.0 - 9.0.100-alpha.1.23619.6 - 9.0.100-alpha.1.23619.6 - 9.0.100-alpha.1.23619.6 + 9.0.100-alpha.1.23620.4 + 9.0.100-alpha.1.23620.4 + 9.0.100-alpha.1.23620.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23618.7 + 4.9.0-3.23619.3 - 9.0.0-alpha.1.23618.7 + 9.0.0-alpha.1.23619.7 - 9.0.0-alpha.1.23618.7 - 9.0.0-alpha.1.23618.7 - 9.0.0-alpha.1.23618.7 - 9.0.0-alpha.1.23618.7 - 9.0.0-alpha.1.23618.7 + 9.0.0-alpha.1.23619.7 + 9.0.0-alpha.1.23619.7 + 9.0.0-alpha.1.23619.7 + 9.0.0-alpha.1.23619.7 + 9.0.0-alpha.1.23619.7 8.0.0-rc.1.23414.4 2.1.0 From 7d927ab09a7a060ad3e1d27c97fbc07744f548c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:40:44 +0000 Subject: [PATCH 53/81] [main] Update dependencies from dotnet/arcade (#18010) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b457c3b1f..b201bd128 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 7e95c635fb04fb81595c777ab6f3701474b9da43 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 7e95c635fb04fb81595c777ab6f3701474b9da43 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 7e95c635fb04fb81595c777ab6f3701474b9da43 + 17dff488fa9de3f27edf2e42516d06d538ed3625 https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 57c61af10606819426d205193aa0e9f2f1672050 - + https://github.com/dotnet/arcade - 7e95c635fb04fb81595c777ab6f3701474b9da43 + 17dff488fa9de3f27edf2e42516d06d538ed3625 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3324049f8..06da00b2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23619.4 + 9.0.0-beta.23620.1 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0b0153135..01c0dd995 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 3b25fd979..d9c5b4aaf 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Build Assets diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d64236b28..bbc010fe7 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -267,7 +267,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index 7390e41a3..1a05fbcac 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23619.4", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23619.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23620.1" } } From 655ebf13d9dadb68e990b5ee55284ea6da45da31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Dec 2023 19:36:48 +0000 Subject: [PATCH 54/81] Update dependencies from https://github.com/dotnet/sdk build 20231220.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23620.4 -> To Version 9.0.100-alpha.1.23620.5 Dependency coherency updates NuGet.Build.Tasks From Version 6.9.0-preview.1.64 -> To Version 6.9.0-preview.1.65 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b201bd128..ae97921cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e - + https://github.com/dotnet/sdk - 27be622f6e257aa9314e9eebc06e802cadf227c5 + 68a50d88d26bcc7157019000e9f97a6f3cd4aec4 - + https://github.com/dotnet/sdk - 27be622f6e257aa9314e9eebc06e802cadf227c5 + 68a50d88d26bcc7157019000e9f97a6f3cd4aec4 - + https://github.com/dotnet/sdk - 27be622f6e257aa9314e9eebc06e802cadf227c5 + 68a50d88d26bcc7157019000e9f97a6f3cd4aec4 - + https://github.com/dotnet/sdk - 27be622f6e257aa9314e9eebc06e802cadf227c5 + 68a50d88d26bcc7157019000e9f97a6f3cd4aec4 https://github.com/dotnet/test-templates @@ -160,9 +160,9 @@ abc2f4620f6749289cafeed7c9a9a80eaeb38e28 - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d diff --git a/eng/Versions.props b/eng/Versions.props index 06da00b2a..50d15462f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23620.4 - 9.0.100-alpha.1.23620.4 - 9.0.100-alpha.1.23620.4 + 9.0.100-alpha.1.23620.5 + 9.0.100-alpha.1.23620.5 + 9.0.100-alpha.1.23620.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -128,7 +128,7 @@ - 6.9.0-preview.1.64 + 6.9.0-preview.1.65 From 8a97050d39d32522f566af381a55f840ee2a0105 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Dec 2023 20:36:17 +0000 Subject: [PATCH 55/81] Update dependencies from https://github.com/dotnet/sdk build 20231220.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23620.4 -> To Version 9.0.100-alpha.1.23620.7 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build,NuGet.Build.Tasks From Version 9.0.0-alpha.1.23619.11 -> To Version 9.0.0-alpha.1.23620.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae97921cd..a8c458146 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/aspnetcore - 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e + 887b62ea6bc47873074f7216fe51dab353811707 - + https://github.com/dotnet/aspnetcore - 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e + 887b62ea6bc47873074f7216fe51dab353811707 - + https://github.com/dotnet/aspnetcore - 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e + 887b62ea6bc47873074f7216fe51dab353811707 - + https://github.com/dotnet/aspnetcore - 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e + 887b62ea6bc47873074f7216fe51dab353811707 - + https://github.com/dotnet/aspnetcore - 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e + 887b62ea6bc47873074f7216fe51dab353811707 - + https://github.com/dotnet/aspnetcore - 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e + 887b62ea6bc47873074f7216fe51dab353811707 - + https://github.com/dotnet/aspnetcore - 16bf80b26105fc955c7a51b32ab76b44c5ed8f9e + 887b62ea6bc47873074f7216fe51dab353811707 - + https://github.com/dotnet/sdk - 68a50d88d26bcc7157019000e9f97a6f3cd4aec4 + 50ccc948eb082d316158b709301b28c5e7f60c01 - + https://github.com/dotnet/sdk - 68a50d88d26bcc7157019000e9f97a6f3cd4aec4 + 50ccc948eb082d316158b709301b28c5e7f60c01 - + https://github.com/dotnet/sdk - 68a50d88d26bcc7157019000e9f97a6f3cd4aec4 + 50ccc948eb082d316158b709301b28c5e7f60c01 - + https://github.com/dotnet/sdk - 68a50d88d26bcc7157019000e9f97a6f3cd4aec4 + 50ccc948eb082d316158b709301b28c5e7f60c01 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 0caa9d162683c44645ccc6e1645ce4a01acfd8dc - + https://github.com/dotnet/msbuild - abc2f4620f6749289cafeed7c9a9a80eaeb38e28 + 5cf78584f998e524374758c5798b7054bf2595e9 diff --git a/eng/Versions.props b/eng/Versions.props index 50d15462f..7b9555102 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23619.11 - 9.0.0-alpha.1.23619.11 - 9.0.0-alpha.1.23619.11 - 9.0.0-alpha.1.23619.11 - 9.0.0-alpha.1.23619.11 - 9.0.0-alpha.1.23619.11 - 9.0.0-alpha.1.23619.11 + 9.0.0-alpha.1.23620.1 + 9.0.0-alpha.1.23620.1 + 9.0.0-alpha.1.23620.1 + 9.0.0-alpha.1.23620.1 + 9.0.0-alpha.1.23620.1 + 9.0.0-alpha.1.23620.1 + 9.0.0-alpha.1.23620.1 0.2.0 - 9.0.100-alpha.1.23620.5 - 9.0.100-alpha.1.23620.5 - 9.0.100-alpha.1.23620.5 + 9.0.100-alpha.1.23620.7 + 9.0.100-alpha.1.23620.7 + 9.0.100-alpha.1.23620.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7cf353c773605779465e100556014b8e2776a168 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 03:27:19 +0000 Subject: [PATCH 56/81] Update dependencies from https://github.com/dotnet/sdk build 20231220.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23620.7 -> To Version 9.0.100-alpha.1.23620.8 --- 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 a8c458146..605432231 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 887b62ea6bc47873074f7216fe51dab353811707 - + https://github.com/dotnet/sdk - 50ccc948eb082d316158b709301b28c5e7f60c01 + 037085ada14b71281cf79d252e8dfba2859c4968 - + https://github.com/dotnet/sdk - 50ccc948eb082d316158b709301b28c5e7f60c01 + 037085ada14b71281cf79d252e8dfba2859c4968 - + https://github.com/dotnet/sdk - 50ccc948eb082d316158b709301b28c5e7f60c01 + 037085ada14b71281cf79d252e8dfba2859c4968 - + https://github.com/dotnet/sdk - 50ccc948eb082d316158b709301b28c5e7f60c01 + 037085ada14b71281cf79d252e8dfba2859c4968 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7b9555102..1cf20a136 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23620.7 - 9.0.100-alpha.1.23620.7 - 9.0.100-alpha.1.23620.7 + 9.0.100-alpha.1.23620.8 + 9.0.100-alpha.1.23620.8 + 9.0.100-alpha.1.23620.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cd0947563e7ae5f1de3bf1ebdc59abdc94a6470e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 05:15:58 +0000 Subject: [PATCH 57/81] Update dependencies from https://github.com/dotnet/sdk build 20231220.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23620.8 -> To Version 9.0.100-alpha.1.23620.10 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 9.0.0-alpha.1.23620.1 -> To Version 9.0.0-alpha.1.23620.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 605432231..1ae326af3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/aspnetcore - 887b62ea6bc47873074f7216fe51dab353811707 + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 887b62ea6bc47873074f7216fe51dab353811707 + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 887b62ea6bc47873074f7216fe51dab353811707 + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 887b62ea6bc47873074f7216fe51dab353811707 + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 887b62ea6bc47873074f7216fe51dab353811707 + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 887b62ea6bc47873074f7216fe51dab353811707 + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/aspnetcore - 887b62ea6bc47873074f7216fe51dab353811707 + 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 037085ada14b71281cf79d252e8dfba2859c4968 + a3ea16aa44c593c8ec082b4ec83736b96c15ad55 - + https://github.com/dotnet/sdk - 037085ada14b71281cf79d252e8dfba2859c4968 + a3ea16aa44c593c8ec082b4ec83736b96c15ad55 - + https://github.com/dotnet/sdk - 037085ada14b71281cf79d252e8dfba2859c4968 + a3ea16aa44c593c8ec082b4ec83736b96c15ad55 - + https://github.com/dotnet/sdk - 037085ada14b71281cf79d252e8dfba2859c4968 + a3ea16aa44c593c8ec082b4ec83736b96c15ad55 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1cf20a136..69a988e74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23620.1 - 9.0.0-alpha.1.23620.1 - 9.0.0-alpha.1.23620.1 - 9.0.0-alpha.1.23620.1 - 9.0.0-alpha.1.23620.1 - 9.0.0-alpha.1.23620.1 - 9.0.0-alpha.1.23620.1 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 + 9.0.0-alpha.1.23620.2 0.2.0 - 9.0.100-alpha.1.23620.8 - 9.0.100-alpha.1.23620.8 - 9.0.100-alpha.1.23620.8 + 9.0.100-alpha.1.23620.10 + 9.0.100-alpha.1.23620.10 + 9.0.100-alpha.1.23620.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e5bc3ab951170c197166351ce071d243a0edf3cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 10:21:46 +0000 Subject: [PATCH 58/81] Update dependencies from https://github.com/dotnet/sdk build 20231221.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23620.10 -> To Version 9.0.100-alpha.1.23621.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23619.3 -> To Version 4.9.0-3.23620.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ae326af3..6225c393b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - a3ea16aa44c593c8ec082b4ec83736b96c15ad55 + 723a1732c1a8c654c1a8e471d3ad105c63f1d9fe - + https://github.com/dotnet/sdk - a3ea16aa44c593c8ec082b4ec83736b96c15ad55 + 723a1732c1a8c654c1a8e471d3ad105c63f1d9fe - + https://github.com/dotnet/sdk - a3ea16aa44c593c8ec082b4ec83736b96c15ad55 + 723a1732c1a8c654c1a8e471d3ad105c63f1d9fe - + https://github.com/dotnet/sdk - a3ea16aa44c593c8ec082b4ec83736b96c15ad55 + 723a1732c1a8c654c1a8e471d3ad105c63f1d9fe https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://github.com/dotnet/runtime 6f4f268d0b46fa5dbcee46b7220919defb148127 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 diff --git a/eng/Versions.props b/eng/Versions.props index 69a988e74..4341239fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,16 +86,16 @@ - 9.0.100-alpha.1.23620.10 - 9.0.100-alpha.1.23620.10 - 9.0.100-alpha.1.23620.10 + 9.0.100-alpha.1.23621.1 + 9.0.100-alpha.1.23621.1 + 9.0.100-alpha.1.23621.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23619.3 + 4.9.0-3.23620.1 From cb960a175f675db30469f5c6888457a56f607fe2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 11:26:00 +0000 Subject: [PATCH 59/81] Update dependencies from https://github.com/dotnet/sdk build 20231221.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23620.10 -> To Version 9.0.100-alpha.1.23621.2 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23619.3 -> To Version 4.9.0-3.23620.1 (parent: Microsoft.NET.Sdk --- 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 6225c393b..93f506798 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 723a1732c1a8c654c1a8e471d3ad105c63f1d9fe + 96f5217929d017d10551ad1f8d923aa95c796064 - + https://github.com/dotnet/sdk - 723a1732c1a8c654c1a8e471d3ad105c63f1d9fe + 96f5217929d017d10551ad1f8d923aa95c796064 - + https://github.com/dotnet/sdk - 723a1732c1a8c654c1a8e471d3ad105c63f1d9fe + 96f5217929d017d10551ad1f8d923aa95c796064 - + https://github.com/dotnet/sdk - 723a1732c1a8c654c1a8e471d3ad105c63f1d9fe + 96f5217929d017d10551ad1f8d923aa95c796064 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4341239fc..c0db832f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23621.1 - 9.0.100-alpha.1.23621.1 - 9.0.100-alpha.1.23621.1 + 9.0.100-alpha.1.23621.2 + 9.0.100-alpha.1.23621.2 + 9.0.100-alpha.1.23621.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 811a520bcfc087188a6998d655b2b9f4513f3981 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 13:29:14 +0000 Subject: [PATCH 60/81] Update dependencies from https://github.com/dotnet/arcade build 20231220.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23620.1 -> To Version 9.0.0-beta.23620.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- .../templates/post-build/common-variables.yml | 2 +- eng/common/templates/steps/publish-logs.yml | 2 +- global.json | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ae326af3..4e9caf6f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 57c61af10606819426d205193aa0e9f2f1672050 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 69a988e74..957e1c648 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23620.1 + 9.0.0-beta.23620.7 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 4ef7bd271..d7bf5c6e3 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -18,7 +18,7 @@ variables: - name: SymbolToolVersion value: 1.0.1 - name: BinlogToolVersion - value: 1.0.8 + value: 1.0.9 - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index d5e96ed09..de8f2d6a2 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -3,7 +3,7 @@ parameters: JobLabel: '' CustomSensitiveDataList: '' # A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed - BinlogToolVersion: '1.0.8' + BinlogToolVersion: '1.0.9' steps: - task: Powershell@2 diff --git a/global.json b/global.json index 1a05fbcac..70a8945a8 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23620.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.7", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23620.7" } } From 51a9f21ff20f5970c88b88d95609eb03890beb60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 21:57:32 +0000 Subject: [PATCH 61/81] Update dependencies from https://github.com/dotnet/sdk build 20231221.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23620.10 -> To Version 9.0.100-alpha.1.23621.4 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-alpha.1.23619.7 -> To Version 9.0.0-alpha.1.23621.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93f506798..c98fa89fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 5a03532e727957d135370ee3ed6f01dbf5a46b69 - + https://github.com/dotnet/runtime - 6f4f268d0b46fa5dbcee46b7220919defb148127 + 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 - + https://github.com/dotnet/runtime - 6f4f268d0b46fa5dbcee46b7220919defb148127 + 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 - + https://github.com/dotnet/runtime - 6f4f268d0b46fa5dbcee46b7220919defb148127 + 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 - + https://github.com/dotnet/runtime - 6f4f268d0b46fa5dbcee46b7220919defb148127 + 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 - + https://github.com/dotnet/runtime - 6f4f268d0b46fa5dbcee46b7220919defb148127 + 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6f4f268d0b46fa5dbcee46b7220919defb148127 + 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 96f5217929d017d10551ad1f8d923aa95c796064 + b81a00ccfb5fcbfc90b810107f08e8a30febf86a - + https://github.com/dotnet/sdk - 96f5217929d017d10551ad1f8d923aa95c796064 + b81a00ccfb5fcbfc90b810107f08e8a30febf86a - + https://github.com/dotnet/sdk - 96f5217929d017d10551ad1f8d923aa95c796064 + b81a00ccfb5fcbfc90b810107f08e8a30febf86a - + https://github.com/dotnet/sdk - 96f5217929d017d10551ad1f8d923aa95c796064 + b81a00ccfb5fcbfc90b810107f08e8a30febf86a https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/dotnet/runtime - 6f4f268d0b46fa5dbcee46b7220919defb148127 + 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index c0db832f2..30f314682 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23621.2 - 9.0.100-alpha.1.23621.2 - 9.0.100-alpha.1.23621.2 + 9.0.100-alpha.1.23621.4 + 9.0.100-alpha.1.23621.4 + 9.0.100-alpha.1.23621.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,15 +99,15 @@ - 9.0.0-alpha.1.23619.7 + 9.0.0-alpha.1.23621.3 - 9.0.0-alpha.1.23619.7 - 9.0.0-alpha.1.23619.7 - 9.0.0-alpha.1.23619.7 - 9.0.0-alpha.1.23619.7 - 9.0.0-alpha.1.23619.7 + 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.3 8.0.0-rc.1.23414.4 2.1.0 From 6949c0b0866a68d61d642ef10f326881d3a7aec2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 06:22:08 +0000 Subject: [PATCH 62/81] Update dependencies from https://github.com/dotnet/sdk build 20231221.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23621.4 -> To Version 9.0.100-alpha.1.23621.6 Dependency coherency updates Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 17.9.0-preview-23614-02 -> To Version 17.9.0-release-23619-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2276620a5..15f1c08e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - b81a00ccfb5fcbfc90b810107f08e8a30febf86a + b829be3d17e0427c8f26ed2fbf9c2b73426f9c54 - + https://github.com/dotnet/sdk - b81a00ccfb5fcbfc90b810107f08e8a30febf86a + b829be3d17e0427c8f26ed2fbf9c2b73426f9c54 - + https://github.com/dotnet/sdk - b81a00ccfb5fcbfc90b810107f08e8a30febf86a + b829be3d17e0427c8f26ed2fbf9c2b73426f9c54 - + https://github.com/dotnet/sdk - b81a00ccfb5fcbfc90b810107f08e8a30febf86a + b829be3d17e0427c8f26ed2fbf9c2b73426f9c54 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 0c489541068f311e23b582410c1df3ff86f1d526 - + https://github.com/microsoft/vstest - 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 + f33b3e4ec550c48607057bf051574c048d3ef7b6 @@ -160,9 +160,9 @@ 5cf78584f998e524374758c5798b7054bf2595e9 - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca diff --git a/eng/Versions.props b/eng/Versions.props index c6e5779f8..854e98491 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23621.4 - 9.0.100-alpha.1.23621.4 - 9.0.100-alpha.1.23621.4 + 9.0.100-alpha.1.23621.6 + 9.0.100-alpha.1.23621.6 + 9.0.100-alpha.1.23621.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -128,7 +128,7 @@ - 6.9.0-preview.1.65 + 6.9.0-preview.1.67 @@ -246,7 +246,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23614-02 + 17.9.0-release-23619-01 8.0.0-alpha.1.22557.12 9.0.0-preview.23613.1 From 6d02926f9285cd6a046bcfe9fda5ac458e69dba1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 09:12:07 +0000 Subject: [PATCH 63/81] Update dependencies from https://github.com/dotnet/sdk build 20231222.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23621.6 -> To Version 9.0.100-alpha.1.23622.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-alpha.1.23621.3 -> To Version 9.0.0-alpha.1.23621.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15f1c08e5..e7ab55a05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 5a03532e727957d135370ee3ed6f01dbf5a46b69 - + https://github.com/dotnet/runtime - 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 + 0cf461b302f58c7add3f6dc405873fb2212b513f - + https://github.com/dotnet/runtime - 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 + 0cf461b302f58c7add3f6dc405873fb2212b513f - + https://github.com/dotnet/runtime - 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 + 0cf461b302f58c7add3f6dc405873fb2212b513f - + https://github.com/dotnet/runtime - 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 + 0cf461b302f58c7add3f6dc405873fb2212b513f - + https://github.com/dotnet/runtime - 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 + 0cf461b302f58c7add3f6dc405873fb2212b513f @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 + 0cf461b302f58c7add3f6dc405873fb2212b513f https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - b829be3d17e0427c8f26ed2fbf9c2b73426f9c54 + 78778758b50a6e1fb865b65e22285647ab050bb3 - + https://github.com/dotnet/sdk - b829be3d17e0427c8f26ed2fbf9c2b73426f9c54 + 78778758b50a6e1fb865b65e22285647ab050bb3 - + https://github.com/dotnet/sdk - b829be3d17e0427c8f26ed2fbf9c2b73426f9c54 + 78778758b50a6e1fb865b65e22285647ab050bb3 - + https://github.com/dotnet/sdk - b829be3d17e0427c8f26ed2fbf9c2b73426f9c54 + 78778758b50a6e1fb865b65e22285647ab050bb3 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ f33b3e4ec550c48607057bf051574c048d3ef7b6 - + https://github.com/dotnet/runtime - 817b4ee1f0c6add28bafd5ddcdcd74edf43b81f9 + 0cf461b302f58c7add3f6dc405873fb2212b513f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 854e98491..fcf858977 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23621.6 - 9.0.100-alpha.1.23621.6 - 9.0.100-alpha.1.23621.6 + 9.0.100-alpha.1.23622.2 + 9.0.100-alpha.1.23622.2 + 9.0.100-alpha.1.23622.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,15 +99,15 @@ - 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.6 - 9.0.0-alpha.1.23621.3 - 9.0.0-alpha.1.23621.3 - 9.0.0-alpha.1.23621.3 - 9.0.0-alpha.1.23621.3 - 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.6 + 9.0.0-alpha.1.23621.6 + 9.0.0-alpha.1.23621.6 + 9.0.0-alpha.1.23621.6 + 9.0.0-alpha.1.23621.6 8.0.0-rc.1.23414.4 2.1.0 From 8562761580a57e27268f0b9bf6b6e9657f6e0398 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 10:14:06 +0000 Subject: [PATCH 64/81] Update dependencies from https://github.com/dotnet/sdk build 20231222.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23621.6 -> To Version 9.0.100-alpha.1.23622.3 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-alpha.1.23621.3 -> To Version 9.0.0-alpha.1.23621.6 (parent: Microsoft.NET.Sdk --- 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 e7ab55a05..e31901744 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 78778758b50a6e1fb865b65e22285647ab050bb3 + 3fecc234e3f81d76f884a1bdebb98fd418195211 - + https://github.com/dotnet/sdk - 78778758b50a6e1fb865b65e22285647ab050bb3 + 3fecc234e3f81d76f884a1bdebb98fd418195211 - + https://github.com/dotnet/sdk - 78778758b50a6e1fb865b65e22285647ab050bb3 + 3fecc234e3f81d76f884a1bdebb98fd418195211 - + https://github.com/dotnet/sdk - 78778758b50a6e1fb865b65e22285647ab050bb3 + 3fecc234e3f81d76f884a1bdebb98fd418195211 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index fcf858977..22db05335 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23622.2 - 9.0.100-alpha.1.23622.2 - 9.0.100-alpha.1.23622.2 + 9.0.100-alpha.1.23622.3 + 9.0.100-alpha.1.23622.3 + 9.0.100-alpha.1.23622.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef6e3ed28218d3131b58a407970c539869fc880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 22 Dec 2023 11:39:07 +0100 Subject: [PATCH 65/81] Move VMR component list into `Components.md` (#18023) Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- .../templates/steps/vmr-pull-updates.yml | 2 +- eng/vmr-sync.sh | 14 +++++++------- .../content/README.md} | 6 +----- src/VirtualMonoRepo/Component.template.md | 15 +++++++++++++++ src/VirtualMonoRepo/InitializeVMR.proj | 2 +- .../Tasks/VirtualMonoRepo_Initialize.cs | 4 ++-- 9 files changed, 33 insertions(+), 22 deletions(-) rename src/{VirtualMonoRepo/README.template.md => SourceBuild/content/README.md} (99%) create mode 100644 src/VirtualMonoRepo/Component.template.md diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1b8a767bc..b8aebb8b0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23619.2", + "version": "1.1.0-beta.23621.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15f1c08e5..9c8c61496 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -224,13 +224,13 @@ https://github.com/dotnet/arcade c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade-services - 57c61af10606819426d205193aa0e9f2f1672050 + 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade-services - 57c61af10606819426d205193aa0e9f2f1672050 + 702f946f89ace6197fdca2ac309d32187c4bc1bd https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 854e98491..667cc2151 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.23619.2 + 1.1.0-beta.23621.3 diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index 3d2fdf3cd..dfa2ded71 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -58,7 +58,7 @@ steps: --repository "installer:${{ parameters.targetRef }}" --recursive --remote "installer:$(pwd)" - --readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md + --component-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/Component.template.md --tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt --debug || diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index a9f902180..bd453f87c 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -33,10 +33,10 @@ ### --debug ### Optional. Turns on the most verbose logging for the VMR tooling ### -### --readme-template -### Optional. Template for VMRs README.md used for regenerating the file to list the newest versions of +### --component-template +### Optional. Template for VMRs Component.md used for regenerating the file to list the newest versions of ### components. -### Defaults to src/VirtualMonoRepo/README.template.md +### Defaults to src/VirtualMonoRepo/Component.template.md ### ### --recursive ### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml) @@ -104,7 +104,7 @@ repository='' additional_remotes='' recursive=false verbosity=verbose -readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md" +readme_template="$installer_dir/src/VirtualMonoRepo/Component.template.md" tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt" azdev_pat='' @@ -139,8 +139,8 @@ while [[ $# -gt 0 ]]; do additional_remotes="$additional_remotes $2" shift ;; - --readme-template) - readme_template=$2 + --component-template) + component_template=$2 shift ;; --tpn-template) @@ -268,7 +268,7 @@ fi --$verbosity \ $recursive_arg \ $additional_remotes \ - --readme-template "$readme_template" \ + --component-template "$component_template" \ --tpn-template "$tpn_template" \ --discard-patches \ "$repository" diff --git a/src/VirtualMonoRepo/README.template.md b/src/SourceBuild/content/README.md similarity index 99% rename from src/VirtualMonoRepo/README.template.md rename to src/SourceBuild/content/README.md index 7bc080a3c..a1d3d73d6 100644 --- a/src/VirtualMonoRepo/README.template.md +++ b/src/SourceBuild/content/README.md @@ -160,11 +160,7 @@ To enable full offline source-building of the VMR, we have no other choice than ### Detailed list - - -> Auto-generated list of components will go here - - +The full list of components synchronized into the VMR is [here (Components.md)](./Components.md). The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. diff --git a/src/VirtualMonoRepo/Component.template.md b/src/VirtualMonoRepo/Component.template.md new file mode 100644 index 000000000..27b0f7893 --- /dev/null +++ b/src/VirtualMonoRepo/Component.template.md @@ -0,0 +1,15 @@ +# List of components + +To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: +- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) +- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) + +## Detailed list + + + +> Auto-generated list of components will go here + + + +The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 09ab72b1c..e3d98fc3c 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -58,7 +58,7 @@ VmrPath="$(VmrDir)" TmpPath="$(TmpDir)" InstallerPath="$(RepoRoot)" - ReadmeTemplatePath="$(MSBuildThisFileDirectory)/README.template.md" + ComponentTemplatePath="$(MSBuildThisFileDirectory)/Component.template.md" TpnTemplatePath="$(MSBuildThisFileDirectory)/THIRD-PARTY-NOTICES.template.txt" SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" /> diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index 2a8c1d726..5ab294231 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -42,7 +42,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask public string InstallerPath { get; set; } - public string ReadmeTemplatePath { get; set; } + public string ComponentTemplatePath { get; set; } public string TpnTemplatePath { get; set; } @@ -72,7 +72,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask Recursive, new NativePath(SourceMappingsPath), additionalRemotes, - ReadmeTemplatePath, + ComponentTemplatePath, TpnTemplatePath, generateCodeowners: false, discardPatches: true, From eb6a7f839df0848d9746477912e2b3037b0a5bf9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 11:18:41 +0000 Subject: [PATCH 66/81] Update dependencies from https://github.com/dotnet/sdk build 20231222.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23621.6 -> To Version 9.0.100-alpha.1.23622.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-alpha.1.23619.3 -> To Version 9.0.0-alpha.1.23621.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e31901744..a00cb2eb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 5a03532e727957d135370ee3ed6f01dbf5a46b69 + 0c87134966f310d40776b06102f3d45bd8888ce3 - + https://github.com/dotnet/windowsdesktop - 5a03532e727957d135370ee3ed6f01dbf5a46b69 + 0c87134966f310d40776b06102f3d45bd8888ce3 - + https://github.com/dotnet/windowsdesktop - 5a03532e727957d135370ee3ed6f01dbf5a46b69 + 0c87134966f310d40776b06102f3d45bd8888ce3 - + https://github.com/dotnet/windowsdesktop - 5a03532e727957d135370ee3ed6f01dbf5a46b69 + 0c87134966f310d40776b06102f3d45bd8888ce3 https://github.com/dotnet/runtime @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 3fecc234e3f81d76f884a1bdebb98fd418195211 + 7839bf263034d9e7c2cfbcc705023e6b421eb4aa - + https://github.com/dotnet/sdk - 3fecc234e3f81d76f884a1bdebb98fd418195211 + 7839bf263034d9e7c2cfbcc705023e6b421eb4aa - + https://github.com/dotnet/sdk - 3fecc234e3f81d76f884a1bdebb98fd418195211 + 7839bf263034d9e7c2cfbcc705023e6b421eb4aa - + https://github.com/dotnet/sdk - 3fecc234e3f81d76f884a1bdebb98fd418195211 + 7839bf263034d9e7c2cfbcc705023e6b421eb4aa https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - bd7cd69c5d8c4522aa4ae510a83e8784050c36f7 + 4634f59f403b731d8ff9932a6b5bc0243ec3db6a - + https://github.com/dotnet/wpf - 964689acf5948e5f6677085655efad6120246014 + bf7816fb217c5ee580048d31ef27b0c0185e956f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 22db05335..658bdba75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23618.7 + 9.0.0-alpha.1.23620.3 - 9.0.0-alpha.1.23619.1 + 9.0.0-alpha.1.23621.2 @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23622.3 - 9.0.100-alpha.1.23622.3 - 9.0.100-alpha.1.23622.3 + 9.0.100-alpha.1.23622.4 + 9.0.100-alpha.1.23622.4 + 9.0.100-alpha.1.23622.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,10 +113,10 @@ - 9.0.0-alpha.1.23619.3 - 9.0.0-alpha.1.23619.3 - 9.0.0-alpha.1.23619.3 - 9.0.0-alpha.1.23619.3 + 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23621.3 From 850978114b9df2eea67e5fc91ece7202af72ca25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 13:27:22 +0000 Subject: [PATCH 67/81] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23620.7 -> To Version 9.0.0-beta.23621.2 --- eng/Version.Details.xml | 16 +++---- eng/Versions.props | 2 +- eng/common/templates/steps/publish-logs.yml | 49 ++++++++++----------- global.json | 4 +- 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c8c61496..99e053618 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 667cc2151..651cb3369 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23620.7 + 9.0.0-beta.23621.2 diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index de8f2d6a2..835e52751 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -15,31 +15,30 @@ steps: Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - -# TODO: Disabled - https://github.com/dotnet/dnceng/issues/1675 -# - task: PowerShell@2 -# displayName: Redact Logs -# inputs: -# filePath: $(Build.SourcesDirectory)/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' -# # 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' -# -BinlogToolVersion ${{parameters.BinlogToolVersion}} -# -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' -# '$(publishing-dnceng-devdiv-code-r-build-re)' -# '$(MaestroAccessToken)' -# '$(dn-bot-all-orgs-artifact-feeds-rw)' -# '$(akams-client-id)' -# '$(akams-client-secret)' -# '$(microsoft-symbol-server-pat)' -# '$(symweb-symbol-server-pat)' -# '$(dn-bot-all-orgs-build-rw-code-rw)' -# ${{parameters.CustomSensitiveDataList}} -# continueOnError: true -# condition: always() - + +- task: PowerShell@2 + displayName: Redact Logs + inputs: + filePath: $(Build.SourcesDirectory)/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' + # 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' + -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + '$(publishing-dnceng-devdiv-code-r-build-re)' + '$(MaestroAccessToken)' + '$(dn-bot-all-orgs-artifact-feeds-rw)' + '$(akams-client-id)' + '$(akams-client-secret)' + '$(microsoft-symbol-server-pat)' + '$(symweb-symbol-server-pat)' + '$(dn-bot-all-orgs-build-rw-code-rw)' + ${{parameters.CustomSensitiveDataList}} + continueOnError: true + condition: always() + - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: diff --git a/global.json b/global.json index 70a8945a8..875330ea6 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.7", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23620.7" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23621.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23621.2" } } From cbb53c78011c473c57a73eddee5866ae98c028c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Dec 2023 13:23:15 +0000 Subject: [PATCH 68/81] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23620.7 -> To Version 9.0.0-beta.23621.2 From 76561e636142e29faa0f85a81e562067a0437b43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Dec 2023 13:23:25 +0000 Subject: [PATCH 69/81] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23620.7 -> To Version 9.0.0-beta.23621.2 From ee664a15d5110aa8257a9ee4ef0d8a3afb86c662 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Dec 2023 03:24:28 +0000 Subject: [PATCH 70/81] Update dependencies from https://github.com/dotnet/sdk build 20231224.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23622.4 -> To Version 9.0.100-alpha.1.23624.2 --- 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 5d9b101c2..5d2037142 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 7839bf263034d9e7c2cfbcc705023e6b421eb4aa + 6000a14f4500eb89039065d32945b3cd2cf389ca - + https://github.com/dotnet/sdk - 7839bf263034d9e7c2cfbcc705023e6b421eb4aa + 6000a14f4500eb89039065d32945b3cd2cf389ca - + https://github.com/dotnet/sdk - 7839bf263034d9e7c2cfbcc705023e6b421eb4aa + 6000a14f4500eb89039065d32945b3cd2cf389ca - + https://github.com/dotnet/sdk - 7839bf263034d9e7c2cfbcc705023e6b421eb4aa + 6000a14f4500eb89039065d32945b3cd2cf389ca https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b886c9221..5817c48ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23622.4 - 9.0.100-alpha.1.23622.4 - 9.0.100-alpha.1.23622.4 + 9.0.100-alpha.1.23624.2 + 9.0.100-alpha.1.23624.2 + 9.0.100-alpha.1.23624.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed39929f596ff6010d82b5be02514cbfc91bab0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Dec 2023 06:28:08 +0000 Subject: [PATCH 71/81] Update dependencies from https://github.com/dotnet/sdk build 20231224.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23624.2 -> To Version 9.0.100-alpha.1.23624.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset From Version 9.0.0-alpha.1.23621.3 -> To Version 9.0.0-alpha.1.23624.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d2037142..1049668ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 0c87134966f310d40776b06102f3d45bd8888ce3 + b8d5bec82d5727fed822263cd47a68496181a83c - + https://github.com/dotnet/windowsdesktop - 0c87134966f310d40776b06102f3d45bd8888ce3 + b8d5bec82d5727fed822263cd47a68496181a83c - + https://github.com/dotnet/windowsdesktop - 0c87134966f310d40776b06102f3d45bd8888ce3 + b8d5bec82d5727fed822263cd47a68496181a83c - + https://github.com/dotnet/windowsdesktop - 0c87134966f310d40776b06102f3d45bd8888ce3 + b8d5bec82d5727fed822263cd47a68496181a83c https://github.com/dotnet/runtime @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 6000a14f4500eb89039065d32945b3cd2cf389ca + 6609842b540723fb379b4a8b3bb53f8223641874 - + https://github.com/dotnet/sdk - 6000a14f4500eb89039065d32945b3cd2cf389ca + 6609842b540723fb379b4a8b3bb53f8223641874 - + https://github.com/dotnet/sdk - 6000a14f4500eb89039065d32945b3cd2cf389ca + 6609842b540723fb379b4a8b3bb53f8223641874 - + https://github.com/dotnet/sdk - 6000a14f4500eb89039065d32945b3cd2cf389ca + 6609842b540723fb379b4a8b3bb53f8223641874 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - 4634f59f403b731d8ff9932a6b5bc0243ec3db6a + cbaa2aaa96867c11f1513283ae2490d6d2618ad5 - + https://github.com/dotnet/wpf - bf7816fb217c5ee580048d31ef27b0c0185e956f + 8f2b77336aede34fa86f32eb90337ab11253d194 https://github.com/dotnet/fsharp @@ -150,9 +150,9 @@ https://github.com/dotnet/runtime 0cf461b302f58c7add3f6dc405873fb2212b513f - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d diff --git a/eng/Versions.props b/eng/Versions.props index 5817c48ca..6d101d04f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23620.3 + 9.0.0-alpha.1.23623.1 - 9.0.0-alpha.1.23621.2 + 9.0.0-alpha.1.23623.1 @@ -86,16 +86,16 @@ - 9.0.100-alpha.1.23624.2 - 9.0.100-alpha.1.23624.2 - 9.0.100-alpha.1.23624.2 + 9.0.100-alpha.1.23624.4 + 9.0.100-alpha.1.23624.4 + 9.0.100-alpha.1.23624.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23620.1 + 4.9.0-3.23621.4 @@ -113,10 +113,10 @@ - 9.0.0-alpha.1.23621.3 - 9.0.0-alpha.1.23621.3 - 9.0.0-alpha.1.23621.3 - 9.0.0-alpha.1.23621.3 + 9.0.0-alpha.1.23624.1 + 9.0.0-alpha.1.23624.1 + 9.0.0-alpha.1.23624.1 + 9.0.0-alpha.1.23624.1 From 6b6b6fa6c5d8c4690ed9142564bcc6c8f3673de9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Dec 2023 08:17:50 +0000 Subject: [PATCH 72/81] Update dependencies from https://github.com/dotnet/sdk build 20231224.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23624.4 -> To Version 9.0.100-alpha.1.23624.5 --- 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 1049668ae..200f21b8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 6609842b540723fb379b4a8b3bb53f8223641874 + 908178072f9e1f32de0fdb1fad1a3565a1e286af - + https://github.com/dotnet/sdk - 6609842b540723fb379b4a8b3bb53f8223641874 + 908178072f9e1f32de0fdb1fad1a3565a1e286af - + https://github.com/dotnet/sdk - 6609842b540723fb379b4a8b3bb53f8223641874 + 908178072f9e1f32de0fdb1fad1a3565a1e286af - + https://github.com/dotnet/sdk - 6609842b540723fb379b4a8b3bb53f8223641874 + 908178072f9e1f32de0fdb1fad1a3565a1e286af https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6d101d04f..e542f71d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23624.4 - 9.0.100-alpha.1.23624.4 - 9.0.100-alpha.1.23624.4 + 9.0.100-alpha.1.23624.5 + 9.0.100-alpha.1.23624.5 + 9.0.100-alpha.1.23624.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14ca45bf4924d6b55e64f27df8b66454c9b53e22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Dec 2023 15:47:45 +0000 Subject: [PATCH 73/81] Update dependencies from https://github.com/dotnet/sdk build 20231226.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23624.5 -> To Version 9.0.100-alpha.1.23626.1 --- 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 200f21b8d..61c855ac1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 908178072f9e1f32de0fdb1fad1a3565a1e286af + e4a856613c2703335cbc13a65391efee03a9a2b9 - + https://github.com/dotnet/sdk - 908178072f9e1f32de0fdb1fad1a3565a1e286af + e4a856613c2703335cbc13a65391efee03a9a2b9 - + https://github.com/dotnet/sdk - 908178072f9e1f32de0fdb1fad1a3565a1e286af + e4a856613c2703335cbc13a65391efee03a9a2b9 - + https://github.com/dotnet/sdk - 908178072f9e1f32de0fdb1fad1a3565a1e286af + e4a856613c2703335cbc13a65391efee03a9a2b9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e542f71d9..da1880cf2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23624.5 - 9.0.100-alpha.1.23624.5 - 9.0.100-alpha.1.23624.5 + 9.0.100-alpha.1.23626.1 + 9.0.100-alpha.1.23626.1 + 9.0.100-alpha.1.23626.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cfe0f1b73c0c9c53e3d901bbeedafa3cf8001fdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Dec 2023 06:46:33 +0000 Subject: [PATCH 74/81] Update dependencies from https://github.com/dotnet/sdk build 20231226.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23626.1 -> To Version 9.0.100-alpha.1.23626.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-alpha.1.23624.1 -> To Version 9.0.0-alpha.1.23626.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61c855ac1..bc209d1d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - b8d5bec82d5727fed822263cd47a68496181a83c + 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a - + https://github.com/dotnet/windowsdesktop - b8d5bec82d5727fed822263cd47a68496181a83c + 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a - + https://github.com/dotnet/windowsdesktop - b8d5bec82d5727fed822263cd47a68496181a83c + 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a - + https://github.com/dotnet/windowsdesktop - b8d5bec82d5727fed822263cd47a68496181a83c + 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a https://github.com/dotnet/runtime @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - e4a856613c2703335cbc13a65391efee03a9a2b9 + f3d5b83ae009622d6388801ed3a17ffd327e4b46 - + https://github.com/dotnet/sdk - e4a856613c2703335cbc13a65391efee03a9a2b9 + f3d5b83ae009622d6388801ed3a17ffd327e4b46 - + https://github.com/dotnet/sdk - e4a856613c2703335cbc13a65391efee03a9a2b9 + f3d5b83ae009622d6388801ed3a17ffd327e4b46 - + https://github.com/dotnet/sdk - e4a856613c2703335cbc13a65391efee03a9a2b9 + f3d5b83ae009622d6388801ed3a17ffd327e4b46 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - cbaa2aaa96867c11f1513283ae2490d6d2618ad5 + 9e2fc95fca4e6d18444c819b35bb1338ac6ca63d - + https://github.com/dotnet/wpf - 8f2b77336aede34fa86f32eb90337ab11253d194 + 137b671131455a5c252a297747725ddce5a21c63 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index da1880cf2..e9557106d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23623.1 + 9.0.0-alpha.1.23625.1 - 9.0.0-alpha.1.23623.1 + 9.0.0-alpha.1.23625.1 @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23626.1 - 9.0.100-alpha.1.23626.1 - 9.0.100-alpha.1.23626.1 + 9.0.100-alpha.1.23626.2 + 9.0.100-alpha.1.23626.2 + 9.0.100-alpha.1.23626.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,10 +113,10 @@ - 9.0.0-alpha.1.23624.1 - 9.0.0-alpha.1.23624.1 - 9.0.0-alpha.1.23624.1 - 9.0.0-alpha.1.23624.1 + 9.0.0-alpha.1.23626.1 + 9.0.0-alpha.1.23626.1 + 9.0.0-alpha.1.23626.1 + 9.0.0-alpha.1.23626.1 From 2766df19e76976e8e1fd2ef08cd26f3b2285e692 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Dec 2023 09:02:00 +0000 Subject: [PATCH 75/81] Update dependencies from https://github.com/dotnet/sdk build 20231227.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23626.2 -> To Version 9.0.100-alpha.1.23627.1 --- 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 bc209d1d9..1a905c54f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - f3d5b83ae009622d6388801ed3a17ffd327e4b46 + e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4 - + https://github.com/dotnet/sdk - f3d5b83ae009622d6388801ed3a17ffd327e4b46 + e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4 - + https://github.com/dotnet/sdk - f3d5b83ae009622d6388801ed3a17ffd327e4b46 + e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4 - + https://github.com/dotnet/sdk - f3d5b83ae009622d6388801ed3a17ffd327e4b46 + e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e9557106d..fbf69cb83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23626.2 - 9.0.100-alpha.1.23626.2 - 9.0.100-alpha.1.23626.2 + 9.0.100-alpha.1.23627.1 + 9.0.100-alpha.1.23627.1 + 9.0.100-alpha.1.23627.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 608f9fa8888f118188925c5640463b4d77fa8239 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Dec 2023 10:31:26 +0000 Subject: [PATCH 76/81] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231227.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.23618.2 -> To Version 9.0.0-alpha.1.23627.1 --- 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 1a905c54f..a4b2451af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -240,9 +240,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - c49c1f4e461b4b57d6d3449671942786bf8fcbb6 + 1128936069bc2703b1e873e598b8d27dde995fb9 From 2a7a8ac01cf4ad54d5813a483cc9ccc9b9730c77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Dec 2023 11:31:56 +0000 Subject: [PATCH 77/81] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231227.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.23618.2 -> To Version 9.0.0-alpha.1.23627.2 --- 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 a4b2451af..ae0d7b4ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -240,9 +240,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 1128936069bc2703b1e873e598b8d27dde995fb9 + 2a008ae4f42c0db384db5a4864752b2ff52d720b From c395d461745fcd9b5376c0a1a98c1648cffb59cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 06:56:53 +0000 Subject: [PATCH 78/81] Update dependencies from https://github.com/dotnet/sdk build 20231227.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23627.1 -> To Version 9.0.100-alpha.1.23627.2 Dependency coherency updates NuGet.Build.Tasks From Version 6.9.0-preview.1.67 -> To Version 6.9.0-preview.1.69 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae0d7b4ed..9c6739be4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4 + 54616c2c5b34707b80da9789dfe1cf63b695d19b - + https://github.com/dotnet/sdk - e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4 + 54616c2c5b34707b80da9789dfe1cf63b695d19b - + https://github.com/dotnet/sdk - e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4 + 54616c2c5b34707b80da9789dfe1cf63b695d19b - + https://github.com/dotnet/sdk - e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4 + 54616c2c5b34707b80da9789dfe1cf63b695d19b https://github.com/dotnet/test-templates @@ -160,9 +160,9 @@ 5cf78584f998e524374758c5798b7054bf2595e9 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 diff --git a/eng/Versions.props b/eng/Versions.props index fbf69cb83..2934a39c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23627.1 - 9.0.100-alpha.1.23627.1 - 9.0.100-alpha.1.23627.1 + 9.0.100-alpha.1.23627.2 + 9.0.100-alpha.1.23627.2 + 9.0.100-alpha.1.23627.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -128,7 +128,7 @@ - 6.9.0-preview.1.67 + 6.9.0-preview.1.69 From c15c7b47c78237a42649b84229af7387a4079cfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 07:57:33 +0000 Subject: [PATCH 79/81] Update dependencies from https://github.com/dotnet/sdk build 20231227.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23627.1 -> To Version 9.0.100-alpha.1.23627.3 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 9.0.0-alpha.1.23621.6 -> To Version 9.0.0-alpha.1.23627.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c6739be4..dbea4f5d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a - + https://github.com/dotnet/runtime - 0cf461b302f58c7add3f6dc405873fb2212b513f + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/runtime - 0cf461b302f58c7add3f6dc405873fb2212b513f + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/runtime - 0cf461b302f58c7add3f6dc405873fb2212b513f + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/runtime - 0cf461b302f58c7add3f6dc405873fb2212b513f + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/runtime - 0cf461b302f58c7add3f6dc405873fb2212b513f + 8121f82d7d46118eef03a99eecbde64d8021cec7 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0cf461b302f58c7add3f6dc405873fb2212b513f + 8121f82d7d46118eef03a99eecbde64d8021cec7 https://github.com/dotnet/aspnetcore @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 54616c2c5b34707b80da9789dfe1cf63b695d19b + 20610aa14f6f313894bd9292386447209cc7025c - + https://github.com/dotnet/sdk - 54616c2c5b34707b80da9789dfe1cf63b695d19b + 20610aa14f6f313894bd9292386447209cc7025c - + https://github.com/dotnet/sdk - 54616c2c5b34707b80da9789dfe1cf63b695d19b + 20610aa14f6f313894bd9292386447209cc7025c - + https://github.com/dotnet/sdk - 54616c2c5b34707b80da9789dfe1cf63b695d19b + 20610aa14f6f313894bd9292386447209cc7025c https://github.com/dotnet/test-templates @@ -146,13 +146,13 @@ f33b3e4ec550c48607057bf051574c048d3ef7b6 - + https://github.com/dotnet/runtime - 0cf461b302f58c7add3f6dc405873fb2212b513f + 8121f82d7d46118eef03a99eecbde64d8021cec7 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 diff --git a/eng/Versions.props b/eng/Versions.props index 2934a39c7..c7d8ad360 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,28 +86,28 @@ - 9.0.100-alpha.1.23627.2 - 9.0.100-alpha.1.23627.2 - 9.0.100-alpha.1.23627.2 + 9.0.100-alpha.1.23627.3 + 9.0.100-alpha.1.23627.3 + 9.0.100-alpha.1.23627.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23621.4 + 4.9.0-3.23627.3 - 9.0.0-alpha.1.23621.6 + 9.0.0-alpha.1.23627.5 - 9.0.0-alpha.1.23621.6 - 9.0.0-alpha.1.23621.6 - 9.0.0-alpha.1.23621.6 - 9.0.0-alpha.1.23621.6 - 9.0.0-alpha.1.23621.6 + 9.0.0-alpha.1.23627.5 + 9.0.0-alpha.1.23627.5 + 9.0.0-alpha.1.23627.5 + 9.0.0-alpha.1.23627.5 + 9.0.0-alpha.1.23627.5 8.0.0-rc.1.23414.4 2.1.0 From 0dc87be76f4de3c35285551642e115bc1c28ae18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 10:56:42 +0000 Subject: [PATCH 80/81] Update dependencies from https://github.com/dotnet/sdk build 20231228.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23627.3 -> To Version 9.0.100-alpha.1.23628.2 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-23619-02 -> To Version 17.10.0-preview-23621-05 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbea4f5d1..0ef1973b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 20610aa14f6f313894bd9292386447209cc7025c + 1c0404394bc925ceb9bf8596165145ae30e947ad - + https://github.com/dotnet/sdk - 20610aa14f6f313894bd9292386447209cc7025c + 1c0404394bc925ceb9bf8596165145ae30e947ad - + https://github.com/dotnet/sdk - 20610aa14f6f313894bd9292386447209cc7025c + 1c0404394bc925ceb9bf8596165145ae30e947ad - + https://github.com/dotnet/sdk - 20610aa14f6f313894bd9292386447209cc7025c + 1c0404394bc925ceb9bf8596165145ae30e947ad https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 - + https://github.com/dotnet/msbuild - 5cf78584f998e524374758c5798b7054bf2595e9 + b59f07e4312eb6e3e33e59241453606c81992738 diff --git a/eng/Versions.props b/eng/Versions.props index c7d8ad360..0835f7eb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23627.3 - 9.0.100-alpha.1.23627.3 - 9.0.100-alpha.1.23627.3 + 9.0.100-alpha.1.23628.2 + 9.0.100-alpha.1.23628.2 + 9.0.100-alpha.1.23628.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 592a6596cd32a899d33f56025d55554a589ed094 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Dec 2023 02:44:08 +0000 Subject: [PATCH 81/81] Update dependencies from https://github.com/dotnet/sdk build 20231228.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23628.2 -> To Version 9.0.100-alpha.1.23628.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-alpha.1.23626.1 -> To Version 9.0.0-alpha.1.23628.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ef1973b7..d34e02c84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a + 8663076a95e5b989687dad0f5002ea2c72432a4e - + https://github.com/dotnet/windowsdesktop - 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a + 8663076a95e5b989687dad0f5002ea2c72432a4e - + https://github.com/dotnet/windowsdesktop - 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a + 8663076a95e5b989687dad0f5002ea2c72432a4e - + https://github.com/dotnet/windowsdesktop - 6ae150796983c8d5bb33e3e3cde3ef7d3056c67a + 8663076a95e5b989687dad0f5002ea2c72432a4e https://github.com/dotnet/runtime @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 4b7810723c27d47cc982055c6615cccf664e2980 - + https://github.com/dotnet/sdk - 1c0404394bc925ceb9bf8596165145ae30e947ad + 76a69c35c0218803b3b341761879e6ff9ed82760 - + https://github.com/dotnet/sdk - 1c0404394bc925ceb9bf8596165145ae30e947ad + 76a69c35c0218803b3b341761879e6ff9ed82760 - + https://github.com/dotnet/sdk - 1c0404394bc925ceb9bf8596165145ae30e947ad + 76a69c35c0218803b3b341761879e6ff9ed82760 - + https://github.com/dotnet/sdk - 1c0404394bc925ceb9bf8596165145ae30e947ad + 76a69c35c0218803b3b341761879e6ff9ed82760 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - 9e2fc95fca4e6d18444c819b35bb1338ac6ca63d + 6ab0ff669b846809efac9a24ceb568a3afde5fb4 - + https://github.com/dotnet/wpf - 137b671131455a5c252a297747725ddce5a21c63 + 322a1a7312613bf0ac357adc94ca9efb14409b1e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0835f7eb7..b3a1d53ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23625.1 + 9.0.0-alpha.1.23627.2 - 9.0.0-alpha.1.23625.1 + 9.0.0-alpha.1.23627.1 @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23628.2 - 9.0.100-alpha.1.23628.2 - 9.0.100-alpha.1.23628.2 + 9.0.100-alpha.1.23628.5 + 9.0.100-alpha.1.23628.5 + 9.0.100-alpha.1.23628.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,10 +113,10 @@ - 9.0.0-alpha.1.23626.1 - 9.0.0-alpha.1.23626.1 - 9.0.0-alpha.1.23626.1 - 9.0.0-alpha.1.23626.1 + 9.0.0-alpha.1.23628.1 + 9.0.0-alpha.1.23628.1 + 9.0.0-alpha.1.23628.1 + 9.0.0-alpha.1.23628.1