From 3ee962859a20e236018cc253d270e2850dee88dc Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 31 Mar 2020 15:40:49 -0700 Subject: [PATCH 01/20] Update channel info and stage dependencies for preview3 --- .vsts-ci.yml | 2 +- src/CopyToLatest/targets/BranchInfo.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2954264c2..500e96e33 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -230,7 +230,7 @@ stages: dependsOn: # This will run only after all the publishing stages have run. # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - - NetCore_Dev5_Publish + - Net5_Preview3_Publish jobs: - job: Copy_SDK_To_Latest pool: diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index 9bd214aa9..08f0cef99 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - master + release/5.0.1xx-preview3 From 64c735dc557b5a6e707d344ad2a7e14decda0bb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 05:48:35 +0000 Subject: [PATCH 02/20] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200331.12 (#7010) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20181.12 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20181.12 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20181.12 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20180.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20181.13 (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 7c2786b24..7acf784f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 782ad0dc9914821cc2ad1b9c8de6630a044d3576 + a6c334f0aa0df17ae04847041049c9cc9a7cf3b1 - + https://github.com/dotnet/windowsdesktop - 782ad0dc9914821cc2ad1b9c8de6630a044d3576 + a6c334f0aa0df17ae04847041049c9cc9a7cf3b1 - + https://github.com/dotnet/windowsdesktop - 782ad0dc9914821cc2ad1b9c8de6630a044d3576 + a6c334f0aa0df17ae04847041049c9cc9a7cf3b1 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ c7272154b12830d822c7414b5ed4c765b3c0c415 - + https://github.com/dotnet/winforms - cf98008886b999206fd4de4666b1e4b904577f4f + 8138bd0e8bd045589aa735ee1501acec40923eb6 - + https://github.com/dotnet/wpf - 1283ba2a8dff8235ef239619542af858d5c119c6 + 2a7a3bc14e0a7d7165c19b7d9e4615e556b023f6 diff --git a/eng/Versions.props b/eng/Versions.props index 4a0e21c82..0388f466f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.4.20180.4 + 5.0.0-preview.3.20180.1 - 5.0.0-preview.4.20180.7 + 5.0.0-preview.3.20181.13 @@ -69,9 +69,9 @@ - 5.0.0-preview.4.20180.8 - 5.0.0-preview.4.20180.8 - 5.0.0-preview.4.20180.8 + 5.0.0-preview.3.20181.12 + 5.0.0-preview.3.20181.12 + 5.0.0-preview.3.20181.12 From a1d7061f10113e328d21541f18d5de27a62a9a85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 19:01:56 +0000 Subject: [PATCH 03/20] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200401.2 (#7016) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20201.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20201.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20201.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20181.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20201.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 7acf784f2..9d4c1c413 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - a6c334f0aa0df17ae04847041049c9cc9a7cf3b1 + d455df84028c76ca7a8aaa934036f482a04a3fdd - + https://github.com/dotnet/windowsdesktop - a6c334f0aa0df17ae04847041049c9cc9a7cf3b1 + d455df84028c76ca7a8aaa934036f482a04a3fdd - + https://github.com/dotnet/windowsdesktop - a6c334f0aa0df17ae04847041049c9cc9a7cf3b1 + d455df84028c76ca7a8aaa934036f482a04a3fdd https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ c7272154b12830d822c7414b5ed4c765b3c0c415 - + https://github.com/dotnet/winforms - 8138bd0e8bd045589aa735ee1501acec40923eb6 + 17d421f36541633c21682b297ca30740d8b539e1 - + https://github.com/dotnet/wpf - 2a7a3bc14e0a7d7165c19b7d9e4615e556b023f6 + 9decc5c6fa69644eabd6e5128defc29e732d3fc5 diff --git a/eng/Versions.props b/eng/Versions.props index 0388f466f..72e2208ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20180.1 + 5.0.0-preview.3.20181.1 - 5.0.0-preview.3.20181.13 + 5.0.0-preview.3.20201.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20181.12 - 5.0.0-preview.3.20181.12 - 5.0.0-preview.3.20181.12 + 5.0.0-preview.3.20201.2 + 5.0.0-preview.3.20201.2 + 5.0.0-preview.3.20201.2 From 374aeabfaabfa5436ab9a533d61b92ef66dbcb52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 Apr 2020 12:30:31 +0000 Subject: [PATCH 04/20] Update dependencies from https://github.com/dotnet/templating build 20200402.1 (#7023) - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.3.20202.1 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 9d4c1c413..e89c0b0cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/test-templates 2720fcade72d709a5d2fe80d0b80fbdac54213f6 - + https://github.com/dotnet/templating - fa46a9dfc516de0c4049d3f2951fdee8e5065ff8 + 3afa35569f53dceabbff596010f52ea328b0d5f8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 72e2208ac..0f874dc2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-preview.3.20181.1 + 5.0.0-preview.3.20202.1 From 8d27884dd180f61abc6b42ad95fd5d4bf22a977c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 Apr 2020 15:53:56 +0000 Subject: [PATCH 05/20] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200401.4 (#7020) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20201.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20201.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20201.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e89c0b0cd..c1e16858c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - d455df84028c76ca7a8aaa934036f482a04a3fdd + 164016bc4e9c42ad7d4bcc51cb84589a391c65a6 - + https://github.com/dotnet/windowsdesktop - d455df84028c76ca7a8aaa934036f482a04a3fdd + 164016bc4e9c42ad7d4bcc51cb84589a391c65a6 - + https://github.com/dotnet/windowsdesktop - d455df84028c76ca7a8aaa934036f482a04a3fdd + 164016bc4e9c42ad7d4bcc51cb84589a391c65a6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0f874dc2d..4350f0e2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20201.2 - 5.0.0-preview.3.20201.2 - 5.0.0-preview.3.20201.2 + 5.0.0-preview.3.20201.4 + 5.0.0-preview.3.20201.4 + 5.0.0-preview.3.20201.4 From c9a638313ed988d148799aba9db563efda4b8244 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Apr 2020 02:38:12 +0000 Subject: [PATCH 06/20] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200402.9 (#7033) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20202.9 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20202.9 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20202.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1e16858c..db57bb002 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 164016bc4e9c42ad7d4bcc51cb84589a391c65a6 + 0fd1137872d12fc4cc2d0e34f120ea4d03adac41 - + https://github.com/dotnet/windowsdesktop - 164016bc4e9c42ad7d4bcc51cb84589a391c65a6 + 0fd1137872d12fc4cc2d0e34f120ea4d03adac41 - + https://github.com/dotnet/windowsdesktop - 164016bc4e9c42ad7d4bcc51cb84589a391c65a6 + 0fd1137872d12fc4cc2d0e34f120ea4d03adac41 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4350f0e2e..17316281e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20201.4 - 5.0.0-preview.3.20201.4 - 5.0.0-preview.3.20201.4 + 5.0.0-preview.3.20202.9 + 5.0.0-preview.3.20202.9 + 5.0.0-preview.3.20202.9 From 147e102ed83bbe3d1d623d4cbd0a521f3c695498 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 01:20:19 +0000 Subject: [PATCH 07/20] [release/5.0.1xx-preview3] Update dependencies from dotnet/runtime (#7005) * Update dependencies from https://github.com/dotnet/runtime build 20200331.15 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20181.15 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20181.15 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20181.15 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20181.15 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20181.15 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20181.15 * Update dependencies from https://github.com/dotnet/runtime build 20200401.7 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20201.7 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20201.7 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20201.7 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20201.7 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20201.7 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20201.7 * Update dependencies from https://github.com/dotnet/runtime build 20200402.4 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20202.4 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20202.4 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20202.4 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20202.4 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20202.4 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20202.4 * Update dependencies from https://github.com/dotnet/runtime build 20200406.14 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20206.14 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20206.14 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20206.14 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20206.14 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20206.14 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20206.14 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 db57bb002..28dc56c62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 0fd1137872d12fc4cc2d0e34f120ea4d03adac41 - + https://github.com/dotnet/runtime - bc28cbef855fdb9cb3769c41276b62d49326b215 + 3cda53187710a77afb1a644b1729be9ff639a14d - + https://github.com/dotnet/runtime - bc28cbef855fdb9cb3769c41276b62d49326b215 + 3cda53187710a77afb1a644b1729be9ff639a14d - + https://github.com/dotnet/runtime - bc28cbef855fdb9cb3769c41276b62d49326b215 + 3cda53187710a77afb1a644b1729be9ff639a14d - + https://github.com/dotnet/runtime - bc28cbef855fdb9cb3769c41276b62d49326b215 + 3cda53187710a77afb1a644b1729be9ff639a14d - + https://github.com/dotnet/runtime - bc28cbef855fdb9cb3769c41276b62d49326b215 + 3cda53187710a77afb1a644b1729be9ff639a14d @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - bc28cbef855fdb9cb3769c41276b62d49326b215 + 3cda53187710a77afb1a644b1729be9ff639a14d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 17316281e..6b939c821 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20206.14 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20206.14 + 5.0.0-preview.3.20206.14 + 5.0.0-preview.3.20206.14 + 5.0.0-preview.3.20206.14 + 5.0.0-preview.3.20206.14 2.1.0 From 0170db604bb34dc683eda8e02db83f7823cd5038 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 02:09:22 +0000 Subject: [PATCH 08/20] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200406.4 (#7045) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20206.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20206.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20206.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28dc56c62..e86aea331 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 0fd1137872d12fc4cc2d0e34f120ea4d03adac41 + bbe89b2fde13f2fcd60906aa48177c121a478235 - + https://github.com/dotnet/windowsdesktop - 0fd1137872d12fc4cc2d0e34f120ea4d03adac41 + bbe89b2fde13f2fcd60906aa48177c121a478235 - + https://github.com/dotnet/windowsdesktop - 0fd1137872d12fc4cc2d0e34f120ea4d03adac41 + bbe89b2fde13f2fcd60906aa48177c121a478235 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6b939c821..5046cd736 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20202.9 - 5.0.0-preview.3.20202.9 - 5.0.0-preview.3.20202.9 + 5.0.0-preview.3.20206.4 + 5.0.0-preview.3.20206.4 + 5.0.0-preview.3.20206.4 From b39800297bea56a622a0e8829556fcbd1650d26c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 03:13:50 +0000 Subject: [PATCH 09/20] [release/5.0.1xx-preview3] Update dependencies from dotnet/sdk (#6999) * Update dependencies from https://github.com/dotnet/sdk build 20200331.9 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20181.9 - Microsoft.NET.Sdk - 5.0.100-preview.3.20181.9 * Update dependencies from https://github.com/dotnet/sdk build 20200331.12 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20181.12 - Microsoft.NET.Sdk - 5.0.100-preview.3.20181.12 * Update dependencies from https://github.com/dotnet/sdk build 20200331.14 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20181.14 - Microsoft.NET.Sdk - 5.0.100-preview.3.20181.14 * Update dependencies from https://github.com/dotnet/sdk build 20200401.5 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20201.5 - Microsoft.NET.Sdk - 5.0.100-preview.3.20201.5 * Update dependencies from https://github.com/dotnet/sdk build 20200401.9 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20201.9 - Microsoft.NET.Sdk - 5.0.100-preview.3.20201.9 * Update dependencies from https://github.com/dotnet/sdk build 20200401.11 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20201.11 - Microsoft.NET.Sdk - 5.0.100-preview.3.20201.11 * Update dependencies from https://github.com/dotnet/sdk build 20200401.13 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20201.13 - Microsoft.NET.Sdk - 5.0.100-preview.3.20201.13 * Update dependencies from https://github.com/dotnet/sdk build 20200401.15 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20201.15 - Microsoft.NET.Sdk - 5.0.100-preview.3.20201.15 * Update dependencies from https://github.com/dotnet/sdk build 20200401.16 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20201.16 - Microsoft.NET.Sdk - 5.0.100-preview.3.20201.16 * Update dependencies from https://github.com/dotnet/sdk build 20200401.17 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20201.17 - Microsoft.NET.Sdk - 5.0.100-preview.3.20201.17 * Update dependencies from https://github.com/dotnet/sdk build 20200402.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20202.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20202.1 * Update dependencies from https://github.com/dotnet/sdk build 20200402.6 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20202.6 - Microsoft.NET.Sdk - 5.0.100-preview.3.20202.6 * Update dependencies from https://github.com/dotnet/sdk build 20200402.10 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20202.10 - Microsoft.NET.Sdk - 5.0.100-preview.3.20202.10 * Update dependencies from https://github.com/dotnet/sdk build 20200402.15 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20202.15 - Microsoft.NET.Sdk - 5.0.100-preview.3.20202.15 * Update dependencies from https://github.com/dotnet/sdk build 20200402.16 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20202.16 - Microsoft.NET.Sdk - 5.0.100-preview.3.20202.16 * Update dependencies from https://github.com/dotnet/sdk build 20200402.20 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20202.20 - Microsoft.NET.Sdk - 5.0.100-preview.3.20202.20 * Update dependencies from https://github.com/dotnet/sdk build 20200403.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20203.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20203.2 * Update dependencies from https://github.com/dotnet/sdk build 20200403.6 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20203.6 - Microsoft.NET.Sdk - 5.0.100-preview.3.20203.6 * Update dependencies from https://github.com/dotnet/sdk build 20200403.12 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20203.12 - Microsoft.NET.Sdk - 5.0.100-preview.3.20203.12 * Update dependencies from https://github.com/dotnet/sdk build 20200404.5 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20204.5 - Microsoft.NET.Sdk - 5.0.100-preview.3.20204.5 * Update dependencies from https://github.com/dotnet/sdk build 20200405.3 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20205.3 - Microsoft.NET.Sdk - 5.0.100-preview.3.20205.3 * Update dependencies from https://github.com/dotnet/sdk build 20200406.4 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20206.4 - Microsoft.NET.Sdk - 5.0.100-preview.3.20206.4 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 e86aea331..f7f6a32e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 3afa35569f53dceabbff596010f52ea328b0d5f8 - + https://github.com/dotnet/sdk - c7272154b12830d822c7414b5ed4c765b3c0c415 + fe6e5d9c05d66b3f3a4374ff0988e83762ef9746 - + https://github.com/dotnet/sdk - c7272154b12830d822c7414b5ed4c765b3c0c415 + fe6e5d9c05d66b3f3a4374ff0988e83762ef9746 diff --git a/eng/Versions.props b/eng/Versions.props index 5046cd736..463c22b13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20174.1 - 5.0.100-preview.3.20174.1 + 5.0.100-preview.3.20206.4 + 5.0.100-preview.3.20206.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b1603a90c88143467d03f3f78c08a9dacf312a03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 04:12:33 +0000 Subject: [PATCH 10/20] Update dependencies from https://github.com/dotnet/sdk build 20200406.5 (#7046) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20206.5 - Microsoft.NET.Sdk - 5.0.100-preview.3.20206.5 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 f7f6a32e3..1452d7845 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 3afa35569f53dceabbff596010f52ea328b0d5f8 - + https://github.com/dotnet/sdk - fe6e5d9c05d66b3f3a4374ff0988e83762ef9746 + 07ca2aa026a07c80eb2f24018e8d43e6306c824d - + https://github.com/dotnet/sdk - fe6e5d9c05d66b3f3a4374ff0988e83762ef9746 + 07ca2aa026a07c80eb2f24018e8d43e6306c824d diff --git a/eng/Versions.props b/eng/Versions.props index 463c22b13..193617b4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20206.4 - 5.0.100-preview.3.20206.4 + 5.0.100-preview.3.20206.5 + 5.0.100-preview.3.20206.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0a3d434af4e77c2459ad58e3d230d8a72441fa8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 04:47:26 +0000 Subject: [PATCH 11/20] [release/5.0.1xx-preview3] Update dependencies from dotnet/aspnetcore (#7001) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200331.7 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20181.7 - dotnet-dev-certs - 5.0.0-preview.3.20181.7 - dotnet-user-secrets - 5.0.0-preview.3.20181.7 - dotnet-watch - 5.0.0-preview.3.20181.7 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20181.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20181.7 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200401.12 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20201.12 - dotnet-dev-certs - 5.0.0-preview.3.20201.12 - dotnet-user-secrets - 5.0.0-preview.3.20201.12 - dotnet-watch - 5.0.0-preview.3.20201.12 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20201.12 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20201.12 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200402.12 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20202.12 - dotnet-dev-certs - 5.0.0-preview.3.20202.12 - dotnet-user-secrets - 5.0.0-preview.3.20202.12 - dotnet-watch - 5.0.0-preview.3.20202.12 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20202.12 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20202.12 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200403.1 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20203.1 - dotnet-dev-certs - 5.0.0-preview.3.20203.1 - dotnet-user-secrets - 5.0.0-preview.3.20203.1 - dotnet-watch - 5.0.0-preview.3.20203.1 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20203.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20203.1 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200403.8 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20203.8 - dotnet-dev-certs - 5.0.0-preview.3.20203.8 - dotnet-user-secrets - 5.0.0-preview.3.20203.8 - dotnet-watch - 5.0.0-preview.3.20203.8 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20203.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20203.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 1452d7845..3e926c57a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 3cda53187710a77afb1a644b1729be9ff639a14d - + https://github.com/dotnet/aspnetcore - a2d8852186643561d783e5ea6c9bc65fc97810ce + 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 - + https://github.com/dotnet/aspnetcore - a2d8852186643561d783e5ea6c9bc65fc97810ce + 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 - + https://github.com/dotnet/aspnetcore - a2d8852186643561d783e5ea6c9bc65fc97810ce + 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 - + https://github.com/dotnet/aspnetcore - a2d8852186643561d783e5ea6c9bc65fc97810ce + 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 - + https://github.com/dotnet/aspnetcore - a2d8852186643561d783e5ea6c9bc65fc97810ce + 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 - + https://github.com/dotnet/aspnetcore - a2d8852186643561d783e5ea6c9bc65fc97810ce + 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 193617b4c..dbf846a24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.3.20170.2 - 5.0.0-preview.3.20170.2 - 5.0.0-preview.3.20170.2 - 5.0.0-preview.3.20170.2 - 5.0.0-preview.3.20170.2 - 5.0.0-preview.3.20170.2 + 5.0.0-preview.3.20203.8 + 5.0.0-preview.3.20203.8 + 5.0.0-preview.3.20203.8 + 5.0.0-preview.3.20203.8 + 5.0.0-preview.3.20203.8 + 5.0.0-preview.3.20203.8 0.2.0 From 892c754da3b58aa03117d0f02f4fb0a4287ec524 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 05:08:16 +0000 Subject: [PATCH 12/20] Update dependencies from https://github.com/dotnet/sdk build 20200406.6 (#7047) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20206.6 - Microsoft.NET.Sdk - 5.0.100-preview.3.20206.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 3e926c57a..493e90c94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 3afa35569f53dceabbff596010f52ea328b0d5f8 - + https://github.com/dotnet/sdk - 07ca2aa026a07c80eb2f24018e8d43e6306c824d + 85fb34966aee02de444151640c954227dbfb4e75 - + https://github.com/dotnet/sdk - 07ca2aa026a07c80eb2f24018e8d43e6306c824d + 85fb34966aee02de444151640c954227dbfb4e75 diff --git a/eng/Versions.props b/eng/Versions.props index dbf846a24..ddc6666f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20206.5 - 5.0.100-preview.3.20206.5 + 5.0.100-preview.3.20206.6 + 5.0.100-preview.3.20206.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1c6054feb07a4ddb87d67a4ca21a15db38c35655 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 08:01:38 +0000 Subject: [PATCH 13/20] Update dependencies from https://github.com/dotnet/sdk build 20200406.7 (#7048) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20206.7 - Microsoft.NET.Sdk - 5.0.100-preview.3.20206.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 493e90c94..1d481b67a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 3afa35569f53dceabbff596010f52ea328b0d5f8 - + https://github.com/dotnet/sdk - 85fb34966aee02de444151640c954227dbfb4e75 + 848039ad0c06bb8ada2662f1cb889ed4064a7f97 - + https://github.com/dotnet/sdk - 85fb34966aee02de444151640c954227dbfb4e75 + 848039ad0c06bb8ada2662f1cb889ed4064a7f97 diff --git a/eng/Versions.props b/eng/Versions.props index ddc6666f9..c663a6deb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20206.6 - 5.0.100-preview.3.20206.6 + 5.0.100-preview.3.20206.7 + 5.0.100-preview.3.20206.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3bc625848483ca7a0fe710a21360c1f215a91f06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 14:28:49 +0000 Subject: [PATCH 14/20] Update dependencies from https://github.com/dotnet/sdk build 20200407.1 (#7049) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20207.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20207.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 1d481b67a..3169f6922 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 3afa35569f53dceabbff596010f52ea328b0d5f8 - + https://github.com/dotnet/sdk - 848039ad0c06bb8ada2662f1cb889ed4064a7f97 + 54d2b7863724fb9144c893c48c856e9781efb466 - + https://github.com/dotnet/sdk - 848039ad0c06bb8ada2662f1cb889ed4064a7f97 + 54d2b7863724fb9144c893c48c856e9781efb466 diff --git a/eng/Versions.props b/eng/Versions.props index c663a6deb..9874d9d23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20206.7 - 5.0.100-preview.3.20206.7 + 5.0.100-preview.3.20207.1 + 5.0.100-preview.3.20207.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3e8e4e9b641098da215c2df62c2024ae0e0b2afb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 05:12:37 +0000 Subject: [PATCH 15/20] Update dependencies from https://github.com/dotnet/aspnetcore build 20200407.4 (#7062) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20207.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20207.4 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20207.4 - dotnet-watch - 5.0.0-preview.3.20207.4 - dotnet-user-secrets - 5.0.0-preview.3.20207.4 - dotnet-dev-certs - 5.0.0-preview.3.20207.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 3169f6922..5680653b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 3cda53187710a77afb1a644b1729be9ff639a14d - + https://github.com/dotnet/aspnetcore - 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 + fcd56ff589a2d82fb6f654b92f372216d695cf88 - + https://github.com/dotnet/aspnetcore - 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 + fcd56ff589a2d82fb6f654b92f372216d695cf88 - + https://github.com/dotnet/aspnetcore - 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 + fcd56ff589a2d82fb6f654b92f372216d695cf88 - + https://github.com/dotnet/aspnetcore - 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 + fcd56ff589a2d82fb6f654b92f372216d695cf88 - + https://github.com/dotnet/aspnetcore - 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 + fcd56ff589a2d82fb6f654b92f372216d695cf88 - + https://github.com/dotnet/aspnetcore - 39a24220cf5146ba52ff4f15ffdd8a69a16ca1b2 + fcd56ff589a2d82fb6f654b92f372216d695cf88 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9874d9d23..88bc1bbbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.3.20203.8 - 5.0.0-preview.3.20203.8 - 5.0.0-preview.3.20203.8 - 5.0.0-preview.3.20203.8 - 5.0.0-preview.3.20203.8 - 5.0.0-preview.3.20203.8 + 5.0.0-preview.3.20207.4 + 5.0.0-preview.3.20207.4 + 5.0.0-preview.3.20207.4 + 5.0.0-preview.3.20207.4 + 5.0.0-preview.3.20207.4 + 5.0.0-preview.3.20207.4 0.2.0 From 16f695dfdad491784339a12f595caccff8771f4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 08:47:51 +0000 Subject: [PATCH 16/20] Update dependencies from https://github.com/dotnet/sdk build 20200408.1 (#7063) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20208.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20208.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 5680653b7..20f119238 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 3afa35569f53dceabbff596010f52ea328b0d5f8 - + https://github.com/dotnet/sdk - 54d2b7863724fb9144c893c48c856e9781efb466 + cc4d40525dd4362f9b3e303a35339d6d0e215b5b - + https://github.com/dotnet/sdk - 54d2b7863724fb9144c893c48c856e9781efb466 + cc4d40525dd4362f9b3e303a35339d6d0e215b5b diff --git a/eng/Versions.props b/eng/Versions.props index 88bc1bbbe..cdf309974 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20207.1 - 5.0.100-preview.3.20207.1 + 5.0.100-preview.3.20208.1 + 5.0.100-preview.3.20208.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 89b89d74b439400a179ee13b3e581d582a777cd5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2020 09:45:27 +0000 Subject: [PATCH 17/20] Update dependencies from https://github.com/dotnet/sdk build 20200408.2 (#7064) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20208.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20208.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 20f119238..e1307c15e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 3afa35569f53dceabbff596010f52ea328b0d5f8 - + https://github.com/dotnet/sdk - cc4d40525dd4362f9b3e303a35339d6d0e215b5b + 0c6ef709a6691023e80d9931b9c000c21ad74cf6 - + https://github.com/dotnet/sdk - cc4d40525dd4362f9b3e303a35339d6d0e215b5b + 0c6ef709a6691023e80d9931b9c000c21ad74cf6 diff --git a/eng/Versions.props b/eng/Versions.props index cdf309974..61f7b2c68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20208.1 - 5.0.100-preview.3.20208.1 + 5.0.100-preview.3.20208.2 + 5.0.100-preview.3.20208.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f5e7d53b351bea88dcb6b06ef95e579dcee886e3 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 8 Apr 2020 13:07:50 -0700 Subject: [PATCH 18/20] [release/5.0.1xx-preview3] Set up TLS 1.2 before calling dotnet-install for tests (#7068) * Set TLS1.2 before running dotnet-install in tests The new powershell process overrides the setting that build.ps1 sets up. * Reduce logging verbosity --- src/core-sdk-tasks/DownloadFile.cs | 4 ++-- test/SdkTests/SdkTests.csproj | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/core-sdk-tasks/DownloadFile.cs b/src/core-sdk-tasks/DownloadFile.cs index 40178d1eb..382d5cffb 100644 --- a/src/core-sdk-tasks/DownloadFile.cs +++ b/src/core-sdk-tasks/DownloadFile.cs @@ -97,7 +97,7 @@ namespace Microsoft.DotNet.Cli.Build { var httpResponse = await httpClient.GetAsync(source); - Log.LogMessage(MessageImportance.High, $"{source} -> {httpResponse.StatusCode}"); + Log.LogMessage(MessageImportance.Normal, $"{source} -> {httpResponse.StatusCode}"); // The Azure Storage REST API returns '400 - Bad Request' in some cases // where the resource is not found on the storage. @@ -116,7 +116,7 @@ namespace Microsoft.DotNet.Cli.Build await httpResponse.Content.CopyToAsync(outStream); } - Log.LogMessage(MessageImportance.High, $"returning true {source} -> {httpResponse.StatusCode}"); + Log.LogMessage(MessageImportance.Normal, $"returning true {source} -> {httpResponse.StatusCode}"); return true; } catch (Exception e) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index ac9e2b663..9e383d60d 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -120,16 +120,20 @@ $(DotnetToTestPath)shared\Microsoft.NETCore.App\$(RuntimeVersionToInstall) - powershell -NoLogo -NoProfile -ExecutionPolicy ByPass - $(InstallRuntimeCommand) "$(_DotNetRoot)dotnet-install.ps1" + + powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& { + $(InstallRuntimeCommand) [Net.ServicePointManager]::SecurityProtocol = 'Tls12, Tls13'; + $(InstallRuntimeCommand) & '$(DotNetRoot)dotnet-install.ps1' $(InstallRuntimeCommand) -Version $(RuntimeVersionToInstall) $(InstallRuntimeCommand) -InstallDir $(DotnetToTestPath) - $(InstallRuntimeCommand) -Runtime "dotnet" - $(InstallRuntimeCommand) -Architecture "$(Architecture)" + $(InstallRuntimeCommand) -Runtime 'dotnet' + $(InstallRuntimeCommand) -Architecture '$(Architecture)' + $(InstallRuntimeCommand) }" /bin/bash - $(InstallRuntimeCommand) "$(_DotNetRoot)dotnet-install.sh" + $(InstallRuntimeCommand) "$(DotNetRoot)dotnet-install.sh" $(InstallRuntimeCommand) --version $(RuntimeVersionToInstall) $(InstallRuntimeCommand) --install-dir "$(DotnetToTestPath)" $(InstallRuntimeCommand) --runtime "dotnet" From db7a71fa4af72490760477c5adc7433c961d41cf Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 8 Apr 2020 13:09:00 -0700 Subject: [PATCH 19/20] Fixup stage dep --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 68f16aeb4..fec720b02 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -243,7 +243,7 @@ stages: dependsOn: # This will run only after all the publishing stages have run. # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - - Net5_Preview3_Publish + - NetCore_Dev5_Publish jobs: - job: Copy_SDK_To_Latest pool: From 337f953a9529ea811aece63c24e51203edf3eac3 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 8 Apr 2020 13:12:41 -0700 Subject: [PATCH 20/20] Revert incorrect changes --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- src/CopyToLatest/targets/BranchInfo.props | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efd25dd66..819b9eb7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - bbe89b2fde13f2fcd60906aa48177c121a478235 + 782ad0dc9914821cc2ad1b9c8de6630a044d3576 - + https://github.com/dotnet/windowsdesktop - bbe89b2fde13f2fcd60906aa48177c121a478235 + 782ad0dc9914821cc2ad1b9c8de6630a044d3576 - + https://github.com/dotnet/windowsdesktop - bbe89b2fde13f2fcd60906aa48177c121a478235 + 782ad0dc9914821cc2ad1b9c8de6630a044d3576 https://github.com/dotnet/runtime @@ -88,13 +88,13 @@ 7fe15e37c809aa5350e5d6b8ef42fc4e26c4ac0e - + https://github.com/dotnet/winforms - 17d421f36541633c21682b297ca30740d8b539e1 + cf98008886b999206fd4de4666b1e4b904577f4f - + https://github.com/dotnet/wpf - 9decc5c6fa69644eabd6e5128defc29e732d3fc5 + 1283ba2a8dff8235ef239619542af858d5c119c6 diff --git a/eng/Versions.props b/eng/Versions.props index 4f2ba1cde..5a75483ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20181.1 + 5.0.0-preview.4.20180.4 - 5.0.0-preview.3.20201.2 + 5.0.0-preview.4.20180.7 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20206.4 - 5.0.0-preview.3.20206.4 - 5.0.0-preview.3.20206.4 + 5.0.0-preview.4.20180.8 + 5.0.0-preview.4.20180.8 + 5.0.0-preview.4.20180.8 diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index 08f0cef99..9bd214aa9 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/5.0.1xx-preview3 + master