From ee9c3f2237eb717ec5316c2b0d7164745803fb5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Sep 2023 21:31:15 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/runtime build 20230920.7 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.2.23469.9 -> To Version 8.0.0-rc.2.23470.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rc.2.23463.1 -> To Version 8.0.0-rtm.23469.3 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76f9dc87295c..2c1b35b0f26b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating d457c9b9db2ca383b031a38c0434e918ca37d63c - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/emsdk - 1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc + 50bf805c8b5ca52abd34fde390609d8a54640246 @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd https://github.com/dotnet/windowsdesktop @@ -386,19 +386,19 @@ - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd @@ -419,9 +419,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + 49bf70a429a6122217f2c88e778ce8115ceac3bd https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index fcc6597d09d0..6f4491399eaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23470.7 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23470.7 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 + 8.0.0-rc.2.23470.7 @@ -207,7 +207,7 @@ - 8.0.0-rc.2.23463.1 + 8.0.0-rtm.23469.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 79aef8ceef4eb5fa17a8067129e4530c3fd350be Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Thu, 21 Sep 2023 17:26:11 -0500 Subject: [PATCH 2/3] Tweak the workload version regex --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6f4491399eaf..9d5ffb4f0186 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -210,10 +210,10 @@ 8.0.0-rtm.23469.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 9be4247c2742840109d7a9bb6e123b7a4a81fcc0 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Thu, 21 Sep 2023 19:21:47 -0500 Subject: [PATCH 3/3] Bump emsdk to a version that exists --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c1b35b0f26b..6af940a9325a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,7 +47,7 @@ https://github.com/dotnet/runtime 49bf70a429a6122217f2c88e778ce8115ceac3bd - + https://github.com/dotnet/emsdk 50bf805c8b5ca52abd34fde390609d8a54640246 diff --git a/eng/Versions.props b/eng/Versions.props index 9d5ffb4f0186..04939bae56f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -207,7 +207,7 @@ - 8.0.0-rtm.23469.3 + 8.0.0-rtm.23470.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))