From ee915dcc3051b8b75f1399b02024235acee43928 Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Wed, 14 Aug 2024 15:01:20 -0700 Subject: [PATCH 001/158] Update release/9.0 to rc2 (#4572) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 836b51fa0..b7e7826a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ 0 0 rc - 1 + 2 false release From 6c0bb8512eedaf1e51ed5c757a996176dfeb3d05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:13:48 +0000 Subject: [PATCH 002/158] [release/9.0] Update dependencies from dotnet/wpf (#4577) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24413.14 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.1.24407.3 to 10.0.0-alpha.1.24414.12 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 972b48a0c..0a5af6cc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/winforms - 7006c1c2c5515bc4b648e5b3c2ea6a604867e0b9 + e4085eb08ceef38d44b0bcdae0bc02e374794979 - + https://github.com/dotnet/wpf - aa7c73eab8ed50131272c18613d7e3133619c9f1 + ce8e3041f94469a4fd2aa5948905c2b70852fe55 - + https://github.com/dotnet/wpf - aa7c73eab8ed50131272c18613d7e3133619c9f1 + ce8e3041f94469a4fd2aa5948905c2b70852fe55 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/winforms - 7006c1c2c5515bc4b648e5b3c2ea6a604867e0b9 + e4085eb08ceef38d44b0bcdae0bc02e374794979 - + https://github.com/dotnet/wpf - aa7c73eab8ed50131272c18613d7e3133619c9f1 + ce8e3041f94469a4fd2aa5948905c2b70852fe55 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 605ff6f6485101d4bd1eabb9ab97af345eee67a1 - + https://github.com/dotnet/winforms - 7006c1c2c5515bc4b648e5b3c2ea6a604867e0b9 + e4085eb08ceef38d44b0bcdae0bc02e374794979 diff --git a/eng/Versions.props b/eng/Versions.props index b7e7826a5..d74168ed0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 5.0.0 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 5.0.0 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24413.14 5.0.0 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 6.0.0 5.0.0 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 5.0.0 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 4.10.0 - 9.0.0-rc.1.24407.3 - 9.0.0-rc.1.24407.3 + 10.0.0-alpha.1.24414.12 + 10.0.0-alpha.1.24414.12 - 9.0.0-rc.1.24413.3 + 10.0.0-alpha.1.24415.2 From 5ebc4ef4219d630c984166bb5dfbb015811e280d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 02:15:10 +0000 Subject: [PATCH 003/158] [release/9.0] Update dependencies from dotnet/wpf (#4580) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a5af6cc3..f29e032f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms e4085eb08ceef38d44b0bcdae0bc02e374794979 - + https://github.com/dotnet/wpf - ce8e3041f94469a4fd2aa5948905c2b70852fe55 + 5b29d9492218ff9960bfd2dda81378b499a88b2f - + https://github.com/dotnet/wpf - ce8e3041f94469a4fd2aa5948905c2b70852fe55 + 5b29d9492218ff9960bfd2dda81378b499a88b2f https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms e4085eb08ceef38d44b0bcdae0bc02e374794979 - + https://github.com/dotnet/wpf - ce8e3041f94469a4fd2aa5948905c2b70852fe55 + 5b29d9492218ff9960bfd2dda81378b499a88b2f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d74168ed0..c7f203af6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 10.0.0-alpha.1.24414.12 10.0.0-alpha.1.24414.12 - 10.0.0-alpha.1.24415.2 + 10.0.0-alpha.1.24416.12 From 7798444cbdcb877fe294b5490a68693eb4415508 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:15:25 -0700 Subject: [PATCH 004/158] [release/9.0] Update dependencies from dotnet/wpf (#4582) * Update dependencies from https://github.com/dotnet/wpf build 20240817.4 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 10.0.0-alpha.1.24416.12 -> To Version 10.0.0-alpha.1.24417.4 * Update dependencies from https://github.com/dotnet/wpf build 20240820.3 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 10.0.0-alpha.1.24417.4 -> To Version 9.0.0-rc.2.24420.3 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 10.0.0-alpha.1.24414.12 -> To Version 9.0.0-rc.2.24420.8 (parent: Microsoft.DotNet.Wpf.GitHub --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f29e032f8..84b643966 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/winforms - e4085eb08ceef38d44b0bcdae0bc02e374794979 + 8cd1fac027b9ada49e4b249f6038a23dff8c5e2b - + https://github.com/dotnet/wpf - 5b29d9492218ff9960bfd2dda81378b499a88b2f + 0303e2c45ab19cb512c8929ec975e02415a7e480 - + https://github.com/dotnet/wpf - 5b29d9492218ff9960bfd2dda81378b499a88b2f + 0303e2c45ab19cb512c8929ec975e02415a7e480 - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/winforms - e4085eb08ceef38d44b0bcdae0bc02e374794979 + 8cd1fac027b9ada49e4b249f6038a23dff8c5e2b - + https://github.com/dotnet/wpf - 5b29d9492218ff9960bfd2dda81378b499a88b2f + 0303e2c45ab19cb512c8929ec975e02415a7e480 - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/runtime - 605ff6f6485101d4bd1eabb9ab97af345eee67a1 + 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/winforms - e4085eb08ceef38d44b0bcdae0bc02e374794979 + 8cd1fac027b9ada49e4b249f6038a23dff8c5e2b diff --git a/eng/Versions.props b/eng/Versions.props index c7f203af6..4f53a107c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 5.0.0 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 5.0.0 - 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24414.5 5.0.0 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 6.0.0 5.0.0 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 5.0.0 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24414.5 4.10.0 - 10.0.0-alpha.1.24414.12 - 10.0.0-alpha.1.24414.12 + 9.0.0-rc.2.24420.8 + 9.0.0-rc.2.24420.8 - 10.0.0-alpha.1.24416.12 + 9.0.0-rc.2.24420.3 From 2e982a1fb6b5a038619ea27af29727045e7273ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:15:59 -0700 Subject: [PATCH 005/158] [release/9.0] Update dependencies from dotnet/arcade (#4588) Update dependencies from https://github.com/dotnet/arcade build 20240820.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks From Version 9.0.0-beta.24408.2 -> To Version 9.0.0-beta.24420.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84b643966..5eb978fd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + b435d26f349d3960d12281321972ed323c35319d diff --git a/eng/Versions.props b/eng/Versions.props index 4f53a107c..4d02bb4ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24408.2 - 9.0.0-beta.24408.2 + 9.0.0-beta.24420.6 + 9.0.0-beta.24420.6 4.5.0 4.8.6 diff --git a/global.json b/global.json index 901a1c633..8713aa8b0 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.5.24307.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24408.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24420.6", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24420.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 4ab75e4b96563a22655d02416ab2cdbfa098f81a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 19:02:59 +0000 Subject: [PATCH 006/158] [release/9.0] Update dependencies from dotnet/arcade (#4590) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/SetupNugetSources.ps1 | 2 +- eng/common/SetupNugetSources.sh | 2 +- global.json | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eb978fd5..51eef9c74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a diff --git a/eng/Versions.props b/eng/Versions.props index 4d02bb4ab..f75da7a6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24420.6 - 9.0.0-beta.24420.6 + 9.0.0-beta.24421.2 + 9.0.0-beta.24421.2 4.5.0 4.8.6 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2b0a5c9e6..5db4ad71e 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } -$dotnetVersions = @('5','6','7','8') +$dotnetVersions = @('5','6','7','8','9') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index b493479a1..4604b61b0 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7' '8') +DotNetVersions=('5' '6' '7' '8' '9') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; diff --git a/global.json b/global.json index 8713aa8b0..0f41f0e61 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-preview.5.24307.3" + "dotnet": "9.0.100-preview.7.24407.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24420.6", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24420.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24421.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From e03263147ef39a5b992d8b636ada0fdd3fe04c16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 02:15:51 +0000 Subject: [PATCH 007/158] [release/9.0] Update dependencies from dotnet/wpf (#4593) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51eef9c74..b1b6de6f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms 8cd1fac027b9ada49e4b249f6038a23dff8c5e2b - + https://github.com/dotnet/wpf - 0303e2c45ab19cb512c8929ec975e02415a7e480 + 241ca8801d775a1feb07124952359762613edda2 - + https://github.com/dotnet/wpf - 0303e2c45ab19cb512c8929ec975e02415a7e480 + 241ca8801d775a1feb07124952359762613edda2 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms 8cd1fac027b9ada49e4b249f6038a23dff8c5e2b - + https://github.com/dotnet/wpf - 0303e2c45ab19cb512c8929ec975e02415a7e480 + 241ca8801d775a1feb07124952359762613edda2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f75da7a6c..09c1ba8b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 9.0.0-rc.2.24420.8 9.0.0-rc.2.24420.8 - 9.0.0-rc.2.24420.3 + 9.0.0-rc.2.24421.7 From 0bb428dc756a8c696835b380ab6be733e8bfac4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:15:29 +0000 Subject: [PATCH 008/158] [release/9.0] Update dependencies from dotnet/wpf (#4594) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.1.24414.5 to 9.0.0-rc.2.24420.15 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24420.8 to 9.0.0-rc.2.24421.10 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1b6de6f1..6b917d79e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/winforms - 8cd1fac027b9ada49e4b249f6038a23dff8c5e2b + aa95eacb53c196215284130aaec121c2b5c9a2c1 - + https://github.com/dotnet/wpf - 241ca8801d775a1feb07124952359762613edda2 + 3088d7179e6403947ee3bcb4b6d4dd0839f10e86 - + https://github.com/dotnet/wpf - 241ca8801d775a1feb07124952359762613edda2 + 3088d7179e6403947ee3bcb4b6d4dd0839f10e86 - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/winforms - 8cd1fac027b9ada49e4b249f6038a23dff8c5e2b + aa95eacb53c196215284130aaec121c2b5c9a2c1 - + https://github.com/dotnet/wpf - 241ca8801d775a1feb07124952359762613edda2 + 3088d7179e6403947ee3bcb4b6d4dd0839f10e86 - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e - + https://github.com/dotnet/winforms - 8cd1fac027b9ada49e4b249f6038a23dff8c5e2b + aa95eacb53c196215284130aaec121c2b5c9a2c1 diff --git a/eng/Versions.props b/eng/Versions.props index 09c1ba8b7..e7ea3ccb3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 5.0.0 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 5.0.0 - 9.0.0-rc.1.24414.5 + 9.0.0-rc.2.24420.15 5.0.0 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 6.0.0 5.0.0 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 5.0.0 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24420.15 4.10.0 - 9.0.0-rc.2.24420.8 - 9.0.0-rc.2.24420.8 + 9.0.0-rc.2.24421.10 + 9.0.0-rc.2.24421.10 - 9.0.0-rc.2.24421.7 + 9.0.0-rc.2.24421.11 From 4c3fe70790353924090d5973e49bb92ea1b4c6e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:28:52 +0000 Subject: [PATCH 009/158] [release/9.0] Update dependencies from dotnet/arcade (#4596) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b917d79e..f64dd3f56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec diff --git a/eng/Versions.props b/eng/Versions.props index e7ea3ccb3..e0ceec84b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24421.2 - 9.0.0-beta.24421.2 + 9.0.0-beta.24421.7 + 9.0.0-beta.24421.7 4.5.0 4.8.6 diff --git a/global.json b/global.json index 0f41f0e61..aa355ffe8 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.7.24407.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24421.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.7", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24421.7", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 817e9a027c0994a21cf3f368674bc4c17e8b6e15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 02:14:33 +0000 Subject: [PATCH 010/158] [release/9.0] Update dependencies from dotnet/wpf (#4597) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f64dd3f56..701164aa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms aa95eacb53c196215284130aaec121c2b5c9a2c1 - + https://github.com/dotnet/wpf - 3088d7179e6403947ee3bcb4b6d4dd0839f10e86 + 16d553e5b9e2c6fd8c96696760a1d67b50d8db28 - + https://github.com/dotnet/wpf - 3088d7179e6403947ee3bcb4b6d4dd0839f10e86 + 16d553e5b9e2c6fd8c96696760a1d67b50d8db28 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms aa95eacb53c196215284130aaec121c2b5c9a2c1 - + https://github.com/dotnet/wpf - 3088d7179e6403947ee3bcb4b6d4dd0839f10e86 + 16d553e5b9e2c6fd8c96696760a1d67b50d8db28 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e0ceec84b..7d52ea5cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 9.0.0-rc.2.24421.10 9.0.0-rc.2.24421.10 - 9.0.0-rc.2.24421.11 + 9.0.0-rc.2.24422.2 From 1218270abdd379ffccfd5195c7990240d43cd056 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 12:11:13 +0000 Subject: [PATCH 011/158] [release/9.0] Update dependencies from dotnet/wpf (#4598) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24420.15 to 9.0.0-rc.2.24421.12 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24421.10 to 9.0.0-rc.2.24422.3 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 701164aa0..4961bb83e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/winforms - aa95eacb53c196215284130aaec121c2b5c9a2c1 + bd7f3a742f3289f16d54b46e62aa05bbe9ae64d4 - + https://github.com/dotnet/wpf - 16d553e5b9e2c6fd8c96696760a1d67b50d8db28 + fa87bac73d593583da1064889a79e42fbdb9e9eb - + https://github.com/dotnet/wpf - 16d553e5b9e2c6fd8c96696760a1d67b50d8db28 + fa87bac73d593583da1064889a79e42fbdb9e9eb - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/winforms - aa95eacb53c196215284130aaec121c2b5c9a2c1 + bd7f3a742f3289f16d54b46e62aa05bbe9ae64d4 - + https://github.com/dotnet/wpf - 16d553e5b9e2c6fd8c96696760a1d67b50d8db28 + fa87bac73d593583da1064889a79e42fbdb9e9eb - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/runtime - 6b5d89152d7f4f71c87009dc8ee99c1f7cba8b5e + 81af315e31b4113b5a6db886a4216ac4d806a3ab - + https://github.com/dotnet/winforms - aa95eacb53c196215284130aaec121c2b5c9a2c1 + bd7f3a742f3289f16d54b46e62aa05bbe9ae64d4 diff --git a/eng/Versions.props b/eng/Versions.props index 7d52ea5cc..5eb0c5727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 5.0.0 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 5.0.0 - 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24421.12 5.0.0 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 6.0.0 5.0.0 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 5.0.0 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 - 9.0.0-rc.2.24420.15 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24421.12 4.10.0 - 9.0.0-rc.2.24421.10 - 9.0.0-rc.2.24421.10 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 - 9.0.0-rc.2.24422.2 + 9.0.0-rc.2.24423.2 From 21a01c0988f09ca2185d100644d840b3325dd2c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 12:11:18 +0000 Subject: [PATCH 012/158] [release/9.0] Update dependencies from dotnet/wpf (#4599) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24421.12 to 9.0.0-rc.2.24422.9 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24423.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4961bb83e..789f259f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/winforms - bd7f3a742f3289f16d54b46e62aa05bbe9ae64d4 + 4e6b9dd39bc6a8a72c5f5287d4a3bf7948387038 - + https://github.com/dotnet/wpf - fa87bac73d593583da1064889a79e42fbdb9e9eb + 439fd106bf0cf03ca3252dfb0319fca204bab061 - + https://github.com/dotnet/wpf - fa87bac73d593583da1064889a79e42fbdb9e9eb + 439fd106bf0cf03ca3252dfb0319fca204bab061 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/winforms - bd7f3a742f3289f16d54b46e62aa05bbe9ae64d4 + 4e6b9dd39bc6a8a72c5f5287d4a3bf7948387038 - + https://github.com/dotnet/wpf - fa87bac73d593583da1064889a79e42fbdb9e9eb + 439fd106bf0cf03ca3252dfb0319fca204bab061 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/runtime - 81af315e31b4113b5a6db886a4216ac4d806a3ab + f7b94caddeb75f42a4a670f7505f72588f7e9f41 - + https://github.com/dotnet/winforms - bd7f3a742f3289f16d54b46e62aa05bbe9ae64d4 + 4e6b9dd39bc6a8a72c5f5287d4a3bf7948387038 diff --git a/eng/Versions.props b/eng/Versions.props index 5eb0c5727..324b3f66c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 5.0.0 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 5.0.0 - 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24422.9 5.0.0 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 6.0.0 5.0.0 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 5.0.0 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 - 9.0.0-rc.2.24421.12 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24422.9 4.10.0 - 9.0.0-rc.2.24422.3 - 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24423.2 + 9.0.0-rc.2.24423.2 - 9.0.0-rc.2.24423.2 + 9.0.0-rc.2.24424.2 From 0ccba39a8549999db3a2f6b1b171ab35e4fff76d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 13:10:51 +0000 Subject: [PATCH 013/158] [release/9.0] Update dependencies from dotnet/arcade (#4601) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 +++--- eng/Versions.props | 4 +- eng/common/core-templates/job/job.yml | 5 -- eng/common/internal/Tools.csproj | 1 + eng/common/templates-official/job/job.yml | 14 ++++ eng/common/templates/job/job.yml | 96 +++++++++++------------ global.json | 4 +- 7 files changed, 75 insertions(+), 73 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 789f259f2..2bc688134 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 diff --git a/eng/Versions.props b/eng/Versions.props index 324b3f66c..8919a46ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24421.7 - 9.0.0-beta.24421.7 + 9.0.0-beta.24423.2 + 9.0.0-beta.24423.2 4.5.0 4.8.6 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index c732bee9f..ba53ebfbd 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -33,11 +33,6 @@ parameters: artifactPublishSteps: [] runAsPublic: false -# Sbom related params - enableSbom: true - PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' - # 1es specific parameters is1ESPipeline: '' diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index e925952d5..32f79dfb3 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -4,6 +4,7 @@ net472 false + false diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 0c2928d5c..3d16b41c7 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,8 +1,22 @@ +parameters: +# Sbom related params + enableSbom: true + PackageVersion: 9.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + jobs: - template: /eng/common/core-templates/job/job.yml parameters: is1ESPipeline: true + componentGovernanceSteps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion }} + BuildDropPath: ${{ parameters.buildDropPath }} + publishArtifacts: false + # publish artifacts # for 1ES managed templates, use the templateContext.output to handle multiple outputs. templateContext: diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8da477dd6..07d317bf8 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -19,71 +19,63 @@ jobs: steps: - ${{ each step in parameters.steps }}: - ${{ step }} - + componentGovernanceSteps: - - template: /eng/common/templates/steps/component-governance.yml - parameters: - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates/steps/generate-sbom.yml - parameters: - PackageVersion: ${{ parameters.packageVersion }} - BuildDropPath: ${{ parameters.buildDropPath }} - publishArtifacts: false - + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} artifactPublishSteps: - - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: false - args: - displayName: Publish pipeline artifacts - pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - publishLocation: Container - artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} - continueOnError: true - condition: always() - - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml - parameters: - is1ESPipeline: false - args: - targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log' - artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: 'Publish logs' - continueOnError: true - condition: always() - sbomEnabled: false # we don't need SBOM for logs - - - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: is1ESPipeline: false args: - displayName: Publish Logs - pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + displayName: Publish pipeline artifacts + pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts' publishLocation: Container - artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() - - - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' - artifactName: 'BuildConfiguration' - displayName: 'Publish build retry configuration' + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' continueOnError: true - sbomEnabled: false # we don't need SBOM for BuildConfiguration + condition: always() + sbomEnabled: false # we don't need SBOM for logs + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: false + args: + displayName: Publish Logs + pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + publishLocation: Container + artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: false + args: + targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true + sbomEnabled: false # we don't need SBOM for BuildConfiguration diff --git a/global.json b/global.json index aa355ffe8..50e5651e6 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.7.24407.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.7", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24421.7", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24423.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24423.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 49cb6a05ca6f49ef871b4ecd251659bf4ad18c3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 02:11:36 +0000 Subject: [PATCH 014/158] [release/9.0] Update dependencies from dotnet/wpf (#4602) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bc688134..7d8d7b4ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms 4e6b9dd39bc6a8a72c5f5287d4a3bf7948387038 - + https://github.com/dotnet/wpf - 439fd106bf0cf03ca3252dfb0319fca204bab061 + 6c1f54de5f6d2b37c729cadc94fa69207eb5ceb3 - + https://github.com/dotnet/wpf - 439fd106bf0cf03ca3252dfb0319fca204bab061 + 6c1f54de5f6d2b37c729cadc94fa69207eb5ceb3 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms 4e6b9dd39bc6a8a72c5f5287d4a3bf7948387038 - + https://github.com/dotnet/wpf - 439fd106bf0cf03ca3252dfb0319fca204bab061 + 6c1f54de5f6d2b37c729cadc94fa69207eb5ceb3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8919a46ca..3f5176d68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 9.0.0-rc.2.24423.2 9.0.0-rc.2.24423.2 - 9.0.0-rc.2.24424.2 + 9.0.0-rc.2.24424.6 From e77880b6c8a41cb5f04b2eb941cf272151b51c38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 12:11:12 +0000 Subject: [PATCH 015/158] [release/9.0] Update dependencies from dotnet/wpf (#4603) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24422.9 to 9.0.0-rc.2.24423.10 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24423.2 to 9.0.0-rc.2.24424.1 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d8d7b4ef..15b33a3fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/winforms - 4e6b9dd39bc6a8a72c5f5287d4a3bf7948387038 + 1961ed892785d2216e53650d5c33c42de1289ae5 - + https://github.com/dotnet/wpf - 6c1f54de5f6d2b37c729cadc94fa69207eb5ceb3 + a8c12d0d17e71822d15f9de1bbdcc4f87f2b86dc - + https://github.com/dotnet/wpf - 6c1f54de5f6d2b37c729cadc94fa69207eb5ceb3 + a8c12d0d17e71822d15f9de1bbdcc4f87f2b86dc - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/winforms - 4e6b9dd39bc6a8a72c5f5287d4a3bf7948387038 + 1961ed892785d2216e53650d5c33c42de1289ae5 - + https://github.com/dotnet/wpf - 6c1f54de5f6d2b37c729cadc94fa69207eb5ceb3 + a8c12d0d17e71822d15f9de1bbdcc4f87f2b86dc - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/runtime - f7b94caddeb75f42a4a670f7505f72588f7e9f41 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/winforms - 4e6b9dd39bc6a8a72c5f5287d4a3bf7948387038 + 1961ed892785d2216e53650d5c33c42de1289ae5 diff --git a/eng/Versions.props b/eng/Versions.props index 3f5176d68..2a91ee391 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 5.0.0 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 5.0.0 - 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24423.10 5.0.0 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 6.0.0 5.0.0 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 5.0.0 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 - 9.0.0-rc.2.24422.9 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 4.10.0 - 9.0.0-rc.2.24423.2 - 9.0.0-rc.2.24423.2 + 9.0.0-rc.2.24424.1 + 9.0.0-rc.2.24424.1 - 9.0.0-rc.2.24424.6 + 9.0.0-rc.2.24425.2 From 5a7d08daa1c21d12bf15028cad5f1d121efa087d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:13:34 +0000 Subject: [PATCH 016/158] [release/9.0] Update dependencies from dotnet/wpf (#4608) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Drawing.Common: from 9.0.0-rc.2.24424.1 to 9.0.0-rc.2.24426.3 (parent: Microsoft.DotNet.Wpf.GitHub) --- 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 15b33a3fa..90030a129 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://github.com/dotnet/runtime 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/winforms - 1961ed892785d2216e53650d5c33c42de1289ae5 + 92ac81b85b73906d383679af3ac58b555f511ae8 - + https://github.com/dotnet/wpf - a8c12d0d17e71822d15f9de1bbdcc4f87f2b86dc + b662ddd8274764b0c687e224b5c9565b92fdc95a - + https://github.com/dotnet/wpf - a8c12d0d17e71822d15f9de1bbdcc4f87f2b86dc + b662ddd8274764b0c687e224b5c9565b92fdc95a https://github.com/dotnet/runtime @@ -30,13 +30,13 @@ https://github.com/dotnet/runtime 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/winforms - 1961ed892785d2216e53650d5c33c42de1289ae5 + 92ac81b85b73906d383679af3ac58b555f511ae8 - + https://github.com/dotnet/wpf - a8c12d0d17e71822d15f9de1bbdcc4f87f2b86dc + b662ddd8274764b0c687e224b5c9565b92fdc95a https://github.com/dotnet/runtime @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/winforms - 1961ed892785d2216e53650d5c33c42de1289ae5 + 92ac81b85b73906d383679af3ac58b555f511ae8 diff --git a/eng/Versions.props b/eng/Versions.props index 2a91ee391..9fb7b086f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 4.10.0 - 9.0.0-rc.2.24424.1 - 9.0.0-rc.2.24424.1 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24425.2 + 9.0.0-rc.2.24426.4 From 6924fefd2054f08ae7a837791b44391134fbc5b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:29:13 +0000 Subject: [PATCH 017/158] [release/9.0] Update dependencies from dotnet/arcade (#4610) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90030a129..c0d160889 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 diff --git a/eng/Versions.props b/eng/Versions.props index 9fb7b086f..7f79846a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24423.2 - 9.0.0-beta.24423.2 + 9.0.0-beta.24426.3 + 9.0.0-beta.24426.3 4.5.0 4.8.6 diff --git a/global.json b/global.json index 50e5651e6..221f96274 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.7.24407.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24423.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24423.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24426.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24426.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From d3a81ff3d2d38f14581d745851b65213d249e7b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 02:13:53 +0000 Subject: [PATCH 018/158] [release/9.0] Update dependencies from dotnet/wpf (#4612) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0d160889..60f026c41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms 92ac81b85b73906d383679af3ac58b555f511ae8 - + https://github.com/dotnet/wpf - b662ddd8274764b0c687e224b5c9565b92fdc95a + 6d72c7513e22a5e7b52869f2231b002d76506563 - + https://github.com/dotnet/wpf - b662ddd8274764b0c687e224b5c9565b92fdc95a + 6d72c7513e22a5e7b52869f2231b002d76506563 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms 92ac81b85b73906d383679af3ac58b555f511ae8 - + https://github.com/dotnet/wpf - b662ddd8274764b0c687e224b5c9565b92fdc95a + 6d72c7513e22a5e7b52869f2231b002d76506563 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7f79846a0..bb9cf021e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 9.0.0-rc.2.24426.3 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.4 + 9.0.0-rc.2.24427.2 From 916daab03c2155c6dd827649d88c3f5ad5e2767b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:19:03 +0000 Subject: [PATCH 019/158] [release/9.0] Update dependencies from dotnet/wpf (#4613) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.3 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60f026c41..430eafac8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/winforms - 92ac81b85b73906d383679af3ac58b555f511ae8 + 28b79a28c8fcc016d319ce6b0f3b8c3463192a5c - + https://github.com/dotnet/wpf - 6d72c7513e22a5e7b52869f2231b002d76506563 + 06d898c6fe61c847cfa792e83c2254d8aabbeb70 - + https://github.com/dotnet/wpf - 6d72c7513e22a5e7b52869f2231b002d76506563 + 06d898c6fe61c847cfa792e83c2254d8aabbeb70 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/winforms - 92ac81b85b73906d383679af3ac58b555f511ae8 + 28b79a28c8fcc016d319ce6b0f3b8c3463192a5c - + https://github.com/dotnet/wpf - 6d72c7513e22a5e7b52869f2231b002d76506563 + 06d898c6fe61c847cfa792e83c2254d8aabbeb70 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/winforms - 92ac81b85b73906d383679af3ac58b555f511ae8 + 28b79a28c8fcc016d319ce6b0f3b8c3463192a5c diff --git a/eng/Versions.props b/eng/Versions.props index bb9cf021e..97d819f62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 5.0.0 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 5.0.0 - 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24426.3 5.0.0 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 6.0.0 5.0.0 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 5.0.0 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 4.10.0 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24427.3 + 9.0.0-rc.2.24427.3 - 9.0.0-rc.2.24427.2 + 9.0.0-rc.2.24427.4 From b03ef02ae6a26c4d77054b95b72ddf7e25e2f5f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 02:16:49 +0000 Subject: [PATCH 020/158] [release/9.0] Update dependencies from dotnet/wpf (#4618) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24426.3 to 9.0.0-rc.2.24427.10 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24427.3 to 9.0.0-rc.2.24428.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 430eafac8..b8a9c2074 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/winforms - 28b79a28c8fcc016d319ce6b0f3b8c3463192a5c + bcd798bb6b6a76c4c0573ce0f856db06b40fd841 - + https://github.com/dotnet/wpf - 06d898c6fe61c847cfa792e83c2254d8aabbeb70 + 4e8309d8659e70818aacdb08fcb66a4677d11894 - + https://github.com/dotnet/wpf - 06d898c6fe61c847cfa792e83c2254d8aabbeb70 + 4e8309d8659e70818aacdb08fcb66a4677d11894 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/winforms - 28b79a28c8fcc016d319ce6b0f3b8c3463192a5c + bcd798bb6b6a76c4c0573ce0f856db06b40fd841 - + https://github.com/dotnet/wpf - 06d898c6fe61c847cfa792e83c2254d8aabbeb70 + 4e8309d8659e70818aacdb08fcb66a4677d11894 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + d5e636923fb1670597b536fa8a6fce4a06822e87 - + https://github.com/dotnet/winforms - 28b79a28c8fcc016d319ce6b0f3b8c3463192a5c + bcd798bb6b6a76c4c0573ce0f856db06b40fd841 diff --git a/eng/Versions.props b/eng/Versions.props index 97d819f62..be86aaf88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 5.0.0 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 5.0.0 - 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24427.10 5.0.0 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 6.0.0 5.0.0 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 5.0.0 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24427.10 4.10.0 - 9.0.0-rc.2.24427.3 - 9.0.0-rc.2.24427.3 + 9.0.0-rc.2.24428.2 + 9.0.0-rc.2.24428.2 - 9.0.0-rc.2.24427.4 + 9.0.0-rc.2.24429.1 From 392ca81c93cf0a010510298cee0058ec225ca49d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:14:55 +0000 Subject: [PATCH 021/158] [release/9.0] Update dependencies from dotnet/wpf (#4620) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24427.10 to 9.0.0-rc.2.24428.8 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24428.2 to 9.0.0-rc.2.24429.3 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8a9c2074..0ffcd2eb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/winforms - bcd798bb6b6a76c4c0573ce0f856db06b40fd841 + 4b62a73f89858102f5da2fd28debf5d20fd25a9d - + https://github.com/dotnet/wpf - 4e8309d8659e70818aacdb08fcb66a4677d11894 + fe1f47c721fc9da38a2e9a10a1a7731753d1a7c6 - + https://github.com/dotnet/wpf - 4e8309d8659e70818aacdb08fcb66a4677d11894 + fe1f47c721fc9da38a2e9a10a1a7731753d1a7c6 - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/winforms - bcd798bb6b6a76c4c0573ce0f856db06b40fd841 + 4b62a73f89858102f5da2fd28debf5d20fd25a9d - + https://github.com/dotnet/wpf - 4e8309d8659e70818aacdb08fcb66a4677d11894 + fe1f47c721fc9da38a2e9a10a1a7731753d1a7c6 - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/runtime - d5e636923fb1670597b536fa8a6fce4a06822e87 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d - + https://github.com/dotnet/winforms - bcd798bb6b6a76c4c0573ce0f856db06b40fd841 + 4b62a73f89858102f5da2fd28debf5d20fd25a9d diff --git a/eng/Versions.props b/eng/Versions.props index be86aaf88..2d250551c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 5.0.0 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 5.0.0 - 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24428.8 5.0.0 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 6.0.0 5.0.0 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 5.0.0 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 - 9.0.0-rc.2.24427.10 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 4.10.0 - 9.0.0-rc.2.24428.2 - 9.0.0-rc.2.24428.2 + 9.0.0-rc.2.24429.3 + 9.0.0-rc.2.24429.3 - 9.0.0-rc.2.24429.1 + 9.0.0-rc.2.24429.4 From 1c701f46406786fb42e85d245117d6f743af7abe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:14:47 +0000 Subject: [PATCH 022/158] [release/9.0] Update dependencies from dotnet/arcade (#4622) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ffcd2eb3..19bc030c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 + b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 - + https://github.com/dotnet/arcade - e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 + b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 - + https://github.com/dotnet/arcade - e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 + b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 - + https://github.com/dotnet/arcade - e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 + b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 - + https://github.com/dotnet/arcade - e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 + b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 - + https://github.com/dotnet/arcade - e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 + b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 diff --git a/eng/Versions.props b/eng/Versions.props index 2d250551c..97eab60a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24426.3 - 9.0.0-beta.24426.3 + 9.0.0-beta.24429.3 + 9.0.0-beta.24429.3 4.5.0 4.8.6 diff --git a/global.json b/global.json index 221f96274..585622b74 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.7.24407.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24426.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24426.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24429.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 1fe5b68ba1747d3f19b09a5d796103eb7c317c31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2024 02:16:27 +0000 Subject: [PATCH 023/158] [release/9.0] Update dependencies from dotnet/wpf (#4624) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19bc030c8..e8b0bf267 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms 4b62a73f89858102f5da2fd28debf5d20fd25a9d - + https://github.com/dotnet/wpf - fe1f47c721fc9da38a2e9a10a1a7731753d1a7c6 + c91615621e61e078854dab8c52fdae083fbd9fe9 - + https://github.com/dotnet/wpf - fe1f47c721fc9da38a2e9a10a1a7731753d1a7c6 + c91615621e61e078854dab8c52fdae083fbd9fe9 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms 4b62a73f89858102f5da2fd28debf5d20fd25a9d - + https://github.com/dotnet/wpf - fe1f47c721fc9da38a2e9a10a1a7731753d1a7c6 + c91615621e61e078854dab8c52fdae083fbd9fe9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 97eab60a6..67ee07620 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 9.0.0-rc.2.24429.3 9.0.0-rc.2.24429.3 - 9.0.0-rc.2.24429.4 + 9.0.0-rc.2.24430.4 From c0038093d715a5be68ad686f85b02cf6bb6e3ac7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2024 12:11:34 +0000 Subject: [PATCH 024/158] [release/9.0] Update dependencies from dotnet/wpf (#4625) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24429.3 to 9.0.0-rc.2.24430.3 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8b0bf267..f9a01ba90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/winforms - 4b62a73f89858102f5da2fd28debf5d20fd25a9d + 7d8d28254a994996518d78895d5d32a96ed56aaf - + https://github.com/dotnet/wpf - c91615621e61e078854dab8c52fdae083fbd9fe9 + 7d6ff3e4cd96780c54ac69a5f2f4bd81e7ef7699 - + https://github.com/dotnet/wpf - c91615621e61e078854dab8c52fdae083fbd9fe9 + 7d6ff3e4cd96780c54ac69a5f2f4bd81e7ef7699 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/winforms - 4b62a73f89858102f5da2fd28debf5d20fd25a9d + 7d8d28254a994996518d78895d5d32a96ed56aaf - + https://github.com/dotnet/wpf - c91615621e61e078854dab8c52fdae083fbd9fe9 + 7d6ff3e4cd96780c54ac69a5f2f4bd81e7ef7699 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/winforms - 4b62a73f89858102f5da2fd28debf5d20fd25a9d + 7d8d28254a994996518d78895d5d32a96ed56aaf diff --git a/eng/Versions.props b/eng/Versions.props index 67ee07620..7ef73e5c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 5.0.0 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 5.0.0 - 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24429.19 5.0.0 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 6.0.0 5.0.0 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 5.0.0 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 4.10.0 - 9.0.0-rc.2.24429.3 - 9.0.0-rc.2.24429.3 + 9.0.0-rc.2.24430.3 + 9.0.0-rc.2.24430.3 - 9.0.0-rc.2.24430.4 + 9.0.0-rc.2.24430.9 From f2c9625232f0cabdd5bb5c707e2ab7d1a5a73ab3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2024 13:10:52 +0000 Subject: [PATCH 025/158] [release/9.0] Update dependencies from dotnet/arcade (#4627) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9a01ba90..f64a9a7a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 diff --git a/eng/Versions.props b/eng/Versions.props index 7ef73e5c3..c42ff0dba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24429.3 - 9.0.0-beta.24429.3 + 9.0.0-beta.24429.5 + 9.0.0-beta.24429.5 4.5.0 4.8.6 diff --git a/global.json b/global.json index 585622b74..4c869c883 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.7.24407.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24429.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24429.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 3467c9b992c2b23e08d4cc8aed3eceb93d457350 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 12:11:11 +0000 Subject: [PATCH 026/158] [release/9.0] Update dependencies from dotnet/wpf (#4629) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f64a9a7a0..9eccf4b65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms 7d8d28254a994996518d78895d5d32a96ed56aaf - + https://github.com/dotnet/wpf - 7d6ff3e4cd96780c54ac69a5f2f4bd81e7ef7699 + 4bbee6591a871580d0ad50ec0191220c24544915 - + https://github.com/dotnet/wpf - 7d6ff3e4cd96780c54ac69a5f2f4bd81e7ef7699 + 4bbee6591a871580d0ad50ec0191220c24544915 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms 7d8d28254a994996518d78895d5d32a96ed56aaf - + https://github.com/dotnet/wpf - 7d6ff3e4cd96780c54ac69a5f2f4bd81e7ef7699 + 4bbee6591a871580d0ad50ec0191220c24544915 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c42ff0dba..488cee23d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 9.0.0-rc.2.24430.3 9.0.0-rc.2.24430.3 - 9.0.0-rc.2.24430.9 + 9.0.0-rc.2.24451.8 From 62e8f0165e9aef8589ed419f821c0b93bfc3a76c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 13:18:25 +0000 Subject: [PATCH 027/158] [release/9.0] Update dependencies from dotnet/arcade (#4630) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9eccf4b65..315586d76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 diff --git a/eng/Versions.props b/eng/Versions.props index 488cee23d..9f4bc7c9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24429.5 - 9.0.0-beta.24429.5 + 9.0.0-beta.24453.1 + 9.0.0-beta.24453.1 4.5.0 4.8.6 diff --git a/global.json b/global.json index 4c869c883..3da1dcf6e 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.7.24407.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24429.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24453.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 04e8e1dd8b7360a4a084cf53f02d9d3e82fc65b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 12:13:12 +0000 Subject: [PATCH 028/158] [release/9.0] Update dependencies from dotnet/wpf (#4633) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24453.5 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24430.3 to 9.0.0-rc.2.24454.3 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 315586d76..5ebcf007b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/winforms - 7d8d28254a994996518d78895d5d32a96ed56aaf + 40a1a9b1354ab607a71b489d07ce54870cb8cd13 - + https://github.com/dotnet/wpf - 4bbee6591a871580d0ad50ec0191220c24544915 + 8efcd1c12339a5b9260cdccf3db5c47d82666943 - + https://github.com/dotnet/wpf - 4bbee6591a871580d0ad50ec0191220c24544915 + 8efcd1c12339a5b9260cdccf3db5c47d82666943 - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/winforms - 7d8d28254a994996518d78895d5d32a96ed56aaf + 40a1a9b1354ab607a71b489d07ce54870cb8cd13 - + https://github.com/dotnet/wpf - 4bbee6591a871580d0ad50ec0191220c24544915 + 8efcd1c12339a5b9260cdccf3db5c47d82666943 - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + 31528d082bd760377b8d818fc839a338cd071b1f - + https://github.com/dotnet/winforms - 7d8d28254a994996518d78895d5d32a96ed56aaf + 40a1a9b1354ab607a71b489d07ce54870cb8cd13 diff --git a/eng/Versions.props b/eng/Versions.props index 9f4bc7c9f..230d36879 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 5.0.0 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 5.0.0 - 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24453.5 5.0.0 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 6.0.0 5.0.0 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 5.0.0 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24453.5 4.10.0 - 9.0.0-rc.2.24430.3 - 9.0.0-rc.2.24430.3 + 9.0.0-rc.2.24454.3 + 9.0.0-rc.2.24454.3 - 9.0.0-rc.2.24451.8 + 9.0.0-rc.2.24454.8 From db9690feac3a8b01a5b4b5a22440848c3fd263d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 12:11:12 +0000 Subject: [PATCH 029/158] [release/9.0] Update dependencies from dotnet/wpf (#4635) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24453.5 to 9.0.0-rc.2.24454.7 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24454.3 to 9.0.0-rc.2.24455.3 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ebcf007b..1df56fb7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/winforms - 40a1a9b1354ab607a71b489d07ce54870cb8cd13 + 636c275ebced377ccbe2763a21488f3e9d346c0b - + https://github.com/dotnet/wpf - 8efcd1c12339a5b9260cdccf3db5c47d82666943 + 7ab4ae3a7bd42b246f086c81f97054b02c5677a1 - + https://github.com/dotnet/wpf - 8efcd1c12339a5b9260cdccf3db5c47d82666943 + 7ab4ae3a7bd42b246f086c81f97054b02c5677a1 - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/winforms - 40a1a9b1354ab607a71b489d07ce54870cb8cd13 + 636c275ebced377ccbe2763a21488f3e9d346c0b - + https://github.com/dotnet/wpf - 8efcd1c12339a5b9260cdccf3db5c47d82666943 + 7ab4ae3a7bd42b246f086c81f97054b02c5677a1 - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/runtime - 31528d082bd760377b8d818fc839a338cd071b1f + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef - + https://github.com/dotnet/winforms - 40a1a9b1354ab607a71b489d07ce54870cb8cd13 + 636c275ebced377ccbe2763a21488f3e9d346c0b diff --git a/eng/Versions.props b/eng/Versions.props index 230d36879..f9df4963d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 5.0.0 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 5.0.0 - 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24454.7 5.0.0 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 6.0.0 5.0.0 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 5.0.0 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 - 9.0.0-rc.2.24453.5 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 4.10.0 - 9.0.0-rc.2.24454.3 - 9.0.0-rc.2.24454.3 + 9.0.0-rc.2.24455.3 + 9.0.0-rc.2.24455.3 - 9.0.0-rc.2.24454.8 + 9.0.0-rc.2.24455.3 From 1f02f58396bb7b70d450e2763bc3f1b22c815910 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 02:12:12 +0000 Subject: [PATCH 030/158] [release/9.0] Update dependencies from dotnet/wpf (#4640) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24455.13 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24455.3 to 9.0.0-rc.2.24456.5 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1df56fb7d..9643a3327 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/winforms - 636c275ebced377ccbe2763a21488f3e9d346c0b + 1d824777942fbf986bee52a502301fd6daae8a49 - + https://github.com/dotnet/wpf - 7ab4ae3a7bd42b246f086c81f97054b02c5677a1 + 6151bed2378b67242a9f1f89d177ca867b73ad47 - + https://github.com/dotnet/wpf - 7ab4ae3a7bd42b246f086c81f97054b02c5677a1 + 6151bed2378b67242a9f1f89d177ca867b73ad47 - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/winforms - 636c275ebced377ccbe2763a21488f3e9d346c0b + 1d824777942fbf986bee52a502301fd6daae8a49 - + https://github.com/dotnet/wpf - 7ab4ae3a7bd42b246f086c81f97054b02c5677a1 + 6151bed2378b67242a9f1f89d177ca867b73ad47 - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + 24889f914558a0fa2ce9631788ceaba6936dad8a - + https://github.com/dotnet/winforms - 636c275ebced377ccbe2763a21488f3e9d346c0b + 1d824777942fbf986bee52a502301fd6daae8a49 diff --git a/eng/Versions.props b/eng/Versions.props index f9df4963d..024240d17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 5.0.0 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 5.0.0 - 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24455.13 5.0.0 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 6.0.0 5.0.0 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 5.0.0 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24455.13 4.10.0 - 9.0.0-rc.2.24455.3 - 9.0.0-rc.2.24455.3 + 9.0.0-rc.2.24456.5 + 9.0.0-rc.2.24456.5 - 9.0.0-rc.2.24455.3 + 9.0.0-rc.2.24457.2 From 31297e056109cac7d842d114fe5c1d8519efe551 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 12:11:14 +0000 Subject: [PATCH 031/158] [release/9.0] Update dependencies from dotnet/wpf (#4642) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24455.13 to 9.0.0-rc.2.24456.9 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24456.5 to 9.0.0-rc.2.24457.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9643a3327..ebce76b00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/winforms - 1d824777942fbf986bee52a502301fd6daae8a49 + b1fd89453ed5e3ad91e4f18c9386cac8dade6e36 - + https://github.com/dotnet/wpf - 6151bed2378b67242a9f1f89d177ca867b73ad47 + 1effdb1edc6b13befbbf53f4ee078efa97f989a2 - + https://github.com/dotnet/wpf - 6151bed2378b67242a9f1f89d177ca867b73ad47 + 1effdb1edc6b13befbbf53f4ee078efa97f989a2 - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/winforms - 1d824777942fbf986bee52a502301fd6daae8a49 + b1fd89453ed5e3ad91e4f18c9386cac8dade6e36 - + https://github.com/dotnet/wpf - 6151bed2378b67242a9f1f89d177ca867b73ad47 + 1effdb1edc6b13befbbf53f4ee078efa97f989a2 - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/runtime - 24889f914558a0fa2ce9631788ceaba6936dad8a + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/winforms - 1d824777942fbf986bee52a502301fd6daae8a49 + b1fd89453ed5e3ad91e4f18c9386cac8dade6e36 diff --git a/eng/Versions.props b/eng/Versions.props index 024240d17..d176f5163 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 5.0.0 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 5.0.0 - 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24456.9 5.0.0 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 6.0.0 5.0.0 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 5.0.0 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 - 9.0.0-rc.2.24455.13 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 4.10.0 - 9.0.0-rc.2.24456.5 - 9.0.0-rc.2.24456.5 + 9.0.0-rc.2.24457.2 + 9.0.0-rc.2.24457.2 - 9.0.0-rc.2.24457.2 + 9.0.0-rc.2.24457.4 From 86a354a98e91f0b717373a47b88b53b7bcaa1b18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:17:53 +0000 Subject: [PATCH 032/158] [release/9.0] Update dependencies from dotnet/wpf (#4645) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Drawing.Common: from 9.0.0-rc.2.24457.2 to 9.0.0-rc.2.24459.6 (parent: Microsoft.DotNet.Wpf.GitHub) --- 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 ebce76b00..9292871ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://github.com/dotnet/runtime dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/winforms - b1fd89453ed5e3ad91e4f18c9386cac8dade6e36 + f2b69dd0b3089db1e104c57f02fb374463d00ce2 - + https://github.com/dotnet/wpf - 1effdb1edc6b13befbbf53f4ee078efa97f989a2 + 2cf9b22c374859120e603b77dd2d870d04613b38 - + https://github.com/dotnet/wpf - 1effdb1edc6b13befbbf53f4ee078efa97f989a2 + 2cf9b22c374859120e603b77dd2d870d04613b38 https://github.com/dotnet/runtime @@ -30,13 +30,13 @@ https://github.com/dotnet/runtime dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/winforms - b1fd89453ed5e3ad91e4f18c9386cac8dade6e36 + f2b69dd0b3089db1e104c57f02fb374463d00ce2 - + https://github.com/dotnet/wpf - 1effdb1edc6b13befbbf53f4ee078efa97f989a2 + 2cf9b22c374859120e603b77dd2d870d04613b38 https://github.com/dotnet/runtime @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/winforms - b1fd89453ed5e3ad91e4f18c9386cac8dade6e36 + f2b69dd0b3089db1e104c57f02fb374463d00ce2 diff --git a/eng/Versions.props b/eng/Versions.props index d176f5163..acee39e89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 4.10.0 - 9.0.0-rc.2.24457.2 - 9.0.0-rc.2.24457.2 + 9.0.0-rc.2.24459.6 + 9.0.0-rc.2.24459.6 - 9.0.0-rc.2.24457.4 + 9.0.0-rc.2.24459.4 From 40ef902a0aaaf4aa7b6b7eb6126d0f3563ad668f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:48:27 +0000 Subject: [PATCH 033/158] [release/9.0] Update dependencies from dotnet/arcade (#4647) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9292871ee..8a838e714 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e diff --git a/eng/Versions.props b/eng/Versions.props index acee39e89..003be8be5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24453.1 - 9.0.0-beta.24453.1 + 9.0.0-beta.24459.6 + 9.0.0-beta.24459.6 4.5.0 4.8.6 diff --git a/global.json b/global.json index 3da1dcf6e..8d506a4f1 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-preview.7.24407.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24453.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24459.6", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24459.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From a1c52e59de1b5cd0164cf59d76e0ece32d9e9d06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 12:12:55 +0000 Subject: [PATCH 034/158] [release/9.0] Update dependencies from dotnet/wpf (#4649) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24456.9 to 9.0.0-rc.2.24459.11 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24459.6 to 9.0.0-rc.2.24460.13 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a838e714..9658dbf92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/winforms - f2b69dd0b3089db1e104c57f02fb374463d00ce2 + e0764c2b5b32090f3487330e5be2f960a9aa7f9a - + https://github.com/dotnet/wpf - 2cf9b22c374859120e603b77dd2d870d04613b38 + 011f73fe9d3565de050bf95a9ad29b483004d463 - + https://github.com/dotnet/wpf - 2cf9b22c374859120e603b77dd2d870d04613b38 + 011f73fe9d3565de050bf95a9ad29b483004d463 - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/winforms - f2b69dd0b3089db1e104c57f02fb374463d00ce2 + e0764c2b5b32090f3487330e5be2f960a9aa7f9a - + https://github.com/dotnet/wpf - 2cf9b22c374859120e603b77dd2d870d04613b38 + 011f73fe9d3565de050bf95a9ad29b483004d463 - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/winforms - f2b69dd0b3089db1e104c57f02fb374463d00ce2 + e0764c2b5b32090f3487330e5be2f960a9aa7f9a diff --git a/eng/Versions.props b/eng/Versions.props index 003be8be5..51d841ccb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 5.0.0 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 5.0.0 - 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24459.11 5.0.0 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 6.0.0 5.0.0 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 5.0.0 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 4.10.0 - 9.0.0-rc.2.24459.6 - 9.0.0-rc.2.24459.6 + 9.0.0-rc.2.24460.13 + 9.0.0-rc.2.24460.13 - 9.0.0-rc.2.24459.4 + 9.0.0-rc.2.24461.2 From 83023f422da116fca4e72f43d2fa5fa75a81682d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 02:11:46 +0000 Subject: [PATCH 035/158] [release/9.0] Update dependencies from dotnet/wpf (#4657) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9658dbf92..e7867ab20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms e0764c2b5b32090f3487330e5be2f960a9aa7f9a - + https://github.com/dotnet/wpf - 011f73fe9d3565de050bf95a9ad29b483004d463 + bf9feb0c88c4dc7fc8cd3798b15270f87644a251 - + https://github.com/dotnet/wpf - 011f73fe9d3565de050bf95a9ad29b483004d463 + bf9feb0c88c4dc7fc8cd3798b15270f87644a251 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms e0764c2b5b32090f3487330e5be2f960a9aa7f9a - + https://github.com/dotnet/wpf - 011f73fe9d3565de050bf95a9ad29b483004d463 + bf9feb0c88c4dc7fc8cd3798b15270f87644a251 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 51d841ccb..c66e21f34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 9.0.0-rc.2.24460.13 9.0.0-rc.2.24460.13 - 9.0.0-rc.2.24461.2 + 9.0.0-rc.2.24462.6 From 88b4a1171f5bd687ee99d5cdd5f56d71ae17181f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:16:25 +0000 Subject: [PATCH 036/158] [release/9.0] Update dependencies from dotnet/wpf (#4659) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24460.13 to 9.0.0-rc.2.24462.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7867ab20..9e4489735 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/winforms - e0764c2b5b32090f3487330e5be2f960a9aa7f9a + d40f610b8305c08c35b72021c28693eb80a301d0 - + https://github.com/dotnet/wpf - bf9feb0c88c4dc7fc8cd3798b15270f87644a251 + ed11f24619eae4faf42119e27b1aedc6a2b33a78 - + https://github.com/dotnet/wpf - bf9feb0c88c4dc7fc8cd3798b15270f87644a251 + ed11f24619eae4faf42119e27b1aedc6a2b33a78 - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/winforms - e0764c2b5b32090f3487330e5be2f960a9aa7f9a + d40f610b8305c08c35b72021c28693eb80a301d0 - + https://github.com/dotnet/wpf - bf9feb0c88c4dc7fc8cd3798b15270f87644a251 + ed11f24619eae4faf42119e27b1aedc6a2b33a78 - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/winforms - e0764c2b5b32090f3487330e5be2f960a9aa7f9a + d40f610b8305c08c35b72021c28693eb80a301d0 diff --git a/eng/Versions.props b/eng/Versions.props index c66e21f34..df3a632dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.2.4 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 5.0.0 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 5.0.0 - 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24461.16 5.0.0 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 6.0.0 5.0.0 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 5.0.0 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 4.10.0 - 9.0.0-rc.2.24460.13 - 9.0.0-rc.2.24460.13 + 9.0.0-rc.2.24462.2 + 9.0.0-rc.2.24462.2 - 9.0.0-rc.2.24462.6 + 9.0.0-rc.2.24462.15 From 9fe00a2449749efd6d116454bb20b1c1391174b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:35:32 +0000 Subject: [PATCH 037/158] [release/9.0] Update dependencies from dotnet/arcade (#4661) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e4489735..49e9da685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c diff --git a/eng/Versions.props b/eng/Versions.props index df3a632dd..0b1f50d49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24459.6 - 9.0.0-beta.24459.6 + 9.0.0-beta.24462.3 + 9.0.0-beta.24462.3 4.5.0 4.8.6 diff --git a/global.json b/global.json index 8d506a4f1..ddeff4796 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-preview.7.24407.12" + "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24459.6", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24459.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24462.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24462.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 034dd829270c33a1b5130a7c4255b921967d5793 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:40:17 +0000 Subject: [PATCH 038/158] [release/9.0] Update dependencies from dotnet/arcade (#4663) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49e9da685..01491b81d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 diff --git a/eng/Versions.props b/eng/Versions.props index 0b1f50d49..80ba193d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,8 +11,8 @@ - 9.0.0-beta.24462.3 - 9.0.0-beta.24462.3 + 9.0.0-beta.24463.2 + 9.0.0-beta.24463.2 4.5.0 4.8.6 diff --git a/global.json b/global.json index ddeff4796..ce54e1169 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24462.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24462.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24463.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24463.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 3c9f5eb678529df78401f77deb2b083aead34bd2 Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Mon, 16 Sep 2024 14:05:45 -0700 Subject: [PATCH 039/158] [release/9.0] Update to rtm (#4665) Update to rtm --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 80ba193d2..8e99e09c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,8 +3,8 @@ 9 0 0 - rc - 2 + rtm + false release From b56170cda58f9a93232bf7fc3e68b2f5264a3005 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 02:11:57 +0000 Subject: [PATCH 040/158] [release/9.0] Update dependencies from dotnet/wpf (#4667) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24463.7 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24462.2 to 9.0.0-rc.2.24464.3 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 71 +++++++++---------- 2 files changed, 110 insertions(+), 109 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01491b81d..c1d999bc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/winforms - d40f610b8305c08c35b72021c28693eb80a301d0 + d284f4d12f51d4df1fff76ac0b8609c7a33e5e9a - + https://github.com/dotnet/wpf - ed11f24619eae4faf42119e27b1aedc6a2b33a78 + 8b63614580c93dec7dc313f23c4a756c0fb10a5d - + https://github.com/dotnet/wpf - ed11f24619eae4faf42119e27b1aedc6a2b33a78 + 8b63614580c93dec7dc313f23c4a756c0fb10a5d - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/winforms - d40f610b8305c08c35b72021c28693eb80a301d0 + d284f4d12f51d4df1fff76ac0b8609c7a33e5e9a - + https://github.com/dotnet/wpf - ed11f24619eae4faf42119e27b1aedc6a2b33a78 + 8b63614580c93dec7dc313f23c4a756c0fb10a5d - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/winforms - d40f610b8305c08c35b72021c28693eb80a301d0 + d284f4d12f51d4df1fff76ac0b8609c7a33e5e9a diff --git a/eng/Versions.props b/eng/Versions.props index 8e99e09c6..329583c2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,8 @@ 0 0 rtm - + + false release @@ -22,49 +23,49 @@ 6.2.4 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 5.0.0 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 5.0.0 - 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24463.7 5.0.0 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 6.0.0 5.0.0 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 5.0.0 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 4.10.0 - 9.0.0-rc.2.24462.2 - 9.0.0-rc.2.24462.2 + 9.0.0-rc.2.24464.3 + 9.0.0-rc.2.24464.3 - 9.0.0-rc.2.24462.15 + 9.0.0-rc.2.24466.5 From 6bd66febd89fad313b81905e276757aab2c0723d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 12:11:05 +0000 Subject: [PATCH 041/158] [release/9.0] Update dependencies from dotnet/wpf (#4669) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Drawing.Common: from 9.0.0-rc.2.24464.3 to 9.0.0-rc.2.24466.1 (parent: Microsoft.DotNet.Wpf.GitHub) --- 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 c1d999bc5..e4f1b8dcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://github.com/dotnet/runtime 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/winforms - d284f4d12f51d4df1fff76ac0b8609c7a33e5e9a + f1676f5dcec5d4a84228406113fcad5fe31025af - + https://github.com/dotnet/wpf - 8b63614580c93dec7dc313f23c4a756c0fb10a5d + bd0f4320a7469c789d4e3081927753eb412b1024 - + https://github.com/dotnet/wpf - 8b63614580c93dec7dc313f23c4a756c0fb10a5d + bd0f4320a7469c789d4e3081927753eb412b1024 https://github.com/dotnet/runtime @@ -30,13 +30,13 @@ https://github.com/dotnet/runtime 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/winforms - d284f4d12f51d4df1fff76ac0b8609c7a33e5e9a + f1676f5dcec5d4a84228406113fcad5fe31025af - + https://github.com/dotnet/wpf - 8b63614580c93dec7dc313f23c4a756c0fb10a5d + bd0f4320a7469c789d4e3081927753eb412b1024 https://github.com/dotnet/runtime @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/winforms - d284f4d12f51d4df1fff76ac0b8609c7a33e5e9a + f1676f5dcec5d4a84228406113fcad5fe31025af diff --git a/eng/Versions.props b/eng/Versions.props index 329583c2b..c92636c6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ 4.10.0 - 9.0.0-rc.2.24464.3 - 9.0.0-rc.2.24464.3 + 9.0.0-rc.2.24466.1 + 9.0.0-rc.2.24466.1 - 9.0.0-rc.2.24466.5 + 9.0.0-rc.2.24467.2 From 455ad31ec0111bc2b7db558ea09339722a706af2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 18:09:08 +0000 Subject: [PATCH 042/158] [release/9.0] Update dependencies from dotnet/arcade (#4671) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4f1b8dcc..4c3030289 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 diff --git a/eng/Versions.props b/eng/Versions.props index c92636c6e..6c621cc12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24463.2 - 9.0.0-beta.24463.2 + 9.0.0-beta.24466.2 + 9.0.0-beta.24466.2 4.5.0 4.8.6 diff --git a/global.json b/global.json index ce54e1169..7ff2e4905 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24463.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24463.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24466.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From f37a996ae93c3aaad652c36d43a6245ad090d775 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 02:11:46 +0000 Subject: [PATCH 043/158] [release/9.0] Update dependencies from dotnet/wpf (#4675) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c3030289..0eefed110 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms f1676f5dcec5d4a84228406113fcad5fe31025af - + https://github.com/dotnet/wpf - bd0f4320a7469c789d4e3081927753eb412b1024 + d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 - + https://github.com/dotnet/wpf - bd0f4320a7469c789d4e3081927753eb412b1024 + d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms f1676f5dcec5d4a84228406113fcad5fe31025af - + https://github.com/dotnet/wpf - bd0f4320a7469c789d4e3081927753eb412b1024 + d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6c621cc12..18c2bd9e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.0-rc.2.24466.1 9.0.0-rc.2.24466.1 - 9.0.0-rc.2.24467.2 + 9.0.0-rtm.24467.10 From fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 12:11:46 +0000 Subject: [PATCH 044/158] [release/9.0] Update dependencies from dotnet/wpf (#4677) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24463.7 to 9.0.0-rc.2.24466.12 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rc.2.24466.1 to 9.0.0-rtm.24467.7 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0eefed110..361573611 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/winforms - f1676f5dcec5d4a84228406113fcad5fe31025af + 7112753e467569a0f429931a18a54a97943572cf - + https://github.com/dotnet/wpf - d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 + 68be81e2641422df4f250661d6ee244bf2ca0dc4 - + https://github.com/dotnet/wpf - d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 + 68be81e2641422df4f250661d6ee244bf2ca0dc4 - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/winforms - f1676f5dcec5d4a84228406113fcad5fe31025af + 7112753e467569a0f429931a18a54a97943572cf - + https://github.com/dotnet/wpf - d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 + 68be81e2641422df4f250661d6ee244bf2ca0dc4 - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/winforms - f1676f5dcec5d4a84228406113fcad5fe31025af + 7112753e467569a0f429931a18a54a97943572cf diff --git a/eng/Versions.props b/eng/Versions.props index 18c2bd9e3..b23f20da8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 5.0.0 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 5.0.0 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 5.0.0 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 6.0.0 5.0.0 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 5.0.0 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 4.10.0 - 9.0.0-rc.2.24466.1 - 9.0.0-rc.2.24466.1 + 9.0.0-rtm.24467.7 + 9.0.0-rtm.24467.7 - 9.0.0-rtm.24467.10 + 9.0.0-rtm.24467.12 From 0c58459e895f6cebce7605ac5ecaad6ee554fac9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 02:11:54 +0000 Subject: [PATCH 045/158] [release/9.0] Update dependencies from dotnet/wpf (#4680) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 361573611..97999ce54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms 7112753e467569a0f429931a18a54a97943572cf - + https://github.com/dotnet/wpf - 68be81e2641422df4f250661d6ee244bf2ca0dc4 + 192c01a0784ef654572533a741308aed4e374c54 - + https://github.com/dotnet/wpf - 68be81e2641422df4f250661d6ee244bf2ca0dc4 + 192c01a0784ef654572533a741308aed4e374c54 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms 7112753e467569a0f429931a18a54a97943572cf - + https://github.com/dotnet/wpf - 68be81e2641422df4f250661d6ee244bf2ca0dc4 + 192c01a0784ef654572533a741308aed4e374c54 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b23f20da8..cce348a17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.0-rtm.24467.7 9.0.0-rtm.24467.7 - 9.0.0-rtm.24467.12 + 9.0.0-rtm.24468.5 From 5e06552d5318ab7b40f822b961fb31f842ca1a25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:11:19 +0000 Subject: [PATCH 046/158] [release/9.0] Update dependencies from dotnet/wpf (#4682) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rc.2.24466.12 to 9.0.0-rtm.24467.13 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rtm.24467.7 to 9.0.0-rtm.24468.6 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97999ce54..19d765703 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/winforms - 7112753e467569a0f429931a18a54a97943572cf + 06f1d0a449929d172946782fd187e3b4591a855b - + https://github.com/dotnet/wpf - 192c01a0784ef654572533a741308aed4e374c54 + a33e61012e2a56f01c67a981968d566d5ef459b1 - + https://github.com/dotnet/wpf - 192c01a0784ef654572533a741308aed4e374c54 + a33e61012e2a56f01c67a981968d566d5ef459b1 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/winforms - 7112753e467569a0f429931a18a54a97943572cf + 06f1d0a449929d172946782fd187e3b4591a855b - + https://github.com/dotnet/wpf - 192c01a0784ef654572533a741308aed4e374c54 + a33e61012e2a56f01c67a981968d566d5ef459b1 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + d1f65c27d9bd28bd141af39d4509d387199cc0bd - + https://github.com/dotnet/winforms - 7112753e467569a0f429931a18a54a97943572cf + 06f1d0a449929d172946782fd187e3b4591a855b diff --git a/eng/Versions.props b/eng/Versions.props index cce348a17..e8a0cf380 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 5.0.0 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 5.0.0 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24467.13 5.0.0 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 6.0.0 5.0.0 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 5.0.0 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 + 9.0.0-rtm.24467.13 4.10.0 - 9.0.0-rtm.24467.7 - 9.0.0-rtm.24467.7 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.5 + 9.0.0-rtm.24468.13 From 888714c37e6d148775045771bd5c976ed1964b37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:11:24 +0000 Subject: [PATCH 047/158] [release/9.0] Update dependencies from dotnet/wpf (#4684) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rtm.24467.13 to 9.0.0-rtm.24470.3 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rtm.24468.6 to 9.0.0-rtm.24472.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19d765703..f39abbea0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/winforms - 06f1d0a449929d172946782fd187e3b4591a855b + ed3e6c60a08cae482f78e5f31e87393a995bfbd4 - + https://github.com/dotnet/wpf - a33e61012e2a56f01c67a981968d566d5ef459b1 + bf7ad4568c301e555ae022768f1b6c820c9d74bc - + https://github.com/dotnet/wpf - a33e61012e2a56f01c67a981968d566d5ef459b1 + bf7ad4568c301e555ae022768f1b6c820c9d74bc - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/winforms - 06f1d0a449929d172946782fd187e3b4591a855b + ed3e6c60a08cae482f78e5f31e87393a995bfbd4 - + https://github.com/dotnet/wpf - a33e61012e2a56f01c67a981968d566d5ef459b1 + bf7ad4568c301e555ae022768f1b6c820c9d74bc - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/runtime - d1f65c27d9bd28bd141af39d4509d387199cc0bd + 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/winforms - 06f1d0a449929d172946782fd187e3b4591a855b + ed3e6c60a08cae482f78e5f31e87393a995bfbd4 diff --git a/eng/Versions.props b/eng/Versions.props index e8a0cf380..ad0674210 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 5.0.0 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 5.0.0 - 9.0.0-rtm.24467.13 + 9.0.0-rtm.24470.3 5.0.0 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 6.0.0 5.0.0 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 5.0.0 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 - 9.0.0-rtm.24467.13 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 4.10.0 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 + 9.0.0-rtm.24472.2 + 9.0.0-rtm.24472.2 - 9.0.0-rtm.24468.13 + 9.0.0-rtm.24472.2 From 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:11:20 +0000 Subject: [PATCH 048/158] [release/9.0] Update dependencies from dotnet/wpf (#4687) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Drawing.Common: from 9.0.0-rtm.24472.2 to 9.0.0-rtm.24473.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- 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 f39abbea0..6089f55c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://github.com/dotnet/runtime 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/winforms - ed3e6c60a08cae482f78e5f31e87393a995bfbd4 + aad987c286a32e55b00ffc62387a2774f0f9fc3e - + https://github.com/dotnet/wpf - bf7ad4568c301e555ae022768f1b6c820c9d74bc + 72a11989cac5121368087ae8bfac9c09d0a167d5 - + https://github.com/dotnet/wpf - bf7ad4568c301e555ae022768f1b6c820c9d74bc + 72a11989cac5121368087ae8bfac9c09d0a167d5 https://github.com/dotnet/runtime @@ -30,13 +30,13 @@ https://github.com/dotnet/runtime 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/winforms - ed3e6c60a08cae482f78e5f31e87393a995bfbd4 + aad987c286a32e55b00ffc62387a2774f0f9fc3e - + https://github.com/dotnet/wpf - bf7ad4568c301e555ae022768f1b6c820c9d74bc + 72a11989cac5121368087ae8bfac9c09d0a167d5 https://github.com/dotnet/runtime @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 - + https://github.com/dotnet/winforms - ed3e6c60a08cae482f78e5f31e87393a995bfbd4 + aad987c286a32e55b00ffc62387a2774f0f9fc3e diff --git a/eng/Versions.props b/eng/Versions.props index ad0674210..990f30e8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ 4.10.0 - 9.0.0-rtm.24472.2 - 9.0.0-rtm.24472.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 - 9.0.0-rtm.24472.2 + 9.0.0-rtm.24474.2 From 8d5fdbe583bf7242d461de79b659d5e4d3140587 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:01:42 +0000 Subject: [PATCH 049/158] [release/9.0] Update dependencies from dotnet/arcade (#4689) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6089f55c3..fb7b39db0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 diff --git a/eng/Versions.props b/eng/Versions.props index 990f30e8e..15c1c3a2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24466.2 - 9.0.0-beta.24466.2 + 9.0.0-beta.24473.1 + 9.0.0-beta.24473.1 4.5.0 4.8.6 diff --git a/global.json b/global.json index 7ff2e4905..521e64fd6 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24466.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24473.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From ea45fe711f3747c51211a4580f402dc07de7f5fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:22:47 -0700 Subject: [PATCH 050/158] [release/9.0] Update dependencies from dotnet/wpf (#4692) Update dependencies from https://github.com/dotnet/wpf build 20240924.7 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.0-rtm.24474.2 -> To Version 9.0.0-rtm.24474.7 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.0-rtm.24473.2 -> To Version 9.0.0-rtm.24474.4 (parent: Microsoft.DotNet.Wpf.GitHub Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb7b39db0..3bdeb6b01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/winforms - aad987c286a32e55b00ffc62387a2774f0f9fc3e + 0749a97fb592ed4a5d7ddc8d13acf9f5097f68f7 - + https://github.com/dotnet/wpf - 72a11989cac5121368087ae8bfac9c09d0a167d5 + 95b7cb7c47cf28eb2cf855ff06f91cbe17735af4 - + https://github.com/dotnet/wpf - 72a11989cac5121368087ae8bfac9c09d0a167d5 + 95b7cb7c47cf28eb2cf855ff06f91cbe17735af4 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/winforms - aad987c286a32e55b00ffc62387a2774f0f9fc3e + 0749a97fb592ed4a5d7ddc8d13acf9f5097f68f7 - + https://github.com/dotnet/wpf - 72a11989cac5121368087ae8bfac9c09d0a167d5 + 95b7cb7c47cf28eb2cf855ff06f91cbe17735af4 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 9c9e77e8eec007a6cc5e7d14739b14974dbddc55 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/winforms - aad987c286a32e55b00ffc62387a2774f0f9fc3e + 0749a97fb592ed4a5d7ddc8d13acf9f5097f68f7 diff --git a/eng/Versions.props b/eng/Versions.props index 15c1c3a2e..ec2df6309 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 5.0.0 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 5.0.0 - 9.0.0-rtm.24470.3 + 9.0.0-rtm.24473.2 5.0.0 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 6.0.0 5.0.0 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 5.0.0 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 4.10.0 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24474.4 + 9.0.0-rtm.24474.4 - 9.0.0-rtm.24474.2 + 9.0.0-rtm.24474.7 From bb957f983a1377b7b9e25f2d24539ec4ab890fcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 04:58:48 +0000 Subject: [PATCH 051/158] [release/9.0] Update dependencies from dotnet/wpf (#4697) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bdeb6b01..98e6e7462 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms 0749a97fb592ed4a5d7ddc8d13acf9f5097f68f7 - + https://github.com/dotnet/wpf - 95b7cb7c47cf28eb2cf855ff06f91cbe17735af4 + 32546f1aeee78cb85fe80191126ea3ecbe47aeed - + https://github.com/dotnet/wpf - 95b7cb7c47cf28eb2cf855ff06f91cbe17735af4 + 32546f1aeee78cb85fe80191126ea3ecbe47aeed https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms 0749a97fb592ed4a5d7ddc8d13acf9f5097f68f7 - + https://github.com/dotnet/wpf - 95b7cb7c47cf28eb2cf855ff06f91cbe17735af4 + 32546f1aeee78cb85fe80191126ea3ecbe47aeed https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ec2df6309..6f7d4493a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.0-rtm.24474.4 9.0.0-rtm.24474.4 - 9.0.0-rtm.24474.7 + 9.0.0-rtm.24476.2 From 1e51d832ef830372fdf7f97e7c77a35e3fed368e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:11:27 +0000 Subject: [PATCH 052/158] [release/9.0] Update dependencies from dotnet/wpf (#4700) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rtm.24473.2 to 9.0.0-rtm.24476.4 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rtm.24474.4 to 9.0.0-rtm.24477.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98e6e7462..c47aff402 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/winforms - 0749a97fb592ed4a5d7ddc8d13acf9f5097f68f7 + b40020d58f624c6d280b25645160e0d44e9c9861 - + https://github.com/dotnet/wpf - 32546f1aeee78cb85fe80191126ea3ecbe47aeed + 6f231e871ec7b89657bec4d2b2cea266cb0b2d5e - + https://github.com/dotnet/wpf - 32546f1aeee78cb85fe80191126ea3ecbe47aeed + 6f231e871ec7b89657bec4d2b2cea266cb0b2d5e - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/winforms - 0749a97fb592ed4a5d7ddc8d13acf9f5097f68f7 + b40020d58f624c6d280b25645160e0d44e9c9861 - + https://github.com/dotnet/wpf - 32546f1aeee78cb85fe80191126ea3ecbe47aeed + 6f231e871ec7b89657bec4d2b2cea266cb0b2d5e - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/winforms - 0749a97fb592ed4a5d7ddc8d13acf9f5097f68f7 + b40020d58f624c6d280b25645160e0d44e9c9861 diff --git a/eng/Versions.props b/eng/Versions.props index 6f7d4493a..88dfc2b0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 5.0.0 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 5.0.0 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24476.4 5.0.0 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 6.0.0 5.0.0 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 5.0.0 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 4.10.0 - 9.0.0-rtm.24474.4 - 9.0.0-rtm.24474.4 + 9.0.0-rtm.24477.2 + 9.0.0-rtm.24477.2 - 9.0.0-rtm.24476.2 + 9.0.0-rtm.24479.2 From cb956b41ed58e8bcbfa5e4b85fc2501bee28ac84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:24:45 +0000 Subject: [PATCH 053/158] [release/9.0] Update dependencies from dotnet/arcade (#4705) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c47aff402..958376209 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 diff --git a/eng/Versions.props b/eng/Versions.props index 88dfc2b0f..bc357204f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 + 9.0.0-beta.24501.3 + 9.0.0-beta.24501.3 4.5.0 4.8.6 diff --git a/global.json b/global.json index 521e64fd6..5a13a9f7f 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24473.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24501.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24501.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From df0382842a58d4ef536472443a5b4ecc05c8cf90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:11:49 +0000 Subject: [PATCH 054/158] [release/9.0] Update dependencies from dotnet/wpf (#4707) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24501.6 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rtm.24477.2 to 9.0.0-rtm.24502.8 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 958376209..b1a8a736a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/winforms - b40020d58f624c6d280b25645160e0d44e9c9861 + 388decbda4d707d996bb1820f17d6fa805f6e47c - + https://github.com/dotnet/wpf - 6f231e871ec7b89657bec4d2b2cea266cb0b2d5e + f1d777f471b7ddaccf33ada60034bcf1a9dc06ec - + https://github.com/dotnet/wpf - 6f231e871ec7b89657bec4d2b2cea266cb0b2d5e + f1d777f471b7ddaccf33ada60034bcf1a9dc06ec - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/winforms - b40020d58f624c6d280b25645160e0d44e9c9861 + 388decbda4d707d996bb1820f17d6fa805f6e47c - + https://github.com/dotnet/wpf - 6f231e871ec7b89657bec4d2b2cea266cb0b2d5e + f1d777f471b7ddaccf33ada60034bcf1a9dc06ec - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/winforms - b40020d58f624c6d280b25645160e0d44e9c9861 + 388decbda4d707d996bb1820f17d6fa805f6e47c diff --git a/eng/Versions.props b/eng/Versions.props index bc357204f..8efc7c21c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 5.0.0 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 5.0.0 - 9.0.0-rtm.24476.4 + 9.0.0-rtm.24501.6 5.0.0 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 6.0.0 5.0.0 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 5.0.0 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 4.10.0 - 9.0.0-rtm.24477.2 - 9.0.0-rtm.24477.2 + 9.0.0-rtm.24502.8 + 9.0.0-rtm.24502.8 - 9.0.0-rtm.24479.2 + 9.0.0-rtm.24503.3 From 9a901a200d9605f5c73be47e3eb4879dd63b0537 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:11:12 +0000 Subject: [PATCH 055/158] [release/9.0] Update dependencies from dotnet/wpf (#4710) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Drawing.Common: from 9.0.0-rtm.24502.8 to 9.0.0-rtm.24502.12 (parent: Microsoft.DotNet.Wpf.GitHub) --- 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 b1a8a736a..b86799a81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://github.com/dotnet/runtime 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/winforms - 388decbda4d707d996bb1820f17d6fa805f6e47c + 856508c70a15183eaac3328ee9cc2d40b7806435 - + https://github.com/dotnet/wpf - f1d777f471b7ddaccf33ada60034bcf1a9dc06ec + 63eac6ac4758df3f2755018846d60bba4ba0916d - + https://github.com/dotnet/wpf - f1d777f471b7ddaccf33ada60034bcf1a9dc06ec + 63eac6ac4758df3f2755018846d60bba4ba0916d https://github.com/dotnet/runtime @@ -30,13 +30,13 @@ https://github.com/dotnet/runtime 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/winforms - 388decbda4d707d996bb1820f17d6fa805f6e47c + 856508c70a15183eaac3328ee9cc2d40b7806435 - + https://github.com/dotnet/wpf - f1d777f471b7ddaccf33ada60034bcf1a9dc06ec + 63eac6ac4758df3f2755018846d60bba4ba0916d https://github.com/dotnet/runtime @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/winforms - 388decbda4d707d996bb1820f17d6fa805f6e47c + 856508c70a15183eaac3328ee9cc2d40b7806435 diff --git a/eng/Versions.props b/eng/Versions.props index 8efc7c21c..f8506d6c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ 4.10.0 - 9.0.0-rtm.24502.8 - 9.0.0-rtm.24502.8 + 9.0.0-rtm.24502.12 + 9.0.0-rtm.24502.12 - 9.0.0-rtm.24503.3 + 9.0.0-rtm.24503.10 From 26e096d07d8cad49cf8c5d4e9d72f02bd29f871e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 13:17:38 +0000 Subject: [PATCH 056/158] [release/9.0] Update dependencies from dotnet/arcade (#4714) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 +++++++++++------------ eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 1 + eng/common/templates/job/job.yml | 1 + global.json | 4 ++-- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b86799a81..60a80efd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 diff --git a/eng/Versions.props b/eng/Versions.props index f8506d6c2..7039f5f52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24501.3 - 9.0.0-beta.24501.3 + 9.0.0-beta.24503.2 + 9.0.0-beta.24503.2 4.5.0 4.8.6 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 3d16b41c7..605692d2f 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,6 +1,7 @@ parameters: # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 07d317bf8..d1aeb92fc 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -4,6 +4,7 @@ parameters: componentGovernanceIgnoreDirectories: '' # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/global.json b/global.json index 5a13a9f7f..50fd54672 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24501.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24501.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24503.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 3e194e4cbf1fd161480a18e44c26709af04da360 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:11:31 +0000 Subject: [PATCH 057/158] [release/9.0] Update dependencies from dotnet/wpf (#4716) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rtm.24502.12 to 9.0.0-rtm.24504.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60a80efd5..4e5844680 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/winforms - 856508c70a15183eaac3328ee9cc2d40b7806435 + f9ea17ed57c1d2f5c1675f2c20547e53379af754 - + https://github.com/dotnet/wpf - 63eac6ac4758df3f2755018846d60bba4ba0916d + d7b788d31b241b94cadc7978c7b4791a8e857f96 - + https://github.com/dotnet/wpf - 63eac6ac4758df3f2755018846d60bba4ba0916d + d7b788d31b241b94cadc7978c7b4791a8e857f96 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/winforms - 856508c70a15183eaac3328ee9cc2d40b7806435 + f9ea17ed57c1d2f5c1675f2c20547e53379af754 - + https://github.com/dotnet/wpf - 63eac6ac4758df3f2755018846d60bba4ba0916d + d7b788d31b241b94cadc7978c7b4791a8e857f96 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/winforms - 856508c70a15183eaac3328ee9cc2d40b7806435 + f9ea17ed57c1d2f5c1675f2c20547e53379af754 diff --git a/eng/Versions.props b/eng/Versions.props index 7039f5f52..6ccd4a93a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 5.0.0 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 5.0.0 - 9.0.0-rtm.24501.6 + 9.0.0-rtm.24503.8 5.0.0 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 6.0.0 5.0.0 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 5.0.0 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 4.10.0 - 9.0.0-rtm.24502.12 - 9.0.0-rtm.24502.12 + 9.0.0-rtm.24504.2 + 9.0.0-rtm.24504.2 - 9.0.0-rtm.24503.10 + 9.0.0-rtm.24507.5 From 9faebd769c8f3b66810dbd778902593986496af0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 12:11:12 +0000 Subject: [PATCH 058/158] [release/9.0] Update dependencies from dotnet/wpf (#4722) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Drawing.Common: from 9.0.0-rtm.24504.2 to 9.0.0-rtm.24508.9 (parent: Microsoft.DotNet.Wpf.GitHub) --- 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 4e5844680..5a87dafe7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://github.com/dotnet/runtime 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/winforms - f9ea17ed57c1d2f5c1675f2c20547e53379af754 + a9b23996c0785bf93f1ad3da50ca9590858cc688 - + https://github.com/dotnet/wpf - d7b788d31b241b94cadc7978c7b4791a8e857f96 + c9a076f865bc85668bd602d7769d9ff88692143b - + https://github.com/dotnet/wpf - d7b788d31b241b94cadc7978c7b4791a8e857f96 + c9a076f865bc85668bd602d7769d9ff88692143b https://github.com/dotnet/runtime @@ -30,13 +30,13 @@ https://github.com/dotnet/runtime 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/winforms - f9ea17ed57c1d2f5c1675f2c20547e53379af754 + a9b23996c0785bf93f1ad3da50ca9590858cc688 - + https://github.com/dotnet/wpf - d7b788d31b241b94cadc7978c7b4791a8e857f96 + c9a076f865bc85668bd602d7769d9ff88692143b https://github.com/dotnet/runtime @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/winforms - f9ea17ed57c1d2f5c1675f2c20547e53379af754 + a9b23996c0785bf93f1ad3da50ca9590858cc688 diff --git a/eng/Versions.props b/eng/Versions.props index 6ccd4a93a..20b2761c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ 4.10.0 - 9.0.0-rtm.24504.2 - 9.0.0-rtm.24504.2 + 9.0.0-rtm.24508.9 + 9.0.0-rtm.24508.9 - 9.0.0-rtm.24507.5 + 9.0.0-rtm.24508.7 From 5a738fbb380f7bc2f93e8bb195540091c104a936 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 12:21:44 +0000 Subject: [PATCH 059/158] [release/9.0] Update dependencies from dotnet/wpf (#4724) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rtm.24503.8 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rtm.24508.9 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a87dafe7..cce849419 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/winforms - a9b23996c0785bf93f1ad3da50ca9590858cc688 + 7735f31438f7743e2d5d9d951760c54d8d4c48ec - + https://github.com/dotnet/wpf - c9a076f865bc85668bd602d7769d9ff88692143b + 9609441059fa1e87655d48667e12fc36ac36d9fd - + https://github.com/dotnet/wpf - c9a076f865bc85668bd602d7769d9ff88692143b + 9609441059fa1e87655d48667e12fc36ac36d9fd - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/winforms - a9b23996c0785bf93f1ad3da50ca9590858cc688 + 7735f31438f7743e2d5d9d951760c54d8d4c48ec - + https://github.com/dotnet/wpf - c9a076f865bc85668bd602d7769d9ff88692143b + 9609441059fa1e87655d48667e12fc36ac36d9fd - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/winforms - a9b23996c0785bf93f1ad3da50ca9590858cc688 + 7735f31438f7743e2d5d9d951760c54d8d4c48ec diff --git a/eng/Versions.props b/eng/Versions.props index 20b2761c5..945d790d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 5.0.0 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 5.0.0 - 9.0.0-rtm.24503.8 + 9.0.0-rtm.24508.17 5.0.0 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 6.0.0 5.0.0 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 5.0.0 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 4.10.0 - 9.0.0-rtm.24508.9 - 9.0.0-rtm.24508.9 + 9.0.0-rtm.24509.5 + 9.0.0-rtm.24509.5 - 9.0.0-rtm.24508.7 + 9.0.0-rtm.24509.5 From b45c693bee53041768d5e2b6ae4d115986f36bb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 13:17:10 +0000 Subject: [PATCH 060/158] [release/9.0] Update dependencies from dotnet/arcade (#4725) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cce849419..b9881c92c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + f8071c4233e05022012c3e0cfd39b4e337e8f537 - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + f8071c4233e05022012c3e0cfd39b4e337e8f537 - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + f8071c4233e05022012c3e0cfd39b4e337e8f537 - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + f8071c4233e05022012c3e0cfd39b4e337e8f537 - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + f8071c4233e05022012c3e0cfd39b4e337e8f537 - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + f8071c4233e05022012c3e0cfd39b4e337e8f537 diff --git a/eng/Versions.props b/eng/Versions.props index 945d790d8..a13b27d79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24503.2 - 9.0.0-beta.24503.2 + 9.0.0-beta.24508.3 + 9.0.0-beta.24508.3 4.5.0 4.8.6 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9574f4eb9..22954477a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -900,7 +900,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 50fd54672..eab188636 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-rc.1.24452.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24503.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24508.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24508.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From d487f9bf1a1230658aad75f333b9d8b26d1e876b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 18:30:50 +0000 Subject: [PATCH 061/158] [release/9.0] Update dependencies from dotnet/arcade (#4728) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9881c92c..5d87518f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - f8071c4233e05022012c3e0cfd39b4e337e8f537 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - f8071c4233e05022012c3e0cfd39b4e337e8f537 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - f8071c4233e05022012c3e0cfd39b4e337e8f537 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - f8071c4233e05022012c3e0cfd39b4e337e8f537 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - f8071c4233e05022012c3e0cfd39b4e337e8f537 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - f8071c4233e05022012c3e0cfd39b4e337e8f537 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa diff --git a/eng/Versions.props b/eng/Versions.props index a13b27d79..75f0ed4c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24508.3 - 9.0.0-beta.24508.3 + 9.0.0-beta.24509.3 + 9.0.0-beta.24509.3 4.5.0 4.8.6 diff --git a/global.json b/global.json index eab188636..aa7e60e00 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-rc.1.24452.12" + "dotnet": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24508.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24508.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24509.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 7509137af0f3ea589d85e66a0fd9fb02d966ea12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 12:11:23 +0000 Subject: [PATCH 062/158] [release/9.0] Update dependencies from dotnet/wpf (#4733) [release/9.0] Update dependencies from dotnet/wpf --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d87518f6..a9cb77727 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms 7735f31438f7743e2d5d9d951760c54d8d4c48ec - + https://github.com/dotnet/wpf - 9609441059fa1e87655d48667e12fc36ac36d9fd + f891f78ca7c995291aba23fd9a9bc941824274fa - + https://github.com/dotnet/wpf - 9609441059fa1e87655d48667e12fc36ac36d9fd + f891f78ca7c995291aba23fd9a9bc941824274fa https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms 7735f31438f7743e2d5d9d951760c54d8d4c48ec - + https://github.com/dotnet/wpf - 9609441059fa1e87655d48667e12fc36ac36d9fd + f891f78ca7c995291aba23fd9a9bc941824274fa https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 75f0ed4c4..799b6d3dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.0-rtm.24509.5 9.0.0-rtm.24509.5 - 9.0.0-rtm.24509.5 + 9.0.0-rtm.24511.2 From 6dcf08a327100eee9bf02e4e4bee483cb82d55da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 02:10:43 +0000 Subject: [PATCH 063/158] [release/9.0] Update dependencies from dotnet/wpf (#4739) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24511.16 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24512.2 (parent: Microsoft.DotNet.Wpf.GitHub) --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9cb77727..2eeaf79b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/winforms - 7735f31438f7743e2d5d9d951760c54d8d4c48ec + 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/wpf - f891f78ca7c995291aba23fd9a9bc941824274fa + a1b12b341809b4edcec23a18c1320efbd70a0ef2 - + https://github.com/dotnet/wpf - f891f78ca7c995291aba23fd9a9bc941824274fa + a1b12b341809b4edcec23a18c1320efbd70a0ef2 - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/winforms - 7735f31438f7743e2d5d9d951760c54d8d4c48ec + 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/wpf - f891f78ca7c995291aba23fd9a9bc941824274fa + a1b12b341809b4edcec23a18c1320efbd70a0ef2 - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/winforms - 7735f31438f7743e2d5d9d951760c54d8d4c48ec + 9b822fd70005bf5632d12fe76811b97b3dd044e4 diff --git a/eng/Versions.props b/eng/Versions.props index 799b6d3dd..052979f6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 5.0.0 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 5.0.0 - 9.0.0-rtm.24508.17 + 9.0.0-rtm.24511.16 5.0.0 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 6.0.0 5.0.0 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 5.0.0 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 4.10.0 - 9.0.0-rtm.24509.5 - 9.0.0-rtm.24509.5 + 9.0.0-rtm.24512.2 + 9.0.0-rtm.24512.2 - 9.0.0-rtm.24511.2 + 9.0.0-rtm.24514.2 From 047d8dc076167a16e9fa09f5bd3d348fc262f80a Mon Sep 17 00:00:00 2001 From: Leaf Shi <132890443+LeafShi1@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:45:55 +0800 Subject: [PATCH 064/158] .NET 9 GA stable release change (#4737) * .NET 9 GA stable release change * Update Directory.Build.props to disable error NU5104 * Removing extra condition for * NoWarn NU5104 --------- Co-authored-by: Loni Tra --- Directory.Build.props | 2 ++ Directory.Packages.props | 2 +- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index bd8d0890a..2e4edf7f6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,6 +20,8 @@ 4 true + $(WarningsNotAsErrors);NU5104 + x64 diff --git a/Directory.Packages.props b/Directory.Packages.props index 5caf83a48..4cb5e7928 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,7 @@ true true - $(NoWarn);NU1507 + $(NoWarn);NU1507;NU5104 diff --git a/eng/Versions.props b/eng/Versions.props index 052979f6e..14ac5f775 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - false + true release From 4e65822d7e71361380854d0c1a43ce9380fc4ea2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 06:37:37 +0000 Subject: [PATCH 065/158] [release/9.0] Update dependencies from dotnet/wpf (#4743) [release/9.0] Update dependencies from dotnet/wpf - Coherency Updates: - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Internal.Runtime.WindowsDesktop.Transport: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - Microsoft.Win32.SystemEvents: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.CodeDom: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Configuration.ConfigurationManager: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.Odbc: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Data.OleDb: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.EventLog: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Diagnostics.PerformanceCounter: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.AccountManagement: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices.Protocols: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.DirectoryServices: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Packaging: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.IO.Ports: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Management: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Reflection.Context: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Runtime.Caching: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Pkcs: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.ProtectedData: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Cryptography.Xml: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Security.Permissions: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceModel.Syndication: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ServiceProcess.ServiceController: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Speech: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Text.Encoding.CodePages: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.Threading.AccessControl: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - Microsoft.Private.Winforms: from 9.0.0-rtm.24512.2 to 9.0.0-rtm.24515.14 (parent: Microsoft.DotNet.Wpf.GitHub) - System.ComponentModel.Composition.Registration: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 9.0.0-rtm.24512.2 to 9.0.0 (parent: Microsoft.DotNet.Wpf.GitHub) --- NuGet.config | 5 ++ eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 113 insertions(+), 108 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60f3b650e..8409d09e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2eeaf79b9..905b8c458 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/winforms - 9b822fd70005bf5632d12fe76811b97b3dd044e4 + 5f03f3d8a99d8094fd0067e2497c4ea9b440e324 - + https://github.com/dotnet/wpf - a1b12b341809b4edcec23a18c1320efbd70a0ef2 + 375aed28c289639ec572af58067a31c3d7742ef9 - + https://github.com/dotnet/wpf - a1b12b341809b4edcec23a18c1320efbd70a0ef2 + 375aed28c289639ec572af58067a31c3d7742ef9 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/winforms - 9b822fd70005bf5632d12fe76811b97b3dd044e4 + 5f03f3d8a99d8094fd0067e2497c4ea9b440e324 - + https://github.com/dotnet/wpf - a1b12b341809b4edcec23a18c1320efbd70a0ef2 + 375aed28c289639ec572af58067a31c3d7742ef9 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 - + https://github.com/dotnet/winforms - 9b822fd70005bf5632d12fe76811b97b3dd044e4 + 5f03f3d8a99d8094fd0067e2497c4ea9b440e324 diff --git a/eng/Versions.props b/eng/Versions.props index 14ac5f775..bfb53247b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 5.0.0 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 5.0.0 - 9.0.0-rtm.24511.16 + 9.0.0-rtm.24515.9 5.0.0 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 6.0.0 5.0.0 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 5.0.0 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 4.10.0 - 9.0.0-rtm.24512.2 - 9.0.0-rtm.24512.2 + 9.0.0-rtm.24515.14 + 9.0.0 - 9.0.0-rtm.24514.2 + 9.0.0-rtm.24515.3 From 5307f2abc4387e29964c6f46cb1f63cfdc218602 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 22:01:57 +0000 Subject: [PATCH 066/158] [release/9.0] Update dependencies from dotnet/arcade (#4747) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 4 ++-- .../steps/get-delegation-sas.yml | 11 ++++++++- global.json | 4 ++-- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 905b8c458..84bbde155 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d diff --git a/eng/Versions.props b/eng/Versions.props index bfb53247b..0a782efed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24509.3 - 9.0.0-beta.24509.3 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 4.5.0 4.8.6 diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index d2901470a..9db5617ea 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -31,7 +31,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/global.json b/global.json index aa7e60e00..bd589803f 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24509.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24516.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From f03451de6f16843c3e500897b88c64b62d72f768 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 17 Oct 2024 19:49:01 +0000 Subject: [PATCH 067/158] Merged PR 43915: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.Registry.AccessControl**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.SystemEvents**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.CodeDom**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.ComponentModel.Composition**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Configuration.ConfigurationManager**: from 9.0.0-rtm.24515.9 to 9.0.0-rtm.24508.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24515.14 to 9.0.0-rtm.24509.5 (parent: Microsoft.DotNet.Wpf.GitHub) - ... --- NuGet.config | 1 - eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 111 insertions(+), 112 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8409d09e5..d18fa72a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84bbde155..1c1a243ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/winforms - 5f03f3d8a99d8094fd0067e2497c4ea9b440e324 + 7735f31438f7743e2d5d9d951760c54d8d4c48ec - - https://github.com/dotnet/wpf - 375aed28c289639ec572af58067a31c3d7742ef9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + fbbc5b5c8ef7cbe6230b7fda555b0fc313287b57 - - https://github.com/dotnet/wpf - 375aed28c289639ec572af58067a31c3d7742ef9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + fbbc5b5c8ef7cbe6230b7fda555b0fc313287b57 - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/winforms - 5f03f3d8a99d8094fd0067e2497c4ea9b440e324 + 7735f31438f7743e2d5d9d951760c54d8d4c48ec - - https://github.com/dotnet/wpf - 375aed28c289639ec572af58067a31c3d7742ef9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + fbbc5b5c8ef7cbe6230b7fda555b0fc313287b57 - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f - + https://github.com/dotnet/winforms - 5f03f3d8a99d8094fd0067e2497c4ea9b440e324 + 7735f31438f7743e2d5d9d951760c54d8d4c48ec diff --git a/eng/Versions.props b/eng/Versions.props index 0a782efed..c8b79b51a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 5.0.0 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 5.0.0 - 9.0.0-rtm.24515.9 + 9.0.0-rtm.24508.17 5.0.0 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 6.0.0 5.0.0 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 5.0.0 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 + 9.0.0-rtm.24508.17 4.10.0 - 9.0.0-rtm.24515.14 - 9.0.0 + 9.0.0-rtm.24509.5 + 9.0.0-rtm.24509.5 - 9.0.0-rtm.24515.3 + 9.0.0-rtm.24517.5 From 62df8b9a0cf4a9959e74ff5ea8d661acb6282261 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 17 Oct 2024 22:31:20 +0000 Subject: [PATCH 068/158] Merged PR 43926: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24516.9 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 9.0.0-rtm.24508.17 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.0-rtm.24508.17 to 9.0.0-rtm.24516.9 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.0-rtm.24508.17 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.Registry.AccessControl**: from 9.0.0-rtm.24508.17 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.SystemEvents**: from 9.0.0-rtm.24508.17 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.CodeDom**: from 9.0.0-rtm.24508.17 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.ComponentModel.Composition**: from 9.0.0-rtm.24508.17 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Configuration.ConfigurationManager**: from 9.0.0-rtm.24508.17 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24509.5 to 9.0.0-rtm.24517.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Data.Odbc**: from 9.0.0-rtm.24508.17 to 9.0.0 (parent: Microsoft.Private.Winforms) ... --- NuGet.config | 12 +++ eng/Version.Details.xml | 216 ++++++++++++++++++++-------------------- eng/Versions.props | 68 ++++++------- 3 files changed, 154 insertions(+), 142 deletions(-) diff --git a/NuGet.config b/NuGet.config index d18fa72a7..3ff4c62e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,11 @@ + + + + @@ -21,5 +25,13 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c1a243ce..18c2be439 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/winforms - 7735f31438f7743e2d5d9d951760c54d8d4c48ec + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + d23e6a34d404b5feffbd13c121b13d3f1963eb2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fbbc5b5c8ef7cbe6230b7fda555b0fc313287b57 + d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fbbc5b5c8ef7cbe6230b7fda555b0fc313287b57 + d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/winforms - 7735f31438f7743e2d5d9d951760c54d8d4c48ec + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + d23e6a34d404b5feffbd13c121b13d3f1963eb2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fbbc5b5c8ef7cbe6230b7fda555b0fc313287b57 + d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/runtime - 24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 64edceb090bcd73e7f842a47b31b4fc865f48b08 - - https://github.com/dotnet/winforms - 7735f31438f7743e2d5d9d951760c54d8d4c48ec + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + d23e6a34d404b5feffbd13c121b13d3f1963eb2f diff --git a/eng/Versions.props b/eng/Versions.props index c8b79b51a..cccc44b2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0-rtm.24516.9 + 9.0.0 + 9.0.0 + 9.0.0 5.0.0 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 5.0.0 - 9.0.0-rtm.24508.17 + 9.0.0 5.0.0 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 6.0.0 5.0.0 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 5.0.0 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 - 9.0.0-rtm.24508.17 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0-rtm.24516.9 4.10.0 - 9.0.0-rtm.24509.5 - 9.0.0-rtm.24509.5 + 9.0.0-rtm.24517.4 + 9.0.0 - 9.0.0-rtm.24517.5 + 9.0.0-rtm.24517.7 From 6621e3204f9fd1b1b636602a4822da334b6954da Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 18 Oct 2024 13:58:00 +0000 Subject: [PATCH 069/158] Merged PR 43930: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24517.4 to 9.0.0-rtm.24517.6 (parent: Microso... --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3ff4c62e2..5bbaf62ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18c2be439..7b1d5c7a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d23e6a34d404b5feffbd13c121b13d3f1963eb2f + 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c + 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c + 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d23e6a34d404b5feffbd13c121b13d3f1963eb2f + 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2b1665f79e35cba8f8aac2c03ade7fcd26a4e8c + 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 64edceb090bcd73e7f842a47b31b4fc865f48b08 + 26f329604f8e2255105f273a82de369fbd17e5cb https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d23e6a34d404b5feffbd13c121b13d3f1963eb2f + 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 diff --git a/eng/Versions.props b/eng/Versions.props index cccc44b2c..16f526030 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.0-rtm.24516.9 + 9.0.0-rtm.24517.18 9.0.0 9.0.0 9.0.0 @@ -59,13 +59,13 @@ 9.0.0 9.0.0 9.0.0 - 9.0.0-rtm.24516.9 + 9.0.0-rtm.24517.18 4.10.0 - 9.0.0-rtm.24517.4 + 9.0.0-rtm.24518.2 9.0.0 - 9.0.0-rtm.24517.7 + 9.0.0-rtm.24518.3 From 9a816eb72c124ea885bd62a1852ca1101303aef6 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Sat, 19 Oct 2024 01:07:19 +0000 Subject: [PATCH 070/158] Merged PR 44013: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:96d60e53-364e-4c86-9944-2b28af49d9e4) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 96d60e53-364e-4c86-9944-2b28af49d9e4 - **Build**: 20241018.6 - **Date Produced**: October 18, 2024 7:11:09 PM UTC - **Commit**: bad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 9.0.0-rtm.24518.3 to 9.0.0-rtm.24518.6][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24518.3 to 9.0.0-rtm.24518.6][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24518.3 to 9.0.0-rtm.24518.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb&targetVersion=GCbad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:96d60e53-364e-4c86-9944-2b28af49d9e4) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b1d5c7a4..90d09a2d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb + bad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb + bad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3050beb7a5bafd5f6f7e2257fda5fcf64dcb11cb + bad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 16f526030..d4ce1786b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.0-rtm.24518.2 9.0.0 - 9.0.0-rtm.24518.3 + 9.0.0-rtm.24518.6 From 41da1bdac283fd0fd121945493398939f770643a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 14:05:50 +0000 Subject: [PATCH 071/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20241021.4 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.0-rtm.24518.6 -> To Version 9.0.0-rtm.24521.4 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.0-rtm.24518.2 -> To Version 9.0.0-rtm.24521.1 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5bbaf62ce..69f1f19b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90d09a2d0..bb8b58cb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 + 3fe741b12b6b0d5b000232def507a39247f972ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7 + 1534d6c1ae447b5dcc661d08f2abaa334b045140 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7 + 1534d6c1ae447b5dcc661d08f2abaa334b045140 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 + 3fe741b12b6b0d5b000232def507a39247f972ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bad810ec49d4fd3b977f2ebab5ffe9e85de9e0c7 + 1534d6c1ae447b5dcc661d08f2abaa334b045140 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 26f329604f8e2255105f273a82de369fbd17e5cb + 9c52987919f0223531191d4cfaa6487647bbf52c https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 90c08cb77d1bdbbf0c8230a59876a85a1a265ef6 + 3fe741b12b6b0d5b000232def507a39247f972ba diff --git a/eng/Versions.props b/eng/Versions.props index d4ce1786b..0296a41a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.0-rtm.24517.18 + 9.0.0-rtm.24518.14 9.0.0 9.0.0 9.0.0 @@ -59,13 +59,13 @@ 9.0.0 9.0.0 9.0.0 - 9.0.0-rtm.24517.18 + 9.0.0-rtm.24518.14 4.10.0 - 9.0.0-rtm.24518.2 + 9.0.0-rtm.24521.1 9.0.0 - 9.0.0-rtm.24518.6 + 9.0.0-rtm.24521.4 From c328fcebfb70f2c9e429d51a4fc5b620003720eb Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 23 Oct 2024 09:56:07 +0000 Subject: [PATCH 072/158] [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69f1f19b5..07906dfa5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb8b58cb8..9764dcf13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3fe741b12b6b0d5b000232def507a39247f972ba + f1cbb10e281b9545b9980a148caae895de895f67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1534d6c1ae447b5dcc661d08f2abaa334b045140 + 42170a8179ee2744f25e203ab235144125ddc361 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1534d6c1ae447b5dcc661d08f2abaa334b045140 + 42170a8179ee2744f25e203ab235144125ddc361 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3fe741b12b6b0d5b000232def507a39247f972ba + f1cbb10e281b9545b9980a148caae895de895f67 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1534d6c1ae447b5dcc661d08f2abaa334b045140 + 42170a8179ee2744f25e203ab235144125ddc361 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9c52987919f0223531191d4cfaa6487647bbf52c + 2df113716c90ff0228dab915ce6daffc9789847a https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3fe741b12b6b0d5b000232def507a39247f972ba + f1cbb10e281b9545b9980a148caae895de895f67 diff --git a/eng/Versions.props b/eng/Versions.props index 0296a41a8..ba4e1dcd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.0-rtm.24518.14 + 9.0.0-rtm.24522.12 9.0.0 9.0.0 9.0.0 @@ -59,13 +59,13 @@ 9.0.0 9.0.0 9.0.0 - 9.0.0-rtm.24518.14 + 9.0.0-rtm.24522.12 4.10.0 - 9.0.0-rtm.24521.1 + 9.0.0-rtm.24522.3 9.0.0 - 9.0.0-rtm.24521.4 + 9.0.0-rtm.24522.3 From 2e5178f9d725c4becd3f04f9627f9e45d7469f03 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 23 Oct 2024 17:07:10 +0000 Subject: [PATCH 073/158] Merged PR 44221: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.0-rtm.24522.12 to 9.0.0-rtm.24522.16 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 9.0.0 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.0-rtm.24522.12 to 9.0.0-rtm.24522.16 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.0 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.Registry.AccessControl**: from 9.0.0 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.SystemEvents**: from 9.0.0 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.CodeDom**: from 9.0.0 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.ComponentModel.Composition**: from 9.0.0 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Configuration.ConfigurationManager**: from 9.0.0 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Data.Odbc**: from 9.0.0 to 9.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.0-rtm.24522.3 to 9.0.0-rtm.24523.2 (parent: Microsoft.DotNe... --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 07906dfa5..f7f95f6c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9764dcf13..7712da6c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1cbb10e281b9545b9980a148caae895de895f67 + bcf70f48f3ad07c7747c64601348e1df81f1f19e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42170a8179ee2744f25e203ab235144125ddc361 + c23c8e8b764b527c6bf96b8f38379faae3c4dc1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42170a8179ee2744f25e203ab235144125ddc361 + c23c8e8b764b527c6bf96b8f38379faae3c4dc1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1cbb10e281b9545b9980a148caae895de895f67 + bcf70f48f3ad07c7747c64601348e1df81f1f19e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42170a8179ee2744f25e203ab235144125ddc361 + c23c8e8b764b527c6bf96b8f38379faae3c4dc1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2df113716c90ff0228dab915ce6daffc9789847a + 0456c7e91c34003f26acf8606ba9d20e29f518bd https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1cbb10e281b9545b9980a148caae895de895f67 + bcf70f48f3ad07c7747c64601348e1df81f1f19e diff --git a/eng/Versions.props b/eng/Versions.props index ba4e1dcd2..616550c37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.0-rtm.24522.12 + 9.0.0-rtm.24522.16 9.0.0 9.0.0 9.0.0 @@ -59,13 +59,13 @@ 9.0.0 9.0.0 9.0.0 - 9.0.0-rtm.24522.12 + 9.0.0-rtm.24522.16 4.10.0 - 9.0.0-rtm.24522.3 + 9.0.0-rtm.24523.2 9.0.0 - 9.0.0-rtm.24522.3 + 9.0.0-rtm.24523.2 From 8a1c5b0ab362830e90b7d0cd5be1d1d0f7b0f44f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 29 Oct 2024 12:51:39 +0000 Subject: [PATCH 074/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20241029.2 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.0-rtm.24523.2 -> To Version 9.0.0-rtm.24529.2 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.0-rtm.24523.2 -> To Version 9.0.0-rtm.24529.1 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index f7f95f6c0..2af84290b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7712da6c9..2a4171d29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcf70f48f3ad07c7747c64601348e1df81f1f19e + 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c23c8e8b764b527c6bf96b8f38379faae3c4dc1d + a04736acb8edb533756131d3d5fc55f15cd03d6a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c23c8e8b764b527c6bf96b8f38379faae3c4dc1d + a04736acb8edb533756131d3d5fc55f15cd03d6a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcf70f48f3ad07c7747c64601348e1df81f1f19e + 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c23c8e8b764b527c6bf96b8f38379faae3c4dc1d + a04736acb8edb533756131d3d5fc55f15cd03d6a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0456c7e91c34003f26acf8606ba9d20e29f518bd + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcf70f48f3ad07c7747c64601348e1df81f1f19e + 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 diff --git a/eng/Versions.props b/eng/Versions.props index 616550c37..8676d4b48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.0-rtm.24522.16 + 9.0.0-rtm.24528.9 9.0.0 9.0.0 9.0.0 @@ -59,13 +59,13 @@ 9.0.0 9.0.0 9.0.0 - 9.0.0-rtm.24522.16 + 9.0.0-rtm.24528.9 4.10.0 - 9.0.0-rtm.24523.2 + 9.0.0-rtm.24529.1 9.0.0 - 9.0.0-rtm.24523.2 + 9.0.0-rtm.24529.2 From 9aca005943d1dfe8f5095d39b3f2bf52a6a14b9c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Nov 2024 10:44:00 -0800 Subject: [PATCH 075/158] Update branding to 9.0.1 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0a782efed..6f94e4b1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 0 + 1 rtm From 19c2e2cc1730e32f6a925a404c2ac39b17b5370b Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Wed, 6 Nov 2024 11:17:58 -0800 Subject: [PATCH 076/158] [release/9.0] Change PreReleaseVersionLabel to servicing (#4769) * Change to servicing * add PlatformManifest.txt --- eng/Versions.props | 2 +- .../src/sfx/PlatformManifest.txt | 79 +++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/windowsdesktop/src/sfx/PlatformManifest.txt diff --git a/eng/Versions.props b/eng/Versions.props index 6f94e4b1a..2c0db2efb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 9 0 1 - rtm + servicing diff --git a/src/windowsdesktop/src/sfx/PlatformManifest.txt b/src/windowsdesktop/src/sfx/PlatformManifest.txt new file mode 100644 index 000000000..db9e70f80 --- /dev/null +++ b/src/windowsdesktop/src/sfx/PlatformManifest.txt @@ -0,0 +1,79 @@ +Microsoft.VisualBasic.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Windows.Forms.Design.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Windows.Forms.Primitives.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Windows.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +PresentationCore.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationUI.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +ReachFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +System.Windows.Controls.Ribbon.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +System.Windows.Input.Manipulations.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +System.Xaml.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +UIAutomationClient.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +UIAutomationClientSideProviders.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +UIAutomationProvider.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +UIAutomationTypes.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +WindowsBase.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +WindowsFormsIntegration.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +D3DCompiler_47_cor3.dll|Microsoft.WindowsDesktop.App.Ref||10.0.22621.3233 +PenImc_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.51503 +PresentationNative_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.47404 +vcruntime140_cor3.dll|Microsoft.WindowsDesktop.App.Ref||14.40.33810.0 +wpfgfx_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.51503 +System.Diagnostics.EventLog.Messages.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|0.0.0.0 +Accessibility.dll|Microsoft.WindowsDesktop.App.Ref|4.0.0.0|9.0.24.51514 +Microsoft.VisualBasic.dll|Microsoft.WindowsDesktop.App.Ref|10.1.0.0|9.0.24.51514 +System.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Drawing.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Drawing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Windows.Forms.Design.Editors.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +Microsoft.Win32.Registry.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +Microsoft.Win32.SystemEvents.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.CodeDom.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Configuration.ConfigurationManager.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Diagnostics.EventLog.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Diagnostics.PerformanceCounter.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.DirectoryServices.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Formats.Nrbf.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.IO.Packaging.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Resources.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Security.Cryptography.Pkcs.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Security.Cryptography.ProtectedData.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Security.Cryptography.Xml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Security.Permissions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Threading.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +System.Windows.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 +Microsoft.VisualBasic.Forms.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Drawing.Common.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Private.Windows.Core.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Windows.Forms.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Windows.Forms.Primitives.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +System.Windows.Forms.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 +DirectWriteForwarder.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationCore.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework-SystemCore.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework-SystemData.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework-SystemDrawing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework-SystemXml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework-SystemXmlLinq.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.Aero.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.Aero2.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.AeroLite.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.Classic.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.Fluent.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.Luna.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.Royale.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationFramework.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +PresentationUI.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +ReachFramework.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +System.Printing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +System.Windows.Controls.Ribbon.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +System.Windows.Input.Manipulations.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +System.Windows.Presentation.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +System.Xaml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +UIAutomationClient.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +UIAutomationClientSideProviders.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +UIAutomationProvider.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +UIAutomationTypes.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +WindowsBase.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +WindowsFormsIntegration.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 From 165494fb53661f78ffbed6aa3f86e2e0e77c6c75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 19:48:59 +0000 Subject: [PATCH 077/158] [release/9.0] Update dependencies from dotnet/arcade (#4785) [release/9.0] Update dependencies from dotnet/arcade - Merge branch 'release/9.0' into darc-release/9.0-f497740b-c1cd-4abf-b6aa-342bb8425ea9 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a4171d29..076c5d677 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de diff --git a/eng/Versions.props b/eng/Versions.props index 53d812e3e..4d628be6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 4.5.0 4.8.6 diff --git a/global.json b/global.json index bd589803f..58d1119c2 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24516.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24562.13", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 8bb822ca480f0c5668e4bebe6984afd59b85d507 Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Thu, 14 Nov 2024 13:37:30 -0800 Subject: [PATCH 078/158] [release/9.0] Update PlatformManifest.txt to match 9.0 GA (#4782) Update PlatformManifest.txt to match 9.0 GA --- .../src/sfx/PlatformManifest.txt | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/src/windowsdesktop/src/sfx/PlatformManifest.txt b/src/windowsdesktop/src/sfx/PlatformManifest.txt index db9e70f80..ca1f96c85 100644 --- a/src/windowsdesktop/src/sfx/PlatformManifest.txt +++ b/src/windowsdesktop/src/sfx/PlatformManifest.txt @@ -1,79 +1,79 @@ -Microsoft.VisualBasic.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Windows.Forms.Design.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Windows.Forms.Primitives.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Windows.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -PresentationCore.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationUI.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -ReachFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -System.Windows.Controls.Ribbon.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -System.Windows.Input.Manipulations.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -System.Xaml.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -UIAutomationClient.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -UIAutomationClientSideProviders.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -UIAutomationProvider.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -UIAutomationTypes.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -WindowsBase.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -WindowsFormsIntegration.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +Microsoft.VisualBasic.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Windows.Forms.Design.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Windows.Forms.Primitives.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Windows.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +PresentationCore.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationUI.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +ReachFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +System.Windows.Controls.Ribbon.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +System.Windows.Input.Manipulations.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +System.Xaml.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +UIAutomationClient.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +UIAutomationClientSideProviders.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +UIAutomationProvider.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +UIAutomationTypes.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +WindowsBase.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +WindowsFormsIntegration.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 D3DCompiler_47_cor3.dll|Microsoft.WindowsDesktop.App.Ref||10.0.22621.3233 -PenImc_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.51503 +PenImc_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.52902 PresentationNative_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.47404 vcruntime140_cor3.dll|Microsoft.WindowsDesktop.App.Ref||14.40.33810.0 -wpfgfx_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.51503 +wpfgfx_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.52902 System.Diagnostics.EventLog.Messages.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|0.0.0.0 -Accessibility.dll|Microsoft.WindowsDesktop.App.Ref|4.0.0.0|9.0.24.51514 -Microsoft.VisualBasic.dll|Microsoft.WindowsDesktop.App.Ref|10.1.0.0|9.0.24.51514 -System.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Drawing.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Drawing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Windows.Forms.Design.Editors.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -Microsoft.Win32.Registry.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -Microsoft.Win32.SystemEvents.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.CodeDom.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Configuration.ConfigurationManager.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Diagnostics.EventLog.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Diagnostics.PerformanceCounter.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.DirectoryServices.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Formats.Nrbf.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.IO.Packaging.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Resources.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Security.Cryptography.Pkcs.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Security.Cryptography.ProtectedData.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Security.Cryptography.Xml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Security.Permissions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Threading.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -System.Windows.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51509 -Microsoft.VisualBasic.Forms.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Drawing.Common.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Private.Windows.Core.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Windows.Forms.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Windows.Forms.Primitives.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -System.Windows.Forms.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51514 -DirectWriteForwarder.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationCore.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework-SystemCore.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework-SystemData.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework-SystemDrawing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework-SystemXml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework-SystemXmlLinq.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.Aero.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.Aero2.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.AeroLite.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.Classic.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.Fluent.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.Luna.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.Royale.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationFramework.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -PresentationUI.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -ReachFramework.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -System.Printing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -System.Windows.Controls.Ribbon.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -System.Windows.Input.Manipulations.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -System.Windows.Presentation.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -System.Xaml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -UIAutomationClient.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -UIAutomationClientSideProviders.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -UIAutomationProvider.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -UIAutomationTypes.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -WindowsBase.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 -WindowsFormsIntegration.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.51503 +Accessibility.dll|Microsoft.WindowsDesktop.App.Ref|4.0.0.0|9.0.24.52901 +Microsoft.VisualBasic.dll|Microsoft.WindowsDesktop.App.Ref|10.1.0.0|9.0.24.52901 +System.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Drawing.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Drawing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Windows.Forms.Design.Editors.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +Microsoft.Win32.Registry.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +Microsoft.Win32.SystemEvents.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.CodeDom.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Configuration.ConfigurationManager.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Diagnostics.EventLog.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Diagnostics.PerformanceCounter.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.DirectoryServices.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Formats.Nrbf.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.IO.Packaging.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Resources.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Security.Cryptography.Pkcs.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Security.Cryptography.ProtectedData.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Security.Cryptography.Xml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Security.Permissions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Threading.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +System.Windows.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 +Microsoft.VisualBasic.Forms.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Drawing.Common.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Private.Windows.Core.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Windows.Forms.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Windows.Forms.Primitives.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +System.Windows.Forms.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 +DirectWriteForwarder.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationCore.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework-SystemCore.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework-SystemData.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework-SystemDrawing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework-SystemXml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework-SystemXmlLinq.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.Aero.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.Aero2.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.AeroLite.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.Classic.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.Fluent.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.Luna.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.Royale.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationFramework.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +PresentationUI.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +ReachFramework.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +System.Printing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +System.Windows.Controls.Ribbon.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +System.Windows.Input.Manipulations.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +System.Windows.Presentation.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +System.Xaml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +UIAutomationClient.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +UIAutomationClientSideProviders.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +UIAutomationProvider.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +UIAutomationTypes.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +WindowsBase.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 +WindowsFormsIntegration.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 From 94132ca243d81a659b542213c46119bb53783702 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 13:58:01 +0000 Subject: [PATCH 079/158] [release/9.0] Update dependencies from dotnet/arcade (#4793) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2af84290b..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,8 @@ - - @@ -27,10 +25,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 076c5d677..882c0f78f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 diff --git a/eng/Versions.props b/eng/Versions.props index 4d628be6d..851641559 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 4.5.0 4.8.6 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3f..4f0546dce 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22954477a..aa94fb174 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 58d1119c2..7769f4162 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-rc.2.24474.11" + "dotnet": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24572.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From e74c9bbe3fb41a1d2e0cc0c57ade3c4fea1c715b Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Mon, 25 Nov 2024 10:35:21 -0800 Subject: [PATCH 080/158] Cherry pick d212e0b --- .../src/sfx/Directory.Build.props | 6 +++- ...crosoft.WindowsDesktop.App.Runtime.sfxproj | 34 +++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/windowsdesktop/src/sfx/Directory.Build.props b/src/windowsdesktop/src/sfx/Directory.Build.props index 46e1d1b94..8b2a2cc50 100644 --- a/src/windowsdesktop/src/sfx/Directory.Build.props +++ b/src/windowsdesktop/src/sfx/Directory.Build.props @@ -31,6 +31,11 @@ + + + + + @@ -50,7 +55,6 @@ - diff --git a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj index 49cfeb8e4..fc9a9a155 100644 --- a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj +++ b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj @@ -10,20 +10,14 @@ LatestPatch + + + + + - - - - - - - - - - - @@ -42,24 +36,34 @@ - + + + - - - + + + + + + + + + + + From 2108f5d48ca55fc96add2b91e2918bfea74e3dfe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 4 Dec 2024 20:45:29 +0000 Subject: [PATCH 081/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20241204.3 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.0-rtm.24529.2 -> To Version 9.0.1-rtm.24604.3 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.0-rtm.24529.1 -> To Version 9.0.1-servicing.24604.3 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 4 ++ eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 108 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2b9f84f81..c613a9b3f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,10 @@ + + @@ -25,8 +27,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 882c0f78f..803a5f102 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 + a0809427d515428bce23e14fe9ca6214d19054c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a04736acb8edb533756131d3d5fc55f15cd03d6a + aaef42794203f462cc23c0ffab4086108938182e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a04736acb8edb533756131d3d5fc55f15cd03d6a + aaef42794203f462cc23c0ffab4086108938182e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 + a0809427d515428bce23e14fe9ca6214d19054c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a04736acb8edb533756131d3d5fc55f15cd03d6a + aaef42794203f462cc23c0ffab4086108938182e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 + a0809427d515428bce23e14fe9ca6214d19054c4 diff --git a/eng/Versions.props b/eng/Versions.props index 851641559..a69aa151e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.0-rtm.24528.9 - 9.0.0 - 9.0.0 - 9.0.0 + 9.0.1-servicing.24603.14 + 9.0.1 + 9.0.1 + 9.0.1 5.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 5.0.0 - 9.0.0 + 9.0.1 5.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 6.0.0 5.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 5.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0-rtm.24528.9 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1 + 9.0.1-servicing.24603.14 4.10.0 - 9.0.0-rtm.24529.1 - 9.0.0 + 9.0.1-servicing.24604.3 + 9.0.1 - 9.0.0-rtm.24529.2 + 9.0.1-rtm.24604.3 From af254ce17dd6827439a1e51006ddf804a0093a13 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 11 Dec 2024 05:15:33 +0000 Subject: [PATCH 082/158] Merged PR 45864: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.1-servicing.24603.14 to 9.0.1-servicing.24610.10 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 9.0.1 to 9.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.1-servicing.24603.14 to 9.0.1-servicing.24610.10 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.1 to 9.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.Registry.AccessControl**: from 9.0.1 to 9.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.SystemEvents**: from 9.0.1 to 9.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.CodeDom**: from 9.0.1 to 9.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.ComponentModel.Composition**: from 9.0.1 to 9.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Configuration.ConfigurationManager**: from 9.0.1 to 9.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Data.Odbc**: from 9... --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index c613a9b3f..faba0e3fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 803a5f102..1239ae44b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a0809427d515428bce23e14fe9ca6214d19054c4 + 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aaef42794203f462cc23c0ffab4086108938182e + f26d48cd826cfd41bed05708d1cdc9e219bf8514 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aaef42794203f462cc23c0ffab4086108938182e + f26d48cd826cfd41bed05708d1cdc9e219bf8514 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a0809427d515428bce23e14fe9ca6214d19054c4 + 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aaef42794203f462cc23c0ffab4086108938182e + f26d48cd826cfd41bed05708d1cdc9e219bf8514 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 69ae1ac0682f4b69b1d733fbf3bdee2825a2aab2 + c8acea22626efab11c13778c028975acdc34678f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a0809427d515428bce23e14fe9ca6214d19054c4 + 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd diff --git a/eng/Versions.props b/eng/Versions.props index a69aa151e..12a269c7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.1-servicing.24603.14 + 9.0.1-servicing.24610.10 9.0.1 9.0.1 9.0.1 @@ -59,13 +59,13 @@ 9.0.1 9.0.1 9.0.1 - 9.0.1-servicing.24603.14 + 9.0.1-servicing.24610.10 4.10.0 - 9.0.1-servicing.24604.3 + 9.0.1-servicing.24610.6 9.0.1 - 9.0.1-rtm.24604.3 + 9.0.1-rtm.24610.3 From 1091be1b0809946e91041dc227cd722eeb5e1eff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 05:12:36 +0000 Subject: [PATCH 083/158] [release/9.0] Update dependencies from dotnet/arcade (#4831) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++------ eng/Versions.props | 4 +- eng/common/cross/toolchain.cmake | 67 +++++++++++++++----------------- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 4 +- 6 files changed, 49 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 882c0f78f..eaae1aab6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b diff --git a/eng/Versions.props b/eng/Versions.props index 851641559..656a3b3f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 + 9.0.0-beta.24623.3 + 9.0.0-beta.24623.3 4.5.0 4.8.6 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9a4e285a5..9a7ecfbd4 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -81,7 +81,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64") else() set(TOOLCHAIN "riscv64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu") endif() endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -127,30 +127,25 @@ endif() # Specify include paths if(TIZEN) - if(TARGET_ARCH_NAME STREQUAL "arm") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) - endif() - if(TARGET_ARCH_NAME STREQUAL "armel") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) - endif() - if(TARGET_ARCH_NAME STREQUAL "arm64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x86") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "riscv64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu) + function(find_toolchain_dir prefix) + # Dynamically find the version subdirectory + file(GLOB DIRECTORIES "${prefix}/*") + list(GET DIRECTORIES 0 FIRST_MATCH) + get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME) + + set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE) + endfunction() + + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + else() + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() + + message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}") + + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++) + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() if(ANDROID) @@ -272,21 +267,21 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -297,10 +292,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() add_toolchain_linker_flag(-m32) if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aa94fb174..a46b6deb7 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -320,7 +320,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 00473c9f9..1159726a1 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -232,7 +232,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then diff --git a/global.json b/global.json index 7769f4162..2cc2ca977 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24572.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24623.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24623.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From c687022e2ec161cb6dd3c6665022213893fccf56 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Jan 2025 11:44:27 -0800 Subject: [PATCH 084/158] Update branding to 9.0.2 (#4841) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 656a3b3f9..9a537c850 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 1 + 2 servicing From 8139d665179fa0b245525d477e2997a4ae8f4e57 Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Tue, 7 Jan 2025 15:31:39 -0800 Subject: [PATCH 085/158] [release/9.0] Update MicroBuild to v4 (#4845) Update MicroBuild to v4 --- eng/pipelines/jobs/windows-build-PR.yml | 2 +- eng/pipelines/jobs/windows-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/jobs/windows-build-PR.yml b/eng/pipelines/jobs/windows-build-PR.yml index 4dd72e69b..42b44f4a1 100644 --- a/eng/pipelines/jobs/windows-build-PR.yml +++ b/eng/pipelines/jobs/windows-build-PR.yml @@ -43,7 +43,7 @@ jobs: - template: /eng/common/templates/steps/enable-internal-sources.yml - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: MicroBuildSigningPlugin@2 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin for Signing inputs: signType: $(SignType) diff --git a/eng/pipelines/jobs/windows-build.yml b/eng/pipelines/jobs/windows-build.yml index bc5f0d021..90563d970 100644 --- a/eng/pipelines/jobs/windows-build.yml +++ b/eng/pipelines/jobs/windows-build.yml @@ -38,7 +38,7 @@ jobs: steps: - template: /eng/common/templates-official/steps/enable-internal-sources.yml - - task: MicroBuildSigningPlugin@2 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin for Signing inputs: signType: $(SignType) From 33f1965b57a35ac173d4d6ab1b2c1a53834d7596 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 10 Jan 2025 16:23:55 +0000 Subject: [PATCH 086/158] Merged PR 46637: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:96d60e53-364e-4c86-9944-2b28af49d9e4) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 96d60e53-364e-4c86-9944-2b28af49d9e4 - **Build**: 20250107.10 - **Date Produced**: January 8, 2025 5:50:59 AM UTC - **Commit**: 268a89320f55f14cc8a2cec94020f7bf44417fbf - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCf26d48cd826cfd41bed05708d1cdc9e219bf8514&targetVersion=GC268a89320f55f14cc8a2cec94020f7bf44417fbf&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:96d60e53-364e-4c86-9944-2b28af49d9e4) --- NuGet.config | 20 ++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index faba0e3fc..d3a438b12 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,19 @@ + + + + + + + + + + @@ -27,9 +37,19 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32ab66c6e..14f68c848 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f26d48cd826cfd41bed05708d1cdc9e219bf8514 + 268a89320f55f14cc8a2cec94020f7bf44417fbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f26d48cd826cfd41bed05708d1cdc9e219bf8514 + 268a89320f55f14cc8a2cec94020f7bf44417fbf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f26d48cd826cfd41bed05708d1cdc9e219bf8514 + 268a89320f55f14cc8a2cec94020f7bf44417fbf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d58143f3f..6e625bad4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.1-servicing.24610.6 9.0.1 - 9.0.1-rtm.24610.3 + 9.0.2-rtm.25057.10 From da7273a5fdd6f30c583d86b302fd7ca30a5c73d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2025 05:19:56 +0000 Subject: [PATCH 087/158] [release/9.0] Update dependencies from dotnet/arcade (#4853) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eaae1aab6..036834e06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 diff --git a/eng/Versions.props b/eng/Versions.props index 9a537c850..4510989b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.24623.3 - 9.0.0-beta.24623.3 + 9.0.0-beta.25058.5 + 9.0.0-beta.25058.5 4.5.0 4.8.6 diff --git a/global.json b/global.json index 2cc2ca977..a2cee627d 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24623.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24623.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25058.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 17cca8f69eec5aea1bc83178fcc06fa8c23dfded Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Jan 2025 05:02:09 +0000 Subject: [PATCH 088/158] Update dependencies from https://github.com/dotnet/arcade build 20250115.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks From Version 9.0.0-beta.25058.5 -> To Version 9.0.0-beta.25065.2 --- NuGet.config | 20 ++++++++++++++++++++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/template-guidance.md | 2 +- global.json | 6 +++--- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index faba0e3fc..d3a438b12 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,19 @@ + + + + + + + + + + @@ -27,9 +37,19 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3285b9aa0..a5ba8b634 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 diff --git a/eng/Versions.props b/eng/Versions.props index d96d1c9bc..0a82fd4c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 4.5.0 4.8.6 diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 5ef6c30ba..98bbc1ded 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -57,7 +57,7 @@ extends: Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). -# Development notes +## Development notes **Folder / file structure** diff --git a/global.json b/global.json index a2cee627d..9bc98fac8 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100" + "dotnet": "9.0.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25058.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25065.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From f971ec245a9aa0e7677b2fe6a565e2979cc59fde Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 18:01:31 +0000 Subject: [PATCH 089/158] Merged PR 46841: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.1-servicing.24610.10 to 9.0.2-servicing.25066.10 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.1-servicing.24610.10 to 9.0.2-servicing.25066.10 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.Registry.AccessControl**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.SystemEvents**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.CodeDom**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.ComponentModel.Composition**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Configuration.ConfigurationManager**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Data.Odbc**: from 9.0.1 to 9.0.2 (parent: Microsoft... --- NuGet.config | 28 ++------ eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 132 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3a438b12..6221a03a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,20 +9,10 @@ - - - + - - - - - - - - - + @@ -37,20 +27,10 @@ - - - + - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13f406130..4ea7ab462 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 268a89320f55f14cc8a2cec94020f7bf44417fbf + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 268a89320f55f14cc8a2cec94020f7bf44417fbf + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 268a89320f55f14cc8a2cec94020f7bf44417fbf + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f diff --git a/eng/Versions.props b/eng/Versions.props index 17b22cab2..50e9cc306 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.1-servicing.24610.10 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2-servicing.25066.10 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 6.0.0 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1-servicing.24610.10 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2-servicing.25066.10 4.10.0 - 9.0.1-servicing.24610.6 - 9.0.1 + 9.0.2-servicing.25066.8 + 9.0.2 - 9.0.2-rtm.25057.10 + 9.0.2-rtm.25067.2 From 1283aee1a1e28c335c1b94672673dacd0f069b8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 05:30:07 +0000 Subject: [PATCH 090/158] [release/9.0] Update dependencies from dotnet/arcade (#4895) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/internal/Tools.csproj | 10 ---------- global.json | 4 ++-- 4 files changed, 16 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5ba8b634..5fa793560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 diff --git a/eng/Versions.props b/eng/Versions.props index 0a82fd4c3..ce90148fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 4.5.0 4.8.6 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 32f79dfb3..feaa6d208 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -15,16 +15,6 @@ - - - - https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - - $(RestoreSources); - https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - - diff --git a/global.json b/global.json index 9bc98fac8..53876b4e8 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25065.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25077.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From e2557064b53f5cffc581f9a47f90dc61992ef499 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 4 Feb 2025 11:41:23 -0800 Subject: [PATCH 091/158] Update branding to 9.0.3 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ce90148fc..0f28a43c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 2 + 3 servicing From 165dd8022535e8de0a0ad3ab5ff3ae12973d1a2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 05:17:30 +0000 Subject: [PATCH 092/158] [release/9.0] Update dependencies from dotnet/arcade (#4929) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fa793560..aeadba615 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 diff --git a/eng/Versions.props b/eng/Versions.props index 0f28a43c6..7aa569164 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25077.4 - 9.0.0-beta.25077.4 + 9.0.0-beta.25111.5 + 9.0.0-beta.25111.5 4.5.0 4.8.6 diff --git a/global.json b/global.json index 53876b4e8..66a8a8a19 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.102" + "dotnet": "9.0.103" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25077.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25111.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 97524695e33f328f45ae21009e7287d1c378ed66 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Wed, 12 Feb 2025 20:29:32 +0000 Subject: [PATCH 093/158] Merged PR 47588: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.2-servicing.25066.10 to 9.0.3-servicing.25111.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 9.0.2 to 9.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.2-servicing.25066.10 to 9.0.3-servicing.25111.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.2 to 9.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.Registry.AccessControl**: from 9.0.2 to 9.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.SystemEvents**: from 9.0.2 to 9.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.CodeDom**: from 9.0.2 to 9.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.ComponentModel.Composition**: from 9.0.2 to 9.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Configuration.ConfigurationManager**: from 9.0.2 to 9.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.2-servicing.25066.8 to 9.0.3-servicing.25111.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Data.Odbc**: from 9.0.2 to 9.0.3 (parent: Microsoft... --- NuGet.config | 32 ++------- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 136 deletions(-) diff --git a/NuGet.config b/NuGet.config index 855bc8520..2b633f22e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,22 +9,10 @@ - - - - + - - - - - - - - - - + @@ -39,22 +27,10 @@ - - - - + - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9b863e2a..84eea5a2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f15a0b2339942cc52d7c24cb82739d8401ead77f + a0c1376228b4ce7378393ab29c33c9d76125a052 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 + 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 + 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f15a0b2339942cc52d7c24cb82739d8401ead77f + a0c1376228b4ce7378393ab29c33c9d76125a052 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 + 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f15a0b2339942cc52d7c24cb82739d8401ead77f + a0c1376228b4ce7378393ab29c33c9d76125a052 diff --git a/eng/Versions.props b/eng/Versions.props index 8e01d8ae6..a25ae1234 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.2-servicing.25066.10 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3-servicing.25111.13 + 9.0.3 + 9.0.3 + 9.0.3 5.0.0 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 5.0.0 - 9.0.2 + 9.0.3 5.0.0 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 6.0.0 5.0.0 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 5.0.0 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2-servicing.25066.10 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3-servicing.25111.13 4.10.0 - 9.0.2-servicing.25066.8 - 9.0.2 + 9.0.3-servicing.25111.6 + 9.0.3 - 9.0.2-rtm.25067.2 + 9.0.3-rtm.25112.4 From 192ae85f186d0aead89c901bbb6dd7096138fed3 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 12 Feb 2025 14:12:24 -0800 Subject: [PATCH 094/158] Merging internal commits for release/9.0 (#4927) * Merged PR 46637: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:96d60e53-364e-4c86-9944-2b28af49d9e4) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 96d60e53-364e-4c86-9944-2b28af49d9e4 - **Build**: 20250107.10 - **Date Produced**: January 8, 2025 5:50:59 AM UTC - **Commit**: 268a89320f55f14cc8a2cec94020f7bf44417fbf - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCf26d48cd826cfd41bed05708d1cdc9e219bf8514&targetVersion=GC268a89320f55f14cc8a2cec94020f7bf44417fbf&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:96d60e53-364e-4c86-9944-2b28af49d9e4) * Merged PR 46841: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.1-servicing.24610.10 to 9.0.2-servicing.25066.10 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.1-servicing.24610.10 to 9.0.2-servicing.25066.10 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.Registry.AccessControl**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.SystemEvents**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.CodeDom**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.ComponentModel.Composition**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Configuration.ConfigurationManager**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Data.Odbc**: from 9.0.1 to 9.0.2 (parent: Microsoft... --------- Co-authored-by: Mirroring Co-authored-by: ProductConstructionServiceProd --- NuGet.config | 28 ++------ eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 132 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3a438b12..6221a03a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,20 +9,10 @@ - - - + - - - - - - - - - + @@ -37,20 +27,10 @@ - - - + - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aeadba615..d9b863e2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f26d48cd826cfd41bed05708d1cdc9e219bf8514 + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f26d48cd826cfd41bed05708d1cdc9e219bf8514 + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f26d48cd826cfd41bed05708d1cdc9e219bf8514 + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f diff --git a/eng/Versions.props b/eng/Versions.props index 7aa569164..8e01d8ae6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.1-servicing.24610.10 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2-servicing.25066.10 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 6.0.0 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1-servicing.24610.10 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2-servicing.25066.10 4.10.0 - 9.0.1-servicing.24610.6 - 9.0.1 + 9.0.2-servicing.25066.8 + 9.0.2 - 9.0.1-rtm.24610.3 + 9.0.2-rtm.25067.2 From e684a3ed19564bb677c538c2b66c2fb3f5bc2ed9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Feb 2025 20:30:52 +0000 Subject: [PATCH 095/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250213.4 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.3-rtm.25112.4 -> To Version 9.0.3-rtm.25113.4 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.Drawing.Common From Version 9.0.3-servicing.25111.6 -> To Version 9.0.3-servicing.25112.2 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2b633f22e..47bb7dba3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84eea5a2b..8e025734e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a0c1376228b4ce7378393ab29c33c9d76125a052 + 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 + f58f709bc102a0d15aa6ffe4d9a7435bebd3079e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 + f58f709bc102a0d15aa6ffe4d9a7435bebd3079e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -30,13 +30,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a0c1376228b4ce7378393ab29c33c9d76125a052 + 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4b241d5e744d9a9d4bbd50a559807c3c4cdf41a7 + f58f709bc102a0d15aa6ffe4d9a7435bebd3079e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a0c1376228b4ce7378393ab29c33c9d76125a052 + 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 diff --git a/eng/Versions.props b/eng/Versions.props index a25ae1234..dffcd7ed0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ 4.10.0 - 9.0.3-servicing.25111.6 + 9.0.3-servicing.25112.2 9.0.3 - 9.0.3-rtm.25112.4 + 9.0.3-rtm.25113.4 From 703d7bd908d1874bef38a8419e7e75e906ddb694 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 6 Mar 2025 10:59:15 -0800 Subject: [PATCH 096/158] Update branding to 9.0.4 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8e01d8ae6..febce5cc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 3 + 4 servicing From 650f6812b7178e80feac24e7e7412d529b7b1f1c Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Tue, 11 Mar 2025 00:29:39 +0000 Subject: [PATCH 097/158] [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47bb7dba3..47e39b552 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,13 @@ + + + + @@ -27,9 +31,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e025734e..b3878cb5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f58f709bc102a0d15aa6ffe4d9a7435bebd3079e + 1f303f9fe25e7c22084baa982c0620f4bf132687 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f58f709bc102a0d15aa6ffe4d9a7435bebd3079e + 1f303f9fe25e7c22084baa982c0620f4bf132687 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f58f709bc102a0d15aa6ffe4d9a7435bebd3079e + 1f303f9fe25e7c22084baa982c0620f4bf132687 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a5db1aad6..e0e11e896 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.3-servicing.25112.2 9.0.3 - 9.0.3-rtm.25113.4 + 9.0.4-rtm.25156.11 From 3caeb1988a1e934ecd3441b14c4519e9e1ecc903 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 12 Mar 2025 17:28:40 +0000 Subject: [PATCH 098/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250312.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.4-rtm.25156.11 -> To Version 9.0.4-rtm.25162.1 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.3-servicing.25112.2 -> To Version 9.0.4-servicing.25161.9 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 16 ++--- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 120 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47e39b552..5848bc836 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,14 +9,10 @@ - - - + - - - + @@ -31,14 +27,10 @@ - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3878cb5c..0b07a33f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 + 0a16d41b77fda8232942730d68a63ea8d8f40fa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1f303f9fe25e7c22084baa982c0620f4bf132687 + 31fe0975854275984f6af10941b4cb84901d4e31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1f303f9fe25e7c22084baa982c0620f4bf132687 + 31fe0975854275984f6af10941b4cb84901d4e31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 + 0a16d41b77fda8232942730d68a63ea8d8f40fa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1f303f9fe25e7c22084baa982c0620f4bf132687 + 31fe0975854275984f6af10941b4cb84901d4e31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 + 0a16d41b77fda8232942730d68a63ea8d8f40fa1 diff --git a/eng/Versions.props b/eng/Versions.props index e0e11e896..7fe288146 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4-servicing.25160.22 + 9.0.4 + 9.0.4 + 9.0.4 5.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 5.0.0 - 9.0.3 + 9.0.4 5.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 6.0.0 5.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 5.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3-servicing.25111.13 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25160.22 4.10.0 - 9.0.3-servicing.25112.2 - 9.0.3 + 9.0.4-servicing.25161.9 + 9.0.4 - 9.0.4-rtm.25156.11 + 9.0.4-rtm.25162.1 From 16e7f30655b65064106dc2d6d6b92e4655609996 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 22:47:18 +0000 Subject: [PATCH 099/158] [release/9.0] Update dependencies from dotnet/arcade (#4971) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 8 +++++++ eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 4 ++-- .../core-templates/steps/generate-sbom.yml | 2 +- eng/common/generate-sbom-prep.ps1 | 20 +++++++++++----- eng/common/generate-sbom-prep.sh | 17 ++++++++----- eng/common/templates-official/job/job.yml | 1 + global.json | 6 ++--- 8 files changed, 52 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47bb7dba3..47e39b552 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,13 @@ + + + + @@ -27,9 +31,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e025734e..859541f9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + f33d9e642f0e68a61312164cd9e0baf4e142a999 diff --git a/eng/Versions.props b/eng/Versions.props index a5db1aad6..39b27569c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25111.5 - 9.0.0-beta.25111.5 + 9.0.0-beta.25161.4 + 9.0.0-beta.25161.4 4.5.0 4.8.6 diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index d938b60e1..56a090094 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -38,7 +38,7 @@ steps: PackageName: ${{ parameters.packageName }} BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) ${{ if ne(parameters.IgnoreDirectories, '') }}: AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index 3e5c1c74a..a0c7d792a 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -4,18 +4,26 @@ Param( . $PSScriptRoot\pipeline-logging-functions.ps1 +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" +$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' +$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName + +Write-Host "Artifact name before : $ArtifactName" +Write-Host "Artifact name after : $SafeArtifactName" + Write-Host "Creating dir $ManifestDirPath" + # create directory for sbom manifest to be placed -if (!(Test-Path -path $ManifestDirPath)) +if (!(Test-Path -path $SbomGenerationDir)) { - New-Item -ItemType Directory -path $ManifestDirPath - Write-Host "Successfully created directory $ManifestDirPath" + New-Item -ItemType Directory -path $SbomGenerationDir + Write-Host "Successfully created directory $SbomGenerationDir" } else{ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." } Write-Host "Updating artifact name" -$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' -Write-Host "Artifact name $artifact_name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index d5c76dc82..b8ecca72b 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -14,19 +14,24 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . $scriptroot/pipeline-logging-functions.sh + +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" manifest_dir=$1 -if [ ! -d "$manifest_dir" ] ; then - mkdir -p "$manifest_dir" - echo "Sbom directory created." $manifest_dir +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir else Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." fi -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" echo "Artifact name before : "$artifact_name -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" echo "Artifact name after : "$safe_artifact_name export ARTIFACT_NAME=$safe_artifact_name echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 605692d2f..817555505 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -16,6 +16,7 @@ jobs: parameters: PackageVersion: ${{ parameters.packageVersion }} BuildDropPath: ${{ parameters.buildDropPath }} + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom publishArtifacts: false # publish artifacts diff --git a/global.json b/global.json index 66a8a8a19..234432ef0 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.103" + "dotnet": "9.0.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25111.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25161.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 0e1c578ab2d3bffe1abf4bab2e51ced5f3cf6299 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 17:30:55 +0000 Subject: [PATCH 100/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250314.2 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.4-rtm.25162.1 -> To Version 9.0.4-rtm.25164.2 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.4-servicing.25161.9 -> To Version 9.0.4-servicing.25163.12 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5848bc836..042e28d9a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d3e6bf9b..dd47bcdfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0a16d41b77fda8232942730d68a63ea8d8f40fa1 + ca42d9e58480ab4ebb845027c44c6b4f10e0539d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 31fe0975854275984f6af10941b4cb84901d4e31 + 33f5371cc258de0a72569adf1e9fbcbf04256a17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 31fe0975854275984f6af10941b4cb84901d4e31 + 33f5371cc258de0a72569adf1e9fbcbf04256a17 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0a16d41b77fda8232942730d68a63ea8d8f40fa1 + ca42d9e58480ab4ebb845027c44c6b4f10e0539d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 31fe0975854275984f6af10941b4cb84901d4e31 + 33f5371cc258de0a72569adf1e9fbcbf04256a17 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0a16d41b77fda8232942730d68a63ea8d8f40fa1 + ca42d9e58480ab4ebb845027c44c6b4f10e0539d diff --git a/eng/Versions.props b/eng/Versions.props index 7540a60a4..54da174f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.4-servicing.25160.22 + 9.0.4-servicing.25163.5 9.0.4 9.0.4 9.0.4 @@ -59,13 +59,13 @@ 9.0.4 9.0.4 9.0.4 - 9.0.4-servicing.25160.22 + 9.0.4-servicing.25163.5 4.10.0 - 9.0.4-servicing.25161.9 + 9.0.4-servicing.25163.12 9.0.4 - 9.0.4-rtm.25162.1 + 9.0.4-rtm.25164.2 From 55944340e09a3e801edf5aa80c2f1ea364412204 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 15 Mar 2025 05:24:11 +0000 Subject: [PATCH 101/158] [release/9.0] Update dependencies from dotnet/arcade (#4979) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 859541f9e..99e6dfe24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - f33d9e642f0e68a61312164cd9e0baf4e142a999 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee diff --git a/eng/Versions.props b/eng/Versions.props index 39b27569c..dd29e3603 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25161.4 - 9.0.0-beta.25161.4 + 9.0.0-beta.25164.2 + 9.0.0-beta.25164.2 4.5.0 4.8.6 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a46b6deb7..22b49e09d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 1159726a1..01b09b657 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -295,7 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 234432ef0..2bf154553 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25161.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25164.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From d288f6826761f8f00de16f05ac8eb674d3f2a55b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Mar 2025 16:56:23 +0000 Subject: [PATCH 102/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250317.4 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.4-rtm.25164.2 -> To Version 9.0.4-rtm.25167.4 --- NuGet.config | 4 ++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 042e28d9a..f9fc1cb33 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,11 @@ + + @@ -27,9 +29,11 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3db8efc98..ae26f8fe0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms ca42d9e58480ab4ebb845027c44c6b4f10e0539d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 33f5371cc258de0a72569adf1e9fbcbf04256a17 + 8874b4de2e00a50abc08144de95ebc30fed8aaf2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 33f5371cc258de0a72569adf1e9fbcbf04256a17 + 8874b4de2e00a50abc08144de95ebc30fed8aaf2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms ca42d9e58480ab4ebb845027c44c6b4f10e0539d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 33f5371cc258de0a72569adf1e9fbcbf04256a17 + 8874b4de2e00a50abc08144de95ebc30fed8aaf2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 34e017ec0..9832e5095 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.4-servicing.25163.12 9.0.4 - 9.0.4-rtm.25164.2 + 9.0.4-rtm.25167.4 From 4dee2b5d7272d777546a76e7dede541009046853 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Mar 2025 20:58:00 +0000 Subject: [PATCH 103/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250317.10 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.4-rtm.25164.2 -> To Version 9.0.4-rtm.25167.10 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.Drawing.Common From Version 9.0.4-servicing.25163.12 -> To Version 9.0.4-servicing.25166.1 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 6 ++---- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index f9fc1cb33..bae40d40a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,8 +13,7 @@ - - + @@ -33,8 +32,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae26f8fe0..6ae587dff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ca42d9e58480ab4ebb845027c44c6b4f10e0539d + 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8874b4de2e00a50abc08144de95ebc30fed8aaf2 + 877eb06cb466a51cb7cf2dafbfa69a19321da113 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8874b4de2e00a50abc08144de95ebc30fed8aaf2 + 877eb06cb466a51cb7cf2dafbfa69a19321da113 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -30,13 +30,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ca42d9e58480ab4ebb845027c44c6b4f10e0539d + 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8874b4de2e00a50abc08144de95ebc30fed8aaf2 + 877eb06cb466a51cb7cf2dafbfa69a19321da113 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ca42d9e58480ab4ebb845027c44c6b4f10e0539d + 17ea9d1d2d534af247cef70a122c3aac9bd25846 diff --git a/eng/Versions.props b/eng/Versions.props index 9832e5095..102e77e3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ 4.10.0 - 9.0.4-servicing.25163.12 + 9.0.4-servicing.25166.1 9.0.4 - 9.0.4-rtm.25167.4 + 9.0.4-rtm.25167.10 From a104b312c261f9c3ce070bbd369c629858a2b1cd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 31 Mar 2025 15:11:45 +0000 Subject: [PATCH 104/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250331.2 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.4-rtm.25167.10 -> To Version 9.0.4-rtm.25181.2 --- NuGet.config | 2 ++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index bae40d40a..85fb3e8ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ae587dff..3af9b5bb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 877eb06cb466a51cb7cf2dafbfa69a19321da113 + 7f4d8de55957f12c43eb5ed521143d1d4fd99a4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 877eb06cb466a51cb7cf2dafbfa69a19321da113 + 7f4d8de55957f12c43eb5ed521143d1d4fd99a4b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 877eb06cb466a51cb7cf2dafbfa69a19321da113 + 7f4d8de55957f12c43eb5ed521143d1d4fd99a4b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 102e77e3b..23bd5743b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.4-servicing.25166.1 9.0.4 - 9.0.4-rtm.25167.10 + 9.0.4-rtm.25181.2 From bfdeeccec0b102a9f511d7f334cf7ede99b795b2 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 2 Apr 2025 10:43:57 -0700 Subject: [PATCH 105/158] Update branding to 9.0.5 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dd29e3603..b41f8a61a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 4 + 5 servicing From 51331cbe2d706c814cdc0f9a1bd9eea0ce05f81e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 3 Apr 2025 05:04:32 +0000 Subject: [PATCH 106/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250402.10 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.4-rtm.25181.2 -> To Version 9.0.5-rtm.25202.10 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3af9b5bb7..7f3176235 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7f4d8de55957f12c43eb5ed521143d1d4fd99a4b + 5d71b8271225492d36cd7f9aed6dad89750e1716 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7f4d8de55957f12c43eb5ed521143d1d4fd99a4b + 5d71b8271225492d36cd7f9aed6dad89750e1716 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7f4d8de55957f12c43eb5ed521143d1d4fd99a4b + 5d71b8271225492d36cd7f9aed6dad89750e1716 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6844a1f53..257632601 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.4-servicing.25166.1 9.0.4 - 9.0.4-rtm.25181.2 + 9.0.5-rtm.25202.10 From 855f2ec72ef89c56411f12bec9d53d05b0fe388f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Apr 2025 05:18:37 +0000 Subject: [PATCH 107/158] [release/9.0] Update dependencies from dotnet/arcade (#5017) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 12 ------------ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47e39b552..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,14 +9,8 @@ - - - - - - @@ -31,14 +25,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99e6dfe24..a0a3d9a94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 diff --git a/eng/Versions.props b/eng/Versions.props index b41f8a61a..7f8855709 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25164.2 - 9.0.0-beta.25164.2 + 9.0.0-beta.25204.5 + 9.0.0-beta.25204.5 4.5.0 4.8.6 diff --git a/global.json b/global.json index 2bf154553..d3a71dd45 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25164.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25204.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25204.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 828794fc3851b88e4de26dfd10dd0a5e7d3e20af Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 7 Apr 2025 05:22:59 +0000 Subject: [PATCH 108/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250406.3 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.4-rtm.25181.2 -> To Version 9.0.5-rtm.25206.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f3176235..ab9048888 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5d71b8271225492d36cd7f9aed6dad89750e1716 + 91e411b04e304175e1d5b809f42de03d7d8743f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5d71b8271225492d36cd7f9aed6dad89750e1716 + 91e411b04e304175e1d5b809f42de03d7d8743f8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5d71b8271225492d36cd7f9aed6dad89750e1716 + 91e411b04e304175e1d5b809f42de03d7d8743f8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 257632601..45f2a7d96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.4-servicing.25166.1 9.0.4 - 9.0.5-rtm.25202.10 + 9.0.5-rtm.25206.3 From 90bd8e13c968ee93516db4fd4077ace8068e6788 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 05:18:27 +0000 Subject: [PATCH 109/158] [release/9.0] Update dependencies from dotnet/arcade (#5028) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0a3d9a94..a0b3fd4ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 diff --git a/eng/Versions.props b/eng/Versions.props index 7f8855709..1ebd72496 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25204.5 - 9.0.0-beta.25204.5 + 9.0.0-beta.25208.6 + 9.0.0-beta.25208.6 4.5.0 4.8.6 diff --git a/global.json b/global.json index d3a71dd45..65cf86748 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.104" + "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25204.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25204.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25208.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 036113aff9d4d8b7668779ffaa62e4642f8c565a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Apr 2025 05:39:47 +0000 Subject: [PATCH 110/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250408.3 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.5-rtm.25206.3 -> To Version 9.0.5-rtm.25208.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3847bda2..92355a14f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 91e411b04e304175e1d5b809f42de03d7d8743f8 + c976de79e7e2a0dcde181d38a9d7f62d96f072b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 91e411b04e304175e1d5b809f42de03d7d8743f8 + c976de79e7e2a0dcde181d38a9d7f62d96f072b9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 91e411b04e304175e1d5b809f42de03d7d8743f8 + c976de79e7e2a0dcde181d38a9d7f62d96f072b9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bf6074e89..a7ca487e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.4-servicing.25166.1 9.0.4 - 9.0.5-rtm.25206.3 + 9.0.5-rtm.25208.3 From 866886d67c3318c2761cd763f02bf2c2cee176d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Apr 2025 09:19:40 +0000 Subject: [PATCH 111/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250414.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.5-rtm.25208.3 -> To Version 9.0.5-rtm.25214.1 --- NuGet.config | 10 ---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 87f2edace..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,8 @@ - - - - - @@ -30,13 +25,8 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92355a14f..df40998ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c976de79e7e2a0dcde181d38a9d7f62d96f072b9 + 82bc1c769074be9920614fafa44c8435d2243953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c976de79e7e2a0dcde181d38a9d7f62d96f072b9 + 82bc1c769074be9920614fafa44c8435d2243953 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 17ea9d1d2d534af247cef70a122c3aac9bd25846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c976de79e7e2a0dcde181d38a9d7f62d96f072b9 + 82bc1c769074be9920614fafa44c8435d2243953 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a7ca487e2..763acd244 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.4-servicing.25166.1 9.0.4 - 9.0.5-rtm.25208.3 + 9.0.5-rtm.25214.1 From a069014182cdb9dc478ee9eb8555d6e4a6ab23b2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Apr 2025 21:52:47 +0000 Subject: [PATCH 112/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250416.2 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.5-rtm.25214.1 -> To Version 9.0.5-rtm.25216.2 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.4-servicing.25166.1 -> To Version 9.0.5-servicing.25216.1 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 4 ++ eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 108 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2b9f84f81..b9ace0812 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,10 @@ + + @@ -25,8 +27,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df40998ef..a4a7048e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 17ea9d1d2d534af247cef70a122c3aac9bd25846 + 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 82bc1c769074be9920614fafa44c8435d2243953 + 6df813d45ebffd2739980b7f372767ac5fd68e2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 82bc1c769074be9920614fafa44c8435d2243953 + 6df813d45ebffd2739980b7f372767ac5fd68e2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 17ea9d1d2d534af247cef70a122c3aac9bd25846 + 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 82bc1c769074be9920614fafa44c8435d2243953 + 6df813d45ebffd2739980b7f372767ac5fd68e2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 17ea9d1d2d534af247cef70a122c3aac9bd25846 + 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 diff --git a/eng/Versions.props b/eng/Versions.props index 763acd244..fa5757398 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.4-servicing.25163.5 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5-servicing.25215.9 + 9.0.5 + 9.0.5 + 9.0.5 5.0.0 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 5.0.0 - 9.0.4 + 9.0.5 5.0.0 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 6.0.0 5.0.0 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 5.0.0 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4-servicing.25163.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5-servicing.25215.9 4.10.0 - 9.0.4-servicing.25166.1 - 9.0.4 + 9.0.5-servicing.25216.1 + 9.0.5 - 9.0.5-rtm.25214.1 + 9.0.5-rtm.25216.2 From fbef6f1a5852a69fc993bc4865ac9d4d8c33449a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 23 Apr 2025 07:10:21 +0000 Subject: [PATCH 113/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250422.11 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.5-rtm.25216.2 -> To Version 9.0.5-rtm.25222.11 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index b9ace0812..ecfe8ea48 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,13 @@ + + + + @@ -27,9 +31,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4a7048e8..8f961fdfd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6df813d45ebffd2739980b7f372767ac5fd68e2a + aded4c09d9f59a6fb5fcdfca54fa324becddcb4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6df813d45ebffd2739980b7f372767ac5fd68e2a + aded4c09d9f59a6fb5fcdfca54fa324becddcb4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6df813d45ebffd2739980b7f372767ac5fd68e2a + aded4c09d9f59a6fb5fcdfca54fa324becddcb4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index fa5757398..b70124bc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.5-servicing.25216.1 9.0.5 - 9.0.5-rtm.25216.2 + 9.0.5-rtm.25222.11 From a8f0c0c6d65cc48ee8f1739b71e849bfa98619b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 27 Apr 2025 02:12:48 +0000 Subject: [PATCH 114/158] [release/9.0] Update dependencies from dotnet/arcade (#5060) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 4 ++-- .../core-templates/job/source-build.yml | 2 ++ .../job/source-index-stage1.yml | 4 ++-- .../core-templates/steps/source-build.yml | 1 + global.json | 4 ++-- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 042e28d9a..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,8 @@ - - @@ -27,10 +25,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32606f024..eb8a13d27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 diff --git a/eng/Versions.props b/eng/Versions.props index f4c5f812b..b3611ff9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25208.6 - 9.0.0-beta.25208.6 + 9.0.0-beta.25225.6 + 9.0.0-beta.25225.6 4.5.0 4.8.6 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c4713c8b6..d47f09d58 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -26,6 +26,8 @@ parameters: # Specifies the build script to invoke to perform the build in the repo. The default # './build.sh' should work for typical Arcade repositories, but this is customizable for # difficult situations. + # buildArguments: '' + # Specifies additional build arguments to pass to the build script. # jobProperties: {} # A list of job properties to inject at the top level, for potential extensibility beyond # container and pool. diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 205fb5b3a..8b833332b 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240522.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb..37133b55b 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -79,6 +79,7 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ + ${{ parameters.platform.buildArguments }} \ $officialBuildArgs \ $internalRuntimeDownloadArgs \ $internalRestoreArgs \ diff --git a/global.json b/global.json index 65cf86748..5e9b00f94 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25208.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25225.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 4c8f1b8340f8f8981f036b79039079173c7a4bd6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 28 Apr 2025 07:43:07 +0000 Subject: [PATCH 115/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250427.4 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.5-rtm.25222.11 -> To Version 9.0.5-rtm.25227.4 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f961fdfd..f8a116f6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,12 +9,12 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf aded4c09d9f59a6fb5fcdfca54fa324becddcb4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf aded4c09d9f59a6fb5fcdfca54fa324becddcb4f @@ -34,7 +34,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf aded4c09d9f59a6fb5fcdfca54fa324becddcb4f diff --git a/eng/Versions.props b/eng/Versions.props index b70124bc4..25fd8cff8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.5-servicing.25216.1 9.0.5 - 9.0.5-rtm.25222.11 + 9.0.5-rtm.25227.4 From df7b89222af74e0619234803344fafec5f48d792 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 02:13:16 +0000 Subject: [PATCH 116/158] [release/9.0] Update dependencies from dotnet/arcade (#5069) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb8a13d27..586c15f06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + dba26274ff5a0906a1880443fc3c0466d1a298ae - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + dba26274ff5a0906a1880443fc3c0466d1a298ae - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + dba26274ff5a0906a1880443fc3c0466d1a298ae - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + dba26274ff5a0906a1880443fc3c0466d1a298ae - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + dba26274ff5a0906a1880443fc3c0466d1a298ae - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + dba26274ff5a0906a1880443fc3c0466d1a298ae diff --git a/eng/Versions.props b/eng/Versions.props index b3611ff9a..5c4ab91ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25225.6 - 9.0.0-beta.25225.6 + 9.0.0-beta.25255.3 + 9.0.0-beta.25255.3 4.5.0 4.8.6 diff --git a/global.json b/global.json index 5e9b00f94..678bd0719 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25225.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25255.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From be1816e707a4fb09bf4c74bd9c4e6f935de30e12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 02:12:11 +0000 Subject: [PATCH 117/158] [release/9.0] Update dependencies from dotnet/arcade (#5071) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 586c15f06..8b8e5590b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - dba26274ff5a0906a1880443fc3c0466d1a298ae + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - dba26274ff5a0906a1880443fc3c0466d1a298ae + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - dba26274ff5a0906a1880443fc3c0466d1a298ae + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - dba26274ff5a0906a1880443fc3c0466d1a298ae + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - dba26274ff5a0906a1880443fc3c0466d1a298ae + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - dba26274ff5a0906a1880443fc3c0466d1a298ae + 1cfa39f82d00b3659a3d367bc344241946e10681 diff --git a/eng/Versions.props b/eng/Versions.props index 5c4ab91ba..d88bb3a84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25255.3 - 9.0.0-beta.25255.3 + 9.0.0-beta.25255.5 + 9.0.0-beta.25255.5 4.5.0 4.8.6 diff --git a/global.json b/global.json index 678bd0719..4c5a011b0 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25255.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25255.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From c49e649000b0272533aa31c1e5196bec9853d30d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 7 May 2025 14:47:24 -0700 Subject: [PATCH 118/158] Update branding to 9.0.6 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d88bb3a84..935b9306c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 5 + 6 servicing From 196a12061c226c9f2ceca04f59649b9ae8581dd9 Mon Sep 17 00:00:00 2001 From: Tanya Solyanik Date: Fri, 9 May 2025 15:42:35 -0700 Subject: [PATCH 119/158] Update Windows.Compatibility external packages --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 935b9306c..15404b17b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,7 +16,7 @@ 9.0.0-beta.25255.5 4.5.0 - 4.8.6 + 4.9.0 4.7.0 4.7.0 4.7.0 @@ -61,7 +61,7 @@ 9.0.4 9.0.4-servicing.25163.5 - 4.10.0 + 4.10.3 9.0.4-servicing.25163.12 9.0.4 From 6d81721fc5dbf1d4c4539823e33fbfd0c04b81c8 Mon Sep 17 00:00:00 2001 From: Tanya Solyanik Date: Mon, 12 May 2025 14:23:42 -0700 Subject: [PATCH 120/158] do not pin package versions to the GA release, keep them up-to-date with the latest servicing release. THis is the default arcade behavior, thus let it generate the manifest. --- .../Microsoft.WindowsDesktop.App.Ref.sfxproj | 4 - .../src/sfx/PlatformManifest.txt | 79 ------------------- 2 files changed, 83 deletions(-) delete mode 100644 src/windowsdesktop/src/sfx/PlatformManifest.txt diff --git a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj index 5340a7c87..8f80dac5a 100644 --- a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj +++ b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj @@ -7,7 +7,6 @@ windowsdesktop-targeting-pack win-x64;win-x86;win-arm64 WindowsDesktop.TargetingPack - false false PACKAGE.md @@ -30,7 +29,4 @@ - - - diff --git a/src/windowsdesktop/src/sfx/PlatformManifest.txt b/src/windowsdesktop/src/sfx/PlatformManifest.txt deleted file mode 100644 index ca1f96c85..000000000 --- a/src/windowsdesktop/src/sfx/PlatformManifest.txt +++ /dev/null @@ -1,79 +0,0 @@ -Microsoft.VisualBasic.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Windows.Forms.Design.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Windows.Forms.Primitives.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Windows.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -PresentationCore.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationUI.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -ReachFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -System.Windows.Controls.Ribbon.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -System.Windows.Input.Manipulations.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -System.Xaml.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -UIAutomationClient.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -UIAutomationClientSideProviders.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -UIAutomationProvider.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -UIAutomationTypes.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -WindowsBase.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -WindowsFormsIntegration.resources.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -D3DCompiler_47_cor3.dll|Microsoft.WindowsDesktop.App.Ref||10.0.22621.3233 -PenImc_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.52902 -PresentationNative_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.47404 -vcruntime140_cor3.dll|Microsoft.WindowsDesktop.App.Ref||14.40.33810.0 -wpfgfx_cor3.dll|Microsoft.WindowsDesktop.App.Ref||9.0.24.52902 -System.Diagnostics.EventLog.Messages.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|0.0.0.0 -Accessibility.dll|Microsoft.WindowsDesktop.App.Ref|4.0.0.0|9.0.24.52901 -Microsoft.VisualBasic.dll|Microsoft.WindowsDesktop.App.Ref|10.1.0.0|9.0.24.52901 -System.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Drawing.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Drawing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Windows.Forms.Design.Editors.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -Microsoft.Win32.Registry.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -Microsoft.Win32.SystemEvents.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.CodeDom.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Configuration.ConfigurationManager.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Diagnostics.EventLog.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Diagnostics.PerformanceCounter.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.DirectoryServices.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Formats.Nrbf.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.IO.Packaging.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Resources.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Security.Cryptography.Pkcs.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Security.Cryptography.ProtectedData.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Security.Cryptography.Xml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Security.Permissions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Threading.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -System.Windows.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52809 -Microsoft.VisualBasic.Forms.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Drawing.Common.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Private.Windows.Core.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Windows.Forms.Design.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Windows.Forms.Primitives.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -System.Windows.Forms.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52901 -DirectWriteForwarder.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationCore.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework-SystemCore.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework-SystemData.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework-SystemDrawing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework-SystemXml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework-SystemXmlLinq.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.Aero.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.Aero2.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.AeroLite.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.Classic.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.Fluent.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.Luna.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.Royale.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationFramework.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -PresentationUI.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -ReachFramework.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -System.Printing.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -System.Windows.Controls.Ribbon.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -System.Windows.Input.Manipulations.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -System.Windows.Presentation.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -System.Xaml.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -UIAutomationClient.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -UIAutomationClientSideProviders.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -UIAutomationProvider.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -UIAutomationTypes.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -WindowsBase.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 -WindowsFormsIntegration.dll|Microsoft.WindowsDesktop.App.Ref|9.0.0.0|9.0.24.52902 From 835b0916a39304e69c1ac347b62cbb5fa830714c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 May 2025 02:13:07 +0000 Subject: [PATCH 121/158] [release/9.0] Update dependencies from dotnet/arcade (#5087) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 32 ++ eng/Version.Details.xml | 24 +- eng/Versions.props | 4 +- global.json | 4 +- .../build-configuration.json | 4 + .../eng/common/PSScriptAnalyzerSettings.psd1 | 11 + src/arcade/eng/common/README.md | 28 ++ src/arcade/eng/common/SetupNugetSources.ps1 | 171 ++++++++ src/arcade/eng/common/SetupNugetSources.sh | 167 ++++++++ src/arcade/eng/common/build.cmd | 3 + .../common/core-templates/job/onelocbuild.yml | 121 ++++++ .../core-templates/jobs/source-build.yml | 58 +++ .../post-build/common-variables.yml | 22 + .../post-build/setup-maestro-vars.yml | 74 ++++ .../steps/component-governance.yml | 16 + .../steps/enable-internal-runtimes.yml | 32 ++ .../steps/enable-internal-sources.yml | 47 ++ .../steps/get-federated-access-token.yml | 42 ++ .../steps/publish-build-artifacts.yml | 20 + .../steps/publish-pipeline-artifacts.yml | 20 + .../core-templates/steps/retain-build.yml | 28 ++ .../core-templates/steps/send-to-helix.yml | 93 ++++ .../variables/pool-providers.yml | 8 + .../eng/common/cross/arm/tizen/tizen.patch | 9 + .../eng/common/cross/armel/tizen/tizen.patch | 9 + .../common/cross/riscv64/tizen/tizen.patch | 9 + .../eng/common/cross/tizen-build-rootfs.sh | 82 ++++ src/arcade/eng/common/darc-init.ps1 | 47 ++ src/arcade/eng/common/darc-init.sh | 82 ++++ src/arcade/eng/common/dotnet-install.cmd | 2 + src/arcade/eng/common/dotnet-install.ps1 | 28 ++ src/arcade/eng/common/dotnet-install.sh | 94 ++++ .../common/enable-cross-org-publishing.ps1 | 13 + src/arcade/eng/common/generate-locproject.ps1 | 189 +++++++++ src/arcade/eng/common/generate-sbom-prep.ps1 | 29 ++ src/arcade/eng/common/generate-sbom-prep.sh | 39 ++ src/arcade/eng/common/helixpublish.proj | 27 ++ src/arcade/eng/common/init-tools-native.cmd | 3 + src/arcade/eng/common/init-tools-native.ps1 | 203 +++++++++ src/arcade/eng/common/init-tools-native.sh | 238 +++++++++++ .../eng/common/internal-feed-operations.ps1 | 132 ++++++ .../eng/common/internal-feed-operations.sh | 141 ++++++ .../eng/common/internal/Directory.Build.props | 11 + src/arcade/eng/common/internal/NuGet.config | 7 + src/arcade/eng/common/internal/Tools.csproj | 22 + .../common/loc/P22DotNetHtmlLocalization.lss | 29 ++ src/arcade/eng/common/msbuild.ps1 | 28 ++ src/arcade/eng/common/msbuild.sh | 58 +++ .../eng/common/native/CommonLibrary.psm1 | 401 ++++++++++++++++++ .../eng/common/native/common-library.sh | 172 ++++++++ src/arcade/eng/common/native/init-compiler.sh | 146 +++++++ .../eng/common/native/init-distro-rid.sh | 110 +++++ .../eng/common/native/init-os-and-arch.sh | 85 ++++ .../eng/common/native/install-cmake-test.sh | 117 +++++ src/arcade/eng/common/native/install-cmake.sh | 117 +++++ src/arcade/eng/common/native/install-tool.ps1 | 132 ++++++ .../eng/common/pipeline-logging-functions.ps1 | 260 ++++++++++++ .../eng/common/pipeline-logging-functions.sh | 206 +++++++++ .../post-build/check-channel-consistency.ps1 | 48 +++ .../common/post-build/nuget-validation.ps1 | 22 + .../common/post-build/nuget-verification.ps1 | 121 ++++++ .../eng/common/post-build/redact-logs.ps1 | 89 ++++ .../post-build/sourcelink-validation.ps1 | 327 ++++++++++++++ .../common/post-build/symbols-validation.ps1 | 337 +++++++++++++++ src/arcade/eng/common/retain-build.ps1 | 45 ++ src/arcade/eng/common/sdl/NuGet.config | 18 + .../eng/common/sdl/configure-sdl-tool.ps1 | 130 ++++++ .../eng/common/sdl/execute-all-sdl-tools.ps1 | 167 ++++++++ .../common/sdl/extract-artifact-archives.ps1 | 63 +++ .../common/sdl/extract-artifact-packages.ps1 | 82 ++++ src/arcade/eng/common/sdl/init-sdl.ps1 | 55 +++ src/arcade/eng/common/sdl/run-sdl.ps1 | 49 +++ src/arcade/eng/common/sdl/sdl.ps1 | 38 ++ .../eng/common/sdl/trim-assets-version.ps1 | 75 ++++ src/arcade/eng/common/template-guidance.md | 133 ++++++ .../templates-official/job/onelocbuild.yml | 7 + .../job/publish-build-assets.yml | 7 + .../templates-official/job/source-build.yml | 7 + .../job/source-index-stage1.yml | 7 + .../templates-official/jobs/codeql-build.yml | 7 + .../common/templates-official/jobs/jobs.yml | 7 + .../templates-official/jobs/source-build.yml | 7 + .../post-build/common-variables.yml | 8 + .../post-build/post-build.yml | 8 + .../post-build/setup-maestro-vars.yml | 8 + .../steps/component-governance.yml | 7 + .../steps/enable-internal-runtimes.yml | 9 + .../steps/enable-internal-sources.yml | 7 + .../steps/generate-sbom.yml | 7 + .../steps/get-delegation-sas.yml | 7 + .../steps/get-federated-access-token.yml | 7 + .../templates-official/steps/publish-logs.yml | 7 + .../steps/publish-pipeline-artifacts.yml | 28 ++ .../templates-official/steps/retain-build.yml | 7 + .../steps/send-to-helix.yml | 7 + .../templates-official/steps/source-build.yml | 7 + .../variables/pool-providers.yml | 45 ++ .../variables/sdl-variables.yml | 7 + .../eng/common/templates/job/onelocbuild.yml | 7 + .../templates/job/publish-build-assets.yml | 7 + .../eng/common/templates/job/source-build.yml | 7 + .../templates/job/source-index-stage1.yml | 7 + .../common/templates/jobs/codeql-build.yml | 7 + src/arcade/eng/common/templates/jobs/jobs.yml | 7 + .../common/templates/jobs/source-build.yml | 7 + .../templates/post-build/common-variables.yml | 8 + .../templates/post-build/post-build.yml | 8 + .../post-build/setup-maestro-vars.yml | 8 + .../templates/steps/component-governance.yml | 7 + .../steps/enable-internal-runtimes.yml | 10 + .../steps/enable-internal-sources.yml | 7 + .../common/templates/steps/generate-sbom.yml | 7 + .../templates/steps/get-delegation-sas.yml | 7 + .../steps/get-federated-access-token.yml | 7 + .../common/templates/steps/publish-logs.yml | 7 + .../steps/publish-pipeline-artifacts.yml | 34 ++ .../common/templates/steps/retain-build.yml | 7 + .../common/templates/steps/send-to-helix.yml | 7 + .../common/templates/steps/source-build.yml | 7 + .../templates/variables/pool-providers.yml | 59 +++ 120 files changed, 6553 insertions(+), 16 deletions(-) create mode 100644 src/arcade/eng/common/BuildConfiguration/build-configuration.json create mode 100644 src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 create mode 100644 src/arcade/eng/common/README.md create mode 100644 src/arcade/eng/common/SetupNugetSources.ps1 create mode 100644 src/arcade/eng/common/SetupNugetSources.sh create mode 100644 src/arcade/eng/common/build.cmd create mode 100644 src/arcade/eng/common/core-templates/job/onelocbuild.yml create mode 100644 src/arcade/eng/common/core-templates/jobs/source-build.yml create mode 100644 src/arcade/eng/common/core-templates/post-build/common-variables.yml create mode 100644 src/arcade/eng/common/core-templates/post-build/setup-maestro-vars.yml create mode 100644 src/arcade/eng/common/core-templates/steps/component-governance.yml create mode 100644 src/arcade/eng/common/core-templates/steps/enable-internal-runtimes.yml create mode 100644 src/arcade/eng/common/core-templates/steps/enable-internal-sources.yml create mode 100644 src/arcade/eng/common/core-templates/steps/get-federated-access-token.yml create mode 100644 src/arcade/eng/common/core-templates/steps/publish-build-artifacts.yml create mode 100644 src/arcade/eng/common/core-templates/steps/publish-pipeline-artifacts.yml create mode 100644 src/arcade/eng/common/core-templates/steps/retain-build.yml create mode 100644 src/arcade/eng/common/core-templates/steps/send-to-helix.yml create mode 100644 src/arcade/eng/common/core-templates/variables/pool-providers.yml create mode 100644 src/arcade/eng/common/cross/arm/tizen/tizen.patch create mode 100644 src/arcade/eng/common/cross/armel/tizen/tizen.patch create mode 100644 src/arcade/eng/common/cross/riscv64/tizen/tizen.patch create mode 100644 src/arcade/eng/common/cross/tizen-build-rootfs.sh create mode 100644 src/arcade/eng/common/darc-init.ps1 create mode 100644 src/arcade/eng/common/darc-init.sh create mode 100644 src/arcade/eng/common/dotnet-install.cmd create mode 100644 src/arcade/eng/common/dotnet-install.ps1 create mode 100644 src/arcade/eng/common/dotnet-install.sh create mode 100644 src/arcade/eng/common/enable-cross-org-publishing.ps1 create mode 100644 src/arcade/eng/common/generate-locproject.ps1 create mode 100644 src/arcade/eng/common/generate-sbom-prep.ps1 create mode 100644 src/arcade/eng/common/generate-sbom-prep.sh create mode 100644 src/arcade/eng/common/helixpublish.proj create mode 100644 src/arcade/eng/common/init-tools-native.cmd create mode 100644 src/arcade/eng/common/init-tools-native.ps1 create mode 100644 src/arcade/eng/common/init-tools-native.sh create mode 100644 src/arcade/eng/common/internal-feed-operations.ps1 create mode 100644 src/arcade/eng/common/internal-feed-operations.sh create mode 100644 src/arcade/eng/common/internal/Directory.Build.props create mode 100644 src/arcade/eng/common/internal/NuGet.config create mode 100644 src/arcade/eng/common/internal/Tools.csproj create mode 100644 src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss create mode 100644 src/arcade/eng/common/msbuild.ps1 create mode 100644 src/arcade/eng/common/msbuild.sh create mode 100644 src/arcade/eng/common/native/CommonLibrary.psm1 create mode 100644 src/arcade/eng/common/native/common-library.sh create mode 100644 src/arcade/eng/common/native/init-compiler.sh create mode 100644 src/arcade/eng/common/native/init-distro-rid.sh create mode 100644 src/arcade/eng/common/native/init-os-and-arch.sh create mode 100644 src/arcade/eng/common/native/install-cmake-test.sh create mode 100644 src/arcade/eng/common/native/install-cmake.sh create mode 100644 src/arcade/eng/common/native/install-tool.ps1 create mode 100644 src/arcade/eng/common/pipeline-logging-functions.ps1 create mode 100644 src/arcade/eng/common/pipeline-logging-functions.sh create mode 100644 src/arcade/eng/common/post-build/check-channel-consistency.ps1 create mode 100644 src/arcade/eng/common/post-build/nuget-validation.ps1 create mode 100644 src/arcade/eng/common/post-build/nuget-verification.ps1 create mode 100644 src/arcade/eng/common/post-build/redact-logs.ps1 create mode 100644 src/arcade/eng/common/post-build/sourcelink-validation.ps1 create mode 100644 src/arcade/eng/common/post-build/symbols-validation.ps1 create mode 100644 src/arcade/eng/common/retain-build.ps1 create mode 100644 src/arcade/eng/common/sdl/NuGet.config create mode 100644 src/arcade/eng/common/sdl/configure-sdl-tool.ps1 create mode 100644 src/arcade/eng/common/sdl/execute-all-sdl-tools.ps1 create mode 100644 src/arcade/eng/common/sdl/extract-artifact-archives.ps1 create mode 100644 src/arcade/eng/common/sdl/extract-artifact-packages.ps1 create mode 100644 src/arcade/eng/common/sdl/init-sdl.ps1 create mode 100644 src/arcade/eng/common/sdl/run-sdl.ps1 create mode 100644 src/arcade/eng/common/sdl/sdl.ps1 create mode 100644 src/arcade/eng/common/sdl/trim-assets-version.ps1 create mode 100644 src/arcade/eng/common/template-guidance.md create mode 100644 src/arcade/eng/common/templates-official/job/onelocbuild.yml create mode 100644 src/arcade/eng/common/templates-official/job/publish-build-assets.yml create mode 100644 src/arcade/eng/common/templates-official/job/source-build.yml create mode 100644 src/arcade/eng/common/templates-official/job/source-index-stage1.yml create mode 100644 src/arcade/eng/common/templates-official/jobs/codeql-build.yml create mode 100644 src/arcade/eng/common/templates-official/jobs/jobs.yml create mode 100644 src/arcade/eng/common/templates-official/jobs/source-build.yml create mode 100644 src/arcade/eng/common/templates-official/post-build/common-variables.yml create mode 100644 src/arcade/eng/common/templates-official/post-build/post-build.yml create mode 100644 src/arcade/eng/common/templates-official/post-build/setup-maestro-vars.yml create mode 100644 src/arcade/eng/common/templates-official/steps/component-governance.yml create mode 100644 src/arcade/eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 src/arcade/eng/common/templates-official/steps/enable-internal-sources.yml create mode 100644 src/arcade/eng/common/templates-official/steps/generate-sbom.yml create mode 100644 src/arcade/eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 src/arcade/eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 src/arcade/eng/common/templates-official/steps/publish-logs.yml create mode 100644 src/arcade/eng/common/templates-official/steps/publish-pipeline-artifacts.yml create mode 100644 src/arcade/eng/common/templates-official/steps/retain-build.yml create mode 100644 src/arcade/eng/common/templates-official/steps/send-to-helix.yml create mode 100644 src/arcade/eng/common/templates-official/steps/source-build.yml create mode 100644 src/arcade/eng/common/templates-official/variables/pool-providers.yml create mode 100644 src/arcade/eng/common/templates-official/variables/sdl-variables.yml create mode 100644 src/arcade/eng/common/templates/job/onelocbuild.yml create mode 100644 src/arcade/eng/common/templates/job/publish-build-assets.yml create mode 100644 src/arcade/eng/common/templates/job/source-build.yml create mode 100644 src/arcade/eng/common/templates/job/source-index-stage1.yml create mode 100644 src/arcade/eng/common/templates/jobs/codeql-build.yml create mode 100644 src/arcade/eng/common/templates/jobs/jobs.yml create mode 100644 src/arcade/eng/common/templates/jobs/source-build.yml create mode 100644 src/arcade/eng/common/templates/post-build/common-variables.yml create mode 100644 src/arcade/eng/common/templates/post-build/post-build.yml create mode 100644 src/arcade/eng/common/templates/post-build/setup-maestro-vars.yml create mode 100644 src/arcade/eng/common/templates/steps/component-governance.yml create mode 100644 src/arcade/eng/common/templates/steps/enable-internal-runtimes.yml create mode 100644 src/arcade/eng/common/templates/steps/enable-internal-sources.yml create mode 100644 src/arcade/eng/common/templates/steps/generate-sbom.yml create mode 100644 src/arcade/eng/common/templates/steps/get-delegation-sas.yml create mode 100644 src/arcade/eng/common/templates/steps/get-federated-access-token.yml create mode 100644 src/arcade/eng/common/templates/steps/publish-logs.yml create mode 100644 src/arcade/eng/common/templates/steps/publish-pipeline-artifacts.yml create mode 100644 src/arcade/eng/common/templates/steps/retain-build.yml create mode 100644 src/arcade/eng/common/templates/steps/send-to-helix.yml create mode 100644 src/arcade/eng/common/templates/steps/source-build.yml create mode 100644 src/arcade/eng/common/templates/variables/pool-providers.yml diff --git a/NuGet.config b/NuGet.config index b9ace0812..97cda348a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,25 @@ + + + + + + + + + + + + + + + + @@ -27,9 +43,25 @@ + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acf251cd3..7aee27775 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 diff --git a/eng/Versions.props b/eng/Versions.props index df957220a..57b0e151b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 + 9.0.0-beta.25263.2 + 9.0.0-beta.25263.2 4.5.0 4.9.0 diff --git a/global.json b/global.json index 4c5a011b0..a053410dc 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25255.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25263.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } diff --git a/src/arcade/eng/common/BuildConfiguration/build-configuration.json b/src/arcade/eng/common/BuildConfiguration/build-configuration.json new file mode 100644 index 000000000..3d1cc8989 --- /dev/null +++ b/src/arcade/eng/common/BuildConfiguration/build-configuration.json @@ -0,0 +1,4 @@ +{ + "RetryCountLimit": 1, + "RetryByAnyError": false +} diff --git a/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 b/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 new file mode 100644 index 000000000..4c1ea7c98 --- /dev/null +++ b/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 @@ -0,0 +1,11 @@ +@{ + IncludeRules=@('PSAvoidUsingCmdletAliases', + 'PSAvoidUsingWMICmdlet', + 'PSAvoidUsingPositionalParameters', + 'PSAvoidUsingInvokeExpression', + 'PSUseDeclaredVarsMoreThanAssignments', + 'PSUseCmdletCorrectly', + 'PSStandardDSCFunctionsInResource', + 'PSUseIdenticalMandatoryParametersForDSC', + 'PSUseIdenticalParametersForDSC') +} \ No newline at end of file diff --git a/src/arcade/eng/common/README.md b/src/arcade/eng/common/README.md new file mode 100644 index 000000000..ff49c3715 --- /dev/null +++ b/src/arcade/eng/common/README.md @@ -0,0 +1,28 @@ +# Don't touch this folder + + uuuuuuuuuuuuuuuuuuuu + u" uuuuuuuuuuuuuuuuuu "u + u" u$$$$$$$$$$$$$$$$$$$$u "u + u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u + u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u + u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u + u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u + $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ + $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ + $ $$$" ... "$... ...$" ... "$$$ ... "$$$ $ + $ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $ + $ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $ + $ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $ + $ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $ + $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ + "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" + "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" + "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" + "u "$$$$$$$$$$$$$$$$$$$$$$$$" u" + "u "$$$$$$$$$$$$$$$$$$$$" u" + "u """""""""""""""""" u" + """""""""""""""""""" + +!!! Changes made in this directory are subject to being overwritten by automation !!! + +The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first. diff --git a/src/arcade/eng/common/SetupNugetSources.ps1 b/src/arcade/eng/common/SetupNugetSources.ps1 new file mode 100644 index 000000000..5db4ad71e --- /dev/null +++ b/src/arcade/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,171 @@ +# This script adds internal feeds required to build commits that depend on internal package sources. For instance, +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables +# disabled internal Maestro (darc-int*) feeds. +# +# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. +# +# See example call for this script below. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) +# +# Note that the NuGetAuthenticate task should be called after SetupNugetSources. +# This ensures that: +# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) +# - The credential provider is installed. +# +# This logic is also abstracted into enable-internal-sources.yml. + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + $Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $pwd) { + # If no cred supplied, don't do anything. + if (!$pwd) { + return; + } + + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + + $passwordElement.SetAttribute("value", $pwd) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd + } +} + +function EnablePrivatePackageSources($DisabledPackageSources) { + $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroPrivateSources) { + Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" + # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries + $DisabledPackageSources.RemoveChild($DisabledPackageSource) + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +$creds = $null +if ($Password) { + # Looks for a node. Create it if none is found. + $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") + if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null + } +} + +# Check for disabledPackageSources; we'll enable any darc-int ones we find there +$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") +if ($disabledSources -ne $null) { + Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" + EnablePrivatePackageSources -DisabledPackageSources $disabledSources +} + +$userName = "dn-bot" + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password + +# 3.1 uses a different feed url format so it's handled differently here +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password +} + +$dotnetVersions = @('5','6','7','8','9') + +foreach ($dotnetVersion in $dotnetVersions) { + $feedPrefix = "dotnet" + $dotnetVersion; + $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") + if ($dotnetSource -ne $null) { + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + } +} + +$doc.Save($filename) diff --git a/src/arcade/eng/common/SetupNugetSources.sh b/src/arcade/eng/common/SetupNugetSources.sh new file mode 100644 index 000000000..4604b61b0 --- /dev/null +++ b/src/arcade/eng/common/SetupNugetSources.sh @@ -0,0 +1,167 @@ +#!/usr/bin/env bash + +# This script adds internal feeds required to build commits that depend on internal package sources. For instance, +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables +# disabled internal Maestro (darc-int*) feeds. +# +# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. +# +# See example call for this script below. +# +# - task: Bash@3 +# displayName: Setup Internal Feeds +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(Build.SourcesDirectory)/NuGet.config +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# - task: NuGetAuthenticate@1 +# +# Note that the NuGetAuthenticate task should be called after SetupNugetSources. +# This ensures that: +# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) +# - The credential provider is installed. +# +# This logic is also abstracted into enable-internal-sources.yml. + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$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 )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile +fi + +PackageSources=() + +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') + + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') +fi + +DotNetVersions=('5' '6' '7' '8' '9') + +for DotNetVersion in ${DotNetVersions[@]} ; do + FeedPrefix="dotnet${DotNetVersion}"; + grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=("$FeedPrefix-internal") + + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding $FeedPrefix-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=("$FeedPrefix-internal-transport") + fi +done + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +if [ "$CredToken" ]; then + for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile + fi + done +fi + +# Re-enable any entries in disabledPackageSources where the feed name contains darc-int +grep -i "" $ConfigFile +if [ "$?" == "0" ]; then + DisabledDarcIntSources=() + echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" + DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') + for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do + if [[ $DisabledSourceName == darc-int* ]] + then + OldDisableValue="" + NewDisableValue="" + sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile + echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" + fi + done +fi diff --git a/src/arcade/eng/common/build.cmd b/src/arcade/eng/common/build.cmd new file mode 100644 index 000000000..99daf368a --- /dev/null +++ b/src/arcade/eng/common/build.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*" +exit /b %ErrorLevel% diff --git a/src/arcade/eng/common/core-templates/job/onelocbuild.yml b/src/arcade/eng/common/core-templates/job/onelocbuild.yml new file mode 100644 index 000000000..00feec8eb --- /dev/null +++ b/src/arcade/eng/common/core-templates/job/onelocbuild.yml @@ -0,0 +1,121 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + is1ESPipeline: '' +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish Localization Files + pathToPublish: '$(Build.ArtifactStagingDirectory)/loc' + publishLocation: Container + artifactName: Loc + condition: ${{ parameters.condition }} + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish LocProject.json + pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + publishLocation: Container + artifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/jobs/source-build.yml b/src/arcade/eng/common/core-templates/jobs/source-build.yml new file mode 100644 index 000000000..a10ccfbee --- /dev/null +++ b/src/arcade/eng/common/core-templates/jobs/source-build.yml @@ -0,0 +1,58 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/core-templates/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + + is1ESPipeline: '' + + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/src/arcade/eng/common/core-templates/post-build/common-variables.yml b/src/arcade/eng/common/core-templates/post-build/common-variables.yml new file mode 100644 index 000000000..d5627a994 --- /dev/null +++ b/src/arcade/eng/common/core-templates/post-build/common-variables.yml @@ -0,0 +1,22 @@ +variables: + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro.dot.net" + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + - name: BinlogToolVersion + value: 1.0.11 + + - name: runCodesignValidationInjection + value: false diff --git a/src/arcade/eng/common/core-templates/post-build/setup-maestro-vars.yml b/src/arcade/eng/common/core-templates/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000..f7602980d --- /dev/null +++ b/src/arcade/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -0,0 +1,74 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + is1ESPipeline: '' + +steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: AzureCLI@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json + + $BarId = ${{ parameters.BARBuildId }} + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/src/arcade/eng/common/core-templates/steps/component-governance.yml b/src/arcade/eng/common/core-templates/steps/component-governance.yml new file mode 100644 index 000000000..cf0649aa9 --- /dev/null +++ b/src/arcade/eng/common/core-templates/steps/component-governance.yml @@ -0,0 +1,16 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + is1ESPipeline: false + displayName: 'Component Detection' + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + displayName: ${{ parameters.displayName }} + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/src/arcade/eng/common/core-templates/steps/enable-internal-runtimes.yml b/src/arcade/eng/common/core-templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000..6bdbf62ac --- /dev/null +++ b/src/arcade/eng/common/core-templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,32 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true +- name: is1ESPipeline + type: boolean + default: false + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl + is1ESPipeline: ${{ parameters.is1ESPipeline }} \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/steps/enable-internal-sources.yml b/src/arcade/eng/common/core-templates/steps/enable-internal-sources.yml new file mode 100644 index 000000000..64f881bff --- /dev/null +++ b/src/arcade/eng/common/core-templates/steps/enable-internal-sources.yml @@ -0,0 +1,47 @@ +parameters: +# This is the Azure federated service connection that we log into to get an access token. +- name: nugetFederatedServiceConnection + type: string + default: 'dnceng-artifacts-feeds-read' +- name: is1ESPipeline + type: boolean + default: false +# Legacy parameters to allow for PAT usage +- name: legacyCredential + type: string + default: '' + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if ne(parameters.legacyCredential, '') }}: + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: ${{ parameters.legacyCredential }} + # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. + # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that + # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token. + - ${{ else }}: + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + - ${{ else }}: + - template: /eng/common/templates/steps/get-federated-access-token.yml + parameters: + federatedServiceConnection: ${{ parameters.nugetFederatedServiceConnection }} + outputVariableName: 'dnceng-artifacts-feeds-read-access-token' + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + # This is required in certain scenarios to install the ADO credential provider. + # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others + # (e.g. dotnet msbuild). + - task: NuGetAuthenticate@1 diff --git a/src/arcade/eng/common/core-templates/steps/get-federated-access-token.yml b/src/arcade/eng/common/core-templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000..3a4d4410c --- /dev/null +++ b/src/arcade/eng/common/core-templates/steps/get-federated-access-token.yml @@ -0,0 +1,42 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: is1ESPipeline + type: boolean +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/steps/publish-build-artifacts.yml b/src/arcade/eng/common/core-templates/steps/publish-build-artifacts.yml new file mode 100644 index 000000000..f24ce3466 --- /dev/null +++ b/src/arcade/eng/common/core-templates/steps/publish-build-artifacts.yml @@ -0,0 +1,20 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false +- name: args + type: object + default: {} +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - template: /eng/common/templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + ${{ each parameter in parameters.args }}: + ${{ parameter.key }}: ${{ parameter.value }} +- ${{ else }}: + - template: /eng/common/templates-official/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + ${{ each parameter in parameters.args }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/steps/publish-pipeline-artifacts.yml b/src/arcade/eng/common/core-templates/steps/publish-pipeline-artifacts.yml new file mode 100644 index 000000000..2efec04dc --- /dev/null +++ b/src/arcade/eng/common/core-templates/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,20 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false + +- name: args + type: object + default: {} + +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - template: /eng/common/templates/steps/publish-pipeline-artifacts.yml + parameters: + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} +- ${{ else }}: + - template: /eng/common/templates-official/steps/publish-pipeline-artifacts.yml + parameters: + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/core-templates/steps/retain-build.yml b/src/arcade/eng/common/core-templates/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/src/arcade/eng/common/core-templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/steps/send-to-helix.yml b/src/arcade/eng/common/core-templates/steps/send-to-helix.yml new file mode 100644 index 000000000..68fa739c4 --- /dev/null +++ b/src/arcade/eng/common/core-templates/steps/send-to-helix.yml @@ -0,0 +1,93 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY + HelixProjectArguments: '' # optional -- arguments passed to the build command + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/src/arcade/eng/common/core-templates/variables/pool-providers.yml b/src/arcade/eng/common/core-templates/variables/pool-providers.yml new file mode 100644 index 000000000..41053d382 --- /dev/null +++ b/src/arcade/eng/common/core-templates/variables/pool-providers.yml @@ -0,0 +1,8 @@ +parameters: + is1ESPipeline: false + +variables: + - ${{ if eq(parameters.is1ESPipeline, 'true') }}: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ else }}: + - template: /eng/common/templates/variables/pool-providers.yml \ No newline at end of file diff --git a/src/arcade/eng/common/cross/arm/tizen/tizen.patch b/src/arcade/eng/common/cross/arm/tizen/tizen.patch new file mode 100644 index 000000000..fb12ade72 --- /dev/null +++ b/src/arcade/eng/common/cross/arm/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) ) diff --git a/src/arcade/eng/common/cross/armel/tizen/tizen.patch b/src/arcade/eng/common/cross/armel/tizen/tizen.patch new file mode 100644 index 000000000..ca7c7c1ff --- /dev/null +++ b/src/arcade/eng/common/cross/armel/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) ) diff --git a/src/arcade/eng/common/cross/riscv64/tizen/tizen.patch b/src/arcade/eng/common/cross/riscv64/tizen/tizen.patch new file mode 100644 index 000000000..eb6d1c074 --- /dev/null +++ b/src/arcade/eng/common/cross/riscv64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-littleriscv) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) ) diff --git a/src/arcade/eng/common/cross/tizen-build-rootfs.sh b/src/arcade/eng/common/cross/tizen-build-rootfs.sh new file mode 100644 index 000000000..ba31c9328 --- /dev/null +++ b/src/arcade/eng/common/cross/tizen-build-rootfs.sh @@ -0,0 +1,82 @@ +#!/usr/bin/env bash +set -e + +ARCH=$1 +LINK_ARCH=$ARCH + +case "$ARCH" in + arm) + TIZEN_ARCH="armv7hl" + ;; + armel) + TIZEN_ARCH="armv7l" + LINK_ARCH="arm" + ;; + arm64) + TIZEN_ARCH="aarch64" + ;; + x86) + TIZEN_ARCH="i686" + ;; + x64) + TIZEN_ARCH="x86_64" + LINK_ARCH="x86" + ;; + riscv64) + TIZEN_ARCH="riscv64" + LINK_ARCH="riscv" + ;; + *) + echo "Unsupported architecture for tizen: $ARCH" + exit 1 +esac + +__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +__TIZEN_CROSSDIR="$__CrossDir/${ARCH}/tizen" + +if [[ -z "$ROOTFS_DIR" ]]; then + echo "ROOTFS_DIR is not defined." + exit 1; +fi + +TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp +mkdir -p $TIZEN_TMP_DIR + +# Download files +echo ">>Start downloading files" +VERBOSE=1 $__CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR $TIZEN_ARCH +echo "<>Start constructing Tizen rootfs" +TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm` +cd $ROOTFS_DIR +for f in $TIZEN_RPM_FILES; do + rpm2cpio $f | cpio -idm --quiet +done +echo "<>Start configuring Tizen rootfs" +ln -sfn asm-${LINK_ARCH} ./usr/include/asm +patch -p1 < $__TIZEN_CROSSDIR/tizen.patch +if [[ "$TIZEN_ARCH" == "riscv64" ]]; then + echo "Fixing broken symlinks in $PWD" + rm ./usr/lib64/libresolv.so + ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so + rm ./usr/lib64/libpthread.so + ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so + rm ./usr/lib64/libdl.so + ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so + rm ./usr/lib64/libutil.so + ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so + rm ./usr/lib64/libm.so + ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so + rm ./usr/lib64/librt.so + ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so + rm ./lib/ld-linux-riscv64-lp64d.so.1 + ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1 +fi +echo "< 0 ]]; do + opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + --darcversion) + darcVersion=$2 + shift + ;; + --versionendpoint) + versionEndpoint=$2 + shift + ;; + --verbosity) + verbosity=$2 + shift + ;; + --toolpath) + toolpath=$2 + shift + ;; + *) + echo "Invalid argument: $1" + usage + exit 1 + ;; + esac + + shift +done + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$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 )" + +. "$scriptroot/tools.sh" + +if [ -z "$darcVersion" ]; then + darcVersion=$(curl -X GET "$versionEndpoint" -H "accept: text/plain") +fi + +function InstallDarcCli { + local darc_cli_package_name="microsoft.dotnet.darc" + + InitializeDotNetCli true + local dotnet_root=$_InitializeDotNetCli + + if [ -z "$toolpath" ]; then + local tool_list=$($dotnet_root/dotnet tool list -g) + if [[ $tool_list = *$darc_cli_package_name* ]]; then + echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) + fi + else + local tool_list=$($dotnet_root/dotnet tool list --tool-path "$toolpath") + if [[ $tool_list = *$darc_cli_package_name* ]]; then + echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name --tool-path "$toolpath") + fi + fi + + local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" + + echo "Installing Darc CLI version $darcVersion..." + echo "You may need to restart your command shell if this is the first dotnet tool you have installed." + if [ -z "$toolpath" ]; then + echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) + else + echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath") + fi +} + +InstallDarcCli diff --git a/src/arcade/eng/common/dotnet-install.cmd b/src/arcade/eng/common/dotnet-install.cmd new file mode 100644 index 000000000..b1c2642e7 --- /dev/null +++ b/src/arcade/eng/common/dotnet-install.cmd @@ -0,0 +1,2 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" \ No newline at end of file diff --git a/src/arcade/eng/common/dotnet-install.ps1 b/src/arcade/eng/common/dotnet-install.ps1 new file mode 100644 index 000000000..811f0f717 --- /dev/null +++ b/src/arcade/eng/common/dotnet-install.ps1 @@ -0,0 +1,28 @@ +[CmdletBinding(PositionalBinding=$false)] +Param( + [string] $verbosity = 'minimal', + [string] $architecture = '', + [string] $version = 'Latest', + [string] $runtime = 'dotnet', + [string] $RuntimeSourceFeed = '', + [string] $RuntimeSourceFeedKey = '' +) + +. $PSScriptRoot\tools.ps1 + +$dotnetRoot = Join-Path $RepoRoot '.dotnet' + +$installdir = $dotnetRoot +try { + if ($architecture -and $architecture.Trim() -eq 'x86') { + $installdir = Join-Path $installdir 'x86' + } + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ + ExitWithExitCode 1 +} + +ExitWithExitCode 0 diff --git a/src/arcade/eng/common/dotnet-install.sh b/src/arcade/eng/common/dotnet-install.sh new file mode 100644 index 000000000..7b9d97e3b --- /dev/null +++ b/src/arcade/eng/common/dotnet-install.sh @@ -0,0 +1,94 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$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 )" + +. "$scriptroot/tools.sh" + +version='Latest' +architecture='' +runtime='dotnet' +runtimeSourceFeed='' +runtimeSourceFeedKey='' +while [[ $# > 0 ]]; do + opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -version|-v) + shift + version="$1" + ;; + -architecture|-a) + shift + architecture="$1" + ;; + -runtime|-r) + shift + runtime="$1" + ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; + *) + Write-PipelineTelemetryError -Category 'Build' -Message "Invalid argument: $1" + exit 1 + ;; + esac + shift +done + +# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples +cpuname=$(uname -m) +case $cpuname in + arm64|aarch64) + buildarch=arm64 + if [ "$(getconf LONG_BIT)" -lt 64 ]; then + # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS) + buildarch=arm + fi + ;; + loongarch64) + buildarch=loongarch64 + ;; + amd64|x86_64) + buildarch=x64 + ;; + armv*l) + buildarch=arm + ;; + i[3-6]86) + buildarch=x86 + ;; + riscv64) + buildarch=riscv64 + ;; + *) + echo "Unknown CPU $cpuname detected, treating it as x64" + buildarch=x64 + ;; +esac + +dotnetRoot="${repo_root}.dotnet" +if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then + dotnetRoot="$dotnetRoot/$architecture" +fi + +InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2 + ExitWithExitCode $exit_code +} + +ExitWithExitCode 0 diff --git a/src/arcade/eng/common/enable-cross-org-publishing.ps1 b/src/arcade/eng/common/enable-cross-org-publishing.ps1 new file mode 100644 index 000000000..da09da4f1 --- /dev/null +++ b/src/arcade/eng/common/enable-cross-org-publishing.ps1 @@ -0,0 +1,13 @@ +param( + [string] $token +) + + +. $PSScriptRoot\pipeline-logging-functions.ps1 + +# Write-PipelineSetVariable will no-op if a variable named $ci is not defined +# Since this script is only ever called in AzDO builds, just universally set it +$ci = $true + +Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/' -IsMultiJobVariable $false diff --git a/src/arcade/eng/common/generate-locproject.ps1 b/src/arcade/eng/common/generate-locproject.ps1 new file mode 100644 index 000000000..524aaa57f --- /dev/null +++ b/src/arcade/eng/common/generate-locproject.ps1 @@ -0,0 +1,189 @@ +Param( + [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here + [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json + [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one + [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally +) + +# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: +# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task + +Set-StrictMode -Version 2.0 +$ErrorActionPreference = "Stop" +. $PSScriptRoot\pipeline-logging-functions.ps1 + +$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" +$exclusions = @{ Exclusions = @() } +if (Test-Path -Path $exclusionsFilePath) +{ + $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json +} + +Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work + +# Template files +$jsonFiles = @() +$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern +$jsonTemplateFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" + $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern + +$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them +if (-not $wxlFiles) { + $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files + if ($wxlEnFiles) { + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } + } +} + +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files +$macosHtmlFiles = @() +if ($macosHtmlEnFiles) { + $macosHtmlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } +} + +$xlfFiles = @() + +$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" +$langXlfFiles = @() +if ($allXlfFiles) { + $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' + $firstLangCode = $Matches.1 + $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" +} +$langXlfFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" + $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles + +$locJson = @{ + Projects = @( + @{ + LanguageSet = $LanguageSet + LocItems = @( + $locFiles | ForEach-Object { + $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) + { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { + Remove-Item -Path $sourceFile + } + if ($continue) + { + if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" + } + } else { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnName" + OutputPath = $outputPath + } + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "WiX_CloneLanguages" + LssFiles = @( "wxl_loc.lss" ) + LocItems = @( + $wxlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) + { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "VS_macOS_CloneLanguages" + LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) + LocItems = @( + $macosHtmlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + $lciFile = $sourceFile + ".lci" + if ($continue) { + $result = @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + if (Test-Path $lciFile -PathType Leaf) { + $result["LciFile"] = $lciFile + } + return $result + } + } + ) + } + ) +} + +$json = ConvertTo-Json $locJson -Depth 5 +Write-Host "LocProject.json generated:`n`n$json`n`n" +Pop-Location + +if (!$UseCheckedInLocProjectJson) { + New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json +} +else { + New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json + + if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { + Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." + + exit 1 + } + else { + Write-Host "Generated LocProject.json and current LocProject.json are identical." + } +} diff --git a/src/arcade/eng/common/generate-sbom-prep.ps1 b/src/arcade/eng/common/generate-sbom-prep.ps1 new file mode 100644 index 000000000..a0c7d792a --- /dev/null +++ b/src/arcade/eng/common/generate-sbom-prep.ps1 @@ -0,0 +1,29 @@ +Param( + [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed +) + +. $PSScriptRoot\pipeline-logging-functions.ps1 + +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" +$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' +$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName + +Write-Host "Artifact name before : $ArtifactName" +Write-Host "Artifact name after : $SafeArtifactName" + +Write-Host "Creating dir $ManifestDirPath" + +# create directory for sbom manifest to be placed +if (!(Test-Path -path $SbomGenerationDir)) +{ + New-Item -ItemType Directory -path $SbomGenerationDir + Write-Host "Successfully created directory $SbomGenerationDir" +} +else{ + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +} + +Write-Host "Updating artifact name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/src/arcade/eng/common/generate-sbom-prep.sh b/src/arcade/eng/common/generate-sbom-prep.sh new file mode 100644 index 000000000..b8ecca72b --- /dev/null +++ b/src/arcade/eng/common/generate-sbom-prep.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$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 )" +. $scriptroot/pipeline-logging-functions.sh + + +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" +manifest_dir=$1 + +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir +else + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +fi + +echo "Artifact name before : "$artifact_name +echo "Artifact name after : "$safe_artifact_name +export ARTIFACT_NAME=$safe_artifact_name +echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" + +exit 0 diff --git a/src/arcade/eng/common/helixpublish.proj b/src/arcade/eng/common/helixpublish.proj new file mode 100644 index 000000000..c1323bf41 --- /dev/null +++ b/src/arcade/eng/common/helixpublish.proj @@ -0,0 +1,27 @@ + + + + + msbuild + + + + + %(Identity) + + + + + + $(WorkItemDirectory) + $(WorkItemCommand) + $(WorkItemTimeout) + + + + + + + + + diff --git a/src/arcade/eng/common/init-tools-native.cmd b/src/arcade/eng/common/init-tools-native.cmd new file mode 100644 index 000000000..438cd548c --- /dev/null +++ b/src/arcade/eng/common/init-tools-native.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" +exit /b %ErrorLevel% \ No newline at end of file diff --git a/src/arcade/eng/common/init-tools-native.ps1 b/src/arcade/eng/common/init-tools-native.ps1 new file mode 100644 index 000000000..27ccdb9ec --- /dev/null +++ b/src/arcade/eng/common/init-tools-native.ps1 @@ -0,0 +1,203 @@ +<# +.SYNOPSIS +Entry point script for installing native tools + +.DESCRIPTION +Reads $RepoRoot\global.json file to determine native assets to install +and executes installers for those tools + +.PARAMETER BaseUri +Base file directory or Url from which to acquire tool archives + +.PARAMETER InstallDirectory +Directory to install native toolset. This is a command-line override for the default +Install directory precedence order: +- InstallDirectory command-line override +- NETCOREENG_INSTALL_DIRECTORY environment variable +- (default) %USERPROFILE%/.netcoreeng/native + +.PARAMETER Clean +Switch specifying to not install anything, but cleanup native asset folders + +.PARAMETER Force +Clean and then install tools + +.PARAMETER DownloadRetries +Total number of retry attempts + +.PARAMETER RetryWaitTimeInSeconds +Wait time between retry attempts in seconds + +.PARAMETER GlobalJsonFile +File path to global.json file + +.PARAMETER PathPromotion +Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) +or break the build if a native tool is not found on the path (on a local dev machine) + +.NOTES +#> +[CmdletBinding(PositionalBinding=$false)] +Param ( + [string] $BaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external', + [string] $InstallDirectory, + [switch] $Clean = $False, + [switch] $Force = $False, + [int] $DownloadRetries = 5, + [int] $RetryWaitTimeInSeconds = 30, + [string] $GlobalJsonFile, + [switch] $PathPromotion +) + +if (!$GlobalJsonFile) { + $GlobalJsonFile = Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName 'global.json' +} + +Set-StrictMode -version 2.0 +$ErrorActionPreference='Stop' + +. $PSScriptRoot\pipeline-logging-functions.ps1 +Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') + +try { + # Define verbose switch if undefined + $Verbose = $VerbosePreference -Eq 'Continue' + + $EngCommonBaseDir = Join-Path $PSScriptRoot 'native\' + $NativeBaseDir = $InstallDirectory + if (!$NativeBaseDir) { + $NativeBaseDir = CommonLibrary\Get-NativeInstallDirectory + } + $Env:CommonLibrary_NativeInstallDir = $NativeBaseDir + $InstallBin = Join-Path $NativeBaseDir 'bin' + $InstallerPath = Join-Path $EngCommonBaseDir 'install-tool.ps1' + + # Process tools list + Write-Host "Processing $GlobalJsonFile" + If (-Not (Test-Path $GlobalJsonFile)) { + Write-Host "Unable to find '$GlobalJsonFile'" + exit 0 + } + $NativeTools = Get-Content($GlobalJsonFile) -Raw | + ConvertFrom-Json | + Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue + if ($NativeTools) { + if ($PathPromotion -eq $True) { + $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" + if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $InstalledTools = @{} + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + if ($ToolVersion -eq "latest") { + $ToolVersion = "" + } + $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) + if ($ToolDirectories -eq $null) { + Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." + exit 1 + } + $ToolDirectory = $ToolDirectories[0] + $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" + if (-not (Test-Path -Path "$BinPathFile")) { + Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." + exit 1 + } + $BinPath = Get-Content "$BinPathFile" + $ToolPath = Convert-Path -Path $BinPath + Write-Host "Adding $ToolName to the path ($ToolPath)..." + Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" + $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } + } + } + return $InstalledTools + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." + } + } + exit 0 + } + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } + + if ($Verbose) { + $LocalInstallerArguments += @{ Verbose = $True } + } + if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { + if($Force) { + $LocalInstallerArguments += @{ Force = $True } + } + } + if ($Clean) { + $LocalInstallerArguments += @{ Clean = $True } + } + + Write-Verbose "Installing $ToolName version $ToolVersion" + Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" + & $InstallerPath @LocalInstallerArguments + if ($LASTEXITCODE -Ne "0") { + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + $showNativeToolsWarning = $true + if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { + $showNativeToolsWarning = $false + } + if ($showNativeToolsWarning) { + Write-Warning $errMsg + } + $toolInstallationFailure = $true + } else { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host $errMsg + exit 1 + } + } + } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host 'Native tools bootstrap failed' + exit 1 + } + } + } + else { + Write-Host 'No native tools defined in global.json' + exit 0 + } + + if ($Clean) { + exit 0 + } + if (Test-Path $InstallBin) { + Write-Host 'Native tools are available from ' (Convert-Path -Path $InstallBin) + Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" + return $InstallBin + } + elseif (-not ($PathPromotion)) { + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' + exit 1 + } + exit 0 +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/init-tools-native.sh b/src/arcade/eng/common/init-tools-native.sh new file mode 100644 index 000000000..3e6a8d6ac --- /dev/null +++ b/src/arcade/eng/common/init-tools-native.sh @@ -0,0 +1,238 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +base_uri='https://netcorenativeassets.blob.core.windows.net/resource-packages/external' +install_directory='' +clean=false +force=false +download_retries=5 +retry_wait_time_seconds=30 +global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json" +declare -a native_assets + +. $scriptroot/pipeline-logging-functions.sh +. $scriptroot/native/common-library.sh + +while (($# > 0)); do + lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" + case $lowerI in + --baseuri) + base_uri=$2 + shift 2 + ;; + --installdirectory) + install_directory=$2 + shift 2 + ;; + --clean) + clean=true + shift 1 + ;; + --force) + force=true + shift 1 + ;; + --donotabortonfailure) + donotabortonfailure=true + shift 1 + ;; + --donotdisplaywarnings) + donotdisplaywarnings=true + shift 1 + ;; + --downloadretries) + download_retries=$2 + shift 2 + ;; + --retrywaittimeseconds) + retry_wait_time_seconds=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --installdirectory Directory to install native toolset." + echo " This is a command-line override for the default" + echo " Install directory precedence order:" + echo " - InstallDirectory command-line override" + echo " - NETCOREENG_INSTALL_DIRECTORY environment variable" + echo " - (default) %USERPROFILE%/.netcoreeng/native" + echo "" + echo " --clean Switch specifying not to install anything, but cleanup native asset folders" + echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure" + echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure" + echo " --force Clean and then install tools" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --baseuri Base URI for where to download native tools from" + echo " --downloadretries Number of times a download should be attempted" + echo " --retrywaittimeseconds Wait time between download attempts" + echo "" + exit 0 + ;; + esac +done + +function ReadGlobalJsonNativeTools { + # happy path: we have a proper JSON parsing tool `jq(1)` in PATH! + if command -v jq &> /dev/null; then + + # jq: read each key/value pair under "native-tools" entry and emit: + # KEY="" VALUE="" + # followed by a null byte. + # + # bash: read line with null byte delimeter and push to array (for later `eval`uation). + + while IFS= read -rd '' line; do + native_assets+=("$line") + done < <(jq -r '. | + select(has("native-tools")) | + ."native-tools" | + keys[] as $k | + @sh "KEY=\($k) VALUE=\(.[$k])\u0000"' "$global_json_file") + + return + fi + + # Warning: falling back to manually parsing JSON, which is not recommended. + + # Following routine matches the output and escaping logic of jq(1)'s @sh formatter used above. + # It has been tested with several weird strings with escaped characters in entries (key and value) + # and results were compared with the output of jq(1) in binary representation using xxd(1); + # just before the assignment to 'native_assets' array (above and below). + + # try to capture the section under "native-tools". + if [[ ! "$(cat "$global_json_file")" =~ \"native-tools\"[[:space:]\:\{]*([^\}]+) ]]; then + return + fi + + section="${BASH_REMATCH[1]}" + + parseStarted=0 + possibleEnd=0 + escaping=0 + escaped=0 + isKey=1 + + for (( i=0; i<${#section}; i++ )); do + char="${section:$i:1}" + if ! ((parseStarted)) && [[ "$char" =~ [[:space:],:] ]]; then continue; fi + + if ! ((escaping)) && [[ "$char" == "\\" ]]; then + escaping=1 + elif ((escaping)) && ! ((escaped)); then + escaped=1 + fi + + if ! ((parseStarted)) && [[ "$char" == "\"" ]]; then + parseStarted=1 + possibleEnd=0 + elif [[ "$char" == "'" ]]; then + token="$token'\\\''" + possibleEnd=0 + elif ((escaping)) || [[ "$char" != "\"" ]]; then + token="$token$char" + possibleEnd=1 + fi + + if ((possibleEnd)) && ! ((escaping)) && [[ "$char" == "\"" ]]; then + # Use printf to unescape token to match jq(1)'s @sh formatting rules. + # do not use 'token="$(printf "$token")"' syntax, as $() eats the trailing linefeed. + printf -v token "'$token'" + + if ((isKey)); then + KEY="$token" + isKey=0 + else + line="KEY=$KEY VALUE=$token" + native_assets+=("$line") + isKey=1 + fi + + # reset for next token + parseStarted=0 + token= + elif ((escaping)) && ((escaped)); then + escaping=0 + escaped=0 + fi + done +} + +native_base_dir=$install_directory +if [[ -z $install_directory ]]; then + native_base_dir=$(GetNativeInstallDirectory) +fi + +install_bin="${native_base_dir}/bin" +installed_any=false + +ReadGlobalJsonNativeTools + +if [[ ${#native_assets[@]} -eq 0 ]]; then + echo "No native tools defined in global.json" + exit 0; +else + native_installer_dir="$scriptroot/native" + for index in "${!native_assets[@]}"; do + eval "${native_assets["$index"]}" + + installer_path="$native_installer_dir/install-$KEY.sh" + installer_command="$installer_path" + installer_command+=" --baseuri $base_uri" + installer_command+=" --installpath $install_bin" + installer_command+=" --version $VALUE" + echo $installer_command + + if [[ $force = true ]]; then + installer_command+=" --force" + fi + + if [[ $clean = true ]]; then + installer_command+=" --clean" + fi + + if [[ -a $installer_path ]]; then + $installer_command + if [[ $? != 0 ]]; then + if [[ $donotabortonfailure = true ]]; then + if [[ $donotdisplaywarnings != true ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" + fi + else + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" + exit 1 + fi + else + $installed_any = true + fi + else + if [[ $donotabortonfailure == true ]]; then + if [[ $donotdisplaywarnings != true ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" + fi + else + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" + exit 1 + fi + fi + done +fi + +if [[ $clean = true ]]; then + exit 0 +fi + +if [[ -d $install_bin ]]; then + echo "Native tools are available from $install_bin" + echo "##vso[task.prependpath]$install_bin" +else + if [[ $installed_any = true ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed" + exit 1 + fi +fi + +exit 0 diff --git a/src/arcade/eng/common/internal-feed-operations.ps1 b/src/arcade/eng/common/internal-feed-operations.ps1 new file mode 100644 index 000000000..92b77347d --- /dev/null +++ b/src/arcade/eng/common/internal-feed-operations.ps1 @@ -0,0 +1,132 @@ +param( + [Parameter(Mandatory=$true)][string] $Operation, + [string] $AuthToken, + [string] $CommitSha, + [string] $RepoName, + [switch] $IsFeedPrivate +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 +. $PSScriptRoot\tools.ps1 + +# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed +# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in +# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. This should ONLY be called from identified +# internal builds +function SetupCredProvider { + param( + [string] $AuthToken + ) + + # Install the Cred Provider NuGet plugin + Write-Host 'Setting up Cred Provider NuGet plugin in the agent...' + Write-Host "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." + + $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' + + Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." + Invoke-WebRequest $url -OutFile installcredprovider.ps1 + + Write-Host 'Installing plugin...' + .\installcredprovider.ps1 -Force + + Write-Host "Deleting local copy of 'installcredprovider.ps1'..." + Remove-Item .\installcredprovider.ps1 + + if (-Not("$env:USERPROFILE\.nuget\plugins\netcore")) { + Write-PipelineTelemetryError -Category 'Arcade' -Message 'CredProvider plugin was not installed correctly!' + ExitWithExitCode 1 + } + else { + Write-Host 'CredProvider plugin was installed correctly!' + } + + # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable + # feeds successfully + + $nugetConfigPath = Join-Path $RepoRoot "NuGet.config" + + if (-Not (Test-Path -Path $nugetConfigPath)) { + Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!' + ExitWithExitCode 1 + } + + $endpoints = New-Object System.Collections.ArrayList + $nugetConfigPackageSources = Select-Xml -Path $nugetConfigPath -XPath "//packageSources/add[contains(@key, 'darc-int-')]/@value" | foreach{$_.Node.Value} + + if (($nugetConfigPackageSources | Measure-Object).Count -gt 0 ) { + foreach ($stableRestoreResource in $nugetConfigPackageSources) { + $trimmedResource = ([string]$stableRestoreResource).Trim() + [void]$endpoints.Add(@{endpoint="$trimmedResource"; password="$AuthToken"}) + } + } + + if (($endpoints | Measure-Object).Count -gt 0) { + $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress + + # Create the environment variables the AzDo way + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $endpointCredentials -Properties @{ + 'variable' = 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' + 'issecret' = 'false' + } + + # We don't want sessions cached since we will be updating the endpoints quite frequently + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data 'False' -Properties @{ + 'variable' = 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' + 'issecret' = 'false' + } + } + else + { + Write-Host 'No internal endpoints found in NuGet.config' + } +} + +#Workaround for https://github.com/microsoft/msbuild/issues/4430 +function InstallDotNetSdkAndRestoreArcade { + $dotnetTempDir = Join-Path $RepoRoot "dotnet" + $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) + $dotnet = "$dotnetTempDir\dotnet.exe" + $restoreProjPath = "$PSScriptRoot\restore.proj" + + Write-Host "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." + InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" + + '' | Out-File "$restoreProjPath" + + & $dotnet restore $restoreProjPath + + Write-Host 'Arcade SDK restored!' + + if (Test-Path -Path $restoreProjPath) { + Remove-Item $restoreProjPath + } + + if (Test-Path -Path $dotnetTempDir) { + Remove-Item $dotnetTempDir -Recurse + } +} + +try { + Push-Location $PSScriptRoot + + if ($Operation -like 'setup') { + SetupCredProvider $AuthToken + } + elseif ($Operation -like 'install-restore') { + InstallDotNetSdkAndRestoreArcade + } + else { + Write-PipelineTelemetryError -Category 'Arcade' -Message "Unknown operation '$Operation'!" + ExitWithExitCode 1 + } +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'Arcade' -Message $_ + ExitWithExitCode 1 +} +finally { + Pop-Location +} diff --git a/src/arcade/eng/common/internal-feed-operations.sh b/src/arcade/eng/common/internal-feed-operations.sh new file mode 100644 index 000000000..9378223ba --- /dev/null +++ b/src/arcade/eng/common/internal-feed-operations.sh @@ -0,0 +1,141 @@ +#!/usr/bin/env bash + +set -e + +# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed +# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in +# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. +# This should ONLY be called from identified internal builds +function SetupCredProvider { + local authToken=$1 + + # Install the Cred Provider NuGet plugin + echo "Setting up Cred Provider NuGet plugin in the agent..."... + echo "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." + + local url="https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh" + + echo "Writing the contents of 'installcredprovider.ps1' locally..." + local installcredproviderPath="installcredprovider.sh" + if command -v curl > /dev/null; then + curl $url > "$installcredproviderPath" + else + wget -q -O "$installcredproviderPath" "$url" + fi + + echo "Installing plugin..." + . "$installcredproviderPath" + + echo "Deleting local copy of 'installcredprovider.sh'..." + rm installcredprovider.sh + + if [ ! -d "$HOME/.nuget/plugins" ]; then + Write-PipelineTelemetryError -category 'Build' 'CredProvider plugin was not installed correctly!' + ExitWithExitCode 1 + else + echo "CredProvider plugin was installed correctly!" + fi + + # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable + # feeds successfully + + local nugetConfigPath="{$repo_root}NuGet.config" + + if [ ! "$nugetConfigPath" ]; then + Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!" + ExitWithExitCode 1 + fi + + local endpoints='[' + local nugetConfigPackageValues=`cat "$nugetConfigPath" | grep "key=\"darc-int-"` + local pattern="value=\"(.*)\"" + + for value in $nugetConfigPackageValues + do + if [[ $value =~ $pattern ]]; then + local endpoint="${BASH_REMATCH[1]}" + endpoints+="{\"endpoint\": \"$endpoint\", \"password\": \"$authToken\"}," + fi + done + + endpoints=${endpoints%?} + endpoints+=']' + + if [ ${#endpoints} -gt 2 ]; then + local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" + + echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" + echo "##vso[task.setvariable variable=NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED]False" + else + echo "No internal endpoints found in NuGet.config" + fi +} + +# Workaround for https://github.com/microsoft/msbuild/issues/4430 +function InstallDotNetSdkAndRestoreArcade { + local dotnetTempDir="$repo_root/dotnet" + local dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) + local restoreProjPath="$repo_root/eng/common/restore.proj" + + echo "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." + echo "" > "$restoreProjPath" + + InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" + + local res=`$dotnetTempDir/dotnet restore $restoreProjPath` + echo "Arcade SDK restored!" + + # Cleanup + if [ "$restoreProjPath" ]; then + rm "$restoreProjPath" + fi + + if [ "$dotnetTempDir" ]; then + rm -r $dotnetTempDir + fi +} + +source="${BASH_SOURCE[0]}" +operation='' +authToken='' +repoName='' + +while [[ $# > 0 ]]; do + opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + --operation) + operation=$2 + shift + ;; + --authtoken) + authToken=$2 + shift + ;; + *) + echo "Invalid argument: $1" + usage + exit 1 + ;; + esac + + shift +done + +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$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 )" + +. "$scriptroot/tools.sh" + +if [ "$operation" = "setup" ]; then + SetupCredProvider $authToken +elif [ "$operation" = "install-restore" ]; then + InstallDotNetSdkAndRestoreArcade +else + echo "Unknown operation '$operation'!" +fi diff --git a/src/arcade/eng/common/internal/Directory.Build.props b/src/arcade/eng/common/internal/Directory.Build.props new file mode 100644 index 000000000..f1d041c33 --- /dev/null +++ b/src/arcade/eng/common/internal/Directory.Build.props @@ -0,0 +1,11 @@ + + + + + false + false + + + + + diff --git a/src/arcade/eng/common/internal/NuGet.config b/src/arcade/eng/common/internal/NuGet.config new file mode 100644 index 000000000..19d3d311b --- /dev/null +++ b/src/arcade/eng/common/internal/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/arcade/eng/common/internal/Tools.csproj b/src/arcade/eng/common/internal/Tools.csproj new file mode 100644 index 000000000..feaa6d208 --- /dev/null +++ b/src/arcade/eng/common/internal/Tools.csproj @@ -0,0 +1,22 @@ + + + + + net472 + false + false + + + + + + + + + + + + + + + diff --git a/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss b/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss new file mode 100644 index 000000000..5d892d619 --- /dev/null +++ b/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/arcade/eng/common/msbuild.ps1 b/src/arcade/eng/common/msbuild.ps1 new file mode 100644 index 000000000..f041e5ddd --- /dev/null +++ b/src/arcade/eng/common/msbuild.ps1 @@ -0,0 +1,28 @@ +[CmdletBinding(PositionalBinding=$false)] +Param( + [string] $verbosity = 'minimal', + [bool] $warnAsError = $true, + [bool] $nodeReuse = $true, + [switch] $ci, + [switch] $prepareMachine, + [switch] $excludePrereleaseVS, + [string] $msbuildEngine = $null, + [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs +) + +. $PSScriptRoot\tools.ps1 + +try { + if ($ci) { + $nodeReuse = $false + } + + MSBuild @extraArgs +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'Build' -Message $_ + ExitWithExitCode 1 +} + +ExitWithExitCode 0 \ No newline at end of file diff --git a/src/arcade/eng/common/msbuild.sh b/src/arcade/eng/common/msbuild.sh new file mode 100644 index 000000000..20d3dad54 --- /dev/null +++ b/src/arcade/eng/common/msbuild.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$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 )" + +verbosity='minimal' +warn_as_error=true +node_reuse=true +prepare_machine=false +extra_args='' + +while (($# > 0)); do + lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" + case $lowerI in + --verbosity) + verbosity=$2 + shift 2 + ;; + --warnaserror) + warn_as_error=$2 + shift 2 + ;; + --nodereuse) + node_reuse=$2 + shift 2 + ;; + --ci) + ci=true + shift 1 + ;; + --preparemachine) + prepare_machine=true + shift 1 + ;; + *) + extra_args="$extra_args $1" + shift 1 + ;; + esac +done + +. "$scriptroot/tools.sh" + +if [[ "$ci" == true ]]; then + node_reuse=false +fi + +MSBuild $extra_args +ExitWithExitCode 0 diff --git a/src/arcade/eng/common/native/CommonLibrary.psm1 b/src/arcade/eng/common/native/CommonLibrary.psm1 new file mode 100644 index 000000000..f71f6af6c --- /dev/null +++ b/src/arcade/eng/common/native/CommonLibrary.psm1 @@ -0,0 +1,401 @@ +<# +.SYNOPSIS +Helper module to install an archive to a directory + +.DESCRIPTION +Helper module to download and extract an archive to a specified directory + +.PARAMETER Uri +Uri of artifact to download + +.PARAMETER InstallDirectory +Directory to extract artifact contents to + +.PARAMETER Force +Force download / extraction if file or contents already exist. Default = False + +.PARAMETER DownloadRetries +Total number of retry attempts. Default = 5 + +.PARAMETER RetryWaitTimeInSeconds +Wait time between retry attempts in seconds. Default = 30 + +.NOTES +Returns False if download or extraction fail, True otherwise +#> +function DownloadAndExtract { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $Uri, + [Parameter(Mandatory=$True)] + [string] $InstallDirectory, + [switch] $Force = $False, + [int] $DownloadRetries = 5, + [int] $RetryWaitTimeInSeconds = 30 + ) + # Define verbose switch if undefined + $Verbose = $VerbosePreference -Eq "Continue" + + $TempToolPath = CommonLibrary\Get-TempPathFilename -Path $Uri + + # Download native tool + $DownloadStatus = CommonLibrary\Get-File -Uri $Uri ` + -Path $TempToolPath ` + -DownloadRetries $DownloadRetries ` + -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` + -Force:$Force ` + -Verbose:$Verbose + + if ($DownloadStatus -Eq $False) { + Write-Error "Download failed from $Uri" + return $False + } + + # Extract native tool + $UnzipStatus = CommonLibrary\Expand-Zip -ZipPath $TempToolPath ` + -OutputDirectory $InstallDirectory ` + -Force:$Force ` + -Verbose:$Verbose + + if ($UnzipStatus -Eq $False) { + # Retry Download one more time with Force=true + $DownloadRetryStatus = CommonLibrary\Get-File -Uri $Uri ` + -Path $TempToolPath ` + -DownloadRetries 1 ` + -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` + -Force:$True ` + -Verbose:$Verbose + + if ($DownloadRetryStatus -Eq $False) { + Write-Error "Last attempt of download failed as well" + return $False + } + + # Retry unzip again one more time with Force=true + $UnzipRetryStatus = CommonLibrary\Expand-Zip -ZipPath $TempToolPath ` + -OutputDirectory $InstallDirectory ` + -Force:$True ` + -Verbose:$Verbose + if ($UnzipRetryStatus -Eq $False) + { + Write-Error "Last attempt of unzip failed as well" + # Clean up partial zips and extracts + if (Test-Path $TempToolPath) { + Remove-Item $TempToolPath -Force + } + if (Test-Path $InstallDirectory) { + Remove-Item $InstallDirectory -Force -Recurse + } + return $False + } + } + + return $True +} + +<# +.SYNOPSIS +Download a file, retry on failure + +.DESCRIPTION +Download specified file and retry if attempt fails + +.PARAMETER Uri +Uri of file to download. If Uri is a local path, the file will be copied instead of downloaded + +.PARAMETER Path +Path to download or copy uri file to + +.PARAMETER Force +Overwrite existing file if present. Default = False + +.PARAMETER DownloadRetries +Total number of retry attempts. Default = 5 + +.PARAMETER RetryWaitTimeInSeconds +Wait time between retry attempts in seconds Default = 30 + +#> +function Get-File { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $Uri, + [Parameter(Mandatory=$True)] + [string] $Path, + [int] $DownloadRetries = 5, + [int] $RetryWaitTimeInSeconds = 30, + [switch] $Force = $False + ) + $Attempt = 0 + + if ($Force) { + if (Test-Path $Path) { + Remove-Item $Path -Force + } + } + if (Test-Path $Path) { + Write-Host "File '$Path' already exists, skipping download" + return $True + } + + $DownloadDirectory = Split-Path -ErrorAction Ignore -Path "$Path" -Parent + if (-Not (Test-Path $DownloadDirectory)) { + New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null + } + + $TempPath = "$Path.tmp" + if (Test-Path -IsValid -Path $Uri) { + Write-Verbose "'$Uri' is a file path, copying temporarily to '$TempPath'" + Copy-Item -Path $Uri -Destination $TempPath + Write-Verbose "Moving temporary file to '$Path'" + Move-Item -Path $TempPath -Destination $Path + return $? + } + else { + Write-Verbose "Downloading $Uri" + # Don't display the console progress UI - it's a huge perf hit + $ProgressPreference = 'SilentlyContinue' + while($Attempt -Lt $DownloadRetries) + { + try { + Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $TempPath + Write-Verbose "Downloaded to temporary location '$TempPath'" + Move-Item -Path $TempPath -Destination $Path + Write-Verbose "Moved temporary file to '$Path'" + return $True + } + catch { + $Attempt++ + if ($Attempt -Lt $DownloadRetries) { + $AttemptsLeft = $DownloadRetries - $Attempt + Write-Warning "Download failed, $AttemptsLeft attempts remaining, will retry in $RetryWaitTimeInSeconds seconds" + Start-Sleep -Seconds $RetryWaitTimeInSeconds + } + else { + Write-Error $_ + Write-Error $_.Exception + } + } + } + } + + return $False +} + +<# +.SYNOPSIS +Generate a shim for a native tool + +.DESCRIPTION +Creates a wrapper script (shim) that passes arguments forward to native tool assembly + +.PARAMETER ShimName +The name of the shim + +.PARAMETER ShimDirectory +The directory where shims are stored + +.PARAMETER ToolFilePath +Path to file that shim forwards to + +.PARAMETER Force +Replace shim if already present. Default = False + +.NOTES +Returns $True if generating shim succeeds, $False otherwise +#> +function New-ScriptShim { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $ShimName, + [Parameter(Mandatory=$True)] + [string] $ShimDirectory, + [Parameter(Mandatory=$True)] + [string] $ToolFilePath, + [Parameter(Mandatory=$True)] + [string] $BaseUri, + [switch] $Force + ) + try { + Write-Verbose "Generating '$ShimName' shim" + + if (-Not (Test-Path $ToolFilePath)){ + Write-Error "Specified tool file path '$ToolFilePath' does not exist" + return $False + } + + # WinShimmer is a small .NET Framework program that creates .exe shims to bootstrapped programs + # Many of the checks for installed programs expect a .exe extension for Windows tools, rather + # than a .bat or .cmd file. + # Source: https://github.com/dotnet/arcade/tree/master/src/WinShimmer + if (-Not (Test-Path "$ShimDirectory\WinShimmer\winshimmer.exe")) { + $InstallStatus = DownloadAndExtract -Uri "$BaseUri/windows/winshimmer/WinShimmer.zip" ` + -InstallDirectory $ShimDirectory\WinShimmer ` + -Force:$Force ` + -DownloadRetries 2 ` + -RetryWaitTimeInSeconds 5 ` + -Verbose:$Verbose + } + + if ((Test-Path (Join-Path $ShimDirectory "$ShimName.exe"))) { + Write-Host "$ShimName.exe already exists; replacing..." + Remove-Item (Join-Path $ShimDirectory "$ShimName.exe") + } + + & "$ShimDirectory\WinShimmer\winshimmer.exe" $ShimName $ToolFilePath $ShimDirectory + return $True + } + catch { + Write-Host $_ + Write-Host $_.Exception + return $False + } +} + +<# +.SYNOPSIS +Returns the machine architecture of the host machine + +.NOTES +Returns 'x64' on 64 bit machines + Returns 'x86' on 32 bit machines +#> +function Get-MachineArchitecture { + $ProcessorArchitecture = $Env:PROCESSOR_ARCHITECTURE + $ProcessorArchitectureW6432 = $Env:PROCESSOR_ARCHITEW6432 + if($ProcessorArchitecture -Eq "X86") + { + if(($ProcessorArchitectureW6432 -Eq "") -Or + ($ProcessorArchitectureW6432 -Eq "X86")) { + return "x86" + } + $ProcessorArchitecture = $ProcessorArchitectureW6432 + } + if (($ProcessorArchitecture -Eq "AMD64") -Or + ($ProcessorArchitecture -Eq "IA64") -Or + ($ProcessorArchitecture -Eq "ARM64") -Or + ($ProcessorArchitecture -Eq "LOONGARCH64") -Or + ($ProcessorArchitecture -Eq "RISCV64")) { + return "x64" + } + return "x86" +} + +<# +.SYNOPSIS +Get the name of a temporary folder under the native install directory +#> +function Get-TempDirectory { + return Join-Path (Get-NativeInstallDirectory) "temp/" +} + +function Get-TempPathFilename { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $Path + ) + $TempDir = CommonLibrary\Get-TempDirectory + $TempFilename = Split-Path $Path -leaf + $TempPath = Join-Path $TempDir $TempFilename + return $TempPath +} + +<# +.SYNOPSIS +Returns the base directory to use for native tool installation + +.NOTES +Returns the value of the NETCOREENG_INSTALL_DIRECTORY if that environment variable +is set, or otherwise returns an install directory under the %USERPROFILE% +#> +function Get-NativeInstallDirectory { + $InstallDir = $Env:NETCOREENG_INSTALL_DIRECTORY + if (!$InstallDir) { + $InstallDir = Join-Path $Env:USERPROFILE ".netcoreeng/native/" + } + return $InstallDir +} + +<# +.SYNOPSIS +Unzip an archive + +.DESCRIPTION +Powershell module to unzip an archive to a specified directory + +.PARAMETER ZipPath (Required) +Path to archive to unzip + +.PARAMETER OutputDirectory (Required) +Output directory for archive contents + +.PARAMETER Force +Overwrite output directory contents if they already exist + +.NOTES +- Returns True and does not perform an extraction if output directory already exists but Overwrite is not True. +- Returns True if unzip operation is successful +- Returns False if Overwrite is True and it is unable to remove contents of OutputDirectory +- Returns False if unable to extract zip archive +#> +function Expand-Zip { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $ZipPath, + [Parameter(Mandatory=$True)] + [string] $OutputDirectory, + [switch] $Force + ) + + Write-Verbose "Extracting '$ZipPath' to '$OutputDirectory'" + try { + if ((Test-Path $OutputDirectory) -And (-Not $Force)) { + Write-Host "Directory '$OutputDirectory' already exists, skipping extract" + return $True + } + if (Test-Path $OutputDirectory) { + Write-Verbose "'Force' is 'True', but '$OutputDirectory' exists, removing directory" + Remove-Item $OutputDirectory -Force -Recurse + if ($? -Eq $False) { + Write-Error "Unable to remove '$OutputDirectory'" + return $False + } + } + + $TempOutputDirectory = Join-Path "$(Split-Path -Parent $OutputDirectory)" "$(Split-Path -Leaf $OutputDirectory).tmp" + if (Test-Path $TempOutputDirectory) { + Remove-Item $TempOutputDirectory -Force -Recurse + } + New-Item -Path $TempOutputDirectory -Force -ItemType "Directory" | Out-Null + + Add-Type -assembly "system.io.compression.filesystem" + [io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$TempOutputDirectory") + if ($? -Eq $False) { + Write-Error "Unable to extract '$ZipPath'" + return $False + } + + Move-Item -Path $TempOutputDirectory -Destination $OutputDirectory + } + catch { + Write-Host $_ + Write-Host $_.Exception + + return $False + } + return $True +} + +export-modulemember -function DownloadAndExtract +export-modulemember -function Expand-Zip +export-modulemember -function Get-File +export-modulemember -function Get-MachineArchitecture +export-modulemember -function Get-NativeInstallDirectory +export-modulemember -function Get-TempDirectory +export-modulemember -function Get-TempPathFilename +export-modulemember -function New-ScriptShim diff --git a/src/arcade/eng/common/native/common-library.sh b/src/arcade/eng/common/native/common-library.sh new file mode 100644 index 000000000..080c2c283 --- /dev/null +++ b/src/arcade/eng/common/native/common-library.sh @@ -0,0 +1,172 @@ +#!/usr/bin/env bash + +function GetNativeInstallDirectory { + local install_dir + + if [[ -z $NETCOREENG_INSTALL_DIRECTORY ]]; then + install_dir=$HOME/.netcoreeng/native/ + else + install_dir=$NETCOREENG_INSTALL_DIRECTORY + fi + + echo $install_dir + return 0 +} + +function GetTempDirectory { + + echo $(GetNativeInstallDirectory)temp/ + return 0 +} + +function ExpandZip { + local zip_path=$1 + local output_directory=$2 + local force=${3:-false} + + echo "Extracting $zip_path to $output_directory" + if [[ -d $output_directory ]] && [[ $force = false ]]; then + echo "Directory '$output_directory' already exists, skipping extract" + return 0 + fi + + if [[ -d $output_directory ]]; then + echo "'Force flag enabled, but '$output_directory' exists. Removing directory" + rm -rf $output_directory + if [[ $? != 0 ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Unable to remove '$output_directory'" + return 1 + fi + fi + + echo "Creating directory: '$output_directory'" + mkdir -p $output_directory + + echo "Extracting archive" + tar -xf $zip_path -C $output_directory + if [[ $? != 0 ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Unable to extract '$zip_path'" + return 1 + fi + + return 0 +} + +function GetCurrentOS { + local unameOut="$(uname -s)" + case $unameOut in + Linux*) echo "Linux";; + Darwin*) echo "MacOS";; + esac + return 0 +} + +function GetFile { + local uri=$1 + local path=$2 + local force=${3:-false} + local download_retries=${4:-5} + local retry_wait_time_seconds=${5:-30} + + if [[ -f $path ]]; then + if [[ $force = false ]]; then + echo "File '$path' already exists. Skipping download" + return 0 + else + rm -rf $path + fi + fi + + if [[ -f $uri ]]; then + echo "'$uri' is a file path, copying file to '$path'" + cp $uri $path + return $? + fi + + echo "Downloading $uri" + # Use curl if available, otherwise use wget + if command -v curl > /dev/null; then + curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail + else + wget -q -O "$path" "$uri" --tries="$download_retries" + fi + + return $? +} + +function GetTempPathFileName { + local path=$1 + + local temp_dir=$(GetTempDirectory) + local temp_file_name=$(basename $path) + echo $temp_dir$temp_file_name + return 0 +} + +function DownloadAndExtract { + local uri=$1 + local installDir=$2 + local force=${3:-false} + local download_retries=${4:-5} + local retry_wait_time_seconds=${5:-30} + + local temp_tool_path=$(GetTempPathFileName $uri) + + echo "downloading to: $temp_tool_path" + + # Download file + GetFile "$uri" "$temp_tool_path" $force $download_retries $retry_wait_time_seconds + if [[ $? != 0 ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Failed to download '$uri' to '$temp_tool_path'." + return 1 + fi + + # Extract File + echo "extracting from $temp_tool_path to $installDir" + ExpandZip "$temp_tool_path" "$installDir" $force $download_retries $retry_wait_time_seconds + if [[ $? != 0 ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Failed to extract '$temp_tool_path' to '$installDir'." + return 1 + fi + + return 0 +} + +function NewScriptShim { + local shimpath=$1 + local tool_file_path=$2 + local force=${3:-false} + + echo "Generating '$shimpath' shim" + if [[ -f $shimpath ]]; then + if [[ $force = false ]]; then + echo "File '$shimpath' already exists." >&2 + return 1 + else + rm -rf $shimpath + fi + fi + + if [[ ! -f $tool_file_path ]]; then + # try to see if the path is lower cased + tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")" + if [[ ! -f $tool_file_path ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist" + return 1 + fi + fi + + local shim_contents=$'#!/usr/bin/env bash\n' + shim_contents+="SHIMARGS="$'$1\n' + shim_contents+="$tool_file_path"$' $SHIMARGS\n' + + # Write shim file + echo "$shim_contents" > $shimpath + + chmod +x $shimpath + + echo "Finished generating shim '$shimpath'" + + return $? +} + diff --git a/src/arcade/eng/common/native/init-compiler.sh b/src/arcade/eng/common/native/init-compiler.sh new file mode 100644 index 000000000..9a0e1f2b4 --- /dev/null +++ b/src/arcade/eng/common/native/init-compiler.sh @@ -0,0 +1,146 @@ +#!/bin/sh +# +# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables +# +# NOTE: some scripts source this file and rely on stdout being empty, make sure +# to not output *anything* here, unless it is an error message that fails the +# build. + +if [ -z "$build_arch" ] || [ -z "$compiler" ]; then + echo "Usage..." + echo "build_arch= compiler= init-compiler.sh" + echo "Specify the target architecture." + echo "Specify the name of compiler (clang or gcc)." + exit 1 +fi + +case "$compiler" in + clang*|-clang*|--clang*) + # clangx.y or clang-x.y + version="$(echo "$compiler" | tr -d '[:alpha:]-=')" + majorVersion="${version%%.*}" + + # LLVM based on v18 released in early 2024, with two releases per year + maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 6)))" + compiler=clang + ;; + + gcc*|-gcc*|--gcc*) + # gccx.y or gcc-x.y + version="$(echo "$compiler" | tr -d '[:alpha:]-=')" + majorVersion="${version%%.*}" + + # GCC based on v14 released in early 2024, with one release per year + maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 12)))" + compiler=gcc + ;; +esac + +cxxCompiler="$compiler++" + +# clear the existing CC and CXX from environment +CC= +CXX= +LDFLAGS= + +if [ "$compiler" = "gcc" ]; then cxxCompiler="g++"; fi + +check_version_exists() { + desired_version=-1 + + # Set up the environment to be used for building with the desired compiler. + if command -v "$compiler-$1" > /dev/null; then + desired_version="-$1" + elif command -v "$compiler$1" > /dev/null; then + desired_version="$1" + fi + + echo "$desired_version" +} + +__baseOS="$(uname)" +set_compiler_version_from_CC() { + if [ "$__baseOS" = "Darwin" ]; then + # On Darwin, the versions from -version/-dumpversion refer to Xcode + # versions, not llvm versions, so we can't rely on them. + return + fi + + version="$("$CC" -dumpversion)" + if [ -z "$version" ]; then + echo "Error: $CC -dumpversion didn't provide a version" + exit 1 + fi + + # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments. + IFS=. read -r majorVersion _ < /dev/null; then + echo "Error: No compatible version of $compiler was found within the range of $minVersion to $maxVersion. Please upgrade your toolchain or specify the compiler explicitly using CLR_CC and CLR_CXX environment variables." + exit 1 + fi + + CC="$(command -v "$compiler" 2> /dev/null)" + CXX="$(command -v "$cxxCompiler" 2> /dev/null)" + set_compiler_version_from_CC + fi + else + desired_version="$(check_version_exists "$majorVersion")" + if [ "$desired_version" = "-1" ]; then + echo "Error: Could not find specific version of $compiler: $majorVersion." + exit 1 + fi + fi + + if [ -z "$CC" ]; then + CC="$(command -v "$compiler$desired_version" 2> /dev/null)" + CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)" + if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi + set_compiler_version_from_CC + fi +else + if [ ! -f "$CLR_CC" ]; then + echo "Error: CLR_CC is set but path '$CLR_CC' does not exist" + exit 1 + fi + CC="$CLR_CC" + CXX="$CLR_CXX" + set_compiler_version_from_CC +fi + +if [ -z "$CC" ]; then + echo "Error: Unable to find $compiler." + exit 1 +fi + +if [ "$__baseOS" != "Darwin" ]; then + # On Darwin, we always want to use the Apple linker. + + # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0. + if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then + if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then + LDFLAGS="-fuse-ld=lld" + fi + fi +fi + +SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)" + +export CC CXX LDFLAGS SCAN_BUILD_COMMAND diff --git a/src/arcade/eng/common/native/init-distro-rid.sh b/src/arcade/eng/common/native/init-distro-rid.sh new file mode 100644 index 000000000..83ea7aab0 --- /dev/null +++ b/src/arcade/eng/common/native/init-distro-rid.sh @@ -0,0 +1,110 @@ +#!/bin/sh + +# getNonPortableDistroRid +# +# Input: +# targetOs: (str) +# targetArch: (str) +# rootfsDir: (str) +# +# Return: +# non-portable rid +getNonPortableDistroRid() +{ + targetOs="$1" + targetArch="$2" + rootfsDir="$3" + nonPortableRid="" + + if [ "$targetOs" = "linux" ]; then + # shellcheck disable=SC1091 + if [ -e "${rootfsDir}/etc/os-release" ]; then + . "${rootfsDir}/etc/os-release" + if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then + nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" + else + # Rolling release distros either do not set VERSION_ID, set it as blank or + # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux); + # so omit it here to be consistent with everything else. + nonPortableRid="${ID}-${targetArch}" + fi + elif [ -e "${rootfsDir}/android_platform" ]; then + # shellcheck disable=SC1091 + . "${rootfsDir}/android_platform" + nonPortableRid="$RID" + fi + fi + + if [ "$targetOs" = "freebsd" ]; then + # $rootfsDir can be empty. freebsd-version is a shell script and should always work. + __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1) + nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" + elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then + __android_sdk_version=$(getprop ro.build.version.sdk) + nonPortableRid="android.$__android_sdk_version-${targetArch}" + elif [ "$targetOs" = "illumos" ]; then + __uname_version=$(uname -v) + nonPortableRid="illumos-${targetArch}" + elif [ "$targetOs" = "solaris" ]; then + __uname_version=$(uname -v) + __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1) + nonPortableRid="solaris.$__solaris_major_version-${targetArch}" + elif [ "$targetOs" = "haiku" ]; then + __uname_release="$(uname -r)" + nonPortableRid=haiku.r"$__uname_release"-"$targetArch" + fi + + echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]' +} + +# initDistroRidGlobal +# +# Input: +# os: (str) +# arch: (str) +# rootfsDir?: (nullable:string) +# +# Return: +# None +# +# Notes: +# It is important to note that the function does not return anything, but it +# exports the following variables on success: +# __DistroRid : Non-portable rid of the target platform. +# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. +initDistroRidGlobal() +{ + targetOs="$1" + targetArch="$2" + rootfsDir="" + if [ $# -ge 3 ]; then + rootfsDir="$3" + fi + + if [ -n "${rootfsDir}" ]; then + # We may have a cross build. Check for the existence of the rootfsDir + if [ ! -e "${rootfsDir}" ]; then + echo "Error: rootfsDir has been passed, but the location is not valid." + exit 1 + fi + fi + + __DistroRid=$(getNonPortableDistroRid "${targetOs}" "${targetArch}" "${rootfsDir}") + + if [ -z "${__PortableTargetOS:-}" ]; then + __PortableTargetOS="$targetOs" + + STRINGS="$(command -v strings || true)" + if [ -z "$STRINGS" ]; then + STRINGS="$(command -v llvm-strings || true)" + fi + + # Check for musl-based distros (e.g. Alpine Linux, Void Linux). + if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || + ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then + __PortableTargetOS="linux-musl" + fi + fi + + export __DistroRid __PortableTargetOS +} diff --git a/src/arcade/eng/common/native/init-os-and-arch.sh b/src/arcade/eng/common/native/init-os-and-arch.sh new file mode 100644 index 000000000..38921d433 --- /dev/null +++ b/src/arcade/eng/common/native/init-os-and-arch.sh @@ -0,0 +1,85 @@ +#!/bin/sh + +# Use uname to determine what the OS is. +OSName=$(uname -s | tr '[:upper:]' '[:lower:]') + +if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then + OSName="android" +fi + +case "$OSName" in +freebsd|linux|netbsd|openbsd|sunos|android|haiku) + os="$OSName" ;; +darwin) + os=osx ;; +*) + echo "Unsupported OS $OSName detected!" + exit 1 ;; +esac + +# On Solaris, `uname -m` is discouraged, see https://docs.oracle.com/cd/E36784_01/html/E36870/uname-1.html +# and `uname -p` returns processor type (e.g. i386 on amd64). +# The appropriate tool to determine CPU is isainfo(1) https://docs.oracle.com/cd/E36784_01/html/E36870/isainfo-1.html. +if [ "$os" = "sunos" ]; then + if uname -o 2>&1 | grep -q illumos; then + os="illumos" + else + os="solaris" + fi + CPUName=$(isainfo -n) +else + # For the rest of the operating systems, use uname(1) to determine what the CPU is. + CPUName=$(uname -m) +fi + +case "$CPUName" in + arm64|aarch64) + arch=arm64 + if [ "$(getconf LONG_BIT)" -lt 64 ]; then + # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS) + arch=arm + fi + ;; + + loongarch64) + arch=loongarch64 + ;; + + riscv64) + arch=riscv64 + ;; + + amd64|x86_64) + arch=x64 + ;; + + armv7l|armv8l) + # shellcheck disable=SC1091 + if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then + arch=armel + else + arch=arm + fi + ;; + + armv6l) + arch=armv6 + ;; + + i[3-6]86) + echo "Unsupported CPU $CPUName detected, build might not succeed!" + arch=x86 + ;; + + s390x) + arch=s390x + ;; + + ppc64le) + arch=ppc64le + ;; + *) + echo "Unknown CPU $CPUName detected!" + exit 1 + ;; +esac diff --git a/src/arcade/eng/common/native/install-cmake-test.sh b/src/arcade/eng/common/native/install-cmake-test.sh new file mode 100644 index 000000000..8a5e7cf0d --- /dev/null +++ b/src/arcade/eng/common/native/install-cmake-test.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. $scriptroot/common-library.sh + +base_uri= +install_path= +version= +clean=false +force=false +download_retries=5 +retry_wait_time_seconds=30 + +while (($# > 0)); do + lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" + case $lowerI in + --baseuri) + base_uri=$2 + shift 2 + ;; + --installpath) + install_path=$2 + shift 2 + ;; + --version) + version=$2 + shift 2 + ;; + --clean) + clean=true + shift 1 + ;; + --force) + force=true + shift 1 + ;; + --downloadretries) + download_retries=$2 + shift 2 + ;; + --retrywaittimeseconds) + retry_wait_time_seconds=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --baseuri Base file directory or Url wrom which to acquire tool archives" + echo " --installpath Base directory to install native tool to" + echo " --clean Don't install the tool, just clean up the current install of the tool" + echo " --force Force install of tools even if they previously exist" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --downloadretries Total number of retry attempts" + echo " --retrywaittimeseconds Wait time between retry attempts in seconds" + echo "" + exit 0 + ;; + esac +done + +tool_name="cmake-test" +tool_os=$(GetCurrentOS) +tool_folder="$(echo $tool_os | tr "[:upper:]" "[:lower:]")" +tool_arch="x86_64" +tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" +tool_install_directory="$install_path/$tool_name/$version" +tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" +shim_path="$install_path/$tool_name.sh" +uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" + +# Clean up tool and installers +if [[ $clean = true ]]; then + echo "Cleaning $tool_install_directory" + if [[ -d $tool_install_directory ]]; then + rm -rf $tool_install_directory + fi + + echo "Cleaning $shim_path" + if [[ -f $shim_path ]]; then + rm -rf $shim_path + fi + + tool_temp_path=$(GetTempPathFileName $uri) + echo "Cleaning $tool_temp_path" + if [[ -f $tool_temp_path ]]; then + rm -rf $tool_temp_path + fi + + exit 0 +fi + +# Install tool +if [[ -f $tool_file_path ]] && [[ $force = false ]]; then + echo "$tool_name ($version) already exists, skipping install" + exit 0 +fi + +DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds + +if [[ $? != 0 ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Installation failed' + exit 1 +fi + +# Generate Shim +# Always rewrite shims so that we are referencing the expected version +NewScriptShim $shim_path $tool_file_path true + +if [[ $? != 0 ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Shim generation failed' + exit 1 +fi + +exit 0 diff --git a/src/arcade/eng/common/native/install-cmake.sh b/src/arcade/eng/common/native/install-cmake.sh new file mode 100644 index 000000000..de496beeb --- /dev/null +++ b/src/arcade/eng/common/native/install-cmake.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. $scriptroot/common-library.sh + +base_uri= +install_path= +version= +clean=false +force=false +download_retries=5 +retry_wait_time_seconds=30 + +while (($# > 0)); do + lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" + case $lowerI in + --baseuri) + base_uri=$2 + shift 2 + ;; + --installpath) + install_path=$2 + shift 2 + ;; + --version) + version=$2 + shift 2 + ;; + --clean) + clean=true + shift 1 + ;; + --force) + force=true + shift 1 + ;; + --downloadretries) + download_retries=$2 + shift 2 + ;; + --retrywaittimeseconds) + retry_wait_time_seconds=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --baseuri Base file directory or Url wrom which to acquire tool archives" + echo " --installpath Base directory to install native tool to" + echo " --clean Don't install the tool, just clean up the current install of the tool" + echo " --force Force install of tools even if they previously exist" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --downloadretries Total number of retry attempts" + echo " --retrywaittimeseconds Wait time between retry attempts in seconds" + echo "" + exit 0 + ;; + esac +done + +tool_name="cmake" +tool_os=$(GetCurrentOS) +tool_folder="$(echo $tool_os | tr "[:upper:]" "[:lower:]")" +tool_arch="x86_64" +tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" +tool_install_directory="$install_path/$tool_name/$version" +tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" +shim_path="$install_path/$tool_name.sh" +uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" + +# Clean up tool and installers +if [[ $clean = true ]]; then + echo "Cleaning $tool_install_directory" + if [[ -d $tool_install_directory ]]; then + rm -rf $tool_install_directory + fi + + echo "Cleaning $shim_path" + if [[ -f $shim_path ]]; then + rm -rf $shim_path + fi + + tool_temp_path=$(GetTempPathFileName $uri) + echo "Cleaning $tool_temp_path" + if [[ -f $tool_temp_path ]]; then + rm -rf $tool_temp_path + fi + + exit 0 +fi + +# Install tool +if [[ -f $tool_file_path ]] && [[ $force = false ]]; then + echo "$tool_name ($version) already exists, skipping install" + exit 0 +fi + +DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds + +if [[ $? != 0 ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Installation failed' + exit 1 +fi + +# Generate Shim +# Always rewrite shims so that we are referencing the expected version +NewScriptShim $shim_path $tool_file_path true + +if [[ $? != 0 ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Shim generation failed' + exit 1 +fi + +exit 0 diff --git a/src/arcade/eng/common/native/install-tool.ps1 b/src/arcade/eng/common/native/install-tool.ps1 new file mode 100644 index 000000000..78f2d84a4 --- /dev/null +++ b/src/arcade/eng/common/native/install-tool.ps1 @@ -0,0 +1,132 @@ +<# +.SYNOPSIS +Install native tool + +.DESCRIPTION +Install cmake native tool from Azure blob storage + +.PARAMETER InstallPath +Base directory to install native tool to + +.PARAMETER BaseUri +Base file directory or Url from which to acquire tool archives + +.PARAMETER CommonLibraryDirectory +Path to folder containing common library modules + +.PARAMETER Force +Force install of tools even if they previously exist + +.PARAMETER Clean +Don't install the tool, just clean up the current install of the tool + +.PARAMETER DownloadRetries +Total number of retry attempts + +.PARAMETER RetryWaitTimeInSeconds +Wait time between retry attempts in seconds + +.NOTES +Returns 0 if install succeeds, 1 otherwise +#> +[CmdletBinding(PositionalBinding=$false)] +Param ( + [Parameter(Mandatory=$True)] + [string] $ToolName, + [Parameter(Mandatory=$True)] + [string] $InstallPath, + [Parameter(Mandatory=$True)] + [string] $BaseUri, + [Parameter(Mandatory=$True)] + [string] $Version, + [string] $CommonLibraryDirectory = $PSScriptRoot, + [switch] $Force = $False, + [switch] $Clean = $False, + [int] $DownloadRetries = 5, + [int] $RetryWaitTimeInSeconds = 30 +) + +. $PSScriptRoot\..\pipeline-logging-functions.ps1 + +# Import common library modules +Import-Module -Name (Join-Path $CommonLibraryDirectory "CommonLibrary.psm1") + +try { + # Define verbose switch if undefined + $Verbose = $VerbosePreference -Eq "Continue" + + $Arch = CommonLibrary\Get-MachineArchitecture + $ToolOs = "win64" + if($Arch -Eq "x32") { + $ToolOs = "win32" + } + $ToolNameMoniker = "$ToolName-$Version-$ToolOs-$Arch" + $ToolInstallDirectory = Join-Path $InstallPath "$ToolName\$Version\" + $Uri = "$BaseUri/windows/$ToolName/$ToolNameMoniker.zip" + $ShimPath = Join-Path $InstallPath "$ToolName.exe" + + if ($Clean) { + Write-Host "Cleaning $ToolInstallDirectory" + if (Test-Path $ToolInstallDirectory) { + Remove-Item $ToolInstallDirectory -Force -Recurse + } + Write-Host "Cleaning $ShimPath" + if (Test-Path $ShimPath) { + Remove-Item $ShimPath -Force + } + $ToolTempPath = CommonLibrary\Get-TempPathFilename -Path $Uri + Write-Host "Cleaning $ToolTempPath" + if (Test-Path $ToolTempPath) { + Remove-Item $ToolTempPath -Force + } + exit 0 + } + + # Install tool + if ((Test-Path $ToolInstallDirectory) -And (-Not $Force)) { + Write-Verbose "$ToolName ($Version) already exists, skipping install" + } + else { + $InstallStatus = CommonLibrary\DownloadAndExtract -Uri $Uri ` + -InstallDirectory $ToolInstallDirectory ` + -Force:$Force ` + -DownloadRetries $DownloadRetries ` + -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` + -Verbose:$Verbose + + if ($InstallStatus -Eq $False) { + Write-PipelineTelemetryError "Installation failed" -Category "NativeToolsetBootstrapping" + exit 1 + } + } + + $ToolFilePath = Get-ChildItem $ToolInstallDirectory -Recurse -Filter "$ToolName.exe" | % { $_.FullName } + if (@($ToolFilePath).Length -Gt 1) { + Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))" + exit 1 + } elseif (@($ToolFilePath).Length -Lt 1) { + Write-Host "$ToolName was not found in $ToolInstallDirectory." + exit 1 + } + + # Generate shim + # Always rewrite shims so that we are referencing the expected version + $GenerateShimStatus = CommonLibrary\New-ScriptShim -ShimName $ToolName ` + -ShimDirectory $InstallPath ` + -ToolFilePath "$ToolFilePath" ` + -BaseUri $BaseUri ` + -Force:$Force ` + -Verbose:$Verbose + + if ($GenerateShimStatus -Eq $False) { + Write-PipelineTelemetryError "Generate shim failed" -Category "NativeToolsetBootstrapping" + return 1 + } + + exit 0 +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category "NativeToolsetBootstrapping" -Message $_ + exit 1 +} diff --git a/src/arcade/eng/common/pipeline-logging-functions.ps1 b/src/arcade/eng/common/pipeline-logging-functions.ps1 new file mode 100644 index 000000000..8e422c561 --- /dev/null +++ b/src/arcade/eng/common/pipeline-logging-functions.ps1 @@ -0,0 +1,260 @@ +# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 and modified. + +# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 + +$script:loggingCommandPrefix = '##vso[' +$script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"? + New-Object psobject -Property @{ Token = ';' ; Replacement = '%3B' } + New-Object psobject -Property @{ Token = "`r" ; Replacement = '%0D' } + New-Object psobject -Property @{ Token = "`n" ; Replacement = '%0A' } + New-Object psobject -Property @{ Token = "]" ; Replacement = '%5D' } +) +# TODO: BUG: Escape % ??? +# TODO: Add test to verify don't need to escape "=". + +# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set +function Write-PipelineTelemetryError { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Category, + [Parameter(Mandatory = $true)] + [string]$Message, + [Parameter(Mandatory = $false)] + [string]$Type = 'error', + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput, + [switch]$Force) + + $PSBoundParameters.Remove('Category') | Out-Null + + if ($Force -Or ((Test-Path variable:ci) -And $ci)) { + $Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message" + } + $PSBoundParameters.Remove('Message') | Out-Null + $PSBoundParameters.Add('Message', $Message) + Write-PipelineTaskError @PSBoundParameters +} + +# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set +function Write-PipelineTaskError { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Message, + [Parameter(Mandatory = $false)] + [string]$Type = 'error', + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput, + [switch]$Force + ) + + if (!$Force -And (-Not (Test-Path variable:ci) -Or !$ci)) { + if ($Type -eq 'error') { + Write-Host $Message -ForegroundColor Red + return + } + elseif ($Type -eq 'warning') { + Write-Host $Message -ForegroundColor Yellow + return + } + } + + if (($Type -ne 'error') -and ($Type -ne 'warning')) { + Write-Host $Message + return + } + $PSBoundParameters.Remove('Force') | Out-Null + if (-not $PSBoundParameters.ContainsKey('Type')) { + $PSBoundParameters.Add('Type', 'error') + } + Write-LogIssue @PSBoundParameters +} + +function Write-PipelineSetVariable { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Name, + [string]$Value, + [switch]$Secret, + [switch]$AsOutput, + [bool]$IsMultiJobVariable = $true) + + if ((Test-Path variable:ci) -And $ci) { + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ + 'variable' = $Name + 'isSecret' = $Secret + 'isOutput' = $IsMultiJobVariable + } -AsOutput:$AsOutput + } +} + +function Write-PipelinePrependPath { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Path, + [switch]$AsOutput) + + if ((Test-Path variable:ci) -And $ci) { + Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput + } +} + +function Write-PipelineSetResult { + [CmdletBinding()] + param( + [ValidateSet("Succeeded", "SucceededWithIssues", "Failed", "Cancelled", "Skipped")] + [Parameter(Mandatory = $true)] + [string]$Result, + [string]$Message) + if ((Test-Path variable:ci) -And $ci) { + Write-LoggingCommand -Area 'task' -Event 'complete' -Data $Message -Properties @{ + 'result' = $Result + } + } +} + +<######################################## +# Private functions. +########################################> +function Format-LoggingCommandData { + [CmdletBinding()] + param([string]$Value, [switch]$Reverse) + + if (!$Value) { + return '' + } + + if (!$Reverse) { + foreach ($mapping in $script:loggingCommandEscapeMappings) { + $Value = $Value.Replace($mapping.Token, $mapping.Replacement) + } + } + else { + for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) { + $mapping = $script:loggingCommandEscapeMappings[$i] + $Value = $Value.Replace($mapping.Replacement, $mapping.Token) + } + } + + return $Value +} + +function Format-LoggingCommand { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Area, + [Parameter(Mandatory = $true)] + [string]$Event, + [string]$Data, + [hashtable]$Properties) + + # Append the preamble. + [System.Text.StringBuilder]$sb = New-Object -TypeName System.Text.StringBuilder + $null = $sb.Append($script:loggingCommandPrefix).Append($Area).Append('.').Append($Event) + + # Append the properties. + if ($Properties) { + $first = $true + foreach ($key in $Properties.Keys) { + [string]$value = Format-LoggingCommandData $Properties[$key] + if ($value) { + if ($first) { + $null = $sb.Append(' ') + $first = $false + } + else { + $null = $sb.Append(';') + } + + $null = $sb.Append("$key=$value") + } + } + } + + # Append the tail and output the value. + $Data = Format-LoggingCommandData $Data + $sb.Append(']').Append($Data).ToString() +} + +function Write-LoggingCommand { + [CmdletBinding(DefaultParameterSetName = 'Parameters')] + param( + [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] + [string]$Area, + [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] + [string]$Event, + [Parameter(ParameterSetName = 'Parameters')] + [string]$Data, + [Parameter(ParameterSetName = 'Parameters')] + [hashtable]$Properties, + [Parameter(Mandatory = $true, ParameterSetName = 'Object')] + $Command, + [switch]$AsOutput) + + if ($PSCmdlet.ParameterSetName -eq 'Object') { + Write-LoggingCommand -Area $Command.Area -Event $Command.Event -Data $Command.Data -Properties $Command.Properties -AsOutput:$AsOutput + return + } + + $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties + if ($AsOutput) { + $command + } + else { + Write-Host $command + } +} + +function Write-LogIssue { + [CmdletBinding()] + param( + [ValidateSet('warning', 'error')] + [Parameter(Mandatory = $true)] + [string]$Type, + [string]$Message, + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{ + 'type' = $Type + 'code' = $ErrCode + 'sourcepath' = $SourcePath + 'linenumber' = $LineNumber + 'columnnumber' = $ColumnNumber + } + if ($AsOutput) { + return $command + } + + if ($Type -eq 'error') { + $foregroundColor = $host.PrivateData.ErrorForegroundColor + $backgroundColor = $host.PrivateData.ErrorBackgroundColor + if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { + $foregroundColor = [System.ConsoleColor]::Red + $backgroundColor = [System.ConsoleColor]::Black + } + } + else { + $foregroundColor = $host.PrivateData.WarningForegroundColor + $backgroundColor = $host.PrivateData.WarningBackgroundColor + if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { + $foregroundColor = [System.ConsoleColor]::Yellow + $backgroundColor = [System.ConsoleColor]::Black + } + } + + Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor +} diff --git a/src/arcade/eng/common/pipeline-logging-functions.sh b/src/arcade/eng/common/pipeline-logging-functions.sh new file mode 100644 index 000000000..6a0b2255e --- /dev/null +++ b/src/arcade/eng/common/pipeline-logging-functions.sh @@ -0,0 +1,206 @@ +#!/usr/bin/env bash + +function Write-PipelineTelemetryError { + local telemetry_category='' + local force=false + local function_args=() + local message='' + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -category|-c) + telemetry_category=$2 + shift + ;; + -force|-f) + force=true + ;; + -*) + function_args+=("$1 $2") + shift + ;; + *) + message=$* + ;; + esac + shift + done + + if [[ $force != true ]] && [[ "$ci" != true ]]; then + echo "$message" >&2 + return + fi + + if [[ $force == true ]]; then + function_args+=("-force") + fi + message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message" + function_args+=("$message") + Write-PipelineTaskError ${function_args[@]} +} + +function Write-PipelineTaskError { + local message_type="error" + local sourcepath='' + local linenumber='' + local columnnumber='' + local error_code='' + local force=false + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -type|-t) + message_type=$2 + shift + ;; + -sourcepath|-s) + sourcepath=$2 + shift + ;; + -linenumber|-ln) + linenumber=$2 + shift + ;; + -columnnumber|-cn) + columnnumber=$2 + shift + ;; + -errcode|-e) + error_code=$2 + shift + ;; + -force|-f) + force=true + ;; + *) + break + ;; + esac + + shift + done + + if [[ $force != true ]] && [[ "$ci" != true ]]; then + echo "$@" >&2 + return + fi + + local message="##vso[task.logissue" + + message="$message type=$message_type" + + if [ -n "$sourcepath" ]; then + message="$message;sourcepath=$sourcepath" + fi + + if [ -n "$linenumber" ]; then + message="$message;linenumber=$linenumber" + fi + + if [ -n "$columnnumber" ]; then + message="$message;columnnumber=$columnnumber" + fi + + if [ -n "$error_code" ]; then + message="$message;code=$error_code" + fi + + message="$message]$*" + echo "$message" +} + +function Write-PipelineSetVariable { + if [[ "$ci" != true ]]; then + return + fi + + local name='' + local value='' + local secret=false + local as_output=false + local is_multi_job_variable=true + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -name|-n) + name=$2 + shift + ;; + -value|-v) + value=$2 + shift + ;; + -secret|-s) + secret=true + ;; + -as_output|-a) + as_output=true + ;; + -is_multi_job_variable|-i) + is_multi_job_variable=$2 + shift + ;; + esac + shift + done + + value=${value/;/%3B} + value=${value/\\r/%0D} + value=${value/\\n/%0A} + value=${value/]/%5D} + + local message="##vso[task.setvariable variable=$name;isSecret=$secret;isOutput=$is_multi_job_variable]$value" + + if [[ "$as_output" == true ]]; then + $message + else + echo "$message" + fi +} + +function Write-PipelinePrependPath { + local prepend_path='' + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -path|-p) + prepend_path=$2 + shift + ;; + esac + shift + done + + export PATH="$prepend_path:$PATH" + + if [[ "$ci" == true ]]; then + echo "##vso[task.prependpath]$prepend_path" + fi +} + +function Write-PipelineSetResult { + local result='' + local message='' + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -result|-r) + result=$2 + shift + ;; + -message|-m) + message=$2 + shift + ;; + esac + shift + done + + if [[ "$ci" == true ]]; then + echo "##vso[task.complete result=$result;]$message" + fi +} diff --git a/src/arcade/eng/common/post-build/check-channel-consistency.ps1 b/src/arcade/eng/common/post-build/check-channel-consistency.ps1 new file mode 100644 index 000000000..61208d2d1 --- /dev/null +++ b/src/arcade/eng/common/post-build/check-channel-consistency.ps1 @@ -0,0 +1,48 @@ +param( + [Parameter(Mandatory=$true)][string] $PromoteToChannels, # List of channels that the build should be promoted to + [Parameter(Mandatory=$true)][array] $AvailableChannelIds # List of channel IDs available in the YAML implementation +) + +try { + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 + + if ($PromoteToChannels -eq "") { + Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." + ExitWithExitCode 0 + } + + # Check that every channel that Maestro told to promote the build to + # is available in YAML + $PromoteToChannelsIds = $PromoteToChannels -split "\D" | Where-Object { $_ } + + $hasErrors = $false + + foreach ($id in $PromoteToChannelsIds) { + if (($id -ne 0) -and ($id -notin $AvailableChannelIds)) { + Write-PipelineTaskError -Message "Channel $id is not present in the post-build YAML configuration! This is an error scenario. Please contact @dnceng." + $hasErrors = $true + } + } + + # The `Write-PipelineTaskError` doesn't error the script and we might report several errors + # in the previous lines. The check below makes sure that we return an error state from the + # script if we reported any validation error + if ($hasErrors) { + ExitWithExitCode 1 + } + + Write-Host 'done.' +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Category 'CheckChannelConsistency' -Message "There was an error while trying to check consistency of Maestro default channels for the build and post-build YAML configuration." + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/post-build/nuget-validation.ps1 b/src/arcade/eng/common/post-build/nuget-validation.ps1 new file mode 100644 index 000000000..e5de00c89 --- /dev/null +++ b/src/arcade/eng/common/post-build/nuget-validation.ps1 @@ -0,0 +1,22 @@ +# This script validates NuGet package metadata information using this +# tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage + +param( + [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are +) + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 + +try { + & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'NuGetValidation' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/post-build/nuget-verification.ps1 b/src/arcade/eng/common/post-build/nuget-verification.ps1 new file mode 100644 index 000000000..a365194a9 --- /dev/null +++ b/src/arcade/eng/common/post-build/nuget-verification.ps1 @@ -0,0 +1,121 @@ +<# +.SYNOPSIS + Verifies that Microsoft NuGet packages have proper metadata. +.DESCRIPTION + Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an + error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not + match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script. +.PARAMETER NuGetExePath + The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath + directory. +.PARAMETER PackageSource + The package source to use to download the verification tool. If not provided, nuget.org will be used. +.PARAMETER DownloadPath + The directory path to download the verification tool and nuget.exe to. If not provided, + %TEMP%\NuGet.VerifyNuGetPackage will be used. +.PARAMETER args + Arguments that will be passed to the verification tool. +.EXAMPLE + PS> .\verify.ps1 *.nupkg + Verifies the metadata of all .nupkg files in the currect working directory. +.EXAMPLE + PS> .\verify.ps1 --help + Displays the help text of the downloaded verifiction tool. +.LINK + https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md +#> + +# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1 + +[CmdletBinding(PositionalBinding = $false)] +param( + [string]$NuGetExePath, + [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$DownloadPath, + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$args +) + +# The URL to download nuget.exe. +$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe" + +# The package ID of the verification tool. +$packageId = "NuGet.VerifyMicrosoftPackage" + +# The location that nuget.exe and the verification tool will be downloaded to. +if (!$DownloadPath) { + $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage") +} + +$fence = New-Object -TypeName string -ArgumentList '=', 80 + +# Create the download directory, if it doesn't already exist. +if (!(Test-Path $DownloadPath)) { + New-Item -ItemType Directory $DownloadPath | Out-Null +} +Write-Host "Using download path: $DownloadPath" + +if ($NuGetExePath) { + $nuget = $NuGetExePath +} else { + $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe" + + # Download nuget.exe, if it doesn't already exist. + if (!(Test-Path $downloadedNuGetExe)) { + Write-Host "Downloading nuget.exe from $nugetExeUrl..." + $ProgressPreference = 'SilentlyContinue' + try { + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + $ProgressPreference = 'Continue' + } catch { + $ProgressPreference = 'Continue' + Write-Error $_ + Write-Error "nuget.exe failed to download." + exit + } + } + + $nuget = $downloadedNuGetExe +} + +Write-Host "Using nuget.exe path: $nuget" +Write-Host " " + +# Download the latest version of the verification tool. +Write-Host "Downloading the latest version of $packageId from $packageSource..." +Write-Host $fence +& $nuget install $packageId ` + -Prerelease ` + -OutputDirectory $DownloadPath ` + -Source $PackageSource +Write-Host $fence +Write-Host " " + +if ($LASTEXITCODE -ne 0) { + Write-Error "nuget.exe failed to fetch the verify tool." + exit +} + +# Find the most recently downloaded tool +Write-Host "Finding the most recently downloaded verification tool." +$verifyProbePath = Join-Path $DownloadPath "$packageId.*" +$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory ` + | Sort-Object -Property LastWriteTime -Descending ` + | Select-Object -First 1 +$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe" +Write-Host "Using verification tool: $verify" +Write-Host " " + +# Execute the verification tool. +Write-Host "Executing the verify tool..." +Write-Host $fence +& $verify $args +Write-Host $fence +Write-Host " " + +# Respond to the exit code. +if ($LASTEXITCODE -ne 0) { + Write-Error "The verify tool found some problems." +} else { + Write-Output "The verify tool succeeded." +} diff --git a/src/arcade/eng/common/post-build/redact-logs.ps1 b/src/arcade/eng/common/post-build/redact-logs.ps1 new file mode 100644 index 000000000..b7fc19591 --- /dev/null +++ b/src/arcade/eng/common/post-build/redact-logs.ps1 @@ -0,0 +1,89 @@ +[CmdletBinding(PositionalBinding=$False)] +param( + [Parameter(Mandatory=$true, Position=0)][string] $InputPath, + [Parameter(Mandatory=$true)][string] $BinlogToolVersion, + [Parameter(Mandatory=$false)][string] $DotnetPath, + [Parameter(Mandatory=$false)][string] $PackageFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json', + # File with strings to redact - separated by newlines. + # For comments start the line with '# ' - such lines are ignored + [Parameter(Mandatory=$false)][string] $TokensFilePath, + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact +) + +try { + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 + + $packageName = 'binlogtool' + + $dotnet = $DotnetPath + + if (!$dotnet) { + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + } + + $toolList = & "$dotnet" tool list -g + + if ($toolList -like "*$packageName*") { + & "$dotnet" tool uninstall $packageName -g + } + + $toolPath = "$PSScriptRoot\..\..\..\.tools" + $verbosity = 'minimal' + + New-Item -ItemType Directory -Force -Path $toolPath + + Push-Location -Path $toolPath + + try { + Write-Host "Installing Binlog redactor CLI..." + Write-Host "'$dotnet' new tool-manifest" + & "$dotnet" new tool-manifest + Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion" + & "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion + + if (Test-Path $TokensFilePath) { + Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath + $TokensToRedact += Get-Content -Path $TokensFilePath | Foreach {$_.Trim()} | Where { $_ -notmatch "^# " } + } + + $optionalParams = [System.Collections.ArrayList]::new() + + Foreach ($p in $TokensToRedact) + { + if($p -match '^\$\(.*\)$') + { + Write-Host ("Ignoring token {0} as it is probably unexpanded AzDO variable" -f $p) + } + elseif($p) + { + $optionalParams.Add("-p:" + $p) | Out-Null + } + } + + & $dotnet binlogtool redact --input:$InputPath --recurse --in-place ` + @optionalParams + + if ($LastExitCode -ne 0) { + Write-PipelineTelemetryError -Category 'Redactor' -Type 'warning' -Message "Problems using Redactor tool (exit code: $LastExitCode). But ignoring them now." + } + } + finally { + Pop-Location + } + + Write-Host 'done.' +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Category 'Redactor' -Message "There was an error while trying to redact logs. Error: $_" + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/post-build/sourcelink-validation.ps1 b/src/arcade/eng/common/post-build/sourcelink-validation.ps1 new file mode 100644 index 000000000..1976ef70f --- /dev/null +++ b/src/arcade/eng/common/post-build/sourcelink-validation.ps1 @@ -0,0 +1,327 @@ +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where Symbols.NuGet packages to be checked are stored + [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory=$false)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade + [Parameter(Mandatory=$false)][string] $GHCommit, # GitHub commit SHA used to build the packages + [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 + +# Cache/HashMap (File -> Exist flag) used to consult whether a file exist +# in the repository at a specific commit point. This is populated by inserting +# all files present in the repo at a specific commit point. +$global:RepoFiles = @{} + +# Maximum number of jobs to run in parallel +$MaxParallelJobs = 16 + +$MaxRetries = 5 +$RetryWaitTimeInSeconds = 30 + +# Wait time between check for system load +$SecondsBetweenLoadChecks = 10 + +if (!$InputPath -or !(Test-Path $InputPath)){ + Write-Host "No files to validate." + ExitWithExitCode 0 +} + +$ValidatePackage = { + param( + [string] $PackagePath # Full path to a Symbols.NuGet package + ) + + . $using:PSScriptRoot\..\tools.ps1 + + # Ensure input file exist + if (!(Test-Path $PackagePath)) { + Write-Host "Input file does not exist: $PackagePath" + return [pscustomobject]@{ + result = 1 + packagePath = $PackagePath + } + } + + # Extensions for which we'll look for SourceLink information + # For now we'll only care about Portable & Embedded PDBs + $RelevantExtensions = @('.dll', '.exe', '.pdb') + + Write-Host -NoNewLine 'Validating ' ([System.IO.Path]::GetFileName($PackagePath)) '...' + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId + $FailedFiles = 0 + + Add-Type -AssemblyName System.IO.Compression.FileSystem + + [System.IO.Directory]::CreateDirectory($ExtractPath) | Out-Null + + try { + $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) + + $zip.Entries | + Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | + ForEach-Object { + $FileName = $_.FullName + $Extension = [System.IO.Path]::GetExtension($_.Name) + $FakeName = -Join((New-Guid), $Extension) + $TargetFile = Join-Path -Path $ExtractPath -ChildPath $FakeName + + # We ignore resource DLLs + if ($FileName.EndsWith('.resources.dll')) { + return [pscustomobject]@{ + result = 0 + packagePath = $PackagePath + } + } + + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) + + $ValidateFile = { + param( + [string] $FullPath, # Full path to the module that has to be checked + [string] $RealPath, + [ref] $FailedFiles + ) + + $sourcelinkExe = "$env:USERPROFILE\.dotnet\tools" + $sourcelinkExe = Resolve-Path "$sourcelinkExe\sourcelink.exe" + $SourceLinkInfos = & $sourcelinkExe print-urls $FullPath | Out-String + + if ($LASTEXITCODE -eq 0 -and -not ([string]::IsNullOrEmpty($SourceLinkInfos))) { + $NumFailedLinks = 0 + + # We only care about Http addresses + $Matches = (Select-String '(http[s]?)(:\/\/)([^\s,]+)' -Input $SourceLinkInfos -AllMatches).Matches + + if ($Matches.Count -ne 0) { + $Matches.Value | + ForEach-Object { + $Link = $_ + $CommitUrl = "https://raw.githubusercontent.com/${using:GHRepoName}/${using:GHCommit}/" + + $FilePath = $Link.Replace($CommitUrl, "") + $Status = 200 + $Cache = $using:RepoFiles + + $attempts = 0 + + while ($attempts -lt $using:MaxRetries) { + if ( !($Cache.ContainsKey($FilePath)) ) { + try { + $Uri = $Link -as [System.URI] + + if ($Link -match "submodules") { + # Skip submodule links until sourcelink properly handles submodules + $Status = 200 + } + elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) { + # Only GitHub links are valid + $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode + } + else { + # If it's not a github link, we want to break out of the loop and not retry. + $Status = 0 + $attempts = $using:MaxRetries + } + } + catch { + Write-Host $_ + $Status = 0 + } + } + + if ($Status -ne 200) { + $attempts++ + + if ($attempts -lt $using:MaxRetries) + { + $attemptsLeft = $using:MaxRetries - $attempts + Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds" + Start-Sleep -Seconds $using:RetryWaitTimeInSeconds + } + else { + if ($NumFailedLinks -eq 0) { + if ($FailedFiles.Value -eq 0) { + Write-Host + } + + Write-Host "`tFile $RealPath has broken links:" + } + + Write-Host "`t`tFailed to retrieve $Link" + + $NumFailedLinks++ + } + } + else { + break + } + } + } + } + + if ($NumFailedLinks -ne 0) { + $FailedFiles.value++ + $global:LASTEXITCODE = 1 + } + } + } + + &$ValidateFile $TargetFile $FileName ([ref]$FailedFiles) + } + } + catch { + Write-Host $_ + } + finally { + $zip.Dispose() + } + + if ($FailedFiles -eq 0) { + Write-Host 'Passed.' + return [pscustomobject]@{ + result = 0 + packagePath = $PackagePath + } + } + else { + Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links." + return [pscustomobject]@{ + result = 1 + packagePath = $PackagePath + } + } +} + +function CheckJobResult( + $result, + $packagePath, + [ref]$ValidationFailures, + [switch]$logErrors) { + if ($result -ne '0') { + if ($logErrors) { + Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links." + } + $ValidationFailures.Value++ + } +} + +function ValidateSourceLinkLinks { + if ($GHRepoName -ne '' -and !($GHRepoName -Match '^[^\s\/]+/[^\s\/]+$')) { + if (!($GHRepoName -Match '^[^\s-]+-[^\s]+$')) { + Write-PipelineTelemetryError -Category 'SourceLink' -Message "GHRepoName should be in the format / or -. '$GHRepoName'" + ExitWithExitCode 1 + } + else { + $GHRepoName = $GHRepoName -replace '^([^\s-]+)-([^\s]+)$', '$1/$2'; + } + } + + if ($GHCommit -ne '' -and !($GHCommit -Match '^[0-9a-fA-F]{40}$')) { + Write-PipelineTelemetryError -Category 'SourceLink' -Message "GHCommit should be a 40 chars hexadecimal string. '$GHCommit'" + ExitWithExitCode 1 + } + + if ($GHRepoName -ne '' -and $GHCommit -ne '') { + $RepoTreeURL = -Join('http://api.github.com/repos/', $GHRepoName, '/git/trees/', $GHCommit, '?recursive=1') + $CodeExtensions = @('.cs', '.vb', '.fs', '.fsi', '.fsx', '.fsscript') + + try { + # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash + $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree + + foreach ($file in $Data) { + $Extension = [System.IO.Path]::GetExtension($file.path) + + if ($CodeExtensions.Contains($Extension)) { + $RepoFiles[$file.path] = 1 + } + } + } + catch { + Write-Host "Problems downloading the list of files from the repo. Url used: $RepoTreeURL . Execution will proceed without caching." + } + } + elseif ($GHRepoName -ne '' -or $GHCommit -ne '') { + Write-Host 'For using the http caching mechanism both GHRepoName and GHCommit should be informed.' + } + + if (Test-Path $ExtractPath) { + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue + } + + $ValidationFailures = 0 + + # Process each NuGet package in parallel + Get-ChildItem "$InputPath\*.symbols.nupkg" | + ForEach-Object { + Write-Host "Starting $($_.FullName)" + Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null + $NumJobs = @(Get-Job -State 'Running').Count + + while ($NumJobs -ge $MaxParallelJobs) { + Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again." + sleep $SecondsBetweenLoadChecks + $NumJobs = @(Get-Job -State 'Running').Count + } + + foreach ($Job in @(Get-Job -State 'Completed')) { + $jobResult = Wait-Job -Id $Job.Id | Receive-Job + CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures) -LogErrors + Remove-Job -Id $Job.Id + } + } + + foreach ($Job in @(Get-Job)) { + $jobResult = Wait-Job -Id $Job.Id | Receive-Job + CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures) + Remove-Job -Id $Job.Id + } + if ($ValidationFailures -gt 0) { + Write-PipelineTelemetryError -Category 'SourceLink' -Message "$ValidationFailures package(s) failed validation." + ExitWithExitCode 1 + } +} + +function InstallSourcelinkCli { + $sourcelinkCliPackageName = 'sourcelink' + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list --global + + if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) { + Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed." + } + else { + Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..." + Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.' + & "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity "minimal" --global + } +} + +try { + InstallSourcelinkCli + + foreach ($Job in @(Get-Job)) { + Remove-Job -Id $Job.Id + } + + ValidateSourceLinkLinks +} +catch { + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'SourceLink' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/post-build/symbols-validation.ps1 b/src/arcade/eng/common/post-build/symbols-validation.ps1 new file mode 100644 index 000000000..7146e593f --- /dev/null +++ b/src/arcade/eng/common/post-build/symbols-validation.ps1 @@ -0,0 +1,337 @@ +param( + [Parameter(Mandatory = $true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored + [Parameter(Mandatory = $true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory = $true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use + [Parameter(Mandatory = $false)][switch] $CheckForWindowsPdbs, # If we should check for the existence of windows pdbs in addition to portable PDBs + [Parameter(Mandatory = $false)][switch] $ContinueOnError, # If we should keep checking symbols after an error + [Parameter(Mandatory = $false)][switch] $Clean, # Clean extracted symbols directory after checking symbols + [Parameter(Mandatory = $false)][string] $SymbolExclusionFile # Exclude the symbols in the file from publishing to symbol server +) + +. $PSScriptRoot\..\tools.ps1 +# Maximum number of jobs to run in parallel +$MaxParallelJobs = 16 + +# Max number of retries +$MaxRetry = 5 + +# Wait time between check for system load +$SecondsBetweenLoadChecks = 10 + +# Set error codes +Set-Variable -Name "ERROR_BADEXTRACT" -Option Constant -Value -1 +Set-Variable -Name "ERROR_FILEDOESNOTEXIST" -Option Constant -Value -2 + +$WindowsPdbVerificationParam = "" +if ($CheckForWindowsPdbs) { + $WindowsPdbVerificationParam = "--windows-pdbs" +} + +$ExclusionSet = New-Object System.Collections.Generic.HashSet[string]; + +if (!$InputPath -or !(Test-Path $InputPath)){ + Write-Host "No symbols to validate." + ExitWithExitCode 0 +} + +#Check if the path exists +if ($SymbolExclusionFile -and (Test-Path $SymbolExclusionFile)){ + [string[]]$Exclusions = Get-Content "$SymbolExclusionFile" + $Exclusions | foreach { if($_ -and $_.Trim()){$ExclusionSet.Add($_)} } +} +else{ + Write-Host "Symbol Exclusion file does not exists. No symbols to exclude." +} + +$CountMissingSymbols = { + param( + [string] $PackagePath, # Path to a NuGet package + [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs + ) + + Add-Type -AssemblyName System.IO.Compression.FileSystem + + Write-Host "Validating $PackagePath " + + # Ensure input file exist + if (!(Test-Path $PackagePath)) { + Write-PipelineTaskError "Input file does not exist: $PackagePath" + return [pscustomobject]@{ + result = $using:ERROR_FILEDOESNOTEXIST + packagePath = $PackagePath + } + } + + # Extensions for which we'll look for symbols + $RelevantExtensions = @('.dll', '.exe', '.so', '.dylib') + + # How many files are missing symbol information + $MissingSymbols = 0 + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $PackageGuid = New-Guid + $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageGuid + $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath 'Symbols' + + try { + [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath) + } + catch { + Write-Host "Something went wrong extracting $PackagePath" + Write-Host $_ + return [pscustomobject]@{ + result = $using:ERROR_BADEXTRACT + packagePath = $PackagePath + } + } + + Get-ChildItem -Recurse $ExtractPath | + Where-Object { $RelevantExtensions -contains $_.Extension } | + ForEach-Object { + $FileName = $_.FullName + if ($FileName -Match '\\ref\\') { + Write-Host "`t Ignoring reference assembly file " $FileName + return + } + + $FirstMatchingSymbolDescriptionOrDefault = { + param( + [string] $FullPath, # Full path to the module that has to be checked + [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $WindowsPdbVerificationParam, # Parameter to pass to potential check for windows-pdbs. + [string] $SymbolsPath + ) + + $FileName = [System.IO.Path]::GetFileName($FullPath) + $Extension = [System.IO.Path]::GetExtension($FullPath) + + # Those below are potential symbol files that the `dotnet symbol` might + # return. Which one will be returned depend on the type of file we are + # checking and which type of file was uploaded. + + # The file itself is returned + $SymbolPath = $SymbolsPath + '\' + $FileName + + # PDB file for the module + $PdbPath = $SymbolPath.Replace($Extension, '.pdb') + + # PDB file for R2R module (created by crossgen) + $NGenPdb = $SymbolPath.Replace($Extension, '.ni.pdb') + + # DBG file for a .so library + $SODbg = $SymbolPath.Replace($Extension, '.so.dbg') + + # DWARF file for a .dylib + $DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf') + + $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools" + $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe" + + $totalRetries = 0 + + while ($totalRetries -lt $using:MaxRetry) { + + # Save the output and get diagnostic output + $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String + + if ((Test-Path $PdbPath) -and (Test-path $SymbolPath)) { + return 'Module and PDB for Module' + } + elseif ((Test-Path $NGenPdb) -and (Test-Path $PdbPath) -and (Test-Path $SymbolPath)) { + return 'Dll, PDB and NGen PDB' + } + elseif ((Test-Path $SODbg) -and (Test-Path $SymbolPath)) { + return 'So and DBG for SO' + } + elseif ((Test-Path $DylibDwarf) -and (Test-Path $SymbolPath)) { + return 'Dylib and Dwarf for Dylib' + } + elseif (Test-Path $SymbolPath) { + return 'Module' + } + else + { + $totalRetries++ + } + } + + return $null + } + + $FileRelativePath = $FileName.Replace("$ExtractPath\", "") + if (($($using:ExclusionSet) -ne $null) -and ($($using:ExclusionSet).Contains($FileRelativePath) -or ($($using:ExclusionSet).Contains($FileRelativePath.Replace("\", "/"))))){ + Write-Host "Skipping $FileName from symbol validation" + } + + else { + $FileGuid = New-Guid + $ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid + + $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault ` + -FullPath $FileName ` + -TargetServerParam '--microsoft-symbol-server' ` + -SymbolsPath "$ExpandedSymbolsPath-msdl" ` + -WindowsPdbVerificationParam $WindowsPdbVerificationParam + $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault ` + -FullPath $FileName ` + -TargetServerParam '--internal-server' ` + -SymbolsPath "$ExpandedSymbolsPath-symweb" ` + -WindowsPdbVerificationParam $WindowsPdbVerificationParam + + Write-Host -NoNewLine "`t Checking file " $FileName "... " + + if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { + Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)" + } + else { + $MissingSymbols++ + + if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { + Write-Host 'No symbols found on MSDL or SymWeb!' + } + else { + if ($SymbolsOnMSDL -eq $null) { + Write-Host 'No symbols found on MSDL!' + } + else { + Write-Host 'No symbols found on SymWeb!' + } + } + } + } + } + + if ($using:Clean) { + Remove-Item $ExtractPath -Recurse -Force + } + + Pop-Location + + return [pscustomobject]@{ + result = $MissingSymbols + packagePath = $PackagePath + } +} + +function CheckJobResult( + $result, + $packagePath, + [ref]$DupedSymbols, + [ref]$TotalFailures) { + if ($result -eq $ERROR_BADEXTRACT) { + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files" + $DupedSymbols.Value++ + } + elseif ($result -eq $ERROR_FILEDOESNOTEXIST) { + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath does not exist" + $TotalFailures.Value++ + } + elseif ($result -gt '0') { + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath" + $TotalFailures.Value++ + } + else { + Write-Host "All symbols verified for package $packagePath" + } +} + +function CheckSymbolsAvailable { + if (Test-Path $ExtractPath) { + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue + } + + $TotalPackages = 0 + $TotalFailures = 0 + $DupedSymbols = 0 + + Get-ChildItem "$InputPath\*.nupkg" | + ForEach-Object { + $FileName = $_.Name + $FullName = $_.FullName + + # These packages from Arcade-Services include some native libraries that + # our current symbol uploader can't handle. Below is a workaround until + # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted. + if ($FileName -Match 'Microsoft\.DotNet\.Darc\.') { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + elseif ($FileName -Match 'Microsoft\.DotNet\.Maestro\.Tasks\.') { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + + $TotalPackages++ + + Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null + + $NumJobs = @(Get-Job -State 'Running').Count + + while ($NumJobs -ge $MaxParallelJobs) { + Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again." + sleep $SecondsBetweenLoadChecks + $NumJobs = @(Get-Job -State 'Running').Count + } + + foreach ($Job in @(Get-Job -State 'Completed')) { + $jobResult = Wait-Job -Id $Job.Id | Receive-Job + CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$DupedSymbols) ([ref]$TotalFailures) + Remove-Job -Id $Job.Id + } + Write-Host + } + + foreach ($Job in @(Get-Job)) { + $jobResult = Wait-Job -Id $Job.Id | Receive-Job + CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$DupedSymbols) ([ref]$TotalFailures) + } + + if ($TotalFailures -gt 0 -or $DupedSymbols -gt 0) { + if ($TotalFailures -gt 0) { + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures/$TotalPackages packages" + } + + if ($DupedSymbols -gt 0) { + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols/$TotalPackages packages had duplicated symbol files and could not be extracted" + } + + ExitWithExitCode 1 + } + else { + Write-Host "All symbols validated!" + } +} + +function InstallDotnetSymbol { + $dotnetSymbolPackageName = 'dotnet-symbol' + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list --global + + if (($toolList -like "*$dotnetSymbolPackageName*") -and ($toolList -like "*$dotnetSymbolVersion*")) { + Write-Host "dotnet-symbol version $dotnetSymbolVersion is already installed." + } + else { + Write-Host "Installing dotnet-symbol version $dotnetSymbolVersion..." + Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.' + & "$dotnet" tool install $dotnetSymbolPackageName --version $dotnetSymbolVersion --verbosity "minimal" --global + } +} + +try { + InstallDotnetSymbol + + foreach ($Job in @(Get-Job)) { + Remove-Job -Id $Job.Id + } + + CheckSymbolsAvailable +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/retain-build.ps1 b/src/arcade/eng/common/retain-build.ps1 new file mode 100644 index 000000000..e7ba975ad --- /dev/null +++ b/src/arcade/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/src/arcade/eng/common/sdl/NuGet.config b/src/arcade/eng/common/sdl/NuGet.config new file mode 100644 index 000000000..3849bdb3c --- /dev/null +++ b/src/arcade/eng/common/sdl/NuGet.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 b/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 new file mode 100644 index 000000000..27f5a4115 --- /dev/null +++ b/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 @@ -0,0 +1,130 @@ +Param( + [string] $GuardianCliLocation, + [string] $WorkingDirectory, + [string] $TargetDirectory, + [string] $GdnFolder, + # The list of Guardian tools to configure. For each object in the array: + # - If the item is a [hashtable], it must contain these entries: + # - Name = The tool name as Guardian knows it. + # - Scenario = (Optional) Scenario-specific name for this configuration entry. It must be unique + # among all tool entries with the same Name. + # - Args = (Optional) Array of Guardian tool configuration args, like '@("Target > C:\temp")' + # - If the item is a [string] $v, it is treated as '@{ Name="$v" }' + [object[]] $ToolsList, + [string] $GuardianLoggerLevel='Standard', + # Optional: Additional params to add to any tool using CredScan. + [string[]] $CrScanAdditionalRunConfigParams, + # Optional: Additional params to add to any tool using PoliCheck. + [string[]] $PoliCheckAdditionalRunConfigParams, + # Optional: Additional params to add to any tool using CodeQL/Semmle. + [string[]] $CodeQLAdditionalRunConfigParams, + # Optional: Additional params to add to any tool using Binskim. + [string[]] $BinskimAdditionalRunConfigParams +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 +$disableConfigureToolsetImport = $true +$global:LASTEXITCODE = 0 + +try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + # Normalize tools list: all in [hashtable] form with defined values for each key. + $ToolsList = $ToolsList | + ForEach-Object { + if ($_ -is [string]) { + $_ = @{ Name = $_ } + } + + if (-not ($_['Scenario'])) { $_.Scenario = "" } + if (-not ($_['Args'])) { $_.Args = @() } + $_ + } + + Write-Host "List of tools to configure:" + $ToolsList | ForEach-Object { $_ | Out-String | Write-Host } + + # We store config files in the r directory of .gdn + $gdnConfigPath = Join-Path $GdnFolder 'r' + $ValidPath = Test-Path $GuardianCliLocation + + if ($ValidPath -eq $False) + { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." + ExitWithExitCode 1 + } + + foreach ($tool in $ToolsList) { + # Put together the name and scenario to make a unique key. + $toolConfigName = $tool.Name + if ($tool.Scenario) { + $toolConfigName += "_" + $tool.Scenario + } + + Write-Host "=== Configuring $toolConfigName..." + + $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig" + + # For some tools, add default and automatic args. + switch -Exact ($tool.Name) { + 'credscan' { + if ($targetDirectory) { + $tool.Args += "`"TargetDirectory < $TargetDirectory`"" + } + $tool.Args += "`"OutputType < pre`"" + $tool.Args += $CrScanAdditionalRunConfigParams + } + 'policheck' { + if ($targetDirectory) { + $tool.Args += "`"Target < $TargetDirectory`"" + } + $tool.Args += $PoliCheckAdditionalRunConfigParams + } + {$_ -in 'semmle', 'codeql'} { + if ($targetDirectory) { + $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" + } + $tool.Args += $CodeQLAdditionalRunConfigParams + } + 'binskim' { + if ($targetDirectory) { + # Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924. + # We are excluding all `_.pdb` files from the scan. + $tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`"" + } + $tool.Args += $BinskimAdditionalRunConfigParams + } + } + + # Create variable pointing to the args array directly so we can use splat syntax later. + $toolArgs = $tool.Args + + # Configure the tool. If args array is provided or the current tool has some default arguments + # defined, add "--args" and splat each element on the end. Arg format is "{Arg id} < {Value}", + # one per parameter. Doc page for "guardian configure": + # https://dev.azure.com/securitytools/SecurityIntegration/_wiki/wikis/Guardian/1395/configure + Exec-BlockVerbosely { + & $GuardianCliLocation configure ` + --working-directory $WorkingDirectory ` + --tool $tool.Name ` + --output-path $gdnConfigFile ` + --logger-level $GuardianLoggerLevel ` + --noninteractive ` + --force ` + $(if ($toolArgs) { "--args" }) @toolArgs + Exit-IfNZEC "Sdl" + } + + Write-Host "Created '$toolConfigName' configuration file: $gdnConfigFile" + } +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/sdl/execute-all-sdl-tools.ps1 b/src/arcade/eng/common/sdl/execute-all-sdl-tools.ps1 new file mode 100644 index 000000000..4715d75e9 --- /dev/null +++ b/src/arcade/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -0,0 +1,167 @@ +Param( + [string] $GuardianPackageName, # Required: the name of guardian CLI package (not needed if GuardianCliLocation is specified) + [string] $NugetPackageDirectory, # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified) + [string] $GuardianCliLocation, # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified + [string] $Repository=$env:BUILD_REPOSITORY_NAME, # Required: the name of the repository (e.g. dotnet/arcade) + [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master + [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located + [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located + [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault + + # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list + # format. + [object[]] $SourceToolsList, + # Optional: list of SDL tools to run on built artifacts. See 'configure-sdl-tool.ps1' for tools + # list format. + [object[]] $ArtifactToolsList, + # Optional: list of SDL tools to run without automatically specifying a target directory. See + # 'configure-sdl-tool.ps1' for tools list format. + [object[]] $CustomToolsList, + + [bool] $TsaPublish=$False, # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH, # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs. + [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME, # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs. + [string] $BuildNumber=$env:BUILD_BUILDNUMBER, # Optional: required for TSA publish; defaults to $(Build.BuildNumber) + [bool] $UpdateBaseline=$False, # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed + [bool] $TsaOnboard=$False, # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs. + [string] $TsaInstanceUrl, # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaCodebaseName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaProjectName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaNotificationEmail, # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs. + [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. + [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. + [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. + [string] $GuardianLoggerLevel='Standard', # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error + [string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1") + [string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1") + [string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1") + [string[]] $BinskimAdditionalRunConfigParams, # Optional: Additional Params to custom build a Binskim run config in the format @("xyz < abc","sdf < 1") + [bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run +) + +try { + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + #Replace repo names to the format of org/repo + if (!($Repository.contains('/'))) { + $RepoName = $Repository -replace '(.*?)-(.*)', '$1/$2'; + } + else{ + $RepoName = $Repository; + } + + if ($GuardianPackageName) { + $guardianCliLocation = Join-Path $NugetPackageDirectory (Join-Path $GuardianPackageName (Join-Path 'tools' 'guardian.cmd')) + } else { + $guardianCliLocation = $GuardianCliLocation + } + + $workingDirectory = (Split-Path $SourceDirectory -Parent) + $ValidPath = Test-Path $guardianCliLocation + + if ($ValidPath -eq $False) + { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Invalid Guardian CLI Location.' + ExitWithExitCode 1 + } + + Exec-BlockVerbosely { + & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel + } + $gdnFolder = Join-Path $workingDirectory '.gdn' + + if ($TsaOnboard) { + if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) { + Exec-BlockVerbosely { + & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel + } + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-onboard failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } + } else { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Could not onboard to TSA -- not all required values ($TsaCodebaseName, $TsaNotificationEmail, $TsaCodebaseAdmin, $TsaBugAreaPath) were specified.' + ExitWithExitCode 1 + } + } + + # Configure a list of tools with a default target directory. Populates the ".gdn/r" directory. + function Configure-ToolsList([object[]] $tools, [string] $targetDirectory) { + if ($tools -and $tools.Count -gt 0) { + Exec-BlockVerbosely { + & $(Join-Path $PSScriptRoot 'configure-sdl-tool.ps1') ` + -GuardianCliLocation $guardianCliLocation ` + -WorkingDirectory $workingDirectory ` + -TargetDirectory $targetDirectory ` + -GdnFolder $gdnFolder ` + -ToolsList $tools ` + -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` + -GuardianLoggerLevel $GuardianLoggerLevel ` + -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` + -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` + -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams ` + -BinskimAdditionalRunConfigParams $BinskimAdditionalRunConfigParams + if ($BreakOnFailure) { + Exit-IfNZEC "Sdl" + } + } + } + } + + # Configure Artifact and Source tools with default Target directories. + Configure-ToolsList $ArtifactToolsList $ArtifactsDirectory + Configure-ToolsList $SourceToolsList $SourceDirectory + # Configure custom tools with no default Target directory. + Configure-ToolsList $CustomToolsList $null + + # At this point, all tools are configured in the ".gdn" directory. Run them all in a single call. + # (If we used "run" multiple times, each run would overwrite data from earlier runs.) + Exec-BlockVerbosely { + & $(Join-Path $PSScriptRoot 'run-sdl.ps1') ` + -GuardianCliLocation $guardianCliLocation ` + -WorkingDirectory $SourceDirectory ` + -UpdateBaseline $UpdateBaseline ` + -GdnFolder $gdnFolder + } + + if ($TsaPublish) { + if ($TsaBranchName -and $BuildNumber) { + if (-not $TsaRepositoryName) { + $TsaRepositoryName = "$($Repository)-$($BranchName)" + } + Exec-BlockVerbosely { + & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel + } + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-publish failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } + } else { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Could not publish to TSA -- not all required values ($TsaBranchName, $BuildNumber) were specified.' + ExitWithExitCode 1 + } + } + + if ($BreakOnFailure) { + Write-Host "Failing the build in case of breaking results..." + Exec-BlockVerbosely { + & $guardianCliLocation break --working-directory $workingDirectory --logger-level $GuardianLoggerLevel + } + } else { + Write-Host "Letting the build pass even if there were breaking results..." + } +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + exit 1 +} diff --git a/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 b/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 new file mode 100644 index 000000000..68da4fbf2 --- /dev/null +++ b/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 @@ -0,0 +1,63 @@ +# This script looks for each archive file in a directory and extracts it into the target directory. +# For example, the file "$InputPath/bin.tar.gz" extracts to "$ExtractPath/bin.tar.gz.extracted/**". +# Uses the "tar" utility added to Windows 10 / Windows 2019 that supports tar.gz and zip. +param( + # Full path to directory where archives are stored. + [Parameter(Mandatory=$true)][string] $InputPath, + # Full path to directory to extract archives into. May be the same as $InputPath. + [Parameter(Mandatory=$true)][string] $ExtractPath +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +$disableConfigureToolsetImport = $true + +try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + Measure-Command { + $jobs = @() + + # Find archive files for non-Windows and Windows builds. + $archiveFiles = @( + Get-ChildItem (Join-Path $InputPath "*.tar.gz") + Get-ChildItem (Join-Path $InputPath "*.zip") + ) + + foreach ($targzFile in $archiveFiles) { + $jobs += Start-Job -ScriptBlock { + $file = $using:targzFile + $fileName = [System.IO.Path]::GetFileName($file) + $extractDir = Join-Path $using:ExtractPath "$fileName.extracted" + + New-Item $extractDir -ItemType Directory -Force | Out-Null + + Write-Host "Extracting '$file' to '$extractDir'..." + + # Pipe errors to stdout to prevent PowerShell detecting them and quitting the job early. + # This type of quit skips the catch, so we wouldn't be able to tell which file triggered the + # error. Save output so it can be stored in the exception string along with context. + $output = tar -xf $file -C $extractDir 2>&1 + # Handle NZEC manually rather than using Exit-IfNZEC: we are in a background job, so we + # don't have access to the outer scope. + if ($LASTEXITCODE -ne 0) { + throw "Error extracting '$file': non-zero exit code ($LASTEXITCODE). Output: '$output'" + } + + Write-Host "Extracted to $extractDir" + } + } + + Receive-Job $jobs -Wait + } +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 b/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 new file mode 100644 index 000000000..f031ed5b2 --- /dev/null +++ b/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 @@ -0,0 +1,82 @@ +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where artifact packages are stored + [Parameter(Mandatory=$true)][string] $ExtractPath # Full path to directory where the packages will be extracted +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +$disableConfigureToolsetImport = $true + +function ExtractArtifacts { + if (!(Test-Path $InputPath)) { + Write-Host "Input Path does not exist: $InputPath" + ExitWithExitCode 0 + } + $Jobs = @() + Get-ChildItem "$InputPath\*.nupkg" | + ForEach-Object { + $Jobs += Start-Job -ScriptBlock $ExtractPackage -ArgumentList $_.FullName + } + + foreach ($Job in $Jobs) { + Wait-Job -Id $Job.Id | Receive-Job + } +} + +try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $ExtractPackage = { + param( + [string] $PackagePath # Full path to a NuGet package + ) + + if (!(Test-Path $PackagePath)) { + Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath" + ExitWithExitCode 1 + } + + $RelevantExtensions = @('.dll', '.exe', '.pdb') + Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...' + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId + + Add-Type -AssemblyName System.IO.Compression.FileSystem + + [System.IO.Directory]::CreateDirectory($ExtractPath); + + try { + $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) + + $zip.Entries | + Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | + ForEach-Object { + $TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName) + [System.IO.Directory]::CreateDirectory($TargetPath); + + $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile) + } + } + catch { + Write-Host $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 + } + finally { + $zip.Dispose() + } + } + Measure-Command { ExtractArtifacts } +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/sdl/init-sdl.ps1 b/src/arcade/eng/common/sdl/init-sdl.ps1 new file mode 100644 index 000000000..3ac1d92b3 --- /dev/null +++ b/src/arcade/eng/common/sdl/init-sdl.ps1 @@ -0,0 +1,55 @@ +Param( + [string] $GuardianCliLocation, + [string] $Repository, + [string] $BranchName='master', + [string] $WorkingDirectory, + [string] $AzureDevOpsAccessToken, + [string] $GuardianLoggerLevel='Standard' +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 +$disableConfigureToolsetImport = $true +$global:LASTEXITCODE = 0 + +# `tools.ps1` checks $ci to perform some actions. Since the SDL +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +. $PSScriptRoot\..\tools.ps1 + +# Don't display the console progress UI - it's a huge perf hit +$ProgressPreference = 'SilentlyContinue' + +# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file +$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) +$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") +$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0" +$zipFile = "$WorkingDirectory/gdn.zip" + +Add-Type -AssemblyName System.IO.Compression.FileSystem +$gdnFolder = (Join-Path $WorkingDirectory '.gdn') + +try { + # if the folder does not exist, we'll do a guardian init and push it to the remote repository + Write-Host 'Initializing Guardian...' + Write-Host "$GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel" + & $GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Build' -Message "Guardian init failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } + # We create the mainbaseline so it can be edited later + Write-Host "$GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline" + & $GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Build' -Message "Guardian baseline failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } + ExitWithExitCode 0 +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/sdl/run-sdl.ps1 b/src/arcade/eng/common/sdl/run-sdl.ps1 new file mode 100644 index 000000000..2eac8c78f --- /dev/null +++ b/src/arcade/eng/common/sdl/run-sdl.ps1 @@ -0,0 +1,49 @@ +Param( + [string] $GuardianCliLocation, + [string] $WorkingDirectory, + [string] $GdnFolder, + [string] $UpdateBaseline, + [string] $GuardianLoggerLevel='Standard' +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 +$disableConfigureToolsetImport = $true +$global:LASTEXITCODE = 0 + +try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + # We store config files in the r directory of .gdn + $gdnConfigPath = Join-Path $GdnFolder 'r' + $ValidPath = Test-Path $GuardianCliLocation + + if ($ValidPath -eq $False) + { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." + ExitWithExitCode 1 + } + + $gdnConfigFiles = Get-ChildItem $gdnConfigPath -Recurse -Include '*.gdnconfig' + Write-Host "Discovered Guardian config files:" + $gdnConfigFiles | Out-String | Write-Host + + Exec-BlockVerbosely { + & $GuardianCliLocation run ` + --working-directory $WorkingDirectory ` + --baseline mainbaseline ` + --update-baseline $UpdateBaseline ` + --logger-level $GuardianLoggerLevel ` + --config @gdnConfigFiles + Exit-IfNZEC "Sdl" + } +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/sdl/sdl.ps1 b/src/arcade/eng/common/sdl/sdl.ps1 new file mode 100644 index 000000000..648c5068d --- /dev/null +++ b/src/arcade/eng/common/sdl/sdl.ps1 @@ -0,0 +1,38 @@ + +function Install-Gdn { + param( + [Parameter(Mandatory=$true)] + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/src/arcade/eng/common/sdl/trim-assets-version.ps1 b/src/arcade/eng/common/sdl/trim-assets-version.ps1 new file mode 100644 index 000000000..0daa2a9e9 --- /dev/null +++ b/src/arcade/eng/common/sdl/trim-assets-version.ps1 @@ -0,0 +1,75 @@ +<# +.SYNOPSIS +Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name. + +.PARAMETER InputPath +Full path to directory where artifact packages are stored + +.PARAMETER Recursive +Search for NuGet packages recursively + +#> + +Param( + [string] $InputPath, + [bool] $Recursive = $true +) + +$CliToolName = "Microsoft.DotNet.VersionTools.Cli" + +function Install-VersionTools-Cli { + param( + [Parameter(Mandatory=$true)][string]$Version + ) + + Write-Host "Installing the package '$CliToolName' with a version of '$version' ..." + $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" + + $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed") + Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait +} + +# ------------------------------------------------------------------- + +if (!(Test-Path $InputPath)) { + Write-Host "Input Path '$InputPath' does not exist" + ExitWithExitCode 1 +} + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +$disableConfigureToolsetImport = $true +$global:LASTEXITCODE = 0 + +# `tools.ps1` checks $ci to perform some actions. Since the SDL +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +. $PSScriptRoot\..\tools.ps1 + +try { + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + + $toolsetVersion = Read-ArcadeSdkVersion + Install-VersionTools-Cli -Version $toolsetVersion + + $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName}) + if ($null -eq $cliToolFound) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed." + ExitWithExitCode 1 + } + + Exec-BlockVerbosely { + & "$dotnet" $CliToolName trim-assets-version ` + --assets-path $InputPath ` + --recursive $Recursive + Exit-IfNZEC "Sdl" + } +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} diff --git a/src/arcade/eng/common/template-guidance.md b/src/arcade/eng/common/template-guidance.md new file mode 100644 index 000000000..98bbc1ded --- /dev/null +++ b/src/arcade/eng/common/template-guidance.md @@ -0,0 +1,133 @@ +# Overview + +Arcade provides templates for public (`/templates`) and 1ES pipeline templates (`/templates-official`) scenarios. Pipelines which are required to be managed by 1ES pipeline templates should reference `/templates-offical`, all other pipelines may reference `/templates`. + +## How to use + +Basic guidance is: + +- 1ES Pipeline Template or 1ES Microbuild template runs should reference `eng/common/templates-official`. Any internal production-graded pipeline should use these templates. + +- All other runs should reference `eng/common/templates`. + +See [azure-pipelines.yml](../../azure-pipelines.yml) (templates-official example) or [azure-pipelines-pr.yml](../../azure-pipelines-pr.yml) (templates example) for examples. + +#### The `templateIs1ESManaged` parameter + +The `templateIs1ESManaged` is available on most templates and affects which of the variants is used for nested templates. See [Development Notes](#development-notes) below for more information on the `templateIs1ESManaged1 parameter. + +- For templates under `job/`, `jobs/`, `steps`, or `post-build/`, this parameter must be explicitly set. + +## Multiple outputs + +1ES pipeline templates impose a policy where every publish artifact execution results in additional security scans being injected into your pipeline. When using `templates-official/jobs/jobs.yml`, Arcade reduces the number of additional security injections by gathering all publishing outputs into the [Build.ArtifactStagingDirectory](https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#build-variables-devops-services), and utilizing the [outputParentDirectory](https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs#multiple-outputs) feature of 1ES pipeline templates. When implementing your pipeline, if you ensure publish artifacts are located in the `$(Build.ArtifactStagingDirectory)`, and utilize the 1ES provided template context, then you can reduce the number of security scans for your pipeline. + +Example: +``` yaml +# azure-pipelines.yml +extends: + template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate + parameters: + stages: + - stage: build + jobs: + - template: /eng/common/templates-official/jobs/jobs.yml@self + parameters: + # 1ES makes use of outputs to reduce security task injection overhead + templateContext: + outputs: + - output: pipelineArtifact + displayName: 'Publish logs from source' + continueOnError: true + condition: always() + targetPath: $(Build.ArtifactStagingDirectory)/artifacts/log + artifactName: Logs + jobs: + - job: Windows + steps: + - script: echo "friendly neighborhood" > artifacts/marvel/spiderman.txt + # copy build outputs to artifact staging directory for publishing + - task: CopyFiles@2 + displayName: Gather build output + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' +``` + +Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). + +## Development notes + +**Folder / file structure** + +``` text +eng\common\ + [templates || templates-official]\ + job\ + job.yml (shim + artifact publishing logic) + onelocbuild.yml (shim) + publish-build-assets.yml (shim) + source-build.yml (shim) + source-index-stage1.yml (shim) + jobs\ + codeql-build.yml (shim) + jobs.yml (shim) + source-build.yml (shim) + post-build\ + post-build.yml (shim) + common-variabls.yml (shim) + setup-maestro-vars.yml (shim) + steps\ + publish-build-artifacts.yml (logic) + publish-pipeline-artifacts.yml (logic) + component-governance.yml (shim) + generate-sbom.yml (shim) + publish-logs.yml (shim) + retain-build.yml (shim) + send-to-helix.yml (shim) + source-build.yml (shim) + variables\ + pool-providers.yml (logic + redirect) # templates/variables/pool-providers.yml will redirect to templates-official/variables/pool-providers.yml if you are running in the internal project + sdl-variables.yml (logic) + core-templates\ + job\ + job.yml (logic) + onelocbuild.yml (logic) + publish-build-assets.yml (logic) + source-build.yml (logic) + source-index-stage1.yml (logic) + jobs\ + codeql-build.yml (logic) + jobs.yml (logic) + source-build.yml (logic) + post-build\ + common-variabls.yml (logic) + post-build.yml (logic) + setup-maestro-vars.yml (logic) + steps\ + component-governance.yml (logic) + generate-sbom.yml (logic) + publish-build-artifacts.yml (redirect) + publish-logs.yml (logic) + publish-pipeline-artifacts.yml (redirect) + retain-build.yml (logic) + send-to-helix.yml (logic) + source-build.yml (logic) + variables\ + pool-providers.yml (redirect) +``` + +In the table above, a file is designated as "shim", "logic", or "redirect". + +- shim - represents a yaml file which is an intermediate step between pipeline logic and .Net Core Engineering's templates (`core-templates`) and defines the `is1ESPipeline` parameter value. + +- logic - represents actual base template logic. + +- redirect- represents a file in `core-templates` which redirects to the "logic" file in either `templates` or `templates-official`. + +Logic for Arcade's templates live **primarily** in the `core-templates` folder. The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates. `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter. If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`. If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`. + +Within `templates` and `templates-official`, the templates at the "stages", and "jobs" / "job" level have been replaced with shims. Templates at the "steps" and "variables" level are typically too granular to be replaced with shims and instead persist logic which is directly applicable to either scenario. + +Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used. In those places, we redirect back to the respective logic file in `templates` or `templates-official`. diff --git a/src/arcade/eng/common/templates-official/job/onelocbuild.yml b/src/arcade/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000..0f0c514b9 --- /dev/null +++ b/src/arcade/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/job/onelocbuild.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/job/publish-build-assets.yml b/src/arcade/eng/common/templates-official/job/publish-build-assets.yml new file mode 100644 index 000000000..d667a70e8 --- /dev/null +++ b/src/arcade/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/job/publish-build-assets.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/job/source-build.yml b/src/arcade/eng/common/templates-official/job/source-build.yml new file mode 100644 index 000000000..1a480034b --- /dev/null +++ b/src/arcade/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/job/source-index-stage1.yml b/src/arcade/eng/common/templates-official/job/source-index-stage1.yml new file mode 100644 index 000000000..6d5ead316 --- /dev/null +++ b/src/arcade/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/jobs/codeql-build.yml b/src/arcade/eng/common/templates-official/jobs/codeql-build.yml new file mode 100644 index 000000000..a726322ec --- /dev/null +++ b/src/arcade/eng/common/templates-official/jobs/codeql-build.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/jobs/codeql-build.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/jobs/jobs.yml b/src/arcade/eng/common/templates-official/jobs/jobs.yml new file mode 100644 index 000000000..007deddae --- /dev/null +++ b/src/arcade/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/jobs/jobs.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/jobs/source-build.yml b/src/arcade/eng/common/templates-official/jobs/source-build.yml new file mode 100644 index 000000000..483e7b611 --- /dev/null +++ b/src/arcade/eng/common/templates-official/jobs/source-build.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/jobs/source-build.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/post-build/common-variables.yml b/src/arcade/eng/common/templates-official/post-build/common-variables.yml new file mode 100644 index 000000000..c32fc4923 --- /dev/null +++ b/src/arcade/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,8 @@ +variables: +- template: /eng/common/core-templates/post-build/common-variables.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/post-build/post-build.yml b/src/arcade/eng/common/templates-official/post-build/post-build.yml new file mode 100644 index 000000000..2364c0fd4 --- /dev/null +++ b/src/arcade/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,8 @@ +stages: +- template: /eng/common/core-templates/post-build/post-build.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/post-build/setup-maestro-vars.yml b/src/arcade/eng/common/templates-official/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000..024397d87 --- /dev/null +++ b/src/arcade/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -0,0 +1,8 @@ +steps: +- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/steps/component-governance.yml b/src/arcade/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000..30bb3985c --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/enable-internal-runtimes.yml b/src/arcade/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000..f9dd238c6 --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,9 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default +steps: +- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/enable-internal-sources.yml b/src/arcade/eng/common/templates-official/steps/enable-internal-sources.yml new file mode 100644 index 000000000..e6d571822 --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/enable-internal-sources.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/enable-internal-sources.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/steps/generate-sbom.yml b/src/arcade/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000..9a89a4706 --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/generate-sbom.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/get-delegation-sas.yml b/src/arcade/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 000000000..c5a9c1f82 --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/get-federated-access-token.yml b/src/arcade/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 000000000..c8dcf6b81 --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/steps/publish-logs.yml b/src/arcade/eng/common/templates-official/steps/publish-logs.yml new file mode 100644 index 000000000..579fd531e --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/publish-logs.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/src/arcade/eng/common/templates-official/steps/publish-pipeline-artifacts.yml new file mode 100644 index 000000000..172f9f0fd --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,28 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: true + +- name: args + type: object + default: {} + +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates-official cannot be referenced from a non-1ES managed template': error +- task: 1ES.PublishPipelineArtifact@1 + displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }} + ${{ if parameters.args.condition }}: + condition: ${{ parameters.args.condition }} + ${{ else }}: + condition: succeeded() + ${{ if parameters.args.continueOnError }}: + continueOnError: ${{ parameters.args.continueOnError }} + inputs: + targetPath: ${{ parameters.args.targetPath }} + ${{ if parameters.args.artifactName }}: + artifactName: ${{ parameters.args.artifactName }} + ${{ if parameters.args.properties }}: + properties: ${{ parameters.args.properties }} + ${{ if parameters.args.sbomEnabled }}: + sbomEnabled: ${{ parameters.args.sbomEnabled }} diff --git a/src/arcade/eng/common/templates-official/steps/retain-build.yml b/src/arcade/eng/common/templates-official/steps/retain-build.yml new file mode 100644 index 000000000..559455150 --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/retain-build.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/retain-build.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/send-to-helix.yml b/src/arcade/eng/common/templates-official/steps/send-to-helix.yml new file mode 100644 index 000000000..6500f21bf --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/send-to-helix.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/source-build.yml b/src/arcade/eng/common/templates-official/steps/source-build.yml new file mode 100644 index 000000000..8f92c49e7 --- /dev/null +++ b/src/arcade/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/source-build.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/variables/pool-providers.yml b/src/arcade/eng/common/templates-official/variables/pool-providers.yml new file mode 100644 index 000000000..1f308b24e --- /dev/null +++ b/src/arcade/eng/common/templates-official/variables/pool-providers.yml @@ -0,0 +1,45 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage it can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates-official/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) +# +# pool: +# name: $(DncEngInternalBuildPool) +# image: 1es-windows-2022 + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/variables/sdl-variables.yml b/src/arcade/eng/common/templates-official/variables/sdl-variables.yml new file mode 100644 index 000000000..dbdd66d4a --- /dev/null +++ b/src/arcade/eng/common/templates-official/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.109.0 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/src/arcade/eng/common/templates/job/onelocbuild.yml b/src/arcade/eng/common/templates/job/onelocbuild.yml new file mode 100644 index 000000000..ff829dc4c --- /dev/null +++ b/src/arcade/eng/common/templates/job/onelocbuild.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/job/onelocbuild.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/job/publish-build-assets.yml b/src/arcade/eng/common/templates/job/publish-build-assets.yml new file mode 100644 index 000000000..ab2edec2a --- /dev/null +++ b/src/arcade/eng/common/templates/job/publish-build-assets.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/job/publish-build-assets.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/job/source-build.yml b/src/arcade/eng/common/templates/job/source-build.yml new file mode 100644 index 000000000..e44d47b1d --- /dev/null +++ b/src/arcade/eng/common/templates/job/source-build.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/job/source-index-stage1.yml b/src/arcade/eng/common/templates/job/source-index-stage1.yml new file mode 100644 index 000000000..89f329159 --- /dev/null +++ b/src/arcade/eng/common/templates/job/source-index-stage1.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/jobs/codeql-build.yml b/src/arcade/eng/common/templates/jobs/codeql-build.yml new file mode 100644 index 000000000..517f24d6a --- /dev/null +++ b/src/arcade/eng/common/templates/jobs/codeql-build.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/jobs/codeql-build.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/jobs/jobs.yml b/src/arcade/eng/common/templates/jobs/jobs.yml new file mode 100644 index 000000000..388e9037b --- /dev/null +++ b/src/arcade/eng/common/templates/jobs/jobs.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/jobs/jobs.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/jobs/source-build.yml b/src/arcade/eng/common/templates/jobs/source-build.yml new file mode 100644 index 000000000..818d4c326 --- /dev/null +++ b/src/arcade/eng/common/templates/jobs/source-build.yml @@ -0,0 +1,7 @@ +jobs: +- template: /eng/common/core-templates/jobs/source-build.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/post-build/common-variables.yml b/src/arcade/eng/common/templates/post-build/common-variables.yml new file mode 100644 index 000000000..7fa105875 --- /dev/null +++ b/src/arcade/eng/common/templates/post-build/common-variables.yml @@ -0,0 +1,8 @@ +variables: +- template: /eng/common/core-templates/post-build/common-variables.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/post-build/post-build.yml b/src/arcade/eng/common/templates/post-build/post-build.yml new file mode 100644 index 000000000..53ede714b --- /dev/null +++ b/src/arcade/eng/common/templates/post-build/post-build.yml @@ -0,0 +1,8 @@ +stages: +- template: /eng/common/core-templates/post-build/post-build.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/post-build/setup-maestro-vars.yml b/src/arcade/eng/common/templates/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000..a79fab5b4 --- /dev/null +++ b/src/arcade/eng/common/templates/post-build/setup-maestro-vars.yml @@ -0,0 +1,8 @@ +steps: +- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/steps/component-governance.yml b/src/arcade/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..c12a5f8d2 --- /dev/null +++ b/src/arcade/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/enable-internal-runtimes.yml b/src/arcade/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000..b21a8038c --- /dev/null +++ b/src/arcade/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,10 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +steps: +- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/enable-internal-sources.yml b/src/arcade/eng/common/templates/steps/enable-internal-sources.yml new file mode 100644 index 000000000..5f87e9abb --- /dev/null +++ b/src/arcade/eng/common/templates/steps/enable-internal-sources.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/enable-internal-sources.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/steps/generate-sbom.yml b/src/arcade/eng/common/templates/steps/generate-sbom.yml new file mode 100644 index 000000000..26dc00a2e --- /dev/null +++ b/src/arcade/eng/common/templates/steps/generate-sbom.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/generate-sbom.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/get-delegation-sas.yml b/src/arcade/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 000000000..83760c979 --- /dev/null +++ b/src/arcade/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/get-federated-access-token.yml b/src/arcade/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000..31e151d9d --- /dev/null +++ b/src/arcade/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/steps/publish-logs.yml b/src/arcade/eng/common/templates/steps/publish-logs.yml new file mode 100644 index 000000000..4ea86bd88 --- /dev/null +++ b/src/arcade/eng/common/templates/steps/publish-logs.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/publish-pipeline-artifacts.yml b/src/arcade/eng/common/templates/steps/publish-pipeline-artifacts.yml new file mode 100644 index 000000000..5dd698b21 --- /dev/null +++ b/src/arcade/eng/common/templates/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,34 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false + +- name: args + type: object + default: {} + +steps: +- ${{ if eq(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates cannot be referenced from a 1ES managed template': error +- task: PublishPipelineArtifact@1 + displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }} + ${{ if parameters.args.condition }}: + condition: ${{ parameters.args.condition }} + ${{ else }}: + condition: succeeded() + ${{ if parameters.args.continueOnError }}: + continueOnError: ${{ parameters.args.continueOnError }} + inputs: + targetPath: ${{ parameters.args.targetPath }} + ${{ if parameters.args.artifactName }}: + artifactName: ${{ parameters.args.artifactName }} + ${{ if parameters.args.publishLocation }}: + publishLocation: ${{ parameters.args.publishLocation }} + ${{ if parameters.args.fileSharePath }}: + fileSharePath: ${{ parameters.args.fileSharePath }} + ${{ if parameters.args.Parallel }}: + parallel: ${{ parameters.args.Parallel }} + ${{ if parameters.args.parallelCount }}: + parallelCount: ${{ parameters.args.parallelCount }} + ${{ if parameters.args.properties }}: + properties: ${{ parameters.args.properties }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/steps/retain-build.yml b/src/arcade/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000..8e841ace3 --- /dev/null +++ b/src/arcade/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/retain-build.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/send-to-helix.yml b/src/arcade/eng/common/templates/steps/send-to-helix.yml new file mode 100644 index 000000000..39f99fc27 --- /dev/null +++ b/src/arcade/eng/common/templates/steps/send-to-helix.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/send-to-helix.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/source-build.yml b/src/arcade/eng/common/templates/steps/source-build.yml new file mode 100644 index 000000000..23c1d6f4e --- /dev/null +++ b/src/arcade/eng/common/templates/steps/source-build.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/source-build.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/variables/pool-providers.yml b/src/arcade/eng/common/templates/variables/pool-providers.yml new file mode 100644 index 000000000..e0b19c14a --- /dev/null +++ b/src/arcade/eng/common/templates/variables/pool-providers.yml @@ -0,0 +1,59 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage it can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.: +# +# pool: +# name: $(DncEngInternalBuildPool) +# demands: ImageOverride -equals windows.vs2019.amd64 +variables: + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ else }}: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + - name: DncEngPublicBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] From cc5bfa8663a5063b722873bb6f81bfe2e547550a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 May 2025 06:03:19 +0000 Subject: [PATCH 122/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250513.5 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.5-rtm.25227.4 -> To Version 9.0.6-rtm.25263.5 --- NuGet.config | 24 ++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index ecfe8ea48..97cda348a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,11 +10,23 @@ + + + + + + + + + + + + @@ -33,11 +45,23 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f5b9b36c..d691d2bb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aded4c09d9f59a6fb5fcdfca54fa324becddcb4f + 73e6dbf652c07f978e2dd202cbfcf4f97e65fe98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aded4c09d9f59a6fb5fcdfca54fa324becddcb4f + 73e6dbf652c07f978e2dd202cbfcf4f97e65fe98 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aded4c09d9f59a6fb5fcdfca54fa324becddcb4f + 73e6dbf652c07f978e2dd202cbfcf4f97e65fe98 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ed5842f36..89ebef914 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.5-servicing.25216.1 9.0.5 - 9.0.5-rtm.25227.4 + 9.0.6-rtm.25263.5 From fdd2ca6feb94af652c46802f5ba362c8146fc7b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 May 2025 21:33:03 +0000 Subject: [PATCH 123/158] [release/9.0] Update dependencies from dotnet/arcade (#5091) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7aee27775..4102d4bf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 93823d49ca01742464ad1c0b49ea940e693b1be3 - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 93823d49ca01742464ad1c0b49ea940e693b1be3 - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 93823d49ca01742464ad1c0b49ea940e693b1be3 - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 93823d49ca01742464ad1c0b49ea940e693b1be3 - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 93823d49ca01742464ad1c0b49ea940e693b1be3 - + https://github.com/dotnet/arcade - ac63dcf2791c32bf2102fd2b5ebb46479bd48a83 + 93823d49ca01742464ad1c0b49ea940e693b1be3 diff --git a/eng/Versions.props b/eng/Versions.props index 57b0e151b..7c19bcec3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25263.2 - 9.0.0-beta.25263.2 + 9.0.0-beta.25263.5 + 9.0.0-beta.25263.5 4.5.0 4.9.0 diff --git a/global.json b/global.json index a053410dc..9cc4f57f8 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.105" + "dotnet": "9.0.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25263.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25263.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From fc611854f85faffea2c7ee9e00413566ec08abdf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 May 2025 06:19:51 +0000 Subject: [PATCH 124/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250515.7 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.5-rtm.25227.4 -> To Version 9.0.6-rtm.25265.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d691d2bb9..5ced30c16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 73e6dbf652c07f978e2dd202cbfcf4f97e65fe98 + 40d9875b619b334c1ca51afbb7431de5b9703b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 73e6dbf652c07f978e2dd202cbfcf4f97e65fe98 + 40d9875b619b334c1ca51afbb7431de5b9703b34 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 73e6dbf652c07f978e2dd202cbfcf4f97e65fe98 + 40d9875b619b334c1ca51afbb7431de5b9703b34 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 89ebef914..454319cdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.5-servicing.25216.1 9.0.5 - 9.0.6-rtm.25263.5 + 9.0.6-rtm.25265.7 From ee548d4ecccf69b5d547a22cb05d64c6788abe5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 17 May 2025 02:13:46 +0000 Subject: [PATCH 125/158] [release/9.0] Update dependencies from dotnet/arcade (#5095) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4102d4bf3..f557e903c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 93823d49ca01742464ad1c0b49ea940e693b1be3 + c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 - + https://github.com/dotnet/arcade - 93823d49ca01742464ad1c0b49ea940e693b1be3 + c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 - + https://github.com/dotnet/arcade - 93823d49ca01742464ad1c0b49ea940e693b1be3 + c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 - + https://github.com/dotnet/arcade - 93823d49ca01742464ad1c0b49ea940e693b1be3 + c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 - + https://github.com/dotnet/arcade - 93823d49ca01742464ad1c0b49ea940e693b1be3 + c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 - + https://github.com/dotnet/arcade - 93823d49ca01742464ad1c0b49ea940e693b1be3 + c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 diff --git a/eng/Versions.props b/eng/Versions.props index 7c19bcec3..ee297b56a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25263.5 - 9.0.0-beta.25263.5 + 9.0.0-beta.25266.2 + 9.0.0-beta.25266.2 4.5.0 4.9.0 diff --git a/global.json b/global.json index 9cc4f57f8..eb79ce09d 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25263.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25266.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25266.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 6ad991a1f80da95146330683911b3b9d6862f90a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 May 2025 21:18:14 +0000 Subject: [PATCH 126/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250517.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.6-rtm.25265.7 -> To Version 9.0.6-rtm.25267.1 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.5-servicing.25216.1 -> To Version 9.0.6-servicing.25266.5 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 40 ++--------- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 144 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97cda348a..d9ffbe268 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,10 @@ - - - - - - - - - + - - - - - - - - - + @@ -43,26 +27,10 @@ - - - - - - - - - + - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc8bad5a0..50b876f46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 + f0fc61ead7dc20cbce05eb81a42089e28c90c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 40d9875b619b334c1ca51afbb7431de5b9703b34 + 620a20376852ae35038cd4251552ea8425f6cfe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 40d9875b619b334c1ca51afbb7431de5b9703b34 + 620a20376852ae35038cd4251552ea8425f6cfe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 + f0fc61ead7dc20cbce05eb81a42089e28c90c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 40d9875b619b334c1ca51afbb7431de5b9703b34 + 620a20376852ae35038cd4251552ea8425f6cfe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 711ee9fe3398d64b89f2ae70b94c66d9d495cf72 + f0fc61ead7dc20cbce05eb81a42089e28c90c409 diff --git a/eng/Versions.props b/eng/Versions.props index 8066c54e6..561e14b90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.5-servicing.25215.9 - 9.0.5 - 9.0.5 - 9.0.5 + 9.0.6-servicing.25266.13 + 9.0.6 + 9.0.6 + 9.0.6 5.0.0 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 5.0.0 - 9.0.5 + 9.0.6 5.0.0 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 6.0.0 5.0.0 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 5.0.0 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5-servicing.25215.9 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6-servicing.25266.13 4.10.3 - 9.0.5-servicing.25216.1 - 9.0.5 + 9.0.6-servicing.25266.5 + 9.0.6 - 9.0.6-rtm.25265.7 + 9.0.6-rtm.25267.1 From 3b66f94f389141e68f575a67af83665053592e07 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 19 May 2025 06:16:19 +0000 Subject: [PATCH 127/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250518.3 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.6-rtm.25267.1 -> To Version 9.0.6-rtm.25268.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50b876f46..3f261d7a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms f0fc61ead7dc20cbce05eb81a42089e28c90c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 620a20376852ae35038cd4251552ea8425f6cfe6 + 494b07e6d9b6b6055d944b8b1a61c14e403875b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 620a20376852ae35038cd4251552ea8425f6cfe6 + 494b07e6d9b6b6055d944b8b1a61c14e403875b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms f0fc61ead7dc20cbce05eb81a42089e28c90c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 620a20376852ae35038cd4251552ea8425f6cfe6 + 494b07e6d9b6b6055d944b8b1a61c14e403875b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 561e14b90..14074517a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.6-servicing.25266.5 9.0.6 - 9.0.6-rtm.25267.1 + 9.0.6-rtm.25268.3 From 9cb77658f1fa0555a5c3e105fce86e150259375e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 19 May 2025 15:41:47 +0200 Subject: [PATCH 128/158] Delete src/arcade/eng/common directory It got accidentally added due to a darc bug, see https://github.com/dotnet/arcade-services/issues/4837 --- .../build-configuration.json | 4 - .../eng/common/PSScriptAnalyzerSettings.psd1 | 11 - src/arcade/eng/common/README.md | 28 -- src/arcade/eng/common/SetupNugetSources.ps1 | 171 -------- src/arcade/eng/common/SetupNugetSources.sh | 167 -------- src/arcade/eng/common/build.cmd | 3 - .../common/core-templates/job/onelocbuild.yml | 121 ------ .../core-templates/jobs/source-build.yml | 58 --- .../post-build/common-variables.yml | 22 - .../post-build/setup-maestro-vars.yml | 74 ---- .../steps/component-governance.yml | 16 - .../steps/enable-internal-runtimes.yml | 32 -- .../steps/enable-internal-sources.yml | 47 -- .../steps/get-federated-access-token.yml | 42 -- .../steps/publish-build-artifacts.yml | 20 - .../steps/publish-pipeline-artifacts.yml | 20 - .../core-templates/steps/retain-build.yml | 28 -- .../core-templates/steps/send-to-helix.yml | 93 ---- .../variables/pool-providers.yml | 8 - .../eng/common/cross/arm/tizen/tizen.patch | 9 - .../eng/common/cross/armel/tizen/tizen.patch | 9 - .../common/cross/riscv64/tizen/tizen.patch | 9 - .../eng/common/cross/tizen-build-rootfs.sh | 82 ---- src/arcade/eng/common/darc-init.ps1 | 47 -- src/arcade/eng/common/darc-init.sh | 82 ---- src/arcade/eng/common/dotnet-install.cmd | 2 - src/arcade/eng/common/dotnet-install.ps1 | 28 -- src/arcade/eng/common/dotnet-install.sh | 94 ---- .../common/enable-cross-org-publishing.ps1 | 13 - src/arcade/eng/common/generate-locproject.ps1 | 189 --------- src/arcade/eng/common/generate-sbom-prep.ps1 | 29 -- src/arcade/eng/common/generate-sbom-prep.sh | 39 -- src/arcade/eng/common/helixpublish.proj | 27 -- src/arcade/eng/common/init-tools-native.cmd | 3 - src/arcade/eng/common/init-tools-native.ps1 | 203 --------- src/arcade/eng/common/init-tools-native.sh | 238 ----------- .../eng/common/internal-feed-operations.ps1 | 132 ------ .../eng/common/internal-feed-operations.sh | 141 ------ .../eng/common/internal/Directory.Build.props | 11 - src/arcade/eng/common/internal/NuGet.config | 7 - src/arcade/eng/common/internal/Tools.csproj | 22 - .../common/loc/P22DotNetHtmlLocalization.lss | 29 -- src/arcade/eng/common/msbuild.ps1 | 28 -- src/arcade/eng/common/msbuild.sh | 58 --- .../eng/common/native/CommonLibrary.psm1 | 401 ------------------ .../eng/common/native/common-library.sh | 172 -------- src/arcade/eng/common/native/init-compiler.sh | 146 ------- .../eng/common/native/init-distro-rid.sh | 110 ----- .../eng/common/native/init-os-and-arch.sh | 85 ---- .../eng/common/native/install-cmake-test.sh | 117 ----- src/arcade/eng/common/native/install-cmake.sh | 117 ----- src/arcade/eng/common/native/install-tool.ps1 | 132 ------ .../eng/common/pipeline-logging-functions.ps1 | 260 ------------ .../eng/common/pipeline-logging-functions.sh | 206 --------- .../post-build/check-channel-consistency.ps1 | 48 --- .../common/post-build/nuget-validation.ps1 | 22 - .../common/post-build/nuget-verification.ps1 | 121 ------ .../eng/common/post-build/redact-logs.ps1 | 89 ---- .../post-build/sourcelink-validation.ps1 | 327 -------------- .../common/post-build/symbols-validation.ps1 | 337 --------------- src/arcade/eng/common/retain-build.ps1 | 45 -- src/arcade/eng/common/sdl/NuGet.config | 18 - .../eng/common/sdl/configure-sdl-tool.ps1 | 130 ------ .../eng/common/sdl/execute-all-sdl-tools.ps1 | 167 -------- .../common/sdl/extract-artifact-archives.ps1 | 63 --- .../common/sdl/extract-artifact-packages.ps1 | 82 ---- src/arcade/eng/common/sdl/init-sdl.ps1 | 55 --- src/arcade/eng/common/sdl/run-sdl.ps1 | 49 --- src/arcade/eng/common/sdl/sdl.ps1 | 38 -- .../eng/common/sdl/trim-assets-version.ps1 | 75 ---- src/arcade/eng/common/template-guidance.md | 133 ------ .../templates-official/job/onelocbuild.yml | 7 - .../job/publish-build-assets.yml | 7 - .../templates-official/job/source-build.yml | 7 - .../job/source-index-stage1.yml | 7 - .../templates-official/jobs/codeql-build.yml | 7 - .../common/templates-official/jobs/jobs.yml | 7 - .../templates-official/jobs/source-build.yml | 7 - .../post-build/common-variables.yml | 8 - .../post-build/post-build.yml | 8 - .../post-build/setup-maestro-vars.yml | 8 - .../steps/component-governance.yml | 7 - .../steps/enable-internal-runtimes.yml | 9 - .../steps/enable-internal-sources.yml | 7 - .../steps/generate-sbom.yml | 7 - .../steps/get-delegation-sas.yml | 7 - .../steps/get-federated-access-token.yml | 7 - .../templates-official/steps/publish-logs.yml | 7 - .../steps/publish-pipeline-artifacts.yml | 28 -- .../templates-official/steps/retain-build.yml | 7 - .../steps/send-to-helix.yml | 7 - .../templates-official/steps/source-build.yml | 7 - .../variables/pool-providers.yml | 45 -- .../variables/sdl-variables.yml | 7 - .../eng/common/templates/job/onelocbuild.yml | 7 - .../templates/job/publish-build-assets.yml | 7 - .../eng/common/templates/job/source-build.yml | 7 - .../templates/job/source-index-stage1.yml | 7 - .../common/templates/jobs/codeql-build.yml | 7 - src/arcade/eng/common/templates/jobs/jobs.yml | 7 - .../common/templates/jobs/source-build.yml | 7 - .../templates/post-build/common-variables.yml | 8 - .../templates/post-build/post-build.yml | 8 - .../post-build/setup-maestro-vars.yml | 8 - .../templates/steps/component-governance.yml | 7 - .../steps/enable-internal-runtimes.yml | 10 - .../steps/enable-internal-sources.yml | 7 - .../common/templates/steps/generate-sbom.yml | 7 - .../templates/steps/get-delegation-sas.yml | 7 - .../steps/get-federated-access-token.yml | 7 - .../common/templates/steps/publish-logs.yml | 7 - .../steps/publish-pipeline-artifacts.yml | 34 -- .../common/templates/steps/retain-build.yml | 7 - .../common/templates/steps/send-to-helix.yml | 7 - .../common/templates/steps/source-build.yml | 7 - .../templates/variables/pool-providers.yml | 59 --- 116 files changed, 6505 deletions(-) delete mode 100644 src/arcade/eng/common/BuildConfiguration/build-configuration.json delete mode 100644 src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 delete mode 100644 src/arcade/eng/common/README.md delete mode 100644 src/arcade/eng/common/SetupNugetSources.ps1 delete mode 100644 src/arcade/eng/common/SetupNugetSources.sh delete mode 100644 src/arcade/eng/common/build.cmd delete mode 100644 src/arcade/eng/common/core-templates/job/onelocbuild.yml delete mode 100644 src/arcade/eng/common/core-templates/jobs/source-build.yml delete mode 100644 src/arcade/eng/common/core-templates/post-build/common-variables.yml delete mode 100644 src/arcade/eng/common/core-templates/post-build/setup-maestro-vars.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/component-governance.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/enable-internal-runtimes.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/enable-internal-sources.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/get-federated-access-token.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/publish-build-artifacts.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/publish-pipeline-artifacts.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/retain-build.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/send-to-helix.yml delete mode 100644 src/arcade/eng/common/core-templates/variables/pool-providers.yml delete mode 100644 src/arcade/eng/common/cross/arm/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/armel/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/riscv64/tizen/tizen.patch delete mode 100644 src/arcade/eng/common/cross/tizen-build-rootfs.sh delete mode 100644 src/arcade/eng/common/darc-init.ps1 delete mode 100644 src/arcade/eng/common/darc-init.sh delete mode 100644 src/arcade/eng/common/dotnet-install.cmd delete mode 100644 src/arcade/eng/common/dotnet-install.ps1 delete mode 100644 src/arcade/eng/common/dotnet-install.sh delete mode 100644 src/arcade/eng/common/enable-cross-org-publishing.ps1 delete mode 100644 src/arcade/eng/common/generate-locproject.ps1 delete mode 100644 src/arcade/eng/common/generate-sbom-prep.ps1 delete mode 100644 src/arcade/eng/common/generate-sbom-prep.sh delete mode 100644 src/arcade/eng/common/helixpublish.proj delete mode 100644 src/arcade/eng/common/init-tools-native.cmd delete mode 100644 src/arcade/eng/common/init-tools-native.ps1 delete mode 100644 src/arcade/eng/common/init-tools-native.sh delete mode 100644 src/arcade/eng/common/internal-feed-operations.ps1 delete mode 100644 src/arcade/eng/common/internal-feed-operations.sh delete mode 100644 src/arcade/eng/common/internal/Directory.Build.props delete mode 100644 src/arcade/eng/common/internal/NuGet.config delete mode 100644 src/arcade/eng/common/internal/Tools.csproj delete mode 100644 src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss delete mode 100644 src/arcade/eng/common/msbuild.ps1 delete mode 100644 src/arcade/eng/common/msbuild.sh delete mode 100644 src/arcade/eng/common/native/CommonLibrary.psm1 delete mode 100644 src/arcade/eng/common/native/common-library.sh delete mode 100644 src/arcade/eng/common/native/init-compiler.sh delete mode 100644 src/arcade/eng/common/native/init-distro-rid.sh delete mode 100644 src/arcade/eng/common/native/init-os-and-arch.sh delete mode 100644 src/arcade/eng/common/native/install-cmake-test.sh delete mode 100644 src/arcade/eng/common/native/install-cmake.sh delete mode 100644 src/arcade/eng/common/native/install-tool.ps1 delete mode 100644 src/arcade/eng/common/pipeline-logging-functions.ps1 delete mode 100644 src/arcade/eng/common/pipeline-logging-functions.sh delete mode 100644 src/arcade/eng/common/post-build/check-channel-consistency.ps1 delete mode 100644 src/arcade/eng/common/post-build/nuget-validation.ps1 delete mode 100644 src/arcade/eng/common/post-build/nuget-verification.ps1 delete mode 100644 src/arcade/eng/common/post-build/redact-logs.ps1 delete mode 100644 src/arcade/eng/common/post-build/sourcelink-validation.ps1 delete mode 100644 src/arcade/eng/common/post-build/symbols-validation.ps1 delete mode 100644 src/arcade/eng/common/retain-build.ps1 delete mode 100644 src/arcade/eng/common/sdl/NuGet.config delete mode 100644 src/arcade/eng/common/sdl/configure-sdl-tool.ps1 delete mode 100644 src/arcade/eng/common/sdl/execute-all-sdl-tools.ps1 delete mode 100644 src/arcade/eng/common/sdl/extract-artifact-archives.ps1 delete mode 100644 src/arcade/eng/common/sdl/extract-artifact-packages.ps1 delete mode 100644 src/arcade/eng/common/sdl/init-sdl.ps1 delete mode 100644 src/arcade/eng/common/sdl/run-sdl.ps1 delete mode 100644 src/arcade/eng/common/sdl/sdl.ps1 delete mode 100644 src/arcade/eng/common/sdl/trim-assets-version.ps1 delete mode 100644 src/arcade/eng/common/template-guidance.md delete mode 100644 src/arcade/eng/common/templates-official/job/onelocbuild.yml delete mode 100644 src/arcade/eng/common/templates-official/job/publish-build-assets.yml delete mode 100644 src/arcade/eng/common/templates-official/job/source-build.yml delete mode 100644 src/arcade/eng/common/templates-official/job/source-index-stage1.yml delete mode 100644 src/arcade/eng/common/templates-official/jobs/codeql-build.yml delete mode 100644 src/arcade/eng/common/templates-official/jobs/jobs.yml delete mode 100644 src/arcade/eng/common/templates-official/jobs/source-build.yml delete mode 100644 src/arcade/eng/common/templates-official/post-build/common-variables.yml delete mode 100644 src/arcade/eng/common/templates-official/post-build/post-build.yml delete mode 100644 src/arcade/eng/common/templates-official/post-build/setup-maestro-vars.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/component-governance.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/enable-internal-runtimes.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/enable-internal-sources.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/generate-sbom.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/get-delegation-sas.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/get-federated-access-token.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/publish-logs.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/publish-pipeline-artifacts.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/retain-build.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/send-to-helix.yml delete mode 100644 src/arcade/eng/common/templates-official/steps/source-build.yml delete mode 100644 src/arcade/eng/common/templates-official/variables/pool-providers.yml delete mode 100644 src/arcade/eng/common/templates-official/variables/sdl-variables.yml delete mode 100644 src/arcade/eng/common/templates/job/onelocbuild.yml delete mode 100644 src/arcade/eng/common/templates/job/publish-build-assets.yml delete mode 100644 src/arcade/eng/common/templates/job/source-build.yml delete mode 100644 src/arcade/eng/common/templates/job/source-index-stage1.yml delete mode 100644 src/arcade/eng/common/templates/jobs/codeql-build.yml delete mode 100644 src/arcade/eng/common/templates/jobs/jobs.yml delete mode 100644 src/arcade/eng/common/templates/jobs/source-build.yml delete mode 100644 src/arcade/eng/common/templates/post-build/common-variables.yml delete mode 100644 src/arcade/eng/common/templates/post-build/post-build.yml delete mode 100644 src/arcade/eng/common/templates/post-build/setup-maestro-vars.yml delete mode 100644 src/arcade/eng/common/templates/steps/component-governance.yml delete mode 100644 src/arcade/eng/common/templates/steps/enable-internal-runtimes.yml delete mode 100644 src/arcade/eng/common/templates/steps/enable-internal-sources.yml delete mode 100644 src/arcade/eng/common/templates/steps/generate-sbom.yml delete mode 100644 src/arcade/eng/common/templates/steps/get-delegation-sas.yml delete mode 100644 src/arcade/eng/common/templates/steps/get-federated-access-token.yml delete mode 100644 src/arcade/eng/common/templates/steps/publish-logs.yml delete mode 100644 src/arcade/eng/common/templates/steps/publish-pipeline-artifacts.yml delete mode 100644 src/arcade/eng/common/templates/steps/retain-build.yml delete mode 100644 src/arcade/eng/common/templates/steps/send-to-helix.yml delete mode 100644 src/arcade/eng/common/templates/steps/source-build.yml delete mode 100644 src/arcade/eng/common/templates/variables/pool-providers.yml diff --git a/src/arcade/eng/common/BuildConfiguration/build-configuration.json b/src/arcade/eng/common/BuildConfiguration/build-configuration.json deleted file mode 100644 index 3d1cc8989..000000000 --- a/src/arcade/eng/common/BuildConfiguration/build-configuration.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "RetryCountLimit": 1, - "RetryByAnyError": false -} diff --git a/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 b/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 deleted file mode 100644 index 4c1ea7c98..000000000 --- a/src/arcade/eng/common/PSScriptAnalyzerSettings.psd1 +++ /dev/null @@ -1,11 +0,0 @@ -@{ - IncludeRules=@('PSAvoidUsingCmdletAliases', - 'PSAvoidUsingWMICmdlet', - 'PSAvoidUsingPositionalParameters', - 'PSAvoidUsingInvokeExpression', - 'PSUseDeclaredVarsMoreThanAssignments', - 'PSUseCmdletCorrectly', - 'PSStandardDSCFunctionsInResource', - 'PSUseIdenticalMandatoryParametersForDSC', - 'PSUseIdenticalParametersForDSC') -} \ No newline at end of file diff --git a/src/arcade/eng/common/README.md b/src/arcade/eng/common/README.md deleted file mode 100644 index ff49c3715..000000000 --- a/src/arcade/eng/common/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# Don't touch this folder - - uuuuuuuuuuuuuuuuuuuu - u" uuuuuuuuuuuuuuuuuu "u - u" u$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - $ $$$" ... "$... ...$" ... "$$$ ... "$$$ $ - $ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $ - $ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $ - $ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $ - $ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $ - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$" u" - "u """""""""""""""""" u" - """""""""""""""""""" - -!!! Changes made in this directory are subject to being overwritten by automation !!! - -The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first. diff --git a/src/arcade/eng/common/SetupNugetSources.ps1 b/src/arcade/eng/common/SetupNugetSources.ps1 deleted file mode 100644 index 5db4ad71e..000000000 --- a/src/arcade/eng/common/SetupNugetSources.ps1 +++ /dev/null @@ -1,171 +0,0 @@ -# This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. -# -# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. -# -# See example call for this script below. -# -# - task: PowerShell@2 -# displayName: Setup Private Feeds Credentials -# condition: eq(variables['Agent.OS'], 'Windows_NT') -# inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token -# env: -# Token: $(dn-bot-dnceng-artifact-feeds-rw) -# -# Note that the NuGetAuthenticate task should be called after SetupNugetSources. -# This ensures that: -# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) -# - The credential provider is installed. -# -# This logic is also abstracted into enable-internal-sources.yml. - -[CmdletBinding()] -param ( - [Parameter(Mandatory = $true)][string]$ConfigFile, - $Password -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - -. $PSScriptRoot\tools.ps1 - -# Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { - $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") - - if ($packageSource -eq $null) - { - $packageSource = $doc.CreateElement("add") - $packageSource.SetAttribute("key", $SourceName) - $packageSource.SetAttribute("value", $SourceEndPoint) - $sources.AppendChild($packageSource) | Out-Null - } - else { - Write-Host "Package source $SourceName already present." - } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd -} - -# Add a credential node for the specified source -function AddCredential($creds, $source, $username, $pwd) { - # If no cred supplied, don't do anything. - if (!$pwd) { - return; - } - - # Looks for credential configuration for the given SourceName. Create it if none is found. - $sourceElement = $creds.SelectSingleNode($Source) - if ($sourceElement -eq $null) - { - $sourceElement = $doc.CreateElement($Source) - $creds.AppendChild($sourceElement) | Out-Null - } - - # Add the node to the credential if none is found. - $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") - if ($usernameElement -eq $null) - { - $usernameElement = $doc.CreateElement("add") - $usernameElement.SetAttribute("key", "Username") - $sourceElement.AppendChild($usernameElement) | Out-Null - } - $usernameElement.SetAttribute("value", $Username) - - # Add the to the credential if none is found. - # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. - # -> https://github.com/NuGet/Home/issues/5526 - $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") - if ($passwordElement -eq $null) - { - $passwordElement = $doc.CreateElement("add") - $passwordElement.SetAttribute("key", "ClearTextPassword") - $sourceElement.AppendChild($passwordElement) | Out-Null - } - - $passwordElement.SetAttribute("value", $pwd) -} - -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { - $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") - - Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." - - ForEach ($PackageSource in $maestroPrivateSources) { - Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd - } -} - -function EnablePrivatePackageSources($DisabledPackageSources) { - $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" - # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries - $DisabledPackageSources.RemoveChild($DisabledPackageSource) - } -} - -if (!(Test-Path $ConfigFile -PathType Leaf)) { - Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" - ExitWithExitCode 1 -} - -# Load NuGet.config -$doc = New-Object System.Xml.XmlDocument -$filename = (Get-Item $ConfigFile).FullName -$doc.Load($filename) - -# Get reference to or create one if none exist already -$sources = $doc.DocumentElement.SelectSingleNode("packageSources") -if ($sources -eq $null) { - $sources = $doc.CreateElement("packageSources") - $doc.DocumentElement.AppendChild($sources) | Out-Null -} - -$creds = $null -if ($Password) { - # Looks for a node. Create it if none is found. - $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") - if ($creds -eq $null) { - $creds = $doc.CreateElement("packageSourceCredentials") - $doc.DocumentElement.AppendChild($creds) | Out-Null - } -} - -# Check for disabledPackageSources; we'll enable any darc-int ones we find there -$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") -if ($disabledSources -ne $null) { - Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnablePrivatePackageSources -DisabledPackageSources $disabledSources -} - -$userName = "dn-bot" - -# Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password - -# 3.1 uses a different feed url format so it's handled differently here -$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") -if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password -} - -$dotnetVersions = @('5','6','7','8','9') - -foreach ($dotnetVersion in $dotnetVersions) { - $feedPrefix = "dotnet" + $dotnetVersion; - $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") - if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password - } -} - -$doc.Save($filename) diff --git a/src/arcade/eng/common/SetupNugetSources.sh b/src/arcade/eng/common/SetupNugetSources.sh deleted file mode 100644 index 4604b61b0..000000000 --- a/src/arcade/eng/common/SetupNugetSources.sh +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env bash - -# This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. -# -# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. -# -# See example call for this script below. -# -# - task: Bash@3 -# displayName: Setup Internal Feeds -# inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config -# condition: ne(variables['Agent.OS'], 'Windows_NT') -# - task: NuGetAuthenticate@1 -# -# Note that the NuGetAuthenticate task should be called after SetupNugetSources. -# This ensures that: -# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) -# - The credential provider is installed. -# -# This logic is also abstracted into enable-internal-sources.yml. - -ConfigFile=$1 -CredToken=$2 -NL='\n' -TB=' ' - -source="${BASH_SOURCE[0]}" - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$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 )" - -. "$scriptroot/tools.sh" - -if [ ! -f "$ConfigFile" ]; then - Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" - ExitWithExitCode 1 -fi - -if [[ `uname -s` == "Darwin" ]]; then - NL=$'\\\n' - TB='' -fi - -# Ensure there is a ... section. -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding ... section." - ConfigNodeHeader="" - PackageSourcesTemplate="${TB}${NL}${TB}" - - sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile -fi - -# Ensure there is a ... section. -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding ... section." - - PackageSourcesNodeFooter="" - PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile -fi - -PackageSources=() - -# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present -grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3.1-internal') - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3.1-internal-transport') -fi - -DotNetVersions=('5' '6' '7' '8' '9') - -for DotNetVersion in ${DotNetVersions[@]} ; do - FeedPrefix="dotnet${DotNetVersion}"; - grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal") - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding $FeedPrefix-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal-transport") - fi -done - -# I want things split line by line -PrevIFS=$IFS -IFS=$'\n' -PackageSources+="$IFS" -PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') -IFS=$PrevIFS - -if [ "$CredToken" ]; then - for FeedName in ${PackageSources[@]} ; do - # Check if there is no existing credential for this FeedName - grep -i "<$FeedName>" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." - - PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile - fi - done -fi - -# Re-enable any entries in disabledPackageSources where the feed name contains darc-int -grep -i "" $ConfigFile -if [ "$?" == "0" ]; then - DisabledDarcIntSources=() - echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" - DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') - for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do - if [[ $DisabledSourceName == darc-int* ]] - then - OldDisableValue="" - NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile - echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" - fi - done -fi diff --git a/src/arcade/eng/common/build.cmd b/src/arcade/eng/common/build.cmd deleted file mode 100644 index 99daf368a..000000000 --- a/src/arcade/eng/common/build.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*" -exit /b %ErrorLevel% diff --git a/src/arcade/eng/common/core-templates/job/onelocbuild.yml b/src/arcade/eng/common/core-templates/job/onelocbuild.yml deleted file mode 100644 index 00feec8eb..000000000 --- a/src/arcade/eng/common/core-templates/job/onelocbuild.yml +++ /dev/null @@ -1,121 +0,0 @@ -parameters: - # Optional: dependencies of the job - dependsOn: '' - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: '' - - CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex - GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - - SourcesDirectory: $(Build.SourcesDirectory) - CreatePr: true - AutoCompletePr: false - ReusePr: true - UseLfLineEndings: true - UseCheckedInLocProjectJson: false - SkipLocProjectJsonGeneration: false - LanguageSet: VS_Main_Languages - LclSource: lclFilesInRepo - LclPackageId: '' - RepoType: gitHub - GitHubOrg: dotnet - MirrorRepo: '' - MirrorBranch: main - condition: '' - JobNameSuffix: '' - is1ESPipeline: '' -jobs: -- job: OneLocBuild${{ parameters.JobNameSuffix }} - - dependsOn: ${{ parameters.dependsOn }} - - displayName: OneLocBuild${{ parameters.JobNameSuffix }} - - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - steps: - - ${{ if eq(parameters.is1ESPipeline, '') }}: - - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - - - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} - - - task: OneLocBuild@2 - displayName: OneLocBuild - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - inputs: - locProj: eng/Localize/LocProject.json - outDir: $(Build.ArtifactStagingDirectory) - lclSource: ${{ parameters.LclSource }} - lclPackageId: ${{ parameters.LclPackageId }} - isCreatePrSelected: ${{ parameters.CreatePr }} - isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} - ${{ if eq(parameters.CreatePr, true) }}: - isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - isShouldReusePrSelected: ${{ parameters.ReusePr }} - packageSourceAuth: patAuth - patVariable: ${{ parameters.CeapexPat }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - repoType: ${{ parameters.RepoType }} - gitHubPatVariable: "${{ parameters.GithubPat }}" - ${{ if ne(parameters.MirrorRepo, '') }}: - isMirrorRepoSelected: true - gitHubOrganization: ${{ parameters.GitHubOrg }} - mirrorRepo: ${{ parameters.MirrorRepo }} - mirrorBranch: ${{ parameters.MirrorBranch }} - condition: ${{ parameters.condition }} - - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish Localization Files - pathToPublish: '$(Build.ArtifactStagingDirectory)/loc' - publishLocation: Container - artifactName: Loc - condition: ${{ parameters.condition }} - - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' - publishLocation: Container - artifactName: Loc - condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/jobs/source-build.yml b/src/arcade/eng/common/core-templates/jobs/source-build.yml deleted file mode 100644 index a10ccfbee..000000000 --- a/src/arcade/eng/common/core-templates/jobs/source-build.yml +++ /dev/null @@ -1,58 +0,0 @@ -parameters: - # This template adds arcade-powered source-build to CI. A job is created for each platform, as - # well as an optional server job that completes when all platform jobs complete. - - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - - # See /eng/common/core-templates/job/source-build.yml - jobNamePrefix: 'Source_Build' - - # This is the default platform provided by Arcade, intended for use by a managed-only repo. - defaultManagedPlatform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' - - # Defines the platforms on which to run build jobs. One job is created for each platform, and the - # object in this array is sent to the job template as 'platform'. If no platforms are specified, - # one job runs on 'defaultManagedPlatform'. - platforms: [] - - is1ESPipeline: '' - - # If set to true and running on a non-public project, - # Internal nuget and blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - -jobs: - -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - -- ${{ each platform in parameters.platforms }}: - - template: /eng/common/core-templates/job/source-build.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ platform }} - enableInternalSources: ${{ parameters.enableInternalSources }} - -- ${{ if eq(length(parameters.platforms), 0) }}: - - template: /eng/common/core-templates/job/source-build.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ parameters.defaultManagedPlatform }} - enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/src/arcade/eng/common/core-templates/post-build/common-variables.yml b/src/arcade/eng/common/core-templates/post-build/common-variables.yml deleted file mode 100644 index d5627a994..000000000 --- a/src/arcade/eng/common/core-templates/post-build/common-variables.yml +++ /dev/null @@ -1,22 +0,0 @@ -variables: - - group: Publish-Build-Assets - - # Whether the build is internal or not - - name: IsInternalBuild - value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - - # Default Maestro++ API Endpoint and API Version - - name: MaestroApiEndPoint - value: "https://maestro.dot.net" - - name: MaestroApiVersion - value: "2020-02-20" - - - name: SourceLinkCLIVersion - value: 3.0.0 - - name: SymbolToolVersion - value: 1.0.1 - - name: BinlogToolVersion - value: 1.0.11 - - - name: runCodesignValidationInjection - value: false diff --git a/src/arcade/eng/common/core-templates/post-build/setup-maestro-vars.yml b/src/arcade/eng/common/core-templates/post-build/setup-maestro-vars.yml deleted file mode 100644 index f7602980d..000000000 --- a/src/arcade/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ /dev/null @@ -1,74 +0,0 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - is1ESPipeline: '' - -steps: - - ${{ if eq(parameters.is1ESPipeline, '') }}: - - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - - - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Release Configs - inputs: - buildType: current - artifactName: ReleaseConfigs - checkDownloadedFiles: true - - - task: AzureCLI@2 - name: setReleaseVars - displayName: Set Release Configs Vars - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: pscore - scriptLocation: inlineScript - inlineScript: | - try { - if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { - $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt - - $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 - $IsStableBuild = $Content | Select -Index 2 - - $AzureDevOpsProject = $Env:System_TeamProject - $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId - $AzureDevOpsBuildId = $Env:Build_BuildId - } - else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 - $darc = Get-Darc - $buildInfo = & $darc get-build ` - --id ${{ parameters.BARBuildId }} ` - --extended ` - --output-format json ` - --ci ` - | convertFrom-Json - - $BarId = ${{ parameters.BARBuildId }} - $Channels = $Env:PromoteToMaestroChannels -split "," - $Channels = $Channels -join "][" - $Channels = "[$Channels]" - - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } - - Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" - Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" - Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" - - Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" - Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" - Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" - } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 - } - env: - PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/src/arcade/eng/common/core-templates/steps/component-governance.yml b/src/arcade/eng/common/core-templates/steps/component-governance.yml deleted file mode 100644 index cf0649aa9..000000000 --- a/src/arcade/eng/common/core-templates/steps/component-governance.yml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: - disableComponentGovernance: false - componentGovernanceIgnoreDirectories: '' - is1ESPipeline: false - displayName: 'Component Detection' - -steps: -- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable -- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true - displayName: ${{ parameters.displayName }} - inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/src/arcade/eng/common/core-templates/steps/enable-internal-runtimes.yml b/src/arcade/eng/common/core-templates/steps/enable-internal-runtimes.yml deleted file mode 100644 index 6bdbf62ac..000000000 --- a/src/arcade/eng/common/core-templates/steps/enable-internal-runtimes.yml +++ /dev/null @@ -1,32 +0,0 @@ -# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' -# variable with the base64-encoded SAS token, by default - -parameters: -- name: federatedServiceConnection - type: string - default: 'dotnetbuilds-internal-read' -- name: outputVariableName - type: string - default: 'dotnetbuilds-internal-container-read-token-base64' -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: true -- name: is1ESPipeline - type: boolean - default: false - -steps: -- ${{ if ne(variables['System.TeamProject'], 'public') }}: - - template: /eng/common/core-templates/steps/get-delegation-sas.yml - parameters: - federatedServiceConnection: ${{ parameters.federatedServiceConnection }} - outputVariableName: ${{ parameters.outputVariableName }} - expiryInHours: ${{ parameters.expiryInHours }} - base64Encode: ${{ parameters.base64Encode }} - storageAccount: dotnetbuilds - container: internal - permissions: rl - is1ESPipeline: ${{ parameters.is1ESPipeline }} \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/steps/enable-internal-sources.yml b/src/arcade/eng/common/core-templates/steps/enable-internal-sources.yml deleted file mode 100644 index 64f881bff..000000000 --- a/src/arcade/eng/common/core-templates/steps/enable-internal-sources.yml +++ /dev/null @@ -1,47 +0,0 @@ -parameters: -# This is the Azure federated service connection that we log into to get an access token. -- name: nugetFederatedServiceConnection - type: string - default: 'dnceng-artifacts-feeds-read' -- name: is1ESPipeline - type: boolean - default: false -# Legacy parameters to allow for PAT usage -- name: legacyCredential - type: string - default: '' - -steps: -- ${{ if ne(variables['System.TeamProject'], 'public') }}: - - ${{ if ne(parameters.legacyCredential, '') }}: - - task: PowerShell@2 - displayName: Setup Internal Feeds - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token - env: - Token: ${{ parameters.legacyCredential }} - # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. - # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that - # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token. - - ${{ else }}: - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - task: PowerShell@2 - displayName: Setup Internal Feeds - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config - - ${{ else }}: - - template: /eng/common/templates/steps/get-federated-access-token.yml - parameters: - federatedServiceConnection: ${{ parameters.nugetFederatedServiceConnection }} - outputVariableName: 'dnceng-artifacts-feeds-read-access-token' - - task: PowerShell@2 - displayName: Setup Internal Feeds - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) - # This is required in certain scenarios to install the ADO credential provider. - # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others - # (e.g. dotnet msbuild). - - task: NuGetAuthenticate@1 diff --git a/src/arcade/eng/common/core-templates/steps/get-federated-access-token.yml b/src/arcade/eng/common/core-templates/steps/get-federated-access-token.yml deleted file mode 100644 index 3a4d4410c..000000000 --- a/src/arcade/eng/common/core-templates/steps/get-federated-access-token.yml +++ /dev/null @@ -1,42 +0,0 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: is1ESPipeline - type: boolean -- name: stepName - type: string - default: 'getFederatedAccessToken' -- name: condition - type: string - default: '' -# Resource to get a token for. Common values include: -# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps -# - 'https://storage.azure.com/' for storage -# Defaults to Azure DevOps -- name: resource - type: string - default: '499b84ac-1321-427f-aa17-267ca6975798' -- name: isStepOutputVariable - type: boolean - default: false - -steps: -- task: AzureCLI@2 - displayName: 'Getting federated access token for feeds' - name: ${{ parameters.stepName }} - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" - exit 1 - } - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/steps/publish-build-artifacts.yml b/src/arcade/eng/common/core-templates/steps/publish-build-artifacts.yml deleted file mode 100644 index f24ce3466..000000000 --- a/src/arcade/eng/common/core-templates/steps/publish-build-artifacts.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: -- name: is1ESPipeline - type: boolean - default: false -- name: args - type: object - default: {} -steps: -- ${{ if ne(parameters.is1ESPipeline, true) }}: - - template: /eng/common/templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - ${{ each parameter in parameters.args }}: - ${{ parameter.key }}: ${{ parameter.value }} -- ${{ else }}: - - template: /eng/common/templates-official/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - ${{ each parameter in parameters.args }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/steps/publish-pipeline-artifacts.yml b/src/arcade/eng/common/core-templates/steps/publish-pipeline-artifacts.yml deleted file mode 100644 index 2efec04dc..000000000 --- a/src/arcade/eng/common/core-templates/steps/publish-pipeline-artifacts.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: -- name: is1ESPipeline - type: boolean - default: false - -- name: args - type: object - default: {} - -steps: -- ${{ if ne(parameters.is1ESPipeline, true) }}: - - template: /eng/common/templates/steps/publish-pipeline-artifacts.yml - parameters: - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} -- ${{ else }}: - - template: /eng/common/templates-official/steps/publish-pipeline-artifacts.yml - parameters: - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/core-templates/steps/retain-build.yml b/src/arcade/eng/common/core-templates/steps/retain-build.yml deleted file mode 100644 index 83d97a26a..000000000 --- a/src/arcade/eng/common/core-templates/steps/retain-build.yml +++ /dev/null @@ -1,28 +0,0 @@ -parameters: - # Optional azure devops PAT with build execute permissions for the build's organization, - # only needed if the build that should be retained ran on a different organization than - # the pipeline where this template is executing from - Token: '' - # Optional BuildId to retain, defaults to the current running build - BuildId: '' - # Azure devops Organization URI for the build in the https://dev.azure.com/ format. - # Defaults to the organization the current pipeline is running on - AzdoOrgUri: '$(System.CollectionUri)' - # Azure devops project for the build. Defaults to the project the current pipeline is running on - AzdoProject: '$(System.TeamProject)' - -steps: - - task: powershell@2 - inputs: - targetType: 'filePath' - filePath: eng/common/retain-build.ps1 - pwsh: true - arguments: > - -AzdoOrgUri: ${{parameters.AzdoOrgUri}} - -AzdoProject ${{parameters.AzdoProject}} - -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} - -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} - displayName: Enable permanent build retention - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/src/arcade/eng/common/core-templates/steps/send-to-helix.yml b/src/arcade/eng/common/core-templates/steps/send-to-helix.yml deleted file mode 100644 index 68fa739c4..000000000 --- a/src/arcade/eng/common/core-templates/steps/send-to-helix.yml +++ /dev/null @@ -1,93 +0,0 @@ -# Please remember to update the documentation if you make changes to these parameters! -parameters: - HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ - HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' - HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues - HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group - HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY - HelixProjectArguments: '' # optional -- arguments passed to the build command - HelixConfiguration: '' # optional -- additional property attached to a job - HelixPreCommands: '' # optional -- commands to run before Helix work item execution - HelixPostCommands: '' # optional -- commands to run after Helix work item execution - WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects - WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects - WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects - CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload - XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true - XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects - XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects - XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner - XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects - IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." - IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set - HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) - Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO - condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() - continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false - -steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' - displayName: ${{ parameters.DisplayNamePrefix }} (Windows) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} (Unix) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} diff --git a/src/arcade/eng/common/core-templates/variables/pool-providers.yml b/src/arcade/eng/common/core-templates/variables/pool-providers.yml deleted file mode 100644 index 41053d382..000000000 --- a/src/arcade/eng/common/core-templates/variables/pool-providers.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - is1ESPipeline: false - -variables: - - ${{ if eq(parameters.is1ESPipeline, 'true') }}: - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ else }}: - - template: /eng/common/templates/variables/pool-providers.yml \ No newline at end of file diff --git a/src/arcade/eng/common/cross/arm/tizen/tizen.patch b/src/arcade/eng/common/cross/arm/tizen/tizen.patch deleted file mode 100644 index fb12ade72..000000000 --- a/src/arcade/eng/common/cross/arm/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) ) diff --git a/src/arcade/eng/common/cross/armel/tizen/tizen.patch b/src/arcade/eng/common/cross/armel/tizen/tizen.patch deleted file mode 100644 index ca7c7c1ff..000000000 --- a/src/arcade/eng/common/cross/armel/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) ) diff --git a/src/arcade/eng/common/cross/riscv64/tizen/tizen.patch b/src/arcade/eng/common/cross/riscv64/tizen/tizen.patch deleted file mode 100644 index eb6d1c074..000000000 --- a/src/arcade/eng/common/cross/riscv64/tizen/tizen.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf64-littleriscv) --GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) ) diff --git a/src/arcade/eng/common/cross/tizen-build-rootfs.sh b/src/arcade/eng/common/cross/tizen-build-rootfs.sh deleted file mode 100644 index ba31c9328..000000000 --- a/src/arcade/eng/common/cross/tizen-build-rootfs.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/env bash -set -e - -ARCH=$1 -LINK_ARCH=$ARCH - -case "$ARCH" in - arm) - TIZEN_ARCH="armv7hl" - ;; - armel) - TIZEN_ARCH="armv7l" - LINK_ARCH="arm" - ;; - arm64) - TIZEN_ARCH="aarch64" - ;; - x86) - TIZEN_ARCH="i686" - ;; - x64) - TIZEN_ARCH="x86_64" - LINK_ARCH="x86" - ;; - riscv64) - TIZEN_ARCH="riscv64" - LINK_ARCH="riscv" - ;; - *) - echo "Unsupported architecture for tizen: $ARCH" - exit 1 -esac - -__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -__TIZEN_CROSSDIR="$__CrossDir/${ARCH}/tizen" - -if [[ -z "$ROOTFS_DIR" ]]; then - echo "ROOTFS_DIR is not defined." - exit 1; -fi - -TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp -mkdir -p $TIZEN_TMP_DIR - -# Download files -echo ">>Start downloading files" -VERBOSE=1 $__CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR $TIZEN_ARCH -echo "<>Start constructing Tizen rootfs" -TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm` -cd $ROOTFS_DIR -for f in $TIZEN_RPM_FILES; do - rpm2cpio $f | cpio -idm --quiet -done -echo "<>Start configuring Tizen rootfs" -ln -sfn asm-${LINK_ARCH} ./usr/include/asm -patch -p1 < $__TIZEN_CROSSDIR/tizen.patch -if [[ "$TIZEN_ARCH" == "riscv64" ]]; then - echo "Fixing broken symlinks in $PWD" - rm ./usr/lib64/libresolv.so - ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so - rm ./usr/lib64/libpthread.so - ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so - rm ./usr/lib64/libdl.so - ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so - rm ./usr/lib64/libutil.so - ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so - rm ./usr/lib64/libm.so - ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so - rm ./usr/lib64/librt.so - ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so - rm ./lib/ld-linux-riscv64-lp64d.so.1 - ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1 -fi -echo "< 0 ]]; do - opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - --darcversion) - darcVersion=$2 - shift - ;; - --versionendpoint) - versionEndpoint=$2 - shift - ;; - --verbosity) - verbosity=$2 - shift - ;; - --toolpath) - toolpath=$2 - shift - ;; - *) - echo "Invalid argument: $1" - usage - exit 1 - ;; - esac - - shift -done - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$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 )" - -. "$scriptroot/tools.sh" - -if [ -z "$darcVersion" ]; then - darcVersion=$(curl -X GET "$versionEndpoint" -H "accept: text/plain") -fi - -function InstallDarcCli { - local darc_cli_package_name="microsoft.dotnet.darc" - - InitializeDotNetCli true - local dotnet_root=$_InitializeDotNetCli - - if [ -z "$toolpath" ]; then - local tool_list=$($dotnet_root/dotnet tool list -g) - if [[ $tool_list = *$darc_cli_package_name* ]]; then - echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) - fi - else - local tool_list=$($dotnet_root/dotnet tool list --tool-path "$toolpath") - if [[ $tool_list = *$darc_cli_package_name* ]]; then - echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name --tool-path "$toolpath") - fi - fi - - local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" - - echo "Installing Darc CLI version $darcVersion..." - echo "You may need to restart your command shell if this is the first dotnet tool you have installed." - if [ -z "$toolpath" ]; then - echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) - else - echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath") - fi -} - -InstallDarcCli diff --git a/src/arcade/eng/common/dotnet-install.cmd b/src/arcade/eng/common/dotnet-install.cmd deleted file mode 100644 index b1c2642e7..000000000 --- a/src/arcade/eng/common/dotnet-install.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" \ No newline at end of file diff --git a/src/arcade/eng/common/dotnet-install.ps1 b/src/arcade/eng/common/dotnet-install.ps1 deleted file mode 100644 index 811f0f717..000000000 --- a/src/arcade/eng/common/dotnet-install.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $verbosity = 'minimal', - [string] $architecture = '', - [string] $version = 'Latest', - [string] $runtime = 'dotnet', - [string] $RuntimeSourceFeed = '', - [string] $RuntimeSourceFeedKey = '' -) - -. $PSScriptRoot\tools.ps1 - -$dotnetRoot = Join-Path $RepoRoot '.dotnet' - -$installdir = $dotnetRoot -try { - if ($architecture -and $architecture.Trim() -eq 'x86') { - $installdir = Join-Path $installdir 'x86' - } - InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ - ExitWithExitCode 1 -} - -ExitWithExitCode 0 diff --git a/src/arcade/eng/common/dotnet-install.sh b/src/arcade/eng/common/dotnet-install.sh deleted file mode 100644 index 7b9d97e3b..000000000 --- a/src/arcade/eng/common/dotnet-install.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$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 )" - -. "$scriptroot/tools.sh" - -version='Latest' -architecture='' -runtime='dotnet' -runtimeSourceFeed='' -runtimeSourceFeedKey='' -while [[ $# > 0 ]]; do - opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -version|-v) - shift - version="$1" - ;; - -architecture|-a) - shift - architecture="$1" - ;; - -runtime|-r) - shift - runtime="$1" - ;; - -runtimesourcefeed) - shift - runtimeSourceFeed="$1" - ;; - -runtimesourcefeedkey) - shift - runtimeSourceFeedKey="$1" - ;; - *) - Write-PipelineTelemetryError -Category 'Build' -Message "Invalid argument: $1" - exit 1 - ;; - esac - shift -done - -# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples -cpuname=$(uname -m) -case $cpuname in - arm64|aarch64) - buildarch=arm64 - if [ "$(getconf LONG_BIT)" -lt 64 ]; then - # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS) - buildarch=arm - fi - ;; - loongarch64) - buildarch=loongarch64 - ;; - amd64|x86_64) - buildarch=x64 - ;; - armv*l) - buildarch=arm - ;; - i[3-6]86) - buildarch=x86 - ;; - riscv64) - buildarch=riscv64 - ;; - *) - echo "Unknown CPU $cpuname detected, treating it as x64" - buildarch=x64 - ;; -esac - -dotnetRoot="${repo_root}.dotnet" -if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then - dotnetRoot="$dotnetRoot/$architecture" -fi - -InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { - local exit_code=$? - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2 - ExitWithExitCode $exit_code -} - -ExitWithExitCode 0 diff --git a/src/arcade/eng/common/enable-cross-org-publishing.ps1 b/src/arcade/eng/common/enable-cross-org-publishing.ps1 deleted file mode 100644 index da09da4f1..000000000 --- a/src/arcade/eng/common/enable-cross-org-publishing.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -param( - [string] $token -) - - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -# Write-PipelineSetVariable will no-op if a variable named $ci is not defined -# Since this script is only ever called in AzDO builds, just universally set it -$ci = $true - -Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/' -IsMultiJobVariable $false diff --git a/src/arcade/eng/common/generate-locproject.ps1 b/src/arcade/eng/common/generate-locproject.ps1 deleted file mode 100644 index 524aaa57f..000000000 --- a/src/arcade/eng/common/generate-locproject.ps1 +++ /dev/null @@ -1,189 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here - [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json - [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one - [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally -) - -# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: -# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task - -Set-StrictMode -Version 2.0 -$ErrorActionPreference = "Stop" -. $PSScriptRoot\pipeline-logging-functions.ps1 - -$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" -$exclusions = @{ Exclusions = @() } -if (Test-Path -Path $exclusionsFilePath) -{ - $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json -} - -Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work - -# Template files -$jsonFiles = @() -$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern -$jsonTemplateFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json - - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" - $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru -} - -$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern - -$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them -if (-not $wxlFiles) { - $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files - if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } - } -} - -$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files -$macosHtmlFiles = @() -if ($macosHtmlEnFiles) { - $macosHtmlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } -} - -$xlfFiles = @() - -$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" -$langXlfFiles = @() -if ($allXlfFiles) { - $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' - $firstLangCode = $Matches.1 - $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" -} -$langXlfFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf - - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" - $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru -} - -$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles - -$locJson = @{ - Projects = @( - @{ - LanguageSet = $LanguageSet - LocItems = @( - $locFiles | ForEach-Object { - $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { - Remove-Item -Path $sourceFile - } - if ($continue) - { - if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" - } - } else { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnName" - OutputPath = $outputPath - } - } - } - } - ) - }, - @{ - LanguageSet = $LanguageSet - CloneLanguageSet = "WiX_CloneLanguages" - LssFiles = @( "wxl_loc.lss" ) - LocItems = @( - $wxlFiles | ForEach-Object { - $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - if ($continue) - { - return @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = $outputPath - } - } - } - ) - }, - @{ - LanguageSet = $LanguageSet - CloneLanguageSet = "VS_macOS_CloneLanguages" - LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) - LocItems = @( - $macosHtmlFiles | ForEach-Object { - $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" - $continue = $true - foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) { - $continue = $false - } - } - $sourceFile = ($_.FullName | Resolve-Path -Relative) - $lciFile = $sourceFile + ".lci" - if ($continue) { - $result = @{ - SourceFile = $sourceFile - CopyOption = "LangIDOnPath" - OutputPath = $outputPath - } - if (Test-Path $lciFile -PathType Leaf) { - $result["LciFile"] = $lciFile - } - return $result - } - } - ) - } - ) -} - -$json = ConvertTo-Json $locJson -Depth 5 -Write-Host "LocProject.json generated:`n`n$json`n`n" -Pop-Location - -if (!$UseCheckedInLocProjectJson) { - New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json -} -else { - New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json - - if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { - Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." - - exit 1 - } - else { - Write-Host "Generated LocProject.json and current LocProject.json are identical." - } -} diff --git a/src/arcade/eng/common/generate-sbom-prep.ps1 b/src/arcade/eng/common/generate-sbom-prep.ps1 deleted file mode 100644 index a0c7d792a..000000000 --- a/src/arcade/eng/common/generate-sbom-prep.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed -) - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly -# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. -$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' -$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName - -Write-Host "Artifact name before : $ArtifactName" -Write-Host "Artifact name after : $SafeArtifactName" - -Write-Host "Creating dir $ManifestDirPath" - -# create directory for sbom manifest to be placed -if (!(Test-Path -path $SbomGenerationDir)) -{ - New-Item -ItemType Directory -path $SbomGenerationDir - Write-Host "Successfully created directory $SbomGenerationDir" -} -else{ - Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." -} - -Write-Host "Updating artifact name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/src/arcade/eng/common/generate-sbom-prep.sh b/src/arcade/eng/common/generate-sbom-prep.sh deleted file mode 100644 index b8ecca72b..000000000 --- a/src/arcade/eng/common/generate-sbom-prep.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $SOURCE until the file is no longer a symlink -while [[ -h $source ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$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 )" -. $scriptroot/pipeline-logging-functions.sh - - -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" -manifest_dir=$1 - -# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly -# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. -sbom_generation_dir="$manifest_dir/$safe_artifact_name" - -if [ ! -d "$sbom_generation_dir" ] ; then - mkdir -p "$sbom_generation_dir" - echo "Sbom directory created." $sbom_generation_dir -else - Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." -fi - -echo "Artifact name before : "$artifact_name -echo "Artifact name after : "$safe_artifact_name -export ARTIFACT_NAME=$safe_artifact_name -echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" - -exit 0 diff --git a/src/arcade/eng/common/helixpublish.proj b/src/arcade/eng/common/helixpublish.proj deleted file mode 100644 index c1323bf41..000000000 --- a/src/arcade/eng/common/helixpublish.proj +++ /dev/null @@ -1,27 +0,0 @@ - - - - - msbuild - - - - - %(Identity) - - - - - - $(WorkItemDirectory) - $(WorkItemCommand) - $(WorkItemTimeout) - - - - - - - - - diff --git a/src/arcade/eng/common/init-tools-native.cmd b/src/arcade/eng/common/init-tools-native.cmd deleted file mode 100644 index 438cd548c..000000000 --- a/src/arcade/eng/common/init-tools-native.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" -exit /b %ErrorLevel% \ No newline at end of file diff --git a/src/arcade/eng/common/init-tools-native.ps1 b/src/arcade/eng/common/init-tools-native.ps1 deleted file mode 100644 index 27ccdb9ec..000000000 --- a/src/arcade/eng/common/init-tools-native.ps1 +++ /dev/null @@ -1,203 +0,0 @@ -<# -.SYNOPSIS -Entry point script for installing native tools - -.DESCRIPTION -Reads $RepoRoot\global.json file to determine native assets to install -and executes installers for those tools - -.PARAMETER BaseUri -Base file directory or Url from which to acquire tool archives - -.PARAMETER InstallDirectory -Directory to install native toolset. This is a command-line override for the default -Install directory precedence order: -- InstallDirectory command-line override -- NETCOREENG_INSTALL_DIRECTORY environment variable -- (default) %USERPROFILE%/.netcoreeng/native - -.PARAMETER Clean -Switch specifying to not install anything, but cleanup native asset folders - -.PARAMETER Force -Clean and then install tools - -.PARAMETER DownloadRetries -Total number of retry attempts - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds - -.PARAMETER GlobalJsonFile -File path to global.json file - -.PARAMETER PathPromotion -Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) -or break the build if a native tool is not found on the path (on a local dev machine) - -.NOTES -#> -[CmdletBinding(PositionalBinding=$false)] -Param ( - [string] $BaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external', - [string] $InstallDirectory, - [switch] $Clean = $False, - [switch] $Force = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile, - [switch] $PathPromotion -) - -if (!$GlobalJsonFile) { - $GlobalJsonFile = Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName 'global.json' -} - -Set-StrictMode -version 2.0 -$ErrorActionPreference='Stop' - -. $PSScriptRoot\pipeline-logging-functions.ps1 -Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') - -try { - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq 'Continue' - - $EngCommonBaseDir = Join-Path $PSScriptRoot 'native\' - $NativeBaseDir = $InstallDirectory - if (!$NativeBaseDir) { - $NativeBaseDir = CommonLibrary\Get-NativeInstallDirectory - } - $Env:CommonLibrary_NativeInstallDir = $NativeBaseDir - $InstallBin = Join-Path $NativeBaseDir 'bin' - $InstallerPath = Join-Path $EngCommonBaseDir 'install-tool.ps1' - - # Process tools list - Write-Host "Processing $GlobalJsonFile" - If (-Not (Test-Path $GlobalJsonFile)) { - Write-Host "Unable to find '$GlobalJsonFile'" - exit 0 - } - $NativeTools = Get-Content($GlobalJsonFile) -Raw | - ConvertFrom-Json | - Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue - if ($NativeTools) { - if ($PathPromotion -eq $True) { - $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" - if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $InstalledTools = @{} - - if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { - if ($ToolVersion -eq "latest") { - $ToolVersion = "" - } - $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) - if ($ToolDirectories -eq $null) { - Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." - exit 1 - } - $ToolDirectory = $ToolDirectories[0] - $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" - if (-not (Test-Path -Path "$BinPathFile")) { - Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." - exit 1 - } - $BinPath = Get-Content "$BinPathFile" - $ToolPath = Convert-Path -Path $BinPath - Write-Host "Adding $ToolName to the path ($ToolPath)..." - Write-Host "##vso[task.prependpath]$ToolPath" - $env:PATH = "$ToolPath;$env:PATH" - $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } - } - } - return $InstalledTools - } else { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - - if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." - } - } - exit 0 - } - } else { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false - } - if ($showNativeToolsWarning) { - Write-Warning $errMsg - } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - exit 1 - } - } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 - } - } - } - else { - Write-Host 'No native tools defined in global.json' - exit 0 - } - - if ($Clean) { - exit 0 - } - if (Test-Path $InstallBin) { - Write-Host 'Native tools are available from ' (Convert-Path -Path $InstallBin) - Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" - return $InstallBin - } - elseif (-not ($PathPromotion)) { - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' - exit 1 - } - exit 0 -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/init-tools-native.sh b/src/arcade/eng/common/init-tools-native.sh deleted file mode 100644 index 3e6a8d6ac..000000000 --- a/src/arcade/eng/common/init-tools-native.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -base_uri='https://netcorenativeassets.blob.core.windows.net/resource-packages/external' -install_directory='' -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 -global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json" -declare -a native_assets - -. $scriptroot/pipeline-logging-functions.sh -. $scriptroot/native/common-library.sh - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installdirectory) - install_directory=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --donotabortonfailure) - donotabortonfailure=true - shift 1 - ;; - --donotdisplaywarnings) - donotdisplaywarnings=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --installdirectory Directory to install native toolset." - echo " This is a command-line override for the default" - echo " Install directory precedence order:" - echo " - InstallDirectory command-line override" - echo " - NETCOREENG_INSTALL_DIRECTORY environment variable" - echo " - (default) %USERPROFILE%/.netcoreeng/native" - echo "" - echo " --clean Switch specifying not to install anything, but cleanup native asset folders" - echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure" - echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure" - echo " --force Clean and then install tools" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --baseuri Base URI for where to download native tools from" - echo " --downloadretries Number of times a download should be attempted" - echo " --retrywaittimeseconds Wait time between download attempts" - echo "" - exit 0 - ;; - esac -done - -function ReadGlobalJsonNativeTools { - # happy path: we have a proper JSON parsing tool `jq(1)` in PATH! - if command -v jq &> /dev/null; then - - # jq: read each key/value pair under "native-tools" entry and emit: - # KEY="" VALUE="" - # followed by a null byte. - # - # bash: read line with null byte delimeter and push to array (for later `eval`uation). - - while IFS= read -rd '' line; do - native_assets+=("$line") - done < <(jq -r '. | - select(has("native-tools")) | - ."native-tools" | - keys[] as $k | - @sh "KEY=\($k) VALUE=\(.[$k])\u0000"' "$global_json_file") - - return - fi - - # Warning: falling back to manually parsing JSON, which is not recommended. - - # Following routine matches the output and escaping logic of jq(1)'s @sh formatter used above. - # It has been tested with several weird strings with escaped characters in entries (key and value) - # and results were compared with the output of jq(1) in binary representation using xxd(1); - # just before the assignment to 'native_assets' array (above and below). - - # try to capture the section under "native-tools". - if [[ ! "$(cat "$global_json_file")" =~ \"native-tools\"[[:space:]\:\{]*([^\}]+) ]]; then - return - fi - - section="${BASH_REMATCH[1]}" - - parseStarted=0 - possibleEnd=0 - escaping=0 - escaped=0 - isKey=1 - - for (( i=0; i<${#section}; i++ )); do - char="${section:$i:1}" - if ! ((parseStarted)) && [[ "$char" =~ [[:space:],:] ]]; then continue; fi - - if ! ((escaping)) && [[ "$char" == "\\" ]]; then - escaping=1 - elif ((escaping)) && ! ((escaped)); then - escaped=1 - fi - - if ! ((parseStarted)) && [[ "$char" == "\"" ]]; then - parseStarted=1 - possibleEnd=0 - elif [[ "$char" == "'" ]]; then - token="$token'\\\''" - possibleEnd=0 - elif ((escaping)) || [[ "$char" != "\"" ]]; then - token="$token$char" - possibleEnd=1 - fi - - if ((possibleEnd)) && ! ((escaping)) && [[ "$char" == "\"" ]]; then - # Use printf to unescape token to match jq(1)'s @sh formatting rules. - # do not use 'token="$(printf "$token")"' syntax, as $() eats the trailing linefeed. - printf -v token "'$token'" - - if ((isKey)); then - KEY="$token" - isKey=0 - else - line="KEY=$KEY VALUE=$token" - native_assets+=("$line") - isKey=1 - fi - - # reset for next token - parseStarted=0 - token= - elif ((escaping)) && ((escaped)); then - escaping=0 - escaped=0 - fi - done -} - -native_base_dir=$install_directory -if [[ -z $install_directory ]]; then - native_base_dir=$(GetNativeInstallDirectory) -fi - -install_bin="${native_base_dir}/bin" -installed_any=false - -ReadGlobalJsonNativeTools - -if [[ ${#native_assets[@]} -eq 0 ]]; then - echo "No native tools defined in global.json" - exit 0; -else - native_installer_dir="$scriptroot/native" - for index in "${!native_assets[@]}"; do - eval "${native_assets["$index"]}" - - installer_path="$native_installer_dir/install-$KEY.sh" - installer_command="$installer_path" - installer_command+=" --baseuri $base_uri" - installer_command+=" --installpath $install_bin" - installer_command+=" --version $VALUE" - echo $installer_command - - if [[ $force = true ]]; then - installer_command+=" --force" - fi - - if [[ $clean = true ]]; then - installer_command+=" --clean" - fi - - if [[ -a $installer_path ]]; then - $installer_command - if [[ $? != 0 ]]; then - if [[ $donotabortonfailure = true ]]; then - if [[ $donotdisplaywarnings != true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" - fi - else - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" - exit 1 - fi - else - $installed_any = true - fi - else - if [[ $donotabortonfailure == true ]]; then - if [[ $donotdisplaywarnings != true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" - fi - else - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" - exit 1 - fi - fi - done -fi - -if [[ $clean = true ]]; then - exit 0 -fi - -if [[ -d $install_bin ]]; then - echo "Native tools are available from $install_bin" - echo "##vso[task.prependpath]$install_bin" -else - if [[ $installed_any = true ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed" - exit 1 - fi -fi - -exit 0 diff --git a/src/arcade/eng/common/internal-feed-operations.ps1 b/src/arcade/eng/common/internal-feed-operations.ps1 deleted file mode 100644 index 92b77347d..000000000 --- a/src/arcade/eng/common/internal-feed-operations.ps1 +++ /dev/null @@ -1,132 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $Operation, - [string] $AuthToken, - [string] $CommitSha, - [string] $RepoName, - [switch] $IsFeedPrivate -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -. $PSScriptRoot\tools.ps1 - -# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed -# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in -# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. This should ONLY be called from identified -# internal builds -function SetupCredProvider { - param( - [string] $AuthToken - ) - - # Install the Cred Provider NuGet plugin - Write-Host 'Setting up Cred Provider NuGet plugin in the agent...' - Write-Host "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." - - $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' - - Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 - - Write-Host 'Installing plugin...' - .\installcredprovider.ps1 -Force - - Write-Host "Deleting local copy of 'installcredprovider.ps1'..." - Remove-Item .\installcredprovider.ps1 - - if (-Not("$env:USERPROFILE\.nuget\plugins\netcore")) { - Write-PipelineTelemetryError -Category 'Arcade' -Message 'CredProvider plugin was not installed correctly!' - ExitWithExitCode 1 - } - else { - Write-Host 'CredProvider plugin was installed correctly!' - } - - # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable - # feeds successfully - - $nugetConfigPath = Join-Path $RepoRoot "NuGet.config" - - if (-Not (Test-Path -Path $nugetConfigPath)) { - Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!' - ExitWithExitCode 1 - } - - $endpoints = New-Object System.Collections.ArrayList - $nugetConfigPackageSources = Select-Xml -Path $nugetConfigPath -XPath "//packageSources/add[contains(@key, 'darc-int-')]/@value" | foreach{$_.Node.Value} - - if (($nugetConfigPackageSources | Measure-Object).Count -gt 0 ) { - foreach ($stableRestoreResource in $nugetConfigPackageSources) { - $trimmedResource = ([string]$stableRestoreResource).Trim() - [void]$endpoints.Add(@{endpoint="$trimmedResource"; password="$AuthToken"}) - } - } - - if (($endpoints | Measure-Object).Count -gt 0) { - $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress - - # Create the environment variables the AzDo way - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $endpointCredentials -Properties @{ - 'variable' = 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' - 'issecret' = 'false' - } - - # We don't want sessions cached since we will be updating the endpoints quite frequently - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data 'False' -Properties @{ - 'variable' = 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' - 'issecret' = 'false' - } - } - else - { - Write-Host 'No internal endpoints found in NuGet.config' - } -} - -#Workaround for https://github.com/microsoft/msbuild/issues/4430 -function InstallDotNetSdkAndRestoreArcade { - $dotnetTempDir = Join-Path $RepoRoot "dotnet" - $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) - $dotnet = "$dotnetTempDir\dotnet.exe" - $restoreProjPath = "$PSScriptRoot\restore.proj" - - Write-Host "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." - InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" - - '' | Out-File "$restoreProjPath" - - & $dotnet restore $restoreProjPath - - Write-Host 'Arcade SDK restored!' - - if (Test-Path -Path $restoreProjPath) { - Remove-Item $restoreProjPath - } - - if (Test-Path -Path $dotnetTempDir) { - Remove-Item $dotnetTempDir -Recurse - } -} - -try { - Push-Location $PSScriptRoot - - if ($Operation -like 'setup') { - SetupCredProvider $AuthToken - } - elseif ($Operation -like 'install-restore') { - InstallDotNetSdkAndRestoreArcade - } - else { - Write-PipelineTelemetryError -Category 'Arcade' -Message "Unknown operation '$Operation'!" - ExitWithExitCode 1 - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Arcade' -Message $_ - ExitWithExitCode 1 -} -finally { - Pop-Location -} diff --git a/src/arcade/eng/common/internal-feed-operations.sh b/src/arcade/eng/common/internal-feed-operations.sh deleted file mode 100644 index 9378223ba..000000000 --- a/src/arcade/eng/common/internal-feed-operations.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed -# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in -# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. -# This should ONLY be called from identified internal builds -function SetupCredProvider { - local authToken=$1 - - # Install the Cred Provider NuGet plugin - echo "Setting up Cred Provider NuGet plugin in the agent..."... - echo "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." - - local url="https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh" - - echo "Writing the contents of 'installcredprovider.ps1' locally..." - local installcredproviderPath="installcredprovider.sh" - if command -v curl > /dev/null; then - curl $url > "$installcredproviderPath" - else - wget -q -O "$installcredproviderPath" "$url" - fi - - echo "Installing plugin..." - . "$installcredproviderPath" - - echo "Deleting local copy of 'installcredprovider.sh'..." - rm installcredprovider.sh - - if [ ! -d "$HOME/.nuget/plugins" ]; then - Write-PipelineTelemetryError -category 'Build' 'CredProvider plugin was not installed correctly!' - ExitWithExitCode 1 - else - echo "CredProvider plugin was installed correctly!" - fi - - # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable - # feeds successfully - - local nugetConfigPath="{$repo_root}NuGet.config" - - if [ ! "$nugetConfigPath" ]; then - Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!" - ExitWithExitCode 1 - fi - - local endpoints='[' - local nugetConfigPackageValues=`cat "$nugetConfigPath" | grep "key=\"darc-int-"` - local pattern="value=\"(.*)\"" - - for value in $nugetConfigPackageValues - do - if [[ $value =~ $pattern ]]; then - local endpoint="${BASH_REMATCH[1]}" - endpoints+="{\"endpoint\": \"$endpoint\", \"password\": \"$authToken\"}," - fi - done - - endpoints=${endpoints%?} - endpoints+=']' - - if [ ${#endpoints} -gt 2 ]; then - local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" - - echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" - echo "##vso[task.setvariable variable=NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED]False" - else - echo "No internal endpoints found in NuGet.config" - fi -} - -# Workaround for https://github.com/microsoft/msbuild/issues/4430 -function InstallDotNetSdkAndRestoreArcade { - local dotnetTempDir="$repo_root/dotnet" - local dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) - local restoreProjPath="$repo_root/eng/common/restore.proj" - - echo "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." - echo "" > "$restoreProjPath" - - InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" - - local res=`$dotnetTempDir/dotnet restore $restoreProjPath` - echo "Arcade SDK restored!" - - # Cleanup - if [ "$restoreProjPath" ]; then - rm "$restoreProjPath" - fi - - if [ "$dotnetTempDir" ]; then - rm -r $dotnetTempDir - fi -} - -source="${BASH_SOURCE[0]}" -operation='' -authToken='' -repoName='' - -while [[ $# > 0 ]]; do - opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - --operation) - operation=$2 - shift - ;; - --authtoken) - authToken=$2 - shift - ;; - *) - echo "Invalid argument: $1" - usage - exit 1 - ;; - esac - - shift -done - -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$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 )" - -. "$scriptroot/tools.sh" - -if [ "$operation" = "setup" ]; then - SetupCredProvider $authToken -elif [ "$operation" = "install-restore" ]; then - InstallDotNetSdkAndRestoreArcade -else - echo "Unknown operation '$operation'!" -fi diff --git a/src/arcade/eng/common/internal/Directory.Build.props b/src/arcade/eng/common/internal/Directory.Build.props deleted file mode 100644 index f1d041c33..000000000 --- a/src/arcade/eng/common/internal/Directory.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - false - false - - - - - diff --git a/src/arcade/eng/common/internal/NuGet.config b/src/arcade/eng/common/internal/NuGet.config deleted file mode 100644 index 19d3d311b..000000000 --- a/src/arcade/eng/common/internal/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/arcade/eng/common/internal/Tools.csproj b/src/arcade/eng/common/internal/Tools.csproj deleted file mode 100644 index feaa6d208..000000000 --- a/src/arcade/eng/common/internal/Tools.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - net472 - false - false - - - - - - - - - - - - - - - diff --git a/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss b/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss deleted file mode 100644 index 5d892d619..000000000 --- a/src/arcade/eng/common/loc/P22DotNetHtmlLocalization.lss +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/arcade/eng/common/msbuild.ps1 b/src/arcade/eng/common/msbuild.ps1 deleted file mode 100644 index f041e5ddd..000000000 --- a/src/arcade/eng/common/msbuild.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $verbosity = 'minimal', - [bool] $warnAsError = $true, - [bool] $nodeReuse = $true, - [switch] $ci, - [switch] $prepareMachine, - [switch] $excludePrereleaseVS, - [string] $msbuildEngine = $null, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs -) - -. $PSScriptRoot\tools.ps1 - -try { - if ($ci) { - $nodeReuse = $false - } - - MSBuild @extraArgs -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Build' -Message $_ - ExitWithExitCode 1 -} - -ExitWithExitCode 0 \ No newline at end of file diff --git a/src/arcade/eng/common/msbuild.sh b/src/arcade/eng/common/msbuild.sh deleted file mode 100644 index 20d3dad54..000000000 --- a/src/arcade/eng/common/msbuild.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$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 )" - -verbosity='minimal' -warn_as_error=true -node_reuse=true -prepare_machine=false -extra_args='' - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --verbosity) - verbosity=$2 - shift 2 - ;; - --warnaserror) - warn_as_error=$2 - shift 2 - ;; - --nodereuse) - node_reuse=$2 - shift 2 - ;; - --ci) - ci=true - shift 1 - ;; - --preparemachine) - prepare_machine=true - shift 1 - ;; - *) - extra_args="$extra_args $1" - shift 1 - ;; - esac -done - -. "$scriptroot/tools.sh" - -if [[ "$ci" == true ]]; then - node_reuse=false -fi - -MSBuild $extra_args -ExitWithExitCode 0 diff --git a/src/arcade/eng/common/native/CommonLibrary.psm1 b/src/arcade/eng/common/native/CommonLibrary.psm1 deleted file mode 100644 index f71f6af6c..000000000 --- a/src/arcade/eng/common/native/CommonLibrary.psm1 +++ /dev/null @@ -1,401 +0,0 @@ -<# -.SYNOPSIS -Helper module to install an archive to a directory - -.DESCRIPTION -Helper module to download and extract an archive to a specified directory - -.PARAMETER Uri -Uri of artifact to download - -.PARAMETER InstallDirectory -Directory to extract artifact contents to - -.PARAMETER Force -Force download / extraction if file or contents already exist. Default = False - -.PARAMETER DownloadRetries -Total number of retry attempts. Default = 5 - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds. Default = 30 - -.NOTES -Returns False if download or extraction fail, True otherwise -#> -function DownloadAndExtract { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $Uri, - [Parameter(Mandatory=$True)] - [string] $InstallDirectory, - [switch] $Force = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30 - ) - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq "Continue" - - $TempToolPath = CommonLibrary\Get-TempPathFilename -Path $Uri - - # Download native tool - $DownloadStatus = CommonLibrary\Get-File -Uri $Uri ` - -Path $TempToolPath ` - -DownloadRetries $DownloadRetries ` - -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` - -Force:$Force ` - -Verbose:$Verbose - - if ($DownloadStatus -Eq $False) { - Write-Error "Download failed from $Uri" - return $False - } - - # Extract native tool - $UnzipStatus = CommonLibrary\Expand-Zip -ZipPath $TempToolPath ` - -OutputDirectory $InstallDirectory ` - -Force:$Force ` - -Verbose:$Verbose - - if ($UnzipStatus -Eq $False) { - # Retry Download one more time with Force=true - $DownloadRetryStatus = CommonLibrary\Get-File -Uri $Uri ` - -Path $TempToolPath ` - -DownloadRetries 1 ` - -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` - -Force:$True ` - -Verbose:$Verbose - - if ($DownloadRetryStatus -Eq $False) { - Write-Error "Last attempt of download failed as well" - return $False - } - - # Retry unzip again one more time with Force=true - $UnzipRetryStatus = CommonLibrary\Expand-Zip -ZipPath $TempToolPath ` - -OutputDirectory $InstallDirectory ` - -Force:$True ` - -Verbose:$Verbose - if ($UnzipRetryStatus -Eq $False) - { - Write-Error "Last attempt of unzip failed as well" - # Clean up partial zips and extracts - if (Test-Path $TempToolPath) { - Remove-Item $TempToolPath -Force - } - if (Test-Path $InstallDirectory) { - Remove-Item $InstallDirectory -Force -Recurse - } - return $False - } - } - - return $True -} - -<# -.SYNOPSIS -Download a file, retry on failure - -.DESCRIPTION -Download specified file and retry if attempt fails - -.PARAMETER Uri -Uri of file to download. If Uri is a local path, the file will be copied instead of downloaded - -.PARAMETER Path -Path to download or copy uri file to - -.PARAMETER Force -Overwrite existing file if present. Default = False - -.PARAMETER DownloadRetries -Total number of retry attempts. Default = 5 - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds Default = 30 - -#> -function Get-File { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $Uri, - [Parameter(Mandatory=$True)] - [string] $Path, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30, - [switch] $Force = $False - ) - $Attempt = 0 - - if ($Force) { - if (Test-Path $Path) { - Remove-Item $Path -Force - } - } - if (Test-Path $Path) { - Write-Host "File '$Path' already exists, skipping download" - return $True - } - - $DownloadDirectory = Split-Path -ErrorAction Ignore -Path "$Path" -Parent - if (-Not (Test-Path $DownloadDirectory)) { - New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null - } - - $TempPath = "$Path.tmp" - if (Test-Path -IsValid -Path $Uri) { - Write-Verbose "'$Uri' is a file path, copying temporarily to '$TempPath'" - Copy-Item -Path $Uri -Destination $TempPath - Write-Verbose "Moving temporary file to '$Path'" - Move-Item -Path $TempPath -Destination $Path - return $? - } - else { - Write-Verbose "Downloading $Uri" - # Don't display the console progress UI - it's a huge perf hit - $ProgressPreference = 'SilentlyContinue' - while($Attempt -Lt $DownloadRetries) - { - try { - Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $TempPath - Write-Verbose "Downloaded to temporary location '$TempPath'" - Move-Item -Path $TempPath -Destination $Path - Write-Verbose "Moved temporary file to '$Path'" - return $True - } - catch { - $Attempt++ - if ($Attempt -Lt $DownloadRetries) { - $AttemptsLeft = $DownloadRetries - $Attempt - Write-Warning "Download failed, $AttemptsLeft attempts remaining, will retry in $RetryWaitTimeInSeconds seconds" - Start-Sleep -Seconds $RetryWaitTimeInSeconds - } - else { - Write-Error $_ - Write-Error $_.Exception - } - } - } - } - - return $False -} - -<# -.SYNOPSIS -Generate a shim for a native tool - -.DESCRIPTION -Creates a wrapper script (shim) that passes arguments forward to native tool assembly - -.PARAMETER ShimName -The name of the shim - -.PARAMETER ShimDirectory -The directory where shims are stored - -.PARAMETER ToolFilePath -Path to file that shim forwards to - -.PARAMETER Force -Replace shim if already present. Default = False - -.NOTES -Returns $True if generating shim succeeds, $False otherwise -#> -function New-ScriptShim { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $ShimName, - [Parameter(Mandatory=$True)] - [string] $ShimDirectory, - [Parameter(Mandatory=$True)] - [string] $ToolFilePath, - [Parameter(Mandatory=$True)] - [string] $BaseUri, - [switch] $Force - ) - try { - Write-Verbose "Generating '$ShimName' shim" - - if (-Not (Test-Path $ToolFilePath)){ - Write-Error "Specified tool file path '$ToolFilePath' does not exist" - return $False - } - - # WinShimmer is a small .NET Framework program that creates .exe shims to bootstrapped programs - # Many of the checks for installed programs expect a .exe extension for Windows tools, rather - # than a .bat or .cmd file. - # Source: https://github.com/dotnet/arcade/tree/master/src/WinShimmer - if (-Not (Test-Path "$ShimDirectory\WinShimmer\winshimmer.exe")) { - $InstallStatus = DownloadAndExtract -Uri "$BaseUri/windows/winshimmer/WinShimmer.zip" ` - -InstallDirectory $ShimDirectory\WinShimmer ` - -Force:$Force ` - -DownloadRetries 2 ` - -RetryWaitTimeInSeconds 5 ` - -Verbose:$Verbose - } - - if ((Test-Path (Join-Path $ShimDirectory "$ShimName.exe"))) { - Write-Host "$ShimName.exe already exists; replacing..." - Remove-Item (Join-Path $ShimDirectory "$ShimName.exe") - } - - & "$ShimDirectory\WinShimmer\winshimmer.exe" $ShimName $ToolFilePath $ShimDirectory - return $True - } - catch { - Write-Host $_ - Write-Host $_.Exception - return $False - } -} - -<# -.SYNOPSIS -Returns the machine architecture of the host machine - -.NOTES -Returns 'x64' on 64 bit machines - Returns 'x86' on 32 bit machines -#> -function Get-MachineArchitecture { - $ProcessorArchitecture = $Env:PROCESSOR_ARCHITECTURE - $ProcessorArchitectureW6432 = $Env:PROCESSOR_ARCHITEW6432 - if($ProcessorArchitecture -Eq "X86") - { - if(($ProcessorArchitectureW6432 -Eq "") -Or - ($ProcessorArchitectureW6432 -Eq "X86")) { - return "x86" - } - $ProcessorArchitecture = $ProcessorArchitectureW6432 - } - if (($ProcessorArchitecture -Eq "AMD64") -Or - ($ProcessorArchitecture -Eq "IA64") -Or - ($ProcessorArchitecture -Eq "ARM64") -Or - ($ProcessorArchitecture -Eq "LOONGARCH64") -Or - ($ProcessorArchitecture -Eq "RISCV64")) { - return "x64" - } - return "x86" -} - -<# -.SYNOPSIS -Get the name of a temporary folder under the native install directory -#> -function Get-TempDirectory { - return Join-Path (Get-NativeInstallDirectory) "temp/" -} - -function Get-TempPathFilename { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $Path - ) - $TempDir = CommonLibrary\Get-TempDirectory - $TempFilename = Split-Path $Path -leaf - $TempPath = Join-Path $TempDir $TempFilename - return $TempPath -} - -<# -.SYNOPSIS -Returns the base directory to use for native tool installation - -.NOTES -Returns the value of the NETCOREENG_INSTALL_DIRECTORY if that environment variable -is set, or otherwise returns an install directory under the %USERPROFILE% -#> -function Get-NativeInstallDirectory { - $InstallDir = $Env:NETCOREENG_INSTALL_DIRECTORY - if (!$InstallDir) { - $InstallDir = Join-Path $Env:USERPROFILE ".netcoreeng/native/" - } - return $InstallDir -} - -<# -.SYNOPSIS -Unzip an archive - -.DESCRIPTION -Powershell module to unzip an archive to a specified directory - -.PARAMETER ZipPath (Required) -Path to archive to unzip - -.PARAMETER OutputDirectory (Required) -Output directory for archive contents - -.PARAMETER Force -Overwrite output directory contents if they already exist - -.NOTES -- Returns True and does not perform an extraction if output directory already exists but Overwrite is not True. -- Returns True if unzip operation is successful -- Returns False if Overwrite is True and it is unable to remove contents of OutputDirectory -- Returns False if unable to extract zip archive -#> -function Expand-Zip { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $ZipPath, - [Parameter(Mandatory=$True)] - [string] $OutputDirectory, - [switch] $Force - ) - - Write-Verbose "Extracting '$ZipPath' to '$OutputDirectory'" - try { - if ((Test-Path $OutputDirectory) -And (-Not $Force)) { - Write-Host "Directory '$OutputDirectory' already exists, skipping extract" - return $True - } - if (Test-Path $OutputDirectory) { - Write-Verbose "'Force' is 'True', but '$OutputDirectory' exists, removing directory" - Remove-Item $OutputDirectory -Force -Recurse - if ($? -Eq $False) { - Write-Error "Unable to remove '$OutputDirectory'" - return $False - } - } - - $TempOutputDirectory = Join-Path "$(Split-Path -Parent $OutputDirectory)" "$(Split-Path -Leaf $OutputDirectory).tmp" - if (Test-Path $TempOutputDirectory) { - Remove-Item $TempOutputDirectory -Force -Recurse - } - New-Item -Path $TempOutputDirectory -Force -ItemType "Directory" | Out-Null - - Add-Type -assembly "system.io.compression.filesystem" - [io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$TempOutputDirectory") - if ($? -Eq $False) { - Write-Error "Unable to extract '$ZipPath'" - return $False - } - - Move-Item -Path $TempOutputDirectory -Destination $OutputDirectory - } - catch { - Write-Host $_ - Write-Host $_.Exception - - return $False - } - return $True -} - -export-modulemember -function DownloadAndExtract -export-modulemember -function Expand-Zip -export-modulemember -function Get-File -export-modulemember -function Get-MachineArchitecture -export-modulemember -function Get-NativeInstallDirectory -export-modulemember -function Get-TempDirectory -export-modulemember -function Get-TempPathFilename -export-modulemember -function New-ScriptShim diff --git a/src/arcade/eng/common/native/common-library.sh b/src/arcade/eng/common/native/common-library.sh deleted file mode 100644 index 080c2c283..000000000 --- a/src/arcade/eng/common/native/common-library.sh +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env bash - -function GetNativeInstallDirectory { - local install_dir - - if [[ -z $NETCOREENG_INSTALL_DIRECTORY ]]; then - install_dir=$HOME/.netcoreeng/native/ - else - install_dir=$NETCOREENG_INSTALL_DIRECTORY - fi - - echo $install_dir - return 0 -} - -function GetTempDirectory { - - echo $(GetNativeInstallDirectory)temp/ - return 0 -} - -function ExpandZip { - local zip_path=$1 - local output_directory=$2 - local force=${3:-false} - - echo "Extracting $zip_path to $output_directory" - if [[ -d $output_directory ]] && [[ $force = false ]]; then - echo "Directory '$output_directory' already exists, skipping extract" - return 0 - fi - - if [[ -d $output_directory ]]; then - echo "'Force flag enabled, but '$output_directory' exists. Removing directory" - rm -rf $output_directory - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Unable to remove '$output_directory'" - return 1 - fi - fi - - echo "Creating directory: '$output_directory'" - mkdir -p $output_directory - - echo "Extracting archive" - tar -xf $zip_path -C $output_directory - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Unable to extract '$zip_path'" - return 1 - fi - - return 0 -} - -function GetCurrentOS { - local unameOut="$(uname -s)" - case $unameOut in - Linux*) echo "Linux";; - Darwin*) echo "MacOS";; - esac - return 0 -} - -function GetFile { - local uri=$1 - local path=$2 - local force=${3:-false} - local download_retries=${4:-5} - local retry_wait_time_seconds=${5:-30} - - if [[ -f $path ]]; then - if [[ $force = false ]]; then - echo "File '$path' already exists. Skipping download" - return 0 - else - rm -rf $path - fi - fi - - if [[ -f $uri ]]; then - echo "'$uri' is a file path, copying file to '$path'" - cp $uri $path - return $? - fi - - echo "Downloading $uri" - # Use curl if available, otherwise use wget - if command -v curl > /dev/null; then - curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail - else - wget -q -O "$path" "$uri" --tries="$download_retries" - fi - - return $? -} - -function GetTempPathFileName { - local path=$1 - - local temp_dir=$(GetTempDirectory) - local temp_file_name=$(basename $path) - echo $temp_dir$temp_file_name - return 0 -} - -function DownloadAndExtract { - local uri=$1 - local installDir=$2 - local force=${3:-false} - local download_retries=${4:-5} - local retry_wait_time_seconds=${5:-30} - - local temp_tool_path=$(GetTempPathFileName $uri) - - echo "downloading to: $temp_tool_path" - - # Download file - GetFile "$uri" "$temp_tool_path" $force $download_retries $retry_wait_time_seconds - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Failed to download '$uri' to '$temp_tool_path'." - return 1 - fi - - # Extract File - echo "extracting from $temp_tool_path to $installDir" - ExpandZip "$temp_tool_path" "$installDir" $force $download_retries $retry_wait_time_seconds - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Failed to extract '$temp_tool_path' to '$installDir'." - return 1 - fi - - return 0 -} - -function NewScriptShim { - local shimpath=$1 - local tool_file_path=$2 - local force=${3:-false} - - echo "Generating '$shimpath' shim" - if [[ -f $shimpath ]]; then - if [[ $force = false ]]; then - echo "File '$shimpath' already exists." >&2 - return 1 - else - rm -rf $shimpath - fi - fi - - if [[ ! -f $tool_file_path ]]; then - # try to see if the path is lower cased - tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")" - if [[ ! -f $tool_file_path ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist" - return 1 - fi - fi - - local shim_contents=$'#!/usr/bin/env bash\n' - shim_contents+="SHIMARGS="$'$1\n' - shim_contents+="$tool_file_path"$' $SHIMARGS\n' - - # Write shim file - echo "$shim_contents" > $shimpath - - chmod +x $shimpath - - echo "Finished generating shim '$shimpath'" - - return $? -} - diff --git a/src/arcade/eng/common/native/init-compiler.sh b/src/arcade/eng/common/native/init-compiler.sh deleted file mode 100644 index 9a0e1f2b4..000000000 --- a/src/arcade/eng/common/native/init-compiler.sh +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/sh -# -# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables -# -# NOTE: some scripts source this file and rely on stdout being empty, make sure -# to not output *anything* here, unless it is an error message that fails the -# build. - -if [ -z "$build_arch" ] || [ -z "$compiler" ]; then - echo "Usage..." - echo "build_arch= compiler= init-compiler.sh" - echo "Specify the target architecture." - echo "Specify the name of compiler (clang or gcc)." - exit 1 -fi - -case "$compiler" in - clang*|-clang*|--clang*) - # clangx.y or clang-x.y - version="$(echo "$compiler" | tr -d '[:alpha:]-=')" - majorVersion="${version%%.*}" - - # LLVM based on v18 released in early 2024, with two releases per year - maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 6)))" - compiler=clang - ;; - - gcc*|-gcc*|--gcc*) - # gccx.y or gcc-x.y - version="$(echo "$compiler" | tr -d '[:alpha:]-=')" - majorVersion="${version%%.*}" - - # GCC based on v14 released in early 2024, with one release per year - maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 12)))" - compiler=gcc - ;; -esac - -cxxCompiler="$compiler++" - -# clear the existing CC and CXX from environment -CC= -CXX= -LDFLAGS= - -if [ "$compiler" = "gcc" ]; then cxxCompiler="g++"; fi - -check_version_exists() { - desired_version=-1 - - # Set up the environment to be used for building with the desired compiler. - if command -v "$compiler-$1" > /dev/null; then - desired_version="-$1" - elif command -v "$compiler$1" > /dev/null; then - desired_version="$1" - fi - - echo "$desired_version" -} - -__baseOS="$(uname)" -set_compiler_version_from_CC() { - if [ "$__baseOS" = "Darwin" ]; then - # On Darwin, the versions from -version/-dumpversion refer to Xcode - # versions, not llvm versions, so we can't rely on them. - return - fi - - version="$("$CC" -dumpversion)" - if [ -z "$version" ]; then - echo "Error: $CC -dumpversion didn't provide a version" - exit 1 - fi - - # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments. - IFS=. read -r majorVersion _ < /dev/null; then - echo "Error: No compatible version of $compiler was found within the range of $minVersion to $maxVersion. Please upgrade your toolchain or specify the compiler explicitly using CLR_CC and CLR_CXX environment variables." - exit 1 - fi - - CC="$(command -v "$compiler" 2> /dev/null)" - CXX="$(command -v "$cxxCompiler" 2> /dev/null)" - set_compiler_version_from_CC - fi - else - desired_version="$(check_version_exists "$majorVersion")" - if [ "$desired_version" = "-1" ]; then - echo "Error: Could not find specific version of $compiler: $majorVersion." - exit 1 - fi - fi - - if [ -z "$CC" ]; then - CC="$(command -v "$compiler$desired_version" 2> /dev/null)" - CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)" - if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi - set_compiler_version_from_CC - fi -else - if [ ! -f "$CLR_CC" ]; then - echo "Error: CLR_CC is set but path '$CLR_CC' does not exist" - exit 1 - fi - CC="$CLR_CC" - CXX="$CLR_CXX" - set_compiler_version_from_CC -fi - -if [ -z "$CC" ]; then - echo "Error: Unable to find $compiler." - exit 1 -fi - -if [ "$__baseOS" != "Darwin" ]; then - # On Darwin, we always want to use the Apple linker. - - # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0. - if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then - if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then - LDFLAGS="-fuse-ld=lld" - fi - fi -fi - -SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)" - -export CC CXX LDFLAGS SCAN_BUILD_COMMAND diff --git a/src/arcade/eng/common/native/init-distro-rid.sh b/src/arcade/eng/common/native/init-distro-rid.sh deleted file mode 100644 index 83ea7aab0..000000000 --- a/src/arcade/eng/common/native/init-distro-rid.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh - -# getNonPortableDistroRid -# -# Input: -# targetOs: (str) -# targetArch: (str) -# rootfsDir: (str) -# -# Return: -# non-portable rid -getNonPortableDistroRid() -{ - targetOs="$1" - targetArch="$2" - rootfsDir="$3" - nonPortableRid="" - - if [ "$targetOs" = "linux" ]; then - # shellcheck disable=SC1091 - if [ -e "${rootfsDir}/etc/os-release" ]; then - . "${rootfsDir}/etc/os-release" - if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then - nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" - else - # Rolling release distros either do not set VERSION_ID, set it as blank or - # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux); - # so omit it here to be consistent with everything else. - nonPortableRid="${ID}-${targetArch}" - fi - elif [ -e "${rootfsDir}/android_platform" ]; then - # shellcheck disable=SC1091 - . "${rootfsDir}/android_platform" - nonPortableRid="$RID" - fi - fi - - if [ "$targetOs" = "freebsd" ]; then - # $rootfsDir can be empty. freebsd-version is a shell script and should always work. - __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1) - nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" - elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then - __android_sdk_version=$(getprop ro.build.version.sdk) - nonPortableRid="android.$__android_sdk_version-${targetArch}" - elif [ "$targetOs" = "illumos" ]; then - __uname_version=$(uname -v) - nonPortableRid="illumos-${targetArch}" - elif [ "$targetOs" = "solaris" ]; then - __uname_version=$(uname -v) - __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1) - nonPortableRid="solaris.$__solaris_major_version-${targetArch}" - elif [ "$targetOs" = "haiku" ]; then - __uname_release="$(uname -r)" - nonPortableRid=haiku.r"$__uname_release"-"$targetArch" - fi - - echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]' -} - -# initDistroRidGlobal -# -# Input: -# os: (str) -# arch: (str) -# rootfsDir?: (nullable:string) -# -# Return: -# None -# -# Notes: -# It is important to note that the function does not return anything, but it -# exports the following variables on success: -# __DistroRid : Non-portable rid of the target platform. -# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. -initDistroRidGlobal() -{ - targetOs="$1" - targetArch="$2" - rootfsDir="" - if [ $# -ge 3 ]; then - rootfsDir="$3" - fi - - if [ -n "${rootfsDir}" ]; then - # We may have a cross build. Check for the existence of the rootfsDir - if [ ! -e "${rootfsDir}" ]; then - echo "Error: rootfsDir has been passed, but the location is not valid." - exit 1 - fi - fi - - __DistroRid=$(getNonPortableDistroRid "${targetOs}" "${targetArch}" "${rootfsDir}") - - if [ -z "${__PortableTargetOS:-}" ]; then - __PortableTargetOS="$targetOs" - - STRINGS="$(command -v strings || true)" - if [ -z "$STRINGS" ]; then - STRINGS="$(command -v llvm-strings || true)" - fi - - # Check for musl-based distros (e.g. Alpine Linux, Void Linux). - if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || - ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then - __PortableTargetOS="linux-musl" - fi - fi - - export __DistroRid __PortableTargetOS -} diff --git a/src/arcade/eng/common/native/init-os-and-arch.sh b/src/arcade/eng/common/native/init-os-and-arch.sh deleted file mode 100644 index 38921d433..000000000 --- a/src/arcade/eng/common/native/init-os-and-arch.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -# Use uname to determine what the OS is. -OSName=$(uname -s | tr '[:upper:]' '[:lower:]') - -if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then - OSName="android" -fi - -case "$OSName" in -freebsd|linux|netbsd|openbsd|sunos|android|haiku) - os="$OSName" ;; -darwin) - os=osx ;; -*) - echo "Unsupported OS $OSName detected!" - exit 1 ;; -esac - -# On Solaris, `uname -m` is discouraged, see https://docs.oracle.com/cd/E36784_01/html/E36870/uname-1.html -# and `uname -p` returns processor type (e.g. i386 on amd64). -# The appropriate tool to determine CPU is isainfo(1) https://docs.oracle.com/cd/E36784_01/html/E36870/isainfo-1.html. -if [ "$os" = "sunos" ]; then - if uname -o 2>&1 | grep -q illumos; then - os="illumos" - else - os="solaris" - fi - CPUName=$(isainfo -n) -else - # For the rest of the operating systems, use uname(1) to determine what the CPU is. - CPUName=$(uname -m) -fi - -case "$CPUName" in - arm64|aarch64) - arch=arm64 - if [ "$(getconf LONG_BIT)" -lt 64 ]; then - # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS) - arch=arm - fi - ;; - - loongarch64) - arch=loongarch64 - ;; - - riscv64) - arch=riscv64 - ;; - - amd64|x86_64) - arch=x64 - ;; - - armv7l|armv8l) - # shellcheck disable=SC1091 - if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then - arch=armel - else - arch=arm - fi - ;; - - armv6l) - arch=armv6 - ;; - - i[3-6]86) - echo "Unsupported CPU $CPUName detected, build might not succeed!" - arch=x86 - ;; - - s390x) - arch=s390x - ;; - - ppc64le) - arch=ppc64le - ;; - *) - echo "Unknown CPU $CPUName detected!" - exit 1 - ;; -esac diff --git a/src/arcade/eng/common/native/install-cmake-test.sh b/src/arcade/eng/common/native/install-cmake-test.sh deleted file mode 100644 index 8a5e7cf0d..000000000 --- a/src/arcade/eng/common/native/install-cmake-test.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. $scriptroot/common-library.sh - -base_uri= -install_path= -version= -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installpath) - install_path=$2 - shift 2 - ;; - --version) - version=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --baseuri Base file directory or Url wrom which to acquire tool archives" - echo " --installpath Base directory to install native tool to" - echo " --clean Don't install the tool, just clean up the current install of the tool" - echo " --force Force install of tools even if they previously exist" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --downloadretries Total number of retry attempts" - echo " --retrywaittimeseconds Wait time between retry attempts in seconds" - echo "" - exit 0 - ;; - esac -done - -tool_name="cmake-test" -tool_os=$(GetCurrentOS) -tool_folder="$(echo $tool_os | tr "[:upper:]" "[:lower:]")" -tool_arch="x86_64" -tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" -tool_install_directory="$install_path/$tool_name/$version" -tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" -shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" - -# Clean up tool and installers -if [[ $clean = true ]]; then - echo "Cleaning $tool_install_directory" - if [[ -d $tool_install_directory ]]; then - rm -rf $tool_install_directory - fi - - echo "Cleaning $shim_path" - if [[ -f $shim_path ]]; then - rm -rf $shim_path - fi - - tool_temp_path=$(GetTempPathFileName $uri) - echo "Cleaning $tool_temp_path" - if [[ -f $tool_temp_path ]]; then - rm -rf $tool_temp_path - fi - - exit 0 -fi - -# Install tool -if [[ -f $tool_file_path ]] && [[ $force = false ]]; then - echo "$tool_name ($version) already exists, skipping install" - exit 0 -fi - -DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Installation failed' - exit 1 -fi - -# Generate Shim -# Always rewrite shims so that we are referencing the expected version -NewScriptShim $shim_path $tool_file_path true - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Shim generation failed' - exit 1 -fi - -exit 0 diff --git a/src/arcade/eng/common/native/install-cmake.sh b/src/arcade/eng/common/native/install-cmake.sh deleted file mode 100644 index de496beeb..000000000 --- a/src/arcade/eng/common/native/install-cmake.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. $scriptroot/common-library.sh - -base_uri= -install_path= -version= -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installpath) - install_path=$2 - shift 2 - ;; - --version) - version=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --baseuri Base file directory or Url wrom which to acquire tool archives" - echo " --installpath Base directory to install native tool to" - echo " --clean Don't install the tool, just clean up the current install of the tool" - echo " --force Force install of tools even if they previously exist" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --downloadretries Total number of retry attempts" - echo " --retrywaittimeseconds Wait time between retry attempts in seconds" - echo "" - exit 0 - ;; - esac -done - -tool_name="cmake" -tool_os=$(GetCurrentOS) -tool_folder="$(echo $tool_os | tr "[:upper:]" "[:lower:]")" -tool_arch="x86_64" -tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" -tool_install_directory="$install_path/$tool_name/$version" -tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" -shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" - -# Clean up tool and installers -if [[ $clean = true ]]; then - echo "Cleaning $tool_install_directory" - if [[ -d $tool_install_directory ]]; then - rm -rf $tool_install_directory - fi - - echo "Cleaning $shim_path" - if [[ -f $shim_path ]]; then - rm -rf $shim_path - fi - - tool_temp_path=$(GetTempPathFileName $uri) - echo "Cleaning $tool_temp_path" - if [[ -f $tool_temp_path ]]; then - rm -rf $tool_temp_path - fi - - exit 0 -fi - -# Install tool -if [[ -f $tool_file_path ]] && [[ $force = false ]]; then - echo "$tool_name ($version) already exists, skipping install" - exit 0 -fi - -DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Installation failed' - exit 1 -fi - -# Generate Shim -# Always rewrite shims so that we are referencing the expected version -NewScriptShim $shim_path $tool_file_path true - -if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' 'Shim generation failed' - exit 1 -fi - -exit 0 diff --git a/src/arcade/eng/common/native/install-tool.ps1 b/src/arcade/eng/common/native/install-tool.ps1 deleted file mode 100644 index 78f2d84a4..000000000 --- a/src/arcade/eng/common/native/install-tool.ps1 +++ /dev/null @@ -1,132 +0,0 @@ -<# -.SYNOPSIS -Install native tool - -.DESCRIPTION -Install cmake native tool from Azure blob storage - -.PARAMETER InstallPath -Base directory to install native tool to - -.PARAMETER BaseUri -Base file directory or Url from which to acquire tool archives - -.PARAMETER CommonLibraryDirectory -Path to folder containing common library modules - -.PARAMETER Force -Force install of tools even if they previously exist - -.PARAMETER Clean -Don't install the tool, just clean up the current install of the tool - -.PARAMETER DownloadRetries -Total number of retry attempts - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds - -.NOTES -Returns 0 if install succeeds, 1 otherwise -#> -[CmdletBinding(PositionalBinding=$false)] -Param ( - [Parameter(Mandatory=$True)] - [string] $ToolName, - [Parameter(Mandatory=$True)] - [string] $InstallPath, - [Parameter(Mandatory=$True)] - [string] $BaseUri, - [Parameter(Mandatory=$True)] - [string] $Version, - [string] $CommonLibraryDirectory = $PSScriptRoot, - [switch] $Force = $False, - [switch] $Clean = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30 -) - -. $PSScriptRoot\..\pipeline-logging-functions.ps1 - -# Import common library modules -Import-Module -Name (Join-Path $CommonLibraryDirectory "CommonLibrary.psm1") - -try { - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq "Continue" - - $Arch = CommonLibrary\Get-MachineArchitecture - $ToolOs = "win64" - if($Arch -Eq "x32") { - $ToolOs = "win32" - } - $ToolNameMoniker = "$ToolName-$Version-$ToolOs-$Arch" - $ToolInstallDirectory = Join-Path $InstallPath "$ToolName\$Version\" - $Uri = "$BaseUri/windows/$ToolName/$ToolNameMoniker.zip" - $ShimPath = Join-Path $InstallPath "$ToolName.exe" - - if ($Clean) { - Write-Host "Cleaning $ToolInstallDirectory" - if (Test-Path $ToolInstallDirectory) { - Remove-Item $ToolInstallDirectory -Force -Recurse - } - Write-Host "Cleaning $ShimPath" - if (Test-Path $ShimPath) { - Remove-Item $ShimPath -Force - } - $ToolTempPath = CommonLibrary\Get-TempPathFilename -Path $Uri - Write-Host "Cleaning $ToolTempPath" - if (Test-Path $ToolTempPath) { - Remove-Item $ToolTempPath -Force - } - exit 0 - } - - # Install tool - if ((Test-Path $ToolInstallDirectory) -And (-Not $Force)) { - Write-Verbose "$ToolName ($Version) already exists, skipping install" - } - else { - $InstallStatus = CommonLibrary\DownloadAndExtract -Uri $Uri ` - -InstallDirectory $ToolInstallDirectory ` - -Force:$Force ` - -DownloadRetries $DownloadRetries ` - -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` - -Verbose:$Verbose - - if ($InstallStatus -Eq $False) { - Write-PipelineTelemetryError "Installation failed" -Category "NativeToolsetBootstrapping" - exit 1 - } - } - - $ToolFilePath = Get-ChildItem $ToolInstallDirectory -Recurse -Filter "$ToolName.exe" | % { $_.FullName } - if (@($ToolFilePath).Length -Gt 1) { - Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))" - exit 1 - } elseif (@($ToolFilePath).Length -Lt 1) { - Write-Host "$ToolName was not found in $ToolInstallDirectory." - exit 1 - } - - # Generate shim - # Always rewrite shims so that we are referencing the expected version - $GenerateShimStatus = CommonLibrary\New-ScriptShim -ShimName $ToolName ` - -ShimDirectory $InstallPath ` - -ToolFilePath "$ToolFilePath" ` - -BaseUri $BaseUri ` - -Force:$Force ` - -Verbose:$Verbose - - if ($GenerateShimStatus -Eq $False) { - Write-PipelineTelemetryError "Generate shim failed" -Category "NativeToolsetBootstrapping" - return 1 - } - - exit 0 -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category "NativeToolsetBootstrapping" -Message $_ - exit 1 -} diff --git a/src/arcade/eng/common/pipeline-logging-functions.ps1 b/src/arcade/eng/common/pipeline-logging-functions.ps1 deleted file mode 100644 index 8e422c561..000000000 --- a/src/arcade/eng/common/pipeline-logging-functions.ps1 +++ /dev/null @@ -1,260 +0,0 @@ -# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 and modified. - -# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 - -$script:loggingCommandPrefix = '##vso[' -$script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"? - New-Object psobject -Property @{ Token = ';' ; Replacement = '%3B' } - New-Object psobject -Property @{ Token = "`r" ; Replacement = '%0D' } - New-Object psobject -Property @{ Token = "`n" ; Replacement = '%0A' } - New-Object psobject -Property @{ Token = "]" ; Replacement = '%5D' } -) -# TODO: BUG: Escape % ??? -# TODO: Add test to verify don't need to escape "=". - -# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set -function Write-PipelineTelemetryError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Category, - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput, - [switch]$Force) - - $PSBoundParameters.Remove('Category') | Out-Null - - if ($Force -Or ((Test-Path variable:ci) -And $ci)) { - $Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message" - } - $PSBoundParameters.Remove('Message') | Out-Null - $PSBoundParameters.Add('Message', $Message) - Write-PipelineTaskError @PSBoundParameters -} - -# Specify "-Force" to force pipeline formatted output even if "$ci" is false or not set -function Write-PipelineTaskError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput, - [switch]$Force - ) - - if (!$Force -And (-Not (Test-Path variable:ci) -Or !$ci)) { - if ($Type -eq 'error') { - Write-Host $Message -ForegroundColor Red - return - } - elseif ($Type -eq 'warning') { - Write-Host $Message -ForegroundColor Yellow - return - } - } - - if (($Type -ne 'error') -and ($Type -ne 'warning')) { - Write-Host $Message - return - } - $PSBoundParameters.Remove('Force') | Out-Null - if (-not $PSBoundParameters.ContainsKey('Type')) { - $PSBoundParameters.Add('Type', 'error') - } - Write-LogIssue @PSBoundParameters -} - -function Write-PipelineSetVariable { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Name, - [string]$Value, - [switch]$Secret, - [switch]$AsOutput, - [bool]$IsMultiJobVariable = $true) - - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ - 'variable' = $Name - 'isSecret' = $Secret - 'isOutput' = $IsMultiJobVariable - } -AsOutput:$AsOutput - } -} - -function Write-PipelinePrependPath { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Path, - [switch]$AsOutput) - - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput - } -} - -function Write-PipelineSetResult { - [CmdletBinding()] - param( - [ValidateSet("Succeeded", "SucceededWithIssues", "Failed", "Cancelled", "Skipped")] - [Parameter(Mandatory = $true)] - [string]$Result, - [string]$Message) - if ((Test-Path variable:ci) -And $ci) { - Write-LoggingCommand -Area 'task' -Event 'complete' -Data $Message -Properties @{ - 'result' = $Result - } - } -} - -<######################################## -# Private functions. -########################################> -function Format-LoggingCommandData { - [CmdletBinding()] - param([string]$Value, [switch]$Reverse) - - if (!$Value) { - return '' - } - - if (!$Reverse) { - foreach ($mapping in $script:loggingCommandEscapeMappings) { - $Value = $Value.Replace($mapping.Token, $mapping.Replacement) - } - } - else { - for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) { - $mapping = $script:loggingCommandEscapeMappings[$i] - $Value = $Value.Replace($mapping.Replacement, $mapping.Token) - } - } - - return $Value -} - -function Format-LoggingCommand { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Area, - [Parameter(Mandatory = $true)] - [string]$Event, - [string]$Data, - [hashtable]$Properties) - - # Append the preamble. - [System.Text.StringBuilder]$sb = New-Object -TypeName System.Text.StringBuilder - $null = $sb.Append($script:loggingCommandPrefix).Append($Area).Append('.').Append($Event) - - # Append the properties. - if ($Properties) { - $first = $true - foreach ($key in $Properties.Keys) { - [string]$value = Format-LoggingCommandData $Properties[$key] - if ($value) { - if ($first) { - $null = $sb.Append(' ') - $first = $false - } - else { - $null = $sb.Append(';') - } - - $null = $sb.Append("$key=$value") - } - } - } - - # Append the tail and output the value. - $Data = Format-LoggingCommandData $Data - $sb.Append(']').Append($Data).ToString() -} - -function Write-LoggingCommand { - [CmdletBinding(DefaultParameterSetName = 'Parameters')] - param( - [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] - [string]$Area, - [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] - [string]$Event, - [Parameter(ParameterSetName = 'Parameters')] - [string]$Data, - [Parameter(ParameterSetName = 'Parameters')] - [hashtable]$Properties, - [Parameter(Mandatory = $true, ParameterSetName = 'Object')] - $Command, - [switch]$AsOutput) - - if ($PSCmdlet.ParameterSetName -eq 'Object') { - Write-LoggingCommand -Area $Command.Area -Event $Command.Event -Data $Command.Data -Properties $Command.Properties -AsOutput:$AsOutput - return - } - - $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties - if ($AsOutput) { - $command - } - else { - Write-Host $command - } -} - -function Write-LogIssue { - [CmdletBinding()] - param( - [ValidateSet('warning', 'error')] - [Parameter(Mandatory = $true)] - [string]$Type, - [string]$Message, - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput) - - $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{ - 'type' = $Type - 'code' = $ErrCode - 'sourcepath' = $SourcePath - 'linenumber' = $LineNumber - 'columnnumber' = $ColumnNumber - } - if ($AsOutput) { - return $command - } - - if ($Type -eq 'error') { - $foregroundColor = $host.PrivateData.ErrorForegroundColor - $backgroundColor = $host.PrivateData.ErrorBackgroundColor - if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { - $foregroundColor = [System.ConsoleColor]::Red - $backgroundColor = [System.ConsoleColor]::Black - } - } - else { - $foregroundColor = $host.PrivateData.WarningForegroundColor - $backgroundColor = $host.PrivateData.WarningBackgroundColor - if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { - $foregroundColor = [System.ConsoleColor]::Yellow - $backgroundColor = [System.ConsoleColor]::Black - } - } - - Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor -} diff --git a/src/arcade/eng/common/pipeline-logging-functions.sh b/src/arcade/eng/common/pipeline-logging-functions.sh deleted file mode 100644 index 6a0b2255e..000000000 --- a/src/arcade/eng/common/pipeline-logging-functions.sh +++ /dev/null @@ -1,206 +0,0 @@ -#!/usr/bin/env bash - -function Write-PipelineTelemetryError { - local telemetry_category='' - local force=false - local function_args=() - local message='' - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -category|-c) - telemetry_category=$2 - shift - ;; - -force|-f) - force=true - ;; - -*) - function_args+=("$1 $2") - shift - ;; - *) - message=$* - ;; - esac - shift - done - - if [[ $force != true ]] && [[ "$ci" != true ]]; then - echo "$message" >&2 - return - fi - - if [[ $force == true ]]; then - function_args+=("-force") - fi - message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message" - function_args+=("$message") - Write-PipelineTaskError ${function_args[@]} -} - -function Write-PipelineTaskError { - local message_type="error" - local sourcepath='' - local linenumber='' - local columnnumber='' - local error_code='' - local force=false - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -type|-t) - message_type=$2 - shift - ;; - -sourcepath|-s) - sourcepath=$2 - shift - ;; - -linenumber|-ln) - linenumber=$2 - shift - ;; - -columnnumber|-cn) - columnnumber=$2 - shift - ;; - -errcode|-e) - error_code=$2 - shift - ;; - -force|-f) - force=true - ;; - *) - break - ;; - esac - - shift - done - - if [[ $force != true ]] && [[ "$ci" != true ]]; then - echo "$@" >&2 - return - fi - - local message="##vso[task.logissue" - - message="$message type=$message_type" - - if [ -n "$sourcepath" ]; then - message="$message;sourcepath=$sourcepath" - fi - - if [ -n "$linenumber" ]; then - message="$message;linenumber=$linenumber" - fi - - if [ -n "$columnnumber" ]; then - message="$message;columnnumber=$columnnumber" - fi - - if [ -n "$error_code" ]; then - message="$message;code=$error_code" - fi - - message="$message]$*" - echo "$message" -} - -function Write-PipelineSetVariable { - if [[ "$ci" != true ]]; then - return - fi - - local name='' - local value='' - local secret=false - local as_output=false - local is_multi_job_variable=true - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -name|-n) - name=$2 - shift - ;; - -value|-v) - value=$2 - shift - ;; - -secret|-s) - secret=true - ;; - -as_output|-a) - as_output=true - ;; - -is_multi_job_variable|-i) - is_multi_job_variable=$2 - shift - ;; - esac - shift - done - - value=${value/;/%3B} - value=${value/\\r/%0D} - value=${value/\\n/%0A} - value=${value/]/%5D} - - local message="##vso[task.setvariable variable=$name;isSecret=$secret;isOutput=$is_multi_job_variable]$value" - - if [[ "$as_output" == true ]]; then - $message - else - echo "$message" - fi -} - -function Write-PipelinePrependPath { - local prepend_path='' - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -path|-p) - prepend_path=$2 - shift - ;; - esac - shift - done - - export PATH="$prepend_path:$PATH" - - if [[ "$ci" == true ]]; then - echo "##vso[task.prependpath]$prepend_path" - fi -} - -function Write-PipelineSetResult { - local result='' - local message='' - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -result|-r) - result=$2 - shift - ;; - -message|-m) - message=$2 - shift - ;; - esac - shift - done - - if [[ "$ci" == true ]]; then - echo "##vso[task.complete result=$result;]$message" - fi -} diff --git a/src/arcade/eng/common/post-build/check-channel-consistency.ps1 b/src/arcade/eng/common/post-build/check-channel-consistency.ps1 deleted file mode 100644 index 61208d2d1..000000000 --- a/src/arcade/eng/common/post-build/check-channel-consistency.ps1 +++ /dev/null @@ -1,48 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $PromoteToChannels, # List of channels that the build should be promoted to - [Parameter(Mandatory=$true)][array] $AvailableChannelIds # List of channel IDs available in the YAML implementation -) - -try { - $ErrorActionPreference = 'Stop' - Set-StrictMode -Version 2.0 - - # `tools.ps1` checks $ci to perform some actions. Since the post-build - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - $disableConfigureToolsetImport = $true - . $PSScriptRoot\..\tools.ps1 - - if ($PromoteToChannels -eq "") { - Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." - ExitWithExitCode 0 - } - - # Check that every channel that Maestro told to promote the build to - # is available in YAML - $PromoteToChannelsIds = $PromoteToChannels -split "\D" | Where-Object { $_ } - - $hasErrors = $false - - foreach ($id in $PromoteToChannelsIds) { - if (($id -ne 0) -and ($id -notin $AvailableChannelIds)) { - Write-PipelineTaskError -Message "Channel $id is not present in the post-build YAML configuration! This is an error scenario. Please contact @dnceng." - $hasErrors = $true - } - } - - # The `Write-PipelineTaskError` doesn't error the script and we might report several errors - # in the previous lines. The check below makes sure that we return an error state from the - # script if we reported any validation error - if ($hasErrors) { - ExitWithExitCode 1 - } - - Write-Host 'done.' -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Category 'CheckChannelConsistency' -Message "There was an error while trying to check consistency of Maestro default channels for the build and post-build YAML configuration." - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/post-build/nuget-validation.ps1 b/src/arcade/eng/common/post-build/nuget-validation.ps1 deleted file mode 100644 index e5de00c89..000000000 --- a/src/arcade/eng/common/post-build/nuget-validation.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -# This script validates NuGet package metadata information using this -# tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage - -param( - [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are -) - -# `tools.ps1` checks $ci to perform some actions. Since the post-build -# scripts don't necessarily execute in the same agent that run the -# build.ps1/sh script this variable isn't automatically set. -$ci = $true -$disableConfigureToolsetImport = $true -. $PSScriptRoot\..\tools.ps1 - -try { - & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'NuGetValidation' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/post-build/nuget-verification.ps1 b/src/arcade/eng/common/post-build/nuget-verification.ps1 deleted file mode 100644 index a365194a9..000000000 --- a/src/arcade/eng/common/post-build/nuget-verification.ps1 +++ /dev/null @@ -1,121 +0,0 @@ -<# -.SYNOPSIS - Verifies that Microsoft NuGet packages have proper metadata. -.DESCRIPTION - Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an - error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not - match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script. -.PARAMETER NuGetExePath - The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath - directory. -.PARAMETER PackageSource - The package source to use to download the verification tool. If not provided, nuget.org will be used. -.PARAMETER DownloadPath - The directory path to download the verification tool and nuget.exe to. If not provided, - %TEMP%\NuGet.VerifyNuGetPackage will be used. -.PARAMETER args - Arguments that will be passed to the verification tool. -.EXAMPLE - PS> .\verify.ps1 *.nupkg - Verifies the metadata of all .nupkg files in the currect working directory. -.EXAMPLE - PS> .\verify.ps1 --help - Displays the help text of the downloaded verifiction tool. -.LINK - https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md -#> - -# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1 - -[CmdletBinding(PositionalBinding = $false)] -param( - [string]$NuGetExePath, - [string]$PackageSource = "https://api.nuget.org/v3/index.json", - [string]$DownloadPath, - [Parameter(ValueFromRemainingArguments = $true)] - [string[]]$args -) - -# The URL to download nuget.exe. -$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe" - -# The package ID of the verification tool. -$packageId = "NuGet.VerifyMicrosoftPackage" - -# The location that nuget.exe and the verification tool will be downloaded to. -if (!$DownloadPath) { - $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage") -} - -$fence = New-Object -TypeName string -ArgumentList '=', 80 - -# Create the download directory, if it doesn't already exist. -if (!(Test-Path $DownloadPath)) { - New-Item -ItemType Directory $DownloadPath | Out-Null -} -Write-Host "Using download path: $DownloadPath" - -if ($NuGetExePath) { - $nuget = $NuGetExePath -} else { - $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe" - - # Download nuget.exe, if it doesn't already exist. - if (!(Test-Path $downloadedNuGetExe)) { - Write-Host "Downloading nuget.exe from $nugetExeUrl..." - $ProgressPreference = 'SilentlyContinue' - try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe - $ProgressPreference = 'Continue' - } catch { - $ProgressPreference = 'Continue' - Write-Error $_ - Write-Error "nuget.exe failed to download." - exit - } - } - - $nuget = $downloadedNuGetExe -} - -Write-Host "Using nuget.exe path: $nuget" -Write-Host " " - -# Download the latest version of the verification tool. -Write-Host "Downloading the latest version of $packageId from $packageSource..." -Write-Host $fence -& $nuget install $packageId ` - -Prerelease ` - -OutputDirectory $DownloadPath ` - -Source $PackageSource -Write-Host $fence -Write-Host " " - -if ($LASTEXITCODE -ne 0) { - Write-Error "nuget.exe failed to fetch the verify tool." - exit -} - -# Find the most recently downloaded tool -Write-Host "Finding the most recently downloaded verification tool." -$verifyProbePath = Join-Path $DownloadPath "$packageId.*" -$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory ` - | Sort-Object -Property LastWriteTime -Descending ` - | Select-Object -First 1 -$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe" -Write-Host "Using verification tool: $verify" -Write-Host " " - -# Execute the verification tool. -Write-Host "Executing the verify tool..." -Write-Host $fence -& $verify $args -Write-Host $fence -Write-Host " " - -# Respond to the exit code. -if ($LASTEXITCODE -ne 0) { - Write-Error "The verify tool found some problems." -} else { - Write-Output "The verify tool succeeded." -} diff --git a/src/arcade/eng/common/post-build/redact-logs.ps1 b/src/arcade/eng/common/post-build/redact-logs.ps1 deleted file mode 100644 index b7fc19591..000000000 --- a/src/arcade/eng/common/post-build/redact-logs.ps1 +++ /dev/null @@ -1,89 +0,0 @@ -[CmdletBinding(PositionalBinding=$False)] -param( - [Parameter(Mandatory=$true, Position=0)][string] $InputPath, - [Parameter(Mandatory=$true)][string] $BinlogToolVersion, - [Parameter(Mandatory=$false)][string] $DotnetPath, - [Parameter(Mandatory=$false)][string] $PackageFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json', - # File with strings to redact - separated by newlines. - # For comments start the line with '# ' - such lines are ignored - [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact -) - -try { - $ErrorActionPreference = 'Stop' - Set-StrictMode -Version 2.0 - - # `tools.ps1` checks $ci to perform some actions. Since the post-build - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - $disableConfigureToolsetImport = $true - . $PSScriptRoot\..\tools.ps1 - - $packageName = 'binlogtool' - - $dotnet = $DotnetPath - - if (!$dotnet) { - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - } - - $toolList = & "$dotnet" tool list -g - - if ($toolList -like "*$packageName*") { - & "$dotnet" tool uninstall $packageName -g - } - - $toolPath = "$PSScriptRoot\..\..\..\.tools" - $verbosity = 'minimal' - - New-Item -ItemType Directory -Force -Path $toolPath - - Push-Location -Path $toolPath - - try { - Write-Host "Installing Binlog redactor CLI..." - Write-Host "'$dotnet' new tool-manifest" - & "$dotnet" new tool-manifest - Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion" - & "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion - - if (Test-Path $TokensFilePath) { - Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath - $TokensToRedact += Get-Content -Path $TokensFilePath | Foreach {$_.Trim()} | Where { $_ -notmatch "^# " } - } - - $optionalParams = [System.Collections.ArrayList]::new() - - Foreach ($p in $TokensToRedact) - { - if($p -match '^\$\(.*\)$') - { - Write-Host ("Ignoring token {0} as it is probably unexpanded AzDO variable" -f $p) - } - elseif($p) - { - $optionalParams.Add("-p:" + $p) | Out-Null - } - } - - & $dotnet binlogtool redact --input:$InputPath --recurse --in-place ` - @optionalParams - - if ($LastExitCode -ne 0) { - Write-PipelineTelemetryError -Category 'Redactor' -Type 'warning' -Message "Problems using Redactor tool (exit code: $LastExitCode). But ignoring them now." - } - } - finally { - Pop-Location - } - - Write-Host 'done.' -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Category 'Redactor' -Message "There was an error while trying to redact logs. Error: $_" - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/post-build/sourcelink-validation.ps1 b/src/arcade/eng/common/post-build/sourcelink-validation.ps1 deleted file mode 100644 index 1976ef70f..000000000 --- a/src/arcade/eng/common/post-build/sourcelink-validation.ps1 +++ /dev/null @@ -1,327 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where Symbols.NuGet packages to be checked are stored - [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$false)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade - [Parameter(Mandatory=$false)][string] $GHCommit, # GitHub commit SHA used to build the packages - [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -# `tools.ps1` checks $ci to perform some actions. Since the post-build -# scripts don't necessarily execute in the same agent that run the -# build.ps1/sh script this variable isn't automatically set. -$ci = $true -$disableConfigureToolsetImport = $true -. $PSScriptRoot\..\tools.ps1 - -# Cache/HashMap (File -> Exist flag) used to consult whether a file exist -# in the repository at a specific commit point. This is populated by inserting -# all files present in the repo at a specific commit point. -$global:RepoFiles = @{} - -# Maximum number of jobs to run in parallel -$MaxParallelJobs = 16 - -$MaxRetries = 5 -$RetryWaitTimeInSeconds = 30 - -# Wait time between check for system load -$SecondsBetweenLoadChecks = 10 - -if (!$InputPath -or !(Test-Path $InputPath)){ - Write-Host "No files to validate." - ExitWithExitCode 0 -} - -$ValidatePackage = { - param( - [string] $PackagePath # Full path to a Symbols.NuGet package - ) - - . $using:PSScriptRoot\..\tools.ps1 - - # Ensure input file exist - if (!(Test-Path $PackagePath)) { - Write-Host "Input file does not exist: $PackagePath" - return [pscustomobject]@{ - result = 1 - packagePath = $PackagePath - } - } - - # Extensions for which we'll look for SourceLink information - # For now we'll only care about Portable & Embedded PDBs - $RelevantExtensions = @('.dll', '.exe', '.pdb') - - Write-Host -NoNewLine 'Validating ' ([System.IO.Path]::GetFileName($PackagePath)) '...' - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId - $FailedFiles = 0 - - Add-Type -AssemblyName System.IO.Compression.FileSystem - - [System.IO.Directory]::CreateDirectory($ExtractPath) | Out-Null - - try { - $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) - - $zip.Entries | - Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | - ForEach-Object { - $FileName = $_.FullName - $Extension = [System.IO.Path]::GetExtension($_.Name) - $FakeName = -Join((New-Guid), $Extension) - $TargetFile = Join-Path -Path $ExtractPath -ChildPath $FakeName - - # We ignore resource DLLs - if ($FileName.EndsWith('.resources.dll')) { - return [pscustomobject]@{ - result = 0 - packagePath = $PackagePath - } - } - - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) - - $ValidateFile = { - param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $RealPath, - [ref] $FailedFiles - ) - - $sourcelinkExe = "$env:USERPROFILE\.dotnet\tools" - $sourcelinkExe = Resolve-Path "$sourcelinkExe\sourcelink.exe" - $SourceLinkInfos = & $sourcelinkExe print-urls $FullPath | Out-String - - if ($LASTEXITCODE -eq 0 -and -not ([string]::IsNullOrEmpty($SourceLinkInfos))) { - $NumFailedLinks = 0 - - # We only care about Http addresses - $Matches = (Select-String '(http[s]?)(:\/\/)([^\s,]+)' -Input $SourceLinkInfos -AllMatches).Matches - - if ($Matches.Count -ne 0) { - $Matches.Value | - ForEach-Object { - $Link = $_ - $CommitUrl = "https://raw.githubusercontent.com/${using:GHRepoName}/${using:GHCommit}/" - - $FilePath = $Link.Replace($CommitUrl, "") - $Status = 200 - $Cache = $using:RepoFiles - - $attempts = 0 - - while ($attempts -lt $using:MaxRetries) { - if ( !($Cache.ContainsKey($FilePath)) ) { - try { - $Uri = $Link -as [System.URI] - - if ($Link -match "submodules") { - # Skip submodule links until sourcelink properly handles submodules - $Status = 200 - } - elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) { - # Only GitHub links are valid - $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode - } - else { - # If it's not a github link, we want to break out of the loop and not retry. - $Status = 0 - $attempts = $using:MaxRetries - } - } - catch { - Write-Host $_ - $Status = 0 - } - } - - if ($Status -ne 200) { - $attempts++ - - if ($attempts -lt $using:MaxRetries) - { - $attemptsLeft = $using:MaxRetries - $attempts - Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds" - Start-Sleep -Seconds $using:RetryWaitTimeInSeconds - } - else { - if ($NumFailedLinks -eq 0) { - if ($FailedFiles.Value -eq 0) { - Write-Host - } - - Write-Host "`tFile $RealPath has broken links:" - } - - Write-Host "`t`tFailed to retrieve $Link" - - $NumFailedLinks++ - } - } - else { - break - } - } - } - } - - if ($NumFailedLinks -ne 0) { - $FailedFiles.value++ - $global:LASTEXITCODE = 1 - } - } - } - - &$ValidateFile $TargetFile $FileName ([ref]$FailedFiles) - } - } - catch { - Write-Host $_ - } - finally { - $zip.Dispose() - } - - if ($FailedFiles -eq 0) { - Write-Host 'Passed.' - return [pscustomobject]@{ - result = 0 - packagePath = $PackagePath - } - } - else { - Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links." - return [pscustomobject]@{ - result = 1 - packagePath = $PackagePath - } - } -} - -function CheckJobResult( - $result, - $packagePath, - [ref]$ValidationFailures, - [switch]$logErrors) { - if ($result -ne '0') { - if ($logErrors) { - Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links." - } - $ValidationFailures.Value++ - } -} - -function ValidateSourceLinkLinks { - if ($GHRepoName -ne '' -and !($GHRepoName -Match '^[^\s\/]+/[^\s\/]+$')) { - if (!($GHRepoName -Match '^[^\s-]+-[^\s]+$')) { - Write-PipelineTelemetryError -Category 'SourceLink' -Message "GHRepoName should be in the format / or -. '$GHRepoName'" - ExitWithExitCode 1 - } - else { - $GHRepoName = $GHRepoName -replace '^([^\s-]+)-([^\s]+)$', '$1/$2'; - } - } - - if ($GHCommit -ne '' -and !($GHCommit -Match '^[0-9a-fA-F]{40}$')) { - Write-PipelineTelemetryError -Category 'SourceLink' -Message "GHCommit should be a 40 chars hexadecimal string. '$GHCommit'" - ExitWithExitCode 1 - } - - if ($GHRepoName -ne '' -and $GHCommit -ne '') { - $RepoTreeURL = -Join('http://api.github.com/repos/', $GHRepoName, '/git/trees/', $GHCommit, '?recursive=1') - $CodeExtensions = @('.cs', '.vb', '.fs', '.fsi', '.fsx', '.fsscript') - - try { - # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash - $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree - - foreach ($file in $Data) { - $Extension = [System.IO.Path]::GetExtension($file.path) - - if ($CodeExtensions.Contains($Extension)) { - $RepoFiles[$file.path] = 1 - } - } - } - catch { - Write-Host "Problems downloading the list of files from the repo. Url used: $RepoTreeURL . Execution will proceed without caching." - } - } - elseif ($GHRepoName -ne '' -or $GHCommit -ne '') { - Write-Host 'For using the http caching mechanism both GHRepoName and GHCommit should be informed.' - } - - if (Test-Path $ExtractPath) { - Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue - } - - $ValidationFailures = 0 - - # Process each NuGet package in parallel - Get-ChildItem "$InputPath\*.symbols.nupkg" | - ForEach-Object { - Write-Host "Starting $($_.FullName)" - Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null - $NumJobs = @(Get-Job -State 'Running').Count - - while ($NumJobs -ge $MaxParallelJobs) { - Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again." - sleep $SecondsBetweenLoadChecks - $NumJobs = @(Get-Job -State 'Running').Count - } - - foreach ($Job in @(Get-Job -State 'Completed')) { - $jobResult = Wait-Job -Id $Job.Id | Receive-Job - CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures) -LogErrors - Remove-Job -Id $Job.Id - } - } - - foreach ($Job in @(Get-Job)) { - $jobResult = Wait-Job -Id $Job.Id | Receive-Job - CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures) - Remove-Job -Id $Job.Id - } - if ($ValidationFailures -gt 0) { - Write-PipelineTelemetryError -Category 'SourceLink' -Message "$ValidationFailures package(s) failed validation." - ExitWithExitCode 1 - } -} - -function InstallSourcelinkCli { - $sourcelinkCliPackageName = 'sourcelink' - - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - $toolList = & "$dotnet" tool list --global - - if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) { - Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed." - } - else { - Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..." - Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.' - & "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity "minimal" --global - } -} - -try { - InstallSourcelinkCli - - foreach ($Job in @(Get-Job)) { - Remove-Job -Id $Job.Id - } - - ValidateSourceLinkLinks -} -catch { - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'SourceLink' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/post-build/symbols-validation.ps1 b/src/arcade/eng/common/post-build/symbols-validation.ps1 deleted file mode 100644 index 7146e593f..000000000 --- a/src/arcade/eng/common/post-build/symbols-validation.ps1 +++ /dev/null @@ -1,337 +0,0 @@ -param( - [Parameter(Mandatory = $true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored - [Parameter(Mandatory = $true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory = $true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use - [Parameter(Mandatory = $false)][switch] $CheckForWindowsPdbs, # If we should check for the existence of windows pdbs in addition to portable PDBs - [Parameter(Mandatory = $false)][switch] $ContinueOnError, # If we should keep checking symbols after an error - [Parameter(Mandatory = $false)][switch] $Clean, # Clean extracted symbols directory after checking symbols - [Parameter(Mandatory = $false)][string] $SymbolExclusionFile # Exclude the symbols in the file from publishing to symbol server -) - -. $PSScriptRoot\..\tools.ps1 -# Maximum number of jobs to run in parallel -$MaxParallelJobs = 16 - -# Max number of retries -$MaxRetry = 5 - -# Wait time between check for system load -$SecondsBetweenLoadChecks = 10 - -# Set error codes -Set-Variable -Name "ERROR_BADEXTRACT" -Option Constant -Value -1 -Set-Variable -Name "ERROR_FILEDOESNOTEXIST" -Option Constant -Value -2 - -$WindowsPdbVerificationParam = "" -if ($CheckForWindowsPdbs) { - $WindowsPdbVerificationParam = "--windows-pdbs" -} - -$ExclusionSet = New-Object System.Collections.Generic.HashSet[string]; - -if (!$InputPath -or !(Test-Path $InputPath)){ - Write-Host "No symbols to validate." - ExitWithExitCode 0 -} - -#Check if the path exists -if ($SymbolExclusionFile -and (Test-Path $SymbolExclusionFile)){ - [string[]]$Exclusions = Get-Content "$SymbolExclusionFile" - $Exclusions | foreach { if($_ -and $_.Trim()){$ExclusionSet.Add($_)} } -} -else{ - Write-Host "Symbol Exclusion file does not exists. No symbols to exclude." -} - -$CountMissingSymbols = { - param( - [string] $PackagePath, # Path to a NuGet package - [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs - ) - - Add-Type -AssemblyName System.IO.Compression.FileSystem - - Write-Host "Validating $PackagePath " - - # Ensure input file exist - if (!(Test-Path $PackagePath)) { - Write-PipelineTaskError "Input file does not exist: $PackagePath" - return [pscustomobject]@{ - result = $using:ERROR_FILEDOESNOTEXIST - packagePath = $PackagePath - } - } - - # Extensions for which we'll look for symbols - $RelevantExtensions = @('.dll', '.exe', '.so', '.dylib') - - # How many files are missing symbol information - $MissingSymbols = 0 - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $PackageGuid = New-Guid - $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageGuid - $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath 'Symbols' - - try { - [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath) - } - catch { - Write-Host "Something went wrong extracting $PackagePath" - Write-Host $_ - return [pscustomobject]@{ - result = $using:ERROR_BADEXTRACT - packagePath = $PackagePath - } - } - - Get-ChildItem -Recurse $ExtractPath | - Where-Object { $RelevantExtensions -contains $_.Extension } | - ForEach-Object { - $FileName = $_.FullName - if ($FileName -Match '\\ref\\') { - Write-Host "`t Ignoring reference assembly file " $FileName - return - } - - $FirstMatchingSymbolDescriptionOrDefault = { - param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols - [string] $WindowsPdbVerificationParam, # Parameter to pass to potential check for windows-pdbs. - [string] $SymbolsPath - ) - - $FileName = [System.IO.Path]::GetFileName($FullPath) - $Extension = [System.IO.Path]::GetExtension($FullPath) - - # Those below are potential symbol files that the `dotnet symbol` might - # return. Which one will be returned depend on the type of file we are - # checking and which type of file was uploaded. - - # The file itself is returned - $SymbolPath = $SymbolsPath + '\' + $FileName - - # PDB file for the module - $PdbPath = $SymbolPath.Replace($Extension, '.pdb') - - # PDB file for R2R module (created by crossgen) - $NGenPdb = $SymbolPath.Replace($Extension, '.ni.pdb') - - # DBG file for a .so library - $SODbg = $SymbolPath.Replace($Extension, '.so.dbg') - - # DWARF file for a .dylib - $DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf') - - $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools" - $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe" - - $totalRetries = 0 - - while ($totalRetries -lt $using:MaxRetry) { - - # Save the output and get diagnostic output - $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String - - if ((Test-Path $PdbPath) -and (Test-path $SymbolPath)) { - return 'Module and PDB for Module' - } - elseif ((Test-Path $NGenPdb) -and (Test-Path $PdbPath) -and (Test-Path $SymbolPath)) { - return 'Dll, PDB and NGen PDB' - } - elseif ((Test-Path $SODbg) -and (Test-Path $SymbolPath)) { - return 'So and DBG for SO' - } - elseif ((Test-Path $DylibDwarf) -and (Test-Path $SymbolPath)) { - return 'Dylib and Dwarf for Dylib' - } - elseif (Test-Path $SymbolPath) { - return 'Module' - } - else - { - $totalRetries++ - } - } - - return $null - } - - $FileRelativePath = $FileName.Replace("$ExtractPath\", "") - if (($($using:ExclusionSet) -ne $null) -and ($($using:ExclusionSet).Contains($FileRelativePath) -or ($($using:ExclusionSet).Contains($FileRelativePath.Replace("\", "/"))))){ - Write-Host "Skipping $FileName from symbol validation" - } - - else { - $FileGuid = New-Guid - $ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid - - $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault ` - -FullPath $FileName ` - -TargetServerParam '--microsoft-symbol-server' ` - -SymbolsPath "$ExpandedSymbolsPath-msdl" ` - -WindowsPdbVerificationParam $WindowsPdbVerificationParam - $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault ` - -FullPath $FileName ` - -TargetServerParam '--internal-server' ` - -SymbolsPath "$ExpandedSymbolsPath-symweb" ` - -WindowsPdbVerificationParam $WindowsPdbVerificationParam - - Write-Host -NoNewLine "`t Checking file " $FileName "... " - - if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { - Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)" - } - else { - $MissingSymbols++ - - if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { - Write-Host 'No symbols found on MSDL or SymWeb!' - } - else { - if ($SymbolsOnMSDL -eq $null) { - Write-Host 'No symbols found on MSDL!' - } - else { - Write-Host 'No symbols found on SymWeb!' - } - } - } - } - } - - if ($using:Clean) { - Remove-Item $ExtractPath -Recurse -Force - } - - Pop-Location - - return [pscustomobject]@{ - result = $MissingSymbols - packagePath = $PackagePath - } -} - -function CheckJobResult( - $result, - $packagePath, - [ref]$DupedSymbols, - [ref]$TotalFailures) { - if ($result -eq $ERROR_BADEXTRACT) { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files" - $DupedSymbols.Value++ - } - elseif ($result -eq $ERROR_FILEDOESNOTEXIST) { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath does not exist" - $TotalFailures.Value++ - } - elseif ($result -gt '0') { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath" - $TotalFailures.Value++ - } - else { - Write-Host "All symbols verified for package $packagePath" - } -} - -function CheckSymbolsAvailable { - if (Test-Path $ExtractPath) { - Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue - } - - $TotalPackages = 0 - $TotalFailures = 0 - $DupedSymbols = 0 - - Get-ChildItem "$InputPath\*.nupkg" | - ForEach-Object { - $FileName = $_.Name - $FullName = $_.FullName - - # These packages from Arcade-Services include some native libraries that - # our current symbol uploader can't handle. Below is a workaround until - # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted. - if ($FileName -Match 'Microsoft\.DotNet\.Darc\.') { - Write-Host "Ignoring Arcade-services file: $FileName" - Write-Host - return - } - elseif ($FileName -Match 'Microsoft\.DotNet\.Maestro\.Tasks\.') { - Write-Host "Ignoring Arcade-services file: $FileName" - Write-Host - return - } - - $TotalPackages++ - - Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null - - $NumJobs = @(Get-Job -State 'Running').Count - - while ($NumJobs -ge $MaxParallelJobs) { - Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again." - sleep $SecondsBetweenLoadChecks - $NumJobs = @(Get-Job -State 'Running').Count - } - - foreach ($Job in @(Get-Job -State 'Completed')) { - $jobResult = Wait-Job -Id $Job.Id | Receive-Job - CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$DupedSymbols) ([ref]$TotalFailures) - Remove-Job -Id $Job.Id - } - Write-Host - } - - foreach ($Job in @(Get-Job)) { - $jobResult = Wait-Job -Id $Job.Id | Receive-Job - CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$DupedSymbols) ([ref]$TotalFailures) - } - - if ($TotalFailures -gt 0 -or $DupedSymbols -gt 0) { - if ($TotalFailures -gt 0) { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures/$TotalPackages packages" - } - - if ($DupedSymbols -gt 0) { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols/$TotalPackages packages had duplicated symbol files and could not be extracted" - } - - ExitWithExitCode 1 - } - else { - Write-Host "All symbols validated!" - } -} - -function InstallDotnetSymbol { - $dotnetSymbolPackageName = 'dotnet-symbol' - - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - $toolList = & "$dotnet" tool list --global - - if (($toolList -like "*$dotnetSymbolPackageName*") -and ($toolList -like "*$dotnetSymbolVersion*")) { - Write-Host "dotnet-symbol version $dotnetSymbolVersion is already installed." - } - else { - Write-Host "Installing dotnet-symbol version $dotnetSymbolVersion..." - Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.' - & "$dotnet" tool install $dotnetSymbolPackageName --version $dotnetSymbolVersion --verbosity "minimal" --global - } -} - -try { - InstallDotnetSymbol - - foreach ($Job in @(Get-Job)) { - Remove-Job -Id $Job.Id - } - - CheckSymbolsAvailable -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/retain-build.ps1 b/src/arcade/eng/common/retain-build.ps1 deleted file mode 100644 index e7ba975ad..000000000 --- a/src/arcade/eng/common/retain-build.ps1 +++ /dev/null @@ -1,45 +0,0 @@ - -Param( -[Parameter(Mandatory=$true)][int] $buildId, -[Parameter(Mandatory=$true)][string] $azdoOrgUri, -[Parameter(Mandatory=$true)][string] $azdoProject, -[Parameter(Mandatory=$true)][string] $token -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -function Get-AzDOHeaders( - [string] $token) -{ - $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) - $headers = @{"Authorization"="Basic $base64AuthInfo"} - return $headers -} - -function Update-BuildRetention( - [string] $azdoOrgUri, - [string] $azdoProject, - [int] $buildId, - [string] $token) -{ - $headers = Get-AzDOHeaders -token $token - $requestBody = "{ - `"keepForever`": `"true`" - }" - - $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" - write-Host "Attempting to retain build using the following URI: ${requestUri} ..." - - try { - Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" - Write-Host "Updated retention settings for build ${buildId}." - } - catch { - Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" - exit 1 - } -} - -Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token -exit 0 diff --git a/src/arcade/eng/common/sdl/NuGet.config b/src/arcade/eng/common/sdl/NuGet.config deleted file mode 100644 index 3849bdb3c..000000000 --- a/src/arcade/eng/common/sdl/NuGet.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 b/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 deleted file mode 100644 index 27f5a4115..000000000 --- a/src/arcade/eng/common/sdl/configure-sdl-tool.ps1 +++ /dev/null @@ -1,130 +0,0 @@ -Param( - [string] $GuardianCliLocation, - [string] $WorkingDirectory, - [string] $TargetDirectory, - [string] $GdnFolder, - # The list of Guardian tools to configure. For each object in the array: - # - If the item is a [hashtable], it must contain these entries: - # - Name = The tool name as Guardian knows it. - # - Scenario = (Optional) Scenario-specific name for this configuration entry. It must be unique - # among all tool entries with the same Name. - # - Args = (Optional) Array of Guardian tool configuration args, like '@("Target > C:\temp")' - # - If the item is a [string] $v, it is treated as '@{ Name="$v" }' - [object[]] $ToolsList, - [string] $GuardianLoggerLevel='Standard', - # Optional: Additional params to add to any tool using CredScan. - [string[]] $CrScanAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using PoliCheck. - [string[]] $PoliCheckAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using CodeQL/Semmle. - [string[]] $CodeQLAdditionalRunConfigParams, - # Optional: Additional params to add to any tool using Binskim. - [string[]] $BinskimAdditionalRunConfigParams -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -$disableConfigureToolsetImport = $true -$global:LASTEXITCODE = 0 - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - # Normalize tools list: all in [hashtable] form with defined values for each key. - $ToolsList = $ToolsList | - ForEach-Object { - if ($_ -is [string]) { - $_ = @{ Name = $_ } - } - - if (-not ($_['Scenario'])) { $_.Scenario = "" } - if (-not ($_['Args'])) { $_.Args = @() } - $_ - } - - Write-Host "List of tools to configure:" - $ToolsList | ForEach-Object { $_ | Out-String | Write-Host } - - # We store config files in the r directory of .gdn - $gdnConfigPath = Join-Path $GdnFolder 'r' - $ValidPath = Test-Path $GuardianCliLocation - - if ($ValidPath -eq $False) - { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." - ExitWithExitCode 1 - } - - foreach ($tool in $ToolsList) { - # Put together the name and scenario to make a unique key. - $toolConfigName = $tool.Name - if ($tool.Scenario) { - $toolConfigName += "_" + $tool.Scenario - } - - Write-Host "=== Configuring $toolConfigName..." - - $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig" - - # For some tools, add default and automatic args. - switch -Exact ($tool.Name) { - 'credscan' { - if ($targetDirectory) { - $tool.Args += "`"TargetDirectory < $TargetDirectory`"" - } - $tool.Args += "`"OutputType < pre`"" - $tool.Args += $CrScanAdditionalRunConfigParams - } - 'policheck' { - if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory`"" - } - $tool.Args += $PoliCheckAdditionalRunConfigParams - } - {$_ -in 'semmle', 'codeql'} { - if ($targetDirectory) { - $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" - } - $tool.Args += $CodeQLAdditionalRunConfigParams - } - 'binskim' { - if ($targetDirectory) { - # Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924. - # We are excluding all `_.pdb` files from the scan. - $tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`"" - } - $tool.Args += $BinskimAdditionalRunConfigParams - } - } - - # Create variable pointing to the args array directly so we can use splat syntax later. - $toolArgs = $tool.Args - - # Configure the tool. If args array is provided or the current tool has some default arguments - # defined, add "--args" and splat each element on the end. Arg format is "{Arg id} < {Value}", - # one per parameter. Doc page for "guardian configure": - # https://dev.azure.com/securitytools/SecurityIntegration/_wiki/wikis/Guardian/1395/configure - Exec-BlockVerbosely { - & $GuardianCliLocation configure ` - --working-directory $WorkingDirectory ` - --tool $tool.Name ` - --output-path $gdnConfigFile ` - --logger-level $GuardianLoggerLevel ` - --noninteractive ` - --force ` - $(if ($toolArgs) { "--args" }) @toolArgs - Exit-IfNZEC "Sdl" - } - - Write-Host "Created '$toolConfigName' configuration file: $gdnConfigFile" - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/execute-all-sdl-tools.ps1 b/src/arcade/eng/common/sdl/execute-all-sdl-tools.ps1 deleted file mode 100644 index 4715d75e9..000000000 --- a/src/arcade/eng/common/sdl/execute-all-sdl-tools.ps1 +++ /dev/null @@ -1,167 +0,0 @@ -Param( - [string] $GuardianPackageName, # Required: the name of guardian CLI package (not needed if GuardianCliLocation is specified) - [string] $NugetPackageDirectory, # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified) - [string] $GuardianCliLocation, # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified - [string] $Repository=$env:BUILD_REPOSITORY_NAME, # Required: the name of the repository (e.g. dotnet/arcade) - [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master - [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located - [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located - [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault - - # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list - # format. - [object[]] $SourceToolsList, - # Optional: list of SDL tools to run on built artifacts. See 'configure-sdl-tool.ps1' for tools - # list format. - [object[]] $ArtifactToolsList, - # Optional: list of SDL tools to run without automatically specifying a target directory. See - # 'configure-sdl-tool.ps1' for tools list format. - [object[]] $CustomToolsList, - - [bool] $TsaPublish=$False, # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH, # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs. - [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME, # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs. - [string] $BuildNumber=$env:BUILD_BUILDNUMBER, # Optional: required for TSA publish; defaults to $(Build.BuildNumber) - [bool] $UpdateBaseline=$False, # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed - [bool] $TsaOnboard=$False, # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs. - [string] $TsaInstanceUrl, # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaCodebaseName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaProjectName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaNotificationEmail, # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs. - [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. - [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. - [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. - [string] $GuardianLoggerLevel='Standard', # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error - [string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1") - [string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1") - [string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1") - [string[]] $BinskimAdditionalRunConfigParams, # Optional: Additional Params to custom build a Binskim run config in the format @("xyz < abc","sdf < 1") - [bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run -) - -try { - $ErrorActionPreference = 'Stop' - Set-StrictMode -Version 2.0 - $disableConfigureToolsetImport = $true - $global:LASTEXITCODE = 0 - - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - #Replace repo names to the format of org/repo - if (!($Repository.contains('/'))) { - $RepoName = $Repository -replace '(.*?)-(.*)', '$1/$2'; - } - else{ - $RepoName = $Repository; - } - - if ($GuardianPackageName) { - $guardianCliLocation = Join-Path $NugetPackageDirectory (Join-Path $GuardianPackageName (Join-Path 'tools' 'guardian.cmd')) - } else { - $guardianCliLocation = $GuardianCliLocation - } - - $workingDirectory = (Split-Path $SourceDirectory -Parent) - $ValidPath = Test-Path $guardianCliLocation - - if ($ValidPath -eq $False) - { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Invalid Guardian CLI Location.' - ExitWithExitCode 1 - } - - Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel - } - $gdnFolder = Join-Path $workingDirectory '.gdn' - - if ($TsaOnboard) { - if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) { - Exec-BlockVerbosely { - & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel - } - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-onboard failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - } else { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Could not onboard to TSA -- not all required values ($TsaCodebaseName, $TsaNotificationEmail, $TsaCodebaseAdmin, $TsaBugAreaPath) were specified.' - ExitWithExitCode 1 - } - } - - # Configure a list of tools with a default target directory. Populates the ".gdn/r" directory. - function Configure-ToolsList([object[]] $tools, [string] $targetDirectory) { - if ($tools -and $tools.Count -gt 0) { - Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'configure-sdl-tool.ps1') ` - -GuardianCliLocation $guardianCliLocation ` - -WorkingDirectory $workingDirectory ` - -TargetDirectory $targetDirectory ` - -GdnFolder $gdnFolder ` - -ToolsList $tools ` - -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` - -GuardianLoggerLevel $GuardianLoggerLevel ` - -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` - -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` - -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams ` - -BinskimAdditionalRunConfigParams $BinskimAdditionalRunConfigParams - if ($BreakOnFailure) { - Exit-IfNZEC "Sdl" - } - } - } - } - - # Configure Artifact and Source tools with default Target directories. - Configure-ToolsList $ArtifactToolsList $ArtifactsDirectory - Configure-ToolsList $SourceToolsList $SourceDirectory - # Configure custom tools with no default Target directory. - Configure-ToolsList $CustomToolsList $null - - # At this point, all tools are configured in the ".gdn" directory. Run them all in a single call. - # (If we used "run" multiple times, each run would overwrite data from earlier runs.) - Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'run-sdl.ps1') ` - -GuardianCliLocation $guardianCliLocation ` - -WorkingDirectory $SourceDirectory ` - -UpdateBaseline $UpdateBaseline ` - -GdnFolder $gdnFolder - } - - if ($TsaPublish) { - if ($TsaBranchName -and $BuildNumber) { - if (-not $TsaRepositoryName) { - $TsaRepositoryName = "$($Repository)-$($BranchName)" - } - Exec-BlockVerbosely { - & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel - } - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-publish failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - } else { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message 'Could not publish to TSA -- not all required values ($TsaBranchName, $BuildNumber) were specified.' - ExitWithExitCode 1 - } - } - - if ($BreakOnFailure) { - Write-Host "Failing the build in case of breaking results..." - Exec-BlockVerbosely { - & $guardianCliLocation break --working-directory $workingDirectory --logger-level $GuardianLoggerLevel - } - } else { - Write-Host "Letting the build pass even if there were breaking results..." - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - exit 1 -} diff --git a/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 b/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 deleted file mode 100644 index 68da4fbf2..000000000 --- a/src/arcade/eng/common/sdl/extract-artifact-archives.ps1 +++ /dev/null @@ -1,63 +0,0 @@ -# This script looks for each archive file in a directory and extracts it into the target directory. -# For example, the file "$InputPath/bin.tar.gz" extracts to "$ExtractPath/bin.tar.gz.extracted/**". -# Uses the "tar" utility added to Windows 10 / Windows 2019 that supports tar.gz and zip. -param( - # Full path to directory where archives are stored. - [Parameter(Mandatory=$true)][string] $InputPath, - # Full path to directory to extract archives into. May be the same as $InputPath. - [Parameter(Mandatory=$true)][string] $ExtractPath -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -$disableConfigureToolsetImport = $true - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - Measure-Command { - $jobs = @() - - # Find archive files for non-Windows and Windows builds. - $archiveFiles = @( - Get-ChildItem (Join-Path $InputPath "*.tar.gz") - Get-ChildItem (Join-Path $InputPath "*.zip") - ) - - foreach ($targzFile in $archiveFiles) { - $jobs += Start-Job -ScriptBlock { - $file = $using:targzFile - $fileName = [System.IO.Path]::GetFileName($file) - $extractDir = Join-Path $using:ExtractPath "$fileName.extracted" - - New-Item $extractDir -ItemType Directory -Force | Out-Null - - Write-Host "Extracting '$file' to '$extractDir'..." - - # Pipe errors to stdout to prevent PowerShell detecting them and quitting the job early. - # This type of quit skips the catch, so we wouldn't be able to tell which file triggered the - # error. Save output so it can be stored in the exception string along with context. - $output = tar -xf $file -C $extractDir 2>&1 - # Handle NZEC manually rather than using Exit-IfNZEC: we are in a background job, so we - # don't have access to the outer scope. - if ($LASTEXITCODE -ne 0) { - throw "Error extracting '$file': non-zero exit code ($LASTEXITCODE). Output: '$output'" - } - - Write-Host "Extracted to $extractDir" - } - } - - Receive-Job $jobs -Wait - } -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 b/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 deleted file mode 100644 index f031ed5b2..000000000 --- a/src/arcade/eng/common/sdl/extract-artifact-packages.ps1 +++ /dev/null @@ -1,82 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where artifact packages are stored - [Parameter(Mandatory=$true)][string] $ExtractPath # Full path to directory where the packages will be extracted -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -$disableConfigureToolsetImport = $true - -function ExtractArtifacts { - if (!(Test-Path $InputPath)) { - Write-Host "Input Path does not exist: $InputPath" - ExitWithExitCode 0 - } - $Jobs = @() - Get-ChildItem "$InputPath\*.nupkg" | - ForEach-Object { - $Jobs += Start-Job -ScriptBlock $ExtractPackage -ArgumentList $_.FullName - } - - foreach ($Job in $Jobs) { - Wait-Job -Id $Job.Id | Receive-Job - } -} - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - $ExtractPackage = { - param( - [string] $PackagePath # Full path to a NuGet package - ) - - if (!(Test-Path $PackagePath)) { - Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath" - ExitWithExitCode 1 - } - - $RelevantExtensions = @('.dll', '.exe', '.pdb') - Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...' - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId - - Add-Type -AssemblyName System.IO.Compression.FileSystem - - [System.IO.Directory]::CreateDirectory($ExtractPath); - - try { - $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) - - $zip.Entries | - Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | - ForEach-Object { - $TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName) - [System.IO.Directory]::CreateDirectory($TargetPath); - - $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile) - } - } - catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 - } - finally { - $zip.Dispose() - } - } - Measure-Command { ExtractArtifacts } -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/init-sdl.ps1 b/src/arcade/eng/common/sdl/init-sdl.ps1 deleted file mode 100644 index 3ac1d92b3..000000000 --- a/src/arcade/eng/common/sdl/init-sdl.ps1 +++ /dev/null @@ -1,55 +0,0 @@ -Param( - [string] $GuardianCliLocation, - [string] $Repository, - [string] $BranchName='master', - [string] $WorkingDirectory, - [string] $AzureDevOpsAccessToken, - [string] $GuardianLoggerLevel='Standard' -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -$disableConfigureToolsetImport = $true -$global:LASTEXITCODE = 0 - -# `tools.ps1` checks $ci to perform some actions. Since the SDL -# scripts don't necessarily execute in the same agent that run the -# build.ps1/sh script this variable isn't automatically set. -$ci = $true -. $PSScriptRoot\..\tools.ps1 - -# Don't display the console progress UI - it's a huge perf hit -$ProgressPreference = 'SilentlyContinue' - -# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file -$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) -$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") -$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0" -$zipFile = "$WorkingDirectory/gdn.zip" - -Add-Type -AssemblyName System.IO.Compression.FileSystem -$gdnFolder = (Join-Path $WorkingDirectory '.gdn') - -try { - # if the folder does not exist, we'll do a guardian init and push it to the remote repository - Write-Host 'Initializing Guardian...' - Write-Host "$GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel" - & $GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Build' -Message "Guardian init failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - # We create the mainbaseline so it can be edited later - Write-Host "$GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline" - & $GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Build' -Message "Guardian baseline failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - ExitWithExitCode 0 -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/run-sdl.ps1 b/src/arcade/eng/common/sdl/run-sdl.ps1 deleted file mode 100644 index 2eac8c78f..000000000 --- a/src/arcade/eng/common/sdl/run-sdl.ps1 +++ /dev/null @@ -1,49 +0,0 @@ -Param( - [string] $GuardianCliLocation, - [string] $WorkingDirectory, - [string] $GdnFolder, - [string] $UpdateBaseline, - [string] $GuardianLoggerLevel='Standard' -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 -$disableConfigureToolsetImport = $true -$global:LASTEXITCODE = 0 - -try { - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - # We store config files in the r directory of .gdn - $gdnConfigPath = Join-Path $GdnFolder 'r' - $ValidPath = Test-Path $GuardianCliLocation - - if ($ValidPath -eq $False) - { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." - ExitWithExitCode 1 - } - - $gdnConfigFiles = Get-ChildItem $gdnConfigPath -Recurse -Include '*.gdnconfig' - Write-Host "Discovered Guardian config files:" - $gdnConfigFiles | Out-String | Write-Host - - Exec-BlockVerbosely { - & $GuardianCliLocation run ` - --working-directory $WorkingDirectory ` - --baseline mainbaseline ` - --update-baseline $UpdateBaseline ` - --logger-level $GuardianLoggerLevel ` - --config @gdnConfigFiles - Exit-IfNZEC "Sdl" - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/sdl/sdl.ps1 b/src/arcade/eng/common/sdl/sdl.ps1 deleted file mode 100644 index 648c5068d..000000000 --- a/src/arcade/eng/common/sdl/sdl.ps1 +++ /dev/null @@ -1,38 +0,0 @@ - -function Install-Gdn { - param( - [Parameter(Mandatory=$true)] - [string]$Path, - - # If omitted, install the latest version of Guardian, otherwise install that specific version. - [string]$Version - ) - - $ErrorActionPreference = 'Stop' - Set-StrictMode -Version 2.0 - $disableConfigureToolsetImport = $true - $global:LASTEXITCODE = 0 - - # `tools.ps1` checks $ci to perform some actions. Since the SDL - # scripts don't necessarily execute in the same agent that run the - # build.ps1/sh script this variable isn't automatically set. - $ci = $true - . $PSScriptRoot\..\tools.ps1 - - $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") - - if ($Version) { - $argumentList += "-Version $Version" - } - - Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait - - $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path - - if (!$gdnCliPath) - { - Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' - } - - return $gdnCliPath.FullName -} \ No newline at end of file diff --git a/src/arcade/eng/common/sdl/trim-assets-version.ps1 b/src/arcade/eng/common/sdl/trim-assets-version.ps1 deleted file mode 100644 index 0daa2a9e9..000000000 --- a/src/arcade/eng/common/sdl/trim-assets-version.ps1 +++ /dev/null @@ -1,75 +0,0 @@ -<# -.SYNOPSIS -Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name. - -.PARAMETER InputPath -Full path to directory where artifact packages are stored - -.PARAMETER Recursive -Search for NuGet packages recursively - -#> - -Param( - [string] $InputPath, - [bool] $Recursive = $true -) - -$CliToolName = "Microsoft.DotNet.VersionTools.Cli" - -function Install-VersionTools-Cli { - param( - [Parameter(Mandatory=$true)][string]$Version - ) - - Write-Host "Installing the package '$CliToolName' with a version of '$version' ..." - $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" - - $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed") - Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait -} - -# ------------------------------------------------------------------- - -if (!(Test-Path $InputPath)) { - Write-Host "Input Path '$InputPath' does not exist" - ExitWithExitCode 1 -} - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -$disableConfigureToolsetImport = $true -$global:LASTEXITCODE = 0 - -# `tools.ps1` checks $ci to perform some actions. Since the SDL -# scripts don't necessarily execute in the same agent that run the -# build.ps1/sh script this variable isn't automatically set. -$ci = $true -. $PSScriptRoot\..\tools.ps1 - -try { - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - - $toolsetVersion = Read-ArcadeSdkVersion - Install-VersionTools-Cli -Version $toolsetVersion - - $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName}) - if ($null -eq $cliToolFound) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed." - ExitWithExitCode 1 - } - - Exec-BlockVerbosely { - & "$dotnet" $CliToolName trim-assets-version ` - --assets-path $InputPath ` - --recursive $Recursive - Exit-IfNZEC "Sdl" - } -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ - ExitWithExitCode 1 -} diff --git a/src/arcade/eng/common/template-guidance.md b/src/arcade/eng/common/template-guidance.md deleted file mode 100644 index 98bbc1ded..000000000 --- a/src/arcade/eng/common/template-guidance.md +++ /dev/null @@ -1,133 +0,0 @@ -# Overview - -Arcade provides templates for public (`/templates`) and 1ES pipeline templates (`/templates-official`) scenarios. Pipelines which are required to be managed by 1ES pipeline templates should reference `/templates-offical`, all other pipelines may reference `/templates`. - -## How to use - -Basic guidance is: - -- 1ES Pipeline Template or 1ES Microbuild template runs should reference `eng/common/templates-official`. Any internal production-graded pipeline should use these templates. - -- All other runs should reference `eng/common/templates`. - -See [azure-pipelines.yml](../../azure-pipelines.yml) (templates-official example) or [azure-pipelines-pr.yml](../../azure-pipelines-pr.yml) (templates example) for examples. - -#### The `templateIs1ESManaged` parameter - -The `templateIs1ESManaged` is available on most templates and affects which of the variants is used for nested templates. See [Development Notes](#development-notes) below for more information on the `templateIs1ESManaged1 parameter. - -- For templates under `job/`, `jobs/`, `steps`, or `post-build/`, this parameter must be explicitly set. - -## Multiple outputs - -1ES pipeline templates impose a policy where every publish artifact execution results in additional security scans being injected into your pipeline. When using `templates-official/jobs/jobs.yml`, Arcade reduces the number of additional security injections by gathering all publishing outputs into the [Build.ArtifactStagingDirectory](https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#build-variables-devops-services), and utilizing the [outputParentDirectory](https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs#multiple-outputs) feature of 1ES pipeline templates. When implementing your pipeline, if you ensure publish artifacts are located in the `$(Build.ArtifactStagingDirectory)`, and utilize the 1ES provided template context, then you can reduce the number of security scans for your pipeline. - -Example: -``` yaml -# azure-pipelines.yml -extends: - template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate - parameters: - stages: - - stage: build - jobs: - - template: /eng/common/templates-official/jobs/jobs.yml@self - parameters: - # 1ES makes use of outputs to reduce security task injection overhead - templateContext: - outputs: - - output: pipelineArtifact - displayName: 'Publish logs from source' - continueOnError: true - condition: always() - targetPath: $(Build.ArtifactStagingDirectory)/artifacts/log - artifactName: Logs - jobs: - - job: Windows - steps: - - script: echo "friendly neighborhood" > artifacts/marvel/spiderman.txt - # copy build outputs to artifact staging directory for publishing - - task: CopyFiles@2 - displayName: Gather build output - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' -``` - -Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). - -## Development notes - -**Folder / file structure** - -``` text -eng\common\ - [templates || templates-official]\ - job\ - job.yml (shim + artifact publishing logic) - onelocbuild.yml (shim) - publish-build-assets.yml (shim) - source-build.yml (shim) - source-index-stage1.yml (shim) - jobs\ - codeql-build.yml (shim) - jobs.yml (shim) - source-build.yml (shim) - post-build\ - post-build.yml (shim) - common-variabls.yml (shim) - setup-maestro-vars.yml (shim) - steps\ - publish-build-artifacts.yml (logic) - publish-pipeline-artifacts.yml (logic) - component-governance.yml (shim) - generate-sbom.yml (shim) - publish-logs.yml (shim) - retain-build.yml (shim) - send-to-helix.yml (shim) - source-build.yml (shim) - variables\ - pool-providers.yml (logic + redirect) # templates/variables/pool-providers.yml will redirect to templates-official/variables/pool-providers.yml if you are running in the internal project - sdl-variables.yml (logic) - core-templates\ - job\ - job.yml (logic) - onelocbuild.yml (logic) - publish-build-assets.yml (logic) - source-build.yml (logic) - source-index-stage1.yml (logic) - jobs\ - codeql-build.yml (logic) - jobs.yml (logic) - source-build.yml (logic) - post-build\ - common-variabls.yml (logic) - post-build.yml (logic) - setup-maestro-vars.yml (logic) - steps\ - component-governance.yml (logic) - generate-sbom.yml (logic) - publish-build-artifacts.yml (redirect) - publish-logs.yml (logic) - publish-pipeline-artifacts.yml (redirect) - retain-build.yml (logic) - send-to-helix.yml (logic) - source-build.yml (logic) - variables\ - pool-providers.yml (redirect) -``` - -In the table above, a file is designated as "shim", "logic", or "redirect". - -- shim - represents a yaml file which is an intermediate step between pipeline logic and .Net Core Engineering's templates (`core-templates`) and defines the `is1ESPipeline` parameter value. - -- logic - represents actual base template logic. - -- redirect- represents a file in `core-templates` which redirects to the "logic" file in either `templates` or `templates-official`. - -Logic for Arcade's templates live **primarily** in the `core-templates` folder. The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates. `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter. If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`. If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`. - -Within `templates` and `templates-official`, the templates at the "stages", and "jobs" / "job" level have been replaced with shims. Templates at the "steps" and "variables" level are typically too granular to be replaced with shims and instead persist logic which is directly applicable to either scenario. - -Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used. In those places, we redirect back to the respective logic file in `templates` or `templates-official`. diff --git a/src/arcade/eng/common/templates-official/job/onelocbuild.yml b/src/arcade/eng/common/templates-official/job/onelocbuild.yml deleted file mode 100644 index 0f0c514b9..000000000 --- a/src/arcade/eng/common/templates-official/job/onelocbuild.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/job/onelocbuild.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/job/publish-build-assets.yml b/src/arcade/eng/common/templates-official/job/publish-build-assets.yml deleted file mode 100644 index d667a70e8..000000000 --- a/src/arcade/eng/common/templates-official/job/publish-build-assets.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/job/publish-build-assets.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/job/source-build.yml b/src/arcade/eng/common/templates-official/job/source-build.yml deleted file mode 100644 index 1a480034b..000000000 --- a/src/arcade/eng/common/templates-official/job/source-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/job/source-build.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/job/source-index-stage1.yml b/src/arcade/eng/common/templates-official/job/source-index-stage1.yml deleted file mode 100644 index 6d5ead316..000000000 --- a/src/arcade/eng/common/templates-official/job/source-index-stage1.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/job/source-index-stage1.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/jobs/codeql-build.yml b/src/arcade/eng/common/templates-official/jobs/codeql-build.yml deleted file mode 100644 index a726322ec..000000000 --- a/src/arcade/eng/common/templates-official/jobs/codeql-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/jobs/codeql-build.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/jobs/jobs.yml b/src/arcade/eng/common/templates-official/jobs/jobs.yml deleted file mode 100644 index 007deddae..000000000 --- a/src/arcade/eng/common/templates-official/jobs/jobs.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/jobs/jobs.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/jobs/source-build.yml b/src/arcade/eng/common/templates-official/jobs/source-build.yml deleted file mode 100644 index 483e7b611..000000000 --- a/src/arcade/eng/common/templates-official/jobs/source-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/jobs/source-build.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/post-build/common-variables.yml b/src/arcade/eng/common/templates-official/post-build/common-variables.yml deleted file mode 100644 index c32fc4923..000000000 --- a/src/arcade/eng/common/templates-official/post-build/common-variables.yml +++ /dev/null @@ -1,8 +0,0 @@ -variables: -- template: /eng/common/core-templates/post-build/common-variables.yml - parameters: - # Specifies whether to use 1ES - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/post-build/post-build.yml b/src/arcade/eng/common/templates-official/post-build/post-build.yml deleted file mode 100644 index 2364c0fd4..000000000 --- a/src/arcade/eng/common/templates-official/post-build/post-build.yml +++ /dev/null @@ -1,8 +0,0 @@ -stages: -- template: /eng/common/core-templates/post-build/post-build.yml - parameters: - # Specifies whether to use 1ES - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/post-build/setup-maestro-vars.yml b/src/arcade/eng/common/templates-official/post-build/setup-maestro-vars.yml deleted file mode 100644 index 024397d87..000000000 --- a/src/arcade/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ /dev/null @@ -1,8 +0,0 @@ -steps: -- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - # Specifies whether to use 1ES - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/steps/component-governance.yml b/src/arcade/eng/common/templates-official/steps/component-governance.yml deleted file mode 100644 index 30bb3985c..000000000 --- a/src/arcade/eng/common/templates-official/steps/component-governance.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/enable-internal-runtimes.yml b/src/arcade/eng/common/templates-official/steps/enable-internal-runtimes.yml deleted file mode 100644 index f9dd238c6..000000000 --- a/src/arcade/eng/common/templates-official/steps/enable-internal-runtimes.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' -# variable with the base64-encoded SAS token, by default -steps: -- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/enable-internal-sources.yml b/src/arcade/eng/common/templates-official/steps/enable-internal-sources.yml deleted file mode 100644 index e6d571822..000000000 --- a/src/arcade/eng/common/templates-official/steps/enable-internal-sources.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/enable-internal-sources.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/steps/generate-sbom.yml b/src/arcade/eng/common/templates-official/steps/generate-sbom.yml deleted file mode 100644 index 9a89a4706..000000000 --- a/src/arcade/eng/common/templates-official/steps/generate-sbom.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/generate-sbom.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/get-delegation-sas.yml b/src/arcade/eng/common/templates-official/steps/get-delegation-sas.yml deleted file mode 100644 index c5a9c1f82..000000000 --- a/src/arcade/eng/common/templates-official/steps/get-delegation-sas.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/get-delegation-sas.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/get-federated-access-token.yml b/src/arcade/eng/common/templates-official/steps/get-federated-access-token.yml deleted file mode 100644 index c8dcf6b81..000000000 --- a/src/arcade/eng/common/templates-official/steps/get-federated-access-token.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/get-federated-access-token.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/steps/publish-logs.yml b/src/arcade/eng/common/templates-official/steps/publish-logs.yml deleted file mode 100644 index 579fd531e..000000000 --- a/src/arcade/eng/common/templates-official/steps/publish-logs.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/publish-logs.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/src/arcade/eng/common/templates-official/steps/publish-pipeline-artifacts.yml deleted file mode 100644 index 172f9f0fd..000000000 --- a/src/arcade/eng/common/templates-official/steps/publish-pipeline-artifacts.yml +++ /dev/null @@ -1,28 +0,0 @@ -parameters: -- name: is1ESPipeline - type: boolean - default: true - -- name: args - type: object - default: {} - -steps: -- ${{ if ne(parameters.is1ESPipeline, true) }}: - - 'eng/common/templates-official cannot be referenced from a non-1ES managed template': error -- task: 1ES.PublishPipelineArtifact@1 - displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }} - ${{ if parameters.args.condition }}: - condition: ${{ parameters.args.condition }} - ${{ else }}: - condition: succeeded() - ${{ if parameters.args.continueOnError }}: - continueOnError: ${{ parameters.args.continueOnError }} - inputs: - targetPath: ${{ parameters.args.targetPath }} - ${{ if parameters.args.artifactName }}: - artifactName: ${{ parameters.args.artifactName }} - ${{ if parameters.args.properties }}: - properties: ${{ parameters.args.properties }} - ${{ if parameters.args.sbomEnabled }}: - sbomEnabled: ${{ parameters.args.sbomEnabled }} diff --git a/src/arcade/eng/common/templates-official/steps/retain-build.yml b/src/arcade/eng/common/templates-official/steps/retain-build.yml deleted file mode 100644 index 559455150..000000000 --- a/src/arcade/eng/common/templates-official/steps/retain-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/retain-build.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/send-to-helix.yml b/src/arcade/eng/common/templates-official/steps/send-to-helix.yml deleted file mode 100644 index 6500f21bf..000000000 --- a/src/arcade/eng/common/templates-official/steps/send-to-helix.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/send-to-helix.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/steps/source-build.yml b/src/arcade/eng/common/templates-official/steps/source-build.yml deleted file mode 100644 index 8f92c49e7..000000000 --- a/src/arcade/eng/common/templates-official/steps/source-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/source-build.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates-official/variables/pool-providers.yml b/src/arcade/eng/common/templates-official/variables/pool-providers.yml deleted file mode 100644 index 1f308b24e..000000000 --- a/src/arcade/eng/common/templates-official/variables/pool-providers.yml +++ /dev/null @@ -1,45 +0,0 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, -# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. - -# Motivation: -# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS -# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing -# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. -# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services -# team needs to move resources around and create new and potentially differently-named pools. Using this template -# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. - -# How to use: -# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). -# If we find alternate naming conventions in broad usage it can be added to the condition below. -# -# First, import the template in an arcade-ified repo to pick up the variables, e.g.: -# -# variables: -# - template: /eng/common/templates-official/variables/pool-providers.yml -# -# ... then anywhere specifying the pool provider use the runtime variables, -# $(DncEngInternalBuildPool) -# -# pool: -# name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022 - -variables: - # Coalesce the target and source branches so we know when a PR targets a release branch - # If these variables are somehow missing, fall back to main (tends to have more capacity) - - # Any new -Svc alternative pools should have variables added here to allow for splitting work - - - name: DncEngInternalBuildPool - value: $[ - replace( - replace( - eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), - True, - 'NetCore1ESPool-Svc-Internal' - ), - False, - 'NetCore1ESPool-Internal' - ) - ] \ No newline at end of file diff --git a/src/arcade/eng/common/templates-official/variables/sdl-variables.yml b/src/arcade/eng/common/templates-official/variables/sdl-variables.yml deleted file mode 100644 index dbdd66d4a..000000000 --- a/src/arcade/eng/common/templates-official/variables/sdl-variables.yml +++ /dev/null @@ -1,7 +0,0 @@ -variables: -# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in -# sync with the packages.config file. -- name: DefaultGuardianVersion - value: 0.109.0 -- name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/src/arcade/eng/common/templates/job/onelocbuild.yml b/src/arcade/eng/common/templates/job/onelocbuild.yml deleted file mode 100644 index ff829dc4c..000000000 --- a/src/arcade/eng/common/templates/job/onelocbuild.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/job/onelocbuild.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/job/publish-build-assets.yml b/src/arcade/eng/common/templates/job/publish-build-assets.yml deleted file mode 100644 index ab2edec2a..000000000 --- a/src/arcade/eng/common/templates/job/publish-build-assets.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/job/publish-build-assets.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/job/source-build.yml b/src/arcade/eng/common/templates/job/source-build.yml deleted file mode 100644 index e44d47b1d..000000000 --- a/src/arcade/eng/common/templates/job/source-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/job/source-build.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/job/source-index-stage1.yml b/src/arcade/eng/common/templates/job/source-index-stage1.yml deleted file mode 100644 index 89f329159..000000000 --- a/src/arcade/eng/common/templates/job/source-index-stage1.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/job/source-index-stage1.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/jobs/codeql-build.yml b/src/arcade/eng/common/templates/jobs/codeql-build.yml deleted file mode 100644 index 517f24d6a..000000000 --- a/src/arcade/eng/common/templates/jobs/codeql-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/jobs/codeql-build.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/jobs/jobs.yml b/src/arcade/eng/common/templates/jobs/jobs.yml deleted file mode 100644 index 388e9037b..000000000 --- a/src/arcade/eng/common/templates/jobs/jobs.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/jobs/jobs.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/jobs/source-build.yml b/src/arcade/eng/common/templates/jobs/source-build.yml deleted file mode 100644 index 818d4c326..000000000 --- a/src/arcade/eng/common/templates/jobs/source-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -jobs: -- template: /eng/common/core-templates/jobs/source-build.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/post-build/common-variables.yml b/src/arcade/eng/common/templates/post-build/common-variables.yml deleted file mode 100644 index 7fa105875..000000000 --- a/src/arcade/eng/common/templates/post-build/common-variables.yml +++ /dev/null @@ -1,8 +0,0 @@ -variables: -- template: /eng/common/core-templates/post-build/common-variables.yml - parameters: - # Specifies whether to use 1ES - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/post-build/post-build.yml b/src/arcade/eng/common/templates/post-build/post-build.yml deleted file mode 100644 index 53ede714b..000000000 --- a/src/arcade/eng/common/templates/post-build/post-build.yml +++ /dev/null @@ -1,8 +0,0 @@ -stages: -- template: /eng/common/core-templates/post-build/post-build.yml - parameters: - # Specifies whether to use 1ES - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/post-build/setup-maestro-vars.yml b/src/arcade/eng/common/templates/post-build/setup-maestro-vars.yml deleted file mode 100644 index a79fab5b4..000000000 --- a/src/arcade/eng/common/templates/post-build/setup-maestro-vars.yml +++ /dev/null @@ -1,8 +0,0 @@ -steps: -- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - # Specifies whether to use 1ES - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/steps/component-governance.yml b/src/arcade/eng/common/templates/steps/component-governance.yml deleted file mode 100644 index c12a5f8d2..000000000 --- a/src/arcade/eng/common/templates/steps/component-governance.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/enable-internal-runtimes.yml b/src/arcade/eng/common/templates/steps/enable-internal-runtimes.yml deleted file mode 100644 index b21a8038c..000000000 --- a/src/arcade/eng/common/templates/steps/enable-internal-runtimes.yml +++ /dev/null @@ -1,10 +0,0 @@ -# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' -# variable with the base64-encoded SAS token, by default - -steps: -- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/enable-internal-sources.yml b/src/arcade/eng/common/templates/steps/enable-internal-sources.yml deleted file mode 100644 index 5f87e9abb..000000000 --- a/src/arcade/eng/common/templates/steps/enable-internal-sources.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/enable-internal-sources.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/steps/generate-sbom.yml b/src/arcade/eng/common/templates/steps/generate-sbom.yml deleted file mode 100644 index 26dc00a2e..000000000 --- a/src/arcade/eng/common/templates/steps/generate-sbom.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/generate-sbom.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/get-delegation-sas.yml b/src/arcade/eng/common/templates/steps/get-delegation-sas.yml deleted file mode 100644 index 83760c979..000000000 --- a/src/arcade/eng/common/templates/steps/get-delegation-sas.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/get-delegation-sas.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/get-federated-access-token.yml b/src/arcade/eng/common/templates/steps/get-federated-access-token.yml deleted file mode 100644 index 31e151d9d..000000000 --- a/src/arcade/eng/common/templates/steps/get-federated-access-token.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/get-federated-access-token.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/steps/publish-logs.yml b/src/arcade/eng/common/templates/steps/publish-logs.yml deleted file mode 100644 index 4ea86bd88..000000000 --- a/src/arcade/eng/common/templates/steps/publish-logs.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/publish-logs.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/publish-pipeline-artifacts.yml b/src/arcade/eng/common/templates/steps/publish-pipeline-artifacts.yml deleted file mode 100644 index 5dd698b21..000000000 --- a/src/arcade/eng/common/templates/steps/publish-pipeline-artifacts.yml +++ /dev/null @@ -1,34 +0,0 @@ -parameters: -- name: is1ESPipeline - type: boolean - default: false - -- name: args - type: object - default: {} - -steps: -- ${{ if eq(parameters.is1ESPipeline, true) }}: - - 'eng/common/templates cannot be referenced from a 1ES managed template': error -- task: PublishPipelineArtifact@1 - displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }} - ${{ if parameters.args.condition }}: - condition: ${{ parameters.args.condition }} - ${{ else }}: - condition: succeeded() - ${{ if parameters.args.continueOnError }}: - continueOnError: ${{ parameters.args.continueOnError }} - inputs: - targetPath: ${{ parameters.args.targetPath }} - ${{ if parameters.args.artifactName }}: - artifactName: ${{ parameters.args.artifactName }} - ${{ if parameters.args.publishLocation }}: - publishLocation: ${{ parameters.args.publishLocation }} - ${{ if parameters.args.fileSharePath }}: - fileSharePath: ${{ parameters.args.fileSharePath }} - ${{ if parameters.args.Parallel }}: - parallel: ${{ parameters.args.Parallel }} - ${{ if parameters.args.parallelCount }}: - parallelCount: ${{ parameters.args.parallelCount }} - ${{ if parameters.args.properties }}: - properties: ${{ parameters.args.properties }} \ No newline at end of file diff --git a/src/arcade/eng/common/templates/steps/retain-build.yml b/src/arcade/eng/common/templates/steps/retain-build.yml deleted file mode 100644 index 8e841ace3..000000000 --- a/src/arcade/eng/common/templates/steps/retain-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/retain-build.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/send-to-helix.yml b/src/arcade/eng/common/templates/steps/send-to-helix.yml deleted file mode 100644 index 39f99fc27..000000000 --- a/src/arcade/eng/common/templates/steps/send-to-helix.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/send-to-helix.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/steps/source-build.yml b/src/arcade/eng/common/templates/steps/source-build.yml deleted file mode 100644 index 23c1d6f4e..000000000 --- a/src/arcade/eng/common/templates/steps/source-build.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/source-build.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/src/arcade/eng/common/templates/variables/pool-providers.yml b/src/arcade/eng/common/templates/variables/pool-providers.yml deleted file mode 100644 index e0b19c14a..000000000 --- a/src/arcade/eng/common/templates/variables/pool-providers.yml +++ /dev/null @@ -1,59 +0,0 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, -# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. - -# Motivation: -# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS -# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing -# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. -# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services -# team needs to move resources around and create new and potentially differently-named pools. Using this template -# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. - -# How to use: -# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). -# If we find alternate naming conventions in broad usage it can be added to the condition below. -# -# First, import the template in an arcade-ified repo to pick up the variables, e.g.: -# -# variables: -# - template: /eng/common/templates/variables/pool-providers.yml -# -# ... then anywhere specifying the pool provider use the runtime variables, -# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.: -# -# pool: -# name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 -variables: - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ else }}: - # Coalesce the target and source branches so we know when a PR targets a release branch - # If these variables are somehow missing, fall back to main (tends to have more capacity) - - # Any new -Svc alternative pools should have variables added here to allow for splitting work - - name: DncEngPublicBuildPool - value: $[ - replace( - replace( - eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), - True, - 'NetCore-Svc-Public' - ), - False, - 'NetCore-Public' - ) - ] - - - name: DncEngInternalBuildPool - value: $[ - replace( - replace( - eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), - True, - 'NetCore1ESPool-Svc-Internal' - ), - False, - 'NetCore1ESPool-Internal' - ) - ] From 15f671c13ed576ad73797cbe89be7c10d9a61fcb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 19 May 2025 19:44:39 +0000 Subject: [PATCH 129/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250519.2 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.6-rtm.25268.3 -> To Version 9.0.6-rtm.25269.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f261d7a4..4fecdea5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms f0fc61ead7dc20cbce05eb81a42089e28c90c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 494b07e6d9b6b6055d944b8b1a61c14e403875b4 + 5a4e2343a2986271c9eec97862c2db4cdd15b08e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 494b07e6d9b6b6055d944b8b1a61c14e403875b4 + 5a4e2343a2986271c9eec97862c2db4cdd15b08e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms f0fc61ead7dc20cbce05eb81a42089e28c90c409 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 494b07e6d9b6b6055d944b8b1a61c14e403875b4 + 5a4e2343a2986271c9eec97862c2db4cdd15b08e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 14074517a..6b2a671a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.6-servicing.25266.5 9.0.6 - 9.0.6-rtm.25268.3 + 9.0.6-rtm.25269.2 From 2160cab8378ce42b8effd93d6f8498b06c4afd40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 02:13:05 +0000 Subject: [PATCH 130/158] [release/9.0] Update dependencies from dotnet/arcade (#5102) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f557e903c..c0845b905 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - c62eeb5b5432f9eaa034fbd641ccd9fd0d928fb3 + 086a1771875b63404b4a710d27250fe384dc2810 diff --git a/eng/Versions.props b/eng/Versions.props index ee297b56a..6ccfe2338 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25266.2 - 9.0.0-beta.25266.2 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 4.5.0 4.9.0 diff --git a/global.json b/global.json index eb79ce09d..53d61981f 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25266.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25266.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25271.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 632b5aa2020279d1bd5af07f509e656a2340d865 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 02:12:48 +0000 Subject: [PATCH 131/158] [release/9.0] Update dependencies from dotnet/arcade (#5124) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 36 ------------------- eng/Version.Details.xml | 24 ++++++------- eng/Versions.props | 4 +-- .../core-templates/post-build/post-build.yml | 6 ++++ eng/common/post-build/publish-using-darc.ps1 | 7 +++- global.json | 4 +-- 6 files changed, 28 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97cda348a..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,8 @@ - - - - - - - - - - - - - - - - - - @@ -43,26 +25,8 @@ - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0845b905..4d4a3786f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 diff --git a/eng/Versions.props b/eng/Versions.props index 6ccfe2338..8a7532674 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 4.5.0 4.9.0 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 454fd75c7..a8c0bd3b9 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -44,6 +44,11 @@ parameters: displayName: Publish installers and checksums type: boolean default: true + + - name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false - name: SDLValidationParameters type: object @@ -312,5 +317,6 @@ stages: -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true + -RequireDefaultChannels ${{ parameters.requireDefaultChannels }} -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 90b58e32a..a261517ef 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -5,7 +5,8 @@ param( [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters + [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, + [Parameter(Mandatory=$false)][string] $RequireDefaultChannels ) try { @@ -33,6 +34,10 @@ try { if ("false" -eq $WaitPublishingFinish) { $optionalParams.Add("--no-wait") | Out-Null } + + if ("true" -eq $RequireDefaultChannels) { + $optionalParams.Add("--default-channels-required") | Out-Null + } & $darc add-build-to-channel ` --id $buildId ` diff --git a/global.json b/global.json index 53d61981f..49d84f43d 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25271.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25302.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From fbfa1cacbe84590123aae02a69c46e9c44a29df5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 4 Jun 2025 09:20:34 -0700 Subject: [PATCH 132/158] Update branding to 9.0.7 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a7532674..e219b44f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 6 + 7 servicing From 73029b43964433010a280af3ef1efc261f36f9e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jun 2025 23:26:41 +0000 Subject: [PATCH 133/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250612.2 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.6-rtm.25269.2 -> To Version 9.0.7-rtm.25312.2 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.6-servicing.25266.5 -> To Version 9.0.7-servicing.25312.5 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 +-- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 112 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9ffbe268..59dbc1a80 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1add7a038..d452bd2b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f0fc61ead7dc20cbce05eb81a42089e28c90c409 + ef2a3107f7abdeb18ac152197e4e6f37f0625f76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5a4e2343a2986271c9eec97862c2db4cdd15b08e + 2f2fe4899318aaf1a6bfab64a90e142addd46487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5a4e2343a2986271c9eec97862c2db4cdd15b08e + 2f2fe4899318aaf1a6bfab64a90e142addd46487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f0fc61ead7dc20cbce05eb81a42089e28c90c409 + ef2a3107f7abdeb18ac152197e4e6f37f0625f76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5a4e2343a2986271c9eec97862c2db4cdd15b08e + 2f2fe4899318aaf1a6bfab64a90e142addd46487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f0fc61ead7dc20cbce05eb81a42089e28c90c409 + ef2a3107f7abdeb18ac152197e4e6f37f0625f76 diff --git a/eng/Versions.props b/eng/Versions.props index cac982d35..29a18762c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.6-servicing.25266.13 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7-servicing.25311.18 + 9.0.7 + 9.0.7 + 9.0.7 5.0.0 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 5.0.0 - 9.0.6 + 9.0.7 5.0.0 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 6.0.0 5.0.0 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 5.0.0 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6-servicing.25266.13 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7-servicing.25311.18 4.10.3 - 9.0.6-servicing.25266.5 - 9.0.6 + 9.0.7-servicing.25312.5 + 9.0.7 - 9.0.6-rtm.25269.2 + 9.0.7-rtm.25312.2 From f79ce5328141d98a374f4e95827fbe7b169138b1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 15:37:17 +0000 Subject: [PATCH 134/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250617.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.7-rtm.25312.2 -> To Version 9.0.7-rtm.25317.1 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.7-servicing.25312.5 -> To Version 9.0.7-servicing.25316.4 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59dbc1a80..a67f88696 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d452bd2b9..3b4bfd315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ef2a3107f7abdeb18ac152197e4e6f37f0625f76 + 839ce1ed3f4e73f8628ba24f48660ecebd99824e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2f2fe4899318aaf1a6bfab64a90e142addd46487 + 7ac13333cf0a6ba33b4be231673080313e752e6a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2f2fe4899318aaf1a6bfab64a90e142addd46487 + 7ac13333cf0a6ba33b4be231673080313e752e6a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ef2a3107f7abdeb18ac152197e4e6f37f0625f76 + 839ce1ed3f4e73f8628ba24f48660ecebd99824e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2f2fe4899318aaf1a6bfab64a90e142addd46487 + 7ac13333cf0a6ba33b4be231673080313e752e6a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ef2a3107f7abdeb18ac152197e4e6f37f0625f76 + 839ce1ed3f4e73f8628ba24f48660ecebd99824e diff --git a/eng/Versions.props b/eng/Versions.props index 29a18762c..591c83df3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 9.0.7 9.0.7 9.0.7 @@ -59,13 +59,13 @@ 9.0.7 9.0.7 9.0.7 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 4.10.3 - 9.0.7-servicing.25312.5 + 9.0.7-servicing.25316.4 9.0.7 - 9.0.7-rtm.25312.2 + 9.0.7-rtm.25317.1 From dc456006306e63d9045f02cbe55cd8516eb5259d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Jun 2025 02:13:39 +0000 Subject: [PATCH 135/158] [release/9.0] Update dependencies from dotnet/arcade (#5162) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/core-templates/job/job.yml | 4 ++++ eng/common/internal/NuGet.config | 3 +++ global.json | 6 +++--- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9ffbe268..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,8 @@ - - @@ -27,10 +25,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2898de899..fbbce9a99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 diff --git a/eng/Versions.props b/eng/Versions.props index 2075e326f..39bf20fa3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 + 9.0.0-beta.25323.2 + 9.0.0-beta.25323.2 4.5.0 4.9.0 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd..abe80a2a0 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 19d3d311b..f70261ed6 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -4,4 +4,7 @@ + + + diff --git a/global.json b/global.json index 49d84f43d..19c1ccc81 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.106" + "dotnet": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25323.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From e4d621b1b9c2a73471b9ef6bbc799526414be546 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Jun 2025 02:13:58 +0000 Subject: [PATCH 136/158] [release/9.0] Update dependencies from dotnet/arcade (#5168) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbbce9a99..7b9754b1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + 13b20849f8294593bf150a801cab639397e6c29d diff --git a/eng/Versions.props b/eng/Versions.props index 39bf20fa3..402e65f54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25323.2 - 9.0.0-beta.25323.2 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 4.5.0 4.9.0 diff --git a/global.json b/global.json index 19c1ccc81..efd5ded01 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25323.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25325.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From cf7cb92b77130771912b67277c05fec3bbffa0f1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 3 Jul 2025 10:28:40 -0700 Subject: [PATCH 137/158] Update branding to 9.0.8 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 402e65f54..e4387e983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 7 + 8 servicing From ac6e9a74d3da1ab82ecda41e5be74c1e8caac83d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 21:52:41 +0000 Subject: [PATCH 138/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250710.3 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.7-rtm.25317.1 -> To Version 9.0.8-rtm.25360.3 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.7-servicing.25316.4 -> To Version 9.0.8-servicing.25360.4 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 +-- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 112 deletions(-) diff --git a/NuGet.config b/NuGet.config index a67f88696..cd67c0c2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc7bc036a..2ec21606c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 839ce1ed3f4e73f8628ba24f48660ecebd99824e + 6d4e5a13ec610b3271c8d6864a7a4f2e7cce91ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7ac13333cf0a6ba33b4be231673080313e752e6a + 0f52b1010b9f0f8ed38bf50711baebcb74b36446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7ac13333cf0a6ba33b4be231673080313e752e6a + 0f52b1010b9f0f8ed38bf50711baebcb74b36446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 839ce1ed3f4e73f8628ba24f48660ecebd99824e + 6d4e5a13ec610b3271c8d6864a7a4f2e7cce91ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7ac13333cf0a6ba33b4be231673080313e752e6a + 0f52b1010b9f0f8ed38bf50711baebcb74b36446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 839ce1ed3f4e73f8628ba24f48660ecebd99824e + 6d4e5a13ec610b3271c8d6864a7a4f2e7cce91ec diff --git a/eng/Versions.props b/eng/Versions.props index 71cef94f5..73ef164c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.7-servicing.25316.16 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8-servicing.25358.20 + 9.0.8 + 9.0.8 + 9.0.8 5.0.0 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 5.0.0 - 9.0.7 + 9.0.8 5.0.0 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 6.0.0 5.0.0 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 5.0.0 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7-servicing.25316.16 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8-servicing.25358.20 4.10.3 - 9.0.7-servicing.25316.4 - 9.0.7 + 9.0.8-servicing.25360.4 + 9.0.8 - 9.0.7-rtm.25317.1 + 9.0.8-rtm.25360.3 From a5b22a0fdedd6274b9e69cb0c4f13aae99949dbc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Jul 2025 18:01:41 +0000 Subject: [PATCH 139/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250715.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.8-rtm.25360.3 -> To Version 9.0.8-rtm.25365.1 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.8-servicing.25360.4 -> To Version 9.0.8-servicing.25364.1 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index cd67c0c2b..efac6a0da 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ec21606c..30229c3c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6d4e5a13ec610b3271c8d6864a7a4f2e7cce91ec + 45b6768a08b566fb02b8a00a81dbfc517925e8b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0f52b1010b9f0f8ed38bf50711baebcb74b36446 + 29823af871df23e77bed56c27e05b2b093953ee5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0f52b1010b9f0f8ed38bf50711baebcb74b36446 + 29823af871df23e77bed56c27e05b2b093953ee5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6d4e5a13ec610b3271c8d6864a7a4f2e7cce91ec + 45b6768a08b566fb02b8a00a81dbfc517925e8b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0f52b1010b9f0f8ed38bf50711baebcb74b36446 + 29823af871df23e77bed56c27e05b2b093953ee5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6d4e5a13ec610b3271c8d6864a7a4f2e7cce91ec + 45b6768a08b566fb02b8a00a81dbfc517925e8b7 diff --git a/eng/Versions.props b/eng/Versions.props index 73ef164c4..6c34c686a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 9.0.8 9.0.8 9.0.8 @@ -59,13 +59,13 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 4.10.3 - 9.0.8-servicing.25360.4 + 9.0.8-servicing.25364.1 9.0.8 - 9.0.8-rtm.25360.3 + 9.0.8-rtm.25365.1 From 7cf4629a4482ab88d5cf83b18651a2b0979a9bcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Jul 2025 02:14:22 +0000 Subject: [PATCH 140/158] [release/9.0] Update dependencies from dotnet/arcade (#5189) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index a67f88696..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,8 @@ - - @@ -27,10 +25,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc7bc036a..87529632e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f diff --git a/eng/Versions.props b/eng/Versions.props index 71cef94f5..4b00c107c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 4.5.0 4.9.0 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22b49e09d..9b3ad8840 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index efd5ded01..1291a57ca 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25366.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From f7c3be105bca5539df98036232c937ab6f36b10c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 22:32:58 +0000 Subject: [PATCH 141/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250718.9 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.8-rtm.25365.1 -> To Version 9.0.8-rtm.25368.9 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.8-servicing.25364.1 -> To Version 9.0.8-servicing.25368.1 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index efac6a0da..35041ae0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99a838d9f..b77db4dd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 45b6768a08b566fb02b8a00a81dbfc517925e8b7 + dfa9922eb72e517011ad36ed7318242bbe9f9005 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 29823af871df23e77bed56c27e05b2b093953ee5 + c83d78f58cbe40d4f5cd847461a233e5c85f5300 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 29823af871df23e77bed56c27e05b2b093953ee5 + c83d78f58cbe40d4f5cd847461a233e5c85f5300 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 45b6768a08b566fb02b8a00a81dbfc517925e8b7 + dfa9922eb72e517011ad36ed7318242bbe9f9005 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 29823af871df23e77bed56c27e05b2b093953ee5 + c83d78f58cbe40d4f5cd847461a233e5c85f5300 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 45b6768a08b566fb02b8a00a81dbfc517925e8b7 + dfa9922eb72e517011ad36ed7318242bbe9f9005 diff --git a/eng/Versions.props b/eng/Versions.props index 84e7cf05c..fe78a842a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 9.0.8 9.0.8 9.0.8 @@ -59,13 +59,13 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 4.10.3 - 9.0.8-servicing.25364.1 + 9.0.8-servicing.25368.1 9.0.8 - 9.0.8-rtm.25365.1 + 9.0.8-rtm.25368.9 From 2cffacfd71a82fe8e4376d6d175ff3d8b8d2ee43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Jul 2025 02:13:42 +0000 Subject: [PATCH 142/158] [release/9.0] Update dependencies from dotnet/arcade (#5208) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87529632e..2b57cb916 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 diff --git a/eng/Versions.props b/eng/Versions.props index 4b00c107c..56c4ec720 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 4.5.0 4.9.0 diff --git a/global.json b/global.json index 1291a57ca..b93d5fce2 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25380.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From a916acadede5d3ab37d960a625ca6f47660e5c90 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 4 Aug 2025 10:41:14 -0700 Subject: [PATCH 143/158] Update branding to 9.0.9 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 56c4ec720..5c4787c9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 8 + 9 servicing From 50e935662527510137d8dbef0e52e31ecb31af52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 02:12:38 +0000 Subject: [PATCH 144/158] [release/9.0] Update dependencies from dotnet/arcade (#5215) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/common/core-templates/job/job.yml | 10 ++++++---- global.json | 4 ++-- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 35041ae0c..39ddd2d32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,13 @@ + + + + @@ -27,9 +31,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 257ed0c42..616c3cab5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + cfad7219713eb776273d540fa1b65f1662fdf241 diff --git a/eng/Versions.props b/eng/Versions.props index c3c767bcf..f51fd0d4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 + 9.0.0-beta.25406.1 + 9.0.0-beta.25406.1 4.5.0 4.9.0 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0..8947ea3f0 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/global.json b/global.json index b93d5fce2..b543b2e41 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25406.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From e36185d81c711982841c857c5e9d4a3be56641ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Aug 2025 02:13:38 +0000 Subject: [PATCH 145/158] [release/9.0] Update dependencies from dotnet/arcade (#5217) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 616c3cab5..77e92a5e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - cfad7219713eb776273d540fa1b65f1662fdf241 + e29823691315ed6b3acff20d5bdf3b0be7628283 diff --git a/eng/Versions.props b/eng/Versions.props index f51fd0d4a..f6d21b81c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25406.1 - 9.0.0-beta.25406.1 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 4.5.0 4.9.0 diff --git a/global.json b/global.json index b543b2e41..581887fdd 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.107" + "dotnet": "9.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25406.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25407.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 94ceefcec814c6a2111b867e40573b45e99c4086 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Wed, 13 Aug 2025 17:46:48 +0000 Subject: [PATCH 146/158] [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf --- NuGet.config | 16 ++--- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 120 deletions(-) diff --git a/NuGet.config b/NuGet.config index 39ddd2d32..8b32e0843 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,14 +9,10 @@ - - - + - - - + @@ -31,14 +27,10 @@ - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77e92a5e4..d8f36fbdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - dfa9922eb72e517011ad36ed7318242bbe9f9005 + bf01a861ada639dedbe15ac4aa5f1b95b98767e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c83d78f58cbe40d4f5cd847461a233e5c85f5300 + 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c83d78f58cbe40d4f5cd847461a233e5c85f5300 + 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - dfa9922eb72e517011ad36ed7318242bbe9f9005 + bf01a861ada639dedbe15ac4aa5f1b95b98767e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c83d78f58cbe40d4f5cd847461a233e5c85f5300 + 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - dfa9922eb72e517011ad36ed7318242bbe9f9005 + bf01a861ada639dedbe15ac4aa5f1b95b98767e9 diff --git a/eng/Versions.props b/eng/Versions.props index f6d21b81c..f1c4ae78c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.8-servicing.25365.11 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9-servicing.25412.11 + 9.0.9 + 9.0.9 + 9.0.9 5.0.0 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 5.0.0 - 9.0.8 + 9.0.9 5.0.0 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 6.0.0 5.0.0 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 5.0.0 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8-servicing.25365.11 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9-servicing.25412.11 4.10.3 - 9.0.8-servicing.25368.1 - 9.0.8 + 9.0.9-servicing.25412.4 + 9.0.9 - 9.0.8-rtm.25368.9 + 9.0.9-rtm.25413.4 From e51239bd25233f6bb009605f73b35679e99ea5cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Aug 2025 02:20:56 +0000 Subject: [PATCH 147/158] [release/9.0] Update dependencies from dotnet/arcade (#5225) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 12 ---------- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 4 ++-- eng/common/SetupNugetSources.ps1 | 4 ++-- eng/common/SetupNugetSources.sh | 4 ++-- eng/common/core-templates/job/job.yml | 8 +++---- eng/common/core-templates/job/onelocbuild.yml | 6 ++--- .../job/publish-build-assets.yml | 10 ++++---- .../job/source-index-stage1.yml | 2 +- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 ++ .../core-templates/post-build/post-build.yml | 8 +++---- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +++++----- .../core-templates/steps/generate-sbom.yml | 2 +- .../core-templates/steps/publish-logs.yml | 14 +++++------ .../core-templates/steps/source-build.yml | 4 ++-- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 ++-- global.json | 4 ++-- 22 files changed, 63 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 39ddd2d32..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,14 +9,8 @@ - - - - - - @@ -31,14 +25,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77e92a5e4..17482bc51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 diff --git a/eng/Versions.props b/eng/Versions.props index f6d21b81c..3df4c40ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 + 9.0.0-beta.25415.3 + 9.0.0-beta.25415.3 4.5.0 4.9.0 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71e..792b60b49 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b0..facb415ca 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 8947ea3f0..8da43d3b5 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -166,7 +166,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -189,7 +189,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -200,7 +200,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -244,7 +244,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 00feec8eb..edefa789d 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -115,7 +115,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' publishLocation: Container artifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e31..b103b7ee1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: is1ESPipeline: '' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -72,7 +74,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -93,7 +95,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net @@ -113,7 +115,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -142,7 +144,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8b833332b..662b9fcce 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -66,7 +66,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index f2144252c..4571a7864 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -25,7 +25,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index ea69be434..3129670b3 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -117,3 +118,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b9..2ee8bbfff 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -149,7 +149,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -206,7 +206,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -256,7 +256,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -311,7 +311,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980d..a7abd58c4 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bff..4085512b6 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 56a090094..7f5b84c4c 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 80788c523..0623ac6e1 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/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 + filePath: $(System.DefaultWorkingDirectory)/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' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/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' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -42,7 +42,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 37133b55b..730f7ab2b 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -97,7 +97,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,5 +126,5 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded..4bf4cf41b 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 817555505..81ea7a261 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a..f1311bbb1 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index d1aeb92fc..5bdd3dd85 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -75,7 +75,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index 581887fdd..57c22826b 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25415.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 6a2c67c869fa924fe4f95a4e9597368a24aab7dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 16 Aug 2025 21:34:12 +0000 Subject: [PATCH 148/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250816.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.9-rtm.25413.4 -> To Version 9.0.9-rtm.25416.1 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.9-servicing.25412.4 -> To Version 9.0.9-servicing.25415.5 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 8 ++-- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b32e0843..791acf66f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 169238e7e..3ff44ead0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf01a861ada639dedbe15ac4aa5f1b95b98767e9 + c0ddfbb0e411edff04fc669eb7d264b17269d312 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 + 5b68f33bac6923c53bc6de197a4783b773c2902d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 + 5b68f33bac6923c53bc6de197a4783b773c2902d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf01a861ada639dedbe15ac4aa5f1b95b98767e9 + c0ddfbb0e411edff04fc669eb7d264b17269d312 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2a4eba0c9316fa9b70a68309df9ea460c4375ac0 + 5b68f33bac6923c53bc6de197a4783b773c2902d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf01a861ada639dedbe15ac4aa5f1b95b98767e9 + c0ddfbb0e411edff04fc669eb7d264b17269d312 diff --git a/eng/Versions.props b/eng/Versions.props index fe8d2e2c9..bcb3ecb91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 9.0.9 9.0.9 9.0.9 @@ -59,13 +59,13 @@ 9.0.9 9.0.9 9.0.9 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 4.10.3 - 9.0.9-servicing.25412.4 + 9.0.9-servicing.25415.5 9.0.9 - 9.0.9-rtm.25413.4 + 9.0.9-rtm.25416.1 From af6c812df45a26f16a569fc2d016b28e4317c4a7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 06:28:08 +0000 Subject: [PATCH 149/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250819.6 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.9-rtm.25416.1 -> To Version 9.0.9-rtm.25419.6 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.Drawing.Common From Version 9.0.9-servicing.25415.5 -> To Version 9.0.9-servicing.25419.1 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 791acf66f..3f6a96006 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,10 @@ + - + @@ -27,10 +28,11 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ff44ead0..e8a54557a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,18 +5,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c0ddfbb0e411edff04fc669eb7d264b17269d312 + 8cf892e88db8bba0e4c185b98f1b1c3d895facdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5b68f33bac6923c53bc6de197a4783b773c2902d + 58037a97726dec46fce4d6dc79da2aecddf2394d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5b68f33bac6923c53bc6de197a4783b773c2902d + 58037a97726dec46fce4d6dc79da2aecddf2394d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -30,13 +30,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c0ddfbb0e411edff04fc669eb7d264b17269d312 + 8cf892e88db8bba0e4c185b98f1b1c3d895facdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5b68f33bac6923c53bc6de197a4783b773c2902d + 58037a97726dec46fce4d6dc79da2aecddf2394d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c0ddfbb0e411edff04fc669eb7d264b17269d312 + 8cf892e88db8bba0e4c185b98f1b1c3d895facdf diff --git a/eng/Versions.props b/eng/Versions.props index bcb3ecb91..2c9b1baa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ 4.10.3 - 9.0.9-servicing.25415.5 + 9.0.9-servicing.25419.1 9.0.9 - 9.0.9-rtm.25416.1 + 9.0.9-rtm.25419.6 From ba51c8f44c510a0abc1df54bb2e93c39ee063566 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 08:50:47 +0000 Subject: [PATCH 150/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250820.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.9-rtm.25416.1 -> To Version 9.0.9-rtm.25420.1 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 9.0.9-servicing.25415.5 -> To Version 9.0.9-servicing.25419.3 (parent: Microsoft.DotNet.Wpf.GitHub --- NuGet.config | 10 ++--- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 8 ++-- 3 files changed, 52 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3f6a96006..1798d7cad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,10 @@ - - + - + @@ -28,11 +27,10 @@ - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8a54557a..c6b07983a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8cf892e88db8bba0e4c185b98f1b1c3d895facdf + 9dc841c74ab937e3a19c3d81590136067b3a15ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 58037a97726dec46fce4d6dc79da2aecddf2394d + df6b4533527d8d606ee46ab26b2d64354da1a99a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 58037a97726dec46fce4d6dc79da2aecddf2394d + df6b4533527d8d606ee46ab26b2d64354da1a99a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8cf892e88db8bba0e4c185b98f1b1c3d895facdf + 9dc841c74ab937e3a19c3d81590136067b3a15ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 58037a97726dec46fce4d6dc79da2aecddf2394d + df6b4533527d8d606ee46ab26b2d64354da1a99a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8cf892e88db8bba0e4c185b98f1b1c3d895facdf + 9dc841c74ab937e3a19c3d81590136067b3a15ed diff --git a/eng/Versions.props b/eng/Versions.props index 2c9b1baa7..45d4449e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 6.2.4 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 9.0.9 9.0.9 9.0.9 @@ -59,13 +59,13 @@ 9.0.9 9.0.9 9.0.9 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 4.10.3 - 9.0.9-servicing.25419.1 + 9.0.9-servicing.25419.3 9.0.9 - 9.0.9-rtm.25419.6 + 9.0.9-rtm.25420.1 From 82ed4b9a7c1a84a5ed9f2e165b966004fd369fbf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 21 Aug 2025 19:32:23 +0000 Subject: [PATCH 151/158] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf build 20250821.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.9-rtm.25420.1 -> To Version 9.0.9-rtm.25421.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6b07983a..69d8d5db0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 9dc841c74ab937e3a19c3d81590136067b3a15ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df6b4533527d8d606ee46ab26b2d64354da1a99a + 56176690719670a63582850619ed7d33e13083e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df6b4533527d8d606ee46ab26b2d64354da1a99a + 56176690719670a63582850619ed7d33e13083e3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -34,9 +34,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 9dc841c74ab937e3a19c3d81590136067b3a15ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df6b4533527d8d606ee46ab26b2d64354da1a99a + 56176690719670a63582850619ed7d33e13083e3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 45d4449e9..edcf79460 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,6 +66,6 @@ 9.0.9-servicing.25419.3 9.0.9 - 9.0.9-rtm.25420.1 + 9.0.9-rtm.25421.1 From e26fd6e22d3a1289296728e7271fed81b148774a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Aug 2025 02:14:22 +0000 Subject: [PATCH 152/158] [release/9.0] Update dependencies from dotnet/arcade (#5239) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 4 ++-- .../core-templates/job/source-build.yml | 4 ++++ .../core-templates/jobs/source-build.yml | 5 ++++ .../core-templates/steps/source-build.yml | 9 ++++++- global.json | 4 ++-- 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17482bc51..87482f349 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc diff --git a/eng/Versions.props b/eng/Versions.props index 3df4c40ff..3df50c54f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25415.3 - 9.0.0-beta.25415.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 4.5.0 4.9.0 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d47f09d58..5baedac1e 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -33,6 +33,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -93,3 +96,4 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} platform: ${{ parameters.platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee..0b408a67b 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -47,6 +50,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -55,4 +59,5 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 730f7ab2b..0718e4ba9 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -11,6 +11,10 @@ parameters: # for details. The entire object is described in the 'job' template for simplicity, even though # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: false steps: @@ -126,5 +130,8 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/global.json b/global.json index 57c22826b..5ff6d0296 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25415.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25428.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 9dab6d71347a2726e2a9a0f654b2f1b4bfec397b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Sep 2025 09:36:11 -0700 Subject: [PATCH 153/158] Update branding to 9.0.10 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3df50c54f..9df4f3e69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 0 - 9 + 10 servicing From 548692397eff1cfedb6486f5e00872f61efbce02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 19:45:15 +0000 Subject: [PATCH 154/158] [release/9.0] Update dependencies from dotnet/arcade (#5258) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 6 +++--- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1798d7cad..a622bd083 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,17 @@ + + + + + + + + @@ -27,9 +35,17 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 338540485..968313e50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 diff --git a/eng/Versions.props b/eng/Versions.props index 2c9f580dc..51d79c950 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 4.5.0 4.9.0 diff --git a/global.json b/global.json index 5ff6d0296..e51de39cb 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.109" + "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25428.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25460.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From f7f8937f46b4347b701368efe76ef9086dbd3396 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Sep 2025 02:21:32 +0000 Subject: [PATCH 155/158] [release/9.0] Update dependencies from dotnet/arcade (#5260) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 4 ++-- .../job/publish-build-assets.yml | 9 ++++++- eng/common/core-templates/jobs/jobs.yml | 2 ++ global.json | 4 ++-- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 968313e50..cdf56b0c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 diff --git a/eng/Versions.props b/eng/Versions.props index 51d79c950..989a57673 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 4.5.0 4.9.0 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b103b7ee1..a58c8a418 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -34,6 +34,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -56,6 +58,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -100,7 +107,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 3129670b3..bf33cdc2c 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -44,6 +44,7 @@ parameters: artifacts: {} is1ESPipeline: '' repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -119,3 +120,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index e51de39cb..b97c6daf5 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25460.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25462.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 27023b4e8905b355653f75c5bbc9e714b8562125 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 02:16:15 +0000 Subject: [PATCH 156/158] [release/9.0] Update dependencies from dotnet/arcade (#5272) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 20 -------------------- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index a622bd083..2b9f84f81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,18 +9,8 @@ - - - - - - - - - - @@ -35,18 +25,8 @@ - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdf56b0c6..3ec2d18bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 diff --git a/eng/Versions.props b/eng/Versions.props index 989a57673..e5f598859 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 4.5.0 4.9.0 diff --git a/global.json b/global.json index b97c6daf5..d6c0724c5 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25465.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 90693a8bfbf13f41ad47c8a3e5952d625ce67e92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Sep 2025 21:15:07 +0000 Subject: [PATCH 157/158] [release/9.0] Update dependencies from dotnet/arcade (#5281) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ec2d18bc..11dd993d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 diff --git a/eng/Versions.props b/eng/Versions.props index e5f598859..b7fe7884a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 4.5.0 4.9.0 diff --git a/global.json b/global.json index d6c0724c5..3d371df50 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25465.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25473.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 7b3ca98575276548f73f073c8e819395b5fb314f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 18:45:36 +0000 Subject: [PATCH 158/158] [release/9.0] Update dependencies from dotnet/arcade (#5292) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11dd993d3..9444e61cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,29 +152,29 @@ - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c diff --git a/eng/Versions.props b/eng/Versions.props index b7fe7884a..ae43af8ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,8 +12,8 @@ - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 4.5.0 4.9.0 diff --git a/global.json b/global.json index 3d371df50..5d6fd1d9f 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25473.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25475.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25475.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }