From 48b005c37a3df4f4e0d62b95e8d589e4f590651e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:41:28 +0000 Subject: [PATCH] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17695) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23520.10 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23520.10 to 8.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23520.14 to 8.0.0-rtm.23531.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23531.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.0-beta.23523.2 to 12.8.0-beta.23579.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23523.2 to 8.0.200-beta.23579.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23519-02 to 17.9.0-preview-23580-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.9.0-1.23520.1 to 4.9.0-2.23562.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.9.0-preview-23523-01 to 17.9.0-preview-23601-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.9.0-preview.1.17 to 6.9.0-preview.1.45 (parent: Microsoft.NET.Sdk) - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Remove 8.0.100 feed from 8.0.200 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Fix the emsdk coherency and rerun the dependency update for the SKD build - Updating the dotnet new output to match current behavior Teams message sent to confirm if this is correct - Fix emsdk Dependency --- NuGet.config | 2 + eng/Version.Details.xml | 174 +++++++++++++++-------------- eng/Versions.props | 54 ++++----- test/EndToEnd/ProjectBuildTests.cs | 2 +- 4 files changed, 119 insertions(+), 113 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fcb5685f..94ab32f7a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b0cffeb..98034b438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ 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 - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca https://github.com/dotnet/test-templates @@ -124,53 +124,57 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - - https://github.com/dotnet/winforms - abda8e3bfa78319363526b5a5f86863ec979940e + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e4ede9b8979b9d2b1b1d4383f30a791414f0625b - - https://github.com/dotnet/wpf - 0d629281c49061636a8a161bae6fceedd37acff7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 507114e990861aec5444df54de1dc77bfe26a310 + a0396b1cade0e705abd16526f5f165a9894c055d - + https://github.com/dotnet/fsharp - 507114e990861aec5444df54de1dc77bfe26a310 + a0396b1cade0e705abd16526f5f165a9894c055d - + https://github.com/microsoft/vstest - fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 + d6dc5a0343fec142369c744466be1d1fc52fecdb - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/msbuild - 08494c73128451a3f7cfb47a5e9cbd63f5507a1f + 67916dc4592efb2a0bec902aa1a77105859ee245 - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + 707c46e558b2b027d7ae942028c369e26545f10a https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 1b7f3a6560f6fb5f32b2758603c0376037f555ea + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + + + https://github.com/dotnet/emsdk + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 diff --git a/eng/Versions.props b/eng/Versions.props index a4af4b2b8..a43edc3aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23520.14 + 8.0.0-rtm.23531.5 - 8.0.0-rtm.23521.1 + 8.0.0-rtm.23531.4 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 + 8.0.0 + 8.0.0 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 0.2.0 - 8.0.200-preview.23523.30 - 8.0.200-preview.23523.30 - 8.0.200-preview.23523.30 + 8.0.200-preview.23603.4 + 8.0.200-preview.23603.4 + 8.0.200-preview.23603.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23520.1 + 4.9.0-2.23562.2 - 8.0.0-rtm.23520.16 + 8.0.0-rtm.23531.3 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 + 8.0.0-rtm.23531.3 + 8.0.0-rtm.23531.3 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 2.1.0 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 + 8.0.0-rtm.23551.1 + 8.0.0-rtm.23551.1 + 8.0.0 + 8.0.0 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.17 + 6.9.0-preview.1.45 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23519-02 + 17.9.0-preview-23580-01 8.0.0-alpha.1.22557.12 @@ -249,7 +249,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23511.3 + 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 01925eb5f..fa7350c16 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,7 +202,7 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ -[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+ [\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ ";