From e5855d71098a27f35465422cd0908120660c4da5 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Tue, 21 Apr 2020 14:49:32 -0700 Subject: [PATCH 01/25] manual arcade update (#7231) --- .../templates/post-build/post-build.yml | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fbab4cb5d..d3ab67630 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -35,8 +35,9 @@ parameters: NETCoreExperimentalChannelId: 562 NetEngServicesIntChannelId: 678 NetEngServicesProdChannelId: 679 - Net5Preview2ChannelId: 738 Net5Preview3ChannelId: 739 + Net5Preview4ChannelId: 856 + Net5Preview5ChannelId: 857 NetCoreSDK313xxChannelId: 759 NetCoreSDK313xxInternalChannelId: 760 @@ -65,7 +66,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(InitialChannels)[$(PromoteToMaestroChannelId)]" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview2ChannelId}},${{parameters.Net5Preview3ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}} + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}}${{parameters.Net5Preview3ChannelId}},${{parameters.Net5Preview4ChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}} - job: displayName: NuGet Validation @@ -213,10 +214,10 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview2_Publish' - channelName: '.NET 5 Preview 2' - akaMSChannelName: 'net5/preview2' - channelId: ${{ parameters.Net5Preview2ChannelId }} + stageName: 'Net5_Preview3_Publish' + channelName: '.NET 5 Preview 3' + akaMSChannelName: 'net5/preview3' + channelId: ${{ parameters.Net5Preview3ChannelId }} transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' @@ -227,10 +228,24 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview3_Publish' - channelName: '.NET 5 Preview 3' - akaMSChannelName: 'net5/preview3' - channelId: ${{ parameters.Net5Preview3ChannelId }} + stageName: 'Net5_Preview4_Publish' + channelName: '.NET 5 Preview 4' + akaMSChannelName: 'net5/preview4' + channelId: ${{ parameters.Net5Preview4ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_Preview5_Publish' + channelName: '.NET 5 Preview 5' + akaMSChannelName: 'net5/preview5' + channelId: ${{ parameters.Net5Preview5ChannelId }} transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' From 3197ddb3ff52c00654e1a1a59fec695405b0b98b Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Wed, 22 Apr 2020 10:14:27 -0700 Subject: [PATCH 02/25] fixing the ci build (#7246) --- .vsts-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index fec720b02..0bd7de830 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -78,7 +78,12 @@ stages: parameters: agentOs: Linux pool: - name: Hosted Ubuntu 1604 + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCorePublic-Pool + queue: BuildPool.Ubuntu.1604.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCoreInternal-Pool + queue: BuildPool.Ubuntu.1604.Amd64 timeoutInMinutes: 180 strategy: matrix: From a8bb041acdb78e2a0a78def95bec3fb7921c0d9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 19:29:19 +0000 Subject: [PATCH 03/25] Update dependencies from https://github.com/dotnet/runtime build 20200421.7 (#7237) - Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.4.20217.2 -> 5.0.0-preview.4.20221.7 - Microsoft.NETCore.DotNetHostResolver: 5.0.0-preview.4.20217.2 -> 5.0.0-preview.4.20221.7 - Microsoft.NETCore.Platforms: 5.0.0-preview.4.20217.2 -> 5.0.0-preview.4.20221.7 - Microsoft.NETCore.App.Host.win-x64: 5.0.0-preview.4.20217.2 -> 5.0.0-preview.4.20221.7 - Microsoft.NETCore.App.Internal: 5.0.0-preview.4.20217.2 -> 5.0.0-preview.4.20221.7 - Microsoft.NETCore.App.Ref: 5.0.0-preview.4.20217.2 -> 5.0.0-preview.4.20221.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75c178cfd..c99aba99f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 819b8f6838a537d6458a5b94e43b7d47aff22d93 - + https://github.com/dotnet/runtime - e405ca02b49fa34bcf0ffbda6c44d73c9b47ec8f + b7cdadcc6de83f2138dc86dac14870af3b27d373 - + https://github.com/dotnet/runtime - e405ca02b49fa34bcf0ffbda6c44d73c9b47ec8f + b7cdadcc6de83f2138dc86dac14870af3b27d373 - + https://github.com/dotnet/runtime - e405ca02b49fa34bcf0ffbda6c44d73c9b47ec8f + b7cdadcc6de83f2138dc86dac14870af3b27d373 - + https://github.com/dotnet/runtime - e405ca02b49fa34bcf0ffbda6c44d73c9b47ec8f + b7cdadcc6de83f2138dc86dac14870af3b27d373 - + https://github.com/dotnet/runtime - e405ca02b49fa34bcf0ffbda6c44d73c9b47ec8f + b7cdadcc6de83f2138dc86dac14870af3b27d373 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e405ca02b49fa34bcf0ffbda6c44d73c9b47ec8f + b7cdadcc6de83f2138dc86dac14870af3b27d373 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2b027dd17..9b15497f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.4.20217.2 + 5.0.0-preview.4.20221.7 - 5.0.0-preview.4.20217.2 - 5.0.0-preview.4.20217.2 - 5.0.0-preview.4.20217.2 - 5.0.0-preview.4.20217.2 - 5.0.0-preview.4.20217.2 + 5.0.0-preview.4.20221.7 + 5.0.0-preview.4.20221.7 + 5.0.0-preview.4.20221.7 + 5.0.0-preview.4.20221.7 + 5.0.0-preview.4.20221.7 2.1.0 From cdf68b3997b1613fca58e5dd76092e84fc647fa2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 20:09:58 +0000 Subject: [PATCH 04/25] Update dependencies from https://github.com/dotnet/aspnetcore build 20200421.8 (#7232) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 5.0.0-preview.4.20216.10 -> 5.0.0-preview.4.20221.8 - dotnet-dev-certs: 5.0.0-preview.4.20216.10 -> 5.0.0-preview.4.20221.8 - dotnet-user-secrets: 5.0.0-preview.4.20216.10 -> 5.0.0-preview.4.20221.8 - Microsoft.AspNetCore.App.Runtime.win-x64: 5.0.0-preview.4.20216.10 -> 5.0.0-preview.4.20221.8 - Microsoft.AspNetCore.App.Ref: 5.0.0-preview.4.20216.10 -> 5.0.0-preview.4.20221.8 - dotnet-watch: 5.0.0-preview.4.20216.10 -> 5.0.0-preview.4.20221.8 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c99aba99f..434896384 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime b7cdadcc6de83f2138dc86dac14870af3b27d373 - + https://github.com/dotnet/aspnetcore - b89880b1a611e20def7ffaac49dca0d0174ee88c + be0084b819798e45d8f8b14786af8cb927d617d2 - + https://github.com/dotnet/aspnetcore - b89880b1a611e20def7ffaac49dca0d0174ee88c + be0084b819798e45d8f8b14786af8cb927d617d2 - + https://github.com/dotnet/aspnetcore - b89880b1a611e20def7ffaac49dca0d0174ee88c + be0084b819798e45d8f8b14786af8cb927d617d2 - + https://github.com/dotnet/aspnetcore - b89880b1a611e20def7ffaac49dca0d0174ee88c + be0084b819798e45d8f8b14786af8cb927d617d2 - + https://github.com/dotnet/aspnetcore - b89880b1a611e20def7ffaac49dca0d0174ee88c + be0084b819798e45d8f8b14786af8cb927d617d2 - + https://github.com/dotnet/aspnetcore - b89880b1a611e20def7ffaac49dca0d0174ee88c + be0084b819798e45d8f8b14786af8cb927d617d2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9b15497f9..6c3878e33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.4.20216.10 - 5.0.0-preview.4.20216.10 - 5.0.0-preview.4.20216.10 - 5.0.0-preview.4.20216.10 - 5.0.0-preview.4.20216.10 - 5.0.0-preview.4.20216.10 + 5.0.0-preview.4.20221.8 + 5.0.0-preview.4.20221.8 + 5.0.0-preview.4.20221.8 + 5.0.0-preview.4.20221.8 + 5.0.0-preview.4.20221.8 + 5.0.0-preview.4.20221.8 0.2.0 From b3ed95857ec180437e1888664b5283b8071b95ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 22:10:31 +0000 Subject: [PATCH 05/25] [release/5.0.1xx-preview4] Update dependencies from dotnet/windowsdesktop (#7238) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200421.4 - Microsoft.WindowsDesktop.App: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20221.4 - Microsoft.WindowsDesktop.App.Ref: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20221.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20221.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates: 5.0.0-preview.4.20216.1 -> 5.0.0-preview.5.20219.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20219.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200421.6 - Microsoft.WindowsDesktop.App: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20221.6 - Microsoft.WindowsDesktop.App.Ref: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20221.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20221.6 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates: 5.0.0-preview.4.20216.1 -> 5.0.0-preview.5.20219.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20221.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200422.2 - Microsoft.WindowsDesktop.App: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20222.2 - Microsoft.WindowsDesktop.App.Ref: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20222.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20222.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates: 5.0.0-preview.4.20216.1 -> 5.0.0-preview.4.20221.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates: 5.0.0-preview.4.20216.2 -> 5.0.0-preview.4.20222.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 434896384..bc6338fb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 819b8f6838a537d6458a5b94e43b7d47aff22d93 + 6a11ec1eb327bf1f40eb785deb7b4488fb39d14b - + https://github.com/dotnet/windowsdesktop - 819b8f6838a537d6458a5b94e43b7d47aff22d93 + 6a11ec1eb327bf1f40eb785deb7b4488fb39d14b - + https://github.com/dotnet/windowsdesktop - 819b8f6838a537d6458a5b94e43b7d47aff22d93 + 6a11ec1eb327bf1f40eb785deb7b4488fb39d14b https://github.com/dotnet/runtime @@ -88,13 +88,13 @@ af10fe4cb05c7b90e2d0b0293dba769b54f396ad - + https://github.com/dotnet/winforms - 9368a2fa7cdef46c847a71622f2c678c11cb41ad + a952e17bb0d3e6d1c795697419fc41c2ca3be430 - + https://github.com/dotnet/wpf - 2e43ac7de38cf45d9359f2e1cc317b091617241a + 1f2a4f5df91968f6a6f8a7c165b02dbff6465aa7 diff --git a/eng/Versions.props b/eng/Versions.props index 6c3878e33..1856ce899 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.4.20216.1 + 5.0.0-preview.4.20221.5 - 5.0.0-preview.4.20216.2 + 5.0.0-preview.4.20222.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.4.20216.2 - 5.0.0-preview.4.20216.2 - 5.0.0-preview.4.20216.2 + 5.0.0-preview.4.20222.2 + 5.0.0-preview.4.20222.2 + 5.0.0-preview.4.20222.2 From ecd222758bc75f3bbb0b6ac4394bc2bea39af84d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 01:50:28 +0000 Subject: [PATCH 06/25] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200422.3 (#7256) - Microsoft.WindowsDesktop.App: 5.0.0-preview.4.20222.2 -> 5.0.0-preview.4.20222.3 - Microsoft.WindowsDesktop.App.Ref: 5.0.0-preview.4.20222.2 -> 5.0.0-preview.4.20222.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64: 5.0.0-preview.4.20222.2 -> 5.0.0-preview.4.20222.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates: 5.0.0-preview.4.20222.2 -> 5.0.0-preview.4.20222.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc6338fb7..c14e0de23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 6a11ec1eb327bf1f40eb785deb7b4488fb39d14b + 05180a61787abf7b0aa2605fb031a242963a95f6 - + https://github.com/dotnet/windowsdesktop - 6a11ec1eb327bf1f40eb785deb7b4488fb39d14b + 05180a61787abf7b0aa2605fb031a242963a95f6 - + https://github.com/dotnet/windowsdesktop - 6a11ec1eb327bf1f40eb785deb7b4488fb39d14b + 05180a61787abf7b0aa2605fb031a242963a95f6 https://github.com/dotnet/runtime @@ -92,9 +92,9 @@ https://github.com/dotnet/winforms a952e17bb0d3e6d1c795697419fc41c2ca3be430 - + https://github.com/dotnet/wpf - 1f2a4f5df91968f6a6f8a7c165b02dbff6465aa7 + ab0325a0e97c6928a9f31800160f695f2798baf8 diff --git a/eng/Versions.props b/eng/Versions.props index 1856ce899..aa0a8e2b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.4.20222.2 + 5.0.0-preview.4.20222.3 @@ -69,9 +69,9 @@ - 5.0.0-preview.4.20222.2 - 5.0.0-preview.4.20222.2 - 5.0.0-preview.4.20222.2 + 5.0.0-preview.4.20222.3 + 5.0.0-preview.4.20222.3 + 5.0.0-preview.4.20222.3 From a1d140df29766fe78c5d1bb5c169b54ec045b591 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 02:52:07 +0000 Subject: [PATCH 07/25] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200422.4 (#7257) - Microsoft.WindowsDesktop.App: 5.0.0-preview.4.20222.3 -> 5.0.0-preview.4.20222.4 - Microsoft.WindowsDesktop.App.Ref: 5.0.0-preview.4.20222.3 -> 5.0.0-preview.4.20222.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64: 5.0.0-preview.4.20222.3 -> 5.0.0-preview.4.20222.4 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates: 5.0.0-preview.4.20222.3 -> 5.0.0-preview.4.20222.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c14e0de23..668b09ff4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 05180a61787abf7b0aa2605fb031a242963a95f6 + d1cae6c4ce7e938ea4c31ab412ef0e3af4c5e936 - + https://github.com/dotnet/windowsdesktop - 05180a61787abf7b0aa2605fb031a242963a95f6 + d1cae6c4ce7e938ea4c31ab412ef0e3af4c5e936 - + https://github.com/dotnet/windowsdesktop - 05180a61787abf7b0aa2605fb031a242963a95f6 + d1cae6c4ce7e938ea4c31ab412ef0e3af4c5e936 https://github.com/dotnet/runtime @@ -92,9 +92,9 @@ https://github.com/dotnet/winforms a952e17bb0d3e6d1c795697419fc41c2ca3be430 - + https://github.com/dotnet/wpf - ab0325a0e97c6928a9f31800160f695f2798baf8 + 8a2a3c4413d07e30b0113d445db3d4c288aa2763 diff --git a/eng/Versions.props b/eng/Versions.props index aa0a8e2b6..f32c1b7ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.4.20222.3 + 5.0.0-preview.4.20222.4 @@ -69,9 +69,9 @@ - 5.0.0-preview.4.20222.3 - 5.0.0-preview.4.20222.3 - 5.0.0-preview.4.20222.3 + 5.0.0-preview.4.20222.4 + 5.0.0-preview.4.20222.4 + 5.0.0-preview.4.20222.4 From 457f432467ca0b87d4df97f1e7effc0120aaab63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 06:02:24 +0000 Subject: [PATCH 08/25] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200422.5 (#7259) - Microsoft.WindowsDesktop.App: 5.0.0-preview.4.20222.4 -> 5.0.0-preview.4.20222.5 - Microsoft.WindowsDesktop.App.Ref: 5.0.0-preview.4.20222.4 -> 5.0.0-preview.4.20222.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64: 5.0.0-preview.4.20222.4 -> 5.0.0-preview.4.20222.5 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates: 5.0.0-preview.4.20221.5 -> 5.0.0-preview.4.20222.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates: 5.0.0-preview.4.20222.4 -> 5.0.0-preview.4.20222.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 668b09ff4..fbeca4468 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - d1cae6c4ce7e938ea4c31ab412ef0e3af4c5e936 + 964a0e37ec9a561d89ef2ad85852f7a80f485c96 - + https://github.com/dotnet/windowsdesktop - d1cae6c4ce7e938ea4c31ab412ef0e3af4c5e936 + 964a0e37ec9a561d89ef2ad85852f7a80f485c96 - + https://github.com/dotnet/windowsdesktop - d1cae6c4ce7e938ea4c31ab412ef0e3af4c5e936 + 964a0e37ec9a561d89ef2ad85852f7a80f485c96 https://github.com/dotnet/runtime @@ -88,13 +88,13 @@ af10fe4cb05c7b90e2d0b0293dba769b54f396ad - + https://github.com/dotnet/winforms - a952e17bb0d3e6d1c795697419fc41c2ca3be430 + 8c3de4c0ab12cb006515a234b0ef828d498f8b4a - + https://github.com/dotnet/wpf - 8a2a3c4413d07e30b0113d445db3d4c288aa2763 + 15f4d3477b532077f98bf5e6f28e71e342a2c6a6 diff --git a/eng/Versions.props b/eng/Versions.props index f32c1b7ff..116545617 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.4.20221.5 + 5.0.0-preview.4.20222.3 - 5.0.0-preview.4.20222.4 + 5.0.0-preview.4.20222.7 @@ -69,9 +69,9 @@ - 5.0.0-preview.4.20222.4 - 5.0.0-preview.4.20222.4 - 5.0.0-preview.4.20222.4 + 5.0.0-preview.4.20222.5 + 5.0.0-preview.4.20222.5 + 5.0.0-preview.4.20222.5 From b139e17e09c2269dd361342136a5d93f59cc93ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 11:00:52 -0700 Subject: [PATCH 09/25] Update dependencies from https://github.com/dotnet/templating build 20200421.2 (#7233) - Microsoft.DotNet.Common.ItemTemplates: 5.0.0-preview.4.20215.1 -> 5.0.0-preview.4.20221.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbeca4468..6e2b83835 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/test-templates 2720fcade72d709a5d2fe80d0b80fbdac54213f6 - + https://github.com/dotnet/templating - 1b50638acb1defc7d7ccaba5b2a0f4b0c50c0b3d + bb2aad9a623680ecefd731784c97fcbf9e908730 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 116545617..68162c091 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-preview.4.20215.1 + 5.0.0-preview.4.20221.2 From 97c6ec09e9c93bc60c806440aa7843e2e9136062 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 14:22:44 -0700 Subject: [PATCH 10/25] [release/5.0.1xx-preview4] Update dependencies from dotnet/sdk (#7266) * Update dependencies from https://github.com/dotnet/sdk build 20200423.3 - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20223.3 - Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20223.3 * Update dependencies from https://github.com/dotnet/sdk build 20200423.5 - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20223.5 - Microsoft.NET.Sdk: 5.0.100-preview.4.20217.1 -> 5.0.100-preview.4.20223.5 * Switch to using RuntimeInformation APIs instead of deprecated PlatformAbstractions See https://github.com/dotnet/sdk/pull/11076 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Daniel Plaisted --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- global.json | 2 +- test/EndToEnd/GivenSelfContainedAppsRollForward.cs | 3 ++- test/EndToEnd/ProjectBuildTests.cs | 3 ++- .../UnixOnlyFactAttribute.cs | 5 +++-- .../UnixOnlyTheoryAttribute.cs | 4 ++-- .../WindowsOnlyFactAttribute.cs | 4 ++-- .../WindowsOnlyTheoryAttribute.cs | 4 ++-- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e2b83835..f6d2c8501 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/sdk - af10fe4cb05c7b90e2d0b0293dba769b54f396ad + 6fa49e835e87a89231e9193ec51fc7acbbb939af - + https://github.com/dotnet/sdk - af10fe4cb05c7b90e2d0b0293dba769b54f396ad + 6fa49e835e87a89231e9193ec51fc7acbbb939af diff --git a/eng/Versions.props b/eng/Versions.props index 68162c091..4238702ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.4.20217.1 - 5.0.100-preview.4.20217.1 + 5.0.100-preview.4.20223.5 + 5.0.100-preview.4.20223.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/global.json b/global.json index c15eb04d9..db00fc486 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-preview.1.20154.9", + "dotnet": "5.0.100-preview.4.20217.10", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index f90f0b410..297dfd1d5 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.TestFramework; @@ -20,7 +21,7 @@ namespace EndToEnd PackageName = packageName, MinorVersion = minorVersion, // Set RuntimeIdentifier to opt in to roll-forward behavior - RuntimeIdentifier = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier() + RuntimeIdentifier = RuntimeInformation.RuntimeIdentifier }; var testInstance = testProjectCreator.Create(); diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 8a88bbc08..b17b90b73 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Xml.Linq; using Microsoft.DotNet.PlatformAbstractions; using Microsoft.DotNet.TestFramework; @@ -127,7 +128,7 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - var buildArgs = selfContained ? "" :$"-r {RuntimeEnvironment.GetRuntimeIdentifier()}"; + var buildArgs = selfContained ? "" :$"-r {RuntimeInformation.RuntimeIdentifier}"; var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs index 78be9c856..843d0668d 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs @@ -1,7 +1,8 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.DotNet.PlatformAbstractions; + +using System.Runtime.InteropServices; using Xunit; namespace Microsoft.DotNet.Tools.Test.Utilities @@ -10,7 +11,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { public UnixOnlyFactAttribute() { - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { this.Skip = "This test requires Unix to run"; } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs index fe0557b88..461ea7b36 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.DotNet.PlatformAbstractions; +using System.Runtime.InteropServices; using Xunit; namespace Microsoft.DotNet.Tools.Test.Utilities @@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { public UnixOnlyTheoryAttribute() { - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { this.Skip = "This test requires Unix to run"; } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs index 7f9abcccb..079a1af90 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.DotNet.PlatformAbstractions; +using System.Runtime.InteropServices; using Xunit; namespace Microsoft.DotNet.Tools.Test.Utilities @@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { public WindowsOnlyFactAttribute() { - if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { this.Skip = "This test requires Windows to run"; } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs index 8a663433f..98a0267b0 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.DotNet.PlatformAbstractions; +using System.Runtime.InteropServices; using Xunit; namespace Microsoft.DotNet.Tools.Test.Utilities @@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { public WindowsOnlyTheoryAttribute() { - if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { this.Skip = "This test requires Windows to run"; } From fe07a1b971061afb1c37df79b58345deea234e6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 23:14:32 +0000 Subject: [PATCH 11/25] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200423.2 (#7272) - Microsoft.WindowsDesktop.App: 5.0.0-preview.4.20222.5 -> 5.0.0-preview.4.20223.2 - Microsoft.WindowsDesktop.App.Ref: 5.0.0-preview.4.20222.5 -> 5.0.0-preview.4.20223.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64: 5.0.0-preview.4.20222.5 -> 5.0.0-preview.4.20223.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates: 5.0.0-preview.4.20222.7 -> 5.0.0-preview.4.20223.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6d2c8501..a36c148c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 964a0e37ec9a561d89ef2ad85852f7a80f485c96 + bd450fe31719535354256538ff6b65d78cf1d08b - + https://github.com/dotnet/windowsdesktop - 964a0e37ec9a561d89ef2ad85852f7a80f485c96 + bd450fe31719535354256538ff6b65d78cf1d08b - + https://github.com/dotnet/windowsdesktop - 964a0e37ec9a561d89ef2ad85852f7a80f485c96 + bd450fe31719535354256538ff6b65d78cf1d08b https://github.com/dotnet/runtime @@ -92,9 +92,9 @@ https://github.com/dotnet/winforms 8c3de4c0ab12cb006515a234b0ef828d498f8b4a - + https://github.com/dotnet/wpf - 15f4d3477b532077f98bf5e6f28e71e342a2c6a6 + 08dc8b3b451ef24fcca022d82911130c77efa291 diff --git a/eng/Versions.props b/eng/Versions.props index 4238702ea..b10d08758 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.4.20222.7 + 5.0.0-preview.4.20223.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.4.20222.5 - 5.0.0-preview.4.20222.5 - 5.0.0-preview.4.20222.5 + 5.0.0-preview.4.20223.2 + 5.0.0-preview.4.20223.2 + 5.0.0-preview.4.20223.2 From dd5085fef2682fc033c06cd1e63ef13d6deeb11e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Apr 2020 02:35:44 +0000 Subject: [PATCH 12/25] Update dependencies from https://github.com/dotnet/aspnetcore build 20200423.5 (#7276) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 5.0.0-preview.4.20221.8 -> 5.0.0-preview.4.20223.5 - dotnet-dev-certs: 5.0.0-preview.4.20221.8 -> 5.0.0-preview.4.20223.5 - dotnet-user-secrets: 5.0.0-preview.4.20221.8 -> 5.0.0-preview.4.20223.5 - Microsoft.AspNetCore.App.Runtime.win-x64: 5.0.0-preview.4.20221.8 -> 5.0.0-preview.4.20223.5 - Microsoft.AspNetCore.App.Ref: 5.0.0-preview.4.20221.8 -> 5.0.0-preview.4.20223.5 - dotnet-watch: 5.0.0-preview.4.20221.8 -> 5.0.0-preview.4.20223.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a36c148c5..70d57926f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime b7cdadcc6de83f2138dc86dac14870af3b27d373 - + https://github.com/dotnet/aspnetcore - be0084b819798e45d8f8b14786af8cb927d617d2 + 88433aa035f30dd5598d9e67875bd246d839321e - + https://github.com/dotnet/aspnetcore - be0084b819798e45d8f8b14786af8cb927d617d2 + 88433aa035f30dd5598d9e67875bd246d839321e - + https://github.com/dotnet/aspnetcore - be0084b819798e45d8f8b14786af8cb927d617d2 + 88433aa035f30dd5598d9e67875bd246d839321e - + https://github.com/dotnet/aspnetcore - be0084b819798e45d8f8b14786af8cb927d617d2 + 88433aa035f30dd5598d9e67875bd246d839321e - + https://github.com/dotnet/aspnetcore - be0084b819798e45d8f8b14786af8cb927d617d2 + 88433aa035f30dd5598d9e67875bd246d839321e - + https://github.com/dotnet/aspnetcore - be0084b819798e45d8f8b14786af8cb927d617d2 + 88433aa035f30dd5598d9e67875bd246d839321e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b10d08758..dd25f136e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.4.20221.8 - 5.0.0-preview.4.20221.8 - 5.0.0-preview.4.20221.8 - 5.0.0-preview.4.20221.8 - 5.0.0-preview.4.20221.8 - 5.0.0-preview.4.20221.8 + 5.0.0-preview.4.20223.5 + 5.0.0-preview.4.20223.5 + 5.0.0-preview.4.20223.5 + 5.0.0-preview.4.20223.5 + 5.0.0-preview.4.20223.5 + 5.0.0-preview.4.20223.5 0.2.0 From 6156fc47ceadd72b15d8cf23827908514500d920 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Apr 2020 05:25:15 +0000 Subject: [PATCH 13/25] Update dependencies from https://github.com/dotnet/sdk build 20200423.16 (#7278) - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20223.5 -> 5.0.100-preview.4.20223.16 - Microsoft.NET.Sdk: 5.0.100-preview.4.20223.5 -> 5.0.100-preview.4.20223.16 Co-authored-by: dotnet-maestro[bot] --- 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 70d57926f..ad1475645 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/sdk - 6fa49e835e87a89231e9193ec51fc7acbbb939af + dc78dbbefb528994e5bceb412cfbe9595547de76 - + https://github.com/dotnet/sdk - 6fa49e835e87a89231e9193ec51fc7acbbb939af + dc78dbbefb528994e5bceb412cfbe9595547de76 diff --git a/eng/Versions.props b/eng/Versions.props index dd25f136e..724b386be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.4.20223.5 - 5.0.100-preview.4.20223.5 + 5.0.100-preview.4.20223.16 + 5.0.100-preview.4.20223.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 88bd2e8a856152e7d5117f9e47c90226c10cd394 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Apr 2020 06:11:57 +0000 Subject: [PATCH 14/25] Update dependencies from https://github.com/dotnet/sdk build 20200423.17 (#7280) - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20223.16 -> 5.0.100-preview.4.20223.17 - Microsoft.NET.Sdk: 5.0.100-preview.4.20223.16 -> 5.0.100-preview.4.20223.17 Co-authored-by: dotnet-maestro[bot] --- 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 ad1475645..bb1b49ae8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/sdk - dc78dbbefb528994e5bceb412cfbe9595547de76 + 16af34eed788c610680a123673771be8156d0eb1 - + https://github.com/dotnet/sdk - dc78dbbefb528994e5bceb412cfbe9595547de76 + 16af34eed788c610680a123673771be8156d0eb1 diff --git a/eng/Versions.props b/eng/Versions.props index 724b386be..eae374a10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.4.20223.16 - 5.0.100-preview.4.20223.16 + 5.0.100-preview.4.20223.17 + 5.0.100-preview.4.20223.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 75d9dc5f28476ecd757008fc4245f648b075509b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 24 Apr 2020 11:40:44 -0700 Subject: [PATCH 15/25] [master] Update dependencies from dotnet/arcade (#7283) (#7287) * Update dependencies from https://github.com/dotnet/arcade build 20200421.14 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20201.2 -> 5.0.0-beta.20221.14 * Update arcade and add dotnet-tools feed Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> --- NuGet.config | 5 ++- eng/Version.Details.xml | 6 ++-- eng/common/CIBuild.cmd | 2 +- eng/common/PSScriptAnalyzerSettings.psd1 | 2 +- eng/common/SetupNugetSources.ps1 | 14 ++++---- eng/common/cibuild.sh | 2 +- eng/common/cross/arm/sources.list.trusty | 2 +- eng/common/cross/arm/sources.list.xenial | 2 +- eng/common/cross/arm64/sources.list.trusty | 2 +- eng/common/cross/arm64/sources.list.xenial | 2 +- eng/common/cross/build-rootfs.sh | 26 ++++++++------ eng/common/darc-init.ps1 | 2 +- eng/common/dotnet-install.cmd | 2 +- eng/common/generate-graph-files.ps1 | 2 +- eng/common/init-tools-native.cmd | 2 +- eng/common/msbuild.ps1 | 2 +- eng/common/native/install-cmake-test.sh | 2 +- eng/common/native/install-cmake.sh | 2 +- eng/common/performance/perfhelixpublish.proj | 2 +- eng/common/performance/performance-setup.ps1 | 2 +- eng/common/pipeline-logging-functions.sh | 2 +- .../post-build/check-channel-consistency.ps1 | 5 +++ eng/common/post-build/symbols-validation.ps1 | 18 ++++++++-- eng/common/sdk-task.ps1 | 12 +++++++ eng/common/sdl/NuGet.config | 2 +- eng/common/sdl/extract-artifact-packages.ps1 | 4 +-- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 34 ++++++++++--------- eng/common/templates/job/job.yml | 10 ++++++ eng/common/templates/job/performance.yml | 2 +- .../channels/generic-internal-channel.yml | 4 +-- .../channels/generic-public-channel.yml | 4 +-- .../templates/post-build/common-variables.yml | 2 +- .../templates/post-build/post-build.yml | 27 +++++++++++---- .../post-build/setup-maestro-vars.yml | 26 ++++++-------- .../steps/run-script-ifequalelse.yml | 2 +- eng/common/tools.ps1 | 7 ++-- eng/common/tools.sh | 23 ++++++++++--- global.json | 2 +- 39 files changed, 175 insertions(+), 96 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a06f0f7a..9e48ae7d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,11 @@ - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb1b49ae8..b6f44475e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,9 +104,9 @@ - - https://github.com/dotnet/arcade - bce0a98620c1c5a110b2bba9912f3d5929069c6b + + https://dev.azure.com/dnceng/internal/_git/dotnet-arcade + 6764cc0a9b413b2ed861ca93c63352917b15ea4d diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd index 56c2f25ac..ac1f72bf9 100644 --- a/eng/common/CIBuild.cmd +++ b/eng/common/CIBuild.cmd @@ -1,2 +1,2 @@ @echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" \ No newline at end of file +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" diff --git a/eng/common/PSScriptAnalyzerSettings.psd1 b/eng/common/PSScriptAnalyzerSettings.psd1 index 4c1ea7c98..fc7eafc26 100644 --- a/eng/common/PSScriptAnalyzerSettings.psd1 +++ b/eng/common/PSScriptAnalyzerSettings.psd1 @@ -8,4 +8,4 @@ 'PSStandardDSCFunctionsInResource', 'PSUseIdenticalMandatoryParametersForDSC', 'PSUseIdenticalParametersForDSC') -} \ No newline at end of file +} diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a5a1e711d..c3c473eb8 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("value", $Password) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." @@ -123,19 +123,21 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } +$userName = "dn-bot" + # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password $dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } $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 "dn-bot" -Password $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 "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $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 -Password $Password } $doc.Save($filename) diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh index 1a02c0dec..66e3b0ac6 100755 --- a/eng/common/cibuild.sh +++ b/eng/common/cibuild.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ \ No newline at end of file +. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ diff --git a/eng/common/cross/arm/sources.list.trusty b/eng/common/cross/arm/sources.list.trusty index 07d8f88d8..8aa98a259 100644 --- a/eng/common/cross/arm/sources.list.trusty +++ b/eng/common/cross/arm/sources.list.trusty @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse \ No newline at end of file +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.xenial b/eng/common/cross/arm/sources.list.xenial index eacd86b7d..56fbb36a5 100644 --- a/eng/common/cross/arm/sources.list.xenial +++ b/eng/common/cross/arm/sources.list.xenial @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse \ No newline at end of file +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.trusty b/eng/common/cross/arm64/sources.list.trusty index 07d8f88d8..8aa98a259 100644 --- a/eng/common/cross/arm64/sources.list.trusty +++ b/eng/common/cross/arm64/sources.list.trusty @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse \ No newline at end of file +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.xenial b/eng/common/cross/arm64/sources.list.xenial index eacd86b7d..56fbb36a5 100644 --- a/eng/common/cross/arm64/sources.list.xenial +++ b/eng/common/cross/arm64/sources.list.xenial @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse \ No newline at end of file +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 2cdd82d30..6e2312a10 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" @@ -15,6 +17,8 @@ __CodeName=xenial __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) __InitialDir=$PWD __BuildArch=arm +__AlpineArch=armv7 +__QEMUArch=arm __UbuntuArch=armhf __UbuntuRepo="http://ports.ubuntu.com/" __LLDB_Package="liblldb-3.9-dev" @@ -26,9 +30,10 @@ __UbuntuPackages="build-essential" __AlpinePackages="alpine-base" __AlpinePackages+=" build-base" __AlpinePackages+=" linux-headers" -__AlpinePackagesEdgeTesting=" lldb-dev" -__AlpinePackagesEdgeMain=" llvm9-libs" +__AlpinePackagesEdgeCommunity=" lldb-dev" +__AlpinePackagesEdgeMain=" llvm10-libs" __AlpinePackagesEdgeMain+=" python3" +__AlpinePackagesEdgeMain+=" libedit" # symlinks fixer __UbuntuPackages+=" symlinks" @@ -55,12 +60,11 @@ __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" __FreeBSDBase="12.1-RELEASE" -__FreeBSDPkg="1.10.5" +__FreeBSDPkg="1.12.0" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" __FreeBSDPackages+=" lttng-ust" -__FreeBSDPackages+=" llvm-90" __FreeBSDPackages+=" krb5" __UnprocessedBuildArgs= @@ -78,7 +82,7 @@ while :; do arm) __BuildArch=arm __UbuntuArch=armhf - __AlpineArch=armhf + __AlpineArch=armv7 __QEMUArch=arm ;; arm64) @@ -205,7 +209,7 @@ fi if [ -d "$__RootfsDir" ]; then if [ $__SkipUnmount == 0 ]; then - umount $__RootfsDir/* + umount $__RootfsDir/* || true fi rm -rf $__RootfsDir fi @@ -231,9 +235,9 @@ if [[ "$__CodeName" == "alpine" ]]; then add $__AlpinePackagesEdgeMain $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ - -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/community \ -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ - add $__AlpinePackagesEdgeTesting + add $__AlpinePackagesEdgeCommunity rm -r $__ApkToolsDir elif [[ "$__CodeName" == "freebsd" ]]; then @@ -246,7 +250,9 @@ elif [[ "$__CodeName" == "freebsd" ]]; then # get and build package manager wget -O - https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz | tar -C $__RootfsDir/tmp -zxf - cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg} - ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make install + # needed for install to succeed + mkdir -p $__RootfsDir/host/etc + ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make && make install rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg} # install packages we need. $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update @@ -260,7 +266,7 @@ elif [[ -n $__CodeName ]]; then chroot $__RootfsDir symlinks -cr /usr if [ $__SkipUnmount == 0 ]; then - umount $__RootfsDir/* + umount $__RootfsDir/* || true fi if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..94db0527b 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -44,4 +44,4 @@ catch { Write-Host $_.ScriptStackTrace Write-PipelineTelemetryError -Category 'Darc' -Message $_ ExitWithExitCode 1 -} \ No newline at end of file +} diff --git a/eng/common/dotnet-install.cmd b/eng/common/dotnet-install.cmd index b1c2642e7..f74c16cc8 100644 --- a/eng/common/dotnet-install.cmd +++ b/eng/common/dotnet-install.cmd @@ -1,2 +1,2 @@ @echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" \ No newline at end of file +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1 index 0728b1a8b..bc7ad852d 100644 --- a/eng/common/generate-graph-files.ps1 +++ b/eng/common/generate-graph-files.ps1 @@ -83,4 +83,4 @@ catch { ExitWithExitCode 1 } finally { Pop-Location -} \ No newline at end of file +} diff --git a/eng/common/init-tools-native.cmd b/eng/common/init-tools-native.cmd index 438cd548c..10938a23c 100644 --- a/eng/common/init-tools-native.cmd +++ b/eng/common/init-tools-native.cmd @@ -1,3 +1,3 @@ @echo off powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" -exit /b %ErrorLevel% \ No newline at end of file +exit /b %ErrorLevel% diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index c64012300..b2dceff4c 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -23,4 +23,4 @@ catch { ExitWithExitCode 1 } -ExitWithExitCode 0 \ No newline at end of file +ExitWithExitCode 0 diff --git a/eng/common/native/install-cmake-test.sh b/eng/common/native/install-cmake-test.sh index 12339a407..7d1b7136d 100755 --- a/eng/common/native/install-cmake-test.sh +++ b/eng/common/native/install-cmake-test.sh @@ -114,4 +114,4 @@ if [[ $? != 0 ]]; then exit 1 fi -exit 0 \ No newline at end of file +exit 0 diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh index 18041be87..aaa3e3818 100755 --- a/eng/common/native/install-cmake.sh +++ b/eng/common/native/install-cmake.sh @@ -114,4 +114,4 @@ if [[ $? != 0 ]]; then exit 1 fi -exit 0 \ No newline at end of file +exit 0 diff --git a/eng/common/performance/perfhelixpublish.proj b/eng/common/performance/perfhelixpublish.proj index cf5941e1b..f86c3419e 100644 --- a/eng/common/performance/perfhelixpublish.proj +++ b/eng/common/performance/perfhelixpublish.proj @@ -118,4 +118,4 @@ $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - \ No newline at end of file + diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 1763a1a97..5bc6259aa 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -111,4 +111,4 @@ Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $fal 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 +exit 0 diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh index 33c3f0d80..f87f195bb 100755 --- a/eng/common/pipeline-logging-functions.sh +++ b/eng/common/pipeline-logging-functions.sh @@ -176,4 +176,4 @@ function Write-PipelinePrependPath { if [[ "$ci" == true ]]; then echo "##vso[task.prependpath]$prepend_path" fi -} \ No newline at end of file +} diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 7e6618d64..81db7e7fc 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -6,6 +6,11 @@ param( try { . $PSScriptRoot\post-build-utils.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/master/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 { $_ } diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index f7cfe986d..22eeb2656 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -1,7 +1,8 @@ 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=$true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use + [Parameter(Mandatory=$false)][switch] $ContinueOnError # If we should keep checking symbols after an error ) function FirstMatchingSymbolDescriptionOrDefault { @@ -125,6 +126,8 @@ function CheckSymbolsAvailable { Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue } + $TotalFailures = 0 + Get-ChildItem "$InputPath\*.nupkg" | ForEach-Object { $FileName = $_.Name @@ -148,11 +151,22 @@ function CheckSymbolsAvailable { if ($Status -ne 0) { Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $Status modules in the package $FileName" - ExitWithExitCode $exitCode + + if ($ContinueOnError) { + $TotalFailures++ + } + else { + ExitWithExitCode 1 + } } Write-Host } + + if ($TotalFailures -ne 0) { + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures packages" + ExitWithExitCode 1 + } } function InstallDotnetSymbol { diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 3872af59b..79c25e7f3 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -57,6 +57,18 @@ try { ExitWithExitCode 1 } + if( $msbuildEngine -eq "vs") { + # Ensure desktop MSBuild is available for sdk tasks. + if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "vs" )) { + $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.4`" }") -MemberType NoteProperty + } + if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.4.0-alpha" -MemberType NoteProperty + } + + InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true + } + $taskProject = GetSdkTaskProject $task if (!(Test-Path $taskProject)) { Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 0c5451c11..a8213a55c 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 index 9e5f3cb43..7f28d9c59 100644 --- a/eng/common/sdl/extract-artifact-packages.ps1 +++ b/eng/common/sdl/extract-artifact-packages.ps1 @@ -63,7 +63,7 @@ try { } } catch { - Write-Host $_.ScriptStackTrace + Write-Host $_ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ ExitWithExitCode 1 } @@ -74,7 +74,7 @@ try { Measure-Command { ExtractArtifacts } } catch { - Write-Host $_.ScriptStackTrace + Write-Host $_ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ ExitWithExitCode 1 } diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 256ffbfb9..968b39bef 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 640f2b04e..c64c4f568 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,7 @@ parameters: # 'continueOnError', the parameter value is not correctly picked up. # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; + downloadArtifacts: true # optional: determines if the artifacts should be dowloaded dependsOn: '' # Optional: dependencies of the job artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts # Usage: @@ -31,8 +32,20 @@ jobs: steps: - checkout: self clean: true - - ${{ if ne(parameters.artifactNames, '') }}: - - ${{ each artifactName in parameters.artifactNames }}: + - ${{ if ne(parameters.downloadArtifacts, 'false')}}: + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: - task: DownloadBuildArtifacts@0 displayName: Download Build Artifacts inputs: @@ -41,20 +54,9 @@ jobs: project: $(AzDOProjectName) pipeline: $(AzDOPipelineId) buildId: $(AzDOBuildId) - artifactName: ${{ artifactName }} + downloadType: specific files + itemPattern: "**" downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - - ${{ if eq(parameters.artifactNames, '') }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: specific files - itemPattern: "**" - downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts @@ -81,7 +83,7 @@ jobs: continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.7.2 + -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 536c15c46..fc39647f4 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,6 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false + useBuildManifest: false mergeTestResults: false testRunTitle: $(AgentOsName)-$(BuildConfiguration)-xunit name: '' @@ -218,3 +219,12 @@ jobs: ArtifactName: AssetManifests continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if eq(parameters.useBuildManifest, true) }}: + - task: PublishBuildArtifacts@1 + displayName: Publish Build Manifest + inputs: + PathToPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/manifest.props' + PublishLocation: Container + ArtifactName: BuildManifests + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates/job/performance.yml b/eng/common/templates/job/performance.yml index f877fd7a8..53be464a3 100644 --- a/eng/common/templates/job/performance.yml +++ b/eng/common/templates/job/performance.yml @@ -92,4 +92,4 @@ jobs: 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 + CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index dde27800c..258ba4b77 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -23,7 +23,7 @@ stages: - job: publish_symbols displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }})) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats - name: AzDOProjectName @@ -96,7 +96,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - name: AzDOBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }})) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index 08853ec45..bf98d990e 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -25,7 +25,7 @@ stages: - job: publish_symbols displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }})) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats - name: AzDOProjectName @@ -99,7 +99,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - name: ArtifactsCategory value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }} - condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }})) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 867f37cd8..c99fd7503 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -63,7 +63,7 @@ variables: - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion - value: "2019-01-16" + value: "2020-02-20" - name: SourceLinkCLIVersion value: 3.0.0 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d3ab67630..2e1415175 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -9,12 +9,14 @@ parameters: continueOnError: false params: '' artifactNames: '' + downloadArtifacts: true # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' signingValidationAdditionalParameters: '' + useBuildManifest: false # Which stages should finish execution before post-build stages start validateDependsOn: @@ -54,10 +56,8 @@ stages: displayName: Post-build Checks dependsOn: setupMaestroVars variables: - - name: InitialChannels - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'] ] - - name: PromoteToMaestroChannelId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'] ] + - name: TargetChannels + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ] pool: vmImage: 'windows-2019' steps: @@ -65,8 +65,8 @@ stages: displayName: Maestro Channels Consistency inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 - arguments: -PromoteToChannels "$(InitialChannels)[$(PromoteToMaestroChannelId)]" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}}${{parameters.Net5Preview3ChannelId}},${{parameters.Net5Preview4ChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}} + arguments: -PromoteToChannels "$(TargetChannels)" + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview3ChannelId}},${{parameters.Net5Preview4ChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}} - job: displayName: NuGet Validation @@ -114,6 +114,16 @@ stages: pool: vmImage: 'windows-2019' steps: + - ${{ if eq(parameters.useBuildManifest, true) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download build manifest + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BuildManifests - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: @@ -136,11 +146,13 @@ stages: filePath: eng\common\enable-cross-org-publishing.ps1 arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. - task: PowerShell@2 displayName: Validate inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine dotnet + arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} @@ -193,6 +205,7 @@ stages: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} + downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 05e611edb..b3d29d449 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -5,7 +5,9 @@ jobs: - template: common-variables.yml - name: BuildId value: $[ coalesce(variables.BARBuildId, 0) ] - - name: PromoteToChannelId + - name: PromoteToMaestroChannels + value: $[ coalesce(variables.PromoteToChannelIds, 0) ] + - name: PromoteToMaestroChannel value: $[ coalesce(variables.PromoteToMaestroChannelId, 0) ] pool: vmImage: 'windows-2019' @@ -14,7 +16,7 @@ jobs: - task: DownloadBuildArtifacts@0 displayName: Download Release Configs - condition: eq(variables.PromoteToChannelId, 0) + condition: and(eq(variables.PromoteToMaestroChannels, 0), eq(variables.PromoteToMaestroChannel, 0)) inputs: buildType: current artifactName: ReleaseConfigs @@ -26,20 +28,16 @@ jobs: targetType: inline script: | try { - if ($Env:PromoteToChannelId -eq 0) { + if ($Env:PromoteToMaestroChannels -eq 0 -and $Env:PromoteToMaestroChannel -eq 0) { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt $BarId = $Content | Select -Index 0 - - $Channels = "" - $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } - + $Channels = $Content | Select -Index 1 $IsStableBuild = $Content | Select -Index 2 $AzureDevOpsProject = $Env:System_TeamProject $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId $AzureDevOpsBuildId = $Env:Build_BuildId - $PromoteToMaestroChannelId = 0 } else { $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" @@ -51,25 +49,23 @@ jobs: $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } $BarId = $Env:BARBuildId - $Channels = 'None' - - #TODO: Fix this once this issue is done: https://github.com/dotnet/arcade/issues/3834 - $IsStableBuild = 'False' + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels][$Env:PromoteToMaestroChannel]" + $IsStableBuild = $buildInfo.stable $AzureDevOpsProject = $buildInfo.azureDevOpsProject $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - $PromoteToMaestroChannelId = $Env:PromoteToMaestroChannelId } Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId" - Write-Host "##vso[task.setvariable variable=InitialChannels;isOutput=true]$Channels" + Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels" Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild" Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject" Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId" Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId" - Write-Host "##vso[task.setvariable variable=PromoteToMaestroChannelId;isOutput=true]$PromoteToMaestroChannelId" } catch { Write-Host $_ diff --git a/eng/common/templates/steps/run-script-ifequalelse.yml b/eng/common/templates/steps/run-script-ifequalelse.yml index 3d1242f55..2dcd9d12a 100644 --- a/eng/common/templates/steps/run-script-ifequalelse.yml +++ b/eng/common/templates/steps/run-script-ifequalelse.yml @@ -30,4 +30,4 @@ steps: name: ${{ parameters.name }} displayName: ${{ parameters.displayName }} env: ${{ parameters.env }} - condition: ${{ parameters.condition }} \ No newline at end of file + condition: ${{ parameters.condition }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 60c1cd897..3721ce881 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -488,10 +488,11 @@ function GetNuGetPackageCachePath() { if ($env:NUGET_PACKAGES -eq $null) { # Use local cache on CI to ensure deterministic build, # use global cache in dev builds to avoid cost of downloading packages. + # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968 if ($useGlobalNuGetCache) { - $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages' + $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' } else { - $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages' + $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' } } @@ -632,6 +633,8 @@ function MSBuild-Core() { } } + $env:ARCADE_BUILD_TOOL_COMMAND = "$($buildTool.Path) $cmdArgs" + $exitCode = Exec-Process $buildTool.Path $cmdArgs if ($exitCode -ne 0) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index caae1dbdb..a9dff4408 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -201,7 +201,14 @@ function InstallDotNet { local runtimeSourceFeedKey='' if [[ -n "${7:-}" ]]; then - decodedFeedKey=`echo $7 | base64 --decode` + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" + fi + decodedFeedKey=`echo $7 | base64 $decodeArg` runtimeSourceFeedKey="--feed-credential $decodedFeedKey" fi @@ -415,11 +422,17 @@ function MSBuild-Core { warnaserror_switch="/warnaserror" fi - "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || { - local exit_code=$? - Write-PipelineTelemetryError -category 'Build' "Build failed (exit code '$exit_code')." - ExitWithExitCode $exit_code + function RunBuildTool { + export ARCADE_BUILD_TOOL_COMMAND="$_InitializeBuildTool $@" + + "$_InitializeBuildTool" "$@" || { + local exit_code=$? + Write-PipelineTaskError "Build failed (exit code '$exit_code')." + ExitWithExitCode $exit_code + } } + + RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" } ResolvePath "${BASH_SOURCE[0]}" diff --git a/global.json b/global.json index db00fc486..8a7cac54c 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20201.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20224.2" } } From 8544057f17f6092cf45e90f724119bf7b8ffcf5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Apr 2020 19:37:33 +0000 Subject: [PATCH 16/25] Update dependencies from https://github.com/dotnet/runtime build 20200423.6 (#7289) - Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.4.20221.7 -> 5.0.0-preview.4.20223.6 - Microsoft.NETCore.DotNetHostResolver: 5.0.0-preview.4.20221.7 -> 5.0.0-preview.4.20223.6 - Microsoft.NETCore.Platforms: 5.0.0-preview.4.20221.7 -> 5.0.0-preview.4.20223.6 - Microsoft.NETCore.App.Host.win-x64: 5.0.0-preview.4.20221.7 -> 5.0.0-preview.4.20223.6 - Microsoft.NETCore.App.Internal: 5.0.0-preview.4.20221.7 -> 5.0.0-preview.4.20223.6 - Microsoft.NETCore.App.Ref: 5.0.0-preview.4.20221.7 -> 5.0.0-preview.4.20223.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6f44475e..0e8d45e14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop bd450fe31719535354256538ff6b65d78cf1d08b - + https://github.com/dotnet/runtime - b7cdadcc6de83f2138dc86dac14870af3b27d373 + 88c069b819bdfb87afeea4f09c78577e56ea06fa - + https://github.com/dotnet/runtime - b7cdadcc6de83f2138dc86dac14870af3b27d373 + 88c069b819bdfb87afeea4f09c78577e56ea06fa - + https://github.com/dotnet/runtime - b7cdadcc6de83f2138dc86dac14870af3b27d373 + 88c069b819bdfb87afeea4f09c78577e56ea06fa - + https://github.com/dotnet/runtime - b7cdadcc6de83f2138dc86dac14870af3b27d373 + 88c069b819bdfb87afeea4f09c78577e56ea06fa - + https://github.com/dotnet/runtime - b7cdadcc6de83f2138dc86dac14870af3b27d373 + 88c069b819bdfb87afeea4f09c78577e56ea06fa @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b7cdadcc6de83f2138dc86dac14870af3b27d373 + 88c069b819bdfb87afeea4f09c78577e56ea06fa https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index eae374a10..1a688fb57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.4.20221.7 + 5.0.0-preview.4.20223.6 - 5.0.0-preview.4.20221.7 - 5.0.0-preview.4.20221.7 - 5.0.0-preview.4.20221.7 - 5.0.0-preview.4.20221.7 - 5.0.0-preview.4.20221.7 + 5.0.0-preview.4.20223.6 + 5.0.0-preview.4.20223.6 + 5.0.0-preview.4.20223.6 + 5.0.0-preview.4.20223.6 + 5.0.0-preview.4.20223.6 2.1.0 From 737c27c1551644e19583eb5fb4b5824d7b7f1912 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 24 Apr 2020 14:02:27 -0700 Subject: [PATCH 17/25] [release/5.0.1xx-preview4] Generate versions sparsely (#7290) * Publish productVersion sparsely Do not publish the productVersion file in every leg. Publish only in win-x64, so that we don't end up uploading it for every manifest. Publishing breaks in this scenario today. This is a real bug in publishing, but we will probably tighten the restrictions in the Publish to BAR step so that multi-publishign the same asset is an error. Also remove the productCommit-* in cases where we have overlapping rids, which would cause the same problem --- eng/Publishing.props | 6 +++++- src/redist/targets/GenerateBundledVersions.targets | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index c9c74f54e..92d32bac4 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -42,11 +42,15 @@ - + + + + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 490915f9e..b5cd873fe 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -7,7 +7,7 @@ File="$(ArtifactsShippingPackagesDir)productVersion.txt" Lines="$(PackageVersion)" Overwrite="true" - Encoding="ASCII"/> + Encoding="ASCII" /> Date: Sat, 25 Apr 2020 00:57:17 +0000 Subject: [PATCH 18/25] Update dependencies from https://github.com/dotnet/sdk build 20200424.6 (#7295) - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20223.17 -> 5.0.100-preview.4.20224.6 - Microsoft.NET.Sdk: 5.0.100-preview.4.20223.17 -> 5.0.100-preview.4.20224.6 Co-authored-by: dotnet-maestro[bot] --- 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 0e8d45e14..63f217abe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/sdk - 16af34eed788c610680a123673771be8156d0eb1 + 69a1772e0f2abcd7876be308c98338f2a4dbae21 - + https://github.com/dotnet/sdk - 16af34eed788c610680a123673771be8156d0eb1 + 69a1772e0f2abcd7876be308c98338f2a4dbae21 diff --git a/eng/Versions.props b/eng/Versions.props index 1a688fb57..dfbe3471d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.4.20223.17 - 5.0.100-preview.4.20223.17 + 5.0.100-preview.4.20224.6 + 5.0.100-preview.4.20224.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 88aa6996885da8b95606c2e588a09cb9b1e57dd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 26 Apr 2020 08:40:30 +0000 Subject: [PATCH 19/25] Update dependencies from https://github.com/dotnet/sdk build 20200426.1 (#7309) - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20224.6 -> 5.0.100-preview.4.20226.1 - Microsoft.NET.Sdk: 5.0.100-preview.4.20224.6 -> 5.0.100-preview.4.20226.1 Co-authored-by: dotnet-maestro[bot] --- 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 63f217abe..2ef615366 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/sdk - 69a1772e0f2abcd7876be308c98338f2a4dbae21 + 49512728f11e1f23ae836396b1a6d9aaa6dd2f90 - + https://github.com/dotnet/sdk - 69a1772e0f2abcd7876be308c98338f2a4dbae21 + 49512728f11e1f23ae836396b1a6d9aaa6dd2f90 diff --git a/eng/Versions.props b/eng/Versions.props index dfbe3471d..91832d734 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.4.20224.6 - 5.0.100-preview.4.20224.6 + 5.0.100-preview.4.20226.1 + 5.0.100-preview.4.20226.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 13e6ba4d5c91cc489e72821790eeabc0e60ff1c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 08:26:59 +0000 Subject: [PATCH 20/25] Update dependencies from https://github.com/dotnet/runtime build 20200423.9 (#7293) - Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.4.20223.6 -> 5.0.0-preview.4.20223.9 - Microsoft.NETCore.DotNetHostResolver: 5.0.0-preview.4.20223.6 -> 5.0.0-preview.4.20223.9 - Microsoft.NETCore.Platforms: 5.0.0-preview.4.20223.6 -> 5.0.0-preview.4.20223.9 - Microsoft.NETCore.App.Host.win-x64: 5.0.0-preview.4.20223.6 -> 5.0.0-preview.4.20223.9 - Microsoft.NETCore.App.Internal: 5.0.0-preview.4.20223.6 -> 5.0.0-preview.4.20223.9 - Microsoft.NETCore.App.Ref: 5.0.0-preview.4.20223.6 -> 5.0.0-preview.4.20223.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ef615366..39baa0e55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop bd450fe31719535354256538ff6b65d78cf1d08b - + https://github.com/dotnet/runtime - 88c069b819bdfb87afeea4f09c78577e56ea06fa + 0ce44af8241fafb5c6080b111cc00391308db681 - + https://github.com/dotnet/runtime - 88c069b819bdfb87afeea4f09c78577e56ea06fa + 0ce44af8241fafb5c6080b111cc00391308db681 - + https://github.com/dotnet/runtime - 88c069b819bdfb87afeea4f09c78577e56ea06fa + 0ce44af8241fafb5c6080b111cc00391308db681 - + https://github.com/dotnet/runtime - 88c069b819bdfb87afeea4f09c78577e56ea06fa + 0ce44af8241fafb5c6080b111cc00391308db681 - + https://github.com/dotnet/runtime - 88c069b819bdfb87afeea4f09c78577e56ea06fa + 0ce44af8241fafb5c6080b111cc00391308db681 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 88c069b819bdfb87afeea4f09c78577e56ea06fa + 0ce44af8241fafb5c6080b111cc00391308db681 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 91832d734..6df0c1d50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.4.20223.6 + 5.0.0-preview.4.20223.9 - 5.0.0-preview.4.20223.6 - 5.0.0-preview.4.20223.6 - 5.0.0-preview.4.20223.6 - 5.0.0-preview.4.20223.6 - 5.0.0-preview.4.20223.6 + 5.0.0-preview.4.20223.9 + 5.0.0-preview.4.20223.9 + 5.0.0-preview.4.20223.9 + 5.0.0-preview.4.20223.9 + 5.0.0-preview.4.20223.9 2.1.0 From 7c5c2217e346cc818a110e34475453cdbdfd12d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 12:45:11 +0000 Subject: [PATCH 21/25] Update dependencies from https://github.com/dotnet/sdk build 20200427.2 (#7315) - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20226.1 -> 5.0.100-preview.4.20227.2 - Microsoft.NET.Sdk: 5.0.100-preview.4.20226.1 -> 5.0.100-preview.4.20227.2 Co-authored-by: dotnet-maestro[bot] --- 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 39baa0e55..85a5f0037 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/sdk - 49512728f11e1f23ae836396b1a6d9aaa6dd2f90 + 9e9ffad1f76102b9ffb8c3a77a72f7e02e1ff3f6 - + https://github.com/dotnet/sdk - 49512728f11e1f23ae836396b1a6d9aaa6dd2f90 + 9e9ffad1f76102b9ffb8c3a77a72f7e02e1ff3f6 diff --git a/eng/Versions.props b/eng/Versions.props index 6df0c1d50..b4a07cc31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.4.20226.1 - 5.0.100-preview.4.20226.1 + 5.0.100-preview.4.20227.2 + 5.0.100-preview.4.20227.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0956e6290d936672b2f99597cb368cf01a3c6e17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 13:14:53 +0000 Subject: [PATCH 22/25] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200427.1 (#7316) - Microsoft.WindowsDesktop.App: 5.0.0-preview.4.20223.2 -> 5.0.0-preview.4.20227.1 - Microsoft.WindowsDesktop.App.Ref: 5.0.0-preview.4.20223.2 -> 5.0.0-preview.4.20227.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64: 5.0.0-preview.4.20223.2 -> 5.0.0-preview.4.20227.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates: 5.0.0-preview.4.20222.3 -> 5.0.0-preview.4.20226.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates: 5.0.0-preview.4.20223.2 -> 5.0.0-preview.4.20227.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85a5f0037..66b76737a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - bd450fe31719535354256538ff6b65d78cf1d08b + 7b655f32170c795946f3dcbdecd45adf455c5d39 - + https://github.com/dotnet/windowsdesktop - bd450fe31719535354256538ff6b65d78cf1d08b + 7b655f32170c795946f3dcbdecd45adf455c5d39 - + https://github.com/dotnet/windowsdesktop - bd450fe31719535354256538ff6b65d78cf1d08b + 7b655f32170c795946f3dcbdecd45adf455c5d39 https://github.com/dotnet/runtime @@ -88,13 +88,13 @@ 9e9ffad1f76102b9ffb8c3a77a72f7e02e1ff3f6 - + https://github.com/dotnet/winforms - 8c3de4c0ab12cb006515a234b0ef828d498f8b4a + cecabf9c88a0212c484162248670fb7ac26293ff - + https://github.com/dotnet/wpf - 08dc8b3b451ef24fcca022d82911130c77efa291 + 9aeeeb4793e16f87f8426fdcb5c9333ffa13e996 diff --git a/eng/Versions.props b/eng/Versions.props index b4a07cc31..030bbcaf0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.4.20222.3 + 5.0.0-preview.4.20226.4 - 5.0.0-preview.4.20223.2 + 5.0.0-preview.4.20227.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.4.20223.2 - 5.0.0-preview.4.20223.2 - 5.0.0-preview.4.20223.2 + 5.0.0-preview.4.20227.1 + 5.0.0-preview.4.20227.1 + 5.0.0-preview.4.20227.1 From 4991147773d2480aeb3c140766d95f230d482b87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 18:10:30 +0000 Subject: [PATCH 23/25] Update dependencies from https://github.com/dotnet/aspnetcore build 20200424.4 (#7323) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 5.0.0-preview.4.20223.5 -> 5.0.0-preview.4.20224.4 - dotnet-dev-certs: 5.0.0-preview.4.20223.5 -> 5.0.0-preview.4.20224.4 - dotnet-user-secrets: 5.0.0-preview.4.20223.5 -> 5.0.0-preview.4.20224.4 - Microsoft.AspNetCore.App.Runtime.win-x64: 5.0.0-preview.4.20223.5 -> 5.0.0-preview.4.20224.4 - Microsoft.AspNetCore.App.Ref: 5.0.0-preview.4.20223.5 -> 5.0.0-preview.4.20224.4 - dotnet-watch: 5.0.0-preview.4.20223.5 -> 5.0.0-preview.4.20224.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66b76737a..a0392ddf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 0ce44af8241fafb5c6080b111cc00391308db681 - + https://github.com/dotnet/aspnetcore - 88433aa035f30dd5598d9e67875bd246d839321e + 55b362d085c5b0f770070858a8299c81658fe028 - + https://github.com/dotnet/aspnetcore - 88433aa035f30dd5598d9e67875bd246d839321e + 55b362d085c5b0f770070858a8299c81658fe028 - + https://github.com/dotnet/aspnetcore - 88433aa035f30dd5598d9e67875bd246d839321e + 55b362d085c5b0f770070858a8299c81658fe028 - + https://github.com/dotnet/aspnetcore - 88433aa035f30dd5598d9e67875bd246d839321e + 55b362d085c5b0f770070858a8299c81658fe028 - + https://github.com/dotnet/aspnetcore - 88433aa035f30dd5598d9e67875bd246d839321e + 55b362d085c5b0f770070858a8299c81658fe028 - + https://github.com/dotnet/aspnetcore - 88433aa035f30dd5598d9e67875bd246d839321e + 55b362d085c5b0f770070858a8299c81658fe028 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 030bbcaf0..1d19f6e1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.4.20223.5 - 5.0.0-preview.4.20223.5 - 5.0.0-preview.4.20223.5 - 5.0.0-preview.4.20223.5 - 5.0.0-preview.4.20223.5 - 5.0.0-preview.4.20223.5 + 5.0.0-preview.4.20224.4 + 5.0.0-preview.4.20224.4 + 5.0.0-preview.4.20224.4 + 5.0.0-preview.4.20224.4 + 5.0.0-preview.4.20224.4 + 5.0.0-preview.4.20224.4 0.2.0 From c10c339e7ecf29e00b5d02965174d27ff28d43f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Apr 2020 02:17:31 +0000 Subject: [PATCH 24/25] [release/5.0.1xx-preview4] Update dependencies from dotnet/sdk (#7322) * Update dependencies from https://github.com/dotnet/sdk build 20200427.4 - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20227.2 -> 5.0.100-preview.4.20227.4 - Microsoft.NET.Sdk: 5.0.100-preview.4.20227.2 -> 5.0.100-preview.4.20227.4 * Update dependencies from https://github.com/dotnet/sdk build 20200427.7 - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20227.2 -> 5.0.100-preview.4.20227.7 - Microsoft.NET.Sdk: 5.0.100-preview.4.20227.2 -> 5.0.100-preview.4.20227.7 Co-authored-by: dotnet-maestro[bot] --- 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 a0392ddf4..978c27f22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/sdk - 9e9ffad1f76102b9ffb8c3a77a72f7e02e1ff3f6 + 30fafb83a9791ce1dbc4d2ce45f9730ef979e031 - + https://github.com/dotnet/sdk - 9e9ffad1f76102b9ffb8c3a77a72f7e02e1ff3f6 + 30fafb83a9791ce1dbc4d2ce45f9730ef979e031 diff --git a/eng/Versions.props b/eng/Versions.props index 1d19f6e1a..5ac6ffb15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.4.20227.2 - 5.0.100-preview.4.20227.2 + 5.0.100-preview.4.20227.7 + 5.0.100-preview.4.20227.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d66b374d3b5ad39859e8317b40d4df4ac001f1bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 00:58:29 +0000 Subject: [PATCH 25/25] Update dependencies from https://github.com/dotnet/sdk build 20200428.8 (#7340) - Microsoft.DotNet.MSBuildSdkResolver: 5.0.100-preview.4.20227.7 -> 5.0.100-preview.4.20228.8 - Microsoft.NET.Sdk: 5.0.100-preview.4.20227.7 -> 5.0.100-preview.4.20228.8 Co-authored-by: dotnet-maestro[bot] --- 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 978c27f22..5b0ddf052 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/sdk - 30fafb83a9791ce1dbc4d2ce45f9730ef979e031 + e6bd50cfa062805a2550f9ba1658881a0216e1f0 - + https://github.com/dotnet/sdk - 30fafb83a9791ce1dbc4d2ce45f9730ef979e031 + e6bd50cfa062805a2550f9ba1658881a0216e1f0 diff --git a/eng/Versions.props b/eng/Versions.props index 5ac6ffb15..8f168c031 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.4.20227.7 - 5.0.100-preview.4.20227.7 + 5.0.100-preview.4.20228.8 + 5.0.100-preview.4.20228.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)