From 72f31d2b601b26bf5b064b521c77eeaba5393d40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Apr 2021 17:39:24 +0000 Subject: [PATCH 01/18] Update dependencies from https://github.com/dotnet/sdk build 20210406.2 (#10161) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21203.3 to 6.0.0-preview.4.21206.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21203.3 to 6.0.0-preview.4.21206.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21205.1 to 6.0.0-preview.4.21205.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21205.1 to 6.0.0-preview.4.21205.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21205.1 to 6.0.0-preview.4.21205.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21205.1 to 6.0.0-preview.4.21205.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21205.1 to 6.0.0-preview.4.21205.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21205.1 to 6.0.0-preview.4.21205.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21203.3 to 6.0.0-preview.4.21206.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21203.1 to 6.0.0-preview.4.21205.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21203.3 to 6.0.0-preview.4.21206.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21203.2 to 6.0.0-preview.4.21205.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Build: from 16.10.0-preview-21202-06 to 16.10.0-preview-21205-05 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec771fb88..e2e0433e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 7c5d76161f3bb271371a92f307fa809fcdd4db73 + 07effc3d86ea2b1e47f620e458f76576e3d12875 - + https://github.com/dotnet/windowsdesktop - 7c5d76161f3bb271371a92f307fa809fcdd4db73 + 07effc3d86ea2b1e47f620e458f76576e3d12875 - + https://github.com/dotnet/windowsdesktop - 7c5d76161f3bb271371a92f307fa809fcdd4db73 + 07effc3d86ea2b1e47f620e458f76576e3d12875 - + https://github.com/dotnet/runtime - 95201492e7665c7f21faf42e9d544396ff714497 + b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/runtime - 95201492e7665c7f21faf42e9d544396ff714497 + b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/runtime - 95201492e7665c7f21faf42e9d544396ff714497 + b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/runtime - 95201492e7665c7f21faf42e9d544396ff714497 + b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/runtime - 95201492e7665c7f21faf42e9d544396ff714497 + b7a164882573af99eaf200c4b21808ecaf6dbb8c @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 95201492e7665c7f21faf42e9d544396ff714497 + b7a164882573af99eaf200c4b21808ecaf6dbb8c https://github.com/dotnet/aspnetcore @@ -83,22 +83,22 @@ https://github.com/dotnet/templating b84b5c45de37fa5cbd80240b1c915329d218a66f - + https://github.com/dotnet/sdk - f645b6e72718568fe415d2309d71026c80580f90 + 6a908fd58c413e53d3ad398fdba3aea68fe686be - + https://github.com/dotnet/sdk - f645b6e72718568fe415d2309d71026c80580f90 + 6a908fd58c413e53d3ad398fdba3aea68fe686be - + https://github.com/dotnet/winforms - cf909def8e4f4d5a9ab71d4f26ef62288cb9fece + 9073ca4669eb40ca6a6a8fc1bf8d62cd7e520c07 - + https://github.com/dotnet/wpf - e19c3a756ea7bcd4604a7399a56444a5f137e899 + 326787fae7e9cc1fff30acfba47973e3b5397f74 https://github.com/dotnet/fsharp @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn e26948464c97d85aebc21c69142794e4a263f0df - + https://github.com/dotnet/msbuild - 1cfebe4dd3b1bb26bbf76128ff5f9270b6c090bb + 7804350cd4fe271bee48b3dc99e9f4681ee686c5 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 06818f947..55d9bc28a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.4.21203.1 + 6.0.0-preview.4.21205.2 - 6.0.0-preview.4.21203.2 + 6.0.0-preview.4.21205.2 @@ -57,30 +57,30 @@ - 6.0.100-preview.4.21206.1 - 6.0.100-preview.4.21206.1 + 6.0.100-preview.4.21206.2 + 6.0.100-preview.4.21206.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.4.21205.1 + 6.0.0-preview.4.21205.3 - 6.0.0-preview.4.21205.1 - 6.0.0-preview.4.21205.1 - 6.0.0-preview.4.21205.1 - 6.0.0-preview.4.21205.1 - 6.0.0-preview.4.21205.1 + 6.0.0-preview.4.21205.3 + 6.0.0-preview.4.21205.3 + 6.0.0-preview.4.21205.3 + 6.0.0-preview.4.21205.3 + 6.0.0-preview.4.21205.3 2.1.0 - 6.0.0-preview.4.21203.3 - 6.0.0-preview.4.21203.3 - 6.0.0-preview.4.21203.3 + 6.0.0-preview.4.21206.1 + 6.0.0-preview.4.21206.1 + 6.0.0-preview.4.21206.1 From 218602e9fb66083f3b0c553fd4eeaf92ab86cc9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 02:22:39 +0000 Subject: [PATCH 02/18] [main] Update dependencies from dotnet/sdk (#10165) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21205.8 to 6.0.0-preview.4.21206.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21205.8 to 6.0.0-preview.4.21206.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21205.8 to 6.0.0-preview.4.21206.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21205.8 to 6.0.0-preview.4.21206.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.4.21205.8 to 6.0.0-preview.4.21206.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.4.21205.8 to 6.0.0-preview.4.21206.10 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21206.1 to 6.0.100-preview.4.21206.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21205.2 to 6.0.100-preview.2.21206.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21205.4 to 3.10.0-3.21206.16 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2e0433e8..26297d250 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/aspnetcore - d4f1805a915cc0a931e6cbd0574f3ae331ada7e6 + 5de9b7da106cb282126934acc0ebc652602808e5 - + https://github.com/dotnet/aspnetcore - d4f1805a915cc0a931e6cbd0574f3ae331ada7e6 + 5de9b7da106cb282126934acc0ebc652602808e5 - + https://github.com/dotnet/aspnetcore - d4f1805a915cc0a931e6cbd0574f3ae331ada7e6 + 5de9b7da106cb282126934acc0ebc652602808e5 - + https://github.com/dotnet/aspnetcore - d4f1805a915cc0a931e6cbd0574f3ae331ada7e6 + 5de9b7da106cb282126934acc0ebc652602808e5 - + https://github.com/dotnet/aspnetcore - d4f1805a915cc0a931e6cbd0574f3ae331ada7e6 + 5de9b7da106cb282126934acc0ebc652602808e5 - + https://github.com/dotnet/aspnetcore - d4f1805a915cc0a931e6cbd0574f3ae331ada7e6 + 5de9b7da106cb282126934acc0ebc652602808e5 https://github.com/dotnet/test-templates @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates a17e4bdbd6aeab998156ab8cb15b0ddc31517612 - + https://github.com/dotnet/templating - b84b5c45de37fa5cbd80240b1c915329d218a66f + e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - 6a908fd58c413e53d3ad398fdba3aea68fe686be + 9f0885bc8257b194da4c206668bca317df248218 - + https://github.com/dotnet/sdk - 6a908fd58c413e53d3ad398fdba3aea68fe686be + 9f0885bc8257b194da4c206668bca317df248218 @@ -108,14 +108,14 @@ https://github.com/microsoft/vstest bdf1629e12c05a5fd17bf7de48e7e50a8f739170 - + https://github.com/mono/linker - 388fef00320370785b08bbc42dda4a87f3fa38ab + 2674d7d0c36159aa1aec2fb0a53fffecf50e5780 linker - + https://github.com/dotnet/roslyn - e26948464c97d85aebc21c69142794e4a263f0df + d9b764f9995c022607b707dc3cd4c0f5be1ea476 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 55d9bc28a..1a03878c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.4.21206.1 + 6.0.100-preview.4.21206.2 @@ -45,20 +45,20 @@ - 6.0.0-preview.4.21205.8 - 6.0.0-preview.4.21205.8 - 6.0.0-preview.4.21205.8 - 6.0.0-preview.4.21205.8 - 6.0.0-preview.4.21205.8 - 6.0.0-preview.4.21205.8 + 6.0.0-preview.4.21206.10 + 6.0.0-preview.4.21206.10 + 6.0.0-preview.4.21206.10 + 6.0.0-preview.4.21206.10 + 6.0.0-preview.4.21206.10 + 6.0.0-preview.4.21206.10 0.2.0 - 6.0.100-preview.4.21206.2 - 6.0.100-preview.4.21206.2 + 6.0.100-preview.4.21206.9 + 6.0.100-preview.4.21206.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 149e1e1eadb17d531550a9e86c8271b2206be872 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 03:14:35 +0000 Subject: [PATCH 03/18] Update dependencies from https://github.com/dotnet/sdk build 20210406.11 (#10172) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21206.16 to 3.10.0-3.21206.28 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26297d250..3e66198f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - 9f0885bc8257b194da4c206668bca317df248218 + 3edd1f5310a291f99e1fdf1706637219c4f46856 - + https://github.com/dotnet/sdk - 9f0885bc8257b194da4c206668bca317df248218 + 3edd1f5310a291f99e1fdf1706637219c4f46856 @@ -113,9 +113,9 @@ 2674d7d0c36159aa1aec2fb0a53fffecf50e5780 linker - + https://github.com/dotnet/roslyn - d9b764f9995c022607b707dc3cd4c0f5be1ea476 + 18f97263f22775e97baf6323d6449ec896873856 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 1a03878c2..b6cb52bac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.4.21206.9 - 6.0.100-preview.4.21206.9 + 6.0.100-preview.4.21206.11 + 6.0.100-preview.4.21206.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bd832b7435a59b980389dd0731df15fdc4f29292 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 04:14:39 +0000 Subject: [PATCH 04/18] Update dependencies from https://github.com/dotnet/sdk build 20210406.12 (#10173) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21206.10 to 6.0.0-preview.4.21206.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21206.10 to 6.0.0-preview.4.21206.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21206.10 to 6.0.0-preview.4.21206.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21206.10 to 6.0.0-preview.4.21206.13 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.4.21206.10 to 6.0.0-preview.4.21206.13 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.4.21206.10 to 6.0.0-preview.4.21206.13 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e66198f6..d860bdb9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/aspnetcore - 5de9b7da106cb282126934acc0ebc652602808e5 + b700636c329dac8734e6d0b86734ed9dd9d17795 - + https://github.com/dotnet/aspnetcore - 5de9b7da106cb282126934acc0ebc652602808e5 + b700636c329dac8734e6d0b86734ed9dd9d17795 - + https://github.com/dotnet/aspnetcore - 5de9b7da106cb282126934acc0ebc652602808e5 + b700636c329dac8734e6d0b86734ed9dd9d17795 - + https://github.com/dotnet/aspnetcore - 5de9b7da106cb282126934acc0ebc652602808e5 + b700636c329dac8734e6d0b86734ed9dd9d17795 - + https://github.com/dotnet/aspnetcore - 5de9b7da106cb282126934acc0ebc652602808e5 + b700636c329dac8734e6d0b86734ed9dd9d17795 - + https://github.com/dotnet/aspnetcore - 5de9b7da106cb282126934acc0ebc652602808e5 + b700636c329dac8734e6d0b86734ed9dd9d17795 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - 3edd1f5310a291f99e1fdf1706637219c4f46856 + 76c15d3808a11d94970390c74391852d3672b278 - + https://github.com/dotnet/sdk - 3edd1f5310a291f99e1fdf1706637219c4f46856 + 76c15d3808a11d94970390c74391852d3672b278 diff --git a/eng/Versions.props b/eng/Versions.props index b6cb52bac..ff7797023 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.4.21206.10 - 6.0.0-preview.4.21206.10 - 6.0.0-preview.4.21206.10 - 6.0.0-preview.4.21206.10 - 6.0.0-preview.4.21206.10 - 6.0.0-preview.4.21206.10 + 6.0.0-preview.4.21206.13 + 6.0.0-preview.4.21206.13 + 6.0.0-preview.4.21206.13 + 6.0.0-preview.4.21206.13 + 6.0.0-preview.4.21206.13 + 6.0.0-preview.4.21206.13 0.2.0 - 6.0.100-preview.4.21206.11 - 6.0.100-preview.4.21206.11 + 6.0.100-preview.4.21206.12 + 6.0.100-preview.4.21206.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7e260aa97befa15974ad9689ad84a4cf9bf7617a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 08:07:58 +0000 Subject: [PATCH 05/18] Update dependencies from https://github.com/dotnet/sdk build 20210406.15 (#10175) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21206.13 to 6.0.0-preview.4.21206.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21206.13 to 6.0.0-preview.4.21206.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21206.13 to 6.0.0-preview.4.21206.14 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21206.13 to 6.0.0-preview.4.21206.14 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.4.21206.13 to 6.0.0-preview.4.21206.14 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.4.21206.13 to 6.0.0-preview.4.21206.14 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d860bdb9c..102329cf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/aspnetcore - b700636c329dac8734e6d0b86734ed9dd9d17795 + 1114081f256cb0d724118a1bf39e390ebba19dda - + https://github.com/dotnet/aspnetcore - b700636c329dac8734e6d0b86734ed9dd9d17795 + 1114081f256cb0d724118a1bf39e390ebba19dda - + https://github.com/dotnet/aspnetcore - b700636c329dac8734e6d0b86734ed9dd9d17795 + 1114081f256cb0d724118a1bf39e390ebba19dda - + https://github.com/dotnet/aspnetcore - b700636c329dac8734e6d0b86734ed9dd9d17795 + 1114081f256cb0d724118a1bf39e390ebba19dda - + https://github.com/dotnet/aspnetcore - b700636c329dac8734e6d0b86734ed9dd9d17795 + 1114081f256cb0d724118a1bf39e390ebba19dda - + https://github.com/dotnet/aspnetcore - b700636c329dac8734e6d0b86734ed9dd9d17795 + 1114081f256cb0d724118a1bf39e390ebba19dda https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - 76c15d3808a11d94970390c74391852d3672b278 + d4c85bf5b892b0c1fe2fd13178d5e893a5e9b312 - + https://github.com/dotnet/sdk - 76c15d3808a11d94970390c74391852d3672b278 + d4c85bf5b892b0c1fe2fd13178d5e893a5e9b312 diff --git a/eng/Versions.props b/eng/Versions.props index ff7797023..5085ca5bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.4.21206.13 - 6.0.0-preview.4.21206.13 - 6.0.0-preview.4.21206.13 - 6.0.0-preview.4.21206.13 - 6.0.0-preview.4.21206.13 - 6.0.0-preview.4.21206.13 + 6.0.0-preview.4.21206.14 + 6.0.0-preview.4.21206.14 + 6.0.0-preview.4.21206.14 + 6.0.0-preview.4.21206.14 + 6.0.0-preview.4.21206.14 + 6.0.0-preview.4.21206.14 0.2.0 - 6.0.100-preview.4.21206.12 - 6.0.100-preview.4.21206.12 + 6.0.100-preview.4.21206.15 + 6.0.100-preview.4.21206.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b3b5649ea152126aea7029bce91da93a32853b13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 21:32:30 +0000 Subject: [PATCH 06/18] [main] Update dependencies from dotnet/sdk (#10176) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21206.1 to 6.0.0-preview.4.21206.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21206.1 to 6.0.0-preview.4.21206.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21206.14 to 6.0.0-preview.4.21207.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21206.14 to 6.0.0-preview.4.21207.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21206.14 to 6.0.0-preview.4.21207.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21206.14 to 6.0.0-preview.4.21207.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.4.21206.14 to 6.0.0-preview.4.21207.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.4.21206.14 to 6.0.0-preview.4.21207.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.1 to 6.0.0-preview.4.21206.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.1 to 6.0.0-preview.4.21206.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21205.2 to 6.0.0-preview.4.21206.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 102329cf7..75de445b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 07effc3d86ea2b1e47f620e458f76576e3d12875 + 4874021fd9472ced543d30e80496b33668895572 - + https://github.com/dotnet/windowsdesktop - 07effc3d86ea2b1e47f620e458f76576e3d12875 + 4874021fd9472ced543d30e80496b33668895572 - + https://github.com/dotnet/windowsdesktop - 07effc3d86ea2b1e47f620e458f76576e3d12875 + 4874021fd9472ced543d30e80496b33668895572 https://github.com/dotnet/runtime @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/aspnetcore - 1114081f256cb0d724118a1bf39e390ebba19dda + 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d - + https://github.com/dotnet/aspnetcore - 1114081f256cb0d724118a1bf39e390ebba19dda + 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d - + https://github.com/dotnet/aspnetcore - 1114081f256cb0d724118a1bf39e390ebba19dda + 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d - + https://github.com/dotnet/aspnetcore - 1114081f256cb0d724118a1bf39e390ebba19dda + 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d - + https://github.com/dotnet/aspnetcore - 1114081f256cb0d724118a1bf39e390ebba19dda + 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d - + https://github.com/dotnet/aspnetcore - 1114081f256cb0d724118a1bf39e390ebba19dda + 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d https://github.com/dotnet/test-templates @@ -83,22 +83,22 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - d4c85bf5b892b0c1fe2fd13178d5e893a5e9b312 + f2d3af5115b34e0b82d5e3a94758c1f273c45b25 - + https://github.com/dotnet/sdk - d4c85bf5b892b0c1fe2fd13178d5e893a5e9b312 + f2d3af5115b34e0b82d5e3a94758c1f273c45b25 https://github.com/dotnet/winforms 9073ca4669eb40ca6a6a8fc1bf8d62cd7e520c07 - + https://github.com/dotnet/wpf - 326787fae7e9cc1fff30acfba47973e3b5397f74 + ffef664280b799b78a2ad271395ceb99b2fbdeca https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5085ca5bd..ec1653322 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 6.0.0-preview.4.21205.2 + 6.0.0-preview.4.21206.1 @@ -45,20 +45,20 @@ - 6.0.0-preview.4.21206.14 - 6.0.0-preview.4.21206.14 - 6.0.0-preview.4.21206.14 - 6.0.0-preview.4.21206.14 - 6.0.0-preview.4.21206.14 - 6.0.0-preview.4.21206.14 + 6.0.0-preview.4.21207.1 + 6.0.0-preview.4.21207.1 + 6.0.0-preview.4.21207.1 + 6.0.0-preview.4.21207.1 + 6.0.0-preview.4.21207.1 + 6.0.0-preview.4.21207.1 0.2.0 - 6.0.100-preview.4.21206.15 - 6.0.100-preview.4.21206.15 + 6.0.100-preview.4.21207.6 + 6.0.100-preview.4.21207.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.4.21206.1 - 6.0.0-preview.4.21206.1 - 6.0.0-preview.4.21206.1 + 6.0.0-preview.4.21206.2 + 6.0.0-preview.4.21206.2 + 6.0.0-preview.4.21206.2 From 277acabb460859373062b0beb381dfefd9eeab4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 22:44:10 +0000 Subject: [PATCH 07/18] Update dependencies from https://github.com/dotnet/sdk build 20210407.8 (#10177) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21206.1 to 6.0.100-preview.2.21207.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75de445b9..5bf0c9b90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - f2d3af5115b34e0b82d5e3a94758c1f273c45b25 + 2c8e60c0280ef9a1f95fe6b765dac5c0c99fefb9 - + https://github.com/dotnet/sdk - f2d3af5115b34e0b82d5e3a94758c1f273c45b25 + 2c8e60c0280ef9a1f95fe6b765dac5c0c99fefb9 @@ -108,9 +108,9 @@ https://github.com/microsoft/vstest bdf1629e12c05a5fd17bf7de48e7e50a8f739170 - + https://github.com/mono/linker - 2674d7d0c36159aa1aec2fb0a53fffecf50e5780 + 55bd0ebd00ddbf2cd817314b1cf6824003cfb463 linker diff --git a/eng/Versions.props b/eng/Versions.props index ec1653322..d0aca6c0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.4.21207.6 - 6.0.100-preview.4.21207.6 + 6.0.100-preview.4.21207.8 + 6.0.100-preview.4.21207.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 391ef243b335c0fb1acb426fe1afba721ee2cfe7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 01:06:09 +0000 Subject: [PATCH 08/18] [main] Update dependencies from dotnet/sdk (#10179) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21206.28 to 3.10.0-3.21207.12 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bf0c9b90..cfd772dd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - 2c8e60c0280ef9a1f95fe6b765dac5c0c99fefb9 + 40f28f2de8dac1b2297a73b072dbc08f27a181a6 - + https://github.com/dotnet/sdk - 2c8e60c0280ef9a1f95fe6b765dac5c0c99fefb9 + 40f28f2de8dac1b2297a73b072dbc08f27a181a6 @@ -113,9 +113,9 @@ 55bd0ebd00ddbf2cd817314b1cf6824003cfb463 linker - + https://github.com/dotnet/roslyn - 18f97263f22775e97baf6323d6449ec896873856 + fd9b249bf2f1dfdb9531ae86ab0154472c7723b2 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index d0aca6c0d..6ad38135b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.4.21207.8 - 6.0.100-preview.4.21207.8 + 6.0.100-preview.4.21207.12 + 6.0.100-preview.4.21207.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From de80bdc771d354857eb8711cad8c6433c905ccdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 02:07:08 +0000 Subject: [PATCH 09/18] [main] Update dependencies from dotnet/sdk (#10180) [main] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfd772dd6..8c23300f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - 40f28f2de8dac1b2297a73b072dbc08f27a181a6 + fc4dcb6f648551132211c80d8b483ec1b5b56f5b - + https://github.com/dotnet/sdk - 40f28f2de8dac1b2297a73b072dbc08f27a181a6 + fc4dcb6f648551132211c80d8b483ec1b5b56f5b diff --git a/eng/Versions.props b/eng/Versions.props index 6ad38135b..352602d10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.4.21207.12 - 6.0.100-preview.4.21207.12 + 6.0.100-preview.4.21207.20 + 6.0.100-preview.4.21207.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 89e46ed50e2797066c598c7b5ba48ad36e703564 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 02:54:55 +0000 Subject: [PATCH 10/18] Update dependencies from https://github.com/dotnet/sdk build 20210407.22 (#10181) [main] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c23300f6..f08c9345f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - fc4dcb6f648551132211c80d8b483ec1b5b56f5b + 6477c575785af4f65827e5b232672a4b251fe890 - + https://github.com/dotnet/sdk - fc4dcb6f648551132211c80d8b483ec1b5b56f5b + 6477c575785af4f65827e5b232672a4b251fe890 diff --git a/eng/Versions.props b/eng/Versions.props index 352602d10..10397759c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.4.21207.20 - 6.0.100-preview.4.21207.20 + 6.0.100-preview.4.21207.22 + 6.0.100-preview.4.21207.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7d7aa9eeab1e0017a974b17f5be5ec13d533cb14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 03:46:38 +0000 Subject: [PATCH 11/18] [main] Update dependencies from dotnet/sdk (#10182) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21207.1 to 6.0.0-preview.4.21207.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21207.1 to 6.0.0-preview.4.21207.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21207.1 to 6.0.0-preview.4.21207.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21207.1 to 6.0.0-preview.4.21207.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.4.21207.1 to 6.0.0-preview.4.21207.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.4.21207.1 to 6.0.0-preview.4.21207.16 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21207.12 to 3.10.0-3.21208.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f08c9345f..d8f5f8190 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime b7a164882573af99eaf200c4b21808ecaf6dbb8c - + https://github.com/dotnet/aspnetcore - 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d + a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/aspnetcore - 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d + a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/aspnetcore - 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d + a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/aspnetcore - 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d + a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/aspnetcore - 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d + a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/aspnetcore - 9fe56f1d84c4d337dbb63c362c0209ec07d5cf6d + a5864bb173de0f2b7902b128b9716d77d3f14630 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating e46e279c0365c95116f6cb0cb60b12a7d655eb1b - + https://github.com/dotnet/sdk - 6477c575785af4f65827e5b232672a4b251fe890 + 1e4913f32344ce69ee17229168906140e8f88f0d - + https://github.com/dotnet/sdk - 6477c575785af4f65827e5b232672a4b251fe890 + 1e4913f32344ce69ee17229168906140e8f88f0d @@ -113,9 +113,9 @@ 55bd0ebd00ddbf2cd817314b1cf6824003cfb463 linker - + https://github.com/dotnet/roslyn - fd9b249bf2f1dfdb9531ae86ab0154472c7723b2 + cc79281ea25b26f7173258aa646a7652943178ba https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 10397759c..f3990c277 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.4.21207.1 - 6.0.0-preview.4.21207.1 - 6.0.0-preview.4.21207.1 - 6.0.0-preview.4.21207.1 - 6.0.0-preview.4.21207.1 - 6.0.0-preview.4.21207.1 + 6.0.0-preview.4.21207.16 + 6.0.0-preview.4.21207.16 + 6.0.0-preview.4.21207.16 + 6.0.0-preview.4.21207.16 + 6.0.0-preview.4.21207.16 + 6.0.0-preview.4.21207.16 0.2.0 - 6.0.100-preview.4.21207.22 - 6.0.100-preview.4.21207.22 + 6.0.100-preview.4.21207.25 + 6.0.100-preview.4.21207.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 70dc4a6c09211d48f2979e7bf17cfe46f7baf129 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 13:19:46 +0000 Subject: [PATCH 12/18] Update dependencies from https://github.com/dotnet/arcade build 20210407.4 (#10183) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- eng/common/cross/build-android-rootfs.sh | 1 + eng/common/cross/build-rootfs.sh | 4 + eng/common/performance/android_scenarios.proj | 34 -- eng/common/performance/blazor_perf.proj | 30 -- eng/common/performance/crossgen_perf.proj | 110 ------- eng/common/performance/microbenchmarks.proj | 144 -------- eng/common/performance/performance-setup.ps1 | 150 --------- eng/common/performance/performance-setup.sh | 310 ------------------ eng/common/templates/job/performance.yml | 95 ------ .../templates/steps/perf-send-to-helix.yml | 50 --- global.json | 2 +- 13 files changed, 11 insertions(+), 929 deletions(-) delete mode 100644 eng/common/performance/android_scenarios.proj delete mode 100644 eng/common/performance/blazor_perf.proj delete mode 100644 eng/common/performance/crossgen_perf.proj delete mode 100644 eng/common/performance/microbenchmarks.proj delete mode 100644 eng/common/performance/performance-setup.ps1 delete mode 100755 eng/common/performance/performance-setup.sh delete mode 100644 eng/common/templates/job/performance.yml delete mode 100644 eng/common/templates/steps/perf-send-to-helix.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8f5f8190..371179081 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,13 +136,13 @@ - + https://github.com/dotnet/arcade - 4535393d49a652c05fe7f7b2a4a752fca9ee1f45 + 86aee6d02b2fb8534b9466db0da25483d7c399a9 - + https://github.com/dotnet/arcade - 4535393d49a652c05fe7f7b2a4a752fca9ee1f45 + 86aee6d02b2fb8534b9466db0da25483d7c399a9 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f3990c277..be68d9a62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21205.1 + 6.0.0-beta.21207.4 diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index 42516bbee..c29c8267e 100755 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -106,6 +106,7 @@ __AndroidPackages+=" libandroid-glob" __AndroidPackages+=" liblzma" __AndroidPackages+=" krb5" __AndroidPackages+=" openssl" +__AndroidPackages+=" openldap" for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArch/Packages |\ grep -A15 "Package: \(${__AndroidPackages// /\\|}\)" | grep -v "static\|tool" | grep Filename); do diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index b26622444..81e641a57 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -55,11 +55,13 @@ __UbuntuPackages+=" libcurl4-openssl-dev" __UbuntuPackages+=" libkrb5-dev" __UbuntuPackages+=" libssl-dev" __UbuntuPackages+=" zlib1g-dev" +__UbuntuPackages+=" libldap2-dev" __AlpinePackages+=" curl-dev" __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" +__AlpinePackages+=" openldap-dev" __FreeBSDBase="12.1-RELEASE" __FreeBSDPkg="1.12.0" @@ -68,11 +70,13 @@ __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" __FreeBSDPackages+=" lttng-ust" __FreeBSDPackages+=" krb5" +__FreeBSDPackages+=" libslapi-2.4" __IllumosPackages="icu-64.2nb2" __IllumosPackages+=" mit-krb5-1.16.2nb4" __IllumosPackages+=" openssl-1.1.1e" __IllumosPackages+=" zlib-1.2.11" +__IllumosPackages+=" openldap-client-2.4.49" __UseMirror=0 diff --git a/eng/common/performance/android_scenarios.proj b/eng/common/performance/android_scenarios.proj deleted file mode 100644 index a9d4ce9eb..000000000 --- a/eng/common/performance/android_scenarios.proj +++ /dev/null @@ -1,34 +0,0 @@ - - - python3 - $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk - - - - - %(Identity) - - - - - %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\ - - - $HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/ - - - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)helloandroid;copy %HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)helloandroid;copy %HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py --unzip - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - \ No newline at end of file diff --git a/eng/common/performance/blazor_perf.proj b/eng/common/performance/blazor_perf.proj deleted file mode 100644 index 3b25359c4..000000000 --- a/eng/common/performance/blazor_perf.proj +++ /dev/null @@ -1,30 +0,0 @@ - - - python3 - $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk - - - - - %(Identity) - - - - - %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\ - $(ScenarioDirectory)blazor\ - - - $HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/ - $(ScenarioDirectory)blazor/ - - - - - $(WorkItemDirectory) - cd $(BlazorDirectory);$(Python) pre.py publish --msbuild %27/p:_TrimmerDumpDependencies=true%27 --msbuild-static AdditionalMonoLinkerOptions=%27"%24(AdditionalMonoLinkerOptions) --dump-dependencies"%27 --binlog %27./traces/blazor_publish.binlog%27 - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - \ No newline at end of file diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj deleted file mode 100644 index eb8bdd9c4..000000000 --- a/eng/common/performance/crossgen_perf.proj +++ /dev/null @@ -1,110 +0,0 @@ - - - - - %(Identity) - - - - - - py -3 - $(HelixPreCommands) - %HELIX_CORRELATION_PAYLOAD%\Core_Root - %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\ - $(ScenarioDirectory)crossgen\ - $(ScenarioDirectory)crossgen2\ - - - python3 - $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update;chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk - $HELIX_CORRELATION_PAYLOAD/Core_Root - $HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/ - $(ScenarioDirectory)crossgen/ - $(ScenarioDirectory)crossgen2/ - - - - - - - - - - - - - - - - - - - - - - - $(WorkItemDirectory) - $(Python) $(CrossgenDirectory)test.py crossgen --core-root $(CoreRoot) --test-name %(Identity) - - - - - - $(WorkItemDirectory) - $(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --single %(Identity) - - - - - - $(WorkItemDirectory) - $(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --single %(Identity) --singlethreaded True - - - - - - $(WorkItemDirectory) - $(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) - $(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen.out/ - $(Python) $(CrossgenDirectory)post.py - - - - - - $(WorkItemDirectory) - $(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) - $(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen.out/ - $(Python) $(Crossgen2Directory)post.py - - - - - - - 4:00 - - - - 4:00 - - - 4:00 - - - $(WorkItemDirectory) - $(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --composite $(Crossgen2Directory)framework-r2r.dll.rsp - 1:00 - - - 4:00 - - - 4:00 - - - \ No newline at end of file diff --git a/eng/common/performance/microbenchmarks.proj b/eng/common/performance/microbenchmarks.proj deleted file mode 100644 index 318ca5f1b..000000000 --- a/eng/common/performance/microbenchmarks.proj +++ /dev/null @@ -1,144 +0,0 @@ - - - - %HELIX_CORRELATION_PAYLOAD%\performance\scripts\benchmarks_ci.py --csproj %HELIX_CORRELATION_PAYLOAD%\performance\$(TargetCsproj) - --dotnet-versions %DOTNET_VERSION% --cli-source-info args --cli-branch %PERFLAB_BRANCH% --cli-commit-sha %PERFLAB_HASH% --cli-repository https://github.com/%PERFLAB_REPO% --cli-source-timestamp %PERFLAB_BUILDTIMESTAMP% - py -3 - %HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe - %HELIX_CORRELATION_PAYLOAD%\Baseline_Core_Root\CoreRun.exe - - $(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD% - %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts - %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts_Baseline - %HELIX_CORRELATION_PAYLOAD%\performance\src\tools\ResultsComparer\ResultsComparer.csproj - %HELIX_CORRELATION_PAYLOAD%\performance\tools\dotnet\$(Architecture)\dotnet.exe - %25%25 - %HELIX_WORKITEM_ROOT%\testResults.xml - - - - $HELIX_CORRELATION_PAYLOAD - $(BaseDirectory)/performance - - - - $HELIX_WORKITEM_PAYLOAD - $(BaseDirectory) - - - - $(PerformanceDirectory)/scripts/benchmarks_ci.py --csproj $(PerformanceDirectory)/$(TargetCsproj) - --dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP - python3 - $(BaseDirectory)/Core_Root/corerun - $(BaseDirectory)/Baseline_Core_Root/corerun - $(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh - $(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts - $(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts_Baseline - $(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj - $(PerformanceDirectory)/tools/dotnet/$(Architecture)/dotnet - %25 - $HELIX_WORKITEM_ROOT/testResults.xml - - - - $(CliArguments) --wasm - - - - --corerun %HELIX_CORRELATION_PAYLOAD%\dotnet-mono\shared\Microsoft.NETCore.App\6.0.0\corerun.exe - - - --corerun $(BaseDirectory)/dotnet-mono/shared/Microsoft.NETCore.App/6.0.0/corerun - - - - --corerun $(CoreRun) - - - - --corerun $(BaselineCoreRun) - - - - $(Python) $(WorkItemCommand) --incremental no --architecture $(Architecture) -f $(_Framework) $(PerfLabArguments) - - - - $(WorkItemCommand) $(CliArguments) - - - - 2:30 - 0:15 - - - - - %(Identity) - - - - - 30 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - $(WorkItemDirectory) - $(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" - $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" - $(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand) - $(WorkItemTimeout) - - - - - - $(WorkItemDirectory) - $(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)" - $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)" - $(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults) - 4:00 - - - diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 deleted file mode 100644 index b18599eda..000000000 --- a/eng/common/performance/performance-setup.ps1 +++ /dev/null @@ -1,150 +0,0 @@ -Param( - [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, - [string] $CoreRootDirectory, - [string] $BaselineCoreRootDirectory, - [string] $Architecture="x64", - [string] $Framework="net5.0", - [string] $CompilationMode="Tiered", - [string] $Repository=$env:BUILD_REPOSITORY_NAME, - [string] $Branch=$env:BUILD_SOURCEBRANCH, - [string] $CommitSha=$env:BUILD_SOURCEVERSION, - [string] $BuildNumber=$env:BUILD_BUILDNUMBER, - [string] $RunCategories="Libraries Runtime", - [string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj", - [string] $Kind="micro", - [switch] $LLVM, - [switch] $MonoInterpreter, - [switch] $MonoAOT, - [switch] $Internal, - [switch] $Compare, - [string] $MonoDotnet="", - [string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind", - [string] $LogicalMachine="", - [switch] $AndroidMono -) - -$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance") -$UseCoreRun = ($CoreRootDirectory -ne [string]::Empty) -$UseBaselineCoreRun = ($BaselineCoreRootDirectory -ne [string]::Empty) - -$PayloadDirectory = (Join-Path $SourceDirectory "Payload") -$PerformanceDirectory = (Join-Path $PayloadDirectory "performance") -$WorkItemDirectory = (Join-Path $SourceDirectory "workitem") -$ExtraBenchmarkDotNetArguments = "--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true" -$Creator = $env:BUILD_DEFINITIONNAME -$PerfLabArguments = "" -$HelixSourcePrefix = "pr" - -$Queue = "" - -if ($Internal) { - switch ($LogicalMachine) { - "perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } - "perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" } - "perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" } - "perfpixel4a" { $Queue = "Windows.10.Amd64.Pixel.Perf" } - Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } - } - $PerfLabArguments = "--upload-to-perflab-container" - $ExtraBenchmarkDotNetArguments = "" - $Creator = "" - $HelixSourcePrefix = "official" -} -else { - $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open" -} - -if($MonoInterpreter) -{ - $ExtraBenchmarkDotNetArguments = "--category-exclusion-filter NoInterpreter" -} - -if($MonoDotnet -ne "") -{ - $Configurations += " LLVM=$LLVM MonoInterpreter=$MonoInterpreter MonoAOT=$MonoAOT" - if($ExtraBenchmarkDotNetArguments -eq "") - { - #FIX ME: We need to block these tests as they don't run on mono for now - $ExtraBenchmarkDotNetArguments = "--exclusion-filter *Perf_Image* *Perf_NamedPipeStream*" - } - else - { - #FIX ME: We need to block these tests as they don't run on mono for now - $ExtraBenchmarkDotNetArguments += " --exclusion-filter *Perf_Image* *Perf_NamedPipeStream*" - } -} - -# FIX ME: This is a workaround until we get this from the actual pipeline -$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture" -$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments" - - -if ($RunFromPerformanceRepo) { - $SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments" - - robocopy $SourceDirectory $PerformanceDirectory /E /XD $PayloadDirectory $SourceDirectory\artifacts $SourceDirectory\.git -} -else { - git clone --branch main --depth 1 --quiet https://github.com/dotnet/performance $PerformanceDirectory -} - -if($MonoDotnet -ne "") -{ - $UsingMono = "true" - $MonoDotnetPath = (Join-Path $PayloadDirectory "dotnet-mono") - Move-Item -Path $MonoDotnet -Destination $MonoDotnetPath -} - -if ($UseCoreRun) { - $NewCoreRoot = (Join-Path $PayloadDirectory "Core_Root") - Move-Item -Path $CoreRootDirectory -Destination $NewCoreRoot -} -if ($UseBaselineCoreRun) { - $NewBaselineCoreRoot = (Join-Path $PayloadDirectory "Baseline_Core_Root") - Move-Item -Path $BaselineCoreRootDirectory -Destination $NewBaselineCoreRoot -} - -if ($AndroidMono) { - if(!(Test-Path $WorkItemDirectory)) - { - mkdir $WorkItemDirectory - } - Copy-Item -path "$SourceDirectory\artifacts\bin\AndroidSampleApp\arm64\Release\android-arm64\publish\apk\bin\HelloAndroid.apk" $PayloadDirectory - $SetupArguments = $SetupArguments -replace $Architecture, 'arm64' -} - -$DocsDir = (Join-Path $PerformanceDirectory "docs") -robocopy $DocsDir $WorkItemDirectory - -# Set variables that we will need to have in future steps -$ci = $true - -. "$PSScriptRoot\..\pipeline-logging-functions.ps1" - -# Directories -Write-PipelineSetVariable -Name 'PayloadDirectory' -Value "$PayloadDirectory" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'PerformanceDirectory' -Value "$PerformanceDirectory" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'WorkItemDirectory' -Value "$WorkItemDirectory" -IsMultiJobVariable $false - -# Script Arguments -Write-PipelineSetVariable -Name 'Python' -Value "py -3" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'ExtraBenchmarkDotNetArguments' -Value "$ExtraBenchmarkDotNetArguments" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'SetupArguments' -Value "$SetupArguments" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'PerfLabArguments' -Value "$PerfLabArguments" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'BDNCategories' -Value "$RunCategories" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'TargetCsproj' -Value "$Csproj" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'Kind' -Value "$Kind" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'Architecture' -Value "$Architecture" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'UseCoreRun' -Value "$UseCoreRun" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'UseBaselineCoreRun' -Value "$UseBaselineCoreRun" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'RunFromPerfRepo' -Value "$RunFromPerformanceRepo" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'Compare' -Value "$Compare" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'MonoDotnet' -Value "$UsingMono" -IsMultiJobVariable $false - -# Helix Arguments -Write-PipelineSetVariable -Name 'Creator' -Value "$Creator" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false -Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false - -exit 0 \ No newline at end of file diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh deleted file mode 100755 index 200cf71f2..000000000 --- a/eng/common/performance/performance-setup.sh +++ /dev/null @@ -1,310 +0,0 @@ -#!/usr/bin/env bash - -source_directory=$BUILD_SOURCESDIRECTORY -core_root_directory= -baseline_core_root_directory= -architecture=x64 -framework=net5.0 -compilation_mode=tiered -repository=$BUILD_REPOSITORY_NAME -branch=$BUILD_SOURCEBRANCH -commit_sha=$BUILD_SOURCEVERSION -build_number=$BUILD_BUILDNUMBER -internal=false -compare=false -mono_dotnet= -kind="micro" -llvm=false -monointerpreter=false -monoaot=false -monoaot_path= -run_categories="Libraries Runtime" -csproj="src\benchmarks\micro\MicroBenchmarks.csproj" -configurations="CompliationMode=$compilation_mode RunKind=$kind" -run_from_perf_repo=false -use_core_run=true -use_baseline_core_run=true -using_mono=false -wasm_runtime_loc= -using_wasm=false -use_latest_dotnet=false -logical_machine= - -while (($# > 0)); do - lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" - case $lowerI in - --sourcedirectory) - source_directory=$2 - shift 2 - ;; - --corerootdirectory) - core_root_directory=$2 - shift 2 - ;; - --baselinecorerootdirectory) - baseline_core_root_directory=$2 - shift 2 - ;; - --architecture) - architecture=$2 - shift 2 - ;; - --framework) - framework=$2 - shift 2 - ;; - --compilationmode) - compilation_mode=$2 - shift 2 - ;; - --logicalmachine) - logical_machine=$2 - shift 2 - ;; - --repository) - repository=$2 - shift 2 - ;; - --branch) - branch=$2 - shift 2 - ;; - --commitsha) - commit_sha=$2 - shift 2 - ;; - --buildnumber) - build_number=$2 - shift 2 - ;; - --kind) - kind=$2 - configurations="CompilationMode=$compilation_mode RunKind=$kind" - shift 2 - ;; - --runcategories) - run_categories=$2 - shift 2 - ;; - --csproj) - csproj=$2 - shift 2 - ;; - --internal) - internal=true - shift 1 - ;; - --alpine) - alpine=true - shift 1 - ;; - --llvm) - llvm=true - shift 1 - ;; - --monointerpreter) - monointerpreter=true - shift 1 - ;; - --monoaot) - monoaot=true - monoaot_path=$2 - shift 2 - ;; - --monodotnet) - mono_dotnet=$2 - shift 2 - ;; - --wasm) - wasm_runtime_loc=$2 - shift 2 - ;; - --compare) - compare=true - shift 1 - ;; - --configurations) - configurations=$2 - shift 2 - ;; - --latestdotnet) - use_latest_dotnet=true - shift 1 - ;; - *) - echo "Common settings:" - echo " --corerootdirectory Directory where Core_Root exists, if running perf testing with --corerun" - echo " --architecture Architecture of the testing being run" - echo " --configurations List of key=value pairs that will be passed to perf testing infrastructure." - echo " ex: --configurations \"CompilationMode=Tiered OptimzationLevel=PGO\"" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --framework The framework to run, if not running in master" - echo " --compliationmode The compilation mode if not passing --configurations" - echo " --sourcedirectory The directory of the sources. Defaults to env:BUILD_SOURCESDIRECTORY" - echo " --repository The name of the repository in the / format. Defaults to env:BUILD_REPOSITORY_NAME" - echo " --branch The name of the branch. Defaults to env:BUILD_SOURCEBRANCH" - echo " --commitsha The commit sha1 to run against. Defaults to env:BUILD_SOURCEVERSION" - echo " --buildnumber The build number currently running. Defaults to env:BUILD_BUILDNUMBER" - echo " --csproj The relative path to the benchmark csproj whose tests should be run. Defaults to src\benchmarks\micro\MicroBenchmarks.csproj" - echo " --kind Related to csproj. The kind of benchmarks that should be run. Defaults to micro" - echo " --runcategories Related to csproj. Categories of benchmarks to run. Defaults to \"coreclr corefx\"" - echo " --internal If the benchmarks are running as an official job." - echo " --monodotnet Pass the path to the mono dotnet for mono performance testing." - echo " --wasm Path to the unpacked wasm runtime pack." - echo " --latestdotnet --dotnet-versions will not be specified. --dotnet-versions defaults to LKG version in global.json " - echo " --alpine Set for runs on Alpine" - echo "" - exit 0 - ;; - esac -done - -if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-performance" ]; then - run_from_perf_repo=true -fi - -if [ -z "$configurations" ]; then - configurations="CompilationMode=$compilation_mode" -fi - -if [ -z "$core_root_directory" ]; then - use_core_run=false -fi - -if [ -z "$baseline_core_root_directory" ]; then - use_baseline_core_run=false -fi - -payload_directory=$source_directory/Payload -performance_directory=$payload_directory/performance -workitem_directory=$source_directory/workitem -extra_benchmark_dotnet_arguments="--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true" -perflab_arguments= -queue=Ubuntu.1804.Amd64.Open -creator=$BUILD_DEFINITIONNAME -helix_source_prefix="pr" - -if [[ "$internal" == true ]]; then - perflab_arguments="--upload-to-perflab-container" - helix_source_prefix="official" - creator= - extra_benchmark_dotnet_arguments= - - if [[ "$architecture" = "arm64" ]]; then - queue=Ubuntu.1804.Arm64.Perf - else - if [[ "$logical_machine" = "perfowl" ]]; then - queue=Ubuntu.1804.Amd64.Owl.Perf - else - queue=Ubuntu.1804.Amd64.Tiger.Perf - fi - fi - - if [[ "$alpine" = "true" ]]; then - queue=alpine.amd64.tiger.perf - fi -else - if [[ "$architecture" = "arm64" ]]; then - queue=ubuntu.1804.armarch.open - else - queue=Ubuntu.1804.Amd64.Open - fi - - if [[ "$alpine" = "true" ]]; then - queue=alpine.amd64.tiger.perf - fi -fi - -if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then - configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot" - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono" -fi - -if [[ "$wasm_runtime_loc" != "" ]]; then - configurations="CompilationMode=wasm RunKind=$kind" - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM NoMono" -fi - -if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "true" ]]; then - configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot" - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoMono" -fi - -if [[ "$monoaot" == "true" ]]; then - configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot" - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoAOT" -fi - -common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture" -setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments" - -if [[ "$run_from_perf_repo" = true ]]; then - payload_directory= - workitem_directory=$source_directory - performance_directory=$workitem_directory - setup_arguments="--perf-hash $commit_sha $common_setup_arguments" -else - git clone --branch main --depth 1 --quiet https://github.com/dotnet/performance $performance_directory - - docs_directory=$performance_directory/docs - mv $docs_directory $workitem_directory -fi - -if [[ "$wasm_runtime_loc" != "" ]]; then - using_wasm=true - wasm_dotnet_path=$payload_directory/dotnet-wasm - mv $wasm_runtime_loc $wasm_dotnet_path - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmMainJS \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm/runtime-test.js --wasmEngine /home/helixbot/.jsvu/v8 --customRuntimePack \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm" -fi - -if [[ "$mono_dotnet" != "" ]] && [[ "$monoaot" == "false" ]]; then - using_mono=true - mono_dotnet_path=$payload_directory/dotnet-mono - mv $mono_dotnet $mono_dotnet_path -fi - -if [[ "$monoaot" == "true" ]]; then - monoaot_dotnet_path=$payload_directory/monoaot - mv $monoaot_path $monoaot_dotnet_path - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --runtimes monoaotllvm --aotcompilerpath \$HELIX_CORRELATION_PAYLOAD/monoaot/sgen/mini/mono-sgen --customruntimepack \$HELIX_CORRELATION_PAYLOAD/monoaot/pack --aotcompilermode llvm" -fi - -if [[ "$use_core_run" = true ]]; then - new_core_root=$payload_directory/Core_Root - mv $core_root_directory $new_core_root -fi - -if [[ "$use_baseline_core_run" = true ]]; then - new_baseline_core_root=$payload_directory/Baseline_Core_Root - mv $baseline_core_root_directory $new_baseline_core_root -fi - -ci=true - -_script_dir=$(pwd)/eng/common -. "$_script_dir/pipeline-logging-functions.sh" - -# Make sure all of our variables are available for future steps -Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false -Write-PipelineSetVariable -name "UseBaselineCoreRun" -value "$use_baseline_core_run" -is_multi_job_variable false -Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false -Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false -Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false -Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false -Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false -Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false -Write-PipelineSetVariable -name "Python" -value "python3" -is_multi_job_variable false -Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false -Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false -Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false -Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false -Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false -Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false -Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false -Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false -Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false -Write-PipelineSetVariable -name "Compare" -value "$compare" -is_multi_job_variable false -Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_variable false -Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false diff --git a/eng/common/templates/job/performance.yml b/eng/common/templates/job/performance.yml deleted file mode 100644 index f877fd7a8..000000000 --- a/eng/common/templates/job/performance.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - steps: [] # optional -- any additional steps that need to happen before pulling down the performance repo and sending the performance benchmarks to helix (ie building your repo) - variables: [] # optional -- list of additional variables to send to the template - jobName: '' # required -- job name - displayName: '' # optional -- display name for the job. Will use jobName if not passed - pool: '' # required -- name of the Build pool - container: '' # required -- name of the container - osGroup: '' # required -- operating system for the job - extraSetupParameters: '' # optional -- extra arguments to pass to the setup script - frameworks: ['netcoreapp3.0'] # optional -- list of frameworks to run against - continueOnError: 'false' # optional -- determines whether to continue the build if the step errors - dependsOn: '' # optional -- dependencies of the job - timeoutInMinutes: 320 # optional -- timeout for the job - enableTelemetry: false # optional -- enable for telemetry - -jobs: -- template: ../jobs/jobs.yml - parameters: - dependsOn: ${{ parameters.dependsOn }} - enableTelemetry: ${{ parameters.enableTelemetry }} - enablePublishBuildArtifacts: true - continueOnError: ${{ parameters.continueOnError }} - - jobs: - - job: '${{ parameters.jobName }}' - - ${{ if ne(parameters.displayName, '') }}: - displayName: '${{ parameters.displayName }}' - ${{ if eq(parameters.displayName, '') }}: - displayName: '${{ parameters.jobName }}' - - timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - - variables: - - - ${{ each variable in parameters.variables }}: - - ${{ if ne(variable.name, '') }}: - - name: ${{ variable.name }} - value: ${{ variable.value }} - - ${{ if ne(variable.group, '') }}: - - group: ${{ variable.group }} - - - IsInternal: '' - - HelixApiAccessToken: '' - - HelixPreCommand: '' - - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq( parameters.osGroup, 'Windows_NT') }}: - - HelixPreCommand: 'set "PERFLAB_UPLOAD_TOKEN=$(PerfCommandUploadToken)"' - - IsInternal: -Internal - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - HelixPreCommand: 'export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"' - - IsInternal: --internal - - - group: DotNet-HelixApi-Access - - group: dotnet-benchview - - workspace: - clean: all - pool: - ${{ parameters.pool }} - container: ${{ parameters.container }} - strategy: - matrix: - ${{ each framework in parameters.frameworks }}: - ${{ framework }}: - _Framework: ${{ framework }} - steps: - - checkout: self - clean: true - # Run all of the steps to setup repo - - ${{ each step in parameters.steps }}: - - ${{ step }} - - powershell: $(Build.SourcesDirectory)\eng\common\performance\performance-setup.ps1 $(IsInternal) -Framework $(_Framework) ${{ parameters.extraSetupParameters }} - displayName: Performance Setup (Windows) - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $(Build.SourcesDirectory)/eng/common/performance/performance-setup.sh $(IsInternal) --framework $(_Framework) ${{ parameters.extraSetupParameters }} - displayName: Performance Setup (Unix) - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $(Python) $(PerformanceDirectory)/scripts/ci_setup.py $(SetupArguments) - displayName: Run ci setup script - # Run perf testing in helix - - template: /eng/common/templates/steps/perf-send-to-helix.yml - parameters: - HelixSource: '$(HelixSourcePrefix)/$(Build.Repository.Name)/$(Build.SourceBranch)' # sources must start with pr/, official/, prodcon/, or agent/ - HelixType: 'test/performance/$(Kind)/$(_Framework)/$(Architecture)' - HelixAccessToken: $(HelixApiAccessToken) - HelixTargetQueues: $(Queue) - HelixPreCommands: $(HelixPreCommand) - Creator: $(Creator) - WorkItemTimeout: 4:00 # 4 hours - WorkItemDirectory: '$(WorkItemDirectory)' # WorkItemDirectory can not be empty, so we send it some docs to keep it happy - CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions \ No newline at end of file diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml deleted file mode 100644 index 0fb786fab..000000000 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ /dev/null @@ -1,50 +0,0 @@ -# Please remember to update the documentation if you make changes to these parameters! -parameters: - ProjectFile: '' # required -- project file that specifies the helix workitems - 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 - 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 - CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload - 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.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json - EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control - 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." - Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Send job to Helix' # 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 - osGroup: '' # required -- operating system for the job - - -steps: -- template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml - parameters: - osGroup: ${{ parameters.osGroup }} - sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} - condition: ${{ parameters.condition }} - shouldContinueOnError: ${{ parameters.continueOnError }} - environment: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) diff --git a/global.json b/global.json index 4ceab0cdd..c45f0e3c1 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21205.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21207.4" } } From 8c476b58df6032c6713c69535d2679632abac9ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Apr 2021 13:05:37 +0000 Subject: [PATCH 13/18] Update dependencies from https://github.com/dotnet/arcade build 20210408.2 (#10188) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 371179081..450b0d4bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,13 +136,13 @@ - + https://github.com/dotnet/arcade - 86aee6d02b2fb8534b9466db0da25483d7c399a9 + 814754c257edd24aeff89615106e4557d07632d8 - + https://github.com/dotnet/arcade - 86aee6d02b2fb8534b9466db0da25483d7c399a9 + 814754c257edd24aeff89615106e4557d07632d8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index be68d9a62..10eeae61a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21207.4 + 6.0.0-beta.21208.2 diff --git a/global.json b/global.json index c45f0e3c1..7e8a7fa0c 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21207.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21208.2" } } From f1b8e73e579f9c520ed5fa8fa5a20743e64b59e6 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 9 Apr 2021 11:34:12 -0700 Subject: [PATCH 14/18] Disable VS package push when post build sign is true (#10189) When post build signing is true, don't push VS packages. These unsigned packages will not successfully insert into Visual Studio --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 738b205c6..63e5254a3 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -146,7 +146,7 @@ phases: packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' nuGetFeedType: external publishFeedCredentials: 'DevDiv - VS package feed' - condition: and(succeeded(), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86'))) + condition: and(succeeded(), ne(variables['PostBuildSign'], true), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86'))) - task: PublishTestResults@2 displayName: Publish Test Results From ae55aee247b7aeb1fef48a3fb1c8b4f6112a2fb3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 10 Apr 2021 13:10:27 +0000 Subject: [PATCH 15/18] Update dependencies from https://github.com/dotnet/arcade build 20210409.17 (#10190) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 450b0d4bc..2347d49cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,13 +136,13 @@ - + https://github.com/dotnet/arcade - 814754c257edd24aeff89615106e4557d07632d8 + 28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7 - + https://github.com/dotnet/arcade - 814754c257edd24aeff89615106e4557d07632d8 + 28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 10eeae61a..1b9c3daea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21208.2 + 6.0.0-beta.21209.17 diff --git a/global.json b/global.json index 7e8a7fa0c..037202ac2 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21208.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21209.17" } } From 90716fd1a040d408a81723e7f2169322f7f09f3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 13:18:13 +0000 Subject: [PATCH 16/18] Update dependencies from https://github.com/dotnet/test-templates build 20210412.1 (#10193) [main] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2347d49cc..0860061ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/aspnetcore a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/test-templates - a17e4bdbd6aeab998156ab8cb15b0ddc31517612 + 662d3df355d14faf209008e4af4bb446227cf4aa - + https://github.com/dotnet/test-templates - a17e4bdbd6aeab998156ab8cb15b0ddc31517612 + 662d3df355d14faf209008e4af4bb446227cf4aa - + https://github.com/dotnet/test-templates - a17e4bdbd6aeab998156ab8cb15b0ddc31517612 + 662d3df355d14faf209008e4af4bb446227cf4aa https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 1b9c3daea..8ce8bfb18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,8 +36,8 @@ - 1.0.2-beta4.21206.1 - 1.0.2-beta4.21206.1 + 1.0.2-beta4.21212.1 + 1.0.2-beta4.21212.1 @@ -135,7 +135,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21206.1 + 1.0.2-beta4.21212.1 2.1.26 From c6e6c1b622701ea76e946882375c426bc422763d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 16:09:56 +0000 Subject: [PATCH 17/18] Update dependencies from https://github.com/dotnet/test-templates build 20210412.2 (#10194) [main] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0860061ce..3ca5b3b18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/aspnetcore a5864bb173de0f2b7902b128b9716d77d3f14630 - + https://github.com/dotnet/test-templates - 662d3df355d14faf209008e4af4bb446227cf4aa + cb722862f3d76493dc5047a0c30e3bd5f4391170 - + https://github.com/dotnet/test-templates - 662d3df355d14faf209008e4af4bb446227cf4aa + cb722862f3d76493dc5047a0c30e3bd5f4391170 - + https://github.com/dotnet/test-templates - 662d3df355d14faf209008e4af4bb446227cf4aa + cb722862f3d76493dc5047a0c30e3bd5f4391170 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 8ce8bfb18..c493a137f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,8 +36,8 @@ - 1.0.2-beta4.21212.1 - 1.0.2-beta4.21212.1 + 1.0.2-beta4.21212.2 + 1.0.2-beta4.21212.2 @@ -135,7 +135,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.21212.1 + 1.0.2-beta4.21212.2 2.1.26 From 70fef01f634b836506918d3c0732487cd65d76a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 13:20:28 +0000 Subject: [PATCH 18/18] Update dependencies from https://github.com/dotnet/arcade build 20210412.6 (#10200) [main] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21169.2 to 1.0.0-beta.21210.2 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/cross/arm64/tizen-fetch.sh | 2 +- global.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ca5b3b18..63dbaabe6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,13 +136,13 @@ - + https://github.com/dotnet/arcade - 28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7 + db49d790a4bfa977a9ed7436bf2aa242cefae45e - + https://github.com/dotnet/arcade - 28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7 + db49d790a4bfa977a9ed7436bf2aa242cefae45e https://github.com/dotnet/source-build-reference-packages @@ -152,9 +152,9 @@ https://github.com/dotnet/sourcelink 4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc - + https://github.com/dotnet/xliff-tasks - 0da469fe1c2714d0e25cad1143632562fb528425 + aa77a885dbf30ecdb14fa2f20d4e50432ee36db5 diff --git a/eng/Versions.props b/eng/Versions.props index c493a137f..db5d6d26e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21209.17 + 6.0.0-beta.21212.6 diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh index a48a6f51c..16d1301f2 100644 --- a/eng/common/cross/arm64/tizen-fetch.sh +++ b/eng/common/cross/arm64/tizen-fetch.sh @@ -157,7 +157,7 @@ fetch_tizen_pkgs() Inform "Initialize arm base" fetch_tizen_pkgs_init standard base Inform "fetch common packages" -fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel +fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils Inform "fetch coreclr packages" fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu Inform "fetch corefx packages" diff --git a/global.json b/global.json index 037202ac2..b332e5be6 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21209.17" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21212.6" } }