From 4ed6ae999bc4a6d99f7c9d2eeeb37b76e6dd902f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jun 2020 21:08:15 +0000 Subject: [PATCH 01/65] Update dependencies from https://github.com/dotnet/templating build 20200622.1 Microsoft.TemplateEngine.Cli From Version 5.0.0-preview.8.20322.2 -> To Version 5.0.0-preview.7.20322.1 --- 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 8c2e8f589135..3c1f1691b335 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 6bb0326ac089950ead3b19fc83e34444c084e8f5 + 97c803a412c014e0bf93474dfeef0de02f140746 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 096d0c5cc39d..74029e1949a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 5.0.0-preview.8.20322.2 + 5.0.0-preview.7.20322.1 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From e42943996f016e7d9cdbb4451d76daf27e171873 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jun 2020 21:09:26 +0000 Subject: [PATCH 02/65] Update dependencies from https://github.com/dotnet/runtime build 20200622.6 System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Ref , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions From Version 5.0.0-preview.7.20322.7 -> To Version 5.0.0-preview.7.20322.6 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c2e8f589135..776b17062e6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 6bb0326ac089950ead3b19fc83e34444c084e8f5 - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c https://github.com/dotnet/arcade 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker b0b5143ee2a59517df69d38cb6c363cdd17177a8 - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c - + https://github.com/dotnet/runtime - d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 + 80a7935c3accde1a9a97299de456d6f3d75cd57c https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 096d0c5cc39d..ebc53477f119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20316.1 3.1.0 - 5.0.0-preview.7.20322.7 + 5.0.0-preview.7.20322.6 4.3.0 4.3.0 3.6.0 @@ -36,12 +36,12 @@ - 5.0.0-preview.7.20322.7 - 5.0.0-preview.7.20322.7 + 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20322.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.7.20322.7 - 5.0.0-preview.7.20322.7 - 5.0.0-preview.7.20322.7 + 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20322.6 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.7.20322.7 - 5.0.0-preview.7.20322.7 + 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20322.6 5.0.0-preview.7.20307.4 - 5.0.0-preview.7.20322.7 + 5.0.0-preview.7.20322.6 From 1a3f1d9409b1b1f61b37c9b323e64fd9777a12dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2020 23:52:34 +0000 Subject: [PATCH 03/65] Update dependencies from https://github.com/microsoft/msbuild build 20200617.1 (#12147) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20310-07 -> To Version 16.7.0-preview-20317-01 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 8c2e8f589135..e698763ad47d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 + 6019483f9105a83f8a5bf1fb781ff4a5091f1df5 - + https://github.com/microsoft/msbuild - ee1c9fd0c7e0e43174785a4e2ed177f14f5856a0 + 6019483f9105a83f8a5bf1fb781ff4a5091f1df5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 096d0c5cc39d..1d6f4dde9765 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20310-07 + 16.7.0-preview-20317-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20310-07 + 16.7.0-preview-20317-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 255e195797412d9bfba2d647073a9230dbf5a95d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jun 2020 00:16:08 +0000 Subject: [PATCH 04/65] Update dependencies from https://github.com/dotnet/runtime build 20200623.4 System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Ref , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions From Version 5.0.0-preview.7.20322.7 -> To Version 5.0.0-preview.7.20323.4 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 776b17062e6c..c231278cdea1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 6bb0326ac089950ead3b19fc83e34444c084e8f5 - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 https://github.com/dotnet/arcade 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker b0b5143ee2a59517df69d38cb6c363cdd17177a8 - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 - + https://github.com/dotnet/runtime - 80a7935c3accde1a9a97299de456d6f3d75cd57c + 17df0b885273d0f4d22794fd830361d28bf3b663 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index ebc53477f119..959987c7ec09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20316.1 3.1.0 - 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20323.4 4.3.0 4.3.0 3.6.0 @@ -36,12 +36,12 @@ - 5.0.0-preview.7.20322.6 - 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20323.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.7.20322.6 - 5.0.0-preview.7.20322.6 - 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20323.4 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.7.20322.6 - 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20323.4 5.0.0-preview.7.20307.4 - 5.0.0-preview.7.20322.6 + 5.0.0-preview.7.20323.4 From 11d64f9031b016141fc9030bcf1a0c68c13fb2c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 01:45:10 +0000 Subject: [PATCH 05/65] Update dependencies from https://github.com/dotnet/fsharp build 20200623.3 (#12155) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20322.7 -> To Version 10.10.0-beta.20323.3 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 e698763ad47d..c333374e406d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild 6019483f9105a83f8a5bf1fb781ff4a5091f1df5 - + https://github.com/dotnet/fsharp - f578f4abdb447d7c52946932d5fbfe12b3f9f828 + 403f594a569bda4ff0f9aafd39b599041a772fb5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 1d6f4dde9765..10e0584df2da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20322.7 + 10.10.0-beta.20323.3 From 8228993b8b37129bfc4bc929e06c2498c7dd4487 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 03:19:42 +0000 Subject: [PATCH 06/65] [release/5.0.1xx-preview7] Update dependencies from nuget/nuget.client (#12148) * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6668 NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6668 * Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6670 NuGet.Build.Tasks From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6670 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 6b27de8d9073..fcc128c34945 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/aspnetcore 3e6495fde363c66ed9730fb8651497bce6c721fd - + https://github.com/NuGet/NuGet.Client - 728c0ad55c093fb374a1858d9cde5dc94b80c244 + 76c12e524364375549b763c78750372910cb1c19 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 86b5dee453eb..0961348397cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ - 5.7.0-preview.3.6653 + 5.7.0-rtm.6670 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From c7c6314159a6f7c8a90f696f4038fa3f396b3a98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 05:45:12 +0000 Subject: [PATCH 07/65] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200623.6 (#12161) Microsoft.WindowsDesktop.App From Version 5.0.0-preview.7.20311.4 -> To Version 5.0.0-preview.7.20323.6 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 5.0.0-preview.7.20311.4 -> To Version 5.0.0-preview.7.20323.3 (parent: Microsoft.WindowsDesktop.App 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 fcc128c34945..d1da9e6d288d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 - + https://github.com/dotnet/windowsdesktop - 9e0a2c20a97266a45973ef03743db3eb1d1ec3f3 + e1d1b994887b903ff92621dd1eb5520139d66dd2 - + https://github.com/dotnet/wpf - 4a71ebaccdac1a0526c26b82c92e902fc07e6c5d + 20428549dca826c6fe75f26dc589c6e52f60f13c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0961348397cc..339ea5c3be99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,11 +124,11 @@ - 5.0.0-preview.7.20311.4 + 5.0.0-preview.7.20323.3 - 5.0.0-preview.7.20311.4 + 5.0.0-preview.7.20323.6 From b6b3a01a85ddaa5f03d4289903fa2bf351b46fb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 07:42:54 +0000 Subject: [PATCH 08/65] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200623.9 (#12163) Microsoft.WindowsDesktop.App From Version 5.0.0-preview.7.20323.6 -> To Version 5.0.0-preview.7.20323.9 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 5.0.0-preview.7.20323.3 -> To Version 5.0.0-preview.7.20323.5 (parent: Microsoft.WindowsDesktop.App Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1da9e6d288d..a03a275bd1a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,11 +85,11 @@ https://github.com/dotnet/runtime d6b8109177d0ba0eeafc8f7570c63cbc0b2f2562 - + https://github.com/dotnet/windowsdesktop - e1d1b994887b903ff92621dd1eb5520139d66dd2 + 4b17d4de59b1cecf72feeb6614ae5f94dd8d53d6 - + https://github.com/dotnet/wpf 20428549dca826c6fe75f26dc589c6e52f60f13c diff --git a/eng/Versions.props b/eng/Versions.props index 339ea5c3be99..0e0fb8f56c5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,11 +124,11 @@ - 5.0.0-preview.7.20323.3 + 5.0.0-preview.7.20323.5 - 5.0.0-preview.7.20323.6 + 5.0.0-preview.7.20323.9 From b54fa90b0d8517c036eb4b0714b85938f90e599d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 10:56:28 +0000 Subject: [PATCH 09/65] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200624.1 (#12169) Microsoft.WindowsDesktop.App From Version 5.0.0-preview.7.20323.9 -> To Version 5.0.0-preview.7.20324.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 5.0.0-preview.7.20323.5 -> To Version 5.0.0-preview.7.20323.9 (parent: Microsoft.WindowsDesktop.App 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 8f259654547c..e9d02e47e85c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 17df0b885273d0f4d22794fd830361d28bf3b663 - + https://github.com/dotnet/windowsdesktop - 4b17d4de59b1cecf72feeb6614ae5f94dd8d53d6 + 88fc3e713a9fb79b7b7db96a98ca78ac51fd3805 - + https://github.com/dotnet/wpf - 20428549dca826c6fe75f26dc589c6e52f60f13c + 7cfa8e9a8b61db63bb13af8e59cd4bcecafd904c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5fe58e4d99be..d5bff0720856 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,11 +124,11 @@ - 5.0.0-preview.7.20323.5 + 5.0.0-preview.7.20323.9 - 5.0.0-preview.7.20323.9 + 5.0.0-preview.7.20324.1 From 48d6d11cdf2877dda50420046088fe548cfa6ebc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 07:14:17 -0700 Subject: [PATCH 10/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200623.1 (#12150) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-preview.7.20311.11 -> To Version 5.0.0-preview.7.20323.1 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 e9d02e47e85c..d8f8b7259193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 3e6495fde363c66ed9730fb8651497bce6c721fd + baf7e6c4d63920dad84cf87a4f320869d0821d1b - + https://github.com/dotnet/aspnetcore - 3e6495fde363c66ed9730fb8651497bce6c721fd + baf7e6c4d63920dad84cf87a4f320869d0821d1b https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7cfa8e9a8b61db63bb13af8e59cd4bcecafd904c - + https://github.com/dotnet/aspnetcore - 3e6495fde363c66ed9730fb8651497bce6c721fd + baf7e6c4d63920dad84cf87a4f320869d0821d1b - + https://github.com/dotnet/aspnetcore - 3e6495fde363c66ed9730fb8651497bce6c721fd + baf7e6c4d63920dad84cf87a4f320869d0821d1b - + https://github.com/dotnet/aspnetcore - 3e6495fde363c66ed9730fb8651497bce6c721fd + baf7e6c4d63920dad84cf87a4f320869d0821d1b - + https://github.com/dotnet/aspnetcore - 3e6495fde363c66ed9730fb8651497bce6c721fd + baf7e6c4d63920dad84cf87a4f320869d0821d1b https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index d5bff0720856..bfdcaa3035e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20311.11 - 5.0.0-preview.7.20311.11 - 5.0.0-preview.7.20311.11 - 5.0.0-preview.7.20311.11 - 5.0.0-preview.7.20311.11 - 5.0.0-preview.7.20311.11 + 5.0.0-preview.7.20323.1 + 5.0.0-preview.7.20323.1 + 5.0.0-preview.7.20323.1 + 5.0.0-preview.7.20323.1 + 5.0.0-preview.7.20323.1 + 5.0.0-preview.7.20323.1 From 6ef3f764df657f2d3b0c991d53abaabfb76fb449 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 07:25:07 -0700 Subject: [PATCH 11/65] [release/5.0.1xx-preview7] Update dependencies from dotnet/aspnetcore (#12176) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200623.3 Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-preview.7.20323.1 -> To Version 5.0.0-preview.7.20323.3 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200623.9 Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20323.3 -> To Version 5.0.0-preview.7.20323.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 d8f8b7259193..23417805d333 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - baf7e6c4d63920dad84cf87a4f320869d0821d1b + f6a6e4bd07bd4bf51c6965382156ebce22540fb7 - + https://github.com/dotnet/aspnetcore - baf7e6c4d63920dad84cf87a4f320869d0821d1b + f6a6e4bd07bd4bf51c6965382156ebce22540fb7 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7cfa8e9a8b61db63bb13af8e59cd4bcecafd904c - + https://github.com/dotnet/aspnetcore - baf7e6c4d63920dad84cf87a4f320869d0821d1b + f6a6e4bd07bd4bf51c6965382156ebce22540fb7 - + https://github.com/dotnet/aspnetcore - baf7e6c4d63920dad84cf87a4f320869d0821d1b + f6a6e4bd07bd4bf51c6965382156ebce22540fb7 - + https://github.com/dotnet/aspnetcore - baf7e6c4d63920dad84cf87a4f320869d0821d1b + f6a6e4bd07bd4bf51c6965382156ebce22540fb7 - + https://github.com/dotnet/aspnetcore - baf7e6c4d63920dad84cf87a4f320869d0821d1b + f6a6e4bd07bd4bf51c6965382156ebce22540fb7 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index bfdcaa3035e4..af0fc86f854f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20323.1 - 5.0.0-preview.7.20323.1 - 5.0.0-preview.7.20323.1 - 5.0.0-preview.7.20323.1 - 5.0.0-preview.7.20323.1 - 5.0.0-preview.7.20323.1 + 5.0.0-preview.7.20323.9 + 5.0.0-preview.7.20323.9 + 5.0.0-preview.7.20323.9 + 5.0.0-preview.7.20323.9 + 5.0.0-preview.7.20323.9 + 5.0.0-preview.7.20323.9 From cb57053316aa93fa5b94921c09d9d563b2b64eae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2020 15:12:46 +0000 Subject: [PATCH 12/65] Update dependencies from https://github.com/microsoft/msbuild build 20200623.1 (#12158) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20317-01 -> To Version 16.7.0-preview-20323-01 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 23417805d333..df595d1ee56a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - 6019483f9105a83f8a5bf1fb781ff4a5091f1df5 + a3f63e87d3d8ac9ab52affb453c150b7d4997898 - + https://github.com/microsoft/msbuild - 6019483f9105a83f8a5bf1fb781ff4a5091f1df5 + a3f63e87d3d8ac9ab52affb453c150b7d4997898 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index af0fc86f854f..c581de3053f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20317-01 + 16.7.0-preview-20323-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20317-01 + 16.7.0-preview-20323-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 94f0c0a5af65ef4886a35b56ae9fbe84031effaa Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Thu, 25 Jun 2020 11:37:08 -0700 Subject: [PATCH 13/65] Work around for runtime pack profiles with differing runtime IDs --- .../ProcessFrameworkReferences.cs | 103 ++++++++++-------- .../KnownRuntimePackTests.cs | 42 ++++++- 2 files changed, 94 insertions(+), 51 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs index f7aaacb7cb46..19c9670a2192 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs @@ -6,7 +6,6 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; -using System.Text.RegularExpressions; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Newtonsoft.Json; @@ -230,58 +229,74 @@ protected override void ExecuteCore() isTrimmable = selectedRuntimePack?.IsTrimmable; } - // Only add runtime packs where the framework reference name matches the RuntimeFrameworkName - // Framework references for "profiles" will use the runtime pack from the corresponding non-profile framework + bool includeInPackageDownload; + KnownRuntimePack runtimePackForRuntimeIDProcessing; if (knownFrameworkReference.Name.Equals(knownFrameworkReference.RuntimeFrameworkName, StringComparison.OrdinalIgnoreCase)) { - bool processedPrimaryRuntimeIdentifier = false; + // Only add runtime packs where the framework reference name matches the RuntimeFrameworkName + // Framework references for "profiles" will use the runtime pack from the corresponding non-profile framework + runtimePackForRuntimeIDProcessing = selectedRuntimePack.Value; + includeInPackageDownload = true; + } + else if (!knownFrameworkReference.RuntimePackRuntimeIdentifiers.Equals(selectedRuntimePack?.RuntimePackRuntimeIdentifiers)) + { + // If the profile has a different set of runtime identifiers than the runtime pack, use the profile. + runtimePackForRuntimeIDProcessing = knownFrameworkReference.ToKnownRuntimePack(); + includeInPackageDownload = true; + } + else + { + // For the remaining profiles, don't include them in package download but add them to unavaliable if necessary. + runtimePackForRuntimeIDProcessing = knownFrameworkReference.ToKnownRuntimePack(); + includeInPackageDownload = false; + } - if ((SelfContained || ReadyToRunEnabled) && - !string.IsNullOrEmpty(RuntimeIdentifier) && - selectedRuntimePack != null && - !string.IsNullOrEmpty(selectedRuntimePack?.RuntimePackNamePatterns)) - { + bool processedPrimaryRuntimeIdentifier = false; - // Find other KnownFrameworkReferences that map to the same runtime pack, if any - List additionalFrameworkReferencesForRuntimePack = null; - foreach (var additionalKnownFrameworkReference in knownFrameworkReferencesForTargetFramework) + if ((SelfContained || ReadyToRunEnabled) && + !string.IsNullOrEmpty(RuntimeIdentifier) && + selectedRuntimePack != null && + !string.IsNullOrEmpty(selectedRuntimePack?.RuntimePackNamePatterns)) + { + + // Find other KnownFrameworkReferences that map to the same runtime pack, if any + List additionalFrameworkReferencesForRuntimePack = null; + foreach (var additionalKnownFrameworkReference in knownFrameworkReferencesForTargetFramework) + { + if (additionalKnownFrameworkReference.RuntimeFrameworkName.Equals(knownFrameworkReference.RuntimeFrameworkName, StringComparison.OrdinalIgnoreCase) && + !additionalKnownFrameworkReference.RuntimeFrameworkName.Equals(additionalKnownFrameworkReference.Name, StringComparison.OrdinalIgnoreCase)) { - if (additionalKnownFrameworkReference.RuntimeFrameworkName.Equals(knownFrameworkReference.RuntimeFrameworkName, StringComparison.OrdinalIgnoreCase) && - !additionalKnownFrameworkReference.RuntimeFrameworkName.Equals(additionalKnownFrameworkReference.Name, StringComparison.OrdinalIgnoreCase)) + if (additionalFrameworkReferencesForRuntimePack == null) { - if (additionalFrameworkReferencesForRuntimePack == null) - { - additionalFrameworkReferencesForRuntimePack = new List(); - } - additionalFrameworkReferencesForRuntimePack.Add(additionalKnownFrameworkReference.Name); + additionalFrameworkReferencesForRuntimePack = new List(); } + additionalFrameworkReferencesForRuntimePack.Add(additionalKnownFrameworkReference.Name); } + } - ProcessRuntimeIdentifier(RuntimeIdentifier, selectedRuntimePack.Value, runtimePackVersion, additionalFrameworkReferencesForRuntimePack, - unrecognizedRuntimeIdentifiers, unavailableRuntimePacks, runtimePacks, packagesToDownload, isTrimmable); + ProcessRuntimeIdentifier(RuntimeIdentifier, runtimePackForRuntimeIDProcessing, runtimePackVersion, additionalFrameworkReferencesForRuntimePack, + unrecognizedRuntimeIdentifiers, unavailableRuntimePacks, runtimePacks, packagesToDownload, isTrimmable, includeInPackageDownload); - processedPrimaryRuntimeIdentifier = true; - } + processedPrimaryRuntimeIdentifier = true; + } - if (RuntimeIdentifiers != null) + if (RuntimeIdentifiers != null) + { + foreach (var runtimeIdentifier in RuntimeIdentifiers) { - foreach (var runtimeIdentifier in RuntimeIdentifiers) + if (processedPrimaryRuntimeIdentifier && runtimeIdentifier == this.RuntimeIdentifier) { - if (processedPrimaryRuntimeIdentifier && runtimeIdentifier == this.RuntimeIdentifier) - { - // We've already processed this RID - continue; - } - - // Pass in null for the runtimePacks list, as for these runtime identifiers we only want to - // download the runtime packs, but not use the assets from them - ProcessRuntimeIdentifier(runtimeIdentifier, selectedRuntimePack.Value, runtimePackVersion, additionalFrameworkReferencesForRuntimePack: null, - unrecognizedRuntimeIdentifiers, unavailableRuntimePacks, runtimePacks: null, packagesToDownload, isTrimmable); + // We've already processed this RID + continue; } + + // Pass in null for the runtimePacks list, as for these runtime identifiers we only want to + // download the runtime packs, but not use the assets from them + ProcessRuntimeIdentifier(runtimeIdentifier, runtimePackForRuntimeIDProcessing, runtimePackVersion, additionalFrameworkReferencesForRuntimePack: null, + unrecognizedRuntimeIdentifiers, unavailableRuntimePacks, runtimePacks: null, packagesToDownload, isTrimmable, includeInPackageDownload); } } - if (!string.IsNullOrEmpty(knownFrameworkReference.RuntimeFrameworkName)) { TaskItem runtimeFramework = new TaskItem(knownFrameworkReference.RuntimeFrameworkName); @@ -370,7 +385,7 @@ protected override void ExecuteCore() { string runtimePackDescriptionForErrorMessage = knownFrameworkReference.RuntimeFrameworkName + (requiredLabelsMetadata == string.Empty ? string.Empty : ":" + requiredLabelsMetadata); - + Log.LogError(Strings.ConflictingRuntimePackInformation, runtimePackDescriptionForErrorMessage, string.Join(Environment.NewLine, matchingRuntimePacks.Select(rp => rp.RuntimePackNamePatterns))); @@ -387,7 +402,8 @@ private void ProcessRuntimeIdentifier( List unavailableRuntimePacks, List runtimePacks, List packagesToDownload, - string isTrimmable) + string isTrimmable, + bool addToPackageDownload) { var runtimeGraph = new RuntimeGraphCache(this).GetRuntimeGraph(RuntimeGraphPath); var knownFrameworkReferenceRuntimePackRuntimeIdentifiers = selectedRuntimePack.RuntimePackRuntimeIdentifiers.Split(';'); @@ -418,7 +434,7 @@ private void ProcessRuntimeIdentifier( unrecognizedRuntimeIdentifiers.Add(runtimeIdentifier); } } - else + else if (addToPackageDownload) { foreach (var runtimePackNamePattern in selectedRuntimePack.RuntimePackNamePatterns.Split(';')) { @@ -620,18 +636,13 @@ public KnownFrameworkReference(ITaskItem item) // The framework name to write to the runtimeconfig file (and the name of the folder under dotnet/shared) public string RuntimeFrameworkName => _item.GetMetadata(MetadataKeys.RuntimeFrameworkName); public string DefaultRuntimeFrameworkVersion => _item.GetMetadata("DefaultRuntimeFrameworkVersion"); - //public string LatestRuntimeFrameworkVersion => _item.GetMetadata("LatestRuntimeFrameworkVersion"); // The ID of the targeting pack NuGet package to reference public string TargetingPackName => _item.GetMetadata("TargetingPackName"); public string TargetingPackVersion => _item.GetMetadata("TargetingPackVersion"); public string TargetingPackFormat => _item.GetMetadata("TargetingPackFormat"); - //public string RuntimePackNamePatterns => _item.GetMetadata("RuntimePackNamePatterns"); - - //public string RuntimePackRuntimeIdentifiers => _item.GetMetadata(MetadataKeys.RuntimePackRuntimeIdentifiers); - - //public string IsTrimmable => _item.GetMetadata(MetadataKeys.IsTrimmable); + public string RuntimePackRuntimeIdentifiers => _item.GetMetadata(MetadataKeys.RuntimePackRuntimeIdentifiers); public bool IsWindowsOnly => _item.HasMetadataValue("IsWindowsOnly", "true"); @@ -668,8 +679,6 @@ public KnownRuntimePack(ITaskItem item) public string Name => _item.ItemSpec; //// The framework name to write to the runtimeconfig file (and the name of the folder under dotnet/shared) - //public string RuntimeFrameworkName => _item.GetMetadata(MetadataKeys.RuntimeFrameworkName); - //public string DefaultRuntimeFrameworkVersion => _item.GetMetadata("DefaultRuntimeFrameworkVersion"); public string LatestRuntimeFrameworkVersion => _item.GetMetadata("LatestRuntimeFrameworkVersion"); public string RuntimePackNamePatterns => _item.GetMetadata("RuntimePackNamePatterns"); diff --git a/src/Tests/Microsoft.NET.Build.Tests/KnownRuntimePackTests.cs b/src/Tests/Microsoft.NET.Build.Tests/KnownRuntimePackTests.cs index 1ecf5ebd1fe9..5274a61a38da 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/KnownRuntimePackTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/KnownRuntimePackTests.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; +using System.IO; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml.Linq; using FluentAssertions; using Microsoft.NET.TestFramework; @@ -139,5 +136,42 @@ private void AddItem(TestAsset testAsset, XElement item) itemGroup.Add(item); }); } + + [WindowsOnlyFact] + public void ItCanPublishArm64Winforms() + { + var testDirectory = _testAssetsManager.CreateTestDirectory().Path; + + var newCommand = new DotnetCommand(Log, "new", "winforms", "--no-restore"); + newCommand.WorkingDirectory = testDirectory; + newCommand.Execute().Should().Pass(); + + new PublishCommand(Log, testDirectory) + .Execute("/p:RuntimeIdentifier=win-arm64") + .Should() + .Pass(); + + var selfContainedPublishDir = new DirectoryInfo(testDirectory) + .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault() + .Sub("win-arm64").Sub("publish"); + + selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly); + selfContainedPublishDir.Should().HaveFilesMatching($"{new DirectoryInfo(testDirectory).Name}.dll", SearchOption.TopDirectoryOnly); + } + + [WindowsOnlyFact] + public void ItCantPublishArm64Wpf() + { + var testDirectory = _testAssetsManager.CreateTestDirectory().Path; + + var newCommand = new DotnetCommand(Log, "new", "wpf", "--no-restore"); + newCommand.WorkingDirectory = testDirectory; + newCommand.Execute().Should().Pass(); + + new PublishCommand(Log, testDirectory) + .Execute("/p:RuntimeIdentifier=win-arm64") + .Should() + .Fail(); + } } } From fcd1a474b7ce84a80008daf3892dd62a43aa0257 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 18:06:50 +0000 Subject: [PATCH 14/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200625.9 (#12220) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20323.9 -> To Version 5.0.0-preview.7.20325.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 df595d1ee56a..d34aa09a0aa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - f6a6e4bd07bd4bf51c6965382156ebce22540fb7 + 1f56e8273269b1d61bbe031609599bc0dbcf2716 - + https://github.com/dotnet/aspnetcore - f6a6e4bd07bd4bf51c6965382156ebce22540fb7 + 1f56e8273269b1d61bbe031609599bc0dbcf2716 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7cfa8e9a8b61db63bb13af8e59cd4bcecafd904c - + https://github.com/dotnet/aspnetcore - f6a6e4bd07bd4bf51c6965382156ebce22540fb7 + 1f56e8273269b1d61bbe031609599bc0dbcf2716 - + https://github.com/dotnet/aspnetcore - f6a6e4bd07bd4bf51c6965382156ebce22540fb7 + 1f56e8273269b1d61bbe031609599bc0dbcf2716 - + https://github.com/dotnet/aspnetcore - f6a6e4bd07bd4bf51c6965382156ebce22540fb7 + 1f56e8273269b1d61bbe031609599bc0dbcf2716 - + https://github.com/dotnet/aspnetcore - f6a6e4bd07bd4bf51c6965382156ebce22540fb7 + 1f56e8273269b1d61bbe031609599bc0dbcf2716 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c581de3053f5..9e4d0633e907 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20323.9 - 5.0.0-preview.7.20323.9 - 5.0.0-preview.7.20323.9 - 5.0.0-preview.7.20323.9 - 5.0.0-preview.7.20323.9 - 5.0.0-preview.7.20323.9 + 5.0.0-preview.7.20325.9 + 5.0.0-preview.7.20325.9 + 5.0.0-preview.7.20325.9 + 5.0.0-preview.7.20325.9 + 5.0.0-preview.7.20325.9 + 5.0.0-preview.7.20325.9 From 16357ea5bd821b94a1fb9c786684f592937c0300 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 18:13:56 +0000 Subject: [PATCH 15/65] Update dependencies from https://github.com/dotnet/fsharp build 20200626.1 (#12219) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20323.3 -> To Version 10.10.0-beta.20326.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 d34aa09a0aa0..33de4542fb94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild a3f63e87d3d8ac9ab52affb453c150b7d4997898 - + https://github.com/dotnet/fsharp - 403f594a569bda4ff0f9aafd39b599041a772fb5 + d34dab991e71214fa3155e3a5543cbae5cac303d https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 9e4d0633e907..c374edf2a30b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20323.3 + 10.10.0-beta.20326.1 From 144e0f696e9f212443147f8737eb1a94a1d48918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 18:42:43 +0000 Subject: [PATCH 16/65] Update dependencies from https://github.com/dotnet/runtime build 20200626.1 (#12221) System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Ref , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions From Version 5.0.0-preview.7.20323.4 -> To Version 5.0.0-preview.7.20326.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33de4542fb94..e9ffdd9e4313 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 97c803a412c014e0bf93474dfeef0de02f140746 - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff https://github.com/dotnet/arcade 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker b0b5143ee2a59517df69d38cb6c363cdd17177a8 - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff - + https://github.com/dotnet/runtime - 17df0b885273d0f4d22794fd830361d28bf3b663 + b0f97149538e3dabde2267efa326c76a628a30ff https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index c374edf2a30b..cfab622dffd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20316.1 3.1.0 - 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20326.1 4.3.0 4.3.0 3.6.0 @@ -36,12 +36,12 @@ - 5.0.0-preview.7.20323.4 - 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20326.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.7.20323.4 - 5.0.0-preview.7.20323.4 - 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20326.1 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.7.20323.4 - 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20326.1 5.0.0-preview.7.20307.4 - 5.0.0-preview.7.20323.4 + 5.0.0-preview.7.20326.1 From 4a762e982de83164f4f896ef882e15c05ae42aa8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 19:48:59 +0000 Subject: [PATCH 17/65] [release/5.0.1xx-preview7] Update dependencies from microsoft/msbuild (#12218) * Update dependencies from https://github.com/microsoft/msbuild build 20200626.1 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20323-01 -> To Version 16.7.0-preview-20326-01 * Update dependencies from https://github.com/microsoft/msbuild build 20200626.6 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20323-01 -> To Version 16.7.0-preview-20326-06 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 e9ffdd9e4313..ce8a0e022490 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - a3f63e87d3d8ac9ab52affb453c150b7d4997898 + 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca - + https://github.com/microsoft/msbuild - a3f63e87d3d8ac9ab52affb453c150b7d4997898 + 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index cfab622dffd7..31b9365f7e9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20323-01 + 16.7.0-preview-20326-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20323-01 + 16.7.0-preview-20326-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 58469ea250210f3f75223d54d4b7d02a9d2f510b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 22:21:40 +0000 Subject: [PATCH 18/65] [release/5.0.1xx-preview7] Update dependencies from dotnet/aspnetcore (#12223) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.3 Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20325.9 -> To Version 5.0.0-preview.7.20326.3 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.5 Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20325.9 -> To Version 5.0.0-preview.7.20326.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 ce8a0e022490..21ede0cc8480 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 1f56e8273269b1d61bbe031609599bc0dbcf2716 + 0476892ea8101f5c6117cd5306c442bf2dcaddae - + https://github.com/dotnet/aspnetcore - 1f56e8273269b1d61bbe031609599bc0dbcf2716 + 0476892ea8101f5c6117cd5306c442bf2dcaddae https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7cfa8e9a8b61db63bb13af8e59cd4bcecafd904c - + https://github.com/dotnet/aspnetcore - 1f56e8273269b1d61bbe031609599bc0dbcf2716 + 0476892ea8101f5c6117cd5306c442bf2dcaddae - + https://github.com/dotnet/aspnetcore - 1f56e8273269b1d61bbe031609599bc0dbcf2716 + 0476892ea8101f5c6117cd5306c442bf2dcaddae - + https://github.com/dotnet/aspnetcore - 1f56e8273269b1d61bbe031609599bc0dbcf2716 + 0476892ea8101f5c6117cd5306c442bf2dcaddae - + https://github.com/dotnet/aspnetcore - 1f56e8273269b1d61bbe031609599bc0dbcf2716 + 0476892ea8101f5c6117cd5306c442bf2dcaddae https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 31b9365f7e9b..d65dd52b55b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20325.9 - 5.0.0-preview.7.20325.9 - 5.0.0-preview.7.20325.9 - 5.0.0-preview.7.20325.9 - 5.0.0-preview.7.20325.9 - 5.0.0-preview.7.20325.9 + 5.0.0-preview.7.20326.5 + 5.0.0-preview.7.20326.5 + 5.0.0-preview.7.20326.5 + 5.0.0-preview.7.20326.5 + 5.0.0-preview.7.20326.5 + 5.0.0-preview.7.20326.5 From 9eb88ee03aa182eb1db4bceb79bfc0707ea7ec42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 22:23:16 +0000 Subject: [PATCH 19/65] Update dependencies from https://github.com/dotnet/fsharp build 20200626.3 (#12225) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20326.1 -> To Version 10.10.0-beta.20326.3 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 21ede0cc8480..7752c3b2337b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca - + https://github.com/dotnet/fsharp - d34dab991e71214fa3155e3a5543cbae5cac303d + 42f26f2441d3df72a33915000c60cec6ddb297e5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d65dd52b55b8..2f54484aea01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20326.1 + 10.10.0-beta.20326.3 From 604f8be092848bcd08a3e2e16e357ee4674fdb34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 16:58:22 -0700 Subject: [PATCH 20/65] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200626.3 (#12229) Microsoft.WindowsDesktop.App From Version 5.0.0-preview.7.20324.1 -> To Version 5.0.0-preview.7.20326.3 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 5.0.0-preview.7.20323.9 -> To Version 5.0.0-preview.7.20326.3 (parent: Microsoft.WindowsDesktop.App 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 7752c3b2337b..c637ff9f11c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime b0f97149538e3dabde2267efa326c76a628a30ff - + https://github.com/dotnet/windowsdesktop - 88fc3e713a9fb79b7b7db96a98ca78ac51fd3805 + 5661ff75f3e7c7b9b05f92ad3a7ef0421f0182ce - + https://github.com/dotnet/wpf - 7cfa8e9a8b61db63bb13af8e59cd4bcecafd904c + 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2f54484aea01..0f43df10d8d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,11 +124,11 @@ - 5.0.0-preview.7.20323.9 + 5.0.0-preview.7.20326.3 - 5.0.0-preview.7.20324.1 + 5.0.0-preview.7.20326.3 From cb35c3c7b1af37c0e4fbe2ecebf67d0aed223492 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 18:07:35 -0700 Subject: [PATCH 21/65] [release/5.0.1xx-preview7] Update dependencies from microsoft/msbuild (#12226) * Update dependencies from https://github.com/microsoft/msbuild build 20200626.2 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-06 -> To Version 16.7.0-preview-20326-02 * Update dependencies from https://github.com/microsoft/msbuild build 20200626.3 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-02 -> To Version 16.7.0-preview-20326-03 * Update dependencies from https://github.com/microsoft/msbuild build 20200626.5 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-03 -> To Version 16.7.0-preview-20326-05 * Update dependencies from https://github.com/microsoft/msbuild build 20200626.4 Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-05 -> To Version 16.7.0-preview-20326-04 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 c637ff9f11c9..c044d1d5c512 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca + 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/microsoft/msbuild - 3d498ca1a3e0bd75de0b82b9c3e5079eec707bca + 1eab2845bd4dbded49765c0b33641f029ed92c69 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0f43df10d8d5..b79b06e74ec0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20326-06 + 16.7.0-preview-20326-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20326-06 + 16.7.0-preview-20326-04 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 3b39a05d1a30ebbdb7f137660046f895df0422ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jun 2020 04:16:32 +0000 Subject: [PATCH 22/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.10 (#12235) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20326.5 -> To Version 5.0.0-preview.7.20326.10 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 c044d1d5c512..01f4e7a8aba9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 0476892ea8101f5c6117cd5306c442bf2dcaddae + 23a3e845e586d6863f7f917097b855da92ec2908 - + https://github.com/dotnet/aspnetcore - 0476892ea8101f5c6117cd5306c442bf2dcaddae + 23a3e845e586d6863f7f917097b855da92ec2908 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 0476892ea8101f5c6117cd5306c442bf2dcaddae + 23a3e845e586d6863f7f917097b855da92ec2908 - + https://github.com/dotnet/aspnetcore - 0476892ea8101f5c6117cd5306c442bf2dcaddae + 23a3e845e586d6863f7f917097b855da92ec2908 - + https://github.com/dotnet/aspnetcore - 0476892ea8101f5c6117cd5306c442bf2dcaddae + 23a3e845e586d6863f7f917097b855da92ec2908 - + https://github.com/dotnet/aspnetcore - 0476892ea8101f5c6117cd5306c442bf2dcaddae + 23a3e845e586d6863f7f917097b855da92ec2908 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b79b06e74ec0..96e77aae98ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20326.5 - 5.0.0-preview.7.20326.5 - 5.0.0-preview.7.20326.5 - 5.0.0-preview.7.20326.5 - 5.0.0-preview.7.20326.5 - 5.0.0-preview.7.20326.5 + 5.0.0-preview.7.20326.10 + 5.0.0-preview.7.20326.10 + 5.0.0-preview.7.20326.10 + 5.0.0-preview.7.20326.10 + 5.0.0-preview.7.20326.10 + 5.0.0-preview.7.20326.10 From 69d2b83c48c1f543369f701b1f216f402a7c0449 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jun 2020 08:47:22 +0000 Subject: [PATCH 23/65] [release/5.0.1xx-preview7] Update dependencies from dotnet/aspnetcore (#12237) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.12 Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20326.10 -> To Version 5.0.0-preview.7.20326.12 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.13 Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20326.10 -> To Version 5.0.0-preview.7.20326.13 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 01f4e7a8aba9..f8d1ab2b1a3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 23a3e845e586d6863f7f917097b855da92ec2908 + b446ab7c6f28bb10879bd355afe08bbf283c7de3 - + https://github.com/dotnet/aspnetcore - 23a3e845e586d6863f7f917097b855da92ec2908 + b446ab7c6f28bb10879bd355afe08bbf283c7de3 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 23a3e845e586d6863f7f917097b855da92ec2908 + b446ab7c6f28bb10879bd355afe08bbf283c7de3 - + https://github.com/dotnet/aspnetcore - 23a3e845e586d6863f7f917097b855da92ec2908 + b446ab7c6f28bb10879bd355afe08bbf283c7de3 - + https://github.com/dotnet/aspnetcore - 23a3e845e586d6863f7f917097b855da92ec2908 + b446ab7c6f28bb10879bd355afe08bbf283c7de3 - + https://github.com/dotnet/aspnetcore - 23a3e845e586d6863f7f917097b855da92ec2908 + b446ab7c6f28bb10879bd355afe08bbf283c7de3 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 96e77aae98ec..fe50ea3008c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20326.10 - 5.0.0-preview.7.20326.10 - 5.0.0-preview.7.20326.10 - 5.0.0-preview.7.20326.10 - 5.0.0-preview.7.20326.10 - 5.0.0-preview.7.20326.10 + 5.0.0-preview.7.20326.13 + 5.0.0-preview.7.20326.13 + 5.0.0-preview.7.20326.13 + 5.0.0-preview.7.20326.13 + 5.0.0-preview.7.20326.13 + 5.0.0-preview.7.20326.13 From 1129deca88f2d458faae353c28418ec33a9e0fb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jun 2020 00:10:19 +0000 Subject: [PATCH 24/65] Update dependencies from https://github.com/dotnet/fsharp build 20200627.5 (#12244) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20326.3 -> To Version 10.10.0-beta.20327.5 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 f8d1ab2b1a3a..86d89d3a61df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/dotnet/fsharp - 42f26f2441d3df72a33915000c60cec6ddb297e5 + b74c9de731058d0258f82dac1bddc7688a5fa410 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index fe50ea3008c5..9271bd207aaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20326.3 + 10.10.0-beta.20327.5 From 2f9f738b909dfb5b7f89e134d0e6c40070f17a22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 03:33:14 +0000 Subject: [PATCH 25/65] Update dependencies from https://github.com/dotnet/fsharp build 20200628.2 (#12250) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20327.5 -> To Version 10.10.0-beta.20328.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 86d89d3a61df..566afc8233ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/dotnet/fsharp - b74c9de731058d0258f82dac1bddc7688a5fa410 + bab2902ec895cfc53b186eebac47ed0d533ad2eb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 9271bd207aaa..9d7690bfa983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20327.5 + 10.10.0-beta.20328.2 From 4a45c1e49ab33ffe4aa0bf408a870db853917952 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 06:40:10 +0000 Subject: [PATCH 26/65] Update dependencies from https://github.com/dotnet/fsharp build 20200628.3 (#12252) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20328.2 -> To Version 10.10.0-beta.20328.3 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 566afc8233ff..0ac797ac7413 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/dotnet/fsharp - bab2902ec895cfc53b186eebac47ed0d533ad2eb + 2cd49dcaff95f8cade512d525cd70789a2b4588e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 9d7690bfa983..05fecdc655b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20328.2 + 10.10.0-beta.20328.3 From 81cb31bdd7eb23991a73c9d3d01f4cc7fddbe027 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 16:22:35 +0000 Subject: [PATCH 27/65] Update dependencies from https://github.com/dotnet/fsharp build 20200629.1 (#12258) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20328.3 -> To Version 10.10.0-beta.20329.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 0ac797ac7413..3fcd4673de44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/dotnet/fsharp - 2cd49dcaff95f8cade512d525cd70789a2b4588e + 19c9e2f1b21a66ec90fefae79988b33fc16744fc https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 05fecdc655b2..79289e3911fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20328.3 + 10.10.0-beta.20329.1 From 889a199b8d0c3b88b6eb67ab2a2041cc725d7e6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 20:05:51 +0000 Subject: [PATCH 28/65] Update dependencies from https://github.com/microsoft/msbuild build 20200629.2 (#12263) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20326-04 -> To Version 16.7.0-preview-20329-02 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 3fcd4673de44..97357045a944 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - 1eab2845bd4dbded49765c0b33641f029ed92c69 + e2a33003170b038bf0c2414df166b5409d4b9581 - + https://github.com/microsoft/msbuild - 1eab2845bd4dbded49765c0b33641f029ed92c69 + e2a33003170b038bf0c2414df166b5409d4b9581 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 79289e3911fe..6168444ab7d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20326-04 + 16.7.0-preview-20329-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20326-04 + 16.7.0-preview-20329-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From b5fd5f2bc52fb7b99063a4d1c7cd3a6c55741378 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 22:11:21 +0000 Subject: [PATCH 29/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200629.4 (#12266) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20326.13 -> To Version 5.0.0-preview.7.20329.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 97357045a944..835e9b252cc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - b446ab7c6f28bb10879bd355afe08bbf283c7de3 + 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 - + https://github.com/dotnet/aspnetcore - b446ab7c6f28bb10879bd355afe08bbf283c7de3 + 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - b446ab7c6f28bb10879bd355afe08bbf283c7de3 + 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 - + https://github.com/dotnet/aspnetcore - b446ab7c6f28bb10879bd355afe08bbf283c7de3 + 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 - + https://github.com/dotnet/aspnetcore - b446ab7c6f28bb10879bd355afe08bbf283c7de3 + 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 - + https://github.com/dotnet/aspnetcore - b446ab7c6f28bb10879bd355afe08bbf283c7de3 + 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 6168444ab7d4..b6e42adeaa71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20326.13 - 5.0.0-preview.7.20326.13 - 5.0.0-preview.7.20326.13 - 5.0.0-preview.7.20326.13 - 5.0.0-preview.7.20326.13 - 5.0.0-preview.7.20326.13 + 5.0.0-preview.7.20329.4 + 5.0.0-preview.7.20329.4 + 5.0.0-preview.7.20329.4 + 5.0.0-preview.7.20329.4 + 5.0.0-preview.7.20329.4 + 5.0.0-preview.7.20329.4 From bd0c27a5e0293098f41da2256799959a5b52b196 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 01:02:17 +0000 Subject: [PATCH 30/65] Update dependencies from https://github.com/dotnet/fsharp build 20200629.4 (#12268) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20329.1 -> To Version 10.10.0-beta.20329.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 835e9b252cc0..f0c53827764d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,7 +41,7 @@ https://github.com/microsoft/msbuild e2a33003170b038bf0c2414df166b5409d4b9581 - + https://github.com/dotnet/fsharp 19c9e2f1b21a66ec90fefae79988b33fc16744fc diff --git a/eng/Versions.props b/eng/Versions.props index b6e42adeaa71..29c6b3a3d427 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20329.1 + 10.10.0-beta.20329.4 From 948910f4d749a429f0998d0164d0a3b8a8692597 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 02:38:52 +0000 Subject: [PATCH 31/65] Update dependencies from https://github.com/dotnet/fsharp build 20200629.5 (#12269) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20329.4 -> To Version 10.10.0-beta.20329.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0c53827764d..b6c884fdc00d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,7 +41,7 @@ https://github.com/microsoft/msbuild e2a33003170b038bf0c2414df166b5409d4b9581 - + https://github.com/dotnet/fsharp 19c9e2f1b21a66ec90fefae79988b33fc16744fc diff --git a/eng/Versions.props b/eng/Versions.props index 29c6b3a3d427..2866e8e7961e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20329.4 + 10.10.0-beta.20329.5 From 60d7dd7afbc0e822407feabe7bbaa441e0570d25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 05:20:58 +0000 Subject: [PATCH 32/65] Update dependencies from https://github.com/microsoft/msbuild build 20200630.1 (#12273) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20329-02 -> To Version 16.7.0-preview-20330-01 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 b6c884fdc00d..d5dcaeca8a9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - e2a33003170b038bf0c2414df166b5409d4b9581 + 32b3e5871d2cf119379286d079f623475f3597bb - + https://github.com/microsoft/msbuild - e2a33003170b038bf0c2414df166b5409d4b9581 + 32b3e5871d2cf119379286d079f623475f3597bb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2866e8e7961e..a499d36ed8fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20329-02 + 16.7.0-preview-20330-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20329-02 + 16.7.0-preview-20330-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 357e97a02c22619a12a16aa853ae2dd5e4e46350 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 30 Jun 2020 01:31:18 -0500 Subject: [PATCH 33/65] Add ILLink extension points (#12116) (#12264) * Add ILLink extension points See https://github.com/dotnet/sdk/issues/12035 - PrepareForILLink target - ManagedAssemblyToLink ItemGroup - TrimMode property and metadata - private _TrimmerCustomData (https://github.com/mono/linker/issues/1134) - Allow setting `PublishTrimmed` in a late import.targets * Add tests for extension points * Set Action in _RunILLink * Add notes about ManagedAssemblyToLink Co-authored-by: Sven Boemer --- .../targets/Microsoft.NET.ILLink.targets | 76 ++++++---- .../GivenThatWeWantToRunILLink.cs | 139 ++++++++++++++++-- 2 files changed, 176 insertions(+), 39 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets index 19d94d859de4..e7fb38b8cae7 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets @@ -13,7 +13,9 @@ Copyright (c) .NET Foundation. All rights reserved. - + + $(IntermediateOutputPath)linked\ $(IntermediateLinkDir)\ @@ -37,21 +39,21 @@ Copyright (c) .NET Foundation. All rights reserved. - <_LinkedResolvedFileToPublish Include="@(_LinkedResolvedFileToPublishCandidates)" Condition="Exists('%(Identity)')" /> - + <_LinkedResolvedFileToPublish Include="@(_LinkedResolvedFileToPublishCandidate)" Condition="Exists('%(Identity)')" /> + - <_RemovedManagedAssemblies Include="@(_ManagedAssembliesToLink)" Condition="!Exists('$(IntermediateLinkDir)%(Filename)%(Extension)')" /> + <_RemovedManagedAssembly Include="@(ManagedAssemblyToLink)" Condition="!Exists('$(IntermediateLinkDir)%(Filename)%(Extension)')" /> - - - - - + + + + + @@ -67,8 +69,8 @@ Copyright (c) .NET Foundation. All rights reserved. --> + + + %(ManagedAssemblyToLink.TrimMode) + + + + + - + + + true + + + + + copy + @@ -141,22 +163,22 @@ Copyright (c) .NET Foundation. All rights reserved. - + - + - <_LinkedResolvedFileToPublishCandidates Include="@(_ManagedAssembliesToLink->'$(IntermediateLinkDir)%(Filename)%(Extension)')" /> + <_LinkedResolvedFileToPublishCandidate Include="@(ManagedAssemblyToLink->'$(IntermediateLinkDir)%(Filename)%(Extension)')" /> diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs index 941b3117ac23..d63838164e8b 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @@ -99,6 +99,86 @@ public void ILLink_runs_and_creates_linked_app(string targetFramework, bool refe DoesDepsFileHaveAssembly(depsFile, unusedFrameworkAssembly).Should().BeFalse(); } + [Theory] + [InlineData("net5.0")] + public void PrepareForILLink_can_set_IsTrimmable(string targetFramework) + { + var projectName = "HelloWorld"; + var referenceProjectName = "ClassLibForILLink"; + var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); + + var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testAsset = _testAssetsManager.CreateTestProject(testProject) + .WithProjectChanges(project => SetIsTrimmable(project, referenceProjectName)); + + var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + publishCommand.Execute($"/p:RuntimeIdentifier={rid}", $"/p:SelfContained=true", "/p:PublishTrimmed=true").Should().Pass(); + + var publishDirectory = publishCommand.GetOutputDirectory(targetFramework: targetFramework, runtimeIdentifier: rid).FullName; + + var publishedDll = Path.Combine(publishDirectory, $"{projectName}.dll"); + var unusedIsTrimmableDll = Path.Combine(publishDirectory, $"{referenceProjectName}.dll"); + + File.Exists(publishedDll).Should().BeTrue(); + // Check that the unused trimmable assembly was removed + File.Exists(unusedIsTrimmableDll).Should().BeFalse(); + } + + [Theory] + [InlineData("net5.0")] + public void PrepareForILLink_can_set_TrimMode(string targetFramework) + { + var projectName = "HelloWorld"; + var referenceProjectName = "ClassLibForILLink"; + var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); + + var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testAsset = _testAssetsManager.CreateTestProject(testProject) + .WithProjectChanges(project => SetTrimMode(project, referenceProjectName, "link")); + + var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + publishCommand.Execute($"/p:RuntimeIdentifier={rid}", $"/p:SelfContained=true", "/p:PublishTrimmed=true").Should().Pass(); + + var publishDirectory = publishCommand.GetOutputDirectory(targetFramework: targetFramework, runtimeIdentifier: rid).FullName; + + var publishedDll = Path.Combine(publishDirectory, $"{projectName}.dll"); + var unusedTrimModeLinkDll = Path.Combine(publishDirectory, $"{referenceProjectName}.dll"); + + File.Exists(publishedDll).Should().BeTrue(); + // Check that the unused "link" assembly was removed. + File.Exists(unusedTrimModeLinkDll).Should().BeFalse(); + } + + [Theory] + [InlineData("net5.0")] + public void ILLink_respects_global_TrimMode(string targetFramework) + { + var projectName = "HelloWorld"; + var referenceProjectName = "ClassLibForILLink"; + var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); + + var testProject = CreateTestProjectForILLinkTesting(targetFramework, projectName, referenceProjectName); + var testAsset = _testAssetsManager.CreateTestProject(testProject) + .WithProjectChanges(project => SetGlobalTrimMode(project, "link")) + .WithProjectChanges(project => SetIsTrimmable(project, referenceProjectName)) + .WithProjectChanges(project => AddRootDescriptor(project, $"{referenceProjectName}.xml")); + + var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + publishCommand.Execute($"/p:RuntimeIdentifier={rid}", $"/p:SelfContained=true", "/p:PublishTrimmed=true").Should().Pass(); + + var publishDirectory = publishCommand.GetOutputDirectory(targetFramework: targetFramework, runtimeIdentifier: rid).FullName; + + var publishedDll = Path.Combine(publishDirectory, $"{projectName}.dll"); + var isTrimmableDll = Path.Combine(publishDirectory, $"{referenceProjectName}.dll"); + + File.Exists(publishedDll).Should().BeTrue(); + File.Exists(isTrimmableDll).Should().BeTrue(); + // Check that the assembly was trimmed at the member level + DoesImageHaveMethod(isTrimmableDll, "UnusedMethodToRoot").Should().BeTrue(); + DoesImageHaveMethod(isTrimmableDll, "UnusedMethod").Should().BeFalse(); + } + + [Theory] [InlineData("netcoreapp3.0")] public void ILLink_accepts_root_descriptor(string targetFramework) @@ -494,6 +574,44 @@ public void It_warns_when_targetting_netcoreapp_2_x() .HaveStdOutContaining(Strings.PublishTrimmedRequiresVersion30); } + private void SetIsTrimmable(XDocument project, string assemblyName) + { + var ns = project.Root.Name.Namespace; + + var target = new XElement(ns + "Target", + new XAttribute("BeforeTargets", "PrepareForILLink"), + new XAttribute("Name", "SetIsTrimmable")); + project.Root.Add(target); + target.Add(new XElement(ns + "ItemGroup", + new XElement("ManagedAssemblyToLink", + new XAttribute("Condition", $"'%(FileName)' == '{assemblyName}'"), + new XElement("IsTrimmable", "true")))); + } + + private void SetTrimMode(XDocument project, string assemblyName, string trimMode) + { + var ns = project.Root.Name.Namespace; + + var target = new XElement(ns + "Target", + new XAttribute("BeforeTargets", "PrepareForILLink"), + new XAttribute("Name", "SetTrimMode")); + project.Root.Add(target); + target.Add(new XElement(ns + "ItemGroup", + new XElement("ManagedAssemblyToLink", + new XAttribute("Condition", $"'%(FileName)' == '{assemblyName}'"), + new XElement("TrimMode", trimMode)))); + } + + private void SetGlobalTrimMode(XDocument project, string trimMode) + { + var ns = project.Root.Name.Namespace; + + var properties = new XElement(ns + "PropertyGroup"); + project.Root.Add(properties); + properties.Add(new XElement(ns + "TrimMode", + trimMode)); + } + private void EnableNonFrameworkTrimming(XDocument project) { // Used to override the default linker options for testing @@ -501,23 +619,20 @@ private void EnableNonFrameworkTrimming(XDocument project) // but we want to ensure that the linker is running // end-to-end by checking that it strips code from our // test projects. - + SetGlobalTrimMode(project, "link"); var ns = project.Root.Name.Namespace; var target = new XElement(ns + "Target", - new XAttribute("AfterTargets", "_SetILLinkDefaults"), + new XAttribute("BeforeTargets", "PrepareForILLink"), new XAttribute("Name", "_EnableNonFrameworkTrimming")); project.Root.Add(target); - target.Add(new XElement(ns + "PropertyGroup", - new XElement("_TrimmerDefaultAction", "link"))); - target.Add(new XElement(ns + "ItemGroup", - new XElement("TrimmerRootAssembly", - new XAttribute("Remove", "@(TrimmerRootAssembly)")), - new XElement("TrimmerRootAssembly", - new XAttribute("Include", "@(IntermediateAssembly->'%(FileName)')")), - new XElement("_ManagedAssembliesToLink", - new XAttribute("Update", "@(_ManagedAssembliesToLink)"), - new XElement("action")))); + var items = new XElement(ns + "ItemGroup"); + target.Add(items); + items.Add(new XElement("ManagedAssemblyToLink", + new XElement("Condition", "true"), + new XElement("IsTrimmable", "true"))); + items.Add(new XElement(ns + "TrimmerRootAssembly", + new XAttribute("Include", "@(IntermediateAssembly->'%(FileName)')"))); } static readonly string substitutionsFilename = "ILLink.Substitutions.xml"; From 3ebd5ee1969ff21ebefd9ccd153fbbd61529ca6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 07:12:26 +0000 Subject: [PATCH 34/65] Update dependencies from https://github.com/microsoft/msbuild build 20200630.2 (#12275) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-01 -> To Version 16.7.0-preview-20330-02 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 d5dcaeca8a9f..aac6aa9f81e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - 32b3e5871d2cf119379286d079f623475f3597bb + 1eab2845bd4dbded49765c0b33641f029ed92c69 - + https://github.com/microsoft/msbuild - 32b3e5871d2cf119379286d079f623475f3597bb + 1eab2845bd4dbded49765c0b33641f029ed92c69 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a499d36ed8fc..7388f966f107 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20330-01 + 16.7.0-preview-20330-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-01 + 16.7.0-preview-20330-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From b536fabe2a6eb7b8317ff4a0b214aae4b13cf4e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 19:26:23 +0000 Subject: [PATCH 35/65] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6677 (#12284) NuGet.Build.Tasks From Version 5.7.0-rtm.6670 -> To Version 5.7.0-rtm.6677 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 aac6aa9f81e3..e3620b973857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/aspnetcore 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 - + https://github.com/NuGet/NuGet.Client - 76c12e524364375549b763c78750372910cb1c19 + 088004379cb99890f766e9b7a0a29f7b080f888b https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 7388f966f107..8ba2bbfb8a10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ - 5.7.0-rtm.6670 + 5.7.0-rtm.6677 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From eaa48dc3686031a728649180c4022fdefed23cd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 19:57:29 +0000 Subject: [PATCH 36/65] Update dependencies from https://github.com/microsoft/msbuild build 20200630.6 (#12286) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-02 -> To Version 16.7.0-preview-20330-06 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 e3620b973857..e781d0a337b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - 1eab2845bd4dbded49765c0b33641f029ed92c69 + de74df7507bbb93563fec6c1a8252b5750597283 - + https://github.com/microsoft/msbuild - 1eab2845bd4dbded49765c0b33641f029ed92c69 + de74df7507bbb93563fec6c1a8252b5750597283 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8ba2bbfb8a10..fd9d1f5c69ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20330-02 + 16.7.0-preview-20330-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-02 + 16.7.0-preview-20330-06 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From fb1d15cdfdc1485402fec2b06c062a9da9a4eb08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 21:05:22 +0000 Subject: [PATCH 37/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200630.2 (#12290) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20329.4 -> To Version 5.0.0-preview.7.20330.2 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 e781d0a337b2..98003b9475c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 + eb769315789467772c14b0af6503ef57a78e911c - + https://github.com/dotnet/aspnetcore - 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 + eb769315789467772c14b0af6503ef57a78e911c https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 + eb769315789467772c14b0af6503ef57a78e911c - + https://github.com/dotnet/aspnetcore - 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 + eb769315789467772c14b0af6503ef57a78e911c - + https://github.com/dotnet/aspnetcore - 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 + eb769315789467772c14b0af6503ef57a78e911c - + https://github.com/dotnet/aspnetcore - 126f14dbd22fa76ee1e8dbd84fdd6a749c337e75 + eb769315789467772c14b0af6503ef57a78e911c https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index fd9d1f5c69ad..d4406dc31d12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20329.4 - 5.0.0-preview.7.20329.4 - 5.0.0-preview.7.20329.4 - 5.0.0-preview.7.20329.4 - 5.0.0-preview.7.20329.4 - 5.0.0-preview.7.20329.4 + 5.0.0-preview.7.20330.2 + 5.0.0-preview.7.20330.2 + 5.0.0-preview.7.20330.2 + 5.0.0-preview.7.20330.2 + 5.0.0-preview.7.20330.2 + 5.0.0-preview.7.20330.2 From acf08e87a88e59fd52e37091e907daede24e8799 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 23:17:03 +0000 Subject: [PATCH 38/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200630.5 (#12293) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20330.2 -> To Version 5.0.0-preview.7.20330.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 98003b9475c2..5e3353912a91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - eb769315789467772c14b0af6503ef57a78e911c + 3fe6b07412984035dd69ea6757156dd7c8bd1c93 - + https://github.com/dotnet/aspnetcore - eb769315789467772c14b0af6503ef57a78e911c + 3fe6b07412984035dd69ea6757156dd7c8bd1c93 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - eb769315789467772c14b0af6503ef57a78e911c + 3fe6b07412984035dd69ea6757156dd7c8bd1c93 - + https://github.com/dotnet/aspnetcore - eb769315789467772c14b0af6503ef57a78e911c + 3fe6b07412984035dd69ea6757156dd7c8bd1c93 - + https://github.com/dotnet/aspnetcore - eb769315789467772c14b0af6503ef57a78e911c + 3fe6b07412984035dd69ea6757156dd7c8bd1c93 - + https://github.com/dotnet/aspnetcore - eb769315789467772c14b0af6503ef57a78e911c + 3fe6b07412984035dd69ea6757156dd7c8bd1c93 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index d4406dc31d12..48b694f705ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20330.2 - 5.0.0-preview.7.20330.2 - 5.0.0-preview.7.20330.2 - 5.0.0-preview.7.20330.2 - 5.0.0-preview.7.20330.2 - 5.0.0-preview.7.20330.2 + 5.0.0-preview.7.20330.5 + 5.0.0-preview.7.20330.5 + 5.0.0-preview.7.20330.5 + 5.0.0-preview.7.20330.5 + 5.0.0-preview.7.20330.5 + 5.0.0-preview.7.20330.5 From 15eb6244687d7eb8edf3c45ae525c5c807baf0e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2020 23:42:37 +0000 Subject: [PATCH 39/65] Update dependencies from https://github.com/microsoft/msbuild build 20200630.7 (#12294) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-06 -> To Version 16.7.0-preview-20330-07 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 5e3353912a91..a23a6a7f37d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - de74df7507bbb93563fec6c1a8252b5750597283 + 2ec12e962575749b1d20880089bffd667335a451 - + https://github.com/microsoft/msbuild - de74df7507bbb93563fec6c1a8252b5750597283 + 2ec12e962575749b1d20880089bffd667335a451 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 48b694f705ba..a1741b594e6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20330-06 + 16.7.0-preview-20330-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-06 + 16.7.0-preview-20330-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 0ab8a620a451234f36f7af160199d04e44dfcfb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 01:29:15 +0000 Subject: [PATCH 40/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200630.7 (#12299) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20330.5 -> To Version 5.0.0-preview.7.20330.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 a23a6a7f37d4..326d0cdae59c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 3fe6b07412984035dd69ea6757156dd7c8bd1c93 + 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 - + https://github.com/dotnet/aspnetcore - 3fe6b07412984035dd69ea6757156dd7c8bd1c93 + 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 3fe6b07412984035dd69ea6757156dd7c8bd1c93 + 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 - + https://github.com/dotnet/aspnetcore - 3fe6b07412984035dd69ea6757156dd7c8bd1c93 + 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 - + https://github.com/dotnet/aspnetcore - 3fe6b07412984035dd69ea6757156dd7c8bd1c93 + 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 - + https://github.com/dotnet/aspnetcore - 3fe6b07412984035dd69ea6757156dd7c8bd1c93 + 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a1741b594e6d..2cd1c069d347 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20330.5 - 5.0.0-preview.7.20330.5 - 5.0.0-preview.7.20330.5 - 5.0.0-preview.7.20330.5 - 5.0.0-preview.7.20330.5 - 5.0.0-preview.7.20330.5 + 5.0.0-preview.7.20330.7 + 5.0.0-preview.7.20330.7 + 5.0.0-preview.7.20330.7 + 5.0.0-preview.7.20330.7 + 5.0.0-preview.7.20330.7 + 5.0.0-preview.7.20330.7 From 07a1f8392b7c9673cd53ce24faaf6f166315718d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 02:01:12 +0000 Subject: [PATCH 41/65] Update dependencies from https://github.com/microsoft/msbuild build 20200630.8 (#12300) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-07 -> To Version 16.7.0-preview-20330-08 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 326d0cdae59c..e79e5632ab72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - 2ec12e962575749b1d20880089bffd667335a451 + 96403c598a166e5a06933f78ace75528a1d1f3b0 - + https://github.com/microsoft/msbuild - 2ec12e962575749b1d20880089bffd667335a451 + 96403c598a166e5a06933f78ace75528a1d1f3b0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2cd1c069d347..8a847ebd39c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20330-07 + 16.7.0-preview-20330-08 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-07 + 16.7.0-preview-20330-08 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 7cca6fd0f99bfb4800a1bcf75694db97c5050b6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 08:04:54 +0000 Subject: [PATCH 42/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200630.10 (#12302) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20330.7 -> To Version 5.0.0-preview.7.20330.10 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 e79e5632ab72..2b5f796569f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 + 8768cab874fbf74028c7abc38a6712ff038d53aa - + https://github.com/dotnet/aspnetcore - 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 + 8768cab874fbf74028c7abc38a6712ff038d53aa https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 + 8768cab874fbf74028c7abc38a6712ff038d53aa - + https://github.com/dotnet/aspnetcore - 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 + 8768cab874fbf74028c7abc38a6712ff038d53aa - + https://github.com/dotnet/aspnetcore - 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 + 8768cab874fbf74028c7abc38a6712ff038d53aa - + https://github.com/dotnet/aspnetcore - 7f4b846e9ff709b6d0a82fd1b1c12fc61de575b3 + 8768cab874fbf74028c7abc38a6712ff038d53aa https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8a847ebd39c6..e28fa904b784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20330.7 - 5.0.0-preview.7.20330.7 - 5.0.0-preview.7.20330.7 - 5.0.0-preview.7.20330.7 - 5.0.0-preview.7.20330.7 - 5.0.0-preview.7.20330.7 + 5.0.0-preview.7.20330.10 + 5.0.0-preview.7.20330.10 + 5.0.0-preview.7.20330.10 + 5.0.0-preview.7.20330.10 + 5.0.0-preview.7.20330.10 + 5.0.0-preview.7.20330.10 From 3e7d2758cbeb2d1305491a911654f8ec2eea3bdb Mon Sep 17 00:00:00 2001 From: Vijay Ramakrishnan Date: Thu, 2 Jul 2020 08:31:42 -0700 Subject: [PATCH 43/65] Updating the web deploy reference to 4.0.4 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e28fa904b784..c31042f0998f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ 5.0.0-preview.7.20326.1 4.3.0 4.3.0 - 3.6.0 + 4.0.4 4.7.2 From d3de52d768d258eb64729a4637f0512f2e59f35a Mon Sep 17 00:00:00 2001 From: Vijay Ramakrishnan Date: Thu, 2 Jul 2020 12:14:25 -0700 Subject: [PATCH 44/65] Suppress NU1603 warning for Web Deploy package --- src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj index 4589ec061c1a..55232741b657 100644 --- a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj +++ b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj @@ -13,6 +13,7 @@ $(SdkTargetFramework);net472 $(SdkTargetFramework) AnyCPU + $(NoWarn);NU1603 From 4a46309a9d956e6417b4103e67ef04aec3821e03 Mon Sep 17 00:00:00 2001 From: Vijay Ramakrishnan Date: Sat, 4 Jul 2020 22:06:05 -0700 Subject: [PATCH 45/65] Updating the version to 4.0.5 --- eng/Versions.props | 2 +- src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c31042f0998f..422aa79505cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ 5.0.0-preview.7.20326.1 4.3.0 4.3.0 - 4.0.4 + 4.0.5 4.7.2 diff --git a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj index 55232741b657..4589ec061c1a 100644 --- a/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj +++ b/src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj @@ -13,7 +13,6 @@ $(SdkTargetFramework);net472 $(SdkTargetFramework) AnyCPU - $(NoWarn);NU1603 From 0debe3571dc125cc0bf91b18f0e2877429bc6159 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2020 10:36:17 +0000 Subject: [PATCH 46/65] [release/5.0.1xx-preview7] Update dependencies from dotnet/aspnetcore (#12369) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200706.7 Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20330.10 -> To Version 5.0.0-preview.7.20356.7 * Update stage 0 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b5f796569f1..f478e87a0ff8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 8768cab874fbf74028c7abc38a6712ff038d53aa + 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 - + https://github.com/dotnet/aspnetcore - 8768cab874fbf74028c7abc38a6712ff038d53aa + 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 8768cab874fbf74028c7abc38a6712ff038d53aa + 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 - + https://github.com/dotnet/aspnetcore - 8768cab874fbf74028c7abc38a6712ff038d53aa + 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 - + https://github.com/dotnet/aspnetcore - 8768cab874fbf74028c7abc38a6712ff038d53aa + 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 - + https://github.com/dotnet/aspnetcore - 8768cab874fbf74028c7abc38a6712ff038d53aa + 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 422aa79505cd..afd20fec2f1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20330.10 - 5.0.0-preview.7.20330.10 - 5.0.0-preview.7.20330.10 - 5.0.0-preview.7.20330.10 - 5.0.0-preview.7.20330.10 - 5.0.0-preview.7.20330.10 + 5.0.0-preview.7.20356.7 + 5.0.0-preview.7.20356.7 + 5.0.0-preview.7.20356.7 + 5.0.0-preview.7.20356.7 + 5.0.0-preview.7.20356.7 + 5.0.0-preview.7.20356.7 diff --git a/global.json b/global.json index fae409dcc9c1..2e29d3b86cbf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-preview.6.20310.4", + "dotnet": "5.0.100-preview.7.20356.2", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" From 722f5291217e6aa56dae767b21b4b9be6396b75d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2020 16:54:23 +0000 Subject: [PATCH 47/65] Update dependencies from https://github.com/microsoft/msbuild build 20200706.3 (#12374) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20330-08 -> To Version 16.7.0-preview-20356-03 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f478e87a0ff8..61953e2ab411 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,11 +33,11 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild 96403c598a166e5a06933f78ace75528a1d1f3b0 - + https://github.com/microsoft/msbuild 96403c598a166e5a06933f78ace75528a1d1f3b0 diff --git a/eng/Versions.props b/eng/Versions.props index afd20fec2f1b..e1da52dbfec9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20330-08 + 16.7.0-preview-20356-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20330-08 + 16.7.0-preview-20356-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From bbefba1d9728882305cff47a909d7c2da7e0533c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2020 15:32:21 -0700 Subject: [PATCH 48/65] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6686 (#12378) NuGet.Build.Tasks From Version 5.7.0-rtm.6677 -> To Version 5.7.0-rtm.6686 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 61953e2ab411..47dc6090f29b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/aspnetcore 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 - + https://github.com/NuGet/NuGet.Client - 088004379cb99890f766e9b7a0a29f7b080f888b + bd482514a87a0085f8eb8603842ee1cb3ca5f277 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index e1da52dbfec9..46c6f2e045fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ - 5.7.0-rtm.6677 + 5.7.0-rtm.6686 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 989a5b06ee2ffee8ec59fb76ae0ecc72db525c36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2020 03:04:53 +0000 Subject: [PATCH 49/65] Update dependencies from https://github.com/microsoft/msbuild build 20200709.1 (#12390) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20356-03 -> To Version 16.7.0-preview-20359-01 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 47dc6090f29b..43b9c3267a0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - 96403c598a166e5a06933f78ace75528a1d1f3b0 + 29609438b47acb32744163fa618a60f3aa478435 - + https://github.com/microsoft/msbuild - 96403c598a166e5a06933f78ace75528a1d1f3b0 + 29609438b47acb32744163fa618a60f3aa478435 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 46c6f2e045fb..8612d10a983c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20356-03 + 16.7.0-preview-20359-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20356-03 + 16.7.0-preview-20359-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From bf749e5cad4cea231f6e29520ad7a9b7c882b56b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Jul 2020 10:13:10 +0000 Subject: [PATCH 50/65] Update dependencies from https://github.com/dotnet/fsharp build 20200709.2 (#12410) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20329.5 -> To Version 10.10.0-beta.20359.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 43b9c3267a0d..a05add1afef4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild 29609438b47acb32744163fa618a60f3aa478435 - + https://github.com/dotnet/fsharp - 19c9e2f1b21a66ec90fefae79988b33fc16744fc + 709be554527b8fef63fc95c8704ed9148fab8873 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8612d10a983c..a2378e8c31c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20329.5 + 10.10.0-beta.20359.2 From 48884e9bf22635744004a22b34c07616f8587924 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Jul 2020 19:29:54 +0000 Subject: [PATCH 51/65] Update dependencies from https://github.com/microsoft/msbuild build 20200710.3 (#12415) Microsoft.Build.Localization , Microsoft.Build From Version 16.7.0-preview-20359-01 -> To Version 16.7.0-preview-20360-03 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 a05add1afef4..7e072f52e5b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/microsoft/msbuild - 29609438b47acb32744163fa618a60f3aa478435 + 188921e2ffecf6c74dd4583cf01b62465fcbee3c - + https://github.com/microsoft/msbuild - 29609438b47acb32744163fa618a60f3aa478435 + 188921e2ffecf6c74dd4583cf01b62465fcbee3c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a2378e8c31c6..675e3e912c4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.7.0-preview-20359-01 + 16.7.0-preview-20360-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.7.0-preview-20359-01 + 16.7.0-preview-20360-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From abd85ed97b13c79871797ff3754e6edcbfbc11f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Jul 2020 20:12:40 +0000 Subject: [PATCH 52/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200710.2 (#12417) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20356.7 -> To Version 5.0.0-preview.7.20360.2 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 7e072f52e5b9..cdc5f048a131 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn ec4841263590f5456e32728d98097e97c1605e22 - + https://github.com/dotnet/aspnetcore - 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 + 90a4707de0f33d6f52c74b30b8a878911fec90c1 - + https://github.com/dotnet/aspnetcore - 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 + 90a4707de0f33d6f52c74b30b8a878911fec90c1 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 + 90a4707de0f33d6f52c74b30b8a878911fec90c1 - + https://github.com/dotnet/aspnetcore - 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 + 90a4707de0f33d6f52c74b30b8a878911fec90c1 - + https://github.com/dotnet/aspnetcore - 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 + 90a4707de0f33d6f52c74b30b8a878911fec90c1 - + https://github.com/dotnet/aspnetcore - 7412976b4c8db42c5a2bc28dab16af6367e9e6a6 + 90a4707de0f33d6f52c74b30b8a878911fec90c1 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 675e3e912c4f..d8df95c94a9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20356.7 - 5.0.0-preview.7.20356.7 - 5.0.0-preview.7.20356.7 - 5.0.0-preview.7.20356.7 - 5.0.0-preview.7.20356.7 - 5.0.0-preview.7.20356.7 + 5.0.0-preview.7.20360.2 + 5.0.0-preview.7.20360.2 + 5.0.0-preview.7.20360.2 + 5.0.0-preview.7.20360.2 + 5.0.0-preview.7.20360.2 + 5.0.0-preview.7.20360.2 From 9efb3e7e880504a2587054474401da0b60199eab Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Fri, 10 Jul 2020 13:47:52 -0700 Subject: [PATCH 53/65] Reverting #12084 (#12418) --- ...osoft.NET.TargetFrameworkInference.targets | 5 --- .../GivenThatWeWantToBuildALibrary.cs | 34 +------------------ .../GivenThatWeWantToBuildALibraryWithVB.cs | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets index 9ef2457e8d0e..c3892509db36 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets @@ -150,11 +150,6 @@ Copyright (c) .NET Foundation. All rights reserved. ResourceName="CppRequiresTFMVersion31" /> - - - <_EnableDefaultWindowsPlatform Condition="'$(_EnableDefaultWindowsPlatform)' == ''" >false - false - 2.1 diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index ef98b64c861d..da261eb25a75 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs @@ -417,7 +417,7 @@ public void It_implicitly_defines_compilation_constants_for_the_target_framework itemGroup.Add(supportedFramework); }); - AssertDefinedConstantsOutput(testAsset, targetFramework, new[] { "NETCOREAPP", "NET" }.Concat(expectedDefines).ToArray()); + AssertDefinedConstantsOutput(testAsset, targetFramework, new[] { "NETCOREAPP", "NET", "WINDOWS", "WINDOWS7_0" }.Concat(expectedDefines).ToArray()); } [Theory] @@ -498,38 +498,6 @@ public void It_fails_gracefully_if_targetframework_should_be_targetframeworks(bo $"The TargetFramework value '{targetFramework}' is not valid. To multi-target, use the 'TargetFrameworks' property instead"); } - [RequiresMSBuildVersionTheory("16.7.0-preview-20310-07")] - [InlineData("net5.0", false)] - [InlineData("netcoreapp3.1", true)] - public void It_defines_target_platform_defaults_correctly(string targetFramework, bool defaultsDefined) - { - TestProject testProject = new TestProject() - { - Name = "TargetPlatformDefaults", - IsSdkProject = true, - TargetFrameworks = targetFramework - }; - - var testAsset = _testAssetsManager.CreateTestProject(testProject); - - var getValuesCommand = new GetValuesCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name), targetFramework, "TargetPlatformIdentifier"); - getValuesCommand - .Execute() - .Should() - .Pass(); - - var values = getValuesCommand.GetValues(); - if (defaultsDefined) - { - values.Count().Should().Be(1); - values.FirstOrDefault().Should().Be("Windows"); - } - else - { - values.Count().Should().Be(0); - } - } - private void TestInvalidTargetFramework(string testName, string targetFramework, bool useSolution, string expectedOutput) { var testProject = new TestProject() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs index def9568c0323..0afbfeaa3d39 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs @@ -195,7 +195,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st [InlineData("net45", new[] { "NETFRAMEWORK=-1", "NET45=-1" }, true)] [InlineData("net461", new[] { "NETFRAMEWORK=-1", "NET461=-1" }, true)] [InlineData("netcoreapp1.0", new[] { "NETCOREAPP=-1", "NETCOREAPP1_0=-1", "_MyType=\"Empty\"" }, false)] - [InlineData("net5.0", new[] { "NET=-1", "NET5_0=-1", "NETCOREAPP=-1", "NETCOREAPP3_1=-1", "_MyType=\"Empty\"" }, false)] + [InlineData("net5.0", new[] { "NET=-1", "NET5_0=-1", "NETCOREAPP=-1", "NETCOREAPP3_1=-1", "WINDOWS=-1", "WINDOWS7_0=-1", "_MyType=\"Empty\"" }, false)] [InlineData(".NETPortable,Version=v4.5,Profile=Profile78", new string[] { "_MyType=\"Empty\"" }, false)] [InlineData(".NETFramework,Version=v4.0,Profile=Client", new string[] { "NETFRAMEWORK=-1", "NET40=-1" }, false)] [InlineData("Xamarin.iOS,Version=v1.0", new string[] { "XAMARINIOS=-1", "XAMARINIOS1_0=-1", "_MyType=\"Empty\"" }, false)] From 453f7ac7f85ae22057bce136edfe1e596b8a9f11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Jul 2020 00:16:18 +0000 Subject: [PATCH 54/65] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6702 (#12428) NuGet.Build.Tasks From Version 5.7.0-rtm.6686 -> To Version 5.7.0-rtm.6702 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 cdc5f048a131..997293c457bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/aspnetcore 90a4707de0f33d6f52c74b30b8a878911fec90c1 - + https://github.com/NuGet/NuGet.Client - bd482514a87a0085f8eb8603842ee1cb3ca5f277 + cd51d2637fc533e1e188c860e7616107904a3623 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index d8df95c94a9b..f614f71b9034 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ - 5.7.0-rtm.6686 + 5.7.0-rtm.6702 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From bc2d625eed91944096370582c051af0a1cb98468 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 12 Jul 2020 00:43:28 +0000 Subject: [PATCH 55/65] Update dependencies from https://github.com/dotnet/fsharp build 20200711.3 (#12433) Microsoft.FSharp.Compiler From Version 10.10.0-beta.20359.2 -> To Version 10.10.0-beta.20361.3 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 997293c457bd..4859e41057e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild 188921e2ffecf6c74dd4583cf01b62465fcbee3c - + https://github.com/dotnet/fsharp - 709be554527b8fef63fc95c8704ed9148fab8873 + 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f614f71b9034..8a5f0c12a67b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 10.10.0-beta.20359.2 + 10.10.0-beta.20361.3 From 13b53c60c3cc1fdcf9db22f8e2f0553448810c7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2020 09:49:10 +0000 Subject: [PATCH 56/65] Update dependencies from https://github.com/dotnet/roslyn build 20200714.1 (#12453) Microsoft.Net.Compilers.Toolset From Version 3.7.0-3.20312.3 -> To Version 3.7.0-4.20364.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 4859e41057e4..e253e857a8fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 - + https://github.com/dotnet/roslyn - ec4841263590f5456e32728d98097e97c1605e22 + 9d16f1782ca3e9ec7117d0be0e49b85fb9c80ea7 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8a5f0c12a67b..019690a1fb5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.7.0-3.20312.3 + 3.7.0-4.20364.1 From 7ea3c76ea9de746a59e464170c6eb9e51bfa0a16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2020 10:05:11 +0000 Subject: [PATCH 57/65] Update dependencies from https://github.com/dotnet/roslyn build 20200715.2 (#12469) Microsoft.Net.Compilers.Toolset From Version 3.7.0-4.20364.1 -> To Version 3.7.0-5.20365.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 e253e857a8fe..8cdf95801b5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 - + https://github.com/dotnet/roslyn - 9d16f1782ca3e9ec7117d0be0e49b85fb9c80ea7 + 598796cd274b852b5be35398133516e19f543744 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 019690a1fb5e..37b39050dd04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.7.0-4.20364.1 + 3.7.0-5.20365.2 From 6f0c2e2b4e7fc53179f4fab3a91e5280fe1379a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 00:59:41 +0000 Subject: [PATCH 58/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200715.7 (#12497) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20360.2 -> To Version 5.0.0-preview.7.20365.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 8cdf95801b5b..bc8252a8fa9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 598796cd274b852b5be35398133516e19f543744 - + https://github.com/dotnet/aspnetcore - 90a4707de0f33d6f52c74b30b8a878911fec90c1 + b96b1d1a9cbbca1ebace4de63e37206dcc165aef - + https://github.com/dotnet/aspnetcore - 90a4707de0f33d6f52c74b30b8a878911fec90c1 + b96b1d1a9cbbca1ebace4de63e37206dcc165aef https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 90a4707de0f33d6f52c74b30b8a878911fec90c1 + b96b1d1a9cbbca1ebace4de63e37206dcc165aef - + https://github.com/dotnet/aspnetcore - 90a4707de0f33d6f52c74b30b8a878911fec90c1 + b96b1d1a9cbbca1ebace4de63e37206dcc165aef - + https://github.com/dotnet/aspnetcore - 90a4707de0f33d6f52c74b30b8a878911fec90c1 + b96b1d1a9cbbca1ebace4de63e37206dcc165aef - + https://github.com/dotnet/aspnetcore - 90a4707de0f33d6f52c74b30b8a878911fec90c1 + b96b1d1a9cbbca1ebace4de63e37206dcc165aef https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 37b39050dd04..575cf28c1fe9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20360.2 - 5.0.0-preview.7.20360.2 - 5.0.0-preview.7.20360.2 - 5.0.0-preview.7.20360.2 - 5.0.0-preview.7.20360.2 - 5.0.0-preview.7.20360.2 + 5.0.0-preview.7.20365.7 + 5.0.0-preview.7.20365.7 + 5.0.0-preview.7.20365.7 + 5.0.0-preview.7.20365.7 + 5.0.0-preview.7.20365.7 + 5.0.0-preview.7.20365.7 From b7765d2ca5fa369663e873b42940cefd2f8d37ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 05:37:23 +0000 Subject: [PATCH 59/65] Update dependencies from https://github.com/dotnet/roslyn build 20200716.1 (#12505) Microsoft.Net.Compilers.Toolset From Version 3.7.0-5.20365.2 -> To Version 3.7.0-5.20366.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc8252a8fa9e..6ca4fe612d9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,7 +45,7 @@ https://github.com/dotnet/fsharp 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 - + https://github.com/dotnet/roslyn 598796cd274b852b5be35398133516e19f543744 diff --git a/eng/Versions.props b/eng/Versions.props index 575cf28c1fe9..d8ea2e5facd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.7.0-5.20365.2 + 3.7.0-5.20366.1 From cf15ef592a16489b16795ca2ad1194c97f273b28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 06:50:18 +0000 Subject: [PATCH 60/65] [release/5.0.1xx-preview7] Update dependencies from dotnet/runtime (#12493) * Update dependencies from https://github.com/dotnet/runtime build 20200714.6 System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Ref , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions From Version 5.0.0-preview.7.20326.1 -> To Version 5.0.0-preview.7.20364.6 * Update dependencies from https://github.com/dotnet/runtime build 20200714.11 System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Ref , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions From Version 5.0.0-preview.7.20326.1 -> To Version 5.0.0-preview.7.20364.11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ca4fe612d9e..5ced0e7223d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 97c803a412c014e0bf93474dfeef0de02f140746 - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb https://github.com/dotnet/arcade 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker b0b5143ee2a59517df69d38cb6c363cdd17177a8 - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb - + https://github.com/dotnet/runtime - b0f97149538e3dabde2267efa326c76a628a30ff + 53976d38b1bd6917b8fa4d1dd4f009728ece3adb https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index d8ea2e5facd3..88b2b49d603e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20316.1 3.1.0 - 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20364.11 4.3.0 4.3.0 4.0.5 @@ -36,12 +36,12 @@ - 5.0.0-preview.7.20326.1 - 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20364.11 + 5.0.0-preview.7.20364.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.7.20326.1 - 5.0.0-preview.7.20326.1 - 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20364.11 + 5.0.0-preview.7.20364.11 + 5.0.0-preview.7.20364.11 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.7.20326.1 - 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20364.11 + 5.0.0-preview.7.20364.11 5.0.0-preview.7.20307.4 - 5.0.0-preview.7.20326.1 + 5.0.0-preview.7.20364.11 From ada0fa3f905e09e0487eae54516ec646d3e201f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 08:33:31 +0000 Subject: [PATCH 61/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200715.16 (#12509) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20365.7 -> To Version 5.0.0-preview.7.20365.16 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 5ced0e7223d4..7cf6b133e1cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 598796cd274b852b5be35398133516e19f543744 - + https://github.com/dotnet/aspnetcore - b96b1d1a9cbbca1ebace4de63e37206dcc165aef + 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 - + https://github.com/dotnet/aspnetcore - b96b1d1a9cbbca1ebace4de63e37206dcc165aef + 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - b96b1d1a9cbbca1ebace4de63e37206dcc165aef + 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 - + https://github.com/dotnet/aspnetcore - b96b1d1a9cbbca1ebace4de63e37206dcc165aef + 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 - + https://github.com/dotnet/aspnetcore - b96b1d1a9cbbca1ebace4de63e37206dcc165aef + 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 - + https://github.com/dotnet/aspnetcore - b96b1d1a9cbbca1ebace4de63e37206dcc165aef + 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 88b2b49d603e..01455134e0eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20365.7 - 5.0.0-preview.7.20365.7 - 5.0.0-preview.7.20365.7 - 5.0.0-preview.7.20365.7 - 5.0.0-preview.7.20365.7 - 5.0.0-preview.7.20365.7 + 5.0.0-preview.7.20365.16 + 5.0.0-preview.7.20365.16 + 5.0.0-preview.7.20365.16 + 5.0.0-preview.7.20365.16 + 5.0.0-preview.7.20365.16 + 5.0.0-preview.7.20365.16 From 9bae73de2d753da00e80ff8198b3f346a57439ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 11:05:13 +0000 Subject: [PATCH 62/65] Update dependencies from https://github.com/dotnet/aspnetcore build 20200715.19 (#12511) Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers From Version 5.0.0-preview.7.20365.16 -> To Version 5.0.0-preview.7.20365.19 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 7cf6b133e1cb..1b91f4a8ff3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 598796cd274b852b5be35398133516e19f543744 - + https://github.com/dotnet/aspnetcore - 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 + 979632683c720152cc04d0684644c40512f4e953 - + https://github.com/dotnet/aspnetcore - 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 + 979632683c720152cc04d0684644c40512f4e953 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://github.com/dotnet/wpf 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 - + https://github.com/dotnet/aspnetcore - 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 + 979632683c720152cc04d0684644c40512f4e953 - + https://github.com/dotnet/aspnetcore - 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 + 979632683c720152cc04d0684644c40512f4e953 - + https://github.com/dotnet/aspnetcore - 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 + 979632683c720152cc04d0684644c40512f4e953 - + https://github.com/dotnet/aspnetcore - 12c2fb8e7bd6aa252c09e96432da4bfbc878fae4 + 979632683c720152cc04d0684644c40512f4e953 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 01455134e0eb..401f88e13b2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,12 +115,12 @@ - 5.0.0-preview.7.20365.16 - 5.0.0-preview.7.20365.16 - 5.0.0-preview.7.20365.16 - 5.0.0-preview.7.20365.16 - 5.0.0-preview.7.20365.16 - 5.0.0-preview.7.20365.16 + 5.0.0-preview.7.20365.19 + 5.0.0-preview.7.20365.19 + 5.0.0-preview.7.20365.19 + 5.0.0-preview.7.20365.19 + 5.0.0-preview.7.20365.19 + 5.0.0-preview.7.20365.19 From 2c64ed8706d28e33bd84a54279770763e67b1298 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 14:23:23 +0000 Subject: [PATCH 63/65] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200716.1 (#12512) Microsoft.WindowsDesktop.App From Version 5.0.0-preview.7.20326.3 -> To Version 5.0.0-preview.7.20366.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 5.0.0-preview.7.20326.3 -> To Version 5.0.0-preview.7.20365.12 (parent: Microsoft.WindowsDesktop.App 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 1b91f4a8ff3f..d3c3840c9700 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 53976d38b1bd6917b8fa4d1dd4f009728ece3adb - + https://github.com/dotnet/windowsdesktop - 5661ff75f3e7c7b9b05f92ad3a7ef0421f0182ce + 9bc605802ae015642635f01e689b15dc9d89765e - + https://github.com/dotnet/wpf - 7e85f6c0c98b988d485ce77f81e9c1e47ad15f07 + 0868a3efbf564050059f42a837c9f32a256635c7 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 401f88e13b2b..e5081c157c7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,11 +124,11 @@ - 5.0.0-preview.7.20326.3 + 5.0.0-preview.7.20365.12 - 5.0.0-preview.7.20326.3 + 5.0.0-preview.7.20366.1 From 04f9895a5d8ba5d4087c3b2712790454fd739bef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 20:24:36 +0000 Subject: [PATCH 64/65] Update dependencies from https://github.com/dotnet/roslyn build 20200716.7 (#12523) Microsoft.Net.Compilers.Toolset From Version 3.7.0-5.20366.1 -> To Version 3.7.0-5.20366.7 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 d3c3840c9700..40b761e6c244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 - + https://github.com/dotnet/roslyn - 598796cd274b852b5be35398133516e19f543744 + a303c0d8a4ab6af557afb6e4a7a5bc09bbcebae5 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e5081c157c7c..05e2b448f8ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.7.0-5.20366.1 + 3.7.0-5.20366.7 From be15344ec408faa2d5104d1e8d22861f585c0306 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 03:10:30 +0000 Subject: [PATCH 65/65] Update dependencies from https://github.com/dotnet/roslyn build 20200717.1 (#12531) Microsoft.Net.Compilers.Toolset From Version 3.7.0-5.20366.7 -> To Version 3.7.0-5.20367.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 40b761e6c244..c3ad65936aad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 3ef6f0b514198c0bfa6c2c09fefe41a740b024d5 - + https://github.com/dotnet/roslyn - a303c0d8a4ab6af557afb6e4a7a5bc09bbcebae5 + f96dcbb6597fcc801970ee09688e733b64ce9040 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 05e2b448f8ac..089d3a60e63d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.7.0-5.20366.7 + 3.7.0-5.20367.1