From c2c63aa0a9edcf33e048688218a1d76f6f644af5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Mar 2021 23:16:13 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/sdk build 20210328.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.3.21173.8 -> To Version 6.0.100-preview.3.21178.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.0-preview.3.21172.2 -> To Version 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7f4308524eb..c4a2d8458b68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 18b9c3217d7b1320e48acfc810142ab8d6872485 + e3234e9bc1014708ea6d4e23efdaa6d62b857e03 - + https://github.com/dotnet/windowsdesktop - 18b9c3217d7b1320e48acfc810142ab8d6872485 + e3234e9bc1014708ea6d4e23efdaa6d62b857e03 - + https://github.com/dotnet/windowsdesktop - 18b9c3217d7b1320e48acfc810142ab8d6872485 + e3234e9bc1014708ea6d4e23efdaa6d62b857e03 - + https://github.com/dotnet/runtime - 0f64b267ac0552f07b06f18103581b880c8c53c6 + bcc7e0e0ce1758322015675356efc121b211e312 - + https://github.com/dotnet/runtime - 0f64b267ac0552f07b06f18103581b880c8c53c6 + bcc7e0e0ce1758322015675356efc121b211e312 - + https://github.com/dotnet/runtime - 0f64b267ac0552f07b06f18103581b880c8c53c6 + bcc7e0e0ce1758322015675356efc121b211e312 - + https://github.com/dotnet/runtime - 0f64b267ac0552f07b06f18103581b880c8c53c6 + bcc7e0e0ce1758322015675356efc121b211e312 - + https://github.com/dotnet/runtime - 0f64b267ac0552f07b06f18103581b880c8c53c6 + bcc7e0e0ce1758322015675356efc121b211e312 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 0f64b267ac0552f07b06f18103581b880c8c53c6 + bcc7e0e0ce1758322015675356efc121b211e312 - + https://github.com/dotnet/aspnetcore - fb3092b7e6cd8135663bc05c31561b58c0007245 + 1e2fdc3f16431497f8c08909b485f1fb33ffd21f - + https://github.com/dotnet/aspnetcore - fb3092b7e6cd8135663bc05c31561b58c0007245 + 1e2fdc3f16431497f8c08909b485f1fb33ffd21f - + https://github.com/dotnet/aspnetcore - fb3092b7e6cd8135663bc05c31561b58c0007245 + 1e2fdc3f16431497f8c08909b485f1fb33ffd21f - + https://github.com/dotnet/aspnetcore - fb3092b7e6cd8135663bc05c31561b58c0007245 + 1e2fdc3f16431497f8c08909b485f1fb33ffd21f - + https://github.com/dotnet/aspnetcore - fb3092b7e6cd8135663bc05c31561b58c0007245 + 1e2fdc3f16431497f8c08909b485f1fb33ffd21f - + https://github.com/dotnet/aspnetcore - fb3092b7e6cd8135663bc05c31561b58c0007245 + 1e2fdc3f16431497f8c08909b485f1fb33ffd21f https://github.com/dotnet/test-templates @@ -79,26 +79,26 @@ https://github.com/dotnet/test-templates e4b0a1ae3c72c08351046c8f607d1a92cbe86ef4 - + https://github.com/dotnet/templating - 5067a9034f799eceb42846a62e5431a3ec8a267b + f28881570c6f58ccaa76fd8cc48bc22ca2ddf84d - + https://github.com/dotnet/sdk - 2bd13761a780509b8d3a0abd74e4197fe06b8f3f + 8e036f8647a24344a3c95d6a94a83850b10bfa2d - + https://github.com/dotnet/sdk - 2bd13761a780509b8d3a0abd74e4197fe06b8f3f + 8e036f8647a24344a3c95d6a94a83850b10bfa2d https://github.com/dotnet/winforms ed3f2e2ea00a5ea85811bd817d144bc0ce66abc7 - + https://github.com/dotnet/wpf - 77f0456f549ca92ab7413218a7ee028f6195e340 + 6d35e1a0539cc5cc7a6111a11b781f52cfc71fc2 https://github.com/dotnet/fsharp @@ -108,18 +108,18 @@ https://github.com/microsoft/vstest dd5546b3d9ba0c2947c94b56a7f77169ce8d5e9c - + https://github.com/mono/linker - 2f5594e95e1a5227103b9b7d6b92f4b2250be2d7 + 000432728ae8603d7ac0519d844bc260eee4910e linker - + https://github.com/dotnet/roslyn - 0f72ba6869dfc9e34e163c2ab01863a1a33510c3 + 595dde550f007f16b12aa337dd27aa507301b8fb - + https://github.com/dotnet/msbuild - 8d34753d265721735a678033c3ce48033dbc96ee + afd0b62109300f3b088875b5a65d1a5bfd786e15 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 3d7b91ceb5e3..cb130e69c5db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,11 +28,11 @@ - 6.0.0-preview.3.21171.2 + 6.0.0-preview.4.21174.2 - 6.0.100-preview.3.21161.1 + 6.0.100-preview.4.21176.3 @@ -45,42 +45,42 @@ - 6.0.0-preview.3.21172.8 - 6.0.0-preview.3.21172.8 - 6.0.0-preview.3.21172.8 - 6.0.0-preview.3.21172.8 - 6.0.0-preview.3.21172.8 - 6.0.0-preview.3.21172.8 + 6.0.0-preview.4.21176.2 + 6.0.0-preview.4.21176.2 + 6.0.0-preview.4.21176.2 + 6.0.0-preview.4.21176.2 + 6.0.0-preview.4.21176.2 + 6.0.0-preview.4.21176.2 0.2.0 - 6.0.100-preview.3.21173.8 - 6.0.100-preview.3.21173.8 + 6.0.100-preview.3.21178.3 + 6.0.100-preview.3.21178.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.3.21167.1 + 6.0.0-preview.4.21175.1 - 6.0.0-preview.3.21167.1 - 6.0.0-preview.3.21167.1 - 6.0.0-preview.3.21167.1 - 6.0.0-preview.3.21167.1 - 6.0.0-preview.3.21167.1 + 6.0.0-preview.4.21175.1 + 6.0.0-preview.4.21175.1 + 6.0.0-preview.4.21175.1 + 6.0.0-preview.4.21175.1 + 6.0.0-preview.4.21175.1 2.1.0 - 6.0.0-preview.3.21172.2 - 6.0.0-preview.3.21172.2 - 6.0.0-preview.3.21172.2 + 6.0.0-preview.4.21175.1 + 6.0.0-preview.4.21175.1 + 6.0.0-preview.4.21175.1 From 9958909fea51256a399d337ba951272a41acfc86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Mar 2021 23:58:54 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/sdk build 20210328.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.3.21173.8 -> To Version 6.0.100-preview.3.21178.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.0-preview.3.21172.2 -> To Version 6.0.0-preview.4.21175.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 c4a2d8458b68..5155eab054c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating f28881570c6f58ccaa76fd8cc48bc22ca2ddf84d - + https://github.com/dotnet/sdk - 8e036f8647a24344a3c95d6a94a83850b10bfa2d + 1f13c202ed27a0d1f98a12c59d02536d87e6a8ef - + https://github.com/dotnet/sdk - 8e036f8647a24344a3c95d6a94a83850b10bfa2d + 1f13c202ed27a0d1f98a12c59d02536d87e6a8ef @@ -113,9 +113,9 @@ 000432728ae8603d7ac0519d844bc260eee4910e linker - + https://github.com/dotnet/roslyn - 595dde550f007f16b12aa337dd27aa507301b8fb + 32376942f8acc8255c38e167ee3401b4251d37aa https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index cb130e69c5db..a3f383e05bd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.3.21178.3 - 6.0.100-preview.3.21178.3 + 6.0.100-preview.3.21178.6 + 6.0.100-preview.3.21178.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 85c8ef0dfe94be8bdf2f1f219f3eda7d7d70a7dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Mar 2021 05:51:52 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/sdk build 20210328.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.3.21173.8 -> To Version 6.0.100-preview.3.21178.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.0-preview.3.21172.2 -> To Version 6.0.0-preview.4.21175.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 5155eab054c2..d210cd657f17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating f28881570c6f58ccaa76fd8cc48bc22ca2ddf84d - + https://github.com/dotnet/sdk - 1f13c202ed27a0d1f98a12c59d02536d87e6a8ef + 4e7db1c8ec5e9a1216b34c46049aed5daf146fda - + https://github.com/dotnet/sdk - 1f13c202ed27a0d1f98a12c59d02536d87e6a8ef + 4e7db1c8ec5e9a1216b34c46049aed5daf146fda @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 6d35e1a0539cc5cc7a6111a11b781f52cfc71fc2 - + https://github.com/dotnet/fsharp - 437bc2042180d70599f4a73b55f00ac04c49ba8e + 38b5102ef19beeacb6b31e62a74f13e13abee463 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index a3f383e05bd4..a94743a02291 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.3.21178.6 - 6.0.100-preview.3.21178.6 + 6.0.100-preview.3.21178.8 + 6.0.100-preview.3.21178.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e1be86b6089ede46d68bcb913643735545c76a7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Mar 2021 08:38:40 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/sdk build 20210329.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.3.21173.8 -> To Version 6.0.100-preview.3.21179.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.0-preview.3.21172.2 -> To Version 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d210cd657f17..c313942284a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop e3234e9bc1014708ea6d4e23efdaa6d62b857e03 - + https://github.com/dotnet/runtime - bcc7e0e0ce1758322015675356efc121b211e312 + 1b31080188c7820fb1df92b39201cd677357585c - + https://github.com/dotnet/runtime - bcc7e0e0ce1758322015675356efc121b211e312 + 1b31080188c7820fb1df92b39201cd677357585c - + https://github.com/dotnet/runtime - bcc7e0e0ce1758322015675356efc121b211e312 + 1b31080188c7820fb1df92b39201cd677357585c - + https://github.com/dotnet/runtime - bcc7e0e0ce1758322015675356efc121b211e312 + 1b31080188c7820fb1df92b39201cd677357585c - + https://github.com/dotnet/runtime - bcc7e0e0ce1758322015675356efc121b211e312 + 1b31080188c7820fb1df92b39201cd677357585c @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - bcc7e0e0ce1758322015675356efc121b211e312 + 1b31080188c7820fb1df92b39201cd677357585c - + https://github.com/dotnet/aspnetcore - 1e2fdc3f16431497f8c08909b485f1fb33ffd21f + 06c618f19c97ae38fb1c78c4ab906ba072826f23 - + https://github.com/dotnet/aspnetcore - 1e2fdc3f16431497f8c08909b485f1fb33ffd21f + 06c618f19c97ae38fb1c78c4ab906ba072826f23 - + https://github.com/dotnet/aspnetcore - 1e2fdc3f16431497f8c08909b485f1fb33ffd21f + 06c618f19c97ae38fb1c78c4ab906ba072826f23 - + https://github.com/dotnet/aspnetcore - 1e2fdc3f16431497f8c08909b485f1fb33ffd21f + 06c618f19c97ae38fb1c78c4ab906ba072826f23 - + https://github.com/dotnet/aspnetcore - 1e2fdc3f16431497f8c08909b485f1fb33ffd21f + 06c618f19c97ae38fb1c78c4ab906ba072826f23 - + https://github.com/dotnet/aspnetcore - 1e2fdc3f16431497f8c08909b485f1fb33ffd21f + 06c618f19c97ae38fb1c78c4ab906ba072826f23 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating f28881570c6f58ccaa76fd8cc48bc22ca2ddf84d - + https://github.com/dotnet/sdk - 4e7db1c8ec5e9a1216b34c46049aed5daf146fda + ad4e3811c86c39f8100b2d70b18b3f0990605f82 - + https://github.com/dotnet/sdk - 4e7db1c8ec5e9a1216b34c46049aed5daf146fda + ad4e3811c86c39f8100b2d70b18b3f0990605f82 diff --git a/eng/Versions.props b/eng/Versions.props index a94743a02291..952a58ea9a4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,35 +45,35 @@ - 6.0.0-preview.4.21176.2 - 6.0.0-preview.4.21176.2 - 6.0.0-preview.4.21176.2 - 6.0.0-preview.4.21176.2 - 6.0.0-preview.4.21176.2 - 6.0.0-preview.4.21176.2 + 6.0.0-preview.3.21177.2 + 6.0.0-preview.3.21177.2 + 6.0.0-preview.3.21177.2 + 6.0.0-preview.3.21177.2 + 6.0.0-preview.3.21177.2 + 6.0.0-preview.3.21177.2 0.2.0 - 6.0.100-preview.3.21178.8 - 6.0.100-preview.3.21178.8 + 6.0.100-preview.3.21179.2 + 6.0.100-preview.3.21179.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.4.21175.1 + 6.0.0-preview.3.21176.9 - 6.0.0-preview.4.21175.1 - 6.0.0-preview.4.21175.1 - 6.0.0-preview.4.21175.1 - 6.0.0-preview.4.21175.1 - 6.0.0-preview.4.21175.1 + 6.0.0-preview.3.21176.9 + 6.0.0-preview.3.21176.9 + 6.0.0-preview.3.21176.9 + 6.0.0-preview.3.21176.9 + 6.0.0-preview.3.21176.9 2.1.0 From 4206b2f31738311e4e49c6e804d8ce662448b4f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Mar 2021 09:20:33 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/sdk build 20210329.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.3.21173.8 -> To Version 6.0.100-preview.3.21179.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.0-preview.3.21172.2 -> To Version 6.0.0-preview.3.21177.1 (parent: Microsoft.NET.Sdk --- 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 c313942284a6..0c4f8b2beb1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - e3234e9bc1014708ea6d4e23efdaa6d62b857e03 + c5e4f7d2b40b76c72920b873b87d82ceed2ead0b - + https://github.com/dotnet/windowsdesktop - e3234e9bc1014708ea6d4e23efdaa6d62b857e03 + c5e4f7d2b40b76c72920b873b87d82ceed2ead0b - + https://github.com/dotnet/windowsdesktop - e3234e9bc1014708ea6d4e23efdaa6d62b857e03 + c5e4f7d2b40b76c72920b873b87d82ceed2ead0b https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating f28881570c6f58ccaa76fd8cc48bc22ca2ddf84d - + https://github.com/dotnet/sdk - ad4e3811c86c39f8100b2d70b18b3f0990605f82 + 76ac803ec052cf1c17b47231ec4a48954be97d63 - + https://github.com/dotnet/sdk - ad4e3811c86c39f8100b2d70b18b3f0990605f82 + 76ac803ec052cf1c17b47231ec4a48954be97d63 - + https://github.com/dotnet/winforms - ed3f2e2ea00a5ea85811bd817d144bc0ce66abc7 + 1fb65920939af628ce283010900adbe0531dd750 - + https://github.com/dotnet/wpf - 6d35e1a0539cc5cc7a6111a11b781f52cfc71fc2 + 5662d38a6c9b8280b5ab817e7ce2680248537bc5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 952a58ea9a4b..ca8bc731533b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.3.21171.3 + 6.0.0-preview.3.21176.5 - 6.0.0-preview.4.21174.2 + 6.0.0-preview.3.21177.1 @@ -57,8 +57,8 @@ - 6.0.100-preview.3.21179.2 - 6.0.100-preview.3.21179.2 + 6.0.100-preview.3.21179.4 + 6.0.100-preview.3.21179.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.4.21175.1 - 6.0.0-preview.4.21175.1 - 6.0.0-preview.4.21175.1 + 6.0.0-preview.3.21177.1 + 6.0.0-preview.3.21177.1 + 6.0.0-preview.3.21177.1 From cb4a5e78defac7e3c8a7db748935be6fd6b837a8 Mon Sep 17 00:00:00 2001 From: Lukas Lansky Date: Mon, 29 Mar 2021 13:33:44 +0200 Subject: [PATCH 6/7] Remove Android, iOS, and macCatalyst from CA1416 analyzer warnings --- Directory.Build.targets | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Directory.Build.targets b/Directory.Build.targets index 30121eef4ee2..f85748f836fc 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -2,6 +2,14 @@ + + + + + + + + $(ProductMonikerRid) linux-$(Architecture) - dotnet-runtime$(PgoTerm)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime$(PgoArchiveTerm)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid)