From ff31701be58dd16a7606c7ed5e7a41abda95865e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 19:23:53 +0000 Subject: [PATCH 01/14] [release/3.1.1xx] Update dependencies from dotnet/toolset (#6151) * Update dependencies from https://github.com/dotnet/toolset build 20200114.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20064.10 * Remove darc-int feeds. Co-authored-by: Matt Mitchell --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 095d67098..42516102c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - - https://dev.azure.com/dnceng/internal/_git/dotnet-toolset - 411fe514b956a39d6080575cf35d2d64054a7ec0 + + https://github.com/dotnet/toolset + f63f882f404ff4a768fa6d97c0c4376052d54f8a https://dev.azure.com/dnceng/internal/_git/dotnet-sdk diff --git a/eng/Versions.props b/eng/Versions.props index 886382ecc..0a7b2d0d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.101-servicing.19617.13 + 3.1.102-servicing.20064.10 From cbb49a18783d7cd204011b951b21777208d1a8ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Jan 2020 21:50:22 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/aspnetcore build 20200115.6 - dotnet-user-secrets - 3.1.2-servicing.20065.6 - dotnet-watch - 3.1.2-servicing.20065.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2 - dotnet-dev-certs - 3.1.2-servicing.20065.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20065.6 --- NuGet.config | 2 ++ eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8d760329e..fd518e5b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,9 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42516102c..0b1eeb7fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,25 +45,25 @@ https://github.com/aspnet/AspNetCore 2b7e994b8a304700a09617ffc5052f0d943bbcba - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + 36e79022bebf4974a3352a6e1dcc869ae67997fe - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + 36e79022bebf4974a3352a6e1dcc869ae67997fe - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + 36e79022bebf4974a3352a6e1dcc869ae67997fe - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + 36e79022bebf4974a3352a6e1dcc869ae67997fe - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + 36e79022bebf4974a3352a6e1dcc869ae67997fe https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0a7b2d0d1..45b8a6b8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.1 + 3.1.2 3.1.0 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 + 3.1.2-servicing.20065.6 + 3.1.2-servicing.20065.6 + 3.1.2-servicing.20065.6 + 3.1.2-servicing.20065.6 From 932b6130398760ac0f290ad6c798500b5f6d875f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 23:02:02 +0000 Subject: [PATCH 03/14] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#6154) * Update dependencies from https://github.com/dotnet/core-setup build 20200114.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20064.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 * fixup nuget.config Co-authored-by: William Godbe --- NuGet.config | 1 + eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8d760329e..fa8212e1d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,6 +12,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42516102c..c1f75682c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d diff --git a/eng/Versions.props b/eng/Versions.props index 0a7b2d0d1..6d2252c06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,12 +61,12 @@ - 3.1.1-servicing.19608.4 - 3.1.1 - 3.1.1 + 3.1.2-servicing.20064.3 + 3.1.2 + 3.1.2 3.1.0 - 3.1.1 - 3.1.1 + 3.1.2 + 3.1.2 3.1.0 2.1.0 From 21eeb5bd4477126980630073038f03f67b71ad08 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 15 Jan 2020 15:25:45 -0800 Subject: [PATCH 04/14] Remove internal feed --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index fd518e5b5..8d33a48ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,6 @@ - From 215af6aa607999dc021d4a35478a93aa934c9b23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2020 03:58:54 +0000 Subject: [PATCH 05/14] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#6158) * Update dependencies from https://github.com/dotnet/core-setup build 20200115.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20064.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200115.9 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20064.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200115.10 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.10 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200115.12 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.12 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200115.14 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.14 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200116.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200116.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.20065.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200116.9 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.2-servicing.20066.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200116.11 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.11 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.2-servicing.20066.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: William Godbe --- NuGet.config | 3 +-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 88bbf897e..892a230b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,8 +8,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5bf36a97..a4946464a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,23 +3,23 @@ https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 92224c91b9a8dda9b77c41b583fbd711378adc87 - + https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 92224c91b9a8dda9b77c41b583fbd711378adc87 https://github.com/dotnet/core-setup - 193fb40ae0a6fb0a2ecd63cb63db0a95719dbe8d + 92224c91b9a8dda9b77c41b583fbd711378adc87 @@ -90,9 +90,9 @@ https://github.com/dotnet/winforms 9483a88b7764a74d71cbd449de6c56c1d5e0af21 - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a8e48616c8d8e56469a456eb1ee263268316b827 + + https://github.com/dotnet/wpf + 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 diff --git a/eng/Versions.props b/eng/Versions.props index 062b68c24..ad6cb801f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.1.0-rtm.19605.7 + 3.1.2-servicing.20066.4 @@ -61,7 +61,7 @@ - 3.1.2-servicing.20064.3 + 3.1.2-servicing.20066.11 3.1.2 3.1.2 3.1.0 From 7cd80183ec0e16c1502238bb96ef35fe442f45e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2020 15:56:25 -0800 Subject: [PATCH 06/14] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#6167) * Update dependencies from https://github.com/dotnet/core-setup build 20200117.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20067.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200117.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20067.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 --- NuGet.config | 4 +--- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 892a230b3..d890e6588 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,11 +8,9 @@ - + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4946464a..c989ba3e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,23 +3,23 @@ https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 916b5cba268e1e1e803243004f4276cf40b2dda8 - + https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 92224c91b9a8dda9b77c41b583fbd711378adc87 + 916b5cba268e1e1e803243004f4276cf40b2dda8 diff --git a/eng/Versions.props b/eng/Versions.props index ad6cb801f..8f9814108 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,7 +61,7 @@ - 3.1.2-servicing.20066.11 + 3.1.2-servicing.20067.4 3.1.2 3.1.2 3.1.0 From fb213ff970bee5f677d01bd3e377ac8363952fe2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 01:27:28 +0000 Subject: [PATCH 07/14] [release/3.1.1xx] Update dependencies from dotnet/toolset (#6157) * Update dependencies from https://github.com/dotnet/toolset build 20200115.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20065.9 * Update dependencies from https://github.com/dotnet/toolset build 20200115.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20065.12 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Remove internal feed * Update dependencies from https://github.com/dotnet/toolset build 20200115.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20065.13 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20064.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200115.17 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20065.17 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20064.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200116.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20066.7 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20065.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200116.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20066.10 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20066.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200117.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20067.9 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20066.4 (parent: Microsoft.Dotnet.Toolset.Internal) * add templating feed to nuget.config Co-authored-by: William Li Co-authored-by: William Godbe --- NuGet.config | 1 + eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index d890e6588..d8bc04c37 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c989ba3e3..20c8a4eb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,21 +69,21 @@ https://github.com/dotnet/test-templates 5117d3d9d7dfd3583f0c42a639efaf092f957b7b - + https://github.com/dotnet/templating - 13abe7e2749d95337e8d72efdc5b71611815fd43 + 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - f63f882f404ff4a768fa6d97c0c4376052d54f8a + 6b828b4bda52219e8a68526da1fda677eb28a96c - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b38eb3b6cbbc9c82270dbd4e20286007a52a165 + + https://github.com/dotnet/sdk + 595244ad4a8c4ab7be4e4a78641f4da7b4361aae - - https://dev.azure.com/dnceng/internal/_git/dotnet-cli - 91705c83e44dd9221c3071e1bb7a87ba2f47688c + + https://github.com/dotnet/cli + 3b9b81f5c68f60671ecb50ff5e9d68aedb78c6ef diff --git a/eng/Versions.props b/eng/Versions.props index 8f9814108..40d6fe185 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.102-servicing.20064.10 + 3.1.102-servicing.20067.9 @@ -24,7 +24,7 @@ - 3.1.1-servicing.19605.2 + 3.1.2 @@ -45,14 +45,14 @@ - 3.1.101-servicing.19617.2 + 3.1.102-servicing.20066.4 0.2.0 - 3.1.101-servicing.19617.12 + 3.1.102-servicing.20065.3 $(MicrosoftNETSdkPackageVersion) From f8ca0e494fd1818d5eed1d5d27d2da4d99b48d53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 03:36:30 +0000 Subject: [PATCH 08/14] [release/3.1.1xx] Update dependencies from dotnet/toolset (#6180) * Update dependencies from https://github.com/dotnet/toolset build 20200117.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20067.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20067.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200117.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20067.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20067.4 (parent: Microsoft.Dotnet.Toolset.Internal) * nuget.config fixup Co-authored-by: William Godbe --- 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 20c8a4eb5..0a30d7341 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 6b828b4bda52219e8a68526da1fda677eb28a96c + 82505ec7fc985a2dd3393a93814d7c3bb3438c00 https://github.com/dotnet/sdk 595244ad4a8c4ab7be4e4a78641f4da7b4361aae - + https://github.com/dotnet/cli - 3b9b81f5c68f60671ecb50ff5e9d68aedb78c6ef + 2c11da834b80b019651861a3364d2501d803f48f diff --git a/eng/Versions.props b/eng/Versions.props index 40d6fe185..f559f26f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.102-servicing.20067.9 + 3.1.102-servicing.20067.12 @@ -45,7 +45,7 @@ - 3.1.102-servicing.20066.4 + 3.1.102-servicing.20067.4 0.2.0 From b5ea5b5c12e427709e1ae18a74acccd0e0c08c72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 10:47:46 -0800 Subject: [PATCH 09/14] [release/3.1.1xx] Update dependencies from dotnet/toolset (#6184) * Update dependencies from https://github.com/dotnet/toolset build 20200117.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20067.13 * fixup nuget.config Co-authored-by: William Godbe --- 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 0a30d7341..34429d41e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 82505ec7fc985a2dd3393a93814d7c3bb3438c00 + 5574f6216fb2f5970f5f4589de9d4c4e57e238a4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f559f26f9..f0904fb64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.102-servicing.20067.12 + 3.1.102-servicing.20067.13 From 56ce343ea2707581ad8c95aad49f90d28474fce4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 21:31:47 +0000 Subject: [PATCH 10/14] [release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#6162) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.1 - dotnet-user-secrets - 3.1.2-servicing.20066.1 - dotnet-watch - 3.1.2-servicing.20066.1 - Microsoft.AspNetCore.App.Ref - 3.1.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2 - dotnet-dev-certs - 3.1.2-servicing.20066.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.1 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.4 - dotnet-user-secrets - 3.1.2-servicing.20066.4 - dotnet-watch - 3.1.2-servicing.20066.4 - Microsoft.AspNetCore.App.Ref - 3.1.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2 - dotnet-dev-certs - 3.1.2-servicing.20066.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.4 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.14 - dotnet-user-secrets - 3.1.2-servicing.20066.14 - dotnet-watch - 3.1.2-servicing.20066.14 - Microsoft.AspNetCore.App.Ref - 3.1.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2 - dotnet-dev-certs - 3.1.2-servicing.20066.14 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.14 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.15 - dotnet-user-secrets - 3.1.2-servicing.20066.15 - dotnet-watch - 3.1.2-servicing.20066.15 - Microsoft.AspNetCore.App.Ref - 3.1.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2 - dotnet-dev-certs - 3.1.2-servicing.20066.15 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.15 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.1 - dotnet-user-secrets - 3.1.2-servicing.20067.1 - dotnet-watch - 3.1.2-servicing.20067.1 - Microsoft.AspNetCore.App.Ref - 3.1.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2 - dotnet-dev-certs - 3.1.2-servicing.20067.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.1 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.4 - dotnet-user-secrets - 3.1.2-servicing.20067.4 - dotnet-watch - 3.1.2-servicing.20067.4 - Microsoft.AspNetCore.App.Ref - 3.1.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2 - dotnet-dev-certs - 3.1.2-servicing.20067.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.4 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200118.1 - dotnet-dev-certs - 3.1.2-servicing.20068.1 - dotnet-user-secrets - 3.1.2-servicing.20068.1 - dotnet-watch - 3.1.2-servicing.20068.1 - Microsoft.AspNetCore.App.Ref - 3.1.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20068.1 * Update AspNetCoreTargetingPackBlobVersion to 3.1.2 * fixup AspNetCoreTargetingPackBlobVersion * Use property * don't use property Co-authored-by: William Godbe --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 +++++++++++------------ eng/Versions.props | 10 +++++----- src/redist/targets/GenerateLayout.targets | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index d8bc04c37..7da8cfe25 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,9 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34429d41e..1ce54efcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,29 +41,29 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc https://github.com/dotnet/aspnetcore - 36e79022bebf4974a3352a6e1dcc869ae67997fe + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 36e79022bebf4974a3352a6e1dcc869ae67997fe + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 36e79022bebf4974a3352a6e1dcc869ae67997fe + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 36e79022bebf4974a3352a6e1dcc869ae67997fe + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 36e79022bebf4974a3352a6e1dcc869ae67997fe + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f0904fb64..578998d0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ 3.1.2 - 3.1.0 - 3.1.2-servicing.20065.6 - 3.1.2-servicing.20065.6 - 3.1.2-servicing.20065.6 - 3.1.2-servicing.20065.6 + 3.1.2 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 771478685..751f97cf4 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -16,7 +16,7 @@ 3.1.0-rtm.19565.2 - 3.1.0 + 3.1.2-servicing.20068.1 3.1.0-rtm.19565.2 3.0.0 From 464bff08aa2b69e94886540e825c71faaa41225e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 23:20:54 +0000 Subject: [PATCH 11/14] [release/3.1.1xx] Update dependencies from dotnet/toolset (#6192) * Update dependencies from https://github.com/dotnet/toolset build 20200118.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20068.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20068.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update NuGet.config Co-authored-by: William Godbe --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7da8cfe25..4ce02c028 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,9 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ce54efcc..597f1f186 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 5574f6216fb2f5970f5f4589de9d4c4e57e238a4 + 6bd21c205a22091af2c1a0a52872c9ac28524ec4 https://github.com/dotnet/sdk 595244ad4a8c4ab7be4e4a78641f4da7b4361aae - + https://github.com/dotnet/cli - 2c11da834b80b019651861a3364d2501d803f48f + 9dd5dd9f0cf0b48d4d97ad628ca230df3c072d42 diff --git a/eng/Versions.props b/eng/Versions.props index 578998d0a..09d08a03a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.102-servicing.20067.13 + 3.1.102-servicing.20068.4 @@ -45,7 +45,7 @@ - 3.1.102-servicing.20067.4 + 3.1.102-servicing.20068.1 0.2.0 From 2b57ee21216430637f2777067f49bc8a604868ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2020 18:14:45 +0000 Subject: [PATCH 12/14] [release/3.1.1xx] Update dependencies from dotnet/toolset (#6193) * Update dependencies from https://github.com/dotnet/toolset build 20200119.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20069.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200119.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20069.2 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20069.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update NuGet.config Co-authored-by: William Godbe --- 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 597f1f186..57adbdd95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 6bd21c205a22091af2c1a0a52872c9ac28524ec4 + 9d5fc1a1458ffc72cb17167088f35743de6cd4c0 - + https://github.com/dotnet/sdk - 595244ad4a8c4ab7be4e4a78641f4da7b4361aae + 90a093bbbe2c46ef19e301d717bed3cfaa56abb3 - + https://github.com/dotnet/cli - 9dd5dd9f0cf0b48d4d97ad628ca230df3c072d42 + 32fddd23b1e53272472f6feb27f5e12a445b7236 diff --git a/eng/Versions.props b/eng/Versions.props index 09d08a03a..93636bc67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.102-servicing.20068.4 + 3.1.102-servicing.20069.2 @@ -45,14 +45,14 @@ - 3.1.102-servicing.20068.1 + 3.1.102-servicing.20069.1 0.2.0 - 3.1.102-servicing.20065.3 + 3.1.102-servicing.20068.5 $(MicrosoftNETSdkPackageVersion) From 85827cd7db52b09a94fda0a39e41ccc8134a0b51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 15:32:54 -0800 Subject: [PATCH 13/14] [release/3.1.1xx] Update dependencies from dotnet/toolset (#6203) * Update dependencies from https://github.com/dotnet/toolset build 20200120.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20070.1 * Update dependencies from https://github.com/dotnet/toolset build 20200120.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20070.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.102-servicing.20070.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200120.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20070.8 * Fixup nuget.config, cli version Co-authored-by: William Godbe --- 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 57adbdd95..e37b0a242 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 9d5fc1a1458ffc72cb17167088f35743de6cd4c0 + a46d93e5e100f9046cb589b5d4ba70bde41f3480 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 93636bc67..290101a4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.102-servicing.20069.2 + 3.1.102-servicing.20070.8 From 46b8ddf0b55ed52ffcf5eb8c4fc1d3ba66a4343e Mon Sep 17 00:00:00 2001 From: sfoslund Date: Tue, 21 Jan 2020 11:24:22 -0800 Subject: [PATCH 14/14] Reverting drop suffix change --- src/redist/targets/Versions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 64a307af6..1156ea7db 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -8,7 +8,7 @@ - true + false