From 137916fdad3df9191ab73fbd578dc3d30ae33250 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Apr 2021 04:38:39 +0000 Subject: [PATCH 01/20] Update dependencies from https://github.com/dotnet/sdk build 20210401.22 (#10127) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.10.0-preview.2.7185 to 5.10.0-preview.2.7190 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af8dff58c..ff8c8c0b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa - + https://github.com/dotnet/sdk - 46ce4d8d52bb8fd4e9506a1c02fa3f3d28cf7c97 + 7539154d4c9c11436140c35ef718d0b65fd975fd - + https://github.com/dotnet/sdk - 46ce4d8d52bb8fd4e9506a1c02fa3f3d28cf7c97 + 7539154d4c9c11436140c35ef718d0b65fd975fd @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild 7a892102cf23b45f8b19fe4e45a91bb9bfb0cc1b - + https://github.com/nuget/nuget.client - 58795a41a3c8c9d63801fb5072a2e68e48d7507e + 871251958b671dc9bcaf84d5a3547b86f5f325e7 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 3b94a6c94..89bf64b19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21181.18 - 5.0.300-preview.21181.18 + 5.0.300-preview.21201.22 + 5.0.300-preview.21201.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b7b0e0d8b2b090be43d865df803c6be77b270b26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Apr 2021 05:50:56 +0000 Subject: [PATCH 02/20] Update dependencies from https://github.com/dotnet/sdk build 20210401.25 (#10130) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21179.4 to 11.4.2-beta.21181.8 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.10.0-preview-21181-04 to 16.10.0-preview-21181-07 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff8c8c0b0..b2681ed5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa - + https://github.com/dotnet/sdk - 7539154d4c9c11436140c35ef718d0b65fd975fd + 263d3353d3a901f03884171d0b4f1fbc40f71ad0 - + https://github.com/dotnet/sdk - 7539154d4c9c11436140c35ef718d0b65fd975fd + 263d3353d3a901f03884171d0b4f1fbc40f71ad0 @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5d6364723197e917e11c0d442545287c27754aa5 - + https://github.com/dotnet/fsharp - ee3b35325f459717679379b8e0e6d994a0abd76e + 69cbc8346d738746580d0092a1544177bc8f50aa https://github.com/microsoft/vstest @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 59eedc33d35754759994155ea2f4e1012a9951e3 - + https://github.com/dotnet/msbuild - 7a892102cf23b45f8b19fe4e45a91bb9bfb0cc1b + 073022eb44eb1664eb1c35055b4f5ed377f09706 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 89bf64b19..f07f1410e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21201.22 - 5.0.300-preview.21201.22 + 5.0.300-preview.21201.25 + 5.0.300-preview.21201.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 313dd143207be9f1834db8c16cba13b921e71fa3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Apr 2021 19:01:48 +0000 Subject: [PATCH 03/20] Update dependencies from https://github.com/dotnet/sdk build 20210405.3 (#10146) [release/5.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2681ed5f..ef9f6730f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa - + https://github.com/dotnet/sdk - 263d3353d3a901f03884171d0b4f1fbc40f71ad0 + 8f62a49a975cb288ad15432d63cc9390ae600ad8 - + https://github.com/dotnet/sdk - 263d3353d3a901f03884171d0b4f1fbc40f71ad0 + 8f62a49a975cb288ad15432d63cc9390ae600ad8 diff --git a/eng/Versions.props b/eng/Versions.props index f07f1410e..c87d05775 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21201.25 - 5.0.300-preview.21201.25 + 5.0.300-preview.21205.3 + 5.0.300-preview.21205.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e68b66a047f7ab3ac629a2dde87d564ceb3a05ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Apr 2021 04:51:01 +0000 Subject: [PATCH 04/20] Update dependencies from https://github.com/dotnet/sdk build 20210405.12 (#10153) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.10.0-preview-21181-07 to 16.10.0-preview-21202-06 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef9f6730f..6956a7e7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa - + https://github.com/dotnet/sdk - 8f62a49a975cb288ad15432d63cc9390ae600ad8 + b1c579c41678783b3e0f5244e1412cd9a77dcf3e - + https://github.com/dotnet/sdk - 8f62a49a975cb288ad15432d63cc9390ae600ad8 + b1c579c41678783b3e0f5244e1412cd9a77dcf3e @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 59eedc33d35754759994155ea2f4e1012a9951e3 - + https://github.com/dotnet/msbuild - 073022eb44eb1664eb1c35055b4f5ed377f09706 + 1cfebe4dd3b1bb26bbf76128ff5f9270b6c090bb https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index c87d05775..cffd9401b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21205.3 - 5.0.300-preview.21205.3 + 5.0.300-preview.21205.12 + 5.0.300-preview.21205.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 202df730203b2cb5e4b701e8940f267dd7b1e1b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Apr 2021 06:52:22 +0000 Subject: [PATCH 05/20] Update dependencies from https://github.com/dotnet/sdk build 20210405.14 (#10156) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21181.8 to 11.4.2-beta.21204.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6956a7e7d..d9b033266 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa - + https://github.com/dotnet/sdk - b1c579c41678783b3e0f5244e1412cd9a77dcf3e + aaea9bbd7b53c84f858358f1d2cdfb83eafe7a7f - + https://github.com/dotnet/sdk - b1c579c41678783b3e0f5244e1412cd9a77dcf3e + aaea9bbd7b53c84f858358f1d2cdfb83eafe7a7f @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5d6364723197e917e11c0d442545287c27754aa5 - + https://github.com/dotnet/fsharp - 69cbc8346d738746580d0092a1544177bc8f50aa + df023d829e1daa577b95985d42d978e5c6e949a2 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index cffd9401b..3a6e490ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21205.12 - 5.0.300-preview.21205.12 + 5.0.300-preview.21205.14 + 5.0.300-preview.21205.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 291f234eb42e2f8497efe3f74bed17d2d9f79a72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 05:12:35 +0000 Subject: [PATCH 06/20] Update dependencies from https://github.com/dotnet/sdk build 20210406.13 (#10174) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.10.0-preview-21202-06 to 16.10.0-preview-21205-05 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9b033266..94391bf13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa - + https://github.com/dotnet/sdk - aaea9bbd7b53c84f858358f1d2cdfb83eafe7a7f + 4deaf559536f73d53b0e7786dd6177300100d043 - + https://github.com/dotnet/sdk - aaea9bbd7b53c84f858358f1d2cdfb83eafe7a7f + 4deaf559536f73d53b0e7786dd6177300100d043 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 59eedc33d35754759994155ea2f4e1012a9951e3 - + https://github.com/dotnet/msbuild - 1cfebe4dd3b1bb26bbf76128ff5f9270b6c090bb + 7804350cd4fe271bee48b3dc99e9f4681ee686c5 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 3a6e490ab..48685a27d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21205.14 - 5.0.300-preview.21205.14 + 5.0.300-preview.21206.13 + 5.0.300-preview.21206.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 63c0ed20cbc1733c6b2b51582c70357a05a3fc13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 23:47:45 +0000 Subject: [PATCH 07/20] Update dependencies from https://github.com/dotnet/sdk build 20210408.6 (#10187) [release/5.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94391bf13..872de5f0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa - + https://github.com/dotnet/sdk - 4deaf559536f73d53b0e7786dd6177300100d043 + 1abbf215ffa2c01fadbc779336b44df6103f9a02 - + https://github.com/dotnet/sdk - 4deaf559536f73d53b0e7786dd6177300100d043 + 1abbf215ffa2c01fadbc779336b44df6103f9a02 diff --git a/eng/Versions.props b/eng/Versions.props index 48685a27d..fa3565d2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21206.13 - 5.0.300-preview.21206.13 + 5.0.300-preview.21208.6 + 5.0.300-preview.21208.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From faca40a81599ca0d013e101f9532aecfd01995af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 03:23:03 +0000 Subject: [PATCH 08/20] Update dependencies from https://github.com/dotnet/sdk build 20210411.4 (#10191) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21204.5 to 11.4.2-beta.21210.9 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 872de5f0f..fc9806d0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa - + https://github.com/dotnet/sdk - 1abbf215ffa2c01fadbc779336b44df6103f9a02 + d4a9fc7eeec515014e99e4680b2059228c5235a7 - + https://github.com/dotnet/sdk - 1abbf215ffa2c01fadbc779336b44df6103f9a02 + d4a9fc7eeec515014e99e4680b2059228c5235a7 @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5d6364723197e917e11c0d442545287c27754aa5 - + https://github.com/dotnet/fsharp - df023d829e1daa577b95985d42d978e5c6e949a2 + a08bfc6c5f2fe978110a9cbf05352d635d1a7983 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index fa3565d2f..4f1fc0622 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21208.6 - 5.0.300-preview.21208.6 + 5.0.300-preview.21211.4 + 5.0.300-preview.21211.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f3ee062aa9b75685db365ac777040b89e16492d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 10:57:29 +0000 Subject: [PATCH 09/20] Update dependencies from https://github.com/dotnet/sdk build 20210413.3 (#10199) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21175.1 to 5.0.300-preview.21213.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc9806d0c..d2372498c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,17 +83,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 7d0ff3b6a932b7d3de8a8fb9a654b1383e5980fa + 76745a4a81083bc82ac9e0e0b629de4666df72f8 - + https://github.com/dotnet/sdk - d4a9fc7eeec515014e99e4680b2059228c5235a7 + 7af01a50d2a1cb228adba318f62db0dca8e7cc38 - + https://github.com/dotnet/sdk - d4a9fc7eeec515014e99e4680b2059228c5235a7 + 7af01a50d2a1cb228adba318f62db0dca8e7cc38 diff --git a/eng/Versions.props b/eng/Versions.props index 4f1fc0622..a9694f521 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.300-preview.21175.1 + 5.0.300-preview.21213.2 @@ -55,8 +55,8 @@ - 5.0.300-preview.21211.4 - 5.0.300-preview.21211.4 + 5.0.300-preview.21213.3 + 5.0.300-preview.21213.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d83cdf527e2e0d467c4b70dc67fec6646db3dafd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 18:34:33 +0000 Subject: [PATCH 10/20] Update dependencies from https://github.com/dotnet/arcade build 20210310.3 (#10202) [release/5.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2372498c..607a22566 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 + 670382be6a978ba401c21c57ba44311199d2682a - + https://github.com/dotnet/arcade - 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 + 670382be6a978ba401c21c57ba44311199d2682a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a9694f521..2a3cfcbef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21159.7 + 5.0.0-beta.21160.3 diff --git a/global.json b/global.json index 5760c69fc..33c984f8f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3" } } From 0f78ef70677b828925d42fc35e0e04377685789e Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Tue, 13 Apr 2021 16:00:04 -0700 Subject: [PATCH 11/20] Update Windows SDK Projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7225dae04..0c9340dc6 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.15 - 10.0.18362.15 - 10.0.19041.15 + 10.0.17763.16 + 10.0.18362.16 + 10.0.19041.16 From a2a61cf62b684f4e59510bd7bcb90e8c1679f1b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 02:45:43 +0000 Subject: [PATCH 12/20] Update dependencies from https://github.com/dotnet/sdk build 20210413.11 (#10212) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.10.0-preview.2.7190 to 5.10.0-preview.2.7203 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 607a22566..8da2c5af1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 76745a4a81083bc82ac9e0e0b629de4666df72f8 - + https://github.com/dotnet/sdk - 7af01a50d2a1cb228adba318f62db0dca8e7cc38 + 8cb13a917b98c3bff81e40e0ecc01d20c6c60fa2 - + https://github.com/dotnet/sdk - 7af01a50d2a1cb228adba318f62db0dca8e7cc38 + 8cb13a917b98c3bff81e40e0ecc01d20c6c60fa2 @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild 7804350cd4fe271bee48b3dc99e9f4681ee686c5 - + https://github.com/nuget/nuget.client - 871251958b671dc9bcaf84d5a3547b86f5f325e7 + 936eff1f2cccbb25ba537e47a2eaaa4984a160f4 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 2a3cfcbef..f99d26a93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21213.3 - 5.0.300-preview.21213.3 + 5.0.300-preview.21213.11 + 5.0.300-preview.21213.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6c7d334c6e7ac8f369a5fa057ea49d108b17c27e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 04:14:39 +0000 Subject: [PATCH 13/20] Update dependencies from https://github.com/dotnet/sdk build 20210413.25 (#10216) [release/5.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8da2c5af1..ec92c2c47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 76745a4a81083bc82ac9e0e0b629de4666df72f8 - + https://github.com/dotnet/sdk - 8cb13a917b98c3bff81e40e0ecc01d20c6c60fa2 + 2c4872a66bd2a45e05ae93aff47e04dcfe18d702 - + https://github.com/dotnet/sdk - 8cb13a917b98c3bff81e40e0ecc01d20c6c60fa2 + 2c4872a66bd2a45e05ae93aff47e04dcfe18d702 diff --git a/eng/Versions.props b/eng/Versions.props index f99d26a93..27a41acc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21213.11 - 5.0.300-preview.21213.11 + 5.0.300-preview.21213.25 + 5.0.300-preview.21213.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 97c76634a82267f1d8b7bbecdac6db6a50d39fa0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 07:24:51 +0000 Subject: [PATCH 14/20] Update dependencies from https://github.com/dotnet/sdk build 20210413.30 (#10217) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21210.9 to 11.4.2-beta.21212.7 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec92c2c47..0b19967b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 76745a4a81083bc82ac9e0e0b629de4666df72f8 - + https://github.com/dotnet/sdk - 2c4872a66bd2a45e05ae93aff47e04dcfe18d702 + d1f8e1129c301c5d5265d3753ebebd4d1756afba - + https://github.com/dotnet/sdk - 2c4872a66bd2a45e05ae93aff47e04dcfe18d702 + d1f8e1129c301c5d5265d3753ebebd4d1756afba @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5d6364723197e917e11c0d442545287c27754aa5 - + https://github.com/dotnet/fsharp - a08bfc6c5f2fe978110a9cbf05352d635d1a7983 + 35aca7bc7e0b3fdb123e8953385b25316d5e3851 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 27a41acc3..ae39b3dff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21213.25 - 5.0.300-preview.21213.25 + 5.0.300-preview.21213.30 + 5.0.300-preview.21213.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 287095270e33dde56227c534b4336cd55c60ef3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 01:10:54 +0000 Subject: [PATCH 15/20] [release/5.0.3xx] Update dependencies from dotnet/sdk (#10227) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21161.4 to 5.0.0-rtm.21213.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b19967b8..83164a1e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 76745a4a81083bc82ac9e0e0b629de4666df72f8 - + https://github.com/dotnet/sdk - d1f8e1129c301c5d5265d3753ebebd4d1756afba + 3b5bbaffdaae337e70a0df226bdc7d99cf3ac114 - + https://github.com/dotnet/sdk - d1f8e1129c301c5d5265d3753ebebd4d1756afba + 3b5bbaffdaae337e70a0df226bdc7d99cf3ac114 @@ -112,9 +112,9 @@ https://github.com/microsoft/vstest 6a858a323caa439115e9e3cf1c958b04f4ff9993 - + https://github.com/mono/linker - c43f981eec336c1dc4fd0ead84b5e09db9377d9e + 311102e38b4f925856f73af7a83da1ee4ded7af9 linker diff --git a/eng/Versions.props b/eng/Versions.props index ae39b3dff..122e41878 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21213.30 - 5.0.300-preview.21213.30 + 5.0.300-preview.21214.15 + 5.0.300-preview.21214.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7df5b9b659085db50784273eb615b3664ec4ca34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 02:40:05 +0000 Subject: [PATCH 16/20] Update dependencies from https://github.com/dotnet/sdk build 20210414.17 (#10228) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21213.2 to 5.0.300-preview.21214.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83164a1e7..8be6bbd14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,17 +83,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 76745a4a81083bc82ac9e0e0b629de4666df72f8 + 091651d2bfe4b739c6c4f46f86608533a2087c35 - + https://github.com/dotnet/sdk - 3b5bbaffdaae337e70a0df226bdc7d99cf3ac114 + 72ba328cbf98793f0c252412b90e5d64bf5f9ea5 - + https://github.com/dotnet/sdk - 3b5bbaffdaae337e70a0df226bdc7d99cf3ac114 + 72ba328cbf98793f0c252412b90e5d64bf5f9ea5 diff --git a/eng/Versions.props b/eng/Versions.props index 122e41878..3c1e0ea1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.300-preview.21213.2 + 5.0.300-preview.21214.2 @@ -55,8 +55,8 @@ - 5.0.300-preview.21214.15 - 5.0.300-preview.21214.15 + 5.0.300-preview.21214.17 + 5.0.300-preview.21214.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c02505d316b1799be39da57c74c8930fb8ebff5e Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Thu, 15 Apr 2021 13:03:50 -0700 Subject: [PATCH 17/20] Bump implicit versions to 3.1.14 and 2.1.27 --- src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 9873c9231..4218878f2 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -37,19 +37,19 @@ <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_NETCoreApp31RuntimePackVersion>3.1.13 + <_NETCoreApp31RuntimePackVersion>3.1.14 <_NETCoreApp31TargetingPackVersion>3.1.0 <_WindowsDesktop30RuntimePackVersion>3.0.3 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_WindowsDesktop31RuntimePackVersion>3.1.13 + <_WindowsDesktop31RuntimePackVersion>3.1.14 <_WindowsDesktop31TargetingPackVersion>3.1.0 <_AspNet30RuntimePackVersion>3.0.3 <_AspNet30TargetingPackVersion>3.0.1 - <_AspNet31RuntimePackVersion>3.1.13 + <_AspNet31RuntimePackVersion>3.1.14 <_AspNet31TargetingPackVersion>3.1.10 @@ -154,7 +154,7 @@ + LatestVersion="2.1.27" /> + LatestVersion="2.1.27"/> + LatestVersion="2.1.27"/> Date: Thu, 15 Apr 2021 21:55:08 +0000 Subject: [PATCH 18/20] Update dependencies from https://github.com/dotnet/sdk build 20210415.16 (#10233) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21212.7 to 11.4.2-beta.21214.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8be6bbd14..f4ebc5437 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 091651d2bfe4b739c6c4f46f86608533a2087c35 - + https://github.com/dotnet/sdk - 72ba328cbf98793f0c252412b90e5d64bf5f9ea5 + 602ab2857568b82598bbbdf6aaf9be5e044145c9 - + https://github.com/dotnet/sdk - 72ba328cbf98793f0c252412b90e5d64bf5f9ea5 + 602ab2857568b82598bbbdf6aaf9be5e044145c9 @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5d6364723197e917e11c0d442545287c27754aa5 - + https://github.com/dotnet/fsharp - 35aca7bc7e0b3fdb123e8953385b25316d5e3851 + 8b1d616a7464314af09b30ad413a3d41a060eb16 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 3c1e0ea1f..fbefdcaf5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21214.17 - 5.0.300-preview.21214.17 + 5.0.300-preview.21215.16 + 5.0.300-preview.21215.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 63969a1e449e006cbc46ae4718cbadad76f21cdc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 22:46:37 +0000 Subject: [PATCH 19/20] Update dependencies from https://github.com/dotnet/sdk build 20210415.18 (#10234) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.4-servicing.21117.9 to 5.0.5-servicing.21167.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.4-servicing.21116.14 to 5.0.5-servicing.21166.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.4 to 5.0.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.4-servicing.21117.2 to 5.0.5-servicing.21167.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.4-servicing.21117.5 to 5.0.5-servicing.21167.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4ebc5437..3f01bc0f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e708867037ec6edbe7965b8f0f1193999785037e + 951b1ad8c1ade424930ec5697fd9b46d1d170db4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e708867037ec6edbe7965b8f0f1193999785037e + 951b1ad8c1ade424930ec5697fd9b46d1d170db4 https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 @@ -43,9 +43,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/aspnetcore @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating 091651d2bfe4b739c6c4f46f86608533a2087c35 - + https://github.com/dotnet/sdk - 602ab2857568b82598bbbdf6aaf9be5e044145c9 + c446b38d8db90c20c8afb79036fb125f70638aa8 - + https://github.com/dotnet/sdk - 602ab2857568b82598bbbdf6aaf9be5e044145c9 + c446b38d8db90c20c8afb79036fb125f70638aa8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3991c2606be14a6faf29eeafe824bd4444e85ea1 + b47cabfdc9c35f9b3305e5e11c2957d81fee26af - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5d6364723197e917e11c0d442545287c27754aa5 + 2a2301468b4a483e4c11f763ff7f131c6ff70bc2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fbefdcaf5..9f49b313a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.4-servicing.21117.2 + 5.0.5-servicing.21167.1 - 5.0.4-servicing.21117.5 + 5.0.5-servicing.21167.2 @@ -43,41 +43,41 @@ - 5.0.4 + 5.0.5 5.0.0 5.0.0-rtm.20526.5 - 5.0.4-servicing.21118.15 - 5.0.4-servicing.21118.15 - 5.0.4-servicing.21118.15 + 5.0.5-servicing.21167.8 + 5.0.5-servicing.21167.8 + 5.0.5-servicing.21167.8 0.2.0 - 5.0.300-preview.21215.16 - 5.0.300-preview.21215.16 + 5.0.300-preview.21215.18 + 5.0.300-preview.21215.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.1 + 5.0.2 - 5.0.4-servicing.21116.14 - 5.0.4 - 5.0.4 + 5.0.5-servicing.21166.9 + 5.0.5 + 5.0.5 5.0.0 - 5.0.4 + 5.0.5 2.1.0 - 5.0.4-servicing.21117.9 - 5.0.4 + 5.0.5-servicing.21167.2 + 5.0.5 5.0.0 5.0.0-rtm.20520.1 From a51cc90badf71c0f92fd2a52e8ddd76472d71c9b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 19 Apr 2021 10:18:33 -0700 Subject: [PATCH 20/20] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 864eea1c7..05b3d13af 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -53,7 +53,7 @@ <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 - + <_NETCoreApp31RuntimePackVersion>3.1.14 <_NETCoreApp31TargetingPackVersion>3.1.0 @@ -65,7 +65,7 @@ <_AspNet30RuntimePackVersion>3.0.3 <_AspNet30TargetingPackVersion>3.0.1 - + <_AspNet31RuntimePackVersion>3.1.14 <_AspNet31TargetingPackVersion>3.1.10