From a9c508b4f93bdab5092eb2ffb98d589cc2b239ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 18:29:07 -0700 Subject: [PATCH 1/5] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16208) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Mitchell --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- eng/docker/debian/Dockerfile | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 624cc4eca..0b7bafbbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 6ebcfecd33a61cd37680688dc85ced3c1830222b + 05cbe1cf82d18e86184e0bd80c461417964b2d4d - + https://github.com/dotnet/sdk - 6ebcfecd33a61cd37680688dc85ced3c1830222b + 05cbe1cf82d18e86184e0bd80c461417964b2d4d - + https://github.com/dotnet/sdk - 6ebcfecd33a61cd37680688dc85ced3c1830222b + 05cbe1cf82d18e86184e0bd80c461417964b2d4d - + https://github.com/dotnet/sdk - 6ebcfecd33a61cd37680688dc85ced3c1830222b + 05cbe1cf82d18e86184e0bd80c461417964b2d4d @@ -149,18 +149,18 @@ ef625f3b960594fcb3f902af88ad7c90df656516 - + https://github.com/dotnet/msbuild - ac3f5ad89f3f04d080986607d504a838ed622fb9 + b3ac0807c112a969cc52f1104fafce6a42e7920b - + https://github.com/dotnet/msbuild - ac3f5ad89f3f04d080986607d504a838ed622fb9 + b3ac0807c112a969cc52f1104fafce6a42e7920b - + https://github.com/nuget/nuget.client - 63edda646848553467639abe6bbade5ebc5dec61 + 87ce6f59e9cf4f5a32d7ba16f537b6b791d9fcc6 diff --git a/eng/Versions.props b/eng/Versions.props index 524ca997c..922ee56e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23222.7 - 7.0.400-preview.23222.7 - 7.0.400-preview.23222.7 + 7.0.400-preview.23224.13 + 7.0.400-preview.23224.13 + 7.0.400-preview.23224.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile index ebafe9adb..224fbb4da 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 # Install the deb packaging toolchain we need to build debs RUN apt-get update \ From 1ad17130f750a9b0863aa69d0d583fcdfe3b3b6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Apr 2023 03:26:10 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/sdk build 20230424.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23224.13 -> To Version 7.0.400-preview.23224.18 --- 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 0b7bafbbc..0bea15077 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 05cbe1cf82d18e86184e0bd80c461417964b2d4d + f29c124bcd452e765515d4178e09ca9a5d06148a - + https://github.com/dotnet/sdk - 05cbe1cf82d18e86184e0bd80c461417964b2d4d + f29c124bcd452e765515d4178e09ca9a5d06148a - + https://github.com/dotnet/sdk - 05cbe1cf82d18e86184e0bd80c461417964b2d4d + f29c124bcd452e765515d4178e09ca9a5d06148a - + https://github.com/dotnet/sdk - 05cbe1cf82d18e86184e0bd80c461417964b2d4d + f29c124bcd452e765515d4178e09ca9a5d06148a diff --git a/eng/Versions.props b/eng/Versions.props index 922ee56e0..574729f58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23224.13 - 7.0.400-preview.23224.13 - 7.0.400-preview.23224.13 + 7.0.400-preview.23224.18 + 7.0.400-preview.23224.18 + 7.0.400-preview.23224.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eec16ff6f160b9d301469c17e5355b0a848c9904 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Apr 2023 06:51:42 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/sdk build 20230424.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23224.13 -> To Version 7.0.400-preview.23224.22 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.2 (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 0bea15077..f4e981586 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - f29c124bcd452e765515d4178e09ca9a5d06148a + ed81d2caa424c18e75ced741b7266c909504f17e - + https://github.com/dotnet/sdk - f29c124bcd452e765515d4178e09ca9a5d06148a + ed81d2caa424c18e75ced741b7266c909504f17e - + https://github.com/dotnet/sdk - f29c124bcd452e765515d4178e09ca9a5d06148a + ed81d2caa424c18e75ced741b7266c909504f17e - + https://github.com/dotnet/sdk - f29c124bcd452e765515d4178e09ca9a5d06148a + ed81d2caa424c18e75ced741b7266c909504f17e @@ -133,9 +133,9 @@ 858e2df9631a385cbddef62eeb424f9b3071b031 - + https://github.com/microsoft/vstest - 21bc097b123d4d51cab3fcef12529c5c23e632be + 8d72b10a875dc3cd06695ffe9d7112fe48d62fbb @@ -149,13 +149,13 @@ ef625f3b960594fcb3f902af88ad7c90df656516 - + https://github.com/dotnet/msbuild - b3ac0807c112a969cc52f1104fafce6a42e7920b + c6e6cd447ac3944b351247d995f32b4d2010d409 - + https://github.com/dotnet/msbuild - b3ac0807c112a969cc52f1104fafce6a42e7920b + c6e6cd447ac3944b351247d995f32b4d2010d409 diff --git a/eng/Versions.props b/eng/Versions.props index 574729f58..e682b60a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23224.18 - 7.0.400-preview.23224.18 - 7.0.400-preview.23224.18 + 7.0.400-preview.23224.22 + 7.0.400-preview.23224.22 + 7.0.400-preview.23224.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23220.1 + 17.7.0-preview.23224.2 From 316f1132942e96a9330d8f17d0c45a0b2cd8ba66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Apr 2023 10:57:44 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/sdk build 20230425.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23224.13 -> To Version 7.0.400-preview.23225.1 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.2 (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 f4e981586..c2f84df5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - ed81d2caa424c18e75ced741b7266c909504f17e + 41faba98207541a52a5564ef4b93ca429651a813 - + https://github.com/dotnet/sdk - ed81d2caa424c18e75ced741b7266c909504f17e + 41faba98207541a52a5564ef4b93ca429651a813 - + https://github.com/dotnet/sdk - ed81d2caa424c18e75ced741b7266c909504f17e + 41faba98207541a52a5564ef4b93ca429651a813 - + https://github.com/dotnet/sdk - ed81d2caa424c18e75ced741b7266c909504f17e + 41faba98207541a52a5564ef4b93ca429651a813 @@ -149,13 +149,13 @@ ef625f3b960594fcb3f902af88ad7c90df656516 - + https://github.com/dotnet/msbuild - c6e6cd447ac3944b351247d995f32b4d2010d409 + 6300d22b25cc1bcb634663bd7087e31d8312bb15 - + https://github.com/dotnet/msbuild - c6e6cd447ac3944b351247d995f32b4d2010d409 + 6300d22b25cc1bcb634663bd7087e31d8312bb15 diff --git a/eng/Versions.props b/eng/Versions.props index e682b60a2..1fdcd4cd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23224.22 - 7.0.400-preview.23224.22 - 7.0.400-preview.23224.22 + 7.0.400-preview.23225.1 + 7.0.400-preview.23225.1 + 7.0.400-preview.23225.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5cf2af21840a6104e203cc23df9286058d6f41eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Apr 2023 20:36:39 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/sdk build 20230425.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23224.13 -> To Version 7.0.400-preview.23225.10 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.2 (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 c2f84df5e..954b97cac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 41faba98207541a52a5564ef4b93ca429651a813 + cebca2d9cd8e56f9c63e027cf6b497ff3f8e8e2c - + https://github.com/dotnet/sdk - 41faba98207541a52a5564ef4b93ca429651a813 + cebca2d9cd8e56f9c63e027cf6b497ff3f8e8e2c - + https://github.com/dotnet/sdk - 41faba98207541a52a5564ef4b93ca429651a813 + cebca2d9cd8e56f9c63e027cf6b497ff3f8e8e2c - + https://github.com/dotnet/sdk - 41faba98207541a52a5564ef4b93ca429651a813 + cebca2d9cd8e56f9c63e027cf6b497ff3f8e8e2c diff --git a/eng/Versions.props b/eng/Versions.props index 1fdcd4cd4..600efa3ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23225.1 - 7.0.400-preview.23225.1 - 7.0.400-preview.23225.1 + 7.0.400-preview.23225.10 + 7.0.400-preview.23225.10 + 7.0.400-preview.23225.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)