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 001/116] 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 002/116] 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 003/116] 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 004/116] 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 005/116] 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 5542708837705205f4b23e37e7a98c4594cc11c7 Mon Sep 17 00:00:00 2001
From: John Luo
Date: Tue, 6 Apr 2021 10:57:50 -0700
Subject: [PATCH 006/116] Update aspnetcore 2.1 & 3.1 & 5.0 template versions
---
eng/Versions.props | 6 +++---
src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 06818f947..31c3ac4e5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -113,7 +113,7 @@
$(NUnit3DotNetNewTemplatePackageVersion)
$(MicrosoftDotNetCommonItemTemplates50PackageVersion)
$(MicrosoftDotNetCommonItemTemplates50PackageVersion)
- 5.0.4
+ 5.0.5
4.8.1-servicing.19605.5
3.1.2-servicing.20066.4
@@ -121,7 +121,7 @@
3.1.12
$(MicrosoftDotNetCommonItemTemplates31PackageVersion)
$(MicrosoftDotNetTestProjectTemplates50PackageVersion)
- 3.1.13
+ 3.1.14
3.2.1
4.8.0-rc2.19462.10
@@ -136,7 +136,7 @@
1.0.2-beta3
$(MicrosoftDotNetCommonItemTemplates21PackageVersion)
1.0.2-beta4.21206.1
- 2.1.26
+ 2.1.27
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 43e65f87f..b15a0c080 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -43,32 +43,32 @@
<_NET50TargetingPackVersion>5.0.0
<_WindowsDesktop50RuntimePackVersion>5.0.3
<_WindowsDesktop50TargetingPackVersion>5.0.0
- <_AspNet50RuntimePackVersion>5.0.4
+ <_AspNet50RuntimePackVersion>5.0.5
<_AspNet50TargetingPackVersion>5.0.0
<_NETCoreApp31RuntimePackVersion>3.1.13
<_NETCoreApp31TargetingPackVersion>3.1.0
<_WindowsDesktop31RuntimePackVersion>3.1.12
<_WindowsDesktop31TargetingPackVersion>3.1.0
- <_AspNet31RuntimePackVersion>3.1.13
+ <_AspNet31RuntimePackVersion>3.1.14
<_AspNet31TargetingPackVersion>3.1.10
<_NETCoreApp30RuntimePackVersion>3.0.3
<_NETCoreApp30TargetingPackVersion>3.0.0
-
+
<_NETCoreApp31RuntimePackVersion>3.1.13
<_NETCoreApp31TargetingPackVersion>3.1.0
<_WindowsDesktop30RuntimePackVersion>3.0.3
<_WindowsDesktop30TargetingPackVersion>3.0.0
-
+
<_WindowsDesktop31RuntimePackVersion>3.1.13
<_WindowsDesktop31TargetingPackVersion>3.1.0
<_AspNet30RuntimePackVersion>3.0.3
<_AspNet30TargetingPackVersion>3.0.1
-
- <_AspNet31RuntimePackVersion>3.1.13
+
+ <_AspNet31RuntimePackVersion>3.1.14
<_AspNet31TargetingPackVersion>3.1.10
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 007/116] 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 008/116] 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 009/116] 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 010/116] 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 70fef01f634b836506918d3c0732487cd65d76a9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 13:20:28 +0000
Subject: [PATCH 011/116] Update dependencies from
https://github.com/dotnet/arcade build 20210412.6 (#10200)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- XliffTasks: from 1.0.0-beta.21169.2 to 1.0.0-beta.21210.2 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
eng/common/cross/arm64/tizen-fetch.sh | 2 +-
global.json | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3ca5b3b18..63dbaabe6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,13 +136,13 @@
-
+
https://github.com/dotnet/arcade
- 28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7
+ db49d790a4bfa977a9ed7436bf2aa242cefae45e
-
+
https://github.com/dotnet/arcade
- 28d9452d7e2ae4e98a1df735b90b03d3cac1f4e7
+ db49d790a4bfa977a9ed7436bf2aa242cefae45e
https://github.com/dotnet/source-build-reference-packages
@@ -152,9 +152,9 @@
https://github.com/dotnet/sourcelink
4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc
-
+
https://github.com/dotnet/xliff-tasks
- 0da469fe1c2714d0e25cad1143632562fb528425
+ aa77a885dbf30ecdb14fa2f20d4e50432ee36db5
diff --git a/eng/Versions.props b/eng/Versions.props
index c493a137f..db5d6d26e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21209.17
+ 6.0.0-beta.21212.6
diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh
index a48a6f51c..16d1301f2 100644
--- a/eng/common/cross/arm64/tizen-fetch.sh
+++ b/eng/common/cross/arm64/tizen-fetch.sh
@@ -157,7 +157,7 @@ fetch_tizen_pkgs()
Inform "Initialize arm base"
fetch_tizen_pkgs_init standard base
Inform "fetch common packages"
-fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
+fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
Inform "fetch coreclr packages"
fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
Inform "fetch corefx packages"
diff --git a/global.json b/global.json
index 037202ac2..b332e5be6 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21209.17"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21212.6"
}
}
From b75e498821e9d295e03521fb87bb08277245ff68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?=
Date: Tue, 13 Apr 2021 20:06:02 +0200
Subject: [PATCH 012/116] Add KnownRuntimePack entries for Mono-based runtime
packs
We need this now that we changed the name of the Mono-based runtime packs.
See https://github.com/dotnet/sdk/pull/11824 for the design.
Fixes https://github.com/dotnet/sdk/issues/11227
---
.../targets/GenerateBundledVersions.targets | 26 ++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 43e65f87f..6d572f780 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -105,6 +105,17 @@
+
+
+
+
-
-
+
+
+
+
Date: Tue, 13 Apr 2021 18:34:33 +0000
Subject: [PATCH 013/116] 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 dc6edd4b450e9254eaf516270fcfdd5319cb0fe4 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers
Date: Tue, 13 Apr 2021 16:41:01 -0500
Subject: [PATCH 014/116] Update workload manifests to match .NET 6 P3
The versions that were currently used here were a bit outdated, and
some looked like they were pointing to a PR build.
I updated to the builds we shipped for .NET 6 Preview 3, corresponding to:
* https://github.com/xamarin/xamarin-macios/commit/f68d4d9c2a342daf9eaad364ccbe252e009d3901
* https://github.com/xamarin/xamarin-android/commit/7d6cd1cde4182d7db2cfc5d0b55364c972b6d34f
Going forward, I will manually update these as we prepare for future previews.
---
eng/Versions.props | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 40a957f51..3b6af49ad 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -146,11 +146,11 @@
- 11.2.0-ci.d16-9.0
- 14.4.100-ci.pr.gh10849.1206
- 14.3.100-ci.pr.gh10849.351
- 11.1.100-ci.pr.gh10849.1259
- 14.3.100-ci.pr.gh10849.1259
+ 11.0.200-preview.3.196
+ 14.4.100-preview.3.1326
+ 14.3.100-preview.3.471
+ 11.1.100-preview.3.1379
+ 14.3.100-preview.3.1379
$(MicrosoftAspNetCoreAppRuntimePackageVersion)
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 015/116] 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 174902835a7bc4ca5faf0034bb8ce7f07526eab8 Mon Sep 17 00:00:00 2001
From: Anirudh Agnihotry
Date: Tue, 13 Apr 2021 16:23:11 -0700
Subject: [PATCH 016/116] update the netcoreapp versions (#10208)
---
src/redist/targets/GenerateBundledVersions.targets | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index a55d76c21..f8c4bd480 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -39,15 +39,13 @@
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)
- <_NET50RuntimePackVersion>5.0.4
+ <_NET50RuntimePackVersion>5.0.5
<_NET50TargetingPackVersion>5.0.0
<_WindowsDesktop50RuntimePackVersion>5.0.3
<_WindowsDesktop50TargetingPackVersion>5.0.0
<_AspNet50RuntimePackVersion>5.0.5
<_AspNet50TargetingPackVersion>5.0.0
- <_NETCoreApp31RuntimePackVersion>3.1.13
- <_NETCoreApp31TargetingPackVersion>3.1.0
<_WindowsDesktop31RuntimePackVersion>3.1.12
<_WindowsDesktop31TargetingPackVersion>3.1.0
<_AspNet31RuntimePackVersion>3.1.14
@@ -56,7 +54,7 @@
<_NETCoreApp30RuntimePackVersion>3.0.3
<_NETCoreApp30TargetingPackVersion>3.0.0
- <_NETCoreApp31RuntimePackVersion>3.1.13
+ <_NETCoreApp31RuntimePackVersion>3.1.14
<_NETCoreApp31TargetingPackVersion>3.1.0
<_WindowsDesktop30RuntimePackVersion>3.0.3
From a069111a95b4b908235febeeb3966b3b078720d1 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov
Date: Wed, 14 Apr 2021 11:12:08 +1000
Subject: [PATCH 017/116] Update GenerateBundledVersions.targets (#10195)
---
src/redist/targets/GenerateBundledVersions.targets | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index f8c4bd480..89198ab3d 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -41,7 +41,7 @@
<_NET50RuntimePackVersion>5.0.5
<_NET50TargetingPackVersion>5.0.0
- <_WindowsDesktop50RuntimePackVersion>5.0.3
+ <_WindowsDesktop50RuntimePackVersion>5.0.5
<_WindowsDesktop50TargetingPackVersion>5.0.0
<_AspNet50RuntimePackVersion>5.0.5
<_AspNet50TargetingPackVersion>5.0.0
@@ -59,8 +59,8 @@
<_WindowsDesktop30RuntimePackVersion>3.0.3
<_WindowsDesktop30TargetingPackVersion>3.0.0
-
- <_WindowsDesktop31RuntimePackVersion>3.1.13
+
+ <_WindowsDesktop31RuntimePackVersion>3.1.14
<_WindowsDesktop31TargetingPackVersion>3.1.0
<_AspNet30RuntimePackVersion>3.0.3
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 018/116] 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 019/116] 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 020/116] 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 73f0a697e4bf2279414b5a7e385fd72c9198586b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 12:49:16 +0000
Subject: [PATCH 021/116] [main] Update dependencies from dotnet/sdk (#10185)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21206.2 to 6.0.100-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21205.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21206.1 to 6.0.0-preview.4.21212.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.FSharp.Compiler: from 11.4.2-beta.21204.5 to 11.4.2-beta.21212.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21207.1 to 6.0.100-preview.2.21212.5 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21208.2 to 3.10.0-3.21213.18 (parent: Microsoft.NET.Sdk)
- NuGet.Build.Tasks: from 5.10.0-preview.2.7190 to 5.10.0-preview.2.7203 (parent: Microsoft.NET.Sdk)
- Merge branch 'main' into darc-main-4ed89ff0-d420-4cac-9486-36d8a69c8e12
- Set DOTNET_CLI_RUN_MSBUILD_OUTOFPROC=true for SdkTests.csproj
Forces the started dotnet CLI to not load MSBuild.dll in-proc, see https://github.com/dotnet/installer/pull/10185#issuecomment-819463807.
---
eng/Version.Details.xml | 96 +++++++++++++++++------------------
eng/Versions.props | 40 +++++++--------
test/SdkTests/SdkTests.csproj | 2 +-
3 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 63dbaabe6..d23a71aa1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,37 +1,37 @@
-
+
https://github.com/dotnet/windowsdesktop
- 4874021fd9472ced543d30e80496b33668895572
+ f19b0d699190075586eb2c04dc174e02d0bc67c9
-
+
https://github.com/dotnet/windowsdesktop
- 4874021fd9472ced543d30e80496b33668895572
+ f19b0d699190075586eb2c04dc174e02d0bc67c9
-
+
https://github.com/dotnet/windowsdesktop
- 4874021fd9472ced543d30e80496b33668895572
+ f19b0d699190075586eb2c04dc174e02d0bc67c9
-
+
https://github.com/dotnet/runtime
- b7a164882573af99eaf200c4b21808ecaf6dbb8c
+ 5d0817a2136b84580a78fea5bfbe9910098bed2b
-
+
https://github.com/dotnet/runtime
- b7a164882573af99eaf200c4b21808ecaf6dbb8c
+ 5d0817a2136b84580a78fea5bfbe9910098bed2b
-
+
https://github.com/dotnet/runtime
- b7a164882573af99eaf200c4b21808ecaf6dbb8c
+ 5d0817a2136b84580a78fea5bfbe9910098bed2b
-
+
https://github.com/dotnet/runtime
- b7a164882573af99eaf200c4b21808ecaf6dbb8c
+ 5d0817a2136b84580a78fea5bfbe9910098bed2b
-
+
https://github.com/dotnet/runtime
- b7a164882573af99eaf200c4b21808ecaf6dbb8c
+ 5d0817a2136b84580a78fea5bfbe9910098bed2b
@@ -39,33 +39,33 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- b7a164882573af99eaf200c4b21808ecaf6dbb8c
+ 5d0817a2136b84580a78fea5bfbe9910098bed2b
-
+
https://github.com/dotnet/aspnetcore
- a5864bb173de0f2b7902b128b9716d77d3f14630
+ 9ab99b219c3a867a31c733103160c88394b9f120
-
+
https://github.com/dotnet/aspnetcore
- a5864bb173de0f2b7902b128b9716d77d3f14630
+ 9ab99b219c3a867a31c733103160c88394b9f120
-
+
https://github.com/dotnet/aspnetcore
- a5864bb173de0f2b7902b128b9716d77d3f14630
+ 9ab99b219c3a867a31c733103160c88394b9f120
-
+
https://github.com/dotnet/aspnetcore
- a5864bb173de0f2b7902b128b9716d77d3f14630
+ 9ab99b219c3a867a31c733103160c88394b9f120
-
+
https://github.com/dotnet/aspnetcore
- a5864bb173de0f2b7902b128b9716d77d3f14630
+ 9ab99b219c3a867a31c733103160c88394b9f120
-
+
https://github.com/dotnet/aspnetcore
- a5864bb173de0f2b7902b128b9716d77d3f14630
+ 9ab99b219c3a867a31c733103160c88394b9f120
https://github.com/dotnet/test-templates
@@ -79,51 +79,51 @@
https://github.com/dotnet/test-templates
cb722862f3d76493dc5047a0c30e3bd5f4391170
-
+
https://github.com/dotnet/templating
- e46e279c0365c95116f6cb0cb60b12a7d655eb1b
+ d1fdd469d6ee0c059d8957f68620f5745b577fd3
-
+
https://github.com/dotnet/sdk
- 1e4913f32344ce69ee17229168906140e8f88f0d
+ 26d7fc38e51f980331a1fca8f08bda9c2c839e13
-
+
https://github.com/dotnet/sdk
- 1e4913f32344ce69ee17229168906140e8f88f0d
+ 26d7fc38e51f980331a1fca8f08bda9c2c839e13
-
+
https://github.com/dotnet/winforms
- 9073ca4669eb40ca6a6a8fc1bf8d62cd7e520c07
+ fc965cfdd237ba817153c4b136b714c85fd1ad16
-
+
https://github.com/dotnet/wpf
- ffef664280b799b78a2ad271395ceb99b2fbdeca
+ 25a2d02a0f46c03fa761931256958a5f38e75826
-
+
https://github.com/dotnet/fsharp
- df023d829e1daa577b95985d42d978e5c6e949a2
+ 35aca7bc7e0b3fdb123e8953385b25316d5e3851
https://github.com/microsoft/vstest
bdf1629e12c05a5fd17bf7de48e7e50a8f739170
-
+
https://github.com/mono/linker
- 55bd0ebd00ddbf2cd817314b1cf6824003cfb463
+ 7f7eb298a1ea6a144b2fb795ca10feb138e3988a
linker
-
+
https://github.com/dotnet/roslyn
- cc79281ea25b26f7173258aa646a7652943178ba
+ 3e252059f200440480525f667680081c0cb66afd
https://github.com/dotnet/msbuild
7804350cd4fe271bee48b3dc99e9f4681ee686c5
-
+
https://github.com/nuget/nuget.client
- 871251958b671dc9bcaf84d5a3547b86f5f325e7
+ 936eff1f2cccbb25ba537e47a2eaaa4984a160f4
https://github.com/Microsoft/ApplicationInsights-dotnet
diff --git a/eng/Versions.props b/eng/Versions.props
index 40a957f51..e6238fb7b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,15 +24,15 @@
- 6.0.0-preview.4.21205.2
+ 6.0.0-preview.4.21212.1
- 6.0.0-preview.4.21206.1
+ 6.0.0-preview.4.21212.1
- 6.0.100-preview.4.21206.2
+ 6.0.100-preview.4.21213.1
@@ -45,42 +45,42 @@
- 6.0.0-preview.4.21207.16
- 6.0.0-preview.4.21207.16
- 6.0.0-preview.4.21207.16
- 6.0.0-preview.4.21207.16
- 6.0.0-preview.4.21207.16
- 6.0.0-preview.4.21207.16
+ 6.0.0-preview.4.21213.1
+ 6.0.0-preview.4.21213.1
+ 6.0.0-preview.4.21213.1
+ 6.0.0-preview.4.21213.1
+ 6.0.0-preview.4.21213.1
+ 6.0.0-preview.4.21213.1
0.2.0
- 6.0.100-preview.4.21207.25
- 6.0.100-preview.4.21207.25
+ 6.0.100-preview.4.21213.29
+ 6.0.100-preview.4.21213.29
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.0-preview.4.21205.3
+ 6.0.0-preview.4.21213.3
- 6.0.0-preview.4.21205.3
- 6.0.0-preview.4.21205.3
- 6.0.0-preview.4.21205.3
- 6.0.0-preview.4.21205.3
- 6.0.0-preview.4.21205.3
+ 6.0.0-preview.4.21213.3
+ 6.0.0-preview.4.21213.3
+ 6.0.0-preview.4.21213.3
+ 6.0.0-preview.4.21213.3
+ 6.0.0-preview.4.21213.3
2.1.0
- 6.0.0-preview.4.21206.2
- 6.0.0-preview.4.21206.2
- 6.0.0-preview.4.21206.2
+ 6.0.0-preview.4.21212.1
+ 6.0.0-preview.4.21212.1
+ 6.0.0-preview.4.21212.1
diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index 9ac2c8108..111a141e9 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -266,7 +266,7 @@
+ EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME);DOTNET_CLI_RUN_MSBUILD_OUTOFPROC=true"/>
From 9d9f176139d5177d2e442dfdb8d2b6f2f9e59597 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 21:49:54 +0000
Subject: [PATCH 022/116] Update dependencies from
https://github.com/dotnet/sdk build 20210414.9 (#10224)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21212.1 to 6.0.0-preview.4.21213.9 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21212.1 to 6.0.0-preview.4.21213.9 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21212.1 to 6.0.0-preview.4.21213.9 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21212.1 to 6.0.0-preview.4.21213.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21212.1 to 6.0.0-preview.4.21213.9 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21212.1 to 6.0.0-preview.4.21213.18 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
---
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 14 +++++++-------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d23a71aa1..a91561964 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
-
+
https://github.com/dotnet/windowsdesktop
- f19b0d699190075586eb2c04dc174e02d0bc67c9
+ 226e6931f5d9a664cee53bf79154d703b527690c
-
+
https://github.com/dotnet/windowsdesktop
- f19b0d699190075586eb2c04dc174e02d0bc67c9
+ 226e6931f5d9a664cee53bf79154d703b527690c
-
+
https://github.com/dotnet/windowsdesktop
- f19b0d699190075586eb2c04dc174e02d0bc67c9
+ 226e6931f5d9a664cee53bf79154d703b527690c
https://github.com/dotnet/runtime
@@ -83,22 +83,22 @@
https://github.com/dotnet/templating
d1fdd469d6ee0c059d8957f68620f5745b577fd3
-
+
https://github.com/dotnet/sdk
- 26d7fc38e51f980331a1fca8f08bda9c2c839e13
+ 4a4d7cc854c8254c8b51c4cc9bfae7a66da57f02
-
+
https://github.com/dotnet/sdk
- 26d7fc38e51f980331a1fca8f08bda9c2c839e13
+ 4a4d7cc854c8254c8b51c4cc9bfae7a66da57f02
-
+
https://github.com/dotnet/winforms
- fc965cfdd237ba817153c4b136b714c85fd1ad16
+ 7e785d00865a3b7fa3b5f6a2c87a1f0afd04632b
-
+
https://github.com/dotnet/wpf
- 25a2d02a0f46c03fa761931256958a5f38e75826
+ 65182bad588389de8ee5413b14ec6fd6805516aa
https://github.com/dotnet/fsharp
diff --git a/eng/Versions.props b/eng/Versions.props
index c49b73ca5..db6fa0960 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,11 +24,11 @@
- 6.0.0-preview.4.21212.1
+ 6.0.0-preview.4.21213.10
- 6.0.0-preview.4.21212.1
+ 6.0.0-preview.4.21213.18
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21213.29
- 6.0.100-preview.4.21213.29
+ 6.0.100-preview.4.21214.9
+ 6.0.100-preview.4.21214.9
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -78,9 +78,9 @@
- 6.0.0-preview.4.21212.1
- 6.0.0-preview.4.21212.1
- 6.0.0-preview.4.21212.1
+ 6.0.0-preview.4.21213.9
+ 6.0.0-preview.4.21213.9
+ 6.0.0-preview.4.21213.9
From 331f4684695a1967adc7342bf6e8316476a32dd5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 23:02:59 +0000
Subject: [PATCH 023/116] Update dependencies from
https://github.com/dotnet/sdk build 20210414.10 (#10225)
[main] 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 a91561964..c7ac117f9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
d1fdd469d6ee0c059d8957f68620f5745b577fd3
-
+
https://github.com/dotnet/sdk
- 4a4d7cc854c8254c8b51c4cc9bfae7a66da57f02
+ 6947d45754a6df105c71ba4541a29ae4934c495f
-
+
https://github.com/dotnet/sdk
- 4a4d7cc854c8254c8b51c4cc9bfae7a66da57f02
+ 6947d45754a6df105c71ba4541a29ae4934c495f
diff --git a/eng/Versions.props b/eng/Versions.props
index db6fa0960..27082d396 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21214.9
- 6.0.100-preview.4.21214.9
+ 6.0.100-preview.4.21214.10
+ 6.0.100-preview.4.21214.10
$(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 024/116] [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 025/116] 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 be57cb9130b2d7ad0e6dc8744b035cbdbc954679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?=
Date: Thu, 15 Apr 2021 10:22:30 +0200
Subject: [PATCH 026/116] Improve GenerateBundledVersions.targets to include
only existing RIDs in KnownFrameworkReference (#10222)
Move the Mono-only rids to the KnownRuntimePack.
---
.../targets/GenerateBundledVersions.targets | 21 ++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 89198ab3d..a2c9881e3 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -114,6 +114,19 @@
+
+
+
+
+
+
+
+
-
-
+
+
From 3238b2239e01cad2b92fdad569e6ece46dc78256 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 13:14:27 +0000
Subject: [PATCH 027/116] Update dependencies from
https://github.com/dotnet/arcade build 20210414.5 (#10230)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- XliffTasks: from 1.0.0-beta.21210.2 to 1.0.0-beta.21213.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
eng/common/templates/job/onelocbuild.yml | 3 +++
global.json | 2 +-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c7ac117f9..f7d84f1fe 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,13 +136,13 @@
-
+
https://github.com/dotnet/arcade
- db49d790a4bfa977a9ed7436bf2aa242cefae45e
+ 93a6389f406e5e900da46ab643c608578f143851
-
+
https://github.com/dotnet/arcade
- db49d790a4bfa977a9ed7436bf2aa242cefae45e
+ 93a6389f406e5e900da46ab643c608578f143851
https://github.com/dotnet/source-build-reference-packages
@@ -152,9 +152,9 @@
https://github.com/dotnet/sourcelink
4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc
-
+
https://github.com/dotnet/xliff-tasks
- aa77a885dbf30ecdb14fa2f20d4e50432ee36db5
+ 910c7fc666698f9c99ea0ff0e2727b328b2dded5
diff --git a/eng/Versions.props b/eng/Versions.props
index 27082d396..494daac50 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21212.6
+ 6.0.0-beta.21214.5
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index 928a70cda..d2b271ec1 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -11,6 +11,7 @@ parameters:
SourcesDirectory: $(Build.SourcesDirectory)
CreatePr: true
+ AutoCompletePr: false
UseCheckedInLocProjectJson: false
LanguageSet: VS_Main_Languages
LclSource: lclFilesInRepo
@@ -54,6 +55,8 @@ jobs:
lclSource: ${{ parameters.LclSource }}
lclPackageId: ${{ parameters.LclPackageId }}
isCreatePrSelected: ${{ parameters.CreatePr }}
+ ${{ if eq(parameters.CreatePr, true) }}:
+ isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
packageSourceAuth: patAuth
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
diff --git a/global.json b/global.json
index b332e5be6..8cfd5c79f 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21212.6"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21214.5"
}
}
From 4f02edc80b9b68fc904606b56833253a2856e26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?=
Date: Thu, 15 Apr 2021 20:39:03 +0200
Subject: [PATCH 028/116] Remove IsTrimmable from Mono KnownRuntimePack
(#10231)
The assemblies themselves embed the trimmable information now, see https://github.com/dotnet/installer/commit/6c2b85564fb7854a50f47223c6eb34c515ebc82b
---
src/redist/targets/GenerateBundledVersions.targets | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index a2c9881e3..4426fb8b3 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -295,7 +295,6 @@ Copyright (c) .NET Foundation. All rights reserved.
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
RuntimePackRuntimeIdentifiers="@(MonoRuntimePackRids, '%3B')"
RuntimePackLabels="Mono"
- IsTrimmable="true"
/>
Date: Thu, 15 Apr 2021 13:03:50 -0700
Subject: [PATCH 029/116] 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 16:42:30 -0400
Subject: [PATCH 030/116] Apple Silicon Distribution-Template (#10223)
Add hostArchitectures attribute to stop installer from requiring Rosetta
Update the minimum required version to 11.0 for Apple Silicon
---
src/redist/targets/GeneratePKG.targets | 8 ++++++++
.../targets/packaging/osx/clisdk/Distribution-Template | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
index 7f33c208d..1d14596fa 100644
--- a/src/redist/targets/GeneratePKG.targets
+++ b/src/redist/targets/GeneratePKG.targets
@@ -88,6 +88,14 @@
$(Architecture)
+
+ $(Architecture)
+ x86_64
+
+
+ 10.13
+ 11.0
+
$(Version)
diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
index 3535ac201..87a917149 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
@@ -2,12 +2,12 @@
{CLISdkBrandName} ({arch})
-
+
-
+
From 9ef0486bdc0bca00c7ddb4f0c95bf8386c0d0a94 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 21:55:08 +0000
Subject: [PATCH 031/116] 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 032/116] 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 bf689eab9ca866cf5dde9fb046372fd36988b89d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 13:06:32 +0000
Subject: [PATCH 033/116] Update dependencies from
https://github.com/dotnet/arcade build 20210415.5 (#10237)
[main] 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 f7d84f1fe..f7af8d982 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,13 +136,13 @@
-
+
https://github.com/dotnet/arcade
- 93a6389f406e5e900da46ab643c608578f143851
+ e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80
-
+
https://github.com/dotnet/arcade
- 93a6389f406e5e900da46ab643c608578f143851
+ e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80
https://github.com/dotnet/source-build-reference-packages
diff --git a/eng/Versions.props b/eng/Versions.props
index 494daac50..79c74b52a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21214.5
+ 6.0.0-beta.21215.5
diff --git a/global.json b/global.json
index 8cfd5c79f..26ff545a3 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21214.5"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21215.5"
}
}
From a8c1910967400e4019c12c3d988a5bddcf8ac953 Mon Sep 17 00:00:00 2001
From: Michael Simons
Date: Fri, 16 Apr 2021 09:35:26 -0500
Subject: [PATCH 034/116] ArPow stage 1: local source-build infrastructure
(#10186)
---
eng/SourceBuild.props | 31 ++++++
eng/SourceBuildPrebuiltBaseline.xml | 5 +
eng/Version.Details.xml | 1 +
...xclude-test-folder-from-source-build.patch | 24 ++++
...get-rid-to-AppHostRuntimeIdentifiers.patch | 37 +++++++
...formAbstractions-and-NuGet.Versionin.patch | 43 ++++++++
...udeFromSourceBuild-not-working-again.patch | 103 ++++++++++++++++++
...-source-build-aspnetcore-targeting-p.patch | 35 ++++++
...nForms-and-WPF-templates-for-source-.patch | 52 +++++++++
...ions-to-use-ref-pkg-versions-to-trac.patch | 28 +++++
...e-internal-tarball-from-source-build.patch | 25 +++++
...MSI.targets-build-task-ref-to-net5.0.patch | 25 +++++
12 files changed, 409 insertions(+)
create mode 100644 eng/SourceBuild.props
create mode 100644 eng/SourceBuildPrebuiltBaseline.xml
create mode 100644 eng/source-build-patches/0001-Exclude-test-folder-from-source-build.patch
create mode 100644 eng/source-build-patches/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch
create mode 100644 eng/source-build-patches/0003-Use-PVP-for-PlatformAbstractions-and-NuGet.Versionin.patch
create mode 100644 eng/source-build-patches/0004-ExcludeFromSourceBuild-not-working-again.patch
create mode 100644 eng/source-build-patches/0005-Don-t-do-this-in-source-build-aspnetcore-targeting-p.patch
create mode 100644 eng/source-build-patches/0007-Don-t-restore-WinForms-and-WPF-templates-for-source-.patch
create mode 100644 eng/source-build-patches/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch
create mode 100644 eng/source-build-patches/0009-Exclude-internal-tarball-from-source-build.patch
create mode 100644 eng/source-build-patches/0010-Update-GenerateMSI.targets-build-task-ref-to-net5.0.patch
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
new file mode 100644
index 000000000..170fe99b2
--- /dev/null
+++ b/eng/SourceBuild.props
@@ -0,0 +1,31 @@
+
+
+
+ installer
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(InnerBuildArgs) /p:SkipBuildingInstallers=true
+ $(InnerBuildArgs) /p:IncludeNuGetPackageArchive=false
+ $(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false
+ $(InnerBuildArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false
+
+
+
+
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
new file mode 100644
index 000000000..c1b6dfbf0
--- /dev/null
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f7af8d982..1cc5d224d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -139,6 +139,7 @@
https://github.com/dotnet/arcade
e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80
+
https://github.com/dotnet/arcade
diff --git a/eng/source-build-patches/0001-Exclude-test-folder-from-source-build.patch b/eng/source-build-patches/0001-Exclude-test-folder-from-source-build.patch
new file mode 100644
index 000000000..65d055502
--- /dev/null
+++ b/eng/source-build-patches/0001-Exclude-test-folder-from-source-build.patch
@@ -0,0 +1,24 @@
+From 17bdd83006fbd27b64453ecddcf785c17eaaef1b Mon Sep 17 00:00:00 2001
+From: dseefeld
+Date: Mon, 29 Jun 2020 15:14:07 -0400
+Subject: [PATCH 1/3] Exclude test folder from source-build
+
+---
+ test/Directory.Build.props | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/Directory.Build.props b/test/Directory.Build.props
+index a953b97cc..26d486322 100644
+--- a/test/Directory.Build.props
++++ b/test/Directory.Build.props
+@@ -1,4 +1,7 @@
+
+
+
++
++ true
++
+
+--
+2.18.0
+
diff --git a/eng/source-build-patches/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch b/eng/source-build-patches/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch
new file mode 100644
index 000000000..32dedda90
--- /dev/null
+++ b/eng/source-build-patches/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch
@@ -0,0 +1,37 @@
+From e09da5670bfc8df488b65aee94de992a1c75a6a4 Mon Sep 17 00:00:00 2001
+From: Davis Goodin
+Date: Mon, 14 Sep 2020 18:43:27 -0500
+Subject: [PATCH] Add target rid to NetCoreAppHostRids
+
+---
+ src/redist/targets/GenerateBundledVersions.targets | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
+index 7c6f72967..3ee0284e1 100644
+--- a/src/redist/targets/GenerateBundledVersions.targets
++++ b/src/redist/targets/GenerateBundledVersions.targets
+@@ -99,6 +99,20 @@
+
+
+
++
++
++
+
+
+
+-
+-
++
++
+
+
+
+--
+2.21.3
+
diff --git a/eng/source-build-patches/0004-ExcludeFromSourceBuild-not-working-again.patch b/eng/source-build-patches/0004-ExcludeFromSourceBuild-not-working-again.patch
new file mode 100644
index 000000000..c31eec381
--- /dev/null
+++ b/eng/source-build-patches/0004-ExcludeFromSourceBuild-not-working-again.patch
@@ -0,0 +1,103 @@
+From d6aa940075f63d41603cbb2f3524958356d9abcf Mon Sep 17 00:00:00 2001
+From: Chris Rummel
+Date: Fri, 4 Sep 2020 02:23:15 -0500
+Subject: [PATCH 4/4] ExcludeFromSourceBuild not working again
+
+---
+ Microsoft.DotNet.Cli.sln | 7 ------
+ src/SdkResolver/SdkResolver.csproj | 39 ------------------------------
+ src/redist/redist.csproj | 4 ++--
+ 3 files changed, 2 insertion(+), 48 deletions(-)
+ delete mode 100644 src/SdkResolver/SdkResolver.csproj
+
+diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
+index 22d771abd..3ab6577a8 100644
+--- a/Microsoft.DotNet.Cli.sln
++++ b/Microsoft.DotNet.Cli.sln
+@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core-
+ EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{78E15EC1-7732-41E3-8591-934E9F583254}"
+ EndProject
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\SdkResolver\SdkResolver.csproj", "{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}"
+-EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Internal", "src\Microsoft.Dotnet.Sdk.Internal\Microsoft.Dotnet.Sdk.Internal.csproj", "{73F07908-981B-41BB-B9BD-F3420274A6F7}"
+ EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}"
+@@ -45,10 +43,6 @@ Global
+ {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.Build.0 = Release|Any CPU
+- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+@@ -70,7 +64,6 @@ Global
+ {1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+ {53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+ {78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+- {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+ {CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+ {658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+ EndGlobalSection
+--- a/src/SdkResolver/SdkResolver.csproj
++++ /dev/null
+@@ -1,39 +0,0 @@
+-
+-
+-
+- $(CoreSdkTargetFramework)
+- false
+- false
+- false
+- false
+- UNUSED
+- true
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+- <_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" />
+- <_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" />
+- <_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" />
+- <_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" />
+-
+-
+-
+-
+-
+-
+diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
+index 35c3d4ad9..15601e98f 100644
+--- a/src/redist/redist.csproj
++++ b/src/redist/redist.csproj
+@@ -12,7 +12,7 @@
+ RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
+ />
+
+-
++
+-
++
+
+
+--
+2.18.0
+
diff --git a/eng/source-build-patches/0005-Don-t-do-this-in-source-build-aspnetcore-targeting-p.patch b/eng/source-build-patches/0005-Don-t-do-this-in-source-build-aspnetcore-targeting-p.patch
new file mode 100644
index 000000000..4fc5bf023
--- /dev/null
+++ b/eng/source-build-patches/0005-Don-t-do-this-in-source-build-aspnetcore-targeting-p.patch
@@ -0,0 +1,35 @@
+From 5f34f12928157f5ed1c351dc217bf4bf5b62befe Mon Sep 17 00:00:00 2001
+From: Chris Rummel
+Date: Mon, 14 Sep 2020 09:47:04 -0500
+Subject: [PATCH 5/5] Don't do this in source-build -
+ aspnetcore-targeting-pack.tar.gz not available.
+
+---
+ src/redist/targets/GeneratePKG.targets | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
+index 82e55b18c..c78dc7b55 100644
+--- a/src/redist/targets/GeneratePKG.targets
++++ b/src/redist/targets/GeneratePKG.targets
+@@ -128,7 +128,7 @@
+ Inputs="@(GenerateSdkPkgInputs)"
+ Outputs="$(SdkPKGInstallerFile)"
+ DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs"
+- Condition=" '$(OSName)' == 'osx' ">
++ Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' ">
+
+
+
+@@ -172,7 +172,7 @@
+ Inputs="@(GenerateSdkProductArchiveInputs)"
+ Outputs="$(CombinedFrameworkSdkHostPKGInstallerFile)"
+ DependsOnTargets="GenerateSdkPkg"
+- Condition=" '$(OSName)' == 'osx' ">
++ Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' ">
+
+
+
+
+-
+-
+
+
+
+@@ -45,8 +43,6 @@
+
+
+
+-
+-
+
+
+
+@@ -56,8 +52,6 @@
+
+
+
+-
+-
+
+
+
+@@ -68,8 +62,6 @@
+
+
+
+-
+-
+
+
+
+--
+2.21.3
+
diff --git a/eng/source-build-patches/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch b/eng/source-build-patches/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch
new file mode 100644
index 000000000..9e917ee80
--- /dev/null
+++ b/eng/source-build-patches/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch
@@ -0,0 +1,28 @@
+From 992512755a9df08ccfd531f7507c298aa5b22112 Mon Sep 17 00:00:00 2001
+From: dseefeld
+Date: Thu, 29 Oct 2020 16:01:59 +0000
+Subject: [PATCH] Update blob versions to use ref pkg versions to track stable
+ versions
+
+---
+ src/redist/targets/GenerateLayout.targets | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
+index 9e7249d..f1b11d4 100644
+--- a/src/redist/targets/GenerateLayout.targets
++++ b/src/redist/targets/GenerateLayout.targets
+@@ -7,8 +7,8 @@
+
+
+
+- $(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)
+- $(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)
++ $(MicrosoftAspNetCoreAppRuntimePackageVersion)
++ $(MicrosoftNETCoreAppRuntimePackageVersion)
+ $(VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion)
+
+
+--
+1.8.3.1
+
diff --git a/eng/source-build-patches/0009-Exclude-internal-tarball-from-source-build.patch b/eng/source-build-patches/0009-Exclude-internal-tarball-from-source-build.patch
new file mode 100644
index 000000000..69d134b05
--- /dev/null
+++ b/eng/source-build-patches/0009-Exclude-internal-tarball-from-source-build.patch
@@ -0,0 +1,25 @@
+From 13b15d6ef5ac2bf593825bd1c1b85020585e1751 Mon Sep 17 00:00:00 2001
+From: Michael Simons
+Date: Thu, 8 Apr 2021 20:59:02 +0000
+Subject: [PATCH] Exclude internal tarball from source-build
+
+---
+ src/redist/targets/GenerateArchives.targets | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets
+index e59e5d4..8a66679 100644
+--- a/src/redist/targets/GenerateArchives.targets
++++ b/src/redist/targets/GenerateArchives.targets
+@@ -28,7 +28,7 @@
+ IgnoreExitCode="$(IgnoreTarExitCode)"/>
+
+
+Date: Thu, 8 Apr 2021 21:53:33 +0000
+Subject: [PATCH] Update GenerateMSI.targets build task ref to net5.0
+
+---
+ src/redist/targets/GenerateMSIs.targets | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
+index 0c69a4d..397fb82 100644
+--- a/src/redist/targets/GenerateMSIs.targets
++++ b/src/redist/targets/GenerateMSIs.targets
+@@ -1,7 +1,7 @@
+
+
+
+- $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.Installers.dll
++ $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net5.0\Microsoft.DotNet.Build.Tasks.Installers.dll
+ $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll
+
+
+--
+1.8.3.1
+
From 92ea20bfb84a9b1fc27e4456ed102c0e6517b20c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 16:17:09 +0000
Subject: [PATCH 035/116] [main] Update dependencies from dotnet/sdk (#10226)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21213.1 to 6.0.100-preview.4.21216.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21213.10 to 6.0.0-preview.4.21215.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21213.18 to 6.0.0-preview.4.21215.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.FSharp.Compiler: from 11.4.2-beta.21212.7 to 11.4.2-beta.21214.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21212.5 to 6.0.100-preview.2.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21213.18 to 3.10.0-3.21215.28 (parent: Microsoft.NET.Sdk)
- validate inserted manifest
- Merge branch 'darc-main-64df7133-1e9b-45ab-b603-1cefc648ba97' of https://github.com/dotnet/core-sdk into darc-main-64df7133-1e9b-45ab-b603-1cefc648ba97
---
eng/Version.Details.xml | 92 +++++++++++-----------
eng/Versions.props | 40 +++++-----
test/EndToEnd/EndToEnd.Tests.csproj | 4 +
test/EndToEnd/ValidateInsertedManifests.cs | 43 ++++++++++
4 files changed, 113 insertions(+), 66 deletions(-)
create mode 100644 test/EndToEnd/ValidateInsertedManifests.cs
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1cc5d224d..5afe1ca56 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,37 +1,37 @@
-
+
https://github.com/dotnet/windowsdesktop
- 226e6931f5d9a664cee53bf79154d703b527690c
+ 9b0e82ce309d592f30e1ddd6054b7461bd5661fc
-
+
https://github.com/dotnet/windowsdesktop
- 226e6931f5d9a664cee53bf79154d703b527690c
+ 9b0e82ce309d592f30e1ddd6054b7461bd5661fc
-
+
https://github.com/dotnet/windowsdesktop
- 226e6931f5d9a664cee53bf79154d703b527690c
+ 9b0e82ce309d592f30e1ddd6054b7461bd5661fc
-
+
https://github.com/dotnet/runtime
- 5d0817a2136b84580a78fea5bfbe9910098bed2b
+ 3ffaab9b6f90c8f5169cf529035d209b060b1d83
-
+
https://github.com/dotnet/runtime
- 5d0817a2136b84580a78fea5bfbe9910098bed2b
+ 3ffaab9b6f90c8f5169cf529035d209b060b1d83
-
+
https://github.com/dotnet/runtime
- 5d0817a2136b84580a78fea5bfbe9910098bed2b
+ 3ffaab9b6f90c8f5169cf529035d209b060b1d83
-
+
https://github.com/dotnet/runtime
- 5d0817a2136b84580a78fea5bfbe9910098bed2b
+ 3ffaab9b6f90c8f5169cf529035d209b060b1d83
-
+
https://github.com/dotnet/runtime
- 5d0817a2136b84580a78fea5bfbe9910098bed2b
+ 3ffaab9b6f90c8f5169cf529035d209b060b1d83
@@ -39,33 +39,33 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- 5d0817a2136b84580a78fea5bfbe9910098bed2b
+ 3ffaab9b6f90c8f5169cf529035d209b060b1d83
-
+
https://github.com/dotnet/aspnetcore
- 9ab99b219c3a867a31c733103160c88394b9f120
+ 2d6e985887068528980b5037b945232f35ef8019
-
+
https://github.com/dotnet/aspnetcore
- 9ab99b219c3a867a31c733103160c88394b9f120
+ 2d6e985887068528980b5037b945232f35ef8019
-
+
https://github.com/dotnet/aspnetcore
- 9ab99b219c3a867a31c733103160c88394b9f120
+ 2d6e985887068528980b5037b945232f35ef8019
-
+
https://github.com/dotnet/aspnetcore
- 9ab99b219c3a867a31c733103160c88394b9f120
+ 2d6e985887068528980b5037b945232f35ef8019
-
+
https://github.com/dotnet/aspnetcore
- 9ab99b219c3a867a31c733103160c88394b9f120
+ 2d6e985887068528980b5037b945232f35ef8019
-
+
https://github.com/dotnet/aspnetcore
- 9ab99b219c3a867a31c733103160c88394b9f120
+ 2d6e985887068528980b5037b945232f35ef8019
https://github.com/dotnet/test-templates
@@ -79,43 +79,43 @@
https://github.com/dotnet/test-templates
cb722862f3d76493dc5047a0c30e3bd5f4391170
-
+
https://github.com/dotnet/templating
- d1fdd469d6ee0c059d8957f68620f5745b577fd3
+ 22c7a0edfa8445f1de5d18e35f816ea01e98f4d8
-
+
https://github.com/dotnet/sdk
- 6947d45754a6df105c71ba4541a29ae4934c495f
+ 23f0b5c722ea6dfe049b54e3d0f7cabc42811ce3
-
+
https://github.com/dotnet/sdk
- 6947d45754a6df105c71ba4541a29ae4934c495f
+ 23f0b5c722ea6dfe049b54e3d0f7cabc42811ce3
-
+
https://github.com/dotnet/winforms
- 7e785d00865a3b7fa3b5f6a2c87a1f0afd04632b
+ 970b01adc9d7d767115a8a8c29772b3b472f166c
-
+
https://github.com/dotnet/wpf
- 65182bad588389de8ee5413b14ec6fd6805516aa
+ 0400cb5ef465884cb650a1a9e7868e272078208a
-
+
https://github.com/dotnet/fsharp
- 35aca7bc7e0b3fdb123e8953385b25316d5e3851
+ 8b1d616a7464314af09b30ad413a3d41a060eb16
https://github.com/microsoft/vstest
bdf1629e12c05a5fd17bf7de48e7e50a8f739170
-
+
https://github.com/mono/linker
- 7f7eb298a1ea6a144b2fb795ca10feb138e3988a
+ 1ed6f39a6e716b42fa5e478dcfd30a59f1c8f25e
linker
-
+
https://github.com/dotnet/roslyn
- 3e252059f200440480525f667680081c0cb66afd
+ a03881e08eb389ed5c2475484c5102e952d1f86f
https://github.com/dotnet/msbuild
diff --git a/eng/Versions.props b/eng/Versions.props
index 79c74b52a..10993ff50 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,15 +24,15 @@
- 6.0.0-preview.4.21213.10
+ 6.0.0-preview.4.21215.2
- 6.0.0-preview.4.21213.18
+ 6.0.0-preview.4.21215.2
- 6.0.100-preview.4.21213.1
+ 6.0.100-preview.4.21216.1
@@ -45,42 +45,42 @@
- 6.0.0-preview.4.21213.1
- 6.0.0-preview.4.21213.1
- 6.0.0-preview.4.21213.1
- 6.0.0-preview.4.21213.1
- 6.0.0-preview.4.21213.1
- 6.0.0-preview.4.21213.1
+ 6.0.0-preview.4.21215.16
+ 6.0.0-preview.4.21215.16
+ 6.0.0-preview.4.21215.16
+ 6.0.0-preview.4.21215.16
+ 6.0.0-preview.4.21215.16
+ 6.0.0-preview.4.21215.16
0.2.0
- 6.0.100-preview.4.21214.10
- 6.0.100-preview.4.21214.10
+ 6.0.100-preview.4.21216.9
+ 6.0.100-preview.4.21216.9
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.0-preview.4.21213.3
+ 6.0.0-preview.4.21215.2
- 6.0.0-preview.4.21213.3
- 6.0.0-preview.4.21213.3
- 6.0.0-preview.4.21213.3
- 6.0.0-preview.4.21213.3
- 6.0.0-preview.4.21213.3
+ 6.0.0-preview.4.21215.2
+ 6.0.0-preview.4.21215.2
+ 6.0.0-preview.4.21215.2
+ 6.0.0-preview.4.21215.2
+ 6.0.0-preview.4.21215.2
2.1.0
- 6.0.0-preview.4.21213.9
- 6.0.0-preview.4.21213.9
- 6.0.0-preview.4.21213.9
+ 6.0.0-preview.4.21215.3
+ 6.0.0-preview.4.21215.3
+ 6.0.0-preview.4.21215.3
diff --git a/test/EndToEnd/EndToEnd.Tests.csproj b/test/EndToEnd/EndToEnd.Tests.csproj
index 19303cea7..fb7ef6a03 100644
--- a/test/EndToEnd/EndToEnd.Tests.csproj
+++ b/test/EndToEnd/EndToEnd.Tests.csproj
@@ -9,6 +9,10 @@
+
+
+
+
diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs
new file mode 100644
index 000000000..1d9ec8a94
--- /dev/null
+++ b/test/EndToEnd/ValidateInsertedManifests.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using Microsoft.NET.Sdk.WorkloadManifestReader;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace EndToEnd.Tests
+{
+ public class ValidateInsertedManifests : TestBase
+ {
+ private readonly ITestOutputHelper output;
+
+ public ValidateInsertedManifests(ITestOutputHelper output)
+ {
+ this.output = output;
+ }
+
+ [Fact]
+ public void ManifestReaderCanReadManifests()
+ {
+ var sdkManifestDir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk-manifests");
+ var sdkversionDir = new DirectoryInfo(sdkManifestDir).EnumerateDirectories().First();
+ foreach (var manifestDir in sdkversionDir.EnumerateDirectories())
+ {
+ var manifestId = manifestDir.Name;
+
+ string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName;
+
+ File.Exists(manifestFile).Should().BeTrue();
+ using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
+ Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream);
+ readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
+ }
+
+ }
+ }
+}
From 5c0fd3ae47178a97bc82c8d547c850262e107d08 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 20:25:03 +0000
Subject: [PATCH 036/116] [main] Update dependencies from dotnet/sdk (#10241)
[main] Update dependencies from dotnet/sdk
---
eng/Version.Details.xml | 10 +++++-----
eng/Versions.props | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5afe1ca56..cbdfda5cf 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
22c7a0edfa8445f1de5d18e35f816ea01e98f4d8
-
+
https://github.com/dotnet/sdk
- 23f0b5c722ea6dfe049b54e3d0f7cabc42811ce3
+ 2f649d4c4d6ef13e05bc1d149d004854ab6b61b2
-
+
https://github.com/dotnet/sdk
- 23f0b5c722ea6dfe049b54e3d0f7cabc42811ce3
+ 2f649d4c4d6ef13e05bc1d149d004854ab6b61b2
@@ -139,7 +139,7 @@
https://github.com/dotnet/arcade
e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80
-
+
https://github.com/dotnet/arcade
diff --git a/eng/Versions.props b/eng/Versions.props
index 10993ff50..ac4a8cf4c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21216.9
- 6.0.100-preview.4.21216.9
+ 6.0.100-preview.4.21216.11
+ 6.0.100-preview.4.21216.11
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 6d71f84dadb8f5a945b7461386e5d282fe4c36a1 Mon Sep 17 00:00:00 2001
From: Andy Gocke
Date: Fri, 16 Apr 2021 15:42:45 -0700
Subject: [PATCH 037/116] Add CI jobs (#10229)
---
.vsts-ci.yml | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 54bbaa8bb..6fe393a60 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -118,6 +118,12 @@ stages:
_AdditionalBuildParameters: '/p:PublishInternalAsset=true'
# Never run tests on PGO bits
_TestArg: ''
+ Build_Release_x86:
+ _BuildConfig: Release
+ _BuildArchitecture: x86
+ _DOTNET_CLI_UI_LANGUAGE: ''
+ _AdditionalBuildParameters: ''
+ _TestArg: ''
pgoInstrument: true
- template: /eng/build.yml
@@ -290,6 +296,29 @@ stages:
_BuildArchitecture: 'x64'
_TestArg: $(_NonWindowsTestArg)
+ - template: /eng/build.yml
+ parameters:
+ agentOs: Linux
+ pool:
+ ${{ if eq(variables['System.TeamProject'], 'public') }}:
+ name: NetCorePublic-Pool
+ queue: BuildPool.Ubuntu.1604.Amd64.Open
+ ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+ name: NetCoreInternal-Pool
+ queue: BuildPool.Ubuntu.1604.Amd64
+ timeoutInMinutes: 180
+ strategy:
+ matrix:
+ # Always run builds
+ Build_LinuxPortable_Release_x64:
+ _BuildConfig: Release
+ _DockerParameter: ''
+ _LinuxPortable: '--linux-portable'
+ _RuntimeIdentifier: ''
+ _BuildArchitecture: 'x64'
+ _TestArg: ''
+ pgoInstrument: true
+
- template: /eng/build.yml
parameters:
agentOs: Darwin
From 692895ebf8f6761bfa7aa14d3ff3d48f970075c3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 23:33:57 +0000
Subject: [PATCH 038/116] [main] Update dependencies from dotnet/sdk (#10242)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21215.3 to 6.0.0-preview.5.21215.6 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21215.3 to 6.0.0-preview.5.21215.6 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21215.3 to 6.0.0-preview.5.21215.6 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21215.2 to 6.0.0-preview.4.21215.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21215.3 to 6.0.0-preview.5.21215.6 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21215.2 to 6.0.0-preview.4.21215.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
---
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 14 +++++++-------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cbdfda5cf..ed6514dfd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
-
+
https://github.com/dotnet/windowsdesktop
- 9b0e82ce309d592f30e1ddd6054b7461bd5661fc
+ 52a4775acf388bb15205d1e82809ae5f5afa9bb3
-
+
https://github.com/dotnet/windowsdesktop
- 9b0e82ce309d592f30e1ddd6054b7461bd5661fc
+ 52a4775acf388bb15205d1e82809ae5f5afa9bb3
-
+
https://github.com/dotnet/windowsdesktop
- 9b0e82ce309d592f30e1ddd6054b7461bd5661fc
+ 52a4775acf388bb15205d1e82809ae5f5afa9bb3
https://github.com/dotnet/runtime
@@ -83,22 +83,22 @@
https://github.com/dotnet/templating
22c7a0edfa8445f1de5d18e35f816ea01e98f4d8
-
+
https://github.com/dotnet/sdk
- 2f649d4c4d6ef13e05bc1d149d004854ab6b61b2
+ da2ad4b190075660ae1a141173d9796f7baa9832
-
+
https://github.com/dotnet/sdk
- 2f649d4c4d6ef13e05bc1d149d004854ab6b61b2
+ da2ad4b190075660ae1a141173d9796f7baa9832
-
+
https://github.com/dotnet/winforms
- 970b01adc9d7d767115a8a8c29772b3b472f166c
+ f379253b8c34640aa252d039f16e498f6b7a933e
-
+
https://github.com/dotnet/wpf
- 0400cb5ef465884cb650a1a9e7868e272078208a
+ 6d23db9bc4cf4af023c8f9fccc87ae566b2d4e6a
https://github.com/dotnet/fsharp
diff --git a/eng/Versions.props b/eng/Versions.props
index ac4a8cf4c..7bbc6afaf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,11 +24,11 @@
- 6.0.0-preview.4.21215.2
+ 6.0.0-preview.4.21215.3
- 6.0.0-preview.4.21215.2
+ 6.0.0-preview.4.21215.3
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21216.11
- 6.0.100-preview.4.21216.11
+ 6.0.100-preview.4.21216.15
+ 6.0.100-preview.4.21216.15
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -78,9 +78,9 @@
- 6.0.0-preview.4.21215.3
- 6.0.0-preview.4.21215.3
- 6.0.0-preview.4.21215.3
+ 6.0.0-preview.5.21215.6
+ 6.0.0-preview.5.21215.6
+ 6.0.0-preview.5.21215.6
From 6b5d88c954fcc7a6c719df3a0a67163b2c4cd37e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 17 Apr 2021 01:34:40 +0000
Subject: [PATCH 039/116] [main] Update dependencies from dotnet/sdk (#10243)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21215.16 to 6.0.0-preview.4.21216.5 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21215.16 to 6.0.0-preview.4.21216.5 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21215.16 to 6.0.0-preview.4.21216.5 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21215.16 to 6.0.0-preview.4.21216.5 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.4.21215.16 to 6.0.0-preview.4.21216.5 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.4.21215.16 to 6.0.0-preview.4.21216.5 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21215.2 to 6.0.100-preview.2.21216.2 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 36 ++++++++++++++++++------------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ed6514dfd..ffc21f439 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
3ffaab9b6f90c8f5169cf529035d209b060b1d83
-
+
https://github.com/dotnet/aspnetcore
- 2d6e985887068528980b5037b945232f35ef8019
+ 232785ceb876c5eb3d3d6dbabbcedc934521c853
-
+
https://github.com/dotnet/aspnetcore
- 2d6e985887068528980b5037b945232f35ef8019
+ 232785ceb876c5eb3d3d6dbabbcedc934521c853
-
+
https://github.com/dotnet/aspnetcore
- 2d6e985887068528980b5037b945232f35ef8019
+ 232785ceb876c5eb3d3d6dbabbcedc934521c853
-
+
https://github.com/dotnet/aspnetcore
- 2d6e985887068528980b5037b945232f35ef8019
+ 232785ceb876c5eb3d3d6dbabbcedc934521c853
-
+
https://github.com/dotnet/aspnetcore
- 2d6e985887068528980b5037b945232f35ef8019
+ 232785ceb876c5eb3d3d6dbabbcedc934521c853
-
+
https://github.com/dotnet/aspnetcore
- 2d6e985887068528980b5037b945232f35ef8019
+ 232785ceb876c5eb3d3d6dbabbcedc934521c853
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
22c7a0edfa8445f1de5d18e35f816ea01e98f4d8
-
+
https://github.com/dotnet/sdk
- da2ad4b190075660ae1a141173d9796f7baa9832
+ 57b71245001660e2ea9a00bee7fafded74c37e67
-
+
https://github.com/dotnet/sdk
- da2ad4b190075660ae1a141173d9796f7baa9832
+ 57b71245001660e2ea9a00bee7fafded74c37e67
@@ -108,9 +108,9 @@
https://github.com/microsoft/vstest
bdf1629e12c05a5fd17bf7de48e7e50a8f739170
-
+
https://github.com/mono/linker
- 1ed6f39a6e716b42fa5e478dcfd30a59f1c8f25e
+ cd8bd0d1682eee721f99ac648c346d269b93d46f
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index 7bbc6afaf..0bf5bafaa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.4.21215.16
- 6.0.0-preview.4.21215.16
- 6.0.0-preview.4.21215.16
- 6.0.0-preview.4.21215.16
- 6.0.0-preview.4.21215.16
- 6.0.0-preview.4.21215.16
+ 6.0.0-preview.4.21216.5
+ 6.0.0-preview.4.21216.5
+ 6.0.0-preview.4.21216.5
+ 6.0.0-preview.4.21216.5
+ 6.0.0-preview.4.21216.5
+ 6.0.0-preview.4.21216.5
0.2.0
- 6.0.100-preview.4.21216.15
- 6.0.100-preview.4.21216.15
+ 6.0.100-preview.4.21216.18
+ 6.0.100-preview.4.21216.18
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 7770967c512e45da0ee7250c1fb769a6d1caf839 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 17 Apr 2021 02:27:02 +0000
Subject: [PATCH 040/116] Update dependencies from
https://github.com/dotnet/sdk build 20210416.19 (#10244)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21215.28 to 3.10.0-3.21216.10 (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 ffc21f439..495d19f82 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
22c7a0edfa8445f1de5d18e35f816ea01e98f4d8
-
+
https://github.com/dotnet/sdk
- 57b71245001660e2ea9a00bee7fafded74c37e67
+ 8ad5e3aa93da9ef1fdc1b3c5a7e86fa0af16ba35
-
+
https://github.com/dotnet/sdk
- 57b71245001660e2ea9a00bee7fafded74c37e67
+ 8ad5e3aa93da9ef1fdc1b3c5a7e86fa0af16ba35
@@ -113,9 +113,9 @@
cd8bd0d1682eee721f99ac648c346d269b93d46f
linker
-
+
https://github.com/dotnet/roslyn
- a03881e08eb389ed5c2475484c5102e952d1f86f
+ 9bfe989ad46e3f457d33ed800c3be012cec5afc6
https://github.com/dotnet/msbuild
diff --git a/eng/Versions.props b/eng/Versions.props
index 0bf5bafaa..cbf3f0355 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21216.18
- 6.0.100-preview.4.21216.18
+ 6.0.100-preview.4.21216.19
+ 6.0.100-preview.4.21216.19
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 75a31f792b64b4c55699f11664ee31adcb0b7793 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 17 Apr 2021 13:09:18 +0000
Subject: [PATCH 041/116] Update dependencies from
https://github.com/dotnet/arcade build 20210416.2 (#10246)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- XliffTasks: from 1.0.0-beta.21213.1 to 1.0.0-beta.21215.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
global.json | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 495d19f82..dd4a88793 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,14 +136,14 @@
-
+
https://github.com/dotnet/arcade
- e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80
+ 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
-
+
https://github.com/dotnet/arcade
- e76fe48d5eb894e58fe7841f3a2c0bcfa654ee80
+ 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
https://github.com/dotnet/source-build-reference-packages
@@ -153,9 +153,9 @@
https://github.com/dotnet/sourcelink
4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc
-
+
https://github.com/dotnet/xliff-tasks
- 910c7fc666698f9c99ea0ff0e2727b328b2dded5
+ 3d9b37d56a7ca805f4e361092bf699dd2428e895
diff --git a/eng/Versions.props b/eng/Versions.props
index cbf3f0355..57df1c224 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21215.5
+ 6.0.0-beta.21216.2
diff --git a/global.json b/global.json
index 26ff545a3..bfbfd90e3 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21215.5"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2"
}
}
From 3f16a25954e804d52a319cd80494e3f0452670e0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 18 Apr 2021 09:10:04 +0000
Subject: [PATCH 042/116] [main] Update dependencies from dotnet/sdk (#10245)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21215.6 to 6.0.0-preview.5.21216.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21215.6 to 6.0.0-preview.5.21216.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21215.2 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21215.2 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21215.2 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21215.2 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21215.2 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21215.2 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21216.5 to 6.0.0-preview.5.21217.2 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21216.5 to 6.0.0-preview.5.21217.2 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21216.5 to 6.0.0-preview.5.21217.2 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21216.5 to 6.0.0-preview.5.21217.2 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.4.21216.5 to 6.0.0-preview.5.21217.2 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.4.21216.5 to 6.0.0-preview.5.21217.2 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21216.1 to 6.0.100-preview.5.21216.7 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21215.6 to 6.0.0-preview.5.21216.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21215.6 to 6.0.0-preview.5.21216.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 72 ++++++++++++++++++++---------------------
eng/Versions.props | 36 ++++++++++-----------
2 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dd4a88793..bb0074538 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,37 +1,37 @@
-
+
https://github.com/dotnet/windowsdesktop
- 52a4775acf388bb15205d1e82809ae5f5afa9bb3
+ 7a88d8582178134b83ab6c1270132bc6c98092d6
-
+
https://github.com/dotnet/windowsdesktop
- 52a4775acf388bb15205d1e82809ae5f5afa9bb3
+ 7a88d8582178134b83ab6c1270132bc6c98092d6
-
+
https://github.com/dotnet/windowsdesktop
- 52a4775acf388bb15205d1e82809ae5f5afa9bb3
+ 7a88d8582178134b83ab6c1270132bc6c98092d6
-
+
https://github.com/dotnet/runtime
- 3ffaab9b6f90c8f5169cf529035d209b060b1d83
+ 49bce33cc007cf4464d20137fc58f542f7565280
-
+
https://github.com/dotnet/runtime
- 3ffaab9b6f90c8f5169cf529035d209b060b1d83
+ 49bce33cc007cf4464d20137fc58f542f7565280
-
+
https://github.com/dotnet/runtime
- 3ffaab9b6f90c8f5169cf529035d209b060b1d83
+ 49bce33cc007cf4464d20137fc58f542f7565280
-
+
https://github.com/dotnet/runtime
- 3ffaab9b6f90c8f5169cf529035d209b060b1d83
+ 49bce33cc007cf4464d20137fc58f542f7565280
-
+
https://github.com/dotnet/runtime
- 3ffaab9b6f90c8f5169cf529035d209b060b1d83
+ 49bce33cc007cf4464d20137fc58f542f7565280
@@ -39,33 +39,33 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- 3ffaab9b6f90c8f5169cf529035d209b060b1d83
+ 49bce33cc007cf4464d20137fc58f542f7565280
-
+
https://github.com/dotnet/aspnetcore
- 232785ceb876c5eb3d3d6dbabbcedc934521c853
+ 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
-
+
https://github.com/dotnet/aspnetcore
- 232785ceb876c5eb3d3d6dbabbcedc934521c853
+ 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
-
+
https://github.com/dotnet/aspnetcore
- 232785ceb876c5eb3d3d6dbabbcedc934521c853
+ 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
-
+
https://github.com/dotnet/aspnetcore
- 232785ceb876c5eb3d3d6dbabbcedc934521c853
+ 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
-
+
https://github.com/dotnet/aspnetcore
- 232785ceb876c5eb3d3d6dbabbcedc934521c853
+ 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
-
+
https://github.com/dotnet/aspnetcore
- 232785ceb876c5eb3d3d6dbabbcedc934521c853
+ 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
https://github.com/dotnet/test-templates
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
cb722862f3d76493dc5047a0c30e3bd5f4391170
-
+
https://github.com/dotnet/templating
- 22c7a0edfa8445f1de5d18e35f816ea01e98f4d8
+ 97b9240b5fe740271594d7f65902490af9d5a1eb
-
+
https://github.com/dotnet/sdk
- 8ad5e3aa93da9ef1fdc1b3c5a7e86fa0af16ba35
+ bffc5670aae31eb85687bef1f3e8657a4b1aa3ae
-
+
https://github.com/dotnet/sdk
- 8ad5e3aa93da9ef1fdc1b3c5a7e86fa0af16ba35
+ bffc5670aae31eb85687bef1f3e8657a4b1aa3ae
diff --git a/eng/Versions.props b/eng/Versions.props
index 57df1c224..dec8bab59 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.4.21216.1
+ 6.0.100-preview.5.21216.7
@@ -45,42 +45,42 @@
- 6.0.0-preview.4.21216.5
- 6.0.0-preview.4.21216.5
- 6.0.0-preview.4.21216.5
- 6.0.0-preview.4.21216.5
- 6.0.0-preview.4.21216.5
- 6.0.0-preview.4.21216.5
+ 6.0.0-preview.5.21217.2
+ 6.0.0-preview.5.21217.2
+ 6.0.0-preview.5.21217.2
+ 6.0.0-preview.5.21217.2
+ 6.0.0-preview.5.21217.2
+ 6.0.0-preview.5.21217.2
0.2.0
- 6.0.100-preview.4.21216.19
- 6.0.100-preview.4.21216.19
+ 6.0.100-preview.4.21218.1
+ 6.0.100-preview.4.21218.1
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.0-preview.4.21215.2
+ 6.0.0-preview.5.21217.1
- 6.0.0-preview.4.21215.2
- 6.0.0-preview.4.21215.2
- 6.0.0-preview.4.21215.2
- 6.0.0-preview.4.21215.2
- 6.0.0-preview.4.21215.2
+ 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21217.1
2.1.0
- 6.0.0-preview.5.21215.6
- 6.0.0-preview.5.21215.6
- 6.0.0-preview.5.21215.6
+ 6.0.0-preview.5.21216.1
+ 6.0.0-preview.5.21216.1
+ 6.0.0-preview.5.21216.1
From e0a9819b9ece991665f42c30ee6fa2b9c39dd196 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 18 Apr 2021 15:02:35 +0000
Subject: [PATCH 043/116] Update dependencies from
https://github.com/dotnet/sdk build 20210418.2 (#10247)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21218.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21218.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21218.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21218.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21218.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21218.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bb0074538..8eb31d31b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,25 +13,25 @@
https://github.com/dotnet/windowsdesktop
7a88d8582178134b83ab6c1270132bc6c98092d6
-
+
https://github.com/dotnet/runtime
- 49bce33cc007cf4464d20137fc58f542f7565280
+ ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
-
+
https://github.com/dotnet/runtime
- 49bce33cc007cf4464d20137fc58f542f7565280
+ ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
-
+
https://github.com/dotnet/runtime
- 49bce33cc007cf4464d20137fc58f542f7565280
+ ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
-
+
https://github.com/dotnet/runtime
- 49bce33cc007cf4464d20137fc58f542f7565280
+ ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
-
+
https://github.com/dotnet/runtime
- 49bce33cc007cf4464d20137fc58f542f7565280
+ ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
@@ -39,9 +39,9 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- 49bce33cc007cf4464d20137fc58f542f7565280
+ ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
https://github.com/dotnet/aspnetcore
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
97b9240b5fe740271594d7f65902490af9d5a1eb
-
+
https://github.com/dotnet/sdk
- bffc5670aae31eb85687bef1f3e8657a4b1aa3ae
+ 49fe82d16349bdf6c4c9092787962a163f681c9a
-
+
https://github.com/dotnet/sdk
- bffc5670aae31eb85687bef1f3e8657a4b1aa3ae
+ 49fe82d16349bdf6c4c9092787962a163f681c9a
diff --git a/eng/Versions.props b/eng/Versions.props
index dec8bab59..d6b11f2b6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,23 +57,23 @@
- 6.0.100-preview.4.21218.1
- 6.0.100-preview.4.21218.1
+ 6.0.100-preview.4.21218.2
+ 6.0.100-preview.4.21218.2
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21218.1
- 6.0.0-preview.5.21217.1
- 6.0.0-preview.5.21217.1
- 6.0.0-preview.5.21217.1
- 6.0.0-preview.5.21217.1
- 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21218.1
+ 6.0.0-preview.5.21218.1
+ 6.0.0-preview.5.21218.1
+ 6.0.0-preview.5.21218.1
+ 6.0.0-preview.5.21218.1
2.1.0
From 1d7248c4eff1f27fc3ec09c716be79bef816732e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 18 Apr 2021 15:53:30 +0000
Subject: [PATCH 044/116] Update dependencies from
https://github.com/dotnet/sdk build 20210418.3 (#10248)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21216.1 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21216.1 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21216.1 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21216.1 to 6.0.0-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8eb31d31b..f99d2f7a3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
-
+
https://github.com/dotnet/windowsdesktop
- 7a88d8582178134b83ab6c1270132bc6c98092d6
+ 74858aaf38ff34585a8a09881110d5813e382990
-
+
https://github.com/dotnet/windowsdesktop
- 7a88d8582178134b83ab6c1270132bc6c98092d6
+ 74858aaf38ff34585a8a09881110d5813e382990
-
+
https://github.com/dotnet/windowsdesktop
- 7a88d8582178134b83ab6c1270132bc6c98092d6
+ 74858aaf38ff34585a8a09881110d5813e382990
https://github.com/dotnet/runtime
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
97b9240b5fe740271594d7f65902490af9d5a1eb
-
+
https://github.com/dotnet/sdk
- 49fe82d16349bdf6c4c9092787962a163f681c9a
+ d751afd339b6afaadc951c338ba9c5963687b2b7
-
+
https://github.com/dotnet/sdk
- 49fe82d16349bdf6c4c9092787962a163f681c9a
+ d751afd339b6afaadc951c338ba9c5963687b2b7
diff --git a/eng/Versions.props b/eng/Versions.props
index d6b11f2b6..3d6ce26f6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21218.2
- 6.0.100-preview.4.21218.2
+ 6.0.100-preview.4.21218.3
+ 6.0.100-preview.4.21218.3
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -78,9 +78,9 @@
- 6.0.0-preview.5.21216.1
- 6.0.0-preview.5.21216.1
- 6.0.0-preview.5.21216.1
+ 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21217.1
From e4b1e681b541c88beab8a4b02338888e19833b59 Mon Sep 17 00:00:00 2001
From: Bo Anderson
Date: Mon, 19 Apr 2021 01:37:03 +0100
Subject: [PATCH 045/116] Add macOS RIDs for crossgen2 (#10159)
---
src/redist/targets/GenerateBundledVersions.targets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 4426fb8b3..092ace74b 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -157,7 +157,7 @@
" />
-
+
From 0b639eef4e579b15639f8937d4d459172df6653f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 01:28:56 +0000
Subject: [PATCH 046/116] Update dependencies from
https://github.com/dotnet/sdk build 20210418.4 (#10249)
[main] 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 f99d2f7a3..ddcea539d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
97b9240b5fe740271594d7f65902490af9d5a1eb
-
+
https://github.com/dotnet/sdk
- d751afd339b6afaadc951c338ba9c5963687b2b7
+ 0bc0a94bc68512104e82fd84eb25da506097442c
-
+
https://github.com/dotnet/sdk
- d751afd339b6afaadc951c338ba9c5963687b2b7
+ 0bc0a94bc68512104e82fd84eb25da506097442c
diff --git a/eng/Versions.props b/eng/Versions.props
index 3d6ce26f6..53f990bf7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21218.3
- 6.0.100-preview.4.21218.3
+ 6.0.100-preview.4.21218.4
+ 6.0.100-preview.4.21218.4
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 2455d34cebebfa62772f57be93b2cf99d14dbad2 Mon Sep 17 00:00:00 2001
From: Anton Lapounov
Date: Sun, 18 Apr 2021 19:19:05 -0700
Subject: [PATCH 047/116] Extend the list of RIDs supported by Crossgen2
(#10250)
---
.../targets/GenerateBundledVersions.targets | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 092ace74b..9fc8ae9da 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -157,7 +157,21 @@
" />
-
+
+
+
+
From de385a2aa51b6b04d8faf166fbedabdf219d63a0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 12:05:43 +0000
Subject: [PATCH 048/116] [main] Update dependencies from dotnet/sdk (#10251)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21216.7 to 6.0.100-preview.5.21217.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21216.2 to 6.0.100-preview.2.21217.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ddcea539d..6ac531256 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
cb722862f3d76493dc5047a0c30e3bd5f4391170
-
+
https://github.com/dotnet/templating
- 97b9240b5fe740271594d7f65902490af9d5a1eb
+ 196564aa44f7933770365b68338dc291956bdfb3
-
+
https://github.com/dotnet/sdk
- 0bc0a94bc68512104e82fd84eb25da506097442c
+ 2d9db1b512c22c0419bd798a024cc3499be70314
-
+
https://github.com/dotnet/sdk
- 0bc0a94bc68512104e82fd84eb25da506097442c
+ 2d9db1b512c22c0419bd798a024cc3499be70314
@@ -108,9 +108,9 @@
https://github.com/microsoft/vstest
bdf1629e12c05a5fd17bf7de48e7e50a8f739170
-
+
https://github.com/mono/linker
- cd8bd0d1682eee721f99ac648c346d269b93d46f
+ 0e2e95e9db92cd41f620f96dda84171cbf34fa6c
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index 53f990bf7..ef7c7680e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.5.21216.7
+ 6.0.100-preview.5.21217.1
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21218.4
- 6.0.100-preview.4.21218.4
+ 6.0.100-preview.4.21219.3
+ 6.0.100-preview.4.21219.3
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 28486c492a145e69a9a735aba36848f81c2d4771 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 13:04:27 +0000
Subject: [PATCH 049/116] Update dependencies from
https://github.com/dotnet/sdk build 20210419.4 (#10252)
[main] 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 6ac531256..9b992329b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
196564aa44f7933770365b68338dc291956bdfb3
-
+
https://github.com/dotnet/sdk
- 2d9db1b512c22c0419bd798a024cc3499be70314
+ 641206dffcfe4ada899f8f5e0023b96549fa0179
-
+
https://github.com/dotnet/sdk
- 2d9db1b512c22c0419bd798a024cc3499be70314
+ 641206dffcfe4ada899f8f5e0023b96549fa0179
diff --git a/eng/Versions.props b/eng/Versions.props
index ef7c7680e..0b8d576fe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.4.21219.3
- 6.0.100-preview.4.21219.3
+ 6.0.100-preview.4.21219.4
+ 6.0.100-preview.4.21219.4
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From a51cc90badf71c0f92fd2a52e8ddd76472d71c9b Mon Sep 17 00:00:00 2001
From: Marc Paine
Date: Mon, 19 Apr 2021 10:18:33 -0700
Subject: [PATCH 050/116] 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
From 4225f3f2544c63627de94818538d07539829fef7 Mon Sep 17 00:00:00 2001
From: William Li
Date: Mon, 19 Apr 2021 13:51:21 -0700
Subject: [PATCH 051/116] Update preview 5 in README
---
README.md | 156 +++++++++---------
.../TableGenerator/Program.fs | 6 +-
2 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/README.md b/README.md
index 767103642..702955743 100644
--- a/README.md
+++ b/README.md
@@ -74,20 +74,20 @@ With development builds, internal NuGet feeds are necessary for some scenarios (
Please do not directly edit the table below. Use https://github.com/dotnet/installer/tree/main/tools/sdk-readme-table-generator to help you generate it. Make sure to run the table generator test and make any changes to the generator along with your changes to the table.
-| Platform | main
(6.0.x Runtime) | Release/6.0.1XX-preview3
(6.0.x Runtime) | Release/5.0.3XX
(5.0 Runtime) | Release/5.0.2XX
(5.0 Runtime) | Release/3.1.4XX
(3.1.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) |
+| Platform | main
(6.0.x Runtime) | Release/6.0.1XX-preview4
(6.0.x Runtime) | Release/5.0.3XX
(5.0 Runtime) | Release/5.0.2XX
(5.0 Runtime) | Release/3.1.4XX
(3.1.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) |
| :--------- | :----------: | :----------: | :----------: | :----------: | :----------: | :----------: |
-| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-6.0.1XX-preview3]][win-x64-version-6.0.1XX-preview3]
[Installer][win-x64-installer-6.0.1XX-preview3] - [Checksum][win-x64-installer-checksum-6.0.1XX-preview3]
[zip][win-x64-zip-6.0.1XX-preview3] - [Checksum][win-x64-zip-checksum-6.0.1XX-preview3] | [![][win-x64-badge-5.0.3XX]][win-x64-version-5.0.3XX]
[Installer][win-x64-installer-5.0.3XX] - [Checksum][win-x64-installer-checksum-5.0.3XX]
[zip][win-x64-zip-5.0.3XX] - [Checksum][win-x64-zip-checksum-5.0.3XX] | [![][win-x64-badge-5.0.2XX]][win-x64-version-5.0.2XX]
[Installer][win-x64-installer-5.0.2XX] - [Checksum][win-x64-installer-checksum-5.0.2XX]
[zip][win-x64-zip-5.0.2XX] - [Checksum][win-x64-zip-checksum-5.0.2XX] | [![][win-x64-badge-3.1.4XX]][win-x64-version-3.1.4XX]
[Installer][win-x64-installer-3.1.4XX] - [Checksum][win-x64-installer-checksum-3.1.4XX]
[zip][win-x64-zip-3.1.4XX] - [Checksum][win-x64-zip-checksum-3.1.4XX] | [![][win-x64-badge-3.1.1XX]][win-x64-version-3.1.1XX]
[Installer][win-x64-installer-3.1.1XX] - [Checksum][win-x64-installer-checksum-3.1.1XX]
[zip][win-x64-zip-3.1.1XX] - [Checksum][win-x64-zip-checksum-3.1.1XX] |
-| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-6.0.1XX-preview3]][win-x86-version-6.0.1XX-preview3]
[Installer][win-x86-installer-6.0.1XX-preview3] - [Checksum][win-x86-installer-checksum-6.0.1XX-preview3]
[zip][win-x86-zip-6.0.1XX-preview3] - [Checksum][win-x86-zip-checksum-6.0.1XX-preview3] | [![][win-x86-badge-5.0.3XX]][win-x86-version-5.0.3XX]
[Installer][win-x86-installer-5.0.3XX] - [Checksum][win-x86-installer-checksum-5.0.3XX]
[zip][win-x86-zip-5.0.3XX] - [Checksum][win-x86-zip-checksum-5.0.3XX] | [![][win-x86-badge-5.0.2XX]][win-x86-version-5.0.2XX]
[Installer][win-x86-installer-5.0.2XX] - [Checksum][win-x86-installer-checksum-5.0.2XX]
[zip][win-x86-zip-5.0.2XX] - [Checksum][win-x86-zip-checksum-5.0.2XX] | [![][win-x86-badge-3.1.4XX]][win-x86-version-3.1.4XX]
[Installer][win-x86-installer-3.1.4XX] - [Checksum][win-x86-installer-checksum-3.1.4XX]
[zip][win-x86-zip-3.1.4XX] - [Checksum][win-x86-zip-checksum-3.1.4XX] | [![][win-x86-badge-3.1.1XX]][win-x86-version-3.1.1XX]
[Installer][win-x86-installer-3.1.1XX] - [Checksum][win-x86-installer-checksum-3.1.1XX]
[zip][win-x86-zip-3.1.1XX] - [Checksum][win-x86-zip-checksum-3.1.1XX] |
+| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-6.0.1XX-preview4]][win-x64-version-6.0.1XX-preview4]
[Installer][win-x64-installer-6.0.1XX-preview4] - [Checksum][win-x64-installer-checksum-6.0.1XX-preview4]
[zip][win-x64-zip-6.0.1XX-preview4] - [Checksum][win-x64-zip-checksum-6.0.1XX-preview4] | [![][win-x64-badge-5.0.3XX]][win-x64-version-5.0.3XX]
[Installer][win-x64-installer-5.0.3XX] - [Checksum][win-x64-installer-checksum-5.0.3XX]
[zip][win-x64-zip-5.0.3XX] - [Checksum][win-x64-zip-checksum-5.0.3XX] | [![][win-x64-badge-5.0.2XX]][win-x64-version-5.0.2XX]
[Installer][win-x64-installer-5.0.2XX] - [Checksum][win-x64-installer-checksum-5.0.2XX]
[zip][win-x64-zip-5.0.2XX] - [Checksum][win-x64-zip-checksum-5.0.2XX] | [![][win-x64-badge-3.1.4XX]][win-x64-version-3.1.4XX]
[Installer][win-x64-installer-3.1.4XX] - [Checksum][win-x64-installer-checksum-3.1.4XX]
[zip][win-x64-zip-3.1.4XX] - [Checksum][win-x64-zip-checksum-3.1.4XX] | [![][win-x64-badge-3.1.1XX]][win-x64-version-3.1.1XX]
[Installer][win-x64-installer-3.1.1XX] - [Checksum][win-x64-installer-checksum-3.1.1XX]
[zip][win-x64-zip-3.1.1XX] - [Checksum][win-x64-zip-checksum-3.1.1XX] |
+| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-6.0.1XX-preview4]][win-x86-version-6.0.1XX-preview4]
[Installer][win-x86-installer-6.0.1XX-preview4] - [Checksum][win-x86-installer-checksum-6.0.1XX-preview4]
[zip][win-x86-zip-6.0.1XX-preview4] - [Checksum][win-x86-zip-checksum-6.0.1XX-preview4] | [![][win-x86-badge-5.0.3XX]][win-x86-version-5.0.3XX]
[Installer][win-x86-installer-5.0.3XX] - [Checksum][win-x86-installer-checksum-5.0.3XX]
[zip][win-x86-zip-5.0.3XX] - [Checksum][win-x86-zip-checksum-5.0.3XX] | [![][win-x86-badge-5.0.2XX]][win-x86-version-5.0.2XX]
[Installer][win-x86-installer-5.0.2XX] - [Checksum][win-x86-installer-checksum-5.0.2XX]
[zip][win-x86-zip-5.0.2XX] - [Checksum][win-x86-zip-checksum-5.0.2XX] | [![][win-x86-badge-3.1.4XX]][win-x86-version-3.1.4XX]
[Installer][win-x86-installer-3.1.4XX] - [Checksum][win-x86-installer-checksum-3.1.4XX]
[zip][win-x86-zip-3.1.4XX] - [Checksum][win-x86-zip-checksum-3.1.4XX] | [![][win-x86-badge-3.1.1XX]][win-x86-version-3.1.1XX]
[Installer][win-x86-installer-3.1.1XX] - [Checksum][win-x86-installer-checksum-3.1.1XX]
[zip][win-x86-zip-3.1.1XX] - [Checksum][win-x86-zip-checksum-3.1.1XX] |
| **Windows arm** | **N/A** | **N/A** | **N/A** | **N/A** | [![][win-arm-badge-3.1.4XX]][win-arm-version-3.1.4XX]
[zip][win-arm-zip-3.1.4XX] - [Checksum][win-arm-zip-checksum-3.1.4XX] | [![][win-arm-badge-3.1.1XX]][win-arm-version-3.1.1XX]
[zip][win-arm-zip-3.1.1XX] - [Checksum][win-arm-zip-checksum-3.1.1XX] |
-| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-6.0.1XX-preview3]][win-arm64-version-6.0.1XX-preview3]
[Installer][win-arm64-installer-6.0.1XX-preview3] - [Checksum][win-arm64-installer-checksum-6.0.1XX-preview3]
[zip][win-arm64-zip-6.0.1XX-preview3] | [![][win-arm64-badge-5.0.3XX]][win-arm64-version-5.0.3XX]
[Installer][win-arm64-installer-5.0.3XX] - [Checksum][win-arm64-installer-checksum-5.0.3XX]
[zip][win-arm64-zip-5.0.3XX] | [![][win-arm64-badge-5.0.2XX]][win-arm64-version-5.0.2XX]
[Installer][win-arm64-installer-5.0.2XX] - [Checksum][win-arm64-installer-checksum-5.0.2XX]
[zip][win-arm64-zip-5.0.2XX] | **N/A** | **N/A** |
-| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-6.0.1XX-preview3]][osx-x64-version-6.0.1XX-preview3]
[Installer][osx-x64-installer-6.0.1XX-preview3] - [Checksum][osx-x64-installer-checksum-6.0.1XX-preview3]
[tar.gz][osx-x64-targz-6.0.1XX-preview3] - [Checksum][osx-x64-targz-checksum-6.0.1XX-preview3] | [![][osx-x64-badge-5.0.3XX]][osx-x64-version-5.0.3XX]
[Installer][osx-x64-installer-5.0.3XX] - [Checksum][osx-x64-installer-checksum-5.0.3XX]
[tar.gz][osx-x64-targz-5.0.3XX] - [Checksum][osx-x64-targz-checksum-5.0.3XX] | [![][osx-x64-badge-5.0.2XX]][osx-x64-version-5.0.2XX]
[Installer][osx-x64-installer-5.0.2XX] - [Checksum][osx-x64-installer-checksum-5.0.2XX]
[tar.gz][osx-x64-targz-5.0.2XX] - [Checksum][osx-x64-targz-checksum-5.0.2XX] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]
[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]
[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] | [![][osx-x64-badge-3.1.1XX]][osx-x64-version-3.1.1XX]
[Installer][osx-x64-installer-3.1.1XX] - [Checksum][osx-x64-installer-checksum-3.1.1XX]
[tar.gz][osx-x64-targz-3.1.1XX] - [Checksum][osx-x64-targz-checksum-3.1.1XX] |
-| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-6.0.1XX-preview3]][osx-arm64-version-6.0.1XX-preview3]
[Installer][osx-arm64-installer-6.0.1XX-preview3] - [Checksum][osx-arm64-installer-checksum-6.0.1XX-preview3]
[tar.gz][osx-arm64-targz-6.0.1XX-preview3] - [Checksum][osx-arm64-targz-checksum-6.0.1XX-preview3] | **N/A** | **N/A** | **N/A** | **N/A** |
-| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-6.0.1XX-preview3]][linux-version-6.0.1XX-preview3]
[DEB Installer][linux-DEB-installer-6.0.1XX-preview3] - [Checksum][linux-DEB-installer-checksum-6.0.1XX-preview3]
[RPM Installer][linux-RPM-installer-6.0.1XX-preview3] - [Checksum][linux-RPM-installer-checksum-6.0.1XX-preview3]
_see installer note below_1
[tar.gz][linux-targz-6.0.1XX-preview3] - [Checksum][linux-targz-checksum-6.0.1XX-preview3] | [![][linux-badge-5.0.3XX]][linux-version-5.0.3XX]
[DEB Installer][linux-DEB-installer-5.0.3XX] - [Checksum][linux-DEB-installer-checksum-5.0.3XX]
[RPM Installer][linux-RPM-installer-5.0.3XX] - [Checksum][linux-RPM-installer-checksum-5.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.3XX] - [Checksum][linux-targz-checksum-5.0.3XX] | [![][linux-badge-5.0.2XX]][linux-version-5.0.2XX]
[DEB Installer][linux-DEB-installer-5.0.2XX] - [Checksum][linux-DEB-installer-checksum-5.0.2XX]
[RPM Installer][linux-RPM-installer-5.0.2XX] - [Checksum][linux-RPM-installer-checksum-5.0.2XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.2XX] - [Checksum][linux-targz-checksum-5.0.2XX] | [![][linux-badge-3.1.4XX]][linux-version-3.1.4XX]
[DEB Installer][linux-DEB-installer-3.1.4XX] - [Checksum][linux-DEB-installer-checksum-3.1.4XX]
[RPM Installer][linux-RPM-installer-3.1.4XX] - [Checksum][linux-RPM-installer-checksum-3.1.4XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.4XX] - [Checksum][linux-targz-checksum-3.1.4XX] | [![][linux-badge-3.1.1XX]][linux-version-3.1.1XX]
[DEB Installer][linux-DEB-installer-3.1.1XX] - [Checksum][linux-DEB-installer-checksum-3.1.1XX]
[RPM Installer][linux-RPM-installer-3.1.1XX] - [Checksum][linux-RPM-installer-checksum-3.1.1XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.1XX] - [Checksum][linux-targz-checksum-3.1.1XX] |
-| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-6.0.1XX-preview3]][linux-arm-version-6.0.1XX-preview3]
[tar.gz][linux-arm-targz-6.0.1XX-preview3] - [Checksum][linux-arm-targz-checksum-6.0.1XX-preview3] | [![][linux-arm-badge-5.0.3XX]][linux-arm-version-5.0.3XX]
[tar.gz][linux-arm-targz-5.0.3XX] - [Checksum][linux-arm-targz-checksum-5.0.3XX] | [![][linux-arm-badge-5.0.2XX]][linux-arm-version-5.0.2XX]
[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]
[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] | [![][linux-arm-badge-3.1.1XX]][linux-arm-version-3.1.1XX]
[tar.gz][linux-arm-targz-3.1.1XX] - [Checksum][linux-arm-targz-checksum-3.1.1XX] |
-| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-6.0.1XX-preview3]][linux-arm64-version-6.0.1XX-preview3]
[tar.gz][linux-arm64-targz-6.0.1XX-preview3] - [Checksum][linux-arm64-targz-checksum-6.0.1XX-preview3] | [![][linux-arm64-badge-5.0.3XX]][linux-arm64-version-5.0.3XX]
[tar.gz][linux-arm64-targz-5.0.3XX] - [Checksum][linux-arm64-targz-checksum-5.0.3XX] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]
[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]
[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] | [![][linux-arm64-badge-3.1.1XX]][linux-arm64-version-3.1.1XX]
[tar.gz][linux-arm64-targz-3.1.1XX] - [Checksum][linux-arm64-targz-checksum-3.1.1XX] |
-| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-6.0.1XX-preview3]][linux-musl-x64-version-6.0.1XX-preview3]
[tar.gz][linux-musl-x64-targz-6.0.1XX-preview3] - [Checksum][linux-musl-x64-targz-checksum-6.0.1XX-preview3] | [![][linux-musl-x64-badge-5.0.3XX]][linux-musl-x64-version-5.0.3XX]
[tar.gz][linux-musl-x64-targz-5.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.3XX] | [![][linux-musl-x64-badge-5.0.2XX]][linux-musl-x64-version-5.0.2XX]
[tar.gz][linux-musl-x64-targz-5.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.2XX] | [![][linux-musl-x64-badge-3.1.4XX]][linux-musl-x64-version-3.1.4XX]
[tar.gz][linux-musl-x64-targz-3.1.4XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.4XX] | [![][linux-musl-x64-badge-3.1.1XX]][linux-musl-x64-version-3.1.1XX]
[tar.gz][linux-musl-x64-targz-3.1.1XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.1XX] |
-| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-6.0.1XX-preview3]][linux-musl-arm-version-6.0.1XX-preview3]
[tar.gz][linux-musl-arm-targz-6.0.1XX-preview3] - [Checksum][linux-musl-arm-targz-checksum-6.0.1XX-preview3] | [![][linux-musl-arm-badge-5.0.3XX]][linux-musl-arm-version-5.0.3XX]
[tar.gz][linux-musl-arm-targz-5.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.3XX] | [![][linux-musl-arm-badge-5.0.2XX]][linux-musl-arm-version-5.0.2XX]
[tar.gz][linux-musl-arm-targz-5.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.2XX] | **N/A** | **N/A** |
-| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-6.0.1XX-preview3]][linux-musl-arm64-version-6.0.1XX-preview3]
[tar.gz][linux-musl-arm64-targz-6.0.1XX-preview3] - [Checksum][linux-musl-arm64-targz-checksum-6.0.1XX-preview3] | [![][linux-musl-arm64-badge-5.0.3XX]][linux-musl-arm64-version-5.0.3XX]
[tar.gz][linux-musl-arm64-targz-5.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.3XX] | [![][linux-musl-arm64-badge-5.0.2XX]][linux-musl-arm64-version-5.0.2XX]
[tar.gz][linux-musl-arm64-targz-5.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.2XX] | **N/A** | **N/A** |
+| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-6.0.1XX-preview4]][win-arm64-version-6.0.1XX-preview4]
[Installer][win-arm64-installer-6.0.1XX-preview4] - [Checksum][win-arm64-installer-checksum-6.0.1XX-preview4]
[zip][win-arm64-zip-6.0.1XX-preview4] | [![][win-arm64-badge-5.0.3XX]][win-arm64-version-5.0.3XX]
[Installer][win-arm64-installer-5.0.3XX] - [Checksum][win-arm64-installer-checksum-5.0.3XX]
[zip][win-arm64-zip-5.0.3XX] | [![][win-arm64-badge-5.0.2XX]][win-arm64-version-5.0.2XX]
[Installer][win-arm64-installer-5.0.2XX] - [Checksum][win-arm64-installer-checksum-5.0.2XX]
[zip][win-arm64-zip-5.0.2XX] | **N/A** | **N/A** |
+| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-6.0.1XX-preview4]][osx-x64-version-6.0.1XX-preview4]
[Installer][osx-x64-installer-6.0.1XX-preview4] - [Checksum][osx-x64-installer-checksum-6.0.1XX-preview4]
[tar.gz][osx-x64-targz-6.0.1XX-preview4] - [Checksum][osx-x64-targz-checksum-6.0.1XX-preview4] | [![][osx-x64-badge-5.0.3XX]][osx-x64-version-5.0.3XX]
[Installer][osx-x64-installer-5.0.3XX] - [Checksum][osx-x64-installer-checksum-5.0.3XX]
[tar.gz][osx-x64-targz-5.0.3XX] - [Checksum][osx-x64-targz-checksum-5.0.3XX] | [![][osx-x64-badge-5.0.2XX]][osx-x64-version-5.0.2XX]
[Installer][osx-x64-installer-5.0.2XX] - [Checksum][osx-x64-installer-checksum-5.0.2XX]
[tar.gz][osx-x64-targz-5.0.2XX] - [Checksum][osx-x64-targz-checksum-5.0.2XX] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]
[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]
[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] | [![][osx-x64-badge-3.1.1XX]][osx-x64-version-3.1.1XX]
[Installer][osx-x64-installer-3.1.1XX] - [Checksum][osx-x64-installer-checksum-3.1.1XX]
[tar.gz][osx-x64-targz-3.1.1XX] - [Checksum][osx-x64-targz-checksum-3.1.1XX] |
+| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-6.0.1XX-preview4]][osx-arm64-version-6.0.1XX-preview4]
[Installer][osx-arm64-installer-6.0.1XX-preview4] - [Checksum][osx-arm64-installer-checksum-6.0.1XX-preview4]
[tar.gz][osx-arm64-targz-6.0.1XX-preview4] - [Checksum][osx-arm64-targz-checksum-6.0.1XX-preview4] | **N/A** | **N/A** | **N/A** | **N/A** |
+| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-6.0.1XX-preview4]][linux-version-6.0.1XX-preview4]
[DEB Installer][linux-DEB-installer-6.0.1XX-preview4] - [Checksum][linux-DEB-installer-checksum-6.0.1XX-preview4]
[RPM Installer][linux-RPM-installer-6.0.1XX-preview4] - [Checksum][linux-RPM-installer-checksum-6.0.1XX-preview4]
_see installer note below_1
[tar.gz][linux-targz-6.0.1XX-preview4] - [Checksum][linux-targz-checksum-6.0.1XX-preview4] | [![][linux-badge-5.0.3XX]][linux-version-5.0.3XX]
[DEB Installer][linux-DEB-installer-5.0.3XX] - [Checksum][linux-DEB-installer-checksum-5.0.3XX]
[RPM Installer][linux-RPM-installer-5.0.3XX] - [Checksum][linux-RPM-installer-checksum-5.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.3XX] - [Checksum][linux-targz-checksum-5.0.3XX] | [![][linux-badge-5.0.2XX]][linux-version-5.0.2XX]
[DEB Installer][linux-DEB-installer-5.0.2XX] - [Checksum][linux-DEB-installer-checksum-5.0.2XX]
[RPM Installer][linux-RPM-installer-5.0.2XX] - [Checksum][linux-RPM-installer-checksum-5.0.2XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.2XX] - [Checksum][linux-targz-checksum-5.0.2XX] | [![][linux-badge-3.1.4XX]][linux-version-3.1.4XX]
[DEB Installer][linux-DEB-installer-3.1.4XX] - [Checksum][linux-DEB-installer-checksum-3.1.4XX]
[RPM Installer][linux-RPM-installer-3.1.4XX] - [Checksum][linux-RPM-installer-checksum-3.1.4XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.4XX] - [Checksum][linux-targz-checksum-3.1.4XX] | [![][linux-badge-3.1.1XX]][linux-version-3.1.1XX]
[DEB Installer][linux-DEB-installer-3.1.1XX] - [Checksum][linux-DEB-installer-checksum-3.1.1XX]
[RPM Installer][linux-RPM-installer-3.1.1XX] - [Checksum][linux-RPM-installer-checksum-3.1.1XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.1XX] - [Checksum][linux-targz-checksum-3.1.1XX] |
+| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-6.0.1XX-preview4]][linux-arm-version-6.0.1XX-preview4]
[tar.gz][linux-arm-targz-6.0.1XX-preview4] - [Checksum][linux-arm-targz-checksum-6.0.1XX-preview4] | [![][linux-arm-badge-5.0.3XX]][linux-arm-version-5.0.3XX]
[tar.gz][linux-arm-targz-5.0.3XX] - [Checksum][linux-arm-targz-checksum-5.0.3XX] | [![][linux-arm-badge-5.0.2XX]][linux-arm-version-5.0.2XX]
[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]
[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] | [![][linux-arm-badge-3.1.1XX]][linux-arm-version-3.1.1XX]
[tar.gz][linux-arm-targz-3.1.1XX] - [Checksum][linux-arm-targz-checksum-3.1.1XX] |
+| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-6.0.1XX-preview4]][linux-arm64-version-6.0.1XX-preview4]
[tar.gz][linux-arm64-targz-6.0.1XX-preview4] - [Checksum][linux-arm64-targz-checksum-6.0.1XX-preview4] | [![][linux-arm64-badge-5.0.3XX]][linux-arm64-version-5.0.3XX]
[tar.gz][linux-arm64-targz-5.0.3XX] - [Checksum][linux-arm64-targz-checksum-5.0.3XX] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]
[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]
[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] | [![][linux-arm64-badge-3.1.1XX]][linux-arm64-version-3.1.1XX]
[tar.gz][linux-arm64-targz-3.1.1XX] - [Checksum][linux-arm64-targz-checksum-3.1.1XX] |
+| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-6.0.1XX-preview4]][linux-musl-x64-version-6.0.1XX-preview4]
[tar.gz][linux-musl-x64-targz-6.0.1XX-preview4] - [Checksum][linux-musl-x64-targz-checksum-6.0.1XX-preview4] | [![][linux-musl-x64-badge-5.0.3XX]][linux-musl-x64-version-5.0.3XX]
[tar.gz][linux-musl-x64-targz-5.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.3XX] | [![][linux-musl-x64-badge-5.0.2XX]][linux-musl-x64-version-5.0.2XX]
[tar.gz][linux-musl-x64-targz-5.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.2XX] | [![][linux-musl-x64-badge-3.1.4XX]][linux-musl-x64-version-3.1.4XX]
[tar.gz][linux-musl-x64-targz-3.1.4XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.4XX] | [![][linux-musl-x64-badge-3.1.1XX]][linux-musl-x64-version-3.1.1XX]
[tar.gz][linux-musl-x64-targz-3.1.1XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.1XX] |
+| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-6.0.1XX-preview4]][linux-musl-arm-version-6.0.1XX-preview4]
[tar.gz][linux-musl-arm-targz-6.0.1XX-preview4] - [Checksum][linux-musl-arm-targz-checksum-6.0.1XX-preview4] | [![][linux-musl-arm-badge-5.0.3XX]][linux-musl-arm-version-5.0.3XX]
[tar.gz][linux-musl-arm-targz-5.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.3XX] | [![][linux-musl-arm-badge-5.0.2XX]][linux-musl-arm-version-5.0.2XX]
[tar.gz][linux-musl-arm-targz-5.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.2XX] | **N/A** | **N/A** |
+| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-6.0.1XX-preview4]][linux-musl-arm64-version-6.0.1XX-preview4]
[tar.gz][linux-musl-arm64-targz-6.0.1XX-preview4] - [Checksum][linux-musl-arm64-targz-checksum-6.0.1XX-preview4] | [![][linux-musl-arm64-badge-5.0.3XX]][linux-musl-arm64-version-5.0.3XX]
[tar.gz][linux-musl-arm64-targz-5.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.3XX] | [![][linux-musl-arm64-badge-5.0.2XX]][linux-musl-arm64-version-5.0.2XX]
[tar.gz][linux-musl-arm64-targz-5.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.2XX] | **N/A** | **N/A** |
| **RHEL 6** | **N/A** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]
[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] | [![][rhel-6-badge-3.1.1XX]][rhel-6-version-3.1.1XX]
[tar.gz][rhel-6-targz-3.1.1XX] - [Checksum][rhel-6-targz-checksum-3.1.1XX] |
Reference notes:
@@ -104,12 +104,12 @@ Reference notes:
[win-x64-zip-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-x64.zip
[win-x64-zip-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-x64.zip.sha
-[win-x64-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/win_x64_Release_version_badge.svg
-[win-x64-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-win-x64.txt
-[win-x64-installer-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-x64.exe
-[win-x64-installer-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-x64.exe.sha
-[win-x64-zip-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-x64.zip
-[win-x64-zip-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-x64.zip.sha
+[win-x64-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/win_x64_Release_version_badge.svg
+[win-x64-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-win-x64.txt
+[win-x64-installer-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-x64.exe
+[win-x64-installer-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-x64.exe.sha
+[win-x64-zip-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-x64.zip
+[win-x64-zip-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-x64.zip.sha
[win-x64-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/win_x64_Release_version_badge.svg
[win-x64-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-win-x64.txt
@@ -146,12 +146,12 @@ Reference notes:
[win-x86-zip-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-x86.zip
[win-x86-zip-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-x86.zip.sha
-[win-x86-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/win_x86_Release_version_badge.svg
-[win-x86-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-win-x86.txt
-[win-x86-installer-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-x86.exe
-[win-x86-installer-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-x86.exe.sha
-[win-x86-zip-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-x86.zip
-[win-x86-zip-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-x86.zip.sha
+[win-x86-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/win_x86_Release_version_badge.svg
+[win-x86-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-win-x86.txt
+[win-x86-installer-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-x86.exe
+[win-x86-installer-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-x86.exe.sha
+[win-x86-zip-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-x86.zip
+[win-x86-zip-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-x86.zip.sha
[win-x86-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/win_x86_Release_version_badge.svg
[win-x86-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-win-x86.txt
@@ -188,12 +188,12 @@ Reference notes:
[osx-x64-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-osx-x64.tar.gz
[osx-x64-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha
-[osx-x64-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/osx_x64_Release_version_badge.svg
-[osx-x64-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-osx-x64.txt
-[osx-x64-installer-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-osx-x64.pkg
-[osx-x64-installer-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-osx-x64.pkg.sha
-[osx-x64-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-osx-x64.tar.gz
-[osx-x64-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha
+[osx-x64-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/osx_x64_Release_version_badge.svg
+[osx-x64-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-osx-x64.txt
+[osx-x64-installer-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-osx-x64.pkg
+[osx-x64-installer-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-osx-x64.pkg.sha
+[osx-x64-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-osx-x64.tar.gz
+[osx-x64-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha
[osx-x64-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/osx_x64_Release_version_badge.svg
[osx-x64-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-osx-x64.txt
@@ -230,12 +230,12 @@ Reference notes:
[osx-arm64-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-osx-arm64.tar.gz
[osx-arm64-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha
-[osx-arm64-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/osx_arm64_Release_version_badge.svg
-[osx-arm64-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-osx-arm64.txt
-[osx-arm64-installer-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-osx-arm64.pkg
-[osx-arm64-installer-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-osx-arm64.pkg.sha
-[osx-arm64-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-osx-arm64.tar.gz
-[osx-arm64-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha
+[osx-arm64-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/osx_arm64_Release_version_badge.svg
+[osx-arm64-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-osx-arm64.txt
+[osx-arm64-installer-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-osx-arm64.pkg
+[osx-arm64-installer-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-osx-arm64.pkg.sha
+[osx-arm64-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-osx-arm64.tar.gz
+[osx-arm64-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha
[linux-badge-main]: https://aka.ms/dotnet/6.0/daily/linux_x64_Release_version_badge.svg
[linux-version-main]: https://aka.ms/dotnet/6.0/daily/productCommit-linux-x64.txt
@@ -246,14 +246,14 @@ Reference notes:
[linux-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-x64.tar.gz
[linux-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-x64.tar.gz.sha
-[linux-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/linux_x64_Release_version_badge.svg
-[linux-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-linux-x64.txt
-[linux-DEB-installer-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-x64.deb
-[linux-DEB-installer-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-x64.deb.sha
-[linux-RPM-installer-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-x64.rpm
-[linux-RPM-installer-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-x64.rpm.sha
-[linux-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-x64.tar.gz
-[linux-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-x64.tar.gz.sha
+[linux-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/linux_x64_Release_version_badge.svg
+[linux-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-linux-x64.txt
+[linux-DEB-installer-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-x64.deb
+[linux-DEB-installer-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-x64.deb.sha
+[linux-RPM-installer-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-x64.rpm
+[linux-RPM-installer-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-x64.rpm.sha
+[linux-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-x64.tar.gz
+[linux-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-x64.tar.gz.sha
[linux-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/linux_x64_Release_version_badge.svg
[linux-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-linux-x64.txt
@@ -296,10 +296,10 @@ Reference notes:
[linux-arm-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-arm.tar.gz
[linux-arm-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-arm.tar.gz.sha
-[linux-arm-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/linux_arm_Release_version_badge.svg
-[linux-arm-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-linux-arm.txt
-[linux-arm-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-arm.tar.gz
-[linux-arm-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-arm.tar.gz.sha
+[linux-arm-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/linux_arm_Release_version_badge.svg
+[linux-arm-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-linux-arm.txt
+[linux-arm-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-arm.tar.gz
+[linux-arm-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-arm.tar.gz.sha
[linux-arm-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/linux_arm_Release_version_badge.svg
[linux-arm-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-linux-arm.txt
@@ -326,10 +326,10 @@ Reference notes:
[linux-arm64-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-arm64.tar.gz
[linux-arm64-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-arm64.tar.gz.sha
-[linux-arm64-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/linux_arm64_Release_version_badge.svg
-[linux-arm64-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-linux-arm64.txt
-[linux-arm64-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-arm64.tar.gz
-[linux-arm64-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-arm64.tar.gz.sha
+[linux-arm64-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/linux_arm64_Release_version_badge.svg
+[linux-arm64-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-linux-arm64.txt
+[linux-arm64-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-arm64.tar.gz
+[linux-arm64-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-arm64.tar.gz.sha
[linux-arm64-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/linux_arm64_Release_version_badge.svg
[linux-arm64-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-linux-arm64.txt
@@ -356,10 +356,10 @@ Reference notes:
[rhel-6-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-rhel.6-x64.tar.gz
[rhel-6-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha
-[rhel-6-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/rhel.6_x64_Release_version_badge.svg
-[rhel-6-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-rhel.6-x64.txt
-[rhel-6-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-rhel.6-x64.tar.gz
-[rhel-6-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha
+[rhel-6-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/rhel.6_x64_Release_version_badge.svg
+[rhel-6-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-rhel.6-x64.txt
+[rhel-6-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-rhel.6-x64.tar.gz
+[rhel-6-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha
[rhel-6-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/rhel.6_x64_Release_version_badge.svg
[rhel-6-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-rhel.6-x64.txt
@@ -386,10 +386,10 @@ Reference notes:
[linux-musl-x64-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-musl-x64.tar.gz
[linux-musl-x64-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha
-[linux-musl-x64-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/linux_musl_x64_Release_version_badge.svg
-[linux-musl-x64-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-linux-musl-x64.txt
-[linux-musl-x64-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-musl-x64.tar.gz
-[linux-musl-x64-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha
+[linux-musl-x64-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/linux_musl_x64_Release_version_badge.svg
+[linux-musl-x64-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-linux-musl-x64.txt
+[linux-musl-x64-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-musl-x64.tar.gz
+[linux-musl-x64-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha
[linux-musl-x64-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/linux_musl_x64_Release_version_badge.svg
[linux-musl-x64-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-linux-musl-x64.txt
@@ -416,10 +416,10 @@ Reference notes:
[linux-musl-arm-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-musl-arm.tar.gz
[linux-musl-arm-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha
-[linux-musl-arm-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/linux_musl_arm_Release_version_badge.svg
-[linux-musl-arm-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-linux-musl-arm.txt
-[linux-musl-arm-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-musl-arm.tar.gz
-[linux-musl-arm-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha
+[linux-musl-arm-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/linux_musl_arm_Release_version_badge.svg
+[linux-musl-arm-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-linux-musl-arm.txt
+[linux-musl-arm-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-musl-arm.tar.gz
+[linux-musl-arm-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha
[linux-musl-arm-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/linux_musl_arm_Release_version_badge.svg
[linux-musl-arm-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-linux-musl-arm.txt
@@ -436,10 +436,10 @@ Reference notes:
[linux-musl-arm64-targz-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-musl-arm64.tar.gz
[linux-musl-arm64-targz-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha
-[linux-musl-arm64-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/linux_musl_arm64_Release_version_badge.svg
-[linux-musl-arm64-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-linux-musl-arm64.txt
-[linux-musl-arm64-targz-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-musl-arm64.tar.gz
-[linux-musl-arm64-targz-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha
+[linux-musl-arm64-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/linux_musl_arm64_Release_version_badge.svg
+[linux-musl-arm64-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-linux-musl-arm64.txt
+[linux-musl-arm64-targz-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-musl-arm64.tar.gz
+[linux-musl-arm64-targz-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha
[linux-musl-arm64-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/linux_musl_arm64_Release_version_badge.svg
[linux-musl-arm64-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-linux-musl-arm64.txt
@@ -456,10 +456,10 @@ Reference notes:
[win-arm-zip-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-arm.zip
[win-arm-zip-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-arm.zip.sha
-[win-arm-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/win_arm_Release_version_badge.svg
-[win-arm-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-win-arm.txt
-[win-arm-zip-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-arm.zip
-[win-arm-zip-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-arm.zip.sha
+[win-arm-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/win_arm_Release_version_badge.svg
+[win-arm-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-win-arm.txt
+[win-arm-zip-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-arm.zip
+[win-arm-zip-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-arm.zip.sha
[win-arm-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/win_arm_Release_version_badge.svg
[win-arm-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-win-arm.txt
@@ -488,12 +488,12 @@ Reference notes:
[win-arm64-zip-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-arm64.zip
[win-arm64-zip-checksum-main]: https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-arm64.zip.sha
-[win-arm64-badge-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/win_arm64_Release_version_badge.svg
-[win-arm64-version-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/productCommit-win-arm64.txt
-[win-arm64-installer-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-arm64.exe
-[win-arm64-installer-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-arm64.exe.sha
-[win-arm64-zip-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-arm64.zip
-[win-arm64-zip-checksum-6.0.1XX-preview3]: https://aka.ms/dotnet/6.0.1XX-preview3/daily/dotnet-sdk-win-arm64.zip.sha
+[win-arm64-badge-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/win_arm64_Release_version_badge.svg
+[win-arm64-version-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/productCommit-win-arm64.txt
+[win-arm64-installer-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-arm64.exe
+[win-arm64-installer-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-arm64.exe.sha
+[win-arm64-zip-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-arm64.zip
+[win-arm64-zip-checksum-6.0.1XX-preview4]: https://aka.ms/dotnet/6.0.1XX-preview4/daily/dotnet-sdk-win-arm64.zip.sha
[win-arm64-badge-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/win_arm64_Release_version_badge.svg
[win-arm64-version-5.0.3XX]: https://aka.ms/dotnet/5.0.3xx/daily/productCommit-win-arm64.txt
diff --git a/tools/sdk-readme-table-generator/TableGenerator/Program.fs b/tools/sdk-readme-table-generator/TableGenerator/Program.fs
index e7167caf1..6e53fbb6a 100644
--- a/tools/sdk-readme-table-generator/TableGenerator/Program.fs
+++ b/tools/sdk-readme-table-generator/TableGenerator/Program.fs
@@ -9,9 +9,9 @@ let inputBranches =
[ { GitBranchName = "main"
DisplayName = "main
(6.0.x Runtime)"
AkaMsChannel = Some("6.0/daily") }
- { GitBranchName = "release/6.0.1xx-preview3"
- DisplayName = "Release/6.0.1XX-preview3
(6.0.x Runtime)"
- AkaMsChannel = Some("6.0.1XX-preview3/daily") }
+ { GitBranchName = "release/6.0.1xx-preview4"
+ DisplayName = "Release/6.0.1XX-preview4
(6.0.x Runtime)"
+ AkaMsChannel = Some("6.0.1XX-preview4/daily") }
{ GitBranchName = "release/5.0.3xx"
DisplayName = "Release/5.0.3XX
(5.0 Runtime)"
AkaMsChannel = Some("5.0.3xx/daily") }
From 1bf5d58cb3fb10196990558ed965c040267bad6e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:50:35 +0000
Subject: [PATCH 052/116] [main] Update dependencies from dotnet/sdk (#10253)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21217.2 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21217.2 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21217.2 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21217.2 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21217.2 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21217.2 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- Microsoft.FSharp.Compiler: from 11.4.2-beta.21214.1 to 11.4.2-beta.21218.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21217.1 to 6.0.100-preview.2.21219.1 (parent: Microsoft.NET.Sdk)
- Microsoft.Build: from 16.10.0-preview-21205-05 to 16.10.0-preview-21215-05 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 44 ++++++++++++++++++++---------------------
eng/Versions.props | 16 +++++++--------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9b992329b..cd3706236 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
-
+
https://github.com/dotnet/aspnetcore
- 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
+ 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
-
+
https://github.com/dotnet/aspnetcore
- 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
+ 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
-
+
https://github.com/dotnet/aspnetcore
- 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
+ 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
-
+
https://github.com/dotnet/aspnetcore
- 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
+ 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
-
+
https://github.com/dotnet/aspnetcore
- 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
+ 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
-
+
https://github.com/dotnet/aspnetcore
- 61cdc605a8a5ad8af7189ebb21b4a996bc77833d
+ 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
196564aa44f7933770365b68338dc291956bdfb3
-
+
https://github.com/dotnet/sdk
- 641206dffcfe4ada899f8f5e0023b96549fa0179
+ a7d057c66848985dc82092c375962e55d20fede7
-
+
https://github.com/dotnet/sdk
- 641206dffcfe4ada899f8f5e0023b96549fa0179
+ a7d057c66848985dc82092c375962e55d20fede7
@@ -100,26 +100,26 @@
https://github.com/dotnet/wpf
6d23db9bc4cf4af023c8f9fccc87ae566b2d4e6a
-
+
https://github.com/dotnet/fsharp
- 8b1d616a7464314af09b30ad413a3d41a060eb16
+ 9df868cff114636ef4082f0a6c3dd750e990b20d
https://github.com/microsoft/vstest
bdf1629e12c05a5fd17bf7de48e7e50a8f739170
-
+
https://github.com/mono/linker
- 0e2e95e9db92cd41f620f96dda84171cbf34fa6c
+ 76bcd90110b1c4d65a53b99761ac00e0f6b06b21
linker
https://github.com/dotnet/roslyn
9bfe989ad46e3f457d33ed800c3be012cec5afc6
-
+
https://github.com/dotnet/msbuild
- 7804350cd4fe271bee48b3dc99e9f4681ee686c5
+ 369631b4b21ef485f4d6f35e16b0c839a971b0e9
https://github.com/nuget/nuget.client
diff --git a/eng/Versions.props b/eng/Versions.props
index 0b8d576fe..cacc11f5f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21217.2
- 6.0.0-preview.5.21217.2
- 6.0.0-preview.5.21217.2
- 6.0.0-preview.5.21217.2
- 6.0.0-preview.5.21217.2
- 6.0.0-preview.5.21217.2
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
0.2.0
- 6.0.100-preview.4.21219.4
- 6.0.100-preview.4.21219.4
+ 6.0.100-preview.5.21219.19
+ 6.0.100-preview.5.21219.19
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 099f2f752f89d0e5eb07d44c4da3d51c0a533a8b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 03:35:07 +0000
Subject: [PATCH 053/116] Update dependencies from
https://github.com/dotnet/sdk build 20210419.20 (#10258)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21219.13 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21219.13 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21219.13 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21219.13 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21219.13 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21219.13 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cd3706236..697fe2985 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
-
+
https://github.com/dotnet/aspnetcore
- 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
+ fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
-
+
https://github.com/dotnet/aspnetcore
- 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
+ fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
-
+
https://github.com/dotnet/aspnetcore
- 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
+ fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
-
+
https://github.com/dotnet/aspnetcore
- 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
+ fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
-
+
https://github.com/dotnet/aspnetcore
- 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
+ fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
-
+
https://github.com/dotnet/aspnetcore
- 8d8deb71082080d2e674d3d60dab04e9ea11c2bd
+ fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
196564aa44f7933770365b68338dc291956bdfb3
-
+
https://github.com/dotnet/sdk
- a7d057c66848985dc82092c375962e55d20fede7
+ 5f330f6a663bd5f31f8a9ecc464c216eb6a15622
-
+
https://github.com/dotnet/sdk
- a7d057c66848985dc82092c375962e55d20fede7
+ 5f330f6a663bd5f31f8a9ecc464c216eb6a15622
diff --git a/eng/Versions.props b/eng/Versions.props
index cacc11f5f..94280fec6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.13
+ 6.0.0-preview.5.21219.13
+ 6.0.0-preview.5.21219.13
+ 6.0.0-preview.5.21219.13
+ 6.0.0-preview.5.21219.13
+ 6.0.0-preview.5.21219.13
0.2.0
- 6.0.100-preview.5.21219.19
- 6.0.100-preview.5.21219.19
+ 6.0.100-preview.5.21219.20
+ 6.0.100-preview.5.21219.20
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From c2ae3ef2712b2313347a6cc9c3d18208099ffab6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 08:04:50 +0000
Subject: [PATCH 054/116] Update dependencies from
https://github.com/dotnet/sdk build 20210419.21 (#10259)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21219.13 to 6.0.0-preview.5.21219.17 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21219.13 to 6.0.0-preview.5.21219.17 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21219.13 to 6.0.0-preview.5.21219.17 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21219.13 to 6.0.0-preview.5.21219.17 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21219.13 to 6.0.0-preview.5.21219.17 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21219.13 to 6.0.0-preview.5.21219.17 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 697fe2985..7506b3e92 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
-
+
https://github.com/dotnet/aspnetcore
- fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
+ c1edbef997c0f453fe6fb17c60cae6373a43b924
-
+
https://github.com/dotnet/aspnetcore
- fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
+ c1edbef997c0f453fe6fb17c60cae6373a43b924
-
+
https://github.com/dotnet/aspnetcore
- fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
+ c1edbef997c0f453fe6fb17c60cae6373a43b924
-
+
https://github.com/dotnet/aspnetcore
- fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
+ c1edbef997c0f453fe6fb17c60cae6373a43b924
-
+
https://github.com/dotnet/aspnetcore
- fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
+ c1edbef997c0f453fe6fb17c60cae6373a43b924
-
+
https://github.com/dotnet/aspnetcore
- fd75fcdbcd668a1dbf0a3da8f2ee8685850dab5d
+ c1edbef997c0f453fe6fb17c60cae6373a43b924
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
196564aa44f7933770365b68338dc291956bdfb3
-
+
https://github.com/dotnet/sdk
- 5f330f6a663bd5f31f8a9ecc464c216eb6a15622
+ 5e992c5c2b655074708e3f07694c0199a3753ff6
-
+
https://github.com/dotnet/sdk
- 5f330f6a663bd5f31f8a9ecc464c216eb6a15622
+ 5e992c5c2b655074708e3f07694c0199a3753ff6
diff --git a/eng/Versions.props b/eng/Versions.props
index 94280fec6..75ca46076 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21219.13
- 6.0.0-preview.5.21219.13
- 6.0.0-preview.5.21219.13
- 6.0.0-preview.5.21219.13
- 6.0.0-preview.5.21219.13
- 6.0.0-preview.5.21219.13
+ 6.0.0-preview.5.21219.17
+ 6.0.0-preview.5.21219.17
+ 6.0.0-preview.5.21219.17
+ 6.0.0-preview.5.21219.17
+ 6.0.0-preview.5.21219.17
+ 6.0.0-preview.5.21219.17
0.2.0
- 6.0.100-preview.5.21219.20
- 6.0.100-preview.5.21219.20
+ 6.0.100-preview.5.21219.21
+ 6.0.100-preview.5.21219.21
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From bee9f747100f2bae1769d0f64ef8a4e8f152b9bb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:10:00 +0000
Subject: [PATCH 055/116] Update dependencies from
https://github.com/dotnet/arcade build 20210419.2 (#10263)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- XliffTasks: from 1.0.0-beta.21215.1 to 1.0.0-beta.21217.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
eng/common/generate-locproject.ps1 | 17 +++++++++++++----
global.json | 2 +-
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7506b3e92..b60f07087 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,14 +136,14 @@
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
-
+
https://github.com/dotnet/arcade
- 53fe29e220fc0db05eafd5c6bc6c8fb9ee7cec7c
+ 1d951297eb7bdd29a31dff3149606152717ed6b4
https://github.com/dotnet/source-build-reference-packages
@@ -153,9 +153,9 @@
https://github.com/dotnet/sourcelink
4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc
-
+
https://github.com/dotnet/xliff-tasks
- 3d9b37d56a7ca805f4e361092bf699dd2428e895
+ 6251f8148102088975a685bea7f44800954a9a48
diff --git a/eng/Versions.props b/eng/Versions.props
index 75ca46076..15032cf0f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21216.2
+ 6.0.0-beta.21219.2
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 7225ddc66..24c00b5be 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -66,10 +66,19 @@ $locJson = @{
}
if ($continue)
{
- return @{
- SourceFile = $sourceFile
- CopyOption = "LangIDOnName"
- OutputPath = $outputPath
+ if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {
+ return @{
+ SourceFile = $sourceFile
+ CopyOption = "LangIDOnPath"
+ OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
+ }
+ }
+ else {
+ return @{
+ SourceFile = $sourceFile
+ CopyOption = "LangIDOnName"
+ OutputPath = $outputPath
+ }
}
}
}
diff --git a/global.json b/global.json
index bfbfd90e3..9c5eeb65e 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21216.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21219.2"
}
}
From a078ae52c0adbbb64d140b2d9ce049d9c61b972f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 15:30:31 +0000
Subject: [PATCH 056/116] [main] Update dependencies from dotnet/sdk (#10260)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21219.17 to 6.0.0-preview.5.21219.18 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21219.17 to 6.0.0-preview.5.21219.18 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21219.17 to 6.0.0-preview.5.21219.18 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21219.17 to 6.0.0-preview.5.21219.18 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21219.17 to 6.0.0-preview.5.21219.18 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21219.17 to 6.0.0-preview.5.21219.18 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21217.1 to 6.0.100-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21219.1 to 6.0.100-preview.2.21219.2 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 40 ++++++++++++++++++++--------------------
eng/Versions.props | 18 +++++++++---------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b60f07087..0789c1a6c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
-
+
https://github.com/dotnet/aspnetcore
- c1edbef997c0f453fe6fb17c60cae6373a43b924
+ 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
-
+
https://github.com/dotnet/aspnetcore
- c1edbef997c0f453fe6fb17c60cae6373a43b924
+ 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
-
+
https://github.com/dotnet/aspnetcore
- c1edbef997c0f453fe6fb17c60cae6373a43b924
+ 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
-
+
https://github.com/dotnet/aspnetcore
- c1edbef997c0f453fe6fb17c60cae6373a43b924
+ 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
-
+
https://github.com/dotnet/aspnetcore
- c1edbef997c0f453fe6fb17c60cae6373a43b924
+ 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
-
+
https://github.com/dotnet/aspnetcore
- c1edbef997c0f453fe6fb17c60cae6373a43b924
+ 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
https://github.com/dotnet/test-templates
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
cb722862f3d76493dc5047a0c30e3bd5f4391170
-
+
https://github.com/dotnet/templating
- 196564aa44f7933770365b68338dc291956bdfb3
+ 3fd4f264318065919ba40d98499d0609f3188f16
-
+
https://github.com/dotnet/sdk
- 5e992c5c2b655074708e3f07694c0199a3753ff6
+ 139d69e161600ec438cc5d00d07be5aa01e153d6
-
+
https://github.com/dotnet/sdk
- 5e992c5c2b655074708e3f07694c0199a3753ff6
+ 139d69e161600ec438cc5d00d07be5aa01e153d6
@@ -108,9 +108,9 @@
https://github.com/microsoft/vstest
bdf1629e12c05a5fd17bf7de48e7e50a8f739170
-
+
https://github.com/mono/linker
- 76bcd90110b1c4d65a53b99761ac00e0f6b06b21
+ f6ccab59b40c959c10a28f696b3ec8ba0569fe25
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index 15032cf0f..104c96ecc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.5.21217.1
+ 6.0.100-preview.5.21220.1
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21219.17
- 6.0.0-preview.5.21219.17
- 6.0.0-preview.5.21219.17
- 6.0.0-preview.5.21219.17
- 6.0.0-preview.5.21219.17
- 6.0.0-preview.5.21219.17
+ 6.0.0-preview.5.21219.18
+ 6.0.0-preview.5.21219.18
+ 6.0.0-preview.5.21219.18
+ 6.0.0-preview.5.21219.18
+ 6.0.0-preview.5.21219.18
+ 6.0.0-preview.5.21219.18
0.2.0
- 6.0.100-preview.5.21219.21
- 6.0.100-preview.5.21219.21
+ 6.0.100-preview.5.21220.6
+ 6.0.100-preview.5.21220.6
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 1a0480cc156ed00405da670ee13950fe3ba6c84f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 17:14:07 +0000
Subject: [PATCH 057/116] Update dependencies from
https://github.com/dotnet/sdk build 20210420.9 (#10264)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21218.1 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21218.1 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21218.1 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21218.1 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21218.1 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21218.1 to 6.0.0-preview.5.21219.10 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0789c1a6c..4ad80e43d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,25 +13,25 @@
https://github.com/dotnet/windowsdesktop
74858aaf38ff34585a8a09881110d5813e382990
-
+
https://github.com/dotnet/runtime
- ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
+ a668de0a1f619947c6fe164d9408d2fdbda86dc8
-
+
https://github.com/dotnet/runtime
- ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
+ a668de0a1f619947c6fe164d9408d2fdbda86dc8
-
+
https://github.com/dotnet/runtime
- ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
+ a668de0a1f619947c6fe164d9408d2fdbda86dc8
-
+
https://github.com/dotnet/runtime
- ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
+ a668de0a1f619947c6fe164d9408d2fdbda86dc8
-
+
https://github.com/dotnet/runtime
- ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
+ a668de0a1f619947c6fe164d9408d2fdbda86dc8
@@ -39,9 +39,9 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- ccc25a90082fa6592eeca8e146ff37e1b7d6b79d
+ a668de0a1f619947c6fe164d9408d2fdbda86dc8
https://github.com/dotnet/aspnetcore
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
3fd4f264318065919ba40d98499d0609f3188f16
-
+
https://github.com/dotnet/sdk
- 139d69e161600ec438cc5d00d07be5aa01e153d6
+ 2ec0fa45b55e027b194c993512c330dd48fd8edc
-
+
https://github.com/dotnet/sdk
- 139d69e161600ec438cc5d00d07be5aa01e153d6
+ 2ec0fa45b55e027b194c993512c330dd48fd8edc
diff --git a/eng/Versions.props b/eng/Versions.props
index 104c96ecc..ad699014e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,23 +57,23 @@
- 6.0.100-preview.5.21220.6
- 6.0.100-preview.5.21220.6
+ 6.0.100-preview.5.21220.9
+ 6.0.100-preview.5.21220.9
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.0-preview.5.21218.1
+ 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21218.1
- 6.0.0-preview.5.21218.1
- 6.0.0-preview.5.21218.1
- 6.0.0-preview.5.21218.1
- 6.0.0-preview.5.21218.1
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21219.10
2.1.0
From ab0f3c71ab5f3de612c3bd33b6949eede48ce3cc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 18:15:04 +0000
Subject: [PATCH 058/116] Update dependencies from
https://github.com/dotnet/sdk build 20210420.10 (#10265)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21219.18 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21219.18 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21219.18 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21219.18 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21219.18 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21219.18 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4ad80e43d..e61454eed 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
a668de0a1f619947c6fe164d9408d2fdbda86dc8
-
+
https://github.com/dotnet/aspnetcore
- 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
+ 9e88e40454aba46258979be7abeed1d3c74cadb3
-
+
https://github.com/dotnet/aspnetcore
- 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
+ 9e88e40454aba46258979be7abeed1d3c74cadb3
-
+
https://github.com/dotnet/aspnetcore
- 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
+ 9e88e40454aba46258979be7abeed1d3c74cadb3
-
+
https://github.com/dotnet/aspnetcore
- 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
+ 9e88e40454aba46258979be7abeed1d3c74cadb3
-
+
https://github.com/dotnet/aspnetcore
- 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
+ 9e88e40454aba46258979be7abeed1d3c74cadb3
-
+
https://github.com/dotnet/aspnetcore
- 8ec4eda4eccd9fbff22ac3b48b88d71a08baadb6
+ 9e88e40454aba46258979be7abeed1d3c74cadb3
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
3fd4f264318065919ba40d98499d0609f3188f16
-
+
https://github.com/dotnet/sdk
- 2ec0fa45b55e027b194c993512c330dd48fd8edc
+ 4a9f924b75823622f4c4d07cd4bb0adf78137ac6
-
+
https://github.com/dotnet/sdk
- 2ec0fa45b55e027b194c993512c330dd48fd8edc
+ 4a9f924b75823622f4c4d07cd4bb0adf78137ac6
diff --git a/eng/Versions.props b/eng/Versions.props
index ad699014e..a4daf1e34 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21219.18
- 6.0.0-preview.5.21219.18
- 6.0.0-preview.5.21219.18
- 6.0.0-preview.5.21219.18
- 6.0.0-preview.5.21219.18
- 6.0.0-preview.5.21219.18
+ 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21220.1
0.2.0
- 6.0.100-preview.5.21220.9
- 6.0.100-preview.5.21220.9
+ 6.0.100-preview.5.21220.10
+ 6.0.100-preview.5.21220.10
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 8ad502dc2304ff2b2b925f54512d3e3f38d0de26 Mon Sep 17 00:00:00 2001
From: Michelle McDaniel
Date: Tue, 20 Apr 2021 16:06:02 -0700
Subject: [PATCH 059/116] Make certificate for .otf files None (#10267)
Like .ttf and .js files, .otf files come from aspnetcore and aren't signed there, so for post-build signing, we need to mark the certificate name as none
---
eng/Signing.props | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eng/Signing.props b/eng/Signing.props
index fbafae48e..960dca2f0 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -37,12 +37,13 @@
-
+
From 5c25f3badedba9152d81c5621c364110503003a6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 02:58:42 +0000
Subject: [PATCH 060/116] [main] Update dependencies from dotnet/sdk (#10268)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21220.9 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21220.9 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21220.9 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21220.9 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21220.9 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21220.9 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e61454eed..a5531dfc5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
a668de0a1f619947c6fe164d9408d2fdbda86dc8
-
+
https://github.com/dotnet/aspnetcore
- 9e88e40454aba46258979be7abeed1d3c74cadb3
+ ec69111cd568dbc7b06f62851bea3b452e404972
-
+
https://github.com/dotnet/aspnetcore
- 9e88e40454aba46258979be7abeed1d3c74cadb3
+ ec69111cd568dbc7b06f62851bea3b452e404972
-
+
https://github.com/dotnet/aspnetcore
- 9e88e40454aba46258979be7abeed1d3c74cadb3
+ ec69111cd568dbc7b06f62851bea3b452e404972
-
+
https://github.com/dotnet/aspnetcore
- 9e88e40454aba46258979be7abeed1d3c74cadb3
+ ec69111cd568dbc7b06f62851bea3b452e404972
-
+
https://github.com/dotnet/aspnetcore
- 9e88e40454aba46258979be7abeed1d3c74cadb3
+ ec69111cd568dbc7b06f62851bea3b452e404972
-
+
https://github.com/dotnet/aspnetcore
- 9e88e40454aba46258979be7abeed1d3c74cadb3
+ ec69111cd568dbc7b06f62851bea3b452e404972
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
3fd4f264318065919ba40d98499d0609f3188f16
-
+
https://github.com/dotnet/sdk
- 4a9f924b75823622f4c4d07cd4bb0adf78137ac6
+ 944afc0aedb78fd8ceed7c78d5b80a1cd1203968
-
+
https://github.com/dotnet/sdk
- 4a9f924b75823622f4c4d07cd4bb0adf78137ac6
+ 944afc0aedb78fd8ceed7c78d5b80a1cd1203968
diff --git a/eng/Versions.props b/eng/Versions.props
index a4daf1e34..216aa8401 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21220.1
- 6.0.0-preview.5.21220.1
- 6.0.0-preview.5.21220.1
- 6.0.0-preview.5.21220.1
- 6.0.0-preview.5.21220.1
- 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21220.9
+ 6.0.0-preview.5.21220.9
+ 6.0.0-preview.5.21220.9
+ 6.0.0-preview.5.21220.9
+ 6.0.0-preview.5.21220.9
+ 6.0.0-preview.5.21220.9
0.2.0
- 6.0.100-preview.5.21220.10
- 6.0.100-preview.5.21220.10
+ 6.0.100-preview.5.21220.19
+ 6.0.100-preview.5.21220.19
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 1afe55fa52bd5b7f4903aa3f81fa8bef0808f9ab Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 05:54:12 +0000
Subject: [PATCH 061/116] Update dependencies from
https://github.com/dotnet/test-templates build 20210420.1 (#10262)
[main] Update dependencies from dotnet/test-templates
---
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 a5531dfc5..53581ffa5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -67,17 +67,17 @@
https://github.com/dotnet/aspnetcore
ec69111cd568dbc7b06f62851bea3b452e404972
-
+
https://github.com/dotnet/test-templates
- cb722862f3d76493dc5047a0c30e3bd5f4391170
+ 6d45b30d219bb68922eecab9f5f4d2fbc5899176
-
+
https://github.com/dotnet/test-templates
- cb722862f3d76493dc5047a0c30e3bd5f4391170
+ 6d45b30d219bb68922eecab9f5f4d2fbc5899176
-
+
https://github.com/dotnet/test-templates
- cb722862f3d76493dc5047a0c30e3bd5f4391170
+ 6d45b30d219bb68922eecab9f5f4d2fbc5899176
https://github.com/dotnet/templating
diff --git a/eng/Versions.props b/eng/Versions.props
index 216aa8401..e201a0055 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,8 +36,8 @@
- 1.0.2-beta4.21212.2
- 1.0.2-beta4.21212.2
+ 1.0.2-beta4.21220.1
+ 1.0.2-beta4.21220.1
@@ -135,7 +135,7 @@
1.5.3
1.0.2-beta3
$(MicrosoftDotNetCommonItemTemplates21PackageVersion)
- 1.0.2-beta4.21212.2
+ 1.0.2-beta4.21220.1
2.1.27
From 1b25a9290ca774a8be59948f213dce1168b75c3e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 07:39:09 +0000
Subject: [PATCH 062/116] [main] Update dependencies from dotnet/sdk (#10269)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21220.9 to 6.0.0-preview.5.21220.15 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21220.9 to 6.0.0-preview.5.21220.15 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21220.9 to 6.0.0-preview.5.21220.15 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21220.9 to 6.0.0-preview.5.21220.15 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21220.9 to 6.0.0-preview.5.21220.15 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21220.9 to 6.0.0-preview.5.21220.15 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21220.1 to 6.0.100-preview.5.21220.5 (parent: Microsoft.NET.Sdk)
---
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 53581ffa5..139eab8f8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
a668de0a1f619947c6fe164d9408d2fdbda86dc8
-
+
https://github.com/dotnet/aspnetcore
- ec69111cd568dbc7b06f62851bea3b452e404972
+ f8607def3e68d2d7b57991d6c770180a6ab3ad30
-
+
https://github.com/dotnet/aspnetcore
- ec69111cd568dbc7b06f62851bea3b452e404972
+ f8607def3e68d2d7b57991d6c770180a6ab3ad30
-
+
https://github.com/dotnet/aspnetcore
- ec69111cd568dbc7b06f62851bea3b452e404972
+ f8607def3e68d2d7b57991d6c770180a6ab3ad30
-
+
https://github.com/dotnet/aspnetcore
- ec69111cd568dbc7b06f62851bea3b452e404972
+ f8607def3e68d2d7b57991d6c770180a6ab3ad30
-
+
https://github.com/dotnet/aspnetcore
- ec69111cd568dbc7b06f62851bea3b452e404972
+ f8607def3e68d2d7b57991d6c770180a6ab3ad30
-
+
https://github.com/dotnet/aspnetcore
- ec69111cd568dbc7b06f62851bea3b452e404972
+ f8607def3e68d2d7b57991d6c770180a6ab3ad30
https://github.com/dotnet/test-templates
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
6d45b30d219bb68922eecab9f5f4d2fbc5899176
-
+
https://github.com/dotnet/templating
- 3fd4f264318065919ba40d98499d0609f3188f16
+ 885cec6a481b9fc06d5334737c56b7c3e338a1a0
-
+
https://github.com/dotnet/sdk
- 944afc0aedb78fd8ceed7c78d5b80a1cd1203968
+ 9ddf80748d489b6e8669c2f0fe8393ded57d973b
-
+
https://github.com/dotnet/sdk
- 944afc0aedb78fd8ceed7c78d5b80a1cd1203968
+ 9ddf80748d489b6e8669c2f0fe8393ded57d973b
diff --git a/eng/Versions.props b/eng/Versions.props
index e201a0055..4be14f869 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.5.21220.1
+ 6.0.100-preview.5.21220.5
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21220.9
- 6.0.0-preview.5.21220.9
- 6.0.0-preview.5.21220.9
- 6.0.0-preview.5.21220.9
- 6.0.0-preview.5.21220.9
- 6.0.0-preview.5.21220.9
+ 6.0.0-preview.5.21220.15
+ 6.0.0-preview.5.21220.15
+ 6.0.0-preview.5.21220.15
+ 6.0.0-preview.5.21220.15
+ 6.0.0-preview.5.21220.15
+ 6.0.0-preview.5.21220.15
0.2.0
- 6.0.100-preview.5.21220.19
- 6.0.100-preview.5.21220.19
+ 6.0.100-preview.5.21220.26
+ 6.0.100-preview.5.21220.26
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 2d39fa79dad8d59d8dedb619058a677b067677d1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 16:31:32 +0000
Subject: [PATCH 063/116] [main] Update dependencies from dotnet/sdk (#10272)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21220.5 to 6.0.100-preview.5.21221.1 (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 139eab8f8..87910243b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
6d45b30d219bb68922eecab9f5f4d2fbc5899176
-
+
https://github.com/dotnet/templating
- 885cec6a481b9fc06d5334737c56b7c3e338a1a0
+ 4d9915f9c536984b479861142fcf870e66c31ae3
-
+
https://github.com/dotnet/sdk
- 9ddf80748d489b6e8669c2f0fe8393ded57d973b
+ c9ac00cb5f5968870de45e971ec87be3484f7eca
-
+
https://github.com/dotnet/sdk
- 9ddf80748d489b6e8669c2f0fe8393ded57d973b
+ c9ac00cb5f5968870de45e971ec87be3484f7eca
diff --git a/eng/Versions.props b/eng/Versions.props
index 4be14f869..93032e4e3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.5.21220.5
+ 6.0.100-preview.5.21221.1
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21220.26
- 6.0.100-preview.5.21220.26
+ 6.0.100-preview.5.21221.6
+ 6.0.100-preview.5.21221.6
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 3f8e7a8993950fdb3345d0682b620e3bdaf79383 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 18:02:46 +0000
Subject: [PATCH 064/116] Update dependencies from
https://github.com/dotnet/sdk build 20210421.10 (#10276)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21219.10 to 6.0.0-preview.5.21221.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87910243b..fa0e040a1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,25 +13,25 @@
https://github.com/dotnet/windowsdesktop
74858aaf38ff34585a8a09881110d5813e382990
-
+
https://github.com/dotnet/runtime
- a668de0a1f619947c6fe164d9408d2fdbda86dc8
+ 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
-
+
https://github.com/dotnet/runtime
- a668de0a1f619947c6fe164d9408d2fdbda86dc8
+ 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
-
+
https://github.com/dotnet/runtime
- a668de0a1f619947c6fe164d9408d2fdbda86dc8
+ 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
-
+
https://github.com/dotnet/runtime
- a668de0a1f619947c6fe164d9408d2fdbda86dc8
+ 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
-
+
https://github.com/dotnet/runtime
- a668de0a1f619947c6fe164d9408d2fdbda86dc8
+ 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
@@ -39,9 +39,9 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- a668de0a1f619947c6fe164d9408d2fdbda86dc8
+ 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
https://github.com/dotnet/aspnetcore
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
4d9915f9c536984b479861142fcf870e66c31ae3
-
+
https://github.com/dotnet/sdk
- c9ac00cb5f5968870de45e971ec87be3484f7eca
+ fe681df7d54a6e2e8a559c874b612ffa05baff3f
-
+
https://github.com/dotnet/sdk
- c9ac00cb5f5968870de45e971ec87be3484f7eca
+ fe681df7d54a6e2e8a559c874b612ffa05baff3f
diff --git a/eng/Versions.props b/eng/Versions.props
index 93032e4e3..1442fcd76 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,23 +57,23 @@
- 6.0.100-preview.5.21221.6
- 6.0.100-preview.5.21221.6
+ 6.0.100-preview.5.21221.10
+ 6.0.100-preview.5.21221.10
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21221.1
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
- 6.0.0-preview.5.21219.10
+ 6.0.0-preview.5.21221.1
+ 6.0.0-preview.5.21221.1
+ 6.0.0-preview.5.21221.1
+ 6.0.0-preview.5.21221.1
+ 6.0.0-preview.5.21221.1
2.1.0
From d9bf0d661ba2e1ac065ae119585dc7f0e3c29703 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 20:05:38 +0000
Subject: [PATCH 065/116] [main] Update dependencies from dotnet/sdk (#10277)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.FSharp.Compiler: from 11.4.2-beta.21218.2 to 11.4.2-beta.21220.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210331-03 to 17.0.0-preview-20210421-06 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21219.2 to 6.0.100-preview.2.21221.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fa0e040a1..943990463 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
4d9915f9c536984b479861142fcf870e66c31ae3
-
+
https://github.com/dotnet/sdk
- fe681df7d54a6e2e8a559c874b612ffa05baff3f
+ e75b601410fd689cb9ee0398b34d6bb5bea07048
-
+
https://github.com/dotnet/sdk
- fe681df7d54a6e2e8a559c874b612ffa05baff3f
+ e75b601410fd689cb9ee0398b34d6bb5bea07048
@@ -100,17 +100,17 @@
https://github.com/dotnet/wpf
6d23db9bc4cf4af023c8f9fccc87ae566b2d4e6a
-
+
https://github.com/dotnet/fsharp
- 9df868cff114636ef4082f0a6c3dd750e990b20d
+ 84f37d3e56eab6e4cb68034b7a9d620851e5baad
-
+
https://github.com/microsoft/vstest
- bdf1629e12c05a5fd17bf7de48e7e50a8f739170
+ 8a38cdf7a31ee6d99f0b864d8143fe1b24de50bb
-
+
https://github.com/mono/linker
- f6ccab59b40c959c10a28f696b3ec8ba0569fe25
+ 190c08cb32504b09947e24a81b194b335e06c12d
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index 1442fcd76..cb9b2316d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21221.10
- 6.0.100-preview.5.21221.10
+ 6.0.100-preview.5.21221.15
+ 6.0.100-preview.5.21221.15
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -142,7 +142,7 @@
2.2.0-beta.19072.10
2.0.0
- 17.0.0-preview-20210331-03
+ 17.0.0-preview-20210421-06
From ff43b3e6619afbd14c0fde00f087708884ce917e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 02:45:26 +0000
Subject: [PATCH 066/116] [main] Update dependencies from dotnet/sdk (#10278)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21220.15 to 6.0.0-preview.5.21221.6 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21220.15 to 6.0.0-preview.5.21221.6 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21220.15 to 6.0.0-preview.5.21221.6 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21220.15 to 6.0.0-preview.5.21221.6 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21220.15 to 6.0.0-preview.5.21221.6 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21220.15 to 6.0.0-preview.5.21221.6 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 943990463..86c98fe5d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
-
+
https://github.com/dotnet/aspnetcore
- f8607def3e68d2d7b57991d6c770180a6ab3ad30
+ 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
-
+
https://github.com/dotnet/aspnetcore
- f8607def3e68d2d7b57991d6c770180a6ab3ad30
+ 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
-
+
https://github.com/dotnet/aspnetcore
- f8607def3e68d2d7b57991d6c770180a6ab3ad30
+ 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
-
+
https://github.com/dotnet/aspnetcore
- f8607def3e68d2d7b57991d6c770180a6ab3ad30
+ 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
-
+
https://github.com/dotnet/aspnetcore
- f8607def3e68d2d7b57991d6c770180a6ab3ad30
+ 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
-
+
https://github.com/dotnet/aspnetcore
- f8607def3e68d2d7b57991d6c770180a6ab3ad30
+ 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
4d9915f9c536984b479861142fcf870e66c31ae3
-
+
https://github.com/dotnet/sdk
- e75b601410fd689cb9ee0398b34d6bb5bea07048
+ a39ed33d7c6c88ca17bb8c994f7825a5adffa358
-
+
https://github.com/dotnet/sdk
- e75b601410fd689cb9ee0398b34d6bb5bea07048
+ a39ed33d7c6c88ca17bb8c994f7825a5adffa358
diff --git a/eng/Versions.props b/eng/Versions.props
index cb9b2316d..9ddd2aa1f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21220.15
- 6.0.0-preview.5.21220.15
- 6.0.0-preview.5.21220.15
- 6.0.0-preview.5.21220.15
- 6.0.0-preview.5.21220.15
- 6.0.0-preview.5.21220.15
+ 6.0.0-preview.5.21221.6
+ 6.0.0-preview.5.21221.6
+ 6.0.0-preview.5.21221.6
+ 6.0.0-preview.5.21221.6
+ 6.0.0-preview.5.21221.6
+ 6.0.0-preview.5.21221.6
0.2.0
- 6.0.100-preview.5.21221.15
- 6.0.100-preview.5.21221.15
+ 6.0.100-preview.5.21221.26
+ 6.0.100-preview.5.21221.26
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 2f197eb8095cd91376bcf6bc9656fe8f745f0744 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 02:50:07 +0000
Subject: [PATCH 067/116] Update dependencies from
https://github.com/dotnet/test-templates build 20210421.1 (#10271)
[main] Update dependencies from dotnet/test-templates
---
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 86c98fe5d..3e378d8a5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -67,17 +67,17 @@
https://github.com/dotnet/aspnetcore
5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
-
+
https://github.com/dotnet/test-templates
- 6d45b30d219bb68922eecab9f5f4d2fbc5899176
+ 2f4b896a45d774d0df027bd6826137c02efe001d
-
+
https://github.com/dotnet/test-templates
- 6d45b30d219bb68922eecab9f5f4d2fbc5899176
+ 2f4b896a45d774d0df027bd6826137c02efe001d
-
+
https://github.com/dotnet/test-templates
- 6d45b30d219bb68922eecab9f5f4d2fbc5899176
+ 2f4b896a45d774d0df027bd6826137c02efe001d
https://github.com/dotnet/templating
diff --git a/eng/Versions.props b/eng/Versions.props
index 9ddd2aa1f..1df75d306 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,8 +36,8 @@
- 1.0.2-beta4.21220.1
- 1.0.2-beta4.21220.1
+ 1.0.2-beta4.21221.1
+ 1.0.2-beta4.21221.1
@@ -135,7 +135,7 @@
1.5.3
1.0.2-beta3
$(MicrosoftDotNetCommonItemTemplates21PackageVersion)
- 1.0.2-beta4.21220.1
+ 1.0.2-beta4.21221.1
2.1.27
From 051e1fa01404322621ba870a49c6293ccab4d93d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 02:53:56 +0000
Subject: [PATCH 068/116] Update dependencies from
https://github.com/dotnet/arcade build 20210420.2 (#10273)
[main] 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 3e378d8a5..956546082 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,14 +136,14 @@
-
+
https://github.com/dotnet/arcade
- 1d951297eb7bdd29a31dff3149606152717ed6b4
+ 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb
-
+
https://github.com/dotnet/arcade
- 1d951297eb7bdd29a31dff3149606152717ed6b4
+ 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb
https://github.com/dotnet/source-build-reference-packages
diff --git a/eng/Versions.props b/eng/Versions.props
index 1df75d306..123d8463d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21219.2
+ 6.0.0-beta.21220.2
diff --git a/global.json b/global.json
index 9c5eeb65e..66c26eaff 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21219.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21220.2"
}
}
From 502e6b529b1404aec2d515a24157463f898c0931 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 05:56:58 +0000
Subject: [PATCH 069/116] [main] Update dependencies from dotnet/sdk (#10285)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21221.6 to 6.0.0-preview.5.21221.9 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21221.6 to 6.0.0-preview.5.21221.9 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21221.6 to 6.0.0-preview.5.21221.9 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21221.6 to 6.0.0-preview.5.21221.9 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21221.6 to 6.0.0-preview.5.21221.9 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21221.6 to 6.0.0-preview.5.21221.9 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21221.1 to 6.0.100-preview.5.21221.2 (parent: Microsoft.NET.Sdk)
---
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 956546082..477c33a31 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
-
+
https://github.com/dotnet/aspnetcore
- 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
+ 9819c08be913f918daf130e85ac6fd8e3aad46c9
-
+
https://github.com/dotnet/aspnetcore
- 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
+ 9819c08be913f918daf130e85ac6fd8e3aad46c9
-
+
https://github.com/dotnet/aspnetcore
- 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
+ 9819c08be913f918daf130e85ac6fd8e3aad46c9
-
+
https://github.com/dotnet/aspnetcore
- 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
+ 9819c08be913f918daf130e85ac6fd8e3aad46c9
-
+
https://github.com/dotnet/aspnetcore
- 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
+ 9819c08be913f918daf130e85ac6fd8e3aad46c9
-
+
https://github.com/dotnet/aspnetcore
- 5d8525c2b047e5bc4a5c23ee9995f5eb378600e5
+ 9819c08be913f918daf130e85ac6fd8e3aad46c9
https://github.com/dotnet/test-templates
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
2f4b896a45d774d0df027bd6826137c02efe001d
-
+
https://github.com/dotnet/templating
- 4d9915f9c536984b479861142fcf870e66c31ae3
+ f23aac195dece4721f87b887c09d90079a5f7264
-
+
https://github.com/dotnet/sdk
- a39ed33d7c6c88ca17bb8c994f7825a5adffa358
+ fc40b651322a2ffa0c4c4a4e3e9c6d00cbebbd5f
-
+
https://github.com/dotnet/sdk
- a39ed33d7c6c88ca17bb8c994f7825a5adffa358
+ fc40b651322a2ffa0c4c4a4e3e9c6d00cbebbd5f
diff --git a/eng/Versions.props b/eng/Versions.props
index 123d8463d..e27b7096c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.5.21221.1
+ 6.0.100-preview.5.21221.2
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21221.6
- 6.0.0-preview.5.21221.6
- 6.0.0-preview.5.21221.6
- 6.0.0-preview.5.21221.6
- 6.0.0-preview.5.21221.6
- 6.0.0-preview.5.21221.6
+ 6.0.0-preview.5.21221.9
+ 6.0.0-preview.5.21221.9
+ 6.0.0-preview.5.21221.9
+ 6.0.0-preview.5.21221.9
+ 6.0.0-preview.5.21221.9
+ 6.0.0-preview.5.21221.9
0.2.0
- 6.0.100-preview.5.21221.26
- 6.0.100-preview.5.21221.26
+ 6.0.100-preview.5.21221.32
+ 6.0.100-preview.5.21221.32
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 024d6059f25c5d1a14c29324adb05f809a0f0831 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 08:11:49 +0000
Subject: [PATCH 070/116] Update dependencies from
https://github.com/dotnet/sdk build 20210421.33 (#10286)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21217.1 to 6.0.0-preview.5.21220.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 477c33a31..21aa31953 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
-
+
https://github.com/dotnet/windowsdesktop
- 74858aaf38ff34585a8a09881110d5813e382990
+ 049ba3229f4ab4a4af4be416a45e99c0ff483e64
-
+
https://github.com/dotnet/windowsdesktop
- 74858aaf38ff34585a8a09881110d5813e382990
+ 049ba3229f4ab4a4af4be416a45e99c0ff483e64
-
+
https://github.com/dotnet/windowsdesktop
- 74858aaf38ff34585a8a09881110d5813e382990
+ 049ba3229f4ab4a4af4be416a45e99c0ff483e64
https://github.com/dotnet/runtime
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
f23aac195dece4721f87b887c09d90079a5f7264
-
+
https://github.com/dotnet/sdk
- fc40b651322a2ffa0c4c4a4e3e9c6d00cbebbd5f
+ 78622fb9fbd47b27069a340b97bdfe09a33670d1
-
+
https://github.com/dotnet/sdk
- fc40b651322a2ffa0c4c4a4e3e9c6d00cbebbd5f
+ 78622fb9fbd47b27069a340b97bdfe09a33670d1
diff --git a/eng/Versions.props b/eng/Versions.props
index e27b7096c..b903785e9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21221.32
- 6.0.100-preview.5.21221.32
+ 6.0.100-preview.5.21221.33
+ 6.0.100-preview.5.21221.33
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -78,9 +78,9 @@
- 6.0.0-preview.5.21217.1
- 6.0.0-preview.5.21217.1
- 6.0.0-preview.5.21217.1
+ 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21220.1
From a13e6495c398e56fd11bfd21c7d549f98ddc3abb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 09:05:07 +0000
Subject: [PATCH 071/116] Update dependencies from
https://github.com/dotnet/sdk build 20210422.1 (#10288)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21221.1 to 6.0.100-preview.2.21221.3 (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 21aa31953..acca8d65d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
f23aac195dece4721f87b887c09d90079a5f7264
-
+
https://github.com/dotnet/sdk
- 78622fb9fbd47b27069a340b97bdfe09a33670d1
+ ba16bb3708b13456417444a65229e38fac6333a2
-
+
https://github.com/dotnet/sdk
- 78622fb9fbd47b27069a340b97bdfe09a33670d1
+ ba16bb3708b13456417444a65229e38fac6333a2
@@ -108,9 +108,9 @@
https://github.com/microsoft/vstest
8a38cdf7a31ee6d99f0b864d8143fe1b24de50bb
-
+
https://github.com/mono/linker
- 190c08cb32504b09947e24a81b194b335e06c12d
+ 6a82d56a9e95858005aca83891f2992edf665eb6
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index b903785e9..dec1a6d27 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21221.33
- 6.0.100-preview.5.21221.33
+ 6.0.100-preview.5.21222.1
+ 6.0.100-preview.5.21222.1
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From fa2187f53aafc5c55f3f0cb99dd56a06c6759b89 Mon Sep 17 00:00:00 2001
From: William Li
Date: Thu, 22 Apr 2021 08:05:56 -0700
Subject: [PATCH 072/116] Update branding to preview 5 (#10255)
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index dec1a6d27..e9e0ca570 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
00
$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)
preview
- 4
+ 5
$(VersionMajor).$(VersionMinor)
$(MajorMinorVersion).$(VersionSDKMinor)
From a4c0bc4156d72f66c4761773daca4580bfd6f751 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:42:14 +0000
Subject: [PATCH 073/116] Update dependencies from
https://github.com/dotnet/arcade build 20210421.1 (#10291)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- XliffTasks: from 1.0.0-beta.21217.1 to 1.0.0-beta.21220.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
global.json | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index acca8d65d..ae167e985 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,14 +136,14 @@
-
+
https://github.com/dotnet/arcade
- 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb
+ f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f
-
+
https://github.com/dotnet/arcade
- 2803c841d5e5f5cdc3d3ea42d532d51ec96fcadb
+ f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f
https://github.com/dotnet/source-build-reference-packages
@@ -153,9 +153,9 @@
https://github.com/dotnet/sourcelink
4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc
-
+
https://github.com/dotnet/xliff-tasks
- 6251f8148102088975a685bea7f44800954a9a48
+ 1a4eec88c754f024962ab4a974898c8d6d087f57
diff --git a/eng/Versions.props b/eng/Versions.props
index e9e0ca570..08434fe10 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21220.2
+ 6.0.0-beta.21221.1
diff --git a/global.json b/global.json
index 66c26eaff..40302cdf3 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21220.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21221.1"
}
}
From 255ee6dd78794c5f689766bcead6396192ac390a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 17:19:50 +0000
Subject: [PATCH 074/116] [main] Update dependencies from dotnet/sdk (#10290)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21221.2 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21221.2 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21221.2 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21215.3 to 6.0.0-preview.5.21221.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21220.1 to 6.0.0-preview.5.21221.2 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21215.3 to 6.0.0-preview.5.21221.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21221.3 to 6.0.100-preview.2.21222.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 14 +++++++-------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ae167e985..75605bd47 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
-
+
https://github.com/dotnet/windowsdesktop
- 049ba3229f4ab4a4af4be416a45e99c0ff483e64
+ ee1103567d76625bfebf8b399fc4a95069a5e5ec
-
+
https://github.com/dotnet/windowsdesktop
- 049ba3229f4ab4a4af4be416a45e99c0ff483e64
+ ee1103567d76625bfebf8b399fc4a95069a5e5ec
-
+
https://github.com/dotnet/windowsdesktop
- 049ba3229f4ab4a4af4be416a45e99c0ff483e64
+ ee1103567d76625bfebf8b399fc4a95069a5e5ec
https://github.com/dotnet/runtime
@@ -83,22 +83,22 @@
https://github.com/dotnet/templating
f23aac195dece4721f87b887c09d90079a5f7264
-
+
https://github.com/dotnet/sdk
- ba16bb3708b13456417444a65229e38fac6333a2
+ 1b2055f0971fc903f37276d3e55b43fd1ccf9a09
-
+
https://github.com/dotnet/sdk
- ba16bb3708b13456417444a65229e38fac6333a2
+ 1b2055f0971fc903f37276d3e55b43fd1ccf9a09
-
+
https://github.com/dotnet/winforms
- f379253b8c34640aa252d039f16e498f6b7a933e
+ 76e702132543b2b1eba831217608784be20667d1
-
+
https://github.com/dotnet/wpf
- 6d23db9bc4cf4af023c8f9fccc87ae566b2d4e6a
+ b6c7cedd7474b1af6b1d61f7ff4d50a5a613a2de
https://github.com/dotnet/fsharp
@@ -108,9 +108,9 @@
https://github.com/microsoft/vstest
8a38cdf7a31ee6d99f0b864d8143fe1b24de50bb
-
+
https://github.com/mono/linker
- 6a82d56a9e95858005aca83891f2992edf665eb6
+ 012efef292663aa38f9047896942cdcc8765b8e0
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index 08434fe10..03735d4bb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,11 +24,11 @@
- 6.0.0-preview.4.21215.3
+ 6.0.0-preview.5.21221.1
- 6.0.0-preview.4.21215.3
+ 6.0.0-preview.5.21221.2
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21222.1
- 6.0.100-preview.5.21222.1
+ 6.0.100-preview.5.21222.7
+ 6.0.100-preview.5.21222.7
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -78,9 +78,9 @@
- 6.0.0-preview.5.21220.1
- 6.0.0-preview.5.21220.1
- 6.0.0-preview.5.21220.1
+ 6.0.0-preview.5.21221.2
+ 6.0.0-preview.5.21221.2
+ 6.0.0-preview.5.21221.2
From 0cf5e7806270b8332fb6ffafe31e21cff05b08a1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 19:57:01 +0000
Subject: [PATCH 075/116] [main] Update dependencies from dotnet/sdk (#10293)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21221.1 to 6.0.0-preview.5.21222.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21221.1 to 6.0.0-preview.5.21222.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21221.1 to 6.0.0-preview.5.21222.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21221.1 to 6.0.0-preview.5.21222.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21221.1 to 6.0.0-preview.5.21222.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21221.1 to 6.0.0-preview.5.21222.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21222.1 to 6.0.100-preview.2.21222.2 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 36 ++++++++++++++++++------------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 75605bd47..a2f3bbc5e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,25 +13,25 @@
https://github.com/dotnet/windowsdesktop
ee1103567d76625bfebf8b399fc4a95069a5e5ec
-
+
https://github.com/dotnet/runtime
- 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
+ 58b28154290c9c18c2d8720313d36873be4c47d0
-
+
https://github.com/dotnet/runtime
- 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
+ 58b28154290c9c18c2d8720313d36873be4c47d0
-
+
https://github.com/dotnet/runtime
- 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
+ 58b28154290c9c18c2d8720313d36873be4c47d0
-
+
https://github.com/dotnet/runtime
- 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
+ 58b28154290c9c18c2d8720313d36873be4c47d0
-
+
https://github.com/dotnet/runtime
- 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
+ 58b28154290c9c18c2d8720313d36873be4c47d0
@@ -39,9 +39,9 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- 65bcecebde4aebd5926952ccfc4dc8e7fbf7eaed
+ 58b28154290c9c18c2d8720313d36873be4c47d0
https://github.com/dotnet/aspnetcore
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
f23aac195dece4721f87b887c09d90079a5f7264
-
+
https://github.com/dotnet/sdk
- 1b2055f0971fc903f37276d3e55b43fd1ccf9a09
+ 0a29678cfde234f63b81a9f24bb5f550ac928378
-
+
https://github.com/dotnet/sdk
- 1b2055f0971fc903f37276d3e55b43fd1ccf9a09
+ 0a29678cfde234f63b81a9f24bb5f550ac928378
@@ -108,9 +108,9 @@
https://github.com/microsoft/vstest
8a38cdf7a31ee6d99f0b864d8143fe1b24de50bb
-
+
https://github.com/mono/linker
- 012efef292663aa38f9047896942cdcc8765b8e0
+ 0657e20db019e2e6d196cb37734529ceb4217396
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index 03735d4bb..6d53a293d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,23 +57,23 @@
- 6.0.100-preview.5.21222.7
- 6.0.100-preview.5.21222.7
+ 6.0.100-preview.5.21222.15
+ 6.0.100-preview.5.21222.15
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.0-preview.5.21221.1
+ 6.0.0-preview.5.21222.1
- 6.0.0-preview.5.21221.1
- 6.0.0-preview.5.21221.1
- 6.0.0-preview.5.21221.1
- 6.0.0-preview.5.21221.1
- 6.0.0-preview.5.21221.1
+ 6.0.0-preview.5.21222.1
+ 6.0.0-preview.5.21222.1
+ 6.0.0-preview.5.21222.1
+ 6.0.0-preview.5.21222.1
+ 6.0.0-preview.5.21222.1
2.1.0
From 2ce00a2553fc7eeae25386a78e89a592be4c2cb8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 03:03:01 +0000
Subject: [PATCH 076/116] [main] Update dependencies from dotnet/sdk (#10300)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21216.10 to 3.10.0-3.21222.10 (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 a2f3bbc5e..4f49ffaed 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
f23aac195dece4721f87b887c09d90079a5f7264
-
+
https://github.com/dotnet/sdk
- 0a29678cfde234f63b81a9f24bb5f550ac928378
+ 151f7629b8057569168798cfda5e1e10aee5fb74
-
+
https://github.com/dotnet/sdk
- 0a29678cfde234f63b81a9f24bb5f550ac928378
+ 151f7629b8057569168798cfda5e1e10aee5fb74
@@ -113,9 +113,9 @@
0657e20db019e2e6d196cb37734529ceb4217396
linker
-
+
https://github.com/dotnet/roslyn
- 9bfe989ad46e3f457d33ed800c3be012cec5afc6
+ 3b6ef7adbf2a994ea98ebeaa935c13b17ddd2f64
https://github.com/dotnet/msbuild
diff --git a/eng/Versions.props b/eng/Versions.props
index 6d53a293d..4fe22795b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21222.15
- 6.0.100-preview.5.21222.15
+ 6.0.100-preview.5.21222.20
+ 6.0.100-preview.5.21222.20
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 027787f8afec7c8e5bd5fc77cac70402ace1999a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 06:57:08 +0000
Subject: [PATCH 077/116] [main] Update dependencies from dotnet/sdk (#10306)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21221.2 to 6.0.100-preview.5.21222.1 (parent: Microsoft.NET.Sdk)
- Microsoft.FSharp.Compiler: from 11.4.2-beta.21220.2 to 11.4.2-beta.21221.4 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21222.10 to 3.10.0-3.21222.20 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4f49ffaed..a5977cb17 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
2f4b896a45d774d0df027bd6826137c02efe001d
-
+
https://github.com/dotnet/templating
- f23aac195dece4721f87b887c09d90079a5f7264
+ f4d9ff1b6f4b04b1c85d077583efa4fa27aff8b2
-
+
https://github.com/dotnet/sdk
- 151f7629b8057569168798cfda5e1e10aee5fb74
+ 35c7d4ba4eed80307daec6ecf24124c2ea808527
-
+
https://github.com/dotnet/sdk
- 151f7629b8057569168798cfda5e1e10aee5fb74
+ 35c7d4ba4eed80307daec6ecf24124c2ea808527
@@ -100,9 +100,9 @@
https://github.com/dotnet/wpf
b6c7cedd7474b1af6b1d61f7ff4d50a5a613a2de
-
+
https://github.com/dotnet/fsharp
- 84f37d3e56eab6e4cb68034b7a9d620851e5baad
+ 01a833e650c36066087506cda6a8d608a9d8e4f5
https://github.com/microsoft/vstest
@@ -113,9 +113,9 @@
0657e20db019e2e6d196cb37734529ceb4217396
linker
-
+
https://github.com/dotnet/roslyn
- 3b6ef7adbf2a994ea98ebeaa935c13b17ddd2f64
+ da284920d88506513cbd17ef2812f7701eb54003
https://github.com/dotnet/msbuild
diff --git a/eng/Versions.props b/eng/Versions.props
index 4fe22795b..582e87c18 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.5.21221.2
+ 6.0.100-preview.5.21222.1
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21222.20
- 6.0.100-preview.5.21222.20
+ 6.0.100-preview.5.21222.31
+ 6.0.100-preview.5.21222.31
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From af1dd485b76564a5f628fa72d70fda1f9967da4b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 13:14:34 +0000
Subject: [PATCH 078/116] Update dependencies from
https://github.com/dotnet/sdk build 20210423.5 (#10313)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21222.1 to 6.0.100-preview.5.21223.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210421-06 to 17.0.0-preview-20210422-01 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a5977cb17..75dec7f9a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
2f4b896a45d774d0df027bd6826137c02efe001d
-
+
https://github.com/dotnet/templating
- f4d9ff1b6f4b04b1c85d077583efa4fa27aff8b2
+ ac415f818c8236c0d28d939c13dead59c3ae06b8
-
+
https://github.com/dotnet/sdk
- 35c7d4ba4eed80307daec6ecf24124c2ea808527
+ 7f884ae99f7696c1817155ffe90d999faf664b91
-
+
https://github.com/dotnet/sdk
- 35c7d4ba4eed80307daec6ecf24124c2ea808527
+ 7f884ae99f7696c1817155ffe90d999faf664b91
@@ -104,9 +104,9 @@
https://github.com/dotnet/fsharp
01a833e650c36066087506cda6a8d608a9d8e4f5
-
+
https://github.com/microsoft/vstest
- 8a38cdf7a31ee6d99f0b864d8143fe1b24de50bb
+ c2a0e65054afd9bbb6b2d72190359bf9f7233c7f
https://github.com/mono/linker
diff --git a/eng/Versions.props b/eng/Versions.props
index 582e87c18..6475bec64 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.5.21222.1
+ 6.0.100-preview.5.21223.1
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21222.31
- 6.0.100-preview.5.21222.31
+ 6.0.100-preview.5.21223.5
+ 6.0.100-preview.5.21223.5
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -142,7 +142,7 @@
2.2.0-beta.19072.10
2.0.0
- 17.0.0-preview-20210421-06
+ 17.0.0-preview-20210422-01
From ce87216ca3e5244d4e3e5885728acc948eb583e0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 15:36:45 +0000
Subject: [PATCH 079/116] Update dependencies from
https://github.com/dotnet/sdk build 20210423.7 (#10314)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21222.1 to 6.0.0-preview.5.21222.13 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21222.1 to 6.0.0-preview.5.21222.13 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21222.1 to 6.0.0-preview.5.21222.13 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21222.1 to 6.0.0-preview.5.21222.13 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21222.1 to 6.0.0-preview.5.21222.13 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21222.1 to 6.0.0-preview.5.21222.13 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 75dec7f9a..b3a7e2459 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,25 +13,25 @@
https://github.com/dotnet/windowsdesktop
ee1103567d76625bfebf8b399fc4a95069a5e5ec
-
+
https://github.com/dotnet/runtime
- 58b28154290c9c18c2d8720313d36873be4c47d0
+ 282c394b09ce86f9ef9f4bc0dc8ba1fe17a6cbca
-
+
https://github.com/dotnet/runtime
- 58b28154290c9c18c2d8720313d36873be4c47d0
+ 282c394b09ce86f9ef9f4bc0dc8ba1fe17a6cbca
-
+
https://github.com/dotnet/runtime
- 58b28154290c9c18c2d8720313d36873be4c47d0
+ 282c394b09ce86f9ef9f4bc0dc8ba1fe17a6cbca
-
+
https://github.com/dotnet/runtime
- 58b28154290c9c18c2d8720313d36873be4c47d0
+ 282c394b09ce86f9ef9f4bc0dc8ba1fe17a6cbca
-
+
https://github.com/dotnet/runtime
- 58b28154290c9c18c2d8720313d36873be4c47d0
+ 282c394b09ce86f9ef9f4bc0dc8ba1fe17a6cbca
@@ -39,9 +39,9 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- 58b28154290c9c18c2d8720313d36873be4c47d0
+ 282c394b09ce86f9ef9f4bc0dc8ba1fe17a6cbca
https://github.com/dotnet/aspnetcore
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
ac415f818c8236c0d28d939c13dead59c3ae06b8
-
+
https://github.com/dotnet/sdk
- 7f884ae99f7696c1817155ffe90d999faf664b91
+ 0a751c5b259256ba753647b96dbf0579e3bed36d
-
+
https://github.com/dotnet/sdk
- 7f884ae99f7696c1817155ffe90d999faf664b91
+ 0a751c5b259256ba753647b96dbf0579e3bed36d
diff --git a/eng/Versions.props b/eng/Versions.props
index 6475bec64..8d7063f04 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,23 +57,23 @@
- 6.0.100-preview.5.21223.5
- 6.0.100-preview.5.21223.5
+ 6.0.100-preview.5.21223.7
+ 6.0.100-preview.5.21223.7
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.0-preview.5.21222.1
+ 6.0.0-preview.5.21222.13
- 6.0.0-preview.5.21222.1
- 6.0.0-preview.5.21222.1
- 6.0.0-preview.5.21222.1
- 6.0.0-preview.5.21222.1
- 6.0.0-preview.5.21222.1
+ 6.0.0-preview.5.21222.13
+ 6.0.0-preview.5.21222.13
+ 6.0.0-preview.5.21222.13
+ 6.0.0-preview.5.21222.13
+ 6.0.0-preview.5.21222.13
2.1.0
From 10f1d24c89fa94dda3431cc8de6ef6ce15ed3947 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 16:32:56 +0000
Subject: [PATCH 080/116] Update dependencies from
https://github.com/dotnet/sdk build 20210423.8 (#10315)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21223.1 to 6.0.100-preview.5.21223.3 (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 b3a7e2459..20cf31229 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -79,17 +79,17 @@
https://github.com/dotnet/test-templates
2f4b896a45d774d0df027bd6826137c02efe001d
-
+
https://github.com/dotnet/templating
- ac415f818c8236c0d28d939c13dead59c3ae06b8
+ a30a7625c0fbb294a73cca265aa7064029d44a5e
-
+
https://github.com/dotnet/sdk
- 0a751c5b259256ba753647b96dbf0579e3bed36d
+ c4a8d6ab64b78d08603291f3e3577e8ebb0ae268
-
+
https://github.com/dotnet/sdk
- 0a751c5b259256ba753647b96dbf0579e3bed36d
+ c4a8d6ab64b78d08603291f3e3577e8ebb0ae268
diff --git a/eng/Versions.props b/eng/Versions.props
index 8d7063f04..61d7d739e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
- 6.0.100-preview.5.21223.1
+ 6.0.100-preview.5.21223.3
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21223.7
- 6.0.100-preview.5.21223.7
+ 6.0.100-preview.5.21223.8
+ 6.0.100-preview.5.21223.8
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 1b210648c379764e2b1040898fe81fbc93622234 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 18:34:19 +0000
Subject: [PATCH 081/116] [main] Update dependencies from dotnet/sdk (#10316)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21221.9 to 6.0.0-preview.5.21223.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21221.9 to 6.0.0-preview.5.21223.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21221.9 to 6.0.0-preview.5.21223.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21221.9 to 6.0.0-preview.5.21223.1 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21221.9 to 6.0.0-preview.5.21223.1 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21221.9 to 6.0.0-preview.5.21223.1 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 20cf31229..863a459ff 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
282c394b09ce86f9ef9f4bc0dc8ba1fe17a6cbca
-
+
https://github.com/dotnet/aspnetcore
- 9819c08be913f918daf130e85ac6fd8e3aad46c9
+ f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
-
+
https://github.com/dotnet/aspnetcore
- 9819c08be913f918daf130e85ac6fd8e3aad46c9
+ f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
-
+
https://github.com/dotnet/aspnetcore
- 9819c08be913f918daf130e85ac6fd8e3aad46c9
+ f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
-
+
https://github.com/dotnet/aspnetcore
- 9819c08be913f918daf130e85ac6fd8e3aad46c9
+ f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
-
+
https://github.com/dotnet/aspnetcore
- 9819c08be913f918daf130e85ac6fd8e3aad46c9
+ f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
-
+
https://github.com/dotnet/aspnetcore
- 9819c08be913f918daf130e85ac6fd8e3aad46c9
+ f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
a30a7625c0fbb294a73cca265aa7064029d44a5e
-
+
https://github.com/dotnet/sdk
- c4a8d6ab64b78d08603291f3e3577e8ebb0ae268
+ e3bc0a68c08f9388dc8f7f9e55b34ccdf333cbe5
-
+
https://github.com/dotnet/sdk
- c4a8d6ab64b78d08603291f3e3577e8ebb0ae268
+ e3bc0a68c08f9388dc8f7f9e55b34ccdf333cbe5
diff --git a/eng/Versions.props b/eng/Versions.props
index 61d7d739e..53e4f57eb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21221.9
- 6.0.0-preview.5.21221.9
- 6.0.0-preview.5.21221.9
- 6.0.0-preview.5.21221.9
- 6.0.0-preview.5.21221.9
- 6.0.0-preview.5.21221.9
+ 6.0.0-preview.5.21223.1
+ 6.0.0-preview.5.21223.1
+ 6.0.0-preview.5.21223.1
+ 6.0.0-preview.5.21223.1
+ 6.0.0-preview.5.21223.1
+ 6.0.0-preview.5.21223.1
0.2.0
- 6.0.100-preview.5.21223.8
- 6.0.100-preview.5.21223.8
+ 6.0.100-preview.5.21223.11
+ 6.0.100-preview.5.21223.11
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 45a8c62ea19866bec704c185aac539ac973c432f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 21:40:40 +0000
Subject: [PATCH 082/116] Update dependencies from
https://github.com/dotnet/sdk build 20210423.18 (#10322)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21223.1 to 6.0.0-preview.5.21223.6 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21223.1 to 6.0.0-preview.5.21223.6 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21223.1 to 6.0.0-preview.5.21223.6 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21223.1 to 6.0.0-preview.5.21223.6 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.5.21223.1 to 6.0.0-preview.5.21223.6 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.5.21223.1 to 6.0.0-preview.5.21223.6 (parent: Microsoft.NET.Sdk)
---
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 863a459ff..3e5014e7f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -43,29 +43,29 @@
https://github.com/dotnet/runtime
282c394b09ce86f9ef9f4bc0dc8ba1fe17a6cbca
-
+
https://github.com/dotnet/aspnetcore
- f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
+ 917928dc133fe79dc9d87c645c1b649e9bb0e1c4
-
+
https://github.com/dotnet/aspnetcore
- f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
+ 917928dc133fe79dc9d87c645c1b649e9bb0e1c4
-
+
https://github.com/dotnet/aspnetcore
- f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
+ 917928dc133fe79dc9d87c645c1b649e9bb0e1c4
-
+
https://github.com/dotnet/aspnetcore
- f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
+ 917928dc133fe79dc9d87c645c1b649e9bb0e1c4
-
+
https://github.com/dotnet/aspnetcore
- f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
+ 917928dc133fe79dc9d87c645c1b649e9bb0e1c4
-
+
https://github.com/dotnet/aspnetcore
- f62d8c2e4c543e1a631a9e9181117ecb8635eeaa
+ 917928dc133fe79dc9d87c645c1b649e9bb0e1c4
https://github.com/dotnet/test-templates
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
a30a7625c0fbb294a73cca265aa7064029d44a5e
-
+
https://github.com/dotnet/sdk
- e3bc0a68c08f9388dc8f7f9e55b34ccdf333cbe5
+ 186ef63763885f5cb44bd2b0f633638ac48475cc
-
+
https://github.com/dotnet/sdk
- e3bc0a68c08f9388dc8f7f9e55b34ccdf333cbe5
+ 186ef63763885f5cb44bd2b0f633638ac48475cc
diff --git a/eng/Versions.props b/eng/Versions.props
index 53e4f57eb..3e412e0eb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,20 +45,20 @@
- 6.0.0-preview.5.21223.1
- 6.0.0-preview.5.21223.1
- 6.0.0-preview.5.21223.1
- 6.0.0-preview.5.21223.1
- 6.0.0-preview.5.21223.1
- 6.0.0-preview.5.21223.1
+ 6.0.0-preview.5.21223.6
+ 6.0.0-preview.5.21223.6
+ 6.0.0-preview.5.21223.6
+ 6.0.0-preview.5.21223.6
+ 6.0.0-preview.5.21223.6
+ 6.0.0-preview.5.21223.6
0.2.0
- 6.0.100-preview.5.21223.11
- 6.0.100-preview.5.21223.11
+ 6.0.100-preview.5.21223.18
+ 6.0.100-preview.5.21223.18
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 8d356e050b4ac74a35942cef9f1cf1f7b80a911c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 24 Apr 2021 06:41:58 +0000
Subject: [PATCH 083/116] [main] Update dependencies from dotnet/sdk (#10324)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21222.20 to 3.10.0-3.21224.14 (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 3e5014e7f..f34a77b29 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -83,13 +83,13 @@
https://github.com/dotnet/templating
a30a7625c0fbb294a73cca265aa7064029d44a5e
-
+
https://github.com/dotnet/sdk
- 186ef63763885f5cb44bd2b0f633638ac48475cc
+ e5a3c52ccf81c0d37f1f379e5aeeb509615b54aa
-
+
https://github.com/dotnet/sdk
- 186ef63763885f5cb44bd2b0f633638ac48475cc
+ e5a3c52ccf81c0d37f1f379e5aeeb509615b54aa
@@ -113,9 +113,9 @@
0657e20db019e2e6d196cb37734529ceb4217396
linker
-
+
https://github.com/dotnet/roslyn
- da284920d88506513cbd17ef2812f7701eb54003
+ 28a4364bf10947f1bdbf2e84b5f3c368d6531d82
https://github.com/dotnet/msbuild
diff --git a/eng/Versions.props b/eng/Versions.props
index 3e412e0eb..b71e116a3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,8 +57,8 @@
- 6.0.100-preview.5.21223.18
- 6.0.100-preview.5.21223.18
+ 6.0.100-preview.5.21223.25
+ 6.0.100-preview.5.21223.25
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
From 05584c648d757dd156d2d234f6e3b52e3ee8dd90 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 24 Apr 2021 13:16:16 +0000
Subject: [PATCH 084/116] Update dependencies from
https://github.com/dotnet/arcade build 20210422.1 (#10328)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- XliffTasks: from 1.0.0-beta.21220.1 to 1.0.0-beta.21221.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
eng/common/templates/job/source-index-stage1.yml | 2 +-
global.json | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f34a77b29..6ec65677f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -136,14 +136,14 @@
-
+
https://github.com/dotnet/arcade
- f7e58cfb0f6c93980cbb664cc9e62d9ef2df0c2f
+ b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
-
+