From dca28b2c5213d27bd218377e53cd06b1a93566e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Oct 2021 18:30:45 +0000 Subject: [PATCH] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12451) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21518.9 to 6.0.0-rtm.21519.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21519.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.0.0-beta.21518.8 to 12.0.0-beta.21519.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21518.8 to 6.0.1-beta.21519.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21473.1 to 6.0.100-1.21519.4 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21515.3 to 4.0.0-6.21519.19 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21515.2 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk) - Revert removed feed - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b - Resolve source-build patches - Merge branch 'darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b - Resolve source-build patch conflicts --- NuGet.config | 2 +- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 24 +++---- ...d-performance-test-from-source-build.patch | 34 --------- ...sion-changes-to-support-source-build.patch | 44 ------------ ...oject-changes-to-eliminate-prebuilts.patch | 30 -------- .../0001-Fix-humanizer-assembly-version.patch | 23 ------ 7 files changed, 49 insertions(+), 180 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch delete mode 100644 src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch diff --git a/NuGet.config b/NuGet.config index d00c93170..714c7a75c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1e9d8137..cf87d9137 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://github.com/dotnet/windowsdesktop - 07d3454cfcd12d931064177e254bf2f739717468 + 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 - + https://github.com/dotnet/windowsdesktop - 07d3454cfcd12d931064177e254bf2f739717468 + 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 - + https://github.com/dotnet/windowsdesktop - 07d3454cfcd12d931064177e254bf2f739717468 + 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 https://github.com/dotnet/windowsdesktop - 07d3454cfcd12d931064177e254bf2f739717468 + 0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217 https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://github.com/dotnet/runtime 5a23dc38e94484ee69f660ef5ffbc92d7b372bc7 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 - + https://github.com/dotnet/aspnetcore - c01686185a4ceb8e0c6597a38a57abe2cd059b33 + 4aae17def1228a56eef6b1fb2b8fd0d138ebb751 https://github.com/dotnet/test-templates @@ -103,31 +103,31 @@ https://github.com/dotnet/templating e380623de8e689cd7209ffe0881b744413e3e0d6 - + https://github.com/dotnet/sdk - 18232f27b6b1408d0a7095f79d264a8f356338e5 + 4d19f430e05e0c0771b6abf86be9bf137f2cc242 - + https://github.com/dotnet/sdk - 18232f27b6b1408d0a7095f79d264a8f356338e5 + 4d19f430e05e0c0771b6abf86be9bf137f2cc242 - + https://github.com/dotnet/winforms - e73e15755db6f219e05030ca650debd5b5df8e4c + 080dcacb82db540cc26e5bf9882c6af9320ba535 - + https://github.com/dotnet/wpf - d37c1f5613110dbcd3d735e2723bb8b610acc5cd + eee7eff2c7837b56fdb7f313540de74bc1b41a41 - + https://github.com/dotnet/fsharp - 10a05c1adde29cbb7ffebf35b6c9612b789beba3 + 727a6abda5bb3276f3e8dd918b721c5d21464aac - + https://github.com/dotnet/fsharp - 10a05c1adde29cbb7ffebf35b6c9612b789beba3 + 727a6abda5bb3276f3e8dd918b721c5d21464aac @@ -135,15 +135,15 @@ 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 - + https://github.com/dotnet/linker - d51cc207fac85547787bbba83f54f69d8e72e9f5 + d0662ed8db919642177ddfd06a1c33895a69015f linker - + https://github.com/dotnet/roslyn - 95b7a0198f8c805b367f17e4639020ec21c16705 + 3a0930fe6990248c848db2f1e323d7dd2052005b @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk 73c8cd3619efc79364fef5fa81989f9e0dd2147b - + https://github.com/dotnet/source-build - 03462c6b31f9c97d4fb0b9bcca7355b81c7fde76 + 10d0f7e94aa45889155c312f51cfc01bf326b853 diff --git a/eng/Versions.props b/eng/Versions.props index 9ada49b94..9892aab77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-rtm.21518.9 + 6.0.0-rtm.21519.4 - 6.0.0-rtm.21518.14 + 6.0.0-rtm.21519.8 @@ -44,20 +44,20 @@ - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 - 6.0.0-rtm.21518.20 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 + 6.0.0-rtm.21519.6 0.2.0 - 6.0.100-rtm.21519.2 - 6.0.100-rtm.21519.2 + 6.0.100-rtm.21520.1 + 6.0.100-rtm.21520.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.0-rtm.21518.16 - 6.0.0-rtm.21518.16 + 6.0.0-rtm.21519.11 + 6.0.0-rtm.21519.11 6.0.0 6.0.0 diff --git a/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch b/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch deleted file mode 100644 index 58f729c98..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Thu, 14 Oct 2021 01:15:37 +0000 -Subject: [PATCH] Exclude unit and performance test from source-build - ---- - perf/dotnet-format.Performance.csproj | 1 + - tests/dotnet-format.UnitTests.csproj | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj -index dd4c95e..c96e8b8 100644 ---- a/perf/dotnet-format.Performance.csproj -+++ b/perf/dotnet-format.Performance.csproj -@@ -14,6 +14,7 @@ - - - LatestMajor -+ true - - - -diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj -index 06dbbb4..f566d6a 100644 ---- a/tests/dotnet-format.UnitTests.csproj -+++ b/tests/dotnet-format.UnitTests.csproj -@@ -12,6 +12,7 @@ - - 6.0.0-preview.7.21317.1 - LatestMajor -+ true - - - diff --git a/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch b/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch deleted file mode 100644 index 33535cae1..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Thu, 14 Oct 2021 10:35:52 +0000 -Subject: [PATCH] Package version changes to support source-build - ---- - Directory.Packages.props | 3 +-- - eng/Versions.props | 2 ++ - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 57c2735..6b628c2 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -2,7 +2,6 @@ - - - -- 16.11.0 - 5.0.0 - - 6.0.0-preview.4.221 -@@ -15,7 +14,7 @@ - - - -- -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 7a39a9c..5270ea4 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -13,6 +13,8 @@ - true - - -+ 16.11.0 -+ 3.3.2 - - 4.0.0-6.21515.3 - diff --git a/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch b/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch deleted file mode 100644 index c1e097eeb..000000000 --- a/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "msimons@microsoft.com" -Date: Tue, 19 Oct 2021 14:32:25 +0000 -Subject: [PATCH] Project changes to eliminate prebuilts - ---- - src/dotnet-format.csproj | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj -index dbc94b8..994e539 100644 ---- a/src/dotnet-format.csproj -+++ b/src/dotnet-format.csproj -@@ -19,7 +19,6 @@ - true - - -- 6.0.0-preview.7.21317.1 - LatestMajor - - true -@@ -29,7 +28,7 @@ - These identifiers are for generating the shim'd core executables for signing. Not all options - from $(RoslynPortableRuntimeIdentifiers) work or make sense in this context. - --> -- win-x64;win-x86;osx-x64 -+ win-x64;win-x86;osx-x64 - - - diff --git a/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch b/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch deleted file mode 100644 index 763c5f3b2..000000000 --- a/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "msimons@microsoft.com" -Date: Tue, 19 Oct 2021 18:59:23 +0000 -Subject: [PATCH] Fix humanizer assembly version - -Patch for https://github.com/dotnet/source-build/pull/2539 ---- - .../humanizer/0001-Fix-building-in-a-source-build-context.patch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch -index 8d31028..7a5e5f3 100644 ---- a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch -+++ b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch -@@ -24,7 +24,7 @@ index 842a373..e018285 100644 - netstandard1.0 - Mehdi Khalili, Oren Novotny - https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE --+ 2.2.0 -++ 2.2.0 - https://github.com/Humanizr/Humanizer - 2.12 - A micro-framework that turns your normal strings, type names, enum fields, date fields ETC into a human friendly format