From a2dd821f3750961ea8f96d2349704cb27c23c221 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 1 Sep 2020 15:00:10 -0700 Subject: [PATCH 001/134] Branch and branding for rc2 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dab06af60..077332b86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rc - 1 + 2 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 2a2212868d2ee7506bbd3985b1082fd200c79084 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 2 Sep 2020 12:16:28 -0700 Subject: [PATCH 002/134] Fix license URL for PT-BR (#8374) --- .../targets/packaging/windows/clisdk/LCID/1046/bundle.wxl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index c405afb11..42e7dbca4 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -71,7 +71,7 @@ Recursos <A HREF="https://aka.ms/dotnet-docs">Documentação do .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Documentação do SDK</A> <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> - < A HREF = "https://aka.ms/dotnet-License-Windows" > Informações de licenciamento para .NET</A> + <A HREF="https://aka.ms/dotnet-License-Windows">Informações de licenciamento para .NET</A> Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. From 899cee7df694dfbbda55cdb5a40fa8ed803233eb Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Thu, 3 Sep 2020 09:14:28 -0700 Subject: [PATCH 003/134] Reverting version changes --- eng/Version.Details.xml | 97 ++++++++++++++++++++--------------------- eng/Versions.props | 46 +++++++++---------- 2 files changed, 71 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c4102b1c..f0a36edda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 9ea6951cdc8e275e30901a51be700e88d03c4bb9 + 7e542661acee7dea547ff4466ffe6ea232e81fb3 - + https://github.com/dotnet/windowsdesktop - 9ea6951cdc8e275e30901a51be700e88d03c4bb9 + 7e542661acee7dea547ff4466ffe6ea232e81fb3 - + https://github.com/dotnet/windowsdesktop - 9ea6951cdc8e275e30901a51be700e88d03c4bb9 + 7e542661acee7dea547ff4466ffe6ea232e81fb3 - + https://github.com/dotnet/runtime - d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/aspnetcore - ecdcc752d4639061c2c49727ee77a1039bbbca22 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - ecdcc752d4639061c2c49727ee77a1039bbbca22 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - ecdcc752d4639061c2c49727ee77a1039bbbca22 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - ecdcc752d4639061c2c49727ee77a1039bbbca22 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - ecdcc752d4639061c2c49727ee77a1039bbbca22 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - ecdcc752d4639061c2c49727ee77a1039bbbca22 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed https://github.com/dotnet/test-templates @@ -79,58 +79,57 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 1c6403afced118a403dfd03f997d8704820c5a94 + 9d1d639165b8c87bb2e319cdd295b81a4240bb40 - + https://github.com/dotnet/sdk - 1c6403afced118a403dfd03f997d8704820c5a94 + 9d1d639165b8c87bb2e319cdd295b81a4240bb40 - + https://github.com/dotnet/winforms - 97d99ec9e047dcdff90185bfd0bbe9f26b7be62f + e9176d39fa30c6fda81b679274b9316329e0c35e - + https://github.com/dotnet/wpf - be89bbfaded6ad3f0f4143bf1a8dd075a5789715 + de2e9785920c11aca594fc3506b8d8052b9b3260 - + https://github.com/dotnet/fsharp - 918387ac7303945695a8ea92dc02a9dbcfdc0c92 + 068ebd3c599bc5a47163a18b8b90d2fe5517186e - + https://github.com/microsoft/vstest - 0c0fafa64de5c73981e7c40a99d7363f57635f60 + 4fcacb284064e66e670689b9888c0c438b1f4154 https://github.com/mono/linker 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 linker - + https://github.com/dotnet/roslyn - e78b37e454b97aba60afe28def2d5a7a3f1a372d + 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/msbuild - 51a1071f8871e0c93afbaf1b2ac2c9e59c7b6491 + d58e2b7864627321d75b7a47850e9b80deac7db6 https://github.com/NuGet/NuGet.Client 3501ddedc274ac10d4b135856b7593a6bb8a72f1 - https://github.com/dotnet/cliCommandLineParser + https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - - + https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 diff --git a/eng/Versions.props b/eng/Versions.props index 02a6fcb62..077332b86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20431.1 - 5.0.0-rc.1.20451.6 + 5.0.0-rc.1.20431.2 @@ -41,41 +41,41 @@ - 5.0.0-rc.1.20451.17 - 5.0.0-rc.1.20451.17 - 5.0.0-rc.1.20451.17 - 5.0.0-rc.1.20451.17 - 5.0.0-rc.1.20451.17 - 5.0.0-rc.1.20451.17 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 0.2.0 - 5.0.100-rc.1.20453.7 - 5.0.100-rc.1.20453.7 + 5.0.100-rc.1.20451.7 + 5.0.100-rc.1.20451.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20452.14 + 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20452.14 - 5.0.0-rc.1.20452.14 - 5.0.0-rc.1.20452.14 - 5.0.0-rc.1.20452.14 - 5.0.0-rc.1.20452.14 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 2.1.0 - 5.0.0-rc.1.20452.2 - 5.0.0-rc.1.20452.2 - 5.0.0-rc.1.20452.2 + 5.0.0-rc.1.20431.13 + 5.0.0-rc.1.20431.13 + 5.0.0-rc.1.20431.13 @@ -124,12 +124,12 @@ 2.2.0-beta.19072.10 2.0.0 - 16.8.0-release-20200902-05 + 16.8.0-release-20200828-02 - 10.0.17763.3-preview - 10.0.18362.4-preview - 10.0.19041.3-preview + 10.0.17763.1-preview + 10.0.18362.2-preview + 10.0.19041.1-preview From 1e40c0130173b82658e8b40fb1d3a82948e97ed3 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 4 Sep 2020 08:22:25 -0700 Subject: [PATCH 004/134] Pass through BUILD_REPOSITORY_NAME to docker containers (#8407) Needed for manifest generation. Previously we used the uri for the name of the build, but the name is also used for generating the names of the stable package feeds. Co-authored-by: dotnet-bot --- eng/dockerrun.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index f2ef9f914..63d75b53c 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -160,6 +160,7 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e _PACKAGEVERSIONPROPSURL \ -e EXTERNALRESTORESOURCES \ -e BUILD_REPOSITORY_URI \ + -e BUILD_REPOSITORY_NAME \ -e BUILD_SOURCEBRANCH \ -e BUILD_BUILDNUMBER \ -e BUILD_BUILDID \ From 96acacb9d412d90a3a3426e74bb07f38a8649e79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:10:14 +0000 Subject: [PATCH 005/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8404) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20431.1 to 5.0.0-rc.1.20451.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.2.20452.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20428.2 to 11.0.0-beta.20457.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200828-02 to 16.8.0-release-20200902-05 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20420.1 to 3.8.0-3.20454.4 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.8.0-preview-20429-01 to 16.8.0-preview-20454-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 5.8.0-preview.3.6783 to 5.8.0-preview.3.6812 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20451.7 to 5.0.100-rc.2.20458.1 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20451.7 to 5.0.100-rc.2.20458.1 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.2.20454.25 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 - dotnet-dev-certs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 - dotnet-user-secrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 - dotnet-watch: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20456.3 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20431.1 to 5.0.0-rc.1.20451.14 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.2.20454.1 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.2.20452.6 - Microsoft.FSharp.Compiler: from 11.0.0-beta.20428.2 to 11.0.0-beta.20457.3 - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200828-02 to 16.8.0-release-20200902-05 - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20420.1 to 3.8.0-3.20454.4 - Microsoft.Build: from 16.8.0-preview-20429-01 to 16.8.0-preview-20454-01 - NuGet.Build.Tasks: from 5.8.0-preview.3.6783 to 5.8.0-preview.3.6812 - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 - Exclusing all reference assemblies from crossgen - Removing extra / --- eng/Version.Details.xml | 98 ++++++++++++++--------------- eng/Versions.props | 40 ++++++------ src/redist/targets/Crossgen.targets | 2 +- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cb7f59dc..bfa3b7a3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + e6684114271e4e63cc700e319fc1f418edaa5c5e - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + e6684114271e4e63cc700e319fc1f418edaa5c5e - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + e6684114271e4e63cc700e319fc1f418edaa5c5e - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + a916def25585f474712c7e2cbd763977c3c37ff6 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + a916def25585f474712c7e2cbd763977c3c37ff6 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + a916def25585f474712c7e2cbd763977c3c37ff6 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + a916def25585f474712c7e2cbd763977c3c37ff6 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + a916def25585f474712c7e2cbd763977c3c37ff6 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + a916def25585f474712c7e2cbd763977c3c37ff6 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 918dfdcebc70489d28cc40fda9497bd6c3b0db65 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 918dfdcebc70489d28cc40fda9497bd6c3b0db65 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 918dfdcebc70489d28cc40fda9497bd6c3b0db65 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 918dfdcebc70489d28cc40fda9497bd6c3b0db65 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 918dfdcebc70489d28cc40fda9497bd6c3b0db65 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 918dfdcebc70489d28cc40fda9497bd6c3b0db65 https://github.com/dotnet/test-templates @@ -79,50 +79,50 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 9d1d639165b8c87bb2e319cdd295b81a4240bb40 + b18c3a8dd90ea3cb1c692570f5418640289aee72 - + https://github.com/dotnet/sdk - 9d1d639165b8c87bb2e319cdd295b81a4240bb40 + b18c3a8dd90ea3cb1c692570f5418640289aee72 - + https://github.com/dotnet/winforms - e9176d39fa30c6fda81b679274b9316329e0c35e + 97d99ec9e047dcdff90185bfd0bbe9f26b7be62f - + https://github.com/dotnet/wpf - de2e9785920c11aca594fc3506b8d8052b9b3260 + 397cc042b895306d77248b9f172cbd4ab9f29cf6 - + https://github.com/dotnet/fsharp - 068ebd3c599bc5a47163a18b8b90d2fe5517186e + a443243512fc6a6c6f9c6bdb3d3084ea581a92db - + https://github.com/microsoft/vstest - 4fcacb284064e66e670689b9888c0c438b1f4154 + 0c0fafa64de5c73981e7c40a99d7363f57635f60 https://github.com/mono/linker 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 linker - + https://github.com/dotnet/roslyn - 82b3b1f2d95299c9f511069eff25d0501fc2421d + 100f4bee62f45e4ef8756956529d91a7f3407a20 - + https://github.com/dotnet/msbuild - d58e2b7864627321d75b7a47850e9b80deac7db6 + b33e5486fa13b27d99e7e31773a03743173574ed - + https://github.com/NuGet/NuGet.Client - 3501ddedc274ac10d4b135856b7593a6bb8a72f1 + 42743b4a78141def1d4acafe500aa02c9e59de85 - https://github.com/dotnet/CliCommandLineParser + https://github.com/dotnet/cliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 diff --git a/eng/Versions.props b/eng/Versions.props index 077332b86..d5b5c8647 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20431.1 + 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20431.2 + 5.0.0-rc.2.20452.6 @@ -41,41 +41,41 @@ - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.2.20456.3 + 5.0.0-rc.2.20456.3 + 5.0.0-rc.2.20456.3 + 5.0.0-rc.2.20456.3 + 5.0.0-rc.2.20456.3 + 5.0.0-rc.2.20456.3 0.2.0 - 5.0.100-rc.1.20451.7 - 5.0.100-rc.1.20451.7 + 5.0.100-rc.2.20458.1 + 5.0.100-rc.2.20458.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20431.14 + 5.0.0-rc.2.20454.25 - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 + 5.0.0-rc.2.20454.25 + 5.0.0-rc.2.20454.25 + 5.0.0-rc.2.20454.25 + 5.0.0-rc.2.20454.25 + 5.0.0-rc.2.20454.25 2.1.0 - 5.0.0-rc.1.20431.13 - 5.0.0-rc.1.20431.13 - 5.0.0-rc.1.20431.13 + 5.0.0-rc.2.20454.1 + 5.0.0-rc.2.20454.1 + 5.0.0-rc.2.20454.1 @@ -124,7 +124,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.8.0-release-20200828-02 + 16.8.0-release-20200902-05 10.0.17763.1-preview diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index cc81a3f58..91a04a34b 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -71,7 +71,7 @@ - + From e6c9004caaa3eacc995c19b5269ca1517d4a3a50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:52:06 +0000 Subject: [PATCH 006/134] Update dependencies from https://github.com/dotnet/sdk build 20200908.5 (#8422) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.2.20458.1 to 5.0.100-rc.2.20458.5 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.2.20458.1 to 5.0.100-rc.2.20458.5 --- 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 bfa3b7a3c..b7be6add9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - b18c3a8dd90ea3cb1c692570f5418640289aee72 + 7af57079690c02fabe842320361c253be4c9057e - + https://github.com/dotnet/sdk - b18c3a8dd90ea3cb1c692570f5418640289aee72 + 7af57079690c02fabe842320361c253be4c9057e diff --git a/eng/Versions.props b/eng/Versions.props index d5b5c8647..8cea103de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20458.1 - 5.0.100-rc.2.20458.1 + 5.0.100-rc.2.20458.5 + 5.0.100-rc.2.20458.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59a5ba6e73af7914aa698799058987cdb1944d22 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 8 Sep 2020 13:24:00 -0700 Subject: [PATCH 007/134] Add 3.1 Blazor WASM templates --- eng/Versions.props | 1 + src/redist/targets/BundledTemplates.targets | 1 + 2 files changed, 2 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index 8cea103de..41c0d7963 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,6 +105,7 @@ $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) 3.1.7 + 3.2.1 4.8.0-rc2.19462.10 3.0.0 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index b32bd497c..34833a423 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -70,6 +70,7 @@ + From 468372f93dcbe7761e8ee7f46eb8e073fbbe80f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 00:34:37 +0000 Subject: [PATCH 008/134] Update dependencies from https://github.com/dotnet/sdk build 20200908.9 (#8432) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.2.20458.5 to 5.0.100-rc.2.20458.9 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.2.20458.5 to 5.0.100-rc.2.20458.9 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 - dotnet-dev-certs: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 - dotnet-user-secrets: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 - dotnet-watch: from 5.0.0-rc.2.20456.3 to 5.0.0-rc.2.20458.6 --- 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 b7be6add9..b2b094b61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime a916def25585f474712c7e2cbd763977c3c37ff6 - + https://github.com/dotnet/aspnetcore - 918dfdcebc70489d28cc40fda9497bd6c3b0db65 + 9cbf55b09413a12a322010cd938e7485ce038675 - + https://github.com/dotnet/aspnetcore - 918dfdcebc70489d28cc40fda9497bd6c3b0db65 + 9cbf55b09413a12a322010cd938e7485ce038675 - + https://github.com/dotnet/aspnetcore - 918dfdcebc70489d28cc40fda9497bd6c3b0db65 + 9cbf55b09413a12a322010cd938e7485ce038675 - + https://github.com/dotnet/aspnetcore - 918dfdcebc70489d28cc40fda9497bd6c3b0db65 + 9cbf55b09413a12a322010cd938e7485ce038675 - + https://github.com/dotnet/aspnetcore - 918dfdcebc70489d28cc40fda9497bd6c3b0db65 + 9cbf55b09413a12a322010cd938e7485ce038675 - + https://github.com/dotnet/aspnetcore - 918dfdcebc70489d28cc40fda9497bd6c3b0db65 + 9cbf55b09413a12a322010cd938e7485ce038675 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 7af57079690c02fabe842320361c253be4c9057e + 3fe0d030974c47f8a201875e38a114f4b53ce722 - + https://github.com/dotnet/sdk - 7af57079690c02fabe842320361c253be4c9057e + 3fe0d030974c47f8a201875e38a114f4b53ce722 diff --git a/eng/Versions.props b/eng/Versions.props index 8cea103de..6845f6b5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20456.3 - 5.0.0-rc.2.20456.3 - 5.0.0-rc.2.20456.3 - 5.0.0-rc.2.20456.3 - 5.0.0-rc.2.20456.3 - 5.0.0-rc.2.20456.3 + 5.0.0-rc.2.20458.6 + 5.0.0-rc.2.20458.6 + 5.0.0-rc.2.20458.6 + 5.0.0-rc.2.20458.6 + 5.0.0-rc.2.20458.6 + 5.0.0-rc.2.20458.6 0.2.0 - 5.0.100-rc.2.20458.5 - 5.0.100-rc.2.20458.5 + 5.0.100-rc.2.20458.9 + 5.0.100-rc.2.20458.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eb0d13e069fca536bf7bb0ef08e3b285f6ff8337 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 03:16:17 +0000 Subject: [PATCH 009/134] Update dependencies from https://github.com/dotnet/sdk build 20200908.11 (#8436) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20454.4 to 3.8.0-3.20458.6 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.2.20458.9 to 5.0.100-rc.2.20458.11 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.2.20458.9 to 5.0.100-rc.2.20458.11 - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20454.4 to 3.8.0-3.20458.6 --- 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 b2b094b61..fe849f5b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 3fe0d030974c47f8a201875e38a114f4b53ce722 + bbdfbb46627c359aa75f8e55ccaaa0cf3c31908c - + https://github.com/dotnet/sdk - 3fe0d030974c47f8a201875e38a114f4b53ce722 + bbdfbb46627c359aa75f8e55ccaaa0cf3c31908c @@ -109,9 +109,9 @@ 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 linker - + https://github.com/dotnet/roslyn - 100f4bee62f45e4ef8756956529d91a7f3407a20 + b446afd34759150c2ea3b86ab794104e12e64db1 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 6845f6b5d..515588903 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20458.9 - 5.0.100-rc.2.20458.9 + 5.0.100-rc.2.20458.11 + 5.0.100-rc.2.20458.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2344e166fc2c0c38636227b64daaca43d2890623 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 04:48:36 +0000 Subject: [PATCH 010/134] Update dependencies from https://github.com/dotnet/sdk build 20200908.12 (#8438) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.2.20458.11 to 5.0.100-rc.2.20458.12 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.2.20458.11 to 5.0.100-rc.2.20458.12 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 - dotnet-dev-certs: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 - dotnet-user-secrets: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 - dotnet-watch: from 5.0.0-rc.2.20458.6 to 5.0.0-rc.2.20458.11 --- 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 fe849f5b6..02df90afe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime a916def25585f474712c7e2cbd763977c3c37ff6 - + https://github.com/dotnet/aspnetcore - 9cbf55b09413a12a322010cd938e7485ce038675 + 0a33267c1c2ae6518cb081652728799e6d3b4d60 - + https://github.com/dotnet/aspnetcore - 9cbf55b09413a12a322010cd938e7485ce038675 + 0a33267c1c2ae6518cb081652728799e6d3b4d60 - + https://github.com/dotnet/aspnetcore - 9cbf55b09413a12a322010cd938e7485ce038675 + 0a33267c1c2ae6518cb081652728799e6d3b4d60 - + https://github.com/dotnet/aspnetcore - 9cbf55b09413a12a322010cd938e7485ce038675 + 0a33267c1c2ae6518cb081652728799e6d3b4d60 - + https://github.com/dotnet/aspnetcore - 9cbf55b09413a12a322010cd938e7485ce038675 + 0a33267c1c2ae6518cb081652728799e6d3b4d60 - + https://github.com/dotnet/aspnetcore - 9cbf55b09413a12a322010cd938e7485ce038675 + 0a33267c1c2ae6518cb081652728799e6d3b4d60 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - bbdfbb46627c359aa75f8e55ccaaa0cf3c31908c + e996e023fc99a1cc0418854680b9de64e968803b - + https://github.com/dotnet/sdk - bbdfbb46627c359aa75f8e55ccaaa0cf3c31908c + e996e023fc99a1cc0418854680b9de64e968803b diff --git a/eng/Versions.props b/eng/Versions.props index 515588903..bf012f8eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20458.6 - 5.0.0-rc.2.20458.6 - 5.0.0-rc.2.20458.6 - 5.0.0-rc.2.20458.6 - 5.0.0-rc.2.20458.6 - 5.0.0-rc.2.20458.6 + 5.0.0-rc.2.20458.11 + 5.0.0-rc.2.20458.11 + 5.0.0-rc.2.20458.11 + 5.0.0-rc.2.20458.11 + 5.0.0-rc.2.20458.11 + 5.0.0-rc.2.20458.11 0.2.0 - 5.0.100-rc.2.20458.11 - 5.0.100-rc.2.20458.11 + 5.0.100-rc.2.20458.12 + 5.0.100-rc.2.20458.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 38e8f8bdb11ac4aa601009b58f6544d7d6177f32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 07:03:24 +0000 Subject: [PATCH 011/134] Update dependencies from https://github.com/dotnet/sdk build 20200908.15 (#8441) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.2.20458.12 to 5.0.100-rc.2.20458.15 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.2.20458.12 to 5.0.100-rc.2.20458.15 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 - dotnet-dev-certs: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 - dotnet-user-secrets: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 - dotnet-watch: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20458.13 --- 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 02df90afe..f8149fb41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime a916def25585f474712c7e2cbd763977c3c37ff6 - + https://github.com/dotnet/aspnetcore - 0a33267c1c2ae6518cb081652728799e6d3b4d60 + 95763af89a4b8abd42bf9e9ed654e359e13a4650 - + https://github.com/dotnet/aspnetcore - 0a33267c1c2ae6518cb081652728799e6d3b4d60 + 95763af89a4b8abd42bf9e9ed654e359e13a4650 - + https://github.com/dotnet/aspnetcore - 0a33267c1c2ae6518cb081652728799e6d3b4d60 + 95763af89a4b8abd42bf9e9ed654e359e13a4650 - + https://github.com/dotnet/aspnetcore - 0a33267c1c2ae6518cb081652728799e6d3b4d60 + 95763af89a4b8abd42bf9e9ed654e359e13a4650 - + https://github.com/dotnet/aspnetcore - 0a33267c1c2ae6518cb081652728799e6d3b4d60 + 95763af89a4b8abd42bf9e9ed654e359e13a4650 - + https://github.com/dotnet/aspnetcore - 0a33267c1c2ae6518cb081652728799e6d3b4d60 + 95763af89a4b8abd42bf9e9ed654e359e13a4650 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - e996e023fc99a1cc0418854680b9de64e968803b + 25da0455f32d816c728d8709e76d175025428a02 - + https://github.com/dotnet/sdk - e996e023fc99a1cc0418854680b9de64e968803b + 25da0455f32d816c728d8709e76d175025428a02 diff --git a/eng/Versions.props b/eng/Versions.props index bf012f8eb..8873d3e82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20458.11 - 5.0.0-rc.2.20458.11 - 5.0.0-rc.2.20458.11 - 5.0.0-rc.2.20458.11 - 5.0.0-rc.2.20458.11 - 5.0.0-rc.2.20458.11 + 5.0.0-rc.2.20458.13 + 5.0.0-rc.2.20458.13 + 5.0.0-rc.2.20458.13 + 5.0.0-rc.2.20458.13 + 5.0.0-rc.2.20458.13 + 5.0.0-rc.2.20458.13 0.2.0 - 5.0.100-rc.2.20458.12 - 5.0.100-rc.2.20458.12 + 5.0.100-rc.2.20458.15 + 5.0.100-rc.2.20458.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1168e3d7d9d29bf06771f1bd0141512cacbdda84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 12:23:28 +0000 Subject: [PATCH 012/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8443) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.2.20458.15 to 5.0.100-rc.2.20459.2 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.2.20458.15 to 5.0.100-rc.2.20459.2 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20454.25 to 5.0.0-rc.2.20458.14 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 - dotnet-dev-certs: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 - dotnet-user-secrets: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 - dotnet-watch: from 5.0.0-rc.2.20458.13 to 5.0.0-rc.2.20458.16 --- 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 f8149fb41..7e0cfed47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop e6684114271e4e63cc700e319fc1f418edaa5c5e - + https://github.com/dotnet/runtime - a916def25585f474712c7e2cbd763977c3c37ff6 + 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/runtime - a916def25585f474712c7e2cbd763977c3c37ff6 + 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/runtime - a916def25585f474712c7e2cbd763977c3c37ff6 + 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/runtime - a916def25585f474712c7e2cbd763977c3c37ff6 + 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/runtime - a916def25585f474712c7e2cbd763977c3c37ff6 + 482494f9ecc9a630599278b80893841462c90a5b @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a916def25585f474712c7e2cbd763977c3c37ff6 + 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/aspnetcore - 95763af89a4b8abd42bf9e9ed654e359e13a4650 + d5a477ce1ef1298dd27bb9f93ea8801dddfec652 - + https://github.com/dotnet/aspnetcore - 95763af89a4b8abd42bf9e9ed654e359e13a4650 + d5a477ce1ef1298dd27bb9f93ea8801dddfec652 - + https://github.com/dotnet/aspnetcore - 95763af89a4b8abd42bf9e9ed654e359e13a4650 + d5a477ce1ef1298dd27bb9f93ea8801dddfec652 - + https://github.com/dotnet/aspnetcore - 95763af89a4b8abd42bf9e9ed654e359e13a4650 + d5a477ce1ef1298dd27bb9f93ea8801dddfec652 - + https://github.com/dotnet/aspnetcore - 95763af89a4b8abd42bf9e9ed654e359e13a4650 + d5a477ce1ef1298dd27bb9f93ea8801dddfec652 - + https://github.com/dotnet/aspnetcore - 95763af89a4b8abd42bf9e9ed654e359e13a4650 + d5a477ce1ef1298dd27bb9f93ea8801dddfec652 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 25da0455f32d816c728d8709e76d175025428a02 + 6b7967acfb07ebd8291e1eed75526548f27b1cb1 - + https://github.com/dotnet/sdk - 25da0455f32d816c728d8709e76d175025428a02 + 6b7967acfb07ebd8291e1eed75526548f27b1cb1 diff --git a/eng/Versions.props b/eng/Versions.props index 8873d3e82..200e38c90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,34 +41,34 @@ - 5.0.0-rc.2.20458.13 - 5.0.0-rc.2.20458.13 - 5.0.0-rc.2.20458.13 - 5.0.0-rc.2.20458.13 - 5.0.0-rc.2.20458.13 - 5.0.0-rc.2.20458.13 + 5.0.0-rc.2.20458.16 + 5.0.0-rc.2.20458.16 + 5.0.0-rc.2.20458.16 + 5.0.0-rc.2.20458.16 + 5.0.0-rc.2.20458.16 + 5.0.0-rc.2.20458.16 0.2.0 - 5.0.100-rc.2.20458.15 - 5.0.100-rc.2.20458.15 + 5.0.100-rc.2.20459.2 + 5.0.100-rc.2.20459.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20454.25 + 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20454.25 - 5.0.0-rc.2.20454.25 - 5.0.0-rc.2.20454.25 - 5.0.0-rc.2.20454.25 - 5.0.0-rc.2.20454.25 + 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20458.14 2.1.0 From 4e6d364bbb9d815f540dcc433492e512791d1227 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 14:11:18 +0000 Subject: [PATCH 013/134] Update dependencies from https://github.com/dotnet/sdk build 20200909.3 (#8449) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20458.6 to 3.8.0-3.20459.5 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.2.20459.2 to 5.0.100-rc.2.20459.3 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.2.20459.2 to 5.0.100-rc.2.20459.3 - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20458.6 to 3.8.0-3.20459.5 --- 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 7e0cfed47..c0fb1ef1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 6b7967acfb07ebd8291e1eed75526548f27b1cb1 + e2e904a7a815095385d90095826d1addcc338537 - + https://github.com/dotnet/sdk - 6b7967acfb07ebd8291e1eed75526548f27b1cb1 + e2e904a7a815095385d90095826d1addcc338537 @@ -109,9 +109,9 @@ 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 linker - + https://github.com/dotnet/roslyn - b446afd34759150c2ea3b86ab794104e12e64db1 + f0e0e43c1eacb2131acd97d38b871c5bf2ac16b6 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 200e38c90..a1c1bfee0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20459.2 - 5.0.100-rc.2.20459.2 + 5.0.100-rc.2.20459.3 + 5.0.100-rc.2.20459.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2815f3cae11b36893c14909d6976971aec409e15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 14:49:02 +0000 Subject: [PATCH 014/134] Update dependencies from https://github.com/dotnet/sdk build 20200909.4 (#8451) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20431.3 to 5.0.0-rc.2.20459.1 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.2.20459.3 to 5.0.100-rc.2.20459.4 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.2.20459.3 to 5.0.100-rc.2.20459.4 - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20431.3 to 5.0.0-rc.2.20459.1 --- 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 c0fb1ef1f..a57e33fb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,17 +75,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - da62f3656cac0ac4bfb6b012bc072b3499f78e6c + e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - e2e904a7a815095385d90095826d1addcc338537 + 186616633f99b278702b33103275be298e6dd907 - + https://github.com/dotnet/sdk - e2e904a7a815095385d90095826d1addcc338537 + 186616633f99b278702b33103275be298e6dd907 diff --git a/eng/Versions.props b/eng/Versions.props index a1c1bfee0..6a5765ada 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 5.0.0-rc.1.20431.3 + 5.0.0-rc.2.20459.1 @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20459.3 - 5.0.100-rc.2.20459.3 + 5.0.100-rc.2.20459.4 + 5.0.100-rc.2.20459.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 03fef8e30d6c6526e474485646bf34a57143812e Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 9 Sep 2020 10:37:16 -0700 Subject: [PATCH 015/134] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 41c0d7963..848db00d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -119,7 +119,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.14 + 2.1.22 From bde784401524d74236da707e7a3069acda0dcb6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 21:22:22 +0000 Subject: [PATCH 016/134] Update dependencies from https://github.com/dotnet/sdk build 20200909.7 (#8454) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20458.16 to 5.0.0-rc.2.20459.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20458.16 to 5.0.0-rc.2.20459.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20458.16 to 5.0.0-rc.2.20459.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20458.16 to 5.0.0-rc.2.20459.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20458.16 to 5.0.0-rc.2.20459.2 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20458.16 to 5.0.0-rc.2.20459.2 (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 a57e33fb2..8d13b2371 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/aspnetcore - d5a477ce1ef1298dd27bb9f93ea8801dddfec652 + 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 - + https://github.com/dotnet/aspnetcore - d5a477ce1ef1298dd27bb9f93ea8801dddfec652 + 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 - + https://github.com/dotnet/aspnetcore - d5a477ce1ef1298dd27bb9f93ea8801dddfec652 + 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 - + https://github.com/dotnet/aspnetcore - d5a477ce1ef1298dd27bb9f93ea8801dddfec652 + 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 - + https://github.com/dotnet/aspnetcore - d5a477ce1ef1298dd27bb9f93ea8801dddfec652 + 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 - + https://github.com/dotnet/aspnetcore - d5a477ce1ef1298dd27bb9f93ea8801dddfec652 + 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 186616633f99b278702b33103275be298e6dd907 + 5eddf5dceb5b2cf79b5d9e4451266ed0a26fd2ce - + https://github.com/dotnet/sdk - 186616633f99b278702b33103275be298e6dd907 + 5eddf5dceb5b2cf79b5d9e4451266ed0a26fd2ce diff --git a/eng/Versions.props b/eng/Versions.props index 6a5765ada..ca7b77ff7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20458.16 - 5.0.0-rc.2.20458.16 - 5.0.0-rc.2.20458.16 - 5.0.0-rc.2.20458.16 - 5.0.0-rc.2.20458.16 - 5.0.0-rc.2.20458.16 + 5.0.0-rc.2.20459.2 + 5.0.0-rc.2.20459.2 + 5.0.0-rc.2.20459.2 + 5.0.0-rc.2.20459.2 + 5.0.0-rc.2.20459.2 + 5.0.0-rc.2.20459.2 0.2.0 - 5.0.100-rc.2.20459.4 - 5.0.100-rc.2.20459.4 + 5.0.100-rc.2.20459.7 + 5.0.100-rc.2.20459.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f9fd68ad4ae33dcc8ccf6e443bd87f59680c7f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 22:12:38 +0000 Subject: [PATCH 017/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8455) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20454.1 to 5.0.0-rc.2.20459.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20454.1 to 5.0.0-rc.2.20459.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.2.20458.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20454.1 to 5.0.0-rc.2.20459.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20452.6 to 5.0.0-rc.2.20458.11 (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 8d13b2371..e63df6d7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - e6684114271e4e63cc700e319fc1f418edaa5c5e + 8a6f85962207c03b6845a9e72cfc06009db29a1d - + https://github.com/dotnet/windowsdesktop - e6684114271e4e63cc700e319fc1f418edaa5c5e + 8a6f85962207c03b6845a9e72cfc06009db29a1d - + https://github.com/dotnet/windowsdesktop - e6684114271e4e63cc700e319fc1f418edaa5c5e + 8a6f85962207c03b6845a9e72cfc06009db29a1d https://github.com/dotnet/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 5eddf5dceb5b2cf79b5d9e4451266ed0a26fd2ce + ddcd762d33321644e028cf738180ec5eff1f0049 - + https://github.com/dotnet/sdk - 5eddf5dceb5b2cf79b5d9e4451266ed0a26fd2ce + ddcd762d33321644e028cf738180ec5eff1f0049 - + https://github.com/dotnet/winforms - 97d99ec9e047dcdff90185bfd0bbe9f26b7be62f + 754e593f09d734e9b96d40f02a2cbf78795d6bfb - + https://github.com/dotnet/wpf - 397cc042b895306d77248b9f172cbd4ab9f29cf6 + c33f72de038ae93b38fd64cfdbb5db75d1b715df https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ca7b77ff7..12e8c7cf4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20451.14 + 5.0.0-rc.2.20458.11 - 5.0.0-rc.2.20452.6 + 5.0.0-rc.2.20458.11 @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20459.7 - 5.0.100-rc.2.20459.7 + 5.0.100-rc.2.20459.9 + 5.0.100-rc.2.20459.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.2.20454.1 - 5.0.0-rc.2.20454.1 - 5.0.0-rc.2.20454.1 + 5.0.0-rc.2.20459.1 + 5.0.0-rc.2.20459.1 + 5.0.0-rc.2.20459.1 From 03db425853fc47ab27828be396fccf573d07c79a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 01:41:47 +0000 Subject: [PATCH 018/134] Update dependencies from https://github.com/dotnet/sdk build 20200909.10 (#8460) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20459.2 to 5.0.0-rc.2.20459.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20459.2 to 5.0.0-rc.2.20459.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20459.2 to 5.0.0-rc.2.20459.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20459.2 to 5.0.0-rc.2.20459.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20459.2 to 5.0.0-rc.2.20459.5 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20459.2 to 5.0.0-rc.2.20459.5 (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 e63df6d7a..71be5421a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/aspnetcore - 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 + 0d548f302b472e8c1d48719aeaebc14131c03e56 - + https://github.com/dotnet/aspnetcore - 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 + 0d548f302b472e8c1d48719aeaebc14131c03e56 - + https://github.com/dotnet/aspnetcore - 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 + 0d548f302b472e8c1d48719aeaebc14131c03e56 - + https://github.com/dotnet/aspnetcore - 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 + 0d548f302b472e8c1d48719aeaebc14131c03e56 - + https://github.com/dotnet/aspnetcore - 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 + 0d548f302b472e8c1d48719aeaebc14131c03e56 - + https://github.com/dotnet/aspnetcore - 9f5276d17a13a68f4ff56dac1c038aaed8bb6f72 + 0d548f302b472e8c1d48719aeaebc14131c03e56 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - ddcd762d33321644e028cf738180ec5eff1f0049 + 64059c1dc11d0911676fa1dc17ae9756e9073812 - + https://github.com/dotnet/sdk - ddcd762d33321644e028cf738180ec5eff1f0049 + 64059c1dc11d0911676fa1dc17ae9756e9073812 diff --git a/eng/Versions.props b/eng/Versions.props index 12e8c7cf4..60545aa0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20459.2 - 5.0.0-rc.2.20459.2 - 5.0.0-rc.2.20459.2 - 5.0.0-rc.2.20459.2 - 5.0.0-rc.2.20459.2 - 5.0.0-rc.2.20459.2 + 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.5 0.2.0 - 5.0.100-rc.2.20459.9 - 5.0.100-rc.2.20459.9 + 5.0.100-rc.2.20459.10 + 5.0.100-rc.2.20459.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c655e68f49a3f6b0697ede712d9c142c0491dcb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 03:43:22 +0000 Subject: [PATCH 019/134] Update dependencies from https://github.com/dotnet/sdk build 20200909.12 (#8465) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.8.0-preview.3.6812 to 5.8.0-preview.3.6823 (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 71be5421a..2b0593c1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 64059c1dc11d0911676fa1dc17ae9756e9073812 + c78f00840cf73050ad35a60b9768452e9ebec54c - + https://github.com/dotnet/sdk - 64059c1dc11d0911676fa1dc17ae9756e9073812 + c78f00840cf73050ad35a60b9768452e9ebec54c @@ -117,9 +117,9 @@ https://github.com/dotnet/msbuild b33e5486fa13b27d99e7e31773a03743173574ed - + https://github.com/NuGet/NuGet.Client - 42743b4a78141def1d4acafe500aa02c9e59de85 + 5eaf25677df20ce322acd08478ccdaddd87f1a52 https://github.com/dotnet/cliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 60545aa0c..44a36c7a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20459.10 - 5.0.100-rc.2.20459.10 + 5.0.100-rc.2.20459.12 + 5.0.100-rc.2.20459.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26354077a47c24c311abfb90d1d36c7a7d773796 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 10:04:24 +0000 Subject: [PATCH 020/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.1 (#8469) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20459.5 to 3.8.0-3.20460.2 (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 2b0593c1c..998dc3cf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - c78f00840cf73050ad35a60b9768452e9ebec54c + 29234bde5fbdc338e8333bfa2cd9bf29229f4835 - + https://github.com/dotnet/sdk - c78f00840cf73050ad35a60b9768452e9ebec54c + 29234bde5fbdc338e8333bfa2cd9bf29229f4835 @@ -109,9 +109,9 @@ 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 linker - + https://github.com/dotnet/roslyn - f0e0e43c1eacb2131acd97d38b871c5bf2ac16b6 + d57cda76c2b76cff75487a085d289cfadd99150b https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 44a36c7a9..d5fefb697 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20459.12 - 5.0.100-rc.2.20459.12 + 5.0.100-rc.2.20460.1 + 5.0.100-rc.2.20460.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c8ff60c134e9d226e1b4510dd1c69b626cd9fcfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 13:06:50 +0000 Subject: [PATCH 021/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.4 (#8474) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20459.1 to 5.0.0-rc.2.20459.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20459.1 to 5.0.0-rc.2.20459.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20459.20 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20459.20 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20459.20 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20459.20 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20459.20 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20459.20 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20459.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20459.1 to 5.0.0-rc.2.20459.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20458.11 to 5.0.0-rc.2.20459.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 998dc3cf3..5c2e1c87e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 8a6f85962207c03b6845a9e72cfc06009db29a1d + 1fc369dc454d1cffde35cbd5d9abaa701d024655 - + https://github.com/dotnet/windowsdesktop - 8a6f85962207c03b6845a9e72cfc06009db29a1d + 1fc369dc454d1cffde35cbd5d9abaa701d024655 - + https://github.com/dotnet/windowsdesktop - 8a6f85962207c03b6845a9e72cfc06009db29a1d + 1fc369dc454d1cffde35cbd5d9abaa701d024655 https://github.com/dotnet/runtime @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/aspnetcore - 0d548f302b472e8c1d48719aeaebc14131c03e56 + 70725b554c3820a2919bc27341d5865c87da5eec - + https://github.com/dotnet/aspnetcore - 0d548f302b472e8c1d48719aeaebc14131c03e56 + 70725b554c3820a2919bc27341d5865c87da5eec - + https://github.com/dotnet/aspnetcore - 0d548f302b472e8c1d48719aeaebc14131c03e56 + 70725b554c3820a2919bc27341d5865c87da5eec - + https://github.com/dotnet/aspnetcore - 0d548f302b472e8c1d48719aeaebc14131c03e56 + 70725b554c3820a2919bc27341d5865c87da5eec - + https://github.com/dotnet/aspnetcore - 0d548f302b472e8c1d48719aeaebc14131c03e56 + 70725b554c3820a2919bc27341d5865c87da5eec - + https://github.com/dotnet/aspnetcore - 0d548f302b472e8c1d48719aeaebc14131c03e56 + 70725b554c3820a2919bc27341d5865c87da5eec https://github.com/dotnet/test-templates @@ -79,22 +79,22 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 29234bde5fbdc338e8333bfa2cd9bf29229f4835 + 33182742f3e23947af0a5604ee1f9850ab84e31b - + https://github.com/dotnet/sdk - 29234bde5fbdc338e8333bfa2cd9bf29229f4835 + 33182742f3e23947af0a5604ee1f9850ab84e31b - + https://github.com/dotnet/winforms - 754e593f09d734e9b96d40f02a2cbf78795d6bfb + b2f24a91b3ea0f5814043cbdf4ddae84b6f78bd2 - + https://github.com/dotnet/wpf - c33f72de038ae93b38fd64cfdbb5db75d1b715df + 6a244577993f4aae6dd5c90aa1bc974d1e7336c7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d5fefb697..cd5b22324 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20458.11 + 5.0.0-rc.2.20459.6 - 5.0.0-rc.2.20458.11 + 5.0.0-rc.2.20459.5 @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20459.5 - 5.0.0-rc.2.20459.5 - 5.0.0-rc.2.20459.5 - 5.0.0-rc.2.20459.5 - 5.0.0-rc.2.20459.5 - 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.20 + 5.0.0-rc.2.20459.20 + 5.0.0-rc.2.20459.20 + 5.0.0-rc.2.20459.20 + 5.0.0-rc.2.20459.20 + 5.0.0-rc.2.20459.20 0.2.0 - 5.0.100-rc.2.20460.1 - 5.0.100-rc.2.20460.1 + 5.0.100-rc.2.20460.4 + 5.0.100-rc.2.20460.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.2.20459.1 - 5.0.0-rc.2.20459.1 - 5.0.0-rc.2.20459.1 + 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.5 From 004a01521f89694da8d1a66c83ead4c7c24d1b93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 13:44:02 +0000 Subject: [PATCH 022/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.6 (#8476) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20457.3 to 11.0.0-beta.20459.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 5c2e1c87e..162cb2e61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 33182742f3e23947af0a5604ee1f9850ab84e31b + 4d521c7ef14930ee50b01352af8e7089f8c17b3b - + https://github.com/dotnet/sdk - 33182742f3e23947af0a5604ee1f9850ab84e31b + 4d521c7ef14930ee50b01352af8e7089f8c17b3b @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf 6a244577993f4aae6dd5c90aa1bc974d1e7336c7 - + https://github.com/dotnet/fsharp - a443243512fc6a6c6f9c6bdb3d3084ea581a92db + 8f22066d2e0512b55e7f77c88bb89b48f3972a28 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index cd5b22324..50608e0ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20460.4 - 5.0.100-rc.2.20460.4 + 5.0.100-rc.2.20460.6 + 5.0.100-rc.2.20460.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 240b4a18d61616bef220e29726e0664de9e6f502 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 15:31:43 +0000 Subject: [PATCH 023/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.8 (#8479) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20460.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20460.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20459.6 to 5.0.0-rc.2.20459.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20460.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20459.5 to 5.0.0-rc.2.20459.6 (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 162cb2e61..3cb48a959 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 1fc369dc454d1cffde35cbd5d9abaa701d024655 + bb0ccfb678b5aaec07050fd92cea7f1c71998310 - + https://github.com/dotnet/windowsdesktop - 1fc369dc454d1cffde35cbd5d9abaa701d024655 + bb0ccfb678b5aaec07050fd92cea7f1c71998310 - + https://github.com/dotnet/windowsdesktop - 1fc369dc454d1cffde35cbd5d9abaa701d024655 + bb0ccfb678b5aaec07050fd92cea7f1c71998310 https://github.com/dotnet/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 4d521c7ef14930ee50b01352af8e7089f8c17b3b + 534ecf875725a08c2791c4a1bfda93791eb8e5e5 - + https://github.com/dotnet/sdk - 4d521c7ef14930ee50b01352af8e7089f8c17b3b + 534ecf875725a08c2791c4a1bfda93791eb8e5e5 - + https://github.com/dotnet/winforms - b2f24a91b3ea0f5814043cbdf4ddae84b6f78bd2 + ea593ae4b7995bc5d01b47ad06f110428fa97431 - + https://github.com/dotnet/wpf - 6a244577993f4aae6dd5c90aa1bc974d1e7336c7 + 2c069a6c75d8d4ba6ead82021a70937d5d7a3171 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 50608e0ee..ea2e73c5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20459.6 + 5.0.0-rc.2.20459.7 - 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20459.6 @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20460.6 - 5.0.100-rc.2.20460.6 + 5.0.100-rc.2.20460.8 + 5.0.100-rc.2.20460.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.2.20459.5 - 5.0.0-rc.2.20459.5 - 5.0.0-rc.2.20459.5 + 5.0.0-rc.2.20460.1 + 5.0.0-rc.2.20460.1 + 5.0.0-rc.2.20460.1 From 4ec5c73cd1e72bd761484c479bd93250b11623c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 18:10:34 +0000 Subject: [PATCH 024/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.12 (#8483) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20460.1 to 5.0.0-rc.2.20460.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20460.1 to 5.0.0-rc.2.20460.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20459.7 to 5.0.0-rc.2.20459.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20460.1 to 5.0.0-rc.2.20460.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20459.6 to 5.0.0-rc.2.20460.2 (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 3cb48a959..9b7bd2a1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - bb0ccfb678b5aaec07050fd92cea7f1c71998310 + 20f52bd07f69689a512ed2f88fa1defe4d898ac4 - + https://github.com/dotnet/windowsdesktop - bb0ccfb678b5aaec07050fd92cea7f1c71998310 + 20f52bd07f69689a512ed2f88fa1defe4d898ac4 - + https://github.com/dotnet/windowsdesktop - bb0ccfb678b5aaec07050fd92cea7f1c71998310 + 20f52bd07f69689a512ed2f88fa1defe4d898ac4 https://github.com/dotnet/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 534ecf875725a08c2791c4a1bfda93791eb8e5e5 + 7e74312892a9941a4bccac4e7132216c2b5ce6b2 - + https://github.com/dotnet/sdk - 534ecf875725a08c2791c4a1bfda93791eb8e5e5 + 7e74312892a9941a4bccac4e7132216c2b5ce6b2 - + https://github.com/dotnet/winforms - ea593ae4b7995bc5d01b47ad06f110428fa97431 + 7dd240c9d38b74957a5a11472ce7fdb7d455ef95 - + https://github.com/dotnet/wpf - 2c069a6c75d8d4ba6ead82021a70937d5d7a3171 + c982847ea6c7a423ef9dc34ae0079b5b509f1a0c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a8b93693c..5883b6893 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20459.7 + 5.0.0-rc.2.20459.10 - 5.0.0-rc.2.20459.6 + 5.0.0-rc.2.20460.2 @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20460.8 - 5.0.100-rc.2.20460.8 + 5.0.100-rc.2.20460.12 + 5.0.100-rc.2.20460.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.2.20460.1 - 5.0.0-rc.2.20460.1 - 5.0.0-rc.2.20460.1 + 5.0.0-rc.2.20460.2 + 5.0.0-rc.2.20460.2 + 5.0.0-rc.2.20460.2 From a68d0c4636e3b2f2b29514cfee16e1e5074a6bca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 18:55:14 +0000 Subject: [PATCH 025/134] Update dependencies from https://github.com/dotnet/arcade build 20200909.8 (#8484) [release/5.0.1xx-rc2] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-20206-02 to 1.1.0-beta-20457-02 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/internal/Directory.Build.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 8 +++--- .../channels/generic-internal-channel.yml | 4 +-- .../channels/generic-public-channel.yml | 2 +- .../templates/post-build/post-build.yml | 2 +- eng/common/templates/steps/publish-logs.yml | 27 ++++++++++--------- eng/common/tools.ps1 | 18 ++++++++++--- global.json | 2 +- 10 files changed, 46 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b7bd2a1f..a392d8b6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,21 +136,21 @@ - + https://github.com/dotnet/arcade - 4be47e467013f8a07a1ed7b6e49e39c8150bde54 + 91470b0b14ba016c1fb78211b12775287c17b34e - + https://github.com/dotnet/arcade - 4be47e467013f8a07a1ed7b6e49e39c8150bde54 + 91470b0b14ba016c1fb78211b12775287c17b34e https://github.com/dotnet/source-build-reference-packages 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 - + https://github.com/dotnet/sourcelink - db7c31800400b6203d2b162255fa46cbaf2f04aa + e9d917c21e38e274a413a207d9e84eb80382b56f https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 5883b6893..cdf1284f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 5.0.0-beta.20431.1 + 5.0.0-beta.20459.8 diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props index e33179ef3..dbf99d82a 100644 --- a/eng/common/internal/Directory.Build.props +++ b/eng/common/internal/Directory.Build.props @@ -1,4 +1,4 @@ - + diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index f044afe8f..650b13b08 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -8,7 +8,7 @@ param( [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation, [Parameter(Mandatory=$false)][string] $EnableSigningValidation, [Parameter(Mandatory=$false)][string] $EnableNugetValidation, - [Parameter(Mandatory=$true)][string] $PublishInstallersAndChecksums, + [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters ) @@ -16,7 +16,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 # Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel - . $PSScriptRoot\..\darc-init.ps1 -darcVersion "1.1.0-beta.20418.1" + $darc = Get-Darc "1.1.0-beta.20418.1" $optionalParams = [System.Collections.ArrayList]::new() @@ -29,7 +29,7 @@ try { $optionalParams.Add("--no-wait") | Out-Null } - if ("true" -eq $PublishInstallersAndChecksums) { + if ("false" -ne $PublishInstallersAndChecksums) { $optionalParams.Add("--publish-installers-and-checksums") | Out-Null } @@ -50,7 +50,7 @@ try { } } - & darc add-build-to-channel ` + & $darc add-build-to-channel ` --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` --default-channels ` diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 59eb93a40..7ae525592 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -4,7 +4,7 @@ parameters: artifactsPublishingAdditionalParameters: '' dependsOn: - Validate - publishInstallersAndChecksums: false + publishInstallersAndChecksums: true symbolPublishingAdditionalParameters: '' stageName: '' channelName: '' @@ -158,7 +158,7 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release - /p:PublishInstallersAndChecksums=true + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey) /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index 7e80a621a..6cf39dbb2 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -4,7 +4,7 @@ parameters: artifactsPublishingAdditionalParameters: '' dependsOn: - Validate - publishInstallersAndChecksums: false + publishInstallersAndChecksums: true symbolPublishingAdditionalParameters: '' stageName: '' channelName: '' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 630a99d4d..df06f5371 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -19,7 +19,7 @@ parameters: enableSigningValidation: true enableSymbolValidation: false enableNugetValidation: true - publishInstallersAndChecksums: false + publishInstallersAndChecksums: true SDLValidationParameters: enable: false continueOnError: false diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index 428026d2e..88f238f36 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -3,20 +3,21 @@ parameters: JobLabel: '' steps: -- task: CopyFiles@2 - displayName: Copy Logs to $(Build.StagingDirectory)\BuildLogs +- task: Powershell@2 + displayName: Prepare Binlogs to Upload inputs: - SourceFolder: $(Build.SourcesDirectory)\artifacts - Contents: | - **/*.log - **/*.binlog - TargetFolder: '$(Build.StagingDirectory)\BuildLogs' + targetType: inline + script: | + New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true - condition: succeededOrFailed() + condition: always() -- task: PublishPipelineArtifact@1 - displayName: Publish BuildLogs +- task: PublishBuildArtifacts@1 + displayName: Publish Logs inputs: - targetPath: '$(Build.StagingDirectory)\BuildLogs' - artifactName: ${{ parameters.JobLabel }} - condition: succeededOrFailed() + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 1bf215525..37a3a3d68 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -240,8 +240,8 @@ function GetDotNetInstallScript([string] $dotnetRoot) { return $installScript } -function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = '') { - InstallDotNet $dotnetRoot $version $architecture '' $false $runtimeSourceFeed $runtimeSourceFeedKey +function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = '', [switch] $noPath) { + InstallDotNet $dotnetRoot $version $architecture '' $false $runtimeSourceFeed $runtimeSourceFeedKey -noPath:$noPath } function InstallDotNet([string] $dotnetRoot, @@ -250,7 +250,8 @@ function InstallDotNet([string] $dotnetRoot, [string] $runtime = '', [bool] $skipNonVersionedFiles = $false, [string] $runtimeSourceFeed = '', - [string] $runtimeSourceFeedKey = '') { + [string] $runtimeSourceFeedKey = '', + [switch] $noPath) { $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ @@ -261,6 +262,7 @@ function InstallDotNet([string] $dotnetRoot, if ($architecture) { $installParameters.Architecture = $architecture } if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } + if ($noPath) { $installParameters.NoPath = $True } try { & $installScript @installParameters @@ -716,6 +718,16 @@ function IsWindowsPlatform() { return [environment]::OSVersion.Platform -eq [PlatformID]::Win32NT } +function Get-Darc($version) { + $darcPath = "$TempDir\darc\$(New-Guid)" + if ($version -ne $null) { + & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host + } else { + & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath | Out-Host + } + return "$darcPath\darc.exe" +} + . $PSScriptRoot\pipeline-logging-functions.ps1 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..') diff --git a/global.json b/global.json index 1e7b0e89c..e571d9905 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20459.8" } } From 6494d2e72b92a2fea3f9aa20a967985bee6c0a54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 19:22:39 +0000 Subject: [PATCH 026/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.13 (#8486) [release/5.0.1xx-rc2] 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 a392d8b6a..5bcd7cf94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 7e74312892a9941a4bccac4e7132216c2b5ce6b2 + 54cc3dbb42a9792d6795131c52b3c464cfa50d11 - + https://github.com/dotnet/sdk - 7e74312892a9941a4bccac4e7132216c2b5ce6b2 + 54cc3dbb42a9792d6795131c52b3c464cfa50d11 diff --git a/eng/Versions.props b/eng/Versions.props index cdf1284f6..5c3e41a71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20460.12 - 5.0.100-rc.2.20460.12 + 5.0.100-rc.2.20460.13 + 5.0.100-rc.2.20460.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b463cdd8ad06787f58354859c8b345acbd0c18ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 20:04:41 +0000 Subject: [PATCH 027/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.14 (#8487) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rc.1.20431.3 to 5.0.0-rc.1.20459.2 (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 5bcd7cf94..7b9109fb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 54cc3dbb42a9792d6795131c52b3c464cfa50d11 + 9387b948993f019bd29a3eb6ac37114fb670251b - + https://github.com/dotnet/sdk - 54cc3dbb42a9792d6795131c52b3c464cfa50d11 + 9387b948993f019bd29a3eb6ac37114fb670251b @@ -104,9 +104,9 @@ https://github.com/microsoft/vstest 0c0fafa64de5c73981e7c40a99d7363f57635f60 - + https://github.com/mono/linker - 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 + 2f00433ff53753ac59f59690bcca1fa317495068 linker diff --git a/eng/Versions.props b/eng/Versions.props index 5c3e41a71..c692e5d80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20460.13 - 5.0.100-rc.2.20460.13 + 5.0.100-rc.2.20460.14 + 5.0.100-rc.2.20460.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 75b3a228bc74dd0115db73d7e9c2bb672fd0da2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 22:16:35 +0000 Subject: [PATCH 028/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.16 (#8489) [release/5.0.1xx-rc2] 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 7b9109fb3..1bc3c7b9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 9387b948993f019bd29a3eb6ac37114fb670251b + 5f2da4febe97aadb61dadc279c5117fbb1fa7903 - + https://github.com/dotnet/sdk - 9387b948993f019bd29a3eb6ac37114fb670251b + 5f2da4febe97aadb61dadc279c5117fbb1fa7903 diff --git a/eng/Versions.props b/eng/Versions.props index c692e5d80..2337cf784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20460.14 - 5.0.100-rc.2.20460.14 + 5.0.100-rc.2.20460.16 + 5.0.100-rc.2.20460.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 65cbf286dda8bcdf5a09810f0b95513920c15d89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 23:09:01 +0000 Subject: [PATCH 029/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.17 (#8490) [release/5.0.1xx-rc2] 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 1bc3c7b9c..242edbe60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 5f2da4febe97aadb61dadc279c5117fbb1fa7903 + b29b121553e96220c9e64253b80da1637a74d62b - + https://github.com/dotnet/sdk - 5f2da4febe97aadb61dadc279c5117fbb1fa7903 + b29b121553e96220c9e64253b80da1637a74d62b diff --git a/eng/Versions.props b/eng/Versions.props index 2337cf784..6c84ef800 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20460.16 - 5.0.100-rc.2.20460.16 + 5.0.100-rc.2.20460.17 + 5.0.100-rc.2.20460.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ad2d138f1d5ab3e6e23638347b83cde8e37f9a60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 00:14:31 +0000 Subject: [PATCH 030/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.18 (#8494) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20459.20 to 5.0.0-rc.2.20460.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20459.20 to 5.0.0-rc.2.20460.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20459.20 to 5.0.0-rc.2.20460.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20459.20 to 5.0.0-rc.2.20460.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20459.20 to 5.0.0-rc.2.20460.4 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20459.20 to 5.0.0-rc.2.20460.4 (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 242edbe60..a57b01a38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 482494f9ecc9a630599278b80893841462c90a5b - + https://github.com/dotnet/aspnetcore - 70725b554c3820a2919bc27341d5865c87da5eec + 0637599517adf7fb5114ec800c6eba3591d27b91 - + https://github.com/dotnet/aspnetcore - 70725b554c3820a2919bc27341d5865c87da5eec + 0637599517adf7fb5114ec800c6eba3591d27b91 - + https://github.com/dotnet/aspnetcore - 70725b554c3820a2919bc27341d5865c87da5eec + 0637599517adf7fb5114ec800c6eba3591d27b91 - + https://github.com/dotnet/aspnetcore - 70725b554c3820a2919bc27341d5865c87da5eec + 0637599517adf7fb5114ec800c6eba3591d27b91 - + https://github.com/dotnet/aspnetcore - 70725b554c3820a2919bc27341d5865c87da5eec + 0637599517adf7fb5114ec800c6eba3591d27b91 - + https://github.com/dotnet/aspnetcore - 70725b554c3820a2919bc27341d5865c87da5eec + 0637599517adf7fb5114ec800c6eba3591d27b91 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - b29b121553e96220c9e64253b80da1637a74d62b + 3e6570c7c970b795326ba8d27e9e609f1a528355 - + https://github.com/dotnet/sdk - b29b121553e96220c9e64253b80da1637a74d62b + 3e6570c7c970b795326ba8d27e9e609f1a528355 diff --git a/eng/Versions.props b/eng/Versions.props index 6c84ef800..41920770c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20459.20 - 5.0.0-rc.2.20459.20 - 5.0.0-rc.2.20459.20 - 5.0.0-rc.2.20459.20 - 5.0.0-rc.2.20459.20 - 5.0.0-rc.2.20459.20 + 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.4 0.2.0 - 5.0.100-rc.2.20460.17 - 5.0.100-rc.2.20460.17 + 5.0.100-rc.2.20460.18 + 5.0.100-rc.2.20460.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8d61377d42702f4086d0bace5d8cba449760ce8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 01:27:34 +0000 Subject: [PATCH 031/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8496) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20460.2 to 5.0.0-rc.2.20460.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20460.2 to 5.0.0-rc.2.20460.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20460.2 to 5.0.0-rc.2.20460.4 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 5.0.0-rc.1.20459.2 to 5.0.0-rc.1.20460.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a57b01a38..e93657c51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 20f52bd07f69689a512ed2f88fa1defe4d898ac4 + a94bff0bfde1cd5546d65febde8e91a766424bad - + https://github.com/dotnet/windowsdesktop - 20f52bd07f69689a512ed2f88fa1defe4d898ac4 + a94bff0bfde1cd5546d65febde8e91a766424bad - + https://github.com/dotnet/windowsdesktop - 20f52bd07f69689a512ed2f88fa1defe4d898ac4 + a94bff0bfde1cd5546d65febde8e91a766424bad https://github.com/dotnet/runtime @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 3e6570c7c970b795326ba8d27e9e609f1a528355 + 6b4505f35aa411ea3d01fbd3ff0fe0d88fb2742b - + https://github.com/dotnet/sdk - 3e6570c7c970b795326ba8d27e9e609f1a528355 + 6b4505f35aa411ea3d01fbd3ff0fe0d88fb2742b @@ -104,9 +104,9 @@ https://github.com/microsoft/vstest 0c0fafa64de5c73981e7c40a99d7363f57635f60 - + https://github.com/mono/linker - 2f00433ff53753ac59f59690bcca1fa317495068 + ec64f674d276f2c7a5caa0e1c93a2190b35b2133 linker diff --git a/eng/Versions.props b/eng/Versions.props index 41920770c..1f056d353 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20460.18 - 5.0.100-rc.2.20460.18 + 5.0.100-rc.2.20460.22 + 5.0.100-rc.2.20460.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.2.20460.2 - 5.0.0-rc.2.20460.2 - 5.0.0-rc.2.20460.2 + 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.4 From d3f15c951ff5baf301e0c2dd58077c3894154a8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 02:39:54 +0000 Subject: [PATCH 032/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.24 (#8498) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20458.14 to 5.0.0-rc.2.20460.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20458.14 to 5.0.0-rc.2.20460.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20458.14 to 5.0.0-rc.2.20460.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20458.14 to 5.0.0-rc.2.20460.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20458.14 to 5.0.0-rc.2.20460.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20458.14 to 5.0.0-rc.2.20460.7 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.8.0-preview-20454-01 to 16.8.0-preview-20460-02 (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 e93657c51..19fd2c004 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop a94bff0bfde1cd5546d65febde8e91a766424bad - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 482494f9ecc9a630599278b80893841462c90a5b + cead74acd39b1351b1668e440f6c7e220c216240 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 6b4505f35aa411ea3d01fbd3ff0fe0d88fb2742b + 0ca7b6fcfe3617afb6cc674b2474522c4106f2be - + https://github.com/dotnet/sdk - 6b4505f35aa411ea3d01fbd3ff0fe0d88fb2742b + 0ca7b6fcfe3617afb6cc674b2474522c4106f2be @@ -113,9 +113,9 @@ https://github.com/dotnet/roslyn d57cda76c2b76cff75487a085d289cfadd99150b - + https://github.com/dotnet/msbuild - b33e5486fa13b27d99e7e31773a03743173574ed + 579c58bd798f402805bafe7bb73a0f7816504caa https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 1f056d353..359e86d84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.2.20460.22 - 5.0.100-rc.2.20460.22 + 5.0.100-rc.2.20460.24 + 5.0.100-rc.2.20460.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20460.7 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 - 5.0.0-rc.2.20458.14 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.7 2.1.0 From 81de1f6e4c3ecad48c1bf0cf2d2ca64c3d7b8e87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 03:36:27 +0000 Subject: [PATCH 033/134] Update dependencies from https://github.com/dotnet/sdk build 20200910.26 (#8499) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.6 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.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 19fd2c004..6277448b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime cead74acd39b1351b1668e440f6c7e220c216240 - + https://github.com/dotnet/aspnetcore - 0637599517adf7fb5114ec800c6eba3591d27b91 + 848f42df8e25f51ff9e7783541ba63a9cfde189a - + https://github.com/dotnet/aspnetcore - 0637599517adf7fb5114ec800c6eba3591d27b91 + 848f42df8e25f51ff9e7783541ba63a9cfde189a - + https://github.com/dotnet/aspnetcore - 0637599517adf7fb5114ec800c6eba3591d27b91 + 848f42df8e25f51ff9e7783541ba63a9cfde189a - + https://github.com/dotnet/aspnetcore - 0637599517adf7fb5114ec800c6eba3591d27b91 + 848f42df8e25f51ff9e7783541ba63a9cfde189a - + https://github.com/dotnet/aspnetcore - 0637599517adf7fb5114ec800c6eba3591d27b91 + 848f42df8e25f51ff9e7783541ba63a9cfde189a - + https://github.com/dotnet/aspnetcore - 0637599517adf7fb5114ec800c6eba3591d27b91 + 848f42df8e25f51ff9e7783541ba63a9cfde189a https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 0ca7b6fcfe3617afb6cc674b2474522c4106f2be + 3fd6d32a0ba460df01844274f212d329ab02431d - + https://github.com/dotnet/sdk - 0ca7b6fcfe3617afb6cc674b2474522c4106f2be + 3fd6d32a0ba460df01844274f212d329ab02431d diff --git a/eng/Versions.props b/eng/Versions.props index 359e86d84..b4dcc78e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20460.4 - 5.0.0-rc.2.20460.4 - 5.0.0-rc.2.20460.4 - 5.0.0-rc.2.20460.4 - 5.0.0-rc.2.20460.4 - 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.6 + 5.0.0-rc.2.20460.6 + 5.0.0-rc.2.20460.6 + 5.0.0-rc.2.20460.6 + 5.0.0-rc.2.20460.6 + 5.0.0-rc.2.20460.6 0.2.0 - 5.0.100-rc.2.20460.24 - 5.0.100-rc.2.20460.24 + 5.0.100-rc.2.20460.26 + 5.0.100-rc.2.20460.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 085f552a7e2e3586054dec8ab82fdd9792f4f025 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 04:59:13 +0000 Subject: [PATCH 034/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8502) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20460.7 to 5.0.0-rc.2.20460.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20460.7 to 5.0.0-rc.2.20460.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20460.7 to 5.0.0-rc.2.20460.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20460.7 to 5.0.0-rc.2.20460.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20460.7 to 5.0.0-rc.2.20460.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20460.7 to 5.0.0-rc.2.20460.10 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20459.10 to 5.0.0-rc.2.20460.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.9 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20460.2 to 5.0.0-rc.2.20460.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6277448b1..bdb56a295 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - a94bff0bfde1cd5546d65febde8e91a766424bad + c62a29ba2414b86e1dfea25706de46ddea1ce2da - + https://github.com/dotnet/windowsdesktop - a94bff0bfde1cd5546d65febde8e91a766424bad + c62a29ba2414b86e1dfea25706de46ddea1ce2da - + https://github.com/dotnet/windowsdesktop - a94bff0bfde1cd5546d65febde8e91a766424bad + c62a29ba2414b86e1dfea25706de46ddea1ce2da - + https://github.com/dotnet/runtime - cead74acd39b1351b1668e440f6c7e220c216240 + 3802520ce6951111092039fe5b365985d9677708 - + https://github.com/dotnet/runtime - cead74acd39b1351b1668e440f6c7e220c216240 + 3802520ce6951111092039fe5b365985d9677708 - + https://github.com/dotnet/runtime - cead74acd39b1351b1668e440f6c7e220c216240 + 3802520ce6951111092039fe5b365985d9677708 - + https://github.com/dotnet/runtime - cead74acd39b1351b1668e440f6c7e220c216240 + 3802520ce6951111092039fe5b365985d9677708 - + https://github.com/dotnet/runtime - cead74acd39b1351b1668e440f6c7e220c216240 + 3802520ce6951111092039fe5b365985d9677708 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - cead74acd39b1351b1668e440f6c7e220c216240 + 3802520ce6951111092039fe5b365985d9677708 https://github.com/dotnet/aspnetcore @@ -79,22 +79,22 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 3fd6d32a0ba460df01844274f212d329ab02431d + e92b76a9be40e55071ca4417839a0487098fa3aa - + https://github.com/dotnet/sdk - 3fd6d32a0ba460df01844274f212d329ab02431d + e92b76a9be40e55071ca4417839a0487098fa3aa - + https://github.com/dotnet/winforms - 7dd240c9d38b74957a5a11472ce7fdb7d455ef95 + 9c7b5cc1a4ed77d5226b8a361cb68a887b2582bd - + https://github.com/dotnet/wpf - c982847ea6c7a423ef9dc34ae0079b5b509f1a0c + 66fadb533367bbddf2bac38006b3a5237dd3549a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b4dcc78e2..bfc588ba8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20459.10 + 5.0.0-rc.2.20460.1 - 5.0.0-rc.2.20460.2 + 5.0.0-rc.2.20460.4 @@ -53,29 +53,29 @@ - 5.0.100-rc.2.20460.26 - 5.0.100-rc.2.20460.26 + 5.0.100-rc.2.20460.28 + 5.0.100-rc.2.20460.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.10 - 5.0.0-rc.2.20460.7 - 5.0.0-rc.2.20460.7 - 5.0.0-rc.2.20460.7 - 5.0.0-rc.2.20460.7 - 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20460.10 + 5.0.0-rc.2.20460.10 + 5.0.0-rc.2.20460.10 + 5.0.0-rc.2.20460.10 + 5.0.0-rc.2.20460.10 2.1.0 - 5.0.0-rc.2.20460.4 - 5.0.0-rc.2.20460.4 - 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.9 + 5.0.0-rc.2.20460.9 + 5.0.0-rc.2.20460.9 From fba427e8bb866daf3652a3d605ce26bfbfcb94a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 07:00:09 +0000 Subject: [PATCH 035/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8503) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20460.6 to 5.0.0-rc.2.20460.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20460.6 to 5.0.0-rc.2.20460.18 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20460.6 to 5.0.0-rc.2.20460.18 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20460.6 to 5.0.0-rc.2.20460.18 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20460.6 to 5.0.0-rc.2.20460.18 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20460.6 to 5.0.0-rc.2.20460.18 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20459.7 to 11.0.0-beta.20460.6 (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 bdb56a295..d57538045 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 3802520ce6951111092039fe5b365985d9677708 - + https://github.com/dotnet/aspnetcore - 848f42df8e25f51ff9e7783541ba63a9cfde189a + 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 - + https://github.com/dotnet/aspnetcore - 848f42df8e25f51ff9e7783541ba63a9cfde189a + 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 - + https://github.com/dotnet/aspnetcore - 848f42df8e25f51ff9e7783541ba63a9cfde189a + 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 - + https://github.com/dotnet/aspnetcore - 848f42df8e25f51ff9e7783541ba63a9cfde189a + 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 - + https://github.com/dotnet/aspnetcore - 848f42df8e25f51ff9e7783541ba63a9cfde189a + 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 - + https://github.com/dotnet/aspnetcore - 848f42df8e25f51ff9e7783541ba63a9cfde189a + 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - e92b76a9be40e55071ca4417839a0487098fa3aa + db32e0903b33ee3f6a848b43c55cfb418f4f44dc - + https://github.com/dotnet/sdk - e92b76a9be40e55071ca4417839a0487098fa3aa + db32e0903b33ee3f6a848b43c55cfb418f4f44dc @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf 66fadb533367bbddf2bac38006b3a5237dd3549a - + https://github.com/dotnet/fsharp - 8f22066d2e0512b55e7f77c88bb89b48f3972a28 + 183ab3a82559908b1b1d477fb3ced179617f4e8d https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index bfc588ba8..dcf8ff348 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20460.6 - 5.0.0-rc.2.20460.6 - 5.0.0-rc.2.20460.6 - 5.0.0-rc.2.20460.6 - 5.0.0-rc.2.20460.6 - 5.0.0-rc.2.20460.6 + 5.0.0-rc.2.20460.18 + 5.0.0-rc.2.20460.18 + 5.0.0-rc.2.20460.18 + 5.0.0-rc.2.20460.18 + 5.0.0-rc.2.20460.18 + 5.0.0-rc.2.20460.18 0.2.0 - 5.0.100-rc.2.20460.28 - 5.0.100-rc.2.20460.28 + 5.0.100-rc.2.20460.31 + 5.0.100-rc.2.20460.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 27562268889e80d80190cd5cdaeda8d75bd4e2ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 09:53:50 +0000 Subject: [PATCH 036/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8507) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20460.9 to 5.0.0-rc.2.20460.11 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20460.9 to 5.0.0-rc.2.20460.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20460.10 to 5.0.0-rc.2.20460.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20460.10 to 5.0.0-rc.2.20460.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20460.10 to 5.0.0-rc.2.20460.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20460.10 to 5.0.0-rc.2.20460.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20460.10 to 5.0.0-rc.2.20460.15 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20460.10 to 5.0.0-rc.2.20460.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20460.18 to 5.0.0-rc.2.20460.24 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20460.18 to 5.0.0-rc.2.20460.24 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20460.18 to 5.0.0-rc.2.20460.24 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20460.18 to 5.0.0-rc.2.20460.24 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20460.18 to 5.0.0-rc.2.20460.24 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20460.18 to 5.0.0-rc.2.20460.24 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20460.1 to 5.0.0-rc.2.20460.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20460.9 to 5.0.0-rc.2.20460.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20460.4 to 5.0.0-rc.2.20460.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++++----------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d57538045..505d9ffda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - c62a29ba2414b86e1dfea25706de46ddea1ce2da + 6a6d6faa7f4e4a191e2812b62528c76c748e1d45 - + https://github.com/dotnet/windowsdesktop - c62a29ba2414b86e1dfea25706de46ddea1ce2da + 6a6d6faa7f4e4a191e2812b62528c76c748e1d45 - + https://github.com/dotnet/windowsdesktop - c62a29ba2414b86e1dfea25706de46ddea1ce2da + 6a6d6faa7f4e4a191e2812b62528c76c748e1d45 - + https://github.com/dotnet/runtime - 3802520ce6951111092039fe5b365985d9677708 + e3a1128fc78c2836c899bc5099d7e0261888f08f - + https://github.com/dotnet/runtime - 3802520ce6951111092039fe5b365985d9677708 + e3a1128fc78c2836c899bc5099d7e0261888f08f - + https://github.com/dotnet/runtime - 3802520ce6951111092039fe5b365985d9677708 + e3a1128fc78c2836c899bc5099d7e0261888f08f - + https://github.com/dotnet/runtime - 3802520ce6951111092039fe5b365985d9677708 + e3a1128fc78c2836c899bc5099d7e0261888f08f - + https://github.com/dotnet/runtime - 3802520ce6951111092039fe5b365985d9677708 + e3a1128fc78c2836c899bc5099d7e0261888f08f @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3802520ce6951111092039fe5b365985d9677708 + e3a1128fc78c2836c899bc5099d7e0261888f08f - + https://github.com/dotnet/aspnetcore - 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 + 11b85eb7e277d288def26b3b325a5f1c53733e17 - + https://github.com/dotnet/aspnetcore - 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 + 11b85eb7e277d288def26b3b325a5f1c53733e17 - + https://github.com/dotnet/aspnetcore - 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 + 11b85eb7e277d288def26b3b325a5f1c53733e17 - + https://github.com/dotnet/aspnetcore - 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 + 11b85eb7e277d288def26b3b325a5f1c53733e17 - + https://github.com/dotnet/aspnetcore - 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 + 11b85eb7e277d288def26b3b325a5f1c53733e17 - + https://github.com/dotnet/aspnetcore - 18d261b20c2e7f23ebd1971a8ce2fa701be757e0 + 11b85eb7e277d288def26b3b325a5f1c53733e17 https://github.com/dotnet/test-templates @@ -79,22 +79,22 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - db32e0903b33ee3f6a848b43c55cfb418f4f44dc + 8b5616aa0eb734faa4aeb1e3c0ccaefa9e72152e - + https://github.com/dotnet/sdk - db32e0903b33ee3f6a848b43c55cfb418f4f44dc + 8b5616aa0eb734faa4aeb1e3c0ccaefa9e72152e - + https://github.com/dotnet/winforms - 9c7b5cc1a4ed77d5226b8a361cb68a887b2582bd + 83168ff77cdd1a3f53ac8fa3608e7b321f30508c - + https://github.com/dotnet/wpf - 66fadb533367bbddf2bac38006b3a5237dd3549a + 940d0da1e293f4ef514be562d242e404aa6f2701 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dcf8ff348..841ea66ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20460.1 + 5.0.0-rc.2.20460.2 - 5.0.0-rc.2.20460.4 + 5.0.0-rc.2.20460.5 @@ -41,41 +41,41 @@ - 5.0.0-rc.2.20460.18 - 5.0.0-rc.2.20460.18 - 5.0.0-rc.2.20460.18 - 5.0.0-rc.2.20460.18 - 5.0.0-rc.2.20460.18 - 5.0.0-rc.2.20460.18 + 5.0.0-rc.2.20460.24 + 5.0.0-rc.2.20460.24 + 5.0.0-rc.2.20460.24 + 5.0.0-rc.2.20460.24 + 5.0.0-rc.2.20460.24 + 5.0.0-rc.2.20460.24 0.2.0 - 5.0.100-rc.2.20460.31 - 5.0.100-rc.2.20460.31 + 5.0.100-rc.2.20461.2 + 5.0.100-rc.2.20461.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20460.10 + 5.0.0-rc.2.20460.15 - 5.0.0-rc.2.20460.10 - 5.0.0-rc.2.20460.10 - 5.0.0-rc.2.20460.10 - 5.0.0-rc.2.20460.10 - 5.0.0-rc.2.20460.10 + 5.0.0-rc.2.20460.15 + 5.0.0-rc.2.20460.15 + 5.0.0-rc.2.20460.15 + 5.0.0-rc.2.20460.15 + 5.0.0-rc.2.20460.15 2.1.0 - 5.0.0-rc.2.20460.9 - 5.0.0-rc.2.20460.9 - 5.0.0-rc.2.20460.9 + 5.0.0-rc.2.20460.11 + 5.0.0-rc.2.20460.11 + 5.0.0-rc.2.20460.11 From 4479a161894a4ab0cdd4b8342992903bba122e92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 13:53:44 +0000 Subject: [PATCH 037/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8510) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20460.11 to 5.0.0-rc.2.20460.13 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20460.11 to 5.0.0-rc.2.20460.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20460.24 to 5.0.0-rc.2.20460.25 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20460.24 to 5.0.0-rc.2.20460.25 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20460.24 to 5.0.0-rc.2.20460.25 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20460.24 to 5.0.0-rc.2.20460.25 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20460.24 to 5.0.0-rc.2.20460.25 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20460.24 to 5.0.0-rc.2.20460.25 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20460.2 to 5.0.0-rc.2.20460.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20460.11 to 5.0.0-rc.2.20460.13 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20460.5 to 5.0.0-rc.2.20460.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.ILLink.Tasks: from 5.0.0-rc.1.20460.4 to 5.0.0-rc.1.20461.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 505d9ffda..eaeb78249 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 6a6d6faa7f4e4a191e2812b62528c76c748e1d45 + 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 - + https://github.com/dotnet/windowsdesktop - 6a6d6faa7f4e4a191e2812b62528c76c748e1d45 + 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 - + https://github.com/dotnet/windowsdesktop - 6a6d6faa7f4e4a191e2812b62528c76c748e1d45 + 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 https://github.com/dotnet/runtime @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime e3a1128fc78c2836c899bc5099d7e0261888f08f - + https://github.com/dotnet/aspnetcore - 11b85eb7e277d288def26b3b325a5f1c53733e17 + 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e - + https://github.com/dotnet/aspnetcore - 11b85eb7e277d288def26b3b325a5f1c53733e17 + 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e - + https://github.com/dotnet/aspnetcore - 11b85eb7e277d288def26b3b325a5f1c53733e17 + 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e - + https://github.com/dotnet/aspnetcore - 11b85eb7e277d288def26b3b325a5f1c53733e17 + 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e - + https://github.com/dotnet/aspnetcore - 11b85eb7e277d288def26b3b325a5f1c53733e17 + 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e - + https://github.com/dotnet/aspnetcore - 11b85eb7e277d288def26b3b325a5f1c53733e17 + 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e https://github.com/dotnet/test-templates @@ -79,22 +79,22 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 8b5616aa0eb734faa4aeb1e3c0ccaefa9e72152e + f1e1ea9198e0213126fd5727be1f1935ed94df5a - + https://github.com/dotnet/sdk - 8b5616aa0eb734faa4aeb1e3c0ccaefa9e72152e + f1e1ea9198e0213126fd5727be1f1935ed94df5a - + https://github.com/dotnet/winforms - 83168ff77cdd1a3f53ac8fa3608e7b321f30508c + 98f67367df7321b09e9cb5168254a35b83016d2f - + https://github.com/dotnet/wpf - 940d0da1e293f4ef514be562d242e404aa6f2701 + a07ad521fabf36a783df37341fcadfcdcf8509fb https://github.com/dotnet/fsharp @@ -104,9 +104,9 @@ https://github.com/microsoft/vstest 0c0fafa64de5c73981e7c40a99d7363f57635f60 - + https://github.com/mono/linker - ec64f674d276f2c7a5caa0e1c93a2190b35b2133 + c1de87e49fd158526a337c4da32d3d12c5eb1251 linker diff --git a/eng/Versions.props b/eng/Versions.props index 841ea66ce..3692390da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20460.2 + 5.0.0-rc.2.20460.3 - 5.0.0-rc.2.20460.5 + 5.0.0-rc.2.20460.7 @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20460.24 - 5.0.0-rc.2.20460.24 - 5.0.0-rc.2.20460.24 - 5.0.0-rc.2.20460.24 - 5.0.0-rc.2.20460.24 - 5.0.0-rc.2.20460.24 + 5.0.0-rc.2.20460.25 + 5.0.0-rc.2.20460.25 + 5.0.0-rc.2.20460.25 + 5.0.0-rc.2.20460.25 + 5.0.0-rc.2.20460.25 + 5.0.0-rc.2.20460.25 0.2.0 - 5.0.100-rc.2.20461.2 - 5.0.100-rc.2.20461.2 + 5.0.100-rc.2.20461.6 + 5.0.100-rc.2.20461.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.2.20460.11 - 5.0.0-rc.2.20460.11 - 5.0.0-rc.2.20460.11 + 5.0.0-rc.2.20460.13 + 5.0.0-rc.2.20460.13 + 5.0.0-rc.2.20460.13 From d3989d63af1b49f5dec729d923247eb7f20c3b8b Mon Sep 17 00:00:00 2001 From: juanam Date: Fri, 11 Sep 2020 10:58:51 -0700 Subject: [PATCH 038/134] Condition VS.Redist.* to PostBuildSign --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index b4e2a751b..1293e3764 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -123,7 +123,7 @@ phases: env: DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT')) }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}: - task: NuGetCommand@2 displayName: Push Visual Studio NuPkgs inputs: From a3fc14fd2efd2c25c9007dec201695cb76079450 Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Thu, 10 Sep 2020 02:50:04 -0700 Subject: [PATCH 039/134] Revert "Add arm64 as a possible WinForms arch (#7457)" This reverts commit f1564ea07f85999c3712ac8cbce5d7569a1632a7, reversing changes made to 0adcdc972aa1933c811978e3a75e0755077c6565. --- .../targets/GenerateBundledVersions.targets | 5 +- src/redist/targets/GenerateLayout.targets | 2 +- test/EndToEnd/ProjectBuildTests.cs | 46 ------------------- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 031cce670..c7d7f1feb 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -113,9 +113,6 @@ - - $(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion) @@ -198,7 +199,7 @@ + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedNetCoreAppHostPackInstallerFileName) @@ -251,19 +252,19 @@ + Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) $(DownloadedAspNetTargetingPackInstallerFileName) + Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(DownloadedAspNetCoreSharedFxInstallerFileName) + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(DownloadedAspNetCoreSharedFxWixLibFileName) @@ -275,7 +276,7 @@ + Condition="!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64'"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(AspNetCoreSharedFxBaseRuntimeVersionFileName) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 307808e57..9e41ba4f5 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -14,7 +14,7 @@ - 3.10.4 + 3.14.0.4118 https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip @@ -253,7 +253,7 @@ @@ -306,6 +306,9 @@ $(Templates50InstallerUpgradeCode) NetCore_Templates_5.0 + + + $(Templates31LayoutPath.TrimEnd('\')) $(Templates31MSIInstallerFile) @@ -549,7 +552,7 @@ GenerateVSToolsNupkg; GenerateVSToolsResolverNupkg; GenerateSdkMSBuildExtensionsNupkg" - Condition=" '$(OS)' == 'Windows_NT' and !$(Architecture.StartsWith('arm')) " /> + Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " /> diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index a4d986179..c4ebc6ed7 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -183,10 +183,15 @@ + + + - + + + $(InternalCertificateId) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 6b41f8564..f0d039989 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -14,6 +14,10 @@ WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE) + + WixBundleInstalled OR ((NOT (DOTNETHOME_ARM64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE) + + - - - - - + + + + + + + + + + + @@ -107,15 +142,13 @@ - - - + @@ -128,12 +161,16 @@ - - + + + + + + @@ -142,6 +179,7 @@ + @@ -149,6 +187,8 @@ + + diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs index 0474cb9e0..4c4c9fcc8 100644 --- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs +++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs @@ -2,7 +2,7 @@ - + Installed OR ALLOWMSIINSTALL diff --git a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs index df568a37e..a84391c81 100644 --- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs +++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs @@ -15,6 +15,12 @@ + + VersionNT64 AND DOTNETHOME_ARM64 + + + + VersionNT64 AND DOTNETHOME_X64 diff --git a/src/redist/targets/packaging/windows/clisdk/templates.wxs b/src/redist/targets/packaging/windows/clisdk/templates.wxs index b3e9515ef..a2ef49c4b 100644 --- a/src/redist/targets/packaging/windows/clisdk/templates.wxs +++ b/src/redist/targets/packaging/windows/clisdk/templates.wxs @@ -2,7 +2,7 @@ - + Installed OR ALLOWMSIINSTALL diff --git a/src/redist/targets/packaging/windows/clisdk/variables.wxi b/src/redist/targets/packaging/windows/clisdk/variables.wxi index c9536e77a..641cc7431 100644 --- a/src/redist/targets/packaging/windows/clisdk/variables.wxi +++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi @@ -26,10 +26,23 @@ + + + + + + + + + + + + + From 793ad8f148f96d7f90d089e9cf50161416a0fe98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 20:31:12 +0000 Subject: [PATCH 042/134] Update dependencies from https://github.com/dotnet/sdk build 20200911.14 (#8519) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.8.0-preview-20460-02 to 16.8.0-preview-20461-02 (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 eaeb78249..74c26da33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - f1e1ea9198e0213126fd5727be1f1935ed94df5a + d5e218abaccbe84e2e75103c553b3a1cd2e12a08 - + https://github.com/dotnet/sdk - f1e1ea9198e0213126fd5727be1f1935ed94df5a + d5e218abaccbe84e2e75103c553b3a1cd2e12a08 @@ -113,9 +113,9 @@ https://github.com/dotnet/roslyn d57cda76c2b76cff75487a085d289cfadd99150b - + https://github.com/dotnet/msbuild - 579c58bd798f402805bafe7bb73a0f7816504caa + ec61b6fdf48021fca3e94d12ded473b25ca5db9b https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 3692390da..8678fdc53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20461.6 - 5.0.100-rc.2.20461.6 + 5.0.100-rc.2.20461.14 + 5.0.100-rc.2.20461.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11cc2117432c6279ad3024c2a60033dffb871ea7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Sep 2020 09:01:12 +0000 Subject: [PATCH 043/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8521) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20460.15 to 5.0.0-rc.2.20461.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20460.15 to 5.0.0-rc.2.20461.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20460.15 to 5.0.0-rc.2.20461.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20460.15 to 5.0.0-rc.2.20461.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20460.15 to 5.0.0-rc.2.20461.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20460.15 to 5.0.0-rc.2.20461.4 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20460.6 to 11.0.0-beta.20461.3 (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 74c26da33..86d260bcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 - + https://github.com/dotnet/runtime - e3a1128fc78c2836c899bc5099d7e0261888f08f + 7d39776332446d8a84f5d542c80d264fa1cadbe7 - + https://github.com/dotnet/runtime - e3a1128fc78c2836c899bc5099d7e0261888f08f + 7d39776332446d8a84f5d542c80d264fa1cadbe7 - + https://github.com/dotnet/runtime - e3a1128fc78c2836c899bc5099d7e0261888f08f + 7d39776332446d8a84f5d542c80d264fa1cadbe7 - + https://github.com/dotnet/runtime - e3a1128fc78c2836c899bc5099d7e0261888f08f + 7d39776332446d8a84f5d542c80d264fa1cadbe7 - + https://github.com/dotnet/runtime - e3a1128fc78c2836c899bc5099d7e0261888f08f + 7d39776332446d8a84f5d542c80d264fa1cadbe7 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e3a1128fc78c2836c899bc5099d7e0261888f08f + 7d39776332446d8a84f5d542c80d264fa1cadbe7 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - d5e218abaccbe84e2e75103c553b3a1cd2e12a08 + 04cb0f3a96412b77e56de367412e18b137f07e38 - + https://github.com/dotnet/sdk - d5e218abaccbe84e2e75103c553b3a1cd2e12a08 + 04cb0f3a96412b77e56de367412e18b137f07e38 @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf a07ad521fabf36a783df37341fcadfcdcf8509fb - + https://github.com/dotnet/fsharp - 183ab3a82559908b1b1d477fb3ced179617f4e8d + 9558c90bc51a90e3892b623c252ef72f5241dff8 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 8678fdc53..2dbf91605 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.2.20461.14 - 5.0.100-rc.2.20461.14 + 5.0.100-rc.2.20462.1 + 5.0.100-rc.2.20462.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20460.15 + 5.0.0-rc.2.20461.4 - 5.0.0-rc.2.20460.15 - 5.0.0-rc.2.20460.15 - 5.0.0-rc.2.20460.15 - 5.0.0-rc.2.20460.15 - 5.0.0-rc.2.20460.15 + 5.0.0-rc.2.20461.4 + 5.0.0-rc.2.20461.4 + 5.0.0-rc.2.20461.4 + 5.0.0-rc.2.20461.4 + 5.0.0-rc.2.20461.4 2.1.0 From ce12c03aeb8bd0a9c88857eb2a2d3b488740fb97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 13 Sep 2020 02:06:01 +0000 Subject: [PATCH 044/134] Update dependencies from https://github.com/dotnet/sdk build 20200912.5 (#8533) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20461.3 to 11.0.0-beta.20462.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 86d260bcc..e12255145 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 04cb0f3a96412b77e56de367412e18b137f07e38 + a92c1c1657f2a3cb5edd09a0556e81d7a59cc3a0 - + https://github.com/dotnet/sdk - 04cb0f3a96412b77e56de367412e18b137f07e38 + a92c1c1657f2a3cb5edd09a0556e81d7a59cc3a0 @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf a07ad521fabf36a783df37341fcadfcdcf8509fb - + https://github.com/dotnet/fsharp - 9558c90bc51a90e3892b623c252ef72f5241dff8 + 1af1c36c08e082baccb5898b5ef85659d0dbd086 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 2dbf91605..04fa3844e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20462.1 - 5.0.100-rc.2.20462.1 + 5.0.100-rc.2.20462.5 + 5.0.100-rc.2.20462.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From efbc14c616f0a76aa92a14011e9166b644d68e7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 13 Sep 2020 04:51:15 +0000 Subject: [PATCH 045/134] Update dependencies from https://github.com/dotnet/sdk build 20200912.6 (#8534) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20462.3 to 11.0.0-beta.20462.4 (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 e12255145..838a44b44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - a92c1c1657f2a3cb5edd09a0556e81d7a59cc3a0 + 5e7b5d5c1f64cc327e3af5fd174da7ce136a8b46 - + https://github.com/dotnet/sdk - a92c1c1657f2a3cb5edd09a0556e81d7a59cc3a0 + 5e7b5d5c1f64cc327e3af5fd174da7ce136a8b46 @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf a07ad521fabf36a783df37341fcadfcdcf8509fb - + https://github.com/dotnet/fsharp - 1af1c36c08e082baccb5898b5ef85659d0dbd086 + ffb8be9a7aa57e5825a2496e5899e72e49baf0f8 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 04fa3844e..ec50079e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20462.5 - 5.0.100-rc.2.20462.5 + 5.0.100-rc.2.20462.6 + 5.0.100-rc.2.20462.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f4b4d12411591518e10df6cb8249f8b2a8483b54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 13 Sep 2020 13:54:03 +0000 Subject: [PATCH 046/134] Update dependencies from https://github.com/dotnet/sdk build 20200913.1 (#8536) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20462.4 to 11.0.0-beta.20462.6 (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 838a44b44..92737a96b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 5e7b5d5c1f64cc327e3af5fd174da7ce136a8b46 + 4816f551d97d4356abeac75a41137dd677616073 - + https://github.com/dotnet/sdk - 5e7b5d5c1f64cc327e3af5fd174da7ce136a8b46 + 4816f551d97d4356abeac75a41137dd677616073 @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf a07ad521fabf36a783df37341fcadfcdcf8509fb - + https://github.com/dotnet/fsharp - ffb8be9a7aa57e5825a2496e5899e72e49baf0f8 + 71b8192dd317a2f19aa08f4bdfb34f56bd943579 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index ec50079e0..7c8729d4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20462.6 - 5.0.100-rc.2.20462.6 + 5.0.100-rc.2.20463.1 + 5.0.100-rc.2.20463.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5e27e9e4bee69066e322eac7450e6d53a26e9d12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Sep 2020 09:08:46 +0000 Subject: [PATCH 047/134] Update dependencies from https://github.com/dotnet/sdk build 20200914.2 (#8543) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.8.0-preview-20461-02 to 16.8.0-preview-20461-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 92737a96b..63638972e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - 4816f551d97d4356abeac75a41137dd677616073 + c6ec8463f418ea9a5ab276791c2aa51fac978366 - + https://github.com/dotnet/sdk - 4816f551d97d4356abeac75a41137dd677616073 + c6ec8463f418ea9a5ab276791c2aa51fac978366 @@ -113,9 +113,9 @@ https://github.com/dotnet/roslyn d57cda76c2b76cff75487a085d289cfadd99150b - + https://github.com/dotnet/msbuild - ec61b6fdf48021fca3e94d12ded473b25ca5db9b + 037c1214b5f49b370d19e2a6657a01aedc16ef26 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 7c8729d4d..9bb0853b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20463.1 - 5.0.100-rc.2.20463.1 + 5.0.100-rc.2.20464.2 + 5.0.100-rc.2.20464.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 61f0f0f4a066a59e84ec619b2505ff9d55be2995 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Sep 2020 09:52:07 +0000 Subject: [PATCH 048/134] Update dependencies from https://github.com/dotnet/sdk build 20200914.4 (#8545) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20461.4 to 5.0.0-rc.2.20462.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20461.4 to 5.0.0-rc.2.20462.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20461.4 to 5.0.0-rc.2.20462.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20461.4 to 5.0.0-rc.2.20462.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20461.4 to 5.0.0-rc.2.20462.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20461.4 to 5.0.0-rc.2.20462.5 (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 63638972e..afffda373 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 - + https://github.com/dotnet/runtime - 7d39776332446d8a84f5d542c80d264fa1cadbe7 + 54dfce73caac716251ff90e1099c4232f5587e35 - + https://github.com/dotnet/runtime - 7d39776332446d8a84f5d542c80d264fa1cadbe7 + 54dfce73caac716251ff90e1099c4232f5587e35 - + https://github.com/dotnet/runtime - 7d39776332446d8a84f5d542c80d264fa1cadbe7 + 54dfce73caac716251ff90e1099c4232f5587e35 - + https://github.com/dotnet/runtime - 7d39776332446d8a84f5d542c80d264fa1cadbe7 + 54dfce73caac716251ff90e1099c4232f5587e35 - + https://github.com/dotnet/runtime - 7d39776332446d8a84f5d542c80d264fa1cadbe7 + 54dfce73caac716251ff90e1099c4232f5587e35 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7d39776332446d8a84f5d542c80d264fa1cadbe7 + 54dfce73caac716251ff90e1099c4232f5587e35 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating e80baefbce805072fc9c51c1b9922e74485fdf21 - + https://github.com/dotnet/sdk - c6ec8463f418ea9a5ab276791c2aa51fac978366 + ff47749fda6aba644d3cd395df3a339e4be42145 - + https://github.com/dotnet/sdk - c6ec8463f418ea9a5ab276791c2aa51fac978366 + ff47749fda6aba644d3cd395df3a339e4be42145 diff --git a/eng/Versions.props b/eng/Versions.props index 9bb0853b6..fdf685e46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.2.20464.2 - 5.0.100-rc.2.20464.2 + 5.0.100-rc.2.20464.4 + 5.0.100-rc.2.20464.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20461.4 + 5.0.0-rc.2.20462.5 - 5.0.0-rc.2.20461.4 - 5.0.0-rc.2.20461.4 - 5.0.0-rc.2.20461.4 - 5.0.0-rc.2.20461.4 - 5.0.0-rc.2.20461.4 + 5.0.0-rc.2.20462.5 + 5.0.0-rc.2.20462.5 + 5.0.0-rc.2.20462.5 + 5.0.0-rc.2.20462.5 + 5.0.0-rc.2.20462.5 2.1.0 From 03c8593ee05ba671b8b6d87453388abe97277857 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Sep 2020 12:58:57 +0000 Subject: [PATCH 049/134] Update dependencies from https://github.com/dotnet/sdk build 20200914.6 (#8547) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.2.20459.1 to 5.0.0-rc.2.20464.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 afffda373..ccde627ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,17 +75,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - e80baefbce805072fc9c51c1b9922e74485fdf21 + 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - ff47749fda6aba644d3cd395df3a339e4be42145 + c0f4fb29d4d14533e796df67d2fc6ad6f2f54d67 - + https://github.com/dotnet/sdk - ff47749fda6aba644d3cd395df3a339e4be42145 + c0f4fb29d4d14533e796df67d2fc6ad6f2f54d67 diff --git a/eng/Versions.props b/eng/Versions.props index fdf685e46..7ce96ff16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 5.0.0-rc.2.20459.1 + 5.0.0-rc.2.20464.2 @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20464.4 - 5.0.100-rc.2.20464.4 + 5.0.100-rc.2.20464.6 + 5.0.100-rc.2.20464.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 45264fac2a57ce1292abae2cb1f2a1d0d6781a44 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 14 Sep 2020 10:35:11 -0700 Subject: [PATCH 050/134] Stamp runtimeconfigs with M.AspNetCore.App versions The installer currently updates all runtimeconfig files with the M.NETCore.App version regardless of the runtime they are targeting. This causes issues with dotnet-watch which is targeting the AspNetCore shared runtime as of 5.0-preview8. This change updates the targets \ task to be more discerning. --- src/core-sdk-tasks/ReplaceFileContents.cs | 25 ++++++++++++++++------- src/redist/targets/GenerateLayout.targets | 14 ++++++++++++- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/core-sdk-tasks/ReplaceFileContents.cs b/src/core-sdk-tasks/ReplaceFileContents.cs index 130550aba..671b73674 100644 --- a/src/core-sdk-tasks/ReplaceFileContents.cs +++ b/src/core-sdk-tasks/ReplaceFileContents.cs @@ -12,18 +12,18 @@ namespace Microsoft.DotNet.Cli.Build { /// /// Reads contents of an input file, and searches for each replacement passed in. - /// + /// /// When ReplacementItems is matched, it will replace the Include/ItemSpec with the corresponding /// ReplacementString metadata value. This can be useful if the ReplacementString is a value that /// cannot be represented by ITaskItem.ItemSpec (like string.Empty). - /// - /// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index) + /// + /// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index) /// item in ReplacementStrings. - /// - /// For example, if 2 ReplacementPatterns are passed in, 2 ReplacementStrings must also passed in and the first + /// + /// For example, if 2 ReplacementPatterns are passed in, 2 ReplacementStrings must also passed in and the first /// pattern will be replaced with the first string, and the second pattern replaced with the second string. - /// - /// ReplacementPattern could easily be a regex, but it isn't needed for current use cases, so leaving this + /// + /// ReplacementPattern could easily be a regex, but it isn't needed for current use cases, so leaving this /// as just a string that will be replaced. /// public class ReplaceFileContents : Task @@ -40,6 +40,11 @@ namespace Microsoft.DotNet.Cli.Build public ITaskItem[] ReplacementStrings { get; set; } + /// + /// Gets or sets a string that a file must contain for the replacement to be performed. + /// + public string FileMustContainText { get; set; } + public override bool Execute() { if (ReplacementItems == null && ReplacementPatterns == null && ReplacementStrings == null) @@ -81,6 +86,12 @@ namespace Microsoft.DotNet.Cli.Build public void ReplaceContents(string inputFile, string destinationFile) { string inputFileText = File.ReadAllText(inputFile); + if (!string.IsNullOrEmpty(FileMustContainText) && !inputFileText.Contains(FileMustContainText)) + { + Log.LogMessage(MessageImportance.Low, $"Skipping replacement on `{inputFile}` because it does not contain the text '{FileMustContainText}'."); + return; + } + string outputFileText = ReplacePatterns(inputFileText); WriteOutputFile(destinationFile, outputFileText); diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index ed6f08ec6..3043fb94b 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -403,15 +403,27 @@ "version": ".*" "version": "$(MicrosoftNETCoreAppRuntimePackageVersion)" + "version": "$(MicrosoftAspNetCoreAppRuntimePackageVersion)" + + + ReplacementStrings="$(ReplacementString)" + FileMustContainText="Microsoft.NETCore.App" /> + + + Date: Tue, 15 Sep 2020 00:47:03 +0000 Subject: [PATCH 051/134] Update dependencies from https://github.com/dotnet/sdk build 20200914.11 (#8552) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20460.25 to 5.0.0-rc.2.20464.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20460.25 to 5.0.0-rc.2.20464.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20460.25 to 5.0.0-rc.2.20464.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20460.25 to 5.0.0-rc.2.20464.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20460.25 to 5.0.0-rc.2.20464.16 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20460.25 to 5.0.0-rc.2.20464.16 (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 ccde627ad..12857ad37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 54dfce73caac716251ff90e1099c4232f5587e35 - + https://github.com/dotnet/aspnetcore - 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e + 6b8ce801e816c33f9f334f5cf9bd6af810176844 - + https://github.com/dotnet/aspnetcore - 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e + 6b8ce801e816c33f9f334f5cf9bd6af810176844 - + https://github.com/dotnet/aspnetcore - 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e + 6b8ce801e816c33f9f334f5cf9bd6af810176844 - + https://github.com/dotnet/aspnetcore - 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e + 6b8ce801e816c33f9f334f5cf9bd6af810176844 - + https://github.com/dotnet/aspnetcore - 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e + 6b8ce801e816c33f9f334f5cf9bd6af810176844 - + https://github.com/dotnet/aspnetcore - 7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e + 6b8ce801e816c33f9f334f5cf9bd6af810176844 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - c0f4fb29d4d14533e796df67d2fc6ad6f2f54d67 + a8235f8a31f4f9e0601440d237792cac6d2eec80 - + https://github.com/dotnet/sdk - c0f4fb29d4d14533e796df67d2fc6ad6f2f54d67 + a8235f8a31f4f9e0601440d237792cac6d2eec80 diff --git a/eng/Versions.props b/eng/Versions.props index 7ce96ff16..cf816840d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20460.25 - 5.0.0-rc.2.20460.25 - 5.0.0-rc.2.20460.25 - 5.0.0-rc.2.20460.25 - 5.0.0-rc.2.20460.25 - 5.0.0-rc.2.20460.25 + 5.0.0-rc.2.20464.16 + 5.0.0-rc.2.20464.16 + 5.0.0-rc.2.20464.16 + 5.0.0-rc.2.20464.16 + 5.0.0-rc.2.20464.16 + 5.0.0-rc.2.20464.16 0.2.0 - 5.0.100-rc.2.20464.6 - 5.0.100-rc.2.20464.6 + 5.0.100-rc.2.20464.11 + 5.0.100-rc.2.20464.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a0c4713b26b967f611b0cc1f001466c8106753f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 01:49:22 +0000 Subject: [PATCH 052/134] Update dependencies from https://github.com/dotnet/sdk build 20200914.14 (#8555) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.8.0-preview-20461-05 to 16.8.0-preview-20464-02 (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 12857ad37..3927d9801 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - a8235f8a31f4f9e0601440d237792cac6d2eec80 + daa0757f33f4171dbd1a6802cc719c6abbe00a9c - + https://github.com/dotnet/sdk - a8235f8a31f4f9e0601440d237792cac6d2eec80 + daa0757f33f4171dbd1a6802cc719c6abbe00a9c @@ -113,9 +113,9 @@ https://github.com/dotnet/roslyn d57cda76c2b76cff75487a085d289cfadd99150b - + https://github.com/dotnet/msbuild - 037c1214b5f49b370d19e2a6657a01aedc16ef26 + 0220c5eaeac8dd1770a597a7ba4306651c421bf4 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index cf816840d..a12554163 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20464.11 - 5.0.100-rc.2.20464.11 + 5.0.100-rc.2.20464.14 + 5.0.100-rc.2.20464.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e599f70de18b2b8f0adcf8ef5e33d07a8a4873b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 05:47:45 +0000 Subject: [PATCH 053/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8558) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20462.5 to 5.0.0-rc.2.20464.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20462.5 to 5.0.0-rc.2.20464.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20462.5 to 5.0.0-rc.2.20464.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20462.5 to 5.0.0-rc.2.20464.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20462.5 to 5.0.0-rc.2.20464.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20462.5 to 5.0.0-rc.2.20464.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20464.16 to 5.0.0-rc.2.20464.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20464.16 to 5.0.0-rc.2.20464.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20464.16 to 5.0.0-rc.2.20464.19 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20464.16 to 5.0.0-rc.2.20464.19 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20464.16 to 5.0.0-rc.2.20464.19 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20464.16 to 5.0.0-rc.2.20464.19 (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 3927d9801..9848af96a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 - + https://github.com/dotnet/runtime - 54dfce73caac716251ff90e1099c4232f5587e35 + 80df3e06b9d9ffe90427a19e706f7165700d7d4e - + https://github.com/dotnet/runtime - 54dfce73caac716251ff90e1099c4232f5587e35 + 80df3e06b9d9ffe90427a19e706f7165700d7d4e - + https://github.com/dotnet/runtime - 54dfce73caac716251ff90e1099c4232f5587e35 + 80df3e06b9d9ffe90427a19e706f7165700d7d4e - + https://github.com/dotnet/runtime - 54dfce73caac716251ff90e1099c4232f5587e35 + 80df3e06b9d9ffe90427a19e706f7165700d7d4e - + https://github.com/dotnet/runtime - 54dfce73caac716251ff90e1099c4232f5587e35 + 80df3e06b9d9ffe90427a19e706f7165700d7d4e @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 54dfce73caac716251ff90e1099c4232f5587e35 + 80df3e06b9d9ffe90427a19e706f7165700d7d4e - + https://github.com/dotnet/aspnetcore - 6b8ce801e816c33f9f334f5cf9bd6af810176844 + a6f667bbb30023986942522a60822ef3f6290bde - + https://github.com/dotnet/aspnetcore - 6b8ce801e816c33f9f334f5cf9bd6af810176844 + a6f667bbb30023986942522a60822ef3f6290bde - + https://github.com/dotnet/aspnetcore - 6b8ce801e816c33f9f334f5cf9bd6af810176844 + a6f667bbb30023986942522a60822ef3f6290bde - + https://github.com/dotnet/aspnetcore - 6b8ce801e816c33f9f334f5cf9bd6af810176844 + a6f667bbb30023986942522a60822ef3f6290bde - + https://github.com/dotnet/aspnetcore - 6b8ce801e816c33f9f334f5cf9bd6af810176844 + a6f667bbb30023986942522a60822ef3f6290bde - + https://github.com/dotnet/aspnetcore - 6b8ce801e816c33f9f334f5cf9bd6af810176844 + a6f667bbb30023986942522a60822ef3f6290bde https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - daa0757f33f4171dbd1a6802cc719c6abbe00a9c + 3f7a3e88badb7ae82b6911dd7a3f2a4237803ef7 - + https://github.com/dotnet/sdk - daa0757f33f4171dbd1a6802cc719c6abbe00a9c + 3f7a3e88badb7ae82b6911dd7a3f2a4237803ef7 diff --git a/eng/Versions.props b/eng/Versions.props index a12554163..95d568607 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,34 +41,34 @@ - 5.0.0-rc.2.20464.16 - 5.0.0-rc.2.20464.16 - 5.0.0-rc.2.20464.16 - 5.0.0-rc.2.20464.16 - 5.0.0-rc.2.20464.16 - 5.0.0-rc.2.20464.16 + 5.0.0-rc.2.20464.19 + 5.0.0-rc.2.20464.19 + 5.0.0-rc.2.20464.19 + 5.0.0-rc.2.20464.19 + 5.0.0-rc.2.20464.19 + 5.0.0-rc.2.20464.19 0.2.0 - 5.0.100-rc.2.20464.14 - 5.0.100-rc.2.20464.14 + 5.0.100-rc.2.20464.18 + 5.0.100-rc.2.20464.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20462.5 + 5.0.0-rc.2.20464.8 - 5.0.0-rc.2.20462.5 - 5.0.0-rc.2.20462.5 - 5.0.0-rc.2.20462.5 - 5.0.0-rc.2.20462.5 - 5.0.0-rc.2.20462.5 + 5.0.0-rc.2.20464.8 + 5.0.0-rc.2.20464.8 + 5.0.0-rc.2.20464.8 + 5.0.0-rc.2.20464.8 + 5.0.0-rc.2.20464.8 2.1.0 From 6a4777d35fb9fa6dc587da5a0a533bf64a4b638c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 08:03:58 +0000 Subject: [PATCH 054/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8563) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20464.19 to 5.0.0-rc.2.20464.30 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20464.19 to 5.0.0-rc.2.20464.30 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20464.19 to 5.0.0-rc.2.20464.30 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20464.19 to 5.0.0-rc.2.20464.30 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20464.19 to 5.0.0-rc.2.20464.30 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20464.19 to 5.0.0-rc.2.20464.30 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20462.6 to 11.0.0-beta.20464.4 (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 9848af96a..a4e9119cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 80df3e06b9d9ffe90427a19e706f7165700d7d4e - + https://github.com/dotnet/aspnetcore - a6f667bbb30023986942522a60822ef3f6290bde + 45dade2b3621b0b3564041ccdf3063430b25551e - + https://github.com/dotnet/aspnetcore - a6f667bbb30023986942522a60822ef3f6290bde + 45dade2b3621b0b3564041ccdf3063430b25551e - + https://github.com/dotnet/aspnetcore - a6f667bbb30023986942522a60822ef3f6290bde + 45dade2b3621b0b3564041ccdf3063430b25551e - + https://github.com/dotnet/aspnetcore - a6f667bbb30023986942522a60822ef3f6290bde + 45dade2b3621b0b3564041ccdf3063430b25551e - + https://github.com/dotnet/aspnetcore - a6f667bbb30023986942522a60822ef3f6290bde + 45dade2b3621b0b3564041ccdf3063430b25551e - + https://github.com/dotnet/aspnetcore - a6f667bbb30023986942522a60822ef3f6290bde + 45dade2b3621b0b3564041ccdf3063430b25551e https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 3f7a3e88badb7ae82b6911dd7a3f2a4237803ef7 + 5a30071d51354ad5addef9531bbc23120b28c952 - + https://github.com/dotnet/sdk - 3f7a3e88badb7ae82b6911dd7a3f2a4237803ef7 + 5a30071d51354ad5addef9531bbc23120b28c952 @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf a07ad521fabf36a783df37341fcadfcdcf8509fb - + https://github.com/dotnet/fsharp - 71b8192dd317a2f19aa08f4bdfb34f56bd943579 + 038fd2fb945419667a183920d62edd77fc96255b https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 95d568607..4d743b8ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20464.19 - 5.0.0-rc.2.20464.19 - 5.0.0-rc.2.20464.19 - 5.0.0-rc.2.20464.19 - 5.0.0-rc.2.20464.19 - 5.0.0-rc.2.20464.19 + 5.0.0-rc.2.20464.30 + 5.0.0-rc.2.20464.30 + 5.0.0-rc.2.20464.30 + 5.0.0-rc.2.20464.30 + 5.0.0-rc.2.20464.30 + 5.0.0-rc.2.20464.30 0.2.0 - 5.0.100-rc.2.20464.18 - 5.0.100-rc.2.20464.18 + 5.0.100-rc.2.20464.21 + 5.0.100-rc.2.20464.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0de0eccfbb976f24bf4c472c3be20ad841e5f9b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 10:17:09 +0000 Subject: [PATCH 055/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8565) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20464.30 to 5.0.0-rc.2.20464.32 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20464.30 to 5.0.0-rc.2.20464.32 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20464.30 to 5.0.0-rc.2.20464.32 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20464.30 to 5.0.0-rc.2.20464.32 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20464.30 to 5.0.0-rc.2.20464.32 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20464.30 to 5.0.0-rc.2.20464.32 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20464.4 to 11.0.0-beta.20464.6 (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 a4e9119cd..fcbe8c315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 80df3e06b9d9ffe90427a19e706f7165700d7d4e - + https://github.com/dotnet/aspnetcore - 45dade2b3621b0b3564041ccdf3063430b25551e + d14e2730155790fc81b898e7336671b50cd934ea - + https://github.com/dotnet/aspnetcore - 45dade2b3621b0b3564041ccdf3063430b25551e + d14e2730155790fc81b898e7336671b50cd934ea - + https://github.com/dotnet/aspnetcore - 45dade2b3621b0b3564041ccdf3063430b25551e + d14e2730155790fc81b898e7336671b50cd934ea - + https://github.com/dotnet/aspnetcore - 45dade2b3621b0b3564041ccdf3063430b25551e + d14e2730155790fc81b898e7336671b50cd934ea - + https://github.com/dotnet/aspnetcore - 45dade2b3621b0b3564041ccdf3063430b25551e + d14e2730155790fc81b898e7336671b50cd934ea - + https://github.com/dotnet/aspnetcore - 45dade2b3621b0b3564041ccdf3063430b25551e + d14e2730155790fc81b898e7336671b50cd934ea https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 5a30071d51354ad5addef9531bbc23120b28c952 + 05ad0adee08268ab254f0af2f86c9cdc3c127014 - + https://github.com/dotnet/sdk - 5a30071d51354ad5addef9531bbc23120b28c952 + 05ad0adee08268ab254f0af2f86c9cdc3c127014 @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf a07ad521fabf36a783df37341fcadfcdcf8509fb - + https://github.com/dotnet/fsharp - 038fd2fb945419667a183920d62edd77fc96255b + c40b6719e288d18d92f7647f41e6eb3762326023 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 4d743b8ae..1a837b74c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20464.30 - 5.0.0-rc.2.20464.30 - 5.0.0-rc.2.20464.30 - 5.0.0-rc.2.20464.30 - 5.0.0-rc.2.20464.30 - 5.0.0-rc.2.20464.30 + 5.0.0-rc.2.20464.32 + 5.0.0-rc.2.20464.32 + 5.0.0-rc.2.20464.32 + 5.0.0-rc.2.20464.32 + 5.0.0-rc.2.20464.32 + 5.0.0-rc.2.20464.32 0.2.0 - 5.0.100-rc.2.20464.21 - 5.0.100-rc.2.20464.21 + 5.0.100-rc.2.20465.2 + 5.0.100-rc.2.20465.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 36b16badb70f81a5ae42e4e795e959e60ad72101 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 18:30:28 +0000 Subject: [PATCH 056/134] Update dependencies from https://github.com/dotnet/sdk build 20200915.3 (#8566) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20460.13 to 5.0.0-rc.2.20464.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20460.13 to 5.0.0-rc.2.20464.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20460.3 to 5.0.0-rc.2.20464.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20460.13 to 5.0.0-rc.2.20464.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20460.7 to 5.0.0-rc.2.20464.9 (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 fcbe8c315..19e656ee0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 + b54abda1e689fd35959db580631dcda469f1cc7f - + https://github.com/dotnet/windowsdesktop - 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 + b54abda1e689fd35959db580631dcda469f1cc7f - + https://github.com/dotnet/windowsdesktop - 3b432fcf3ca1020b07b8ccbdd7cbcef569e53323 + b54abda1e689fd35959db580631dcda469f1cc7f https://github.com/dotnet/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 05ad0adee08268ab254f0af2f86c9cdc3c127014 + 16043dbbf2c9b44c3ffe5a7748afd6672d941095 - + https://github.com/dotnet/sdk - 05ad0adee08268ab254f0af2f86c9cdc3c127014 + 16043dbbf2c9b44c3ffe5a7748afd6672d941095 - + https://github.com/dotnet/winforms - 98f67367df7321b09e9cb5168254a35b83016d2f + 1420303ba3f80fab91799de75a1f8539dc1441d6 - + https://github.com/dotnet/wpf - a07ad521fabf36a783df37341fcadfcdcf8509fb + 14ec7b1f5aedc31bc609571849139a154452d6da https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1a837b74c..ad5bca2fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20460.3 + 5.0.0-rc.2.20464.6 - 5.0.0-rc.2.20460.7 + 5.0.0-rc.2.20464.9 @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20465.2 - 5.0.100-rc.2.20465.2 + 5.0.100-rc.2.20465.3 + 5.0.100-rc.2.20465.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.2.20460.13 - 5.0.0-rc.2.20460.13 - 5.0.0-rc.2.20460.13 + 5.0.0-rc.2.20464.5 + 5.0.0-rc.2.20464.5 + 5.0.0-rc.2.20464.5 From 12755621ffb1c34cee5e7ceefdfe84b1960d72f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 19:22:56 +0000 Subject: [PATCH 057/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8572) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20464.32 to 5.0.0-rc.2.20464.33 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20464.32 to 5.0.0-rc.2.20464.33 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20464.32 to 5.0.0-rc.2.20464.33 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20464.32 to 5.0.0-rc.2.20464.33 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20464.32 to 5.0.0-rc.2.20464.33 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20464.32 to 5.0.0-rc.2.20464.33 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20464.6 to 11.0.0-beta.20464.8 (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 19e656ee0..0b5721276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 80df3e06b9d9ffe90427a19e706f7165700d7d4e - + https://github.com/dotnet/aspnetcore - d14e2730155790fc81b898e7336671b50cd934ea + 38c9fe7437365df25ff5f5cd481e691a5072a460 - + https://github.com/dotnet/aspnetcore - d14e2730155790fc81b898e7336671b50cd934ea + 38c9fe7437365df25ff5f5cd481e691a5072a460 - + https://github.com/dotnet/aspnetcore - d14e2730155790fc81b898e7336671b50cd934ea + 38c9fe7437365df25ff5f5cd481e691a5072a460 - + https://github.com/dotnet/aspnetcore - d14e2730155790fc81b898e7336671b50cd934ea + 38c9fe7437365df25ff5f5cd481e691a5072a460 - + https://github.com/dotnet/aspnetcore - d14e2730155790fc81b898e7336671b50cd934ea + 38c9fe7437365df25ff5f5cd481e691a5072a460 - + https://github.com/dotnet/aspnetcore - d14e2730155790fc81b898e7336671b50cd934ea + 38c9fe7437365df25ff5f5cd481e691a5072a460 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 16043dbbf2c9b44c3ffe5a7748afd6672d941095 + b0cef96336f34fe902c76ef4f6825cf9a18ccacb - + https://github.com/dotnet/sdk - 16043dbbf2c9b44c3ffe5a7748afd6672d941095 + b0cef96336f34fe902c76ef4f6825cf9a18ccacb @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf 14ec7b1f5aedc31bc609571849139a154452d6da - + https://github.com/dotnet/fsharp - c40b6719e288d18d92f7647f41e6eb3762326023 + 88ca25984dd05990a593fb80382ad09dc3602c33 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index ad5bca2fc..080019e71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 5.0.0-rc.2.20464.32 - 5.0.0-rc.2.20464.32 - 5.0.0-rc.2.20464.32 - 5.0.0-rc.2.20464.32 - 5.0.0-rc.2.20464.32 - 5.0.0-rc.2.20464.32 + 5.0.0-rc.2.20464.33 + 5.0.0-rc.2.20464.33 + 5.0.0-rc.2.20464.33 + 5.0.0-rc.2.20464.33 + 5.0.0-rc.2.20464.33 + 5.0.0-rc.2.20464.33 0.2.0 - 5.0.100-rc.2.20465.3 - 5.0.100-rc.2.20465.3 + 5.0.100-rc.2.20465.5 + 5.0.100-rc.2.20465.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a31503d2be9ebc76e6479ab9c3ed9b523573edf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 22:41:12 +0000 Subject: [PATCH 058/134] Update dependencies from https://github.com/dotnet/sdk build 20200915.14 (#8577) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20464.8 to 11.0.0-beta.20465.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 0b5721276..9c7d20a40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - b0cef96336f34fe902c76ef4f6825cf9a18ccacb + b43b355d3e13121c5de59a70cf94b40805692b33 - + https://github.com/dotnet/sdk - b0cef96336f34fe902c76ef4f6825cf9a18ccacb + b43b355d3e13121c5de59a70cf94b40805692b33 @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf 14ec7b1f5aedc31bc609571849139a154452d6da - + https://github.com/dotnet/fsharp - 88ca25984dd05990a593fb80382ad09dc3602c33 + 0edb614e4face390d84f5120017c24e0f7793b4c https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 080019e71..77a5eb126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.2.20465.5 - 5.0.100-rc.2.20465.5 + 5.0.100-rc.2.20465.14 + 5.0.100-rc.2.20465.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From af06fa7bb4387fb91c32b6f4cb177f70e99ebc91 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 15 Sep 2020 16:45:52 -0700 Subject: [PATCH 059/134] React to non-stable versioning of AspNetCore installers (#8576) * React to non-stable versioning of AspNetCore installers * Fix version prop --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + src/redist/targets/GenerateLayout.targets | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c7d20a40..51c45a453 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,6 +47,10 @@ https://github.com/dotnet/aspnetcore 38c9fe7437365df25ff5f5cd481e691a5072a460 + + https://github.com/dotnet/aspnetcore + 38c9fe7437365df25ff5f5cd481e691a5072a460 + https://github.com/dotnet/aspnetcore 38c9fe7437365df25ff5f5cd481e691a5072a460 diff --git a/eng/Versions.props b/eng/Versions.props index 77a5eb126..2a1be7d8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,6 +43,7 @@ 5.0.0-rc.2.20464.33 5.0.0-rc.2.20464.33 + 5.0.0-rc.2.20464.33 5.0.0-rc.2.20464.33 5.0.0-rc.2.20464.33 5.0.0-rc.2.20464.33 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 3043fb94b..d295ff3fe 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -17,7 +17,7 @@ $(CoreSetupBlobVersion) - $(AspNetCoreBlobVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(WindowsDesktopBlobVersion) 3.0.0 @@ -78,10 +78,11 @@ x64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) From df2d10063f03d0fdc318102c93b29c22011aee78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 00:38:17 +0000 Subject: [PATCH 060/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8580) [release/5.0.1xx-rc2] 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 51c45a453..1845c3690 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - b43b355d3e13121c5de59a70cf94b40805692b33 + 4fc17c565ad4cd1e9184a4c050e95bc86d1c0bbd - + https://github.com/dotnet/sdk - b43b355d3e13121c5de59a70cf94b40805692b33 + 4fc17c565ad4cd1e9184a4c050e95bc86d1c0bbd diff --git a/eng/Versions.props b/eng/Versions.props index 2a1be7d8f..f66c4fdd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20465.14 - 5.0.100-rc.2.20465.14 + 5.0.100-rc.2.20465.17 + 5.0.100-rc.2.20465.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9eee8c5d3fe31e45385dd0316753d595a70b9d44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 02:05:49 +0000 Subject: [PATCH 061/134] Update dependencies from https://github.com/dotnet/sdk build 20200915.18 (#8582) [release/5.0.1xx-rc2] 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 1845c3690..77f456d9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 4fc17c565ad4cd1e9184a4c050e95bc86d1c0bbd + efc169232e186c230487cd5eb04aa13cbeb726b5 - + https://github.com/dotnet/sdk - 4fc17c565ad4cd1e9184a4c050e95bc86d1c0bbd + efc169232e186c230487cd5eb04aa13cbeb726b5 diff --git a/eng/Versions.props b/eng/Versions.props index f66c4fdd4..45049dfd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20465.17 - 5.0.100-rc.2.20465.17 + 5.0.100-rc.2.20465.18 + 5.0.100-rc.2.20465.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7e7de71fc48ef905b9137a8fd3f3d80a8d0e95b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 04:00:10 +0000 Subject: [PATCH 062/134] Update dependencies from https://github.com/dotnet/sdk build 20200915.27 (#8584) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20464.8 to 5.0.0-rc.2.20465.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20464.8 to 5.0.0-rc.2.20465.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20464.8 to 5.0.0-rc.2.20465.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20464.8 to 5.0.0-rc.2.20465.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20464.8 to 5.0.0-rc.2.20465.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20464.8 to 5.0.0-rc.2.20465.4 (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 77f456d9f..44ca01fc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop b54abda1e689fd35959db580631dcda469f1cc7f - + https://github.com/dotnet/runtime - 80df3e06b9d9ffe90427a19e706f7165700d7d4e + acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 - + https://github.com/dotnet/runtime - 80df3e06b9d9ffe90427a19e706f7165700d7d4e + acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 - + https://github.com/dotnet/runtime - 80df3e06b9d9ffe90427a19e706f7165700d7d4e + acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 - + https://github.com/dotnet/runtime - 80df3e06b9d9ffe90427a19e706f7165700d7d4e + acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 - + https://github.com/dotnet/runtime - 80df3e06b9d9ffe90427a19e706f7165700d7d4e + acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 80df3e06b9d9ffe90427a19e706f7165700d7d4e + acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - efc169232e186c230487cd5eb04aa13cbeb726b5 + eb8f5e423902a8a43cd25851cf08fca6f0cf8f34 - + https://github.com/dotnet/sdk - efc169232e186c230487cd5eb04aa13cbeb726b5 + eb8f5e423902a8a43cd25851cf08fca6f0cf8f34 diff --git a/eng/Versions.props b/eng/Versions.props index 45049dfd2..e9948a741 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ - 5.0.100-rc.2.20465.18 - 5.0.100-rc.2.20465.18 + 5.0.100-rc.2.20465.27 + 5.0.100-rc.2.20465.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20464.8 + 5.0.0-rc.2.20465.4 - 5.0.0-rc.2.20464.8 - 5.0.0-rc.2.20464.8 - 5.0.0-rc.2.20464.8 - 5.0.0-rc.2.20464.8 - 5.0.0-rc.2.20464.8 + 5.0.0-rc.2.20465.4 + 5.0.0-rc.2.20465.4 + 5.0.0-rc.2.20465.4 + 5.0.0-rc.2.20465.4 + 5.0.0-rc.2.20465.4 2.1.0 From ce282f183a8ce3ae347dc45795915cbebe2baf08 Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Tue, 15 Sep 2020 22:16:52 -0700 Subject: [PATCH 063/134] Fix casing for ARM64 platform token --- src/redist/targets/packaging/windows/clisdk/variables.wxi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/packaging/windows/clisdk/variables.wxi b/src/redist/targets/packaging/windows/clisdk/variables.wxi index 641cc7431..bad1ff7ef 100644 --- a/src/redist/targets/packaging/windows/clisdk/variables.wxi +++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi @@ -27,7 +27,7 @@ - + From 25792f69e74b0d1469f3624d61f392895c2d7d66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:03:16 +0000 Subject: [PATCH 064/134] Update dependencies from https://github.com/dotnet/arcade build 20200914.13 (#8590) [release/5.0.1xx-rc2] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 +++--- eng/Versions.props | 2 +- .../post-build/sourcelink-validation.ps1 | 26 ++++++++++++++----- eng/common/post-build/symbols-validation.ps1 | 7 +---- global.json | 2 +- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44ca01fc0..7d3e88dfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -140,13 +140,13 @@ - + https://github.com/dotnet/arcade - 91470b0b14ba016c1fb78211b12775287c17b34e + bd918c64b786bdba42e895e4cb93603e5a2ca608 - + https://github.com/dotnet/arcade - 91470b0b14ba016c1fb78211b12775287c17b34e + bd918c64b786bdba42e895e4cb93603e5a2ca608 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e9948a741..67faf9a06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 5.0.0-beta.20459.8 + 5.0.0-beta.20464.13 diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index cdd1bba4f..c7e7ae67d 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -144,11 +144,27 @@ $ValidatePackage = { if ($FailedFiles -eq 0) { Write-Host 'Passed.' - return 0 + return [pscustomobject]@{ + result = 0 + packagePath = $PackagePath + } } else { Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links." - return 1 + return [pscustomobject]@{ + result = 1 + packagePath = $PackagePath + } + } +} + +function CheckJobResult( + $result, + $packagePath, + [ref]$ValidationFailures) { + if ($jobResult.result -ne '0') { + Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links." + $ValidationFailures.Value++ } } @@ -211,10 +227,8 @@ function ValidateSourceLinkLinks { } foreach ($Job in @(Get-Job -State 'Completed')) { - $jobResult = Receive-Job -Id $Job.Id - if ($jobResult -ne '0') { - $ValidationFailures++ - } + $jobResult = Wait-Job -Id $Job.Id | Receive-Job + CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures) Remove-Job -Id $Job.Id } } diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index a36fa6f26..fcc6019b4 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -141,11 +141,6 @@ $CountMissingSymbols = { if ($using:Clean) { Remove-Item $ExtractPath -Recurse -Force } - - if ($MissingSymbols -ne 0) - { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath" - } Pop-Location @@ -165,6 +160,7 @@ function CheckJobResult( $DupedSymbols.Value++ } elseif ($jobResult.result -ne '0') { + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath" $TotalFailures.Value++ } } @@ -201,7 +197,6 @@ function CheckSymbolsAvailable { Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null $NumJobs = @(Get-Job -State 'Running').Count - Write-Host $NumJobs while ($NumJobs -ge $MaxParallelJobs) { Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again." diff --git a/global.json b/global.json index e571d9905..c43f1a3be 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20459.8" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20464.13" } } From 446388ee4f32edc4f2541107df3de19b5f9af2e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 14:49:45 +0000 Subject: [PATCH 065/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8585) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20464.5 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20464.5 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20465.4 to 5.0.0-rc.2.20465.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20465.4 to 5.0.0-rc.2.20465.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20465.4 to 5.0.0-rc.2.20465.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20465.4 to 5.0.0-rc.2.20465.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20465.4 to 5.0.0-rc.2.20465.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20465.4 to 5.0.0-rc.2.20465.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20464.33 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20464.33 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20464.33 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20464.33 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20464.33 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20464.33 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20464.6 to 5.0.0-rc.2.20465.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20464.5 to 5.0.0-rc.2.20466.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20464.9 to 5.0.0-rc.2.20465.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Update the Microsoft.AspNetCore.App.Ref.Internal version --- eng/Version.Details.xml | 82 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d3e88dfb..17a6c429a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - b54abda1e689fd35959db580631dcda469f1cc7f + b9b1d13ac06f5b0a90438da116d0370fb7f679ef - + https://github.com/dotnet/windowsdesktop - b54abda1e689fd35959db580631dcda469f1cc7f + b9b1d13ac06f5b0a90438da116d0370fb7f679ef - + https://github.com/dotnet/windowsdesktop - b54abda1e689fd35959db580631dcda469f1cc7f + b9b1d13ac06f5b0a90438da116d0370fb7f679ef - + https://github.com/dotnet/runtime - acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 + e24e67a8dd52a20e5aa07b934ce7790c96808b1b - + https://github.com/dotnet/runtime - acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 + e24e67a8dd52a20e5aa07b934ce7790c96808b1b - + https://github.com/dotnet/runtime - acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 + e24e67a8dd52a20e5aa07b934ce7790c96808b1b - + https://github.com/dotnet/runtime - acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 + e24e67a8dd52a20e5aa07b934ce7790c96808b1b - + https://github.com/dotnet/runtime - acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 + e24e67a8dd52a20e5aa07b934ce7790c96808b1b @@ -39,37 +39,37 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - acdf37b56119bd11a52a9b8e4ea1f310d0ef7b82 + e24e67a8dd52a20e5aa07b934ce7790c96808b1b - + https://github.com/dotnet/aspnetcore - 38c9fe7437365df25ff5f5cd481e691a5072a460 + 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 - + https://github.com/dotnet/aspnetcore - 38c9fe7437365df25ff5f5cd481e691a5072a460 + 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 - + https://github.com/dotnet/aspnetcore - 38c9fe7437365df25ff5f5cd481e691a5072a460 + 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 - + https://github.com/dotnet/aspnetcore - 38c9fe7437365df25ff5f5cd481e691a5072a460 + 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 - + https://github.com/dotnet/aspnetcore - 38c9fe7437365df25ff5f5cd481e691a5072a460 + 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 - + https://github.com/dotnet/aspnetcore - 38c9fe7437365df25ff5f5cd481e691a5072a460 + 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 - + https://github.com/dotnet/aspnetcore - 38c9fe7437365df25ff5f5cd481e691a5072a460 + 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 https://github.com/dotnet/test-templates @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - eb8f5e423902a8a43cd25851cf08fca6f0cf8f34 + 9447809d269fda57fd5c691a0688d61ed336a590 - + https://github.com/dotnet/sdk - eb8f5e423902a8a43cd25851cf08fca6f0cf8f34 + 9447809d269fda57fd5c691a0688d61ed336a590 - + https://github.com/dotnet/winforms - 1420303ba3f80fab91799de75a1f8539dc1441d6 + 4386255554cea35371c97243e260539139c2db1e - + https://github.com/dotnet/wpf - 14ec7b1f5aedc31bc609571849139a154452d6da + 24665705a1b16f421b545f2a4396b3c2952dbe6f https://github.com/dotnet/fsharp @@ -126,7 +126,7 @@ 5eaf25677df20ce322acd08478ccdaddd87f1a52 - https://github.com/dotnet/cliCommandLineParser + https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 diff --git a/eng/Versions.props b/eng/Versions.props index 67faf9a06..7034feb82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20464.6 + 5.0.0-rc.2.20465.8 - 5.0.0-rc.2.20464.9 + 5.0.0-rc.2.20465.13 @@ -41,42 +41,42 @@ - 5.0.0-rc.2.20464.33 - 5.0.0-rc.2.20464.33 - 5.0.0-rc.2.20464.33 - 5.0.0-rc.2.20464.33 - 5.0.0-rc.2.20464.33 - 5.0.0-rc.2.20464.33 - 5.0.0-rc.2.20464.33 + 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.1 0.2.0 - 5.0.100-rc.2.20465.27 - 5.0.100-rc.2.20465.27 + 5.0.100-rc.2.20466.5 + 5.0.100-rc.2.20466.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20465.4 + 5.0.0-rc.2.20465.7 - 5.0.0-rc.2.20465.4 - 5.0.0-rc.2.20465.4 - 5.0.0-rc.2.20465.4 - 5.0.0-rc.2.20465.4 - 5.0.0-rc.2.20465.4 + 5.0.0-rc.2.20465.7 + 5.0.0-rc.2.20465.7 + 5.0.0-rc.2.20465.7 + 5.0.0-rc.2.20465.7 + 5.0.0-rc.2.20465.7 2.1.0 - 5.0.0-rc.2.20464.5 - 5.0.0-rc.2.20464.5 - 5.0.0-rc.2.20464.5 + 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.1 From 0a5da187e09584e82389be95657c5a44d8fceaca Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 15 Sep 2020 21:26:58 -0700 Subject: [PATCH 066/134] Add VSTemplateLocator package --- eng/Versions.props | 1 + .../VSTemplateLocator.csproj | 39 +++++++++++++++++++ src/redist/redist.csproj | 1 + src/redist/targets/GenerateMSIs.targets | 24 +++++++++++- ...mmon.Net.Core.SDK.VSTemplateLocator.nuspec | 18 +++++++++ 5 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 src/VSTemplateLocator/VSTemplateLocator.csproj create mode 100644 src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec diff --git a/eng/Versions.props b/eng/Versions.props index 7034feb82..f9fd4bb2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,6 +58,7 @@ 5.0.100-rc.2.20466.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) + $(MicrosoftNETSdkPackageVersion) diff --git a/src/VSTemplateLocator/VSTemplateLocator.csproj b/src/VSTemplateLocator/VSTemplateLocator.csproj new file mode 100644 index 000000000..348b13fb5 --- /dev/null +++ b/src/VSTemplateLocator/VSTemplateLocator.csproj @@ -0,0 +1,39 @@ + + + + $(CoreSdkTargetFramework) + false + false + false + false + UNUSED + true + + + + + + + + + + + + + + + + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_VSTemplateLocatorSrc Include="$(Pkgmicrosoft_dotnet_templateLocator)\lib\net472\**\*.dll" Arch="" /> + <_VSTemplateLocatorDst Include="@(_VSTemplateLocatorSrc->'$(OutputPath)VSTemplateLocator\%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 35c3d4ad9..e3b39487a 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -12,6 +12,7 @@ /> + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 307808e57..49c5f54f2 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -46,6 +46,10 @@ $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr + $(ArtifactsDir)bin/VSTemplateLocator/Debug + $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$(FullNugetVersion).nupkg + $(ArtifactsObjDir)/LightCommandPackages @@ -531,6 +535,23 @@ + + + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec new file mode 100644 index 000000000..6b60dae86 --- /dev/null +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec @@ -0,0 +1,18 @@ + + + + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + 1.0.0 + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + Microsoft + Microsoft + https://www.microsoft.com/net/dotnet_library_license.htm + https://github.com/dotnet/core-sdk + true + MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption + © Microsoft Corporation. All rights reserved. + + + + + From d240f3cfd17843f8b3e1bc4097897685de80d4a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 19:19:30 +0000 Subject: [PATCH 067/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/arcade (#8596) [release/5.0.1xx-rc2] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceLink.GitHub: from 1.1.0-beta-20457-02 to 1.1.0-beta-20464-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Update create light/light command package drop task - Update create light/light command package drop task --- eng/Version.Details.xml | 14 ++++---- eng/Versions.props | 2 +- global.json | 2 +- src/redist/targets/GenerateMSIs.targets | 44 +++++++------------------ 4 files changed, 21 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17a6c429a..beaf4e51a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -126,7 +126,7 @@ 5eaf25677df20ce322acd08478ccdaddd87f1a52 - https://github.com/dotnet/CliCommandLineParser + https://github.com/dotnet/cliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 @@ -140,21 +140,21 @@ - + https://github.com/dotnet/arcade - bd918c64b786bdba42e895e4cb93603e5a2ca608 + fa0486ddb04a76341d822903c8977fb9fa088d1e - + https://github.com/dotnet/arcade - bd918c64b786bdba42e895e4cb93603e5a2ca608 + fa0486ddb04a76341d822903c8977fb9fa088d1e https://github.com/dotnet/source-build-reference-packages 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 - + https://github.com/dotnet/sourcelink - e9d917c21e38e274a413a207d9e84eb80382b56f + 8a3edd1902dbfe3adba65f22e3bb7aa2cc73e97f https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index f9fd4bb2b..0a5429f60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 5.0.0-beta.20464.13 + 5.0.0-beta.20465.7 diff --git a/global.json b/global.json index c43f1a3be..cf9977c7d 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20464.13" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20465.7" } } diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 49c5f54f2..ed366530f 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -201,19 +201,14 @@ - + - - - - + - - - - + - - - @@ -383,20 +368,15 @@ - + - - - Date: Wed, 16 Sep 2020 12:48:01 -0700 Subject: [PATCH 068/134] Create ARM64 verision of bundle theme file to account for lack of WindowsDesktop support --- .../windows/clisdk/LCID/1028/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1029/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1031/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1033/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1036/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1040/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1041/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1042/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1045/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1046/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1049/bundle.wxl | 15 +++ .../windows/clisdk/LCID/1055/bundle.wxl | 15 +++ .../windows/clisdk/LCID/2052/bundle.wxl | 15 +++ .../windows/clisdk/LCID/3082/bundle.wxl | 15 +++ .../packaging/windows/clisdk/bundle.wxs | 8 ++ .../packaging/windows/clisdk/bundleArm64.thm | 95 +++++++++++++++++++ 16 files changed, 313 insertions(+) create mode 100644 src/redist/targets/packaging/windows/clisdk/bundleArm64.thm diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index 004138691..fd301d870 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -58,6 +58,21 @@ 此產品會收集使用方式資料 • 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry +資源 + • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs + • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs + • 如需版本資訊，請前往 https://aka.ms/dotnet5-release-notes + • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials +安裝成功。 + +下列項目已安裝在: '[DOTNETHOME]' + • .NET SDK [DOTNETSDKVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + +此產品會收集使用方式資料 + • 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry + 資源 • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index d190f3138..d17c6fcc7 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -58,6 +58,21 @@ Do [DOTNETHOME] byly nainstalovány tyto součásti: Tento produkt shromažďuje data o využití. • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry +Zdroje informací + • Dokumentace k .NET : https://aka.ms/dotnet-docs + • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs + • Zpráva k vydání verze: https://aka.ms/dotnet5-release-notes + • Kurzy: https://aka.ms/dotnet-tutorials + Instalace proběhla úspěšně. + +Do [DOTNETHOME] byly nainstalovány tyto součásti: + • Sada .NET SDK [DOTNETSDKVERSION] + • Modul runtime .NET [DOTNETRUNTIMEVERSION] + • Modul runtime ASP.NET Core [ASPNETCOREVERSION] + +Tento produkt shromažďuje data o využití. + • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry + Zdroje informací • Dokumentace k .NET : https://aka.ms/dotnet-docs • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index fb193fb93..a197ee67a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -58,6 +58,21 @@ Folgende Komponenten wurden unter [DOTNETHOME] installiert: Dieses Produkt erfasst Nutzungsdaten. • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry +Ressourcen + • .NET-Dokumentation: https://aka.ms/dotnet-docs + • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs + • Versionshinweise: https://aka.ms/dotnet5-release-notes + • Tutorials: https://aka.ms/dotnet-tutorials +Die Installation war erfolgreich. + +Folgende Komponenten wurden unter [DOTNETHOME] installiert: + • .NET SDK [DOTNETSDKVERSION] + • .NET-Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core-Runtime [ASPNETCOREVERSION] + +Dieses Produkt erfasst Nutzungsdaten. + • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry + Ressourcen • .NET-Dokumentation: https://aka.ms/dotnet-docs • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl index 2e3e86df2..9944d6e4d 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -58,6 +58,21 @@ The following were installed at: '[DOTNETHOME]' This product collects usage data • More information and opt-out https://aka.ms/dotnet-cli-telemetry +Resources + • .NET Documentation https://aka.ms/dotnet-docs + • SDK Documentation https://aka.ms/dotnet-sdk-docs + • Release Notes https://aka.ms/dotnet5-release-notes + • Tutorials https://aka.ms/dotnet-tutorials +The installation was successful. + +The following were installed at: '[DOTNETHOME]' + • .NET SDK [DOTNETSDKVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + +This product collects usage data + • More information and opt-out https://aka.ms/dotnet-cli-telemetry + Resources • .NET Documentation https://aka.ms/dotnet-docs • SDK Documentation https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index 38cc06a3d..673804e94 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -58,6 +58,21 @@ Les éléments suivants ont été installés sur : '[DOTNETHOME]' Ce produit collecte des données d'utilisation • Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry +Ressources + • Documentation .NET sur https://aka.ms/dotnet-docs + • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs + • Notes de publication sur https://aka.ms/dotnet5-release-notes + • Tutoriels sur https://aka.ms/dotnet-tutorials + L'installation a réussi. + +Les éléments suivants ont été installés sur : '[DOTNETHOME]' + • Kit SDK .NET [DOTNETSDKVERSION] + • Runtime .NET [DOTNETRUNTIMEVERSION] + • Runtime ASP.NET Core [ASPNETCOREVERSION] + +Ce produit collecte des données d'utilisation + • Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry + Ressources • Documentation .NET sur https://aka.ms/dotnet-docs • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 4e9dc4b4a..5c60d0246 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -58,6 +58,21 @@ I componenti seguenti sono stati installati in '[DOTNETHOME]' Questo prodotto consente di raccogliere i dati sull'utilizzo • Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry +Risorse + • Documentazione di .NET https://aka.ms/dotnet-docs + • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs + • Note sulla versione https://aka.ms/dotnet5-release-notes + • Esercitazioni https://aka.ms/dotnet-tutorials + L'installazione è riuscita. + +I componenti seguenti sono stati installati in '[DOTNETHOME]' + • .NET SDK [DOTNETSDKVERSION] + • Runtime di .NET [DOTNETRUNTIMEVERSION] + • Runtime di ASP.NET Core [ASPNETCOREVERSION] + +Questo prodotto consente di raccogliere i dati sull'utilizzo + • Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry + Risorse • Documentazione di .NET https://aka.ms/dotnet-docs • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 6bdfe68ff..36639d88a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -58,6 +58,21 @@ この製品は使用状況データを収集します • 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry +リソース + • .NET ドキュメント https://aka.ms/dotnet-docs + • SDK ドキュメント https://aka.ms/dotnet-sdk-docs + • リリース ノート https://aka.ms/dotnet5-release-notes + • チュートリアル https://aka.ms/dotnet-tutorials + インストールが成功しました。 + +'[DOTNETHOME]' に以下がインストールされました + • .NET SDK [DOTNETSDKVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + +この製品は使用状況データを収集します + • 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry + リソース • .NET ドキュメント https://aka.ms/dotnet-docs • SDK ドキュメント https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index 99a59349c..e8fde1177 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -58,6 +58,21 @@ 이 제품은 사용량 현황 데이터를 수집합니다. • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry +리소스 + • .NET 설명서 https://aka.ms/dotnet-docs + • SDK 설명서 https://aka.ms/dotnet-sdk-docs + • 릴리스 정보 https://aka.ms/dotnet5-release-notes + • 자습서 https://aka.ms/dotnet-tutorials + 설치가 완료되었습니다. + +다음이 '[DOTNETHOME]'에 설치되었습니다. + • .NET SDK [DOTNETSDKVERSION] + • .NET 런타임 [DOTNETRUNTIMEVERSION] + • ASP.NET Core 런타임 [ASPNETCOREVERSION] + +이 제품은 사용량 현황 데이터를 수집합니다. + • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry + 리소스 • .NET 설명서 https://aka.ms/dotnet-docs • SDK 설명서 https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index c22a5a48e..7b7e0aca2 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -58,6 +58,21 @@ Następujące elementy zostały zainstalowane w: „[DOTNETHOME]” Ten produkt gromadzi dane dotyczące użycia • Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry +Zasoby + • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs + • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs + • Informacje o wersji: https://aka.ms/dotnet5-release-notes + • Samouczki: https://aka.ms/dotnet-tutorials + Instalacja zakończyła się pomyślnie. + +Następujące elementy zostały zainstalowane w: „[DOTNETHOME]” + • Zestaw .NET SDK [DOTNETSDKVERSION] + • Środowisko uruchomieniowe platformy .NET [DOTNETRUNTIMEVERSION] + • Środowisko uruchomieniowe platformy ASP.NET Core [ASPNETCOREVERSION] + +Ten produkt gromadzi dane dotyczące użycia + • Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry + Zasoby • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 42e7dbca4..257d6ebb7 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -58,6 +58,21 @@ O seguinte foi instalado em: '[DOTNETHOME]' Este produto coleta dados de uso • Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry +Recursos + • Documentação do .NET: https://aka.ms/dotnet-docs + • Documentação do SDK: https://aka.ms/dotnet-sdk-docs + • Notas sobre a Versão: https://aka.ms/netcore3releasenotes + • Tutoriais: https://aka.ms/dotnet-tutorials + A instalação foi bem-sucedida. + +O seguinte foi instalado em: '[DOTNETHOME]' + • SDK do .NET [DOTNETSDKVERSION] + • Runtime do .NET [DOTNETRUNTIMEVERSION] + • Runtime do ASP.NET Core [ASPNETCOREVERSION] + +Este produto coleta dados de uso + • Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry + Recursos • Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index e79c2aa1f..d9508dcd5 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -58,6 +58,21 @@ Этот продукт собирает данные об использовании. • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry +Ресурсы + • Документация по .NET: https://aka.ms/dotnet-docs + • Документация по SDK: https://aka.ms/dotnet-sdk-docs + • Заметки о выпуске: https://aka.ms/dotnet5-release-notes + • Учебники: https://aka.ms/dotnet-tutorials + Установка выполнена. + +В "[DOTNETHOME]" установлены следующие компоненты: + • Пакет SDK для .NET [DOTNETSDKVERSION] + • Среда выполнения .NET [DOTNETRUNTIMEVERSION] + • Среда выполнения ASP.NET Core [ASPNETCOREVERSION] + +Этот продукт собирает данные об использовании. + • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry + Ресурсы • Документация по .NET: https://aka.ms/dotnet-docs • Документация по SDK: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index f80a96737..8b194934c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -58,6 +58,21 @@ Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]' Bu ürün, kullanım verilerini toplar • Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry +Kaynaklar + • .NET Belgeleri https://aka.ms/dotnet-docs + • SDK Belgeleri https://aka.ms/dotnet-sdk-docs + • Sürüm Notları https://aka.ms/dotnet5-release-notes + • Öğreticiler https://aka.ms/dotnet-tutorials + Yükleme başarılı oldu. + +Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]' + • .NET SDK [DOTNETSDKVERSION] + • .NET Çalışma Zamanı [DOTNETRUNTIMEVERSION] + • ASP.NET Core Çalışma Zamanı [ASPNETCOREVERSION] + +Bu ürün, kullanım verilerini toplar + • Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry + Kaynaklar • .NET Belgeleri https://aka.ms/dotnet-docs • SDK Belgeleri https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index d3e6e3568..661b39718 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -58,6 +58,21 @@ 此产品会收集用法数据 • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry +资源 + • .NET 文档: https://aka.ms/dotnet-docs + • SDK 文档: https://aka.ms/dotnet-sdk-docs + • 发行说明: https://aka.ms/dotnet5-release-notes + • 教程: https://aka.ms/dotnet-tutorials +已成功安装。 + +下列项安装于: "[DOTNETHOME]" + • .NET SDK [DOTNETSDKVERSION] + • .NET 运行时 [DOTNETRUNTIMEVERSION] + • ASP.NET Core 运行时 [ASPNETCOREVERSION] + +此产品会收集用法数据 + • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry + 资源 • .NET 文档: https://aka.ms/dotnet-docs • SDK 文档: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index d70eaa727..b15841abd 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -58,6 +58,21 @@ Se instaló lo siguiente en: "[DOTNETHOME]" Este producto recopila datos de uso • Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry +Recursos + • Documentación de .NET https://aka.ms/dotnet-docs + • Documentación del SDK https://aka.ms/dotnet-sdk-docs + • Notas de la versión https://aka.ms/dotnet5-release-notes + • Tutoriales https://aka.ms/dotnet-tutorials + La instalación se realizó correctamente. + +Se instaló lo siguiente en: "[DOTNETHOME]" + • SDK de .NET [DOTNETSDKVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + +Este producto recopila datos de uso + • Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry + Recursos • Documentación de .NET https://aka.ms/dotnet-docs • Documentación del SDK https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index f0d039989..e22f99c6f 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -195,7 +195,15 @@ + + + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm b/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm new file mode 100644 index 000000000..3a6f14708 --- /dev/null +++ b/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm @@ -0,0 +1,95 @@ + + + #(loc.Caption) + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + #(loc.Title) + + + + + + #(loc.HelpHeader) + #(loc.HelpText) + + + + + + + + #(loc.WelcomeHeaderMessage) + #(loc.WelcomeDescription) + #(loc.VisualStudioWarning) + #(loc.LicenseAssent) + #(loc.PrivacyStatementLink) + #(loc.DotNetEulaLink) + + + + + + + #(loc.FilesInUseHeader) + #(loc.FilesInUseLabel) + + + + + + + + + + + + + + #(loc.ProgressHeader) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + + + + + + + #(loc.ModifyHeader) + + + + + + + + + #(loc.SuccessHeader) + #(loc.FirstTimeWelcomeMessageArm64) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) + + #(loc.SuccessRestartText) + + + + + + + + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) + #(loc.FailureHyperlinkLogText) + + #(loc.FailureRestartText) + + + + From 800566ab6d872aa5552b68d10ef764a78203878c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2020 17:00:51 +0000 Subject: [PATCH 069/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8594) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.10 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20465.7 to 5.0.0-rc.2.20466.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20465.7 to 5.0.0-rc.2.20466.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20465.7 to 5.0.0-rc.2.20466.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20465.7 to 5.0.0-rc.2.20466.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20465.7 to 5.0.0-rc.2.20466.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20465.7 to 5.0.0-rc.2.20466.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.16 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.16 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20465.8 to 5.0.0-rc.2.20466.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20466.1 to 5.0.0-rc.2.20466.10 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20465.13 to 5.0.0-rc.2.20466.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20465.1 to 11.0.0-beta.20467.1 (parent: Microsoft.NET.Sdk) - Update the Microsoft.AspNetCore.App.Ref.Internal version - Update the Microsoft.AspNetCore.App.Ref.Internal version - Fix versions.props - Update Version.Details.xml --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beaf4e51a..34c492014 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - b9b1d13ac06f5b0a90438da116d0370fb7f679ef + abeeaf5f9ce5076773a12a66f622d0915e509bf9 - + https://github.com/dotnet/windowsdesktop - b9b1d13ac06f5b0a90438da116d0370fb7f679ef + abeeaf5f9ce5076773a12a66f622d0915e509bf9 - + https://github.com/dotnet/windowsdesktop - b9b1d13ac06f5b0a90438da116d0370fb7f679ef + abeeaf5f9ce5076773a12a66f622d0915e509bf9 - + https://github.com/dotnet/runtime - e24e67a8dd52a20e5aa07b934ce7790c96808b1b + c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 - + https://github.com/dotnet/runtime - e24e67a8dd52a20e5aa07b934ce7790c96808b1b + c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 - + https://github.com/dotnet/runtime - e24e67a8dd52a20e5aa07b934ce7790c96808b1b + c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 - + https://github.com/dotnet/runtime - e24e67a8dd52a20e5aa07b934ce7790c96808b1b + c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 - + https://github.com/dotnet/runtime - e24e67a8dd52a20e5aa07b934ce7790c96808b1b + c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 @@ -39,37 +39,37 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e24e67a8dd52a20e5aa07b934ce7790c96808b1b + c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 - + https://github.com/dotnet/aspnetcore - 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 + e51468db03ad0264fd14c257f8ae1586e30e35af - + https://github.com/dotnet/aspnetcore - 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 + e51468db03ad0264fd14c257f8ae1586e30e35af - + https://github.com/dotnet/aspnetcore - 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 + e51468db03ad0264fd14c257f8ae1586e30e35af - + https://github.com/dotnet/aspnetcore - 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 + e51468db03ad0264fd14c257f8ae1586e30e35af - + https://github.com/dotnet/aspnetcore - 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 + e51468db03ad0264fd14c257f8ae1586e30e35af - + https://github.com/dotnet/aspnetcore - 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 + e51468db03ad0264fd14c257f8ae1586e30e35af - + https://github.com/dotnet/aspnetcore - 70bc346d25f1e089d1df4dcdcf2368acf3bb4471 + e51468db03ad0264fd14c257f8ae1586e30e35af https://github.com/dotnet/test-templates @@ -83,26 +83,26 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 9447809d269fda57fd5c691a0688d61ed336a590 + 6c8ea7245625ca1cfb1bf5832760fe887cd4765b - + https://github.com/dotnet/sdk - 9447809d269fda57fd5c691a0688d61ed336a590 + 6c8ea7245625ca1cfb1bf5832760fe887cd4765b - + https://github.com/dotnet/winforms - 4386255554cea35371c97243e260539139c2db1e + 41e2b1389654a184769d1eafdc980e55030b4dfd - + https://github.com/dotnet/wpf - 24665705a1b16f421b545f2a4396b3c2952dbe6f + 15035c4b138dfeeaf50fa262615022eaeb4b0970 - + https://github.com/dotnet/fsharp - 0edb614e4face390d84f5120017c24e0f7793b4c + 4a3ffc115246fd0c9b0b7f8e6f42a9ee603a4935 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 0a5429f60..e2f2f4e14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20465.8 + 5.0.0-rc.2.20466.5 - 5.0.0-rc.2.20465.13 + 5.0.0-rc.2.20466.7 @@ -41,43 +41,43 @@ - 5.0.0-rc.2.20466.1 - 5.0.0-rc.2.20466.1 - 5.0.0-rc.2.20466.1 - 5.0.0-rc.2.20466.1 - 5.0.0-rc.2.20466.1 - 5.0.0-rc.2.20466.1 - 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.16 + 5.0.0-rc.2.20466.16 + 5.0.0-rc.2.20466.16 + 5.0.0-rc.2.20466.16 + 5.0.0-rc.2.20466.16 + 5.0.0-rc.2.20466.16 + 5.0.0-rc.2.20466.16 0.2.0 - 5.0.100-rc.2.20466.5 - 5.0.100-rc.2.20466.5 + 5.0.100-rc.2.20467.7 + 5.0.100-rc.2.20467.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20465.7 + 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20465.7 - 5.0.0-rc.2.20465.7 - 5.0.0-rc.2.20465.7 - 5.0.0-rc.2.20465.7 - 5.0.0-rc.2.20465.7 + 5.0.0-rc.2.20466.8 + 5.0.0-rc.2.20466.8 + 5.0.0-rc.2.20466.8 + 5.0.0-rc.2.20466.8 + 5.0.0-rc.2.20466.8 2.1.0 - 5.0.0-rc.2.20466.1 - 5.0.0-rc.2.20466.1 - 5.0.0-rc.2.20466.1 + 5.0.0-rc.2.20466.10 + 5.0.0-rc.2.20466.10 + 5.0.0-rc.2.20466.10 From 45d9204c7aa109c2d33ac964b1c43fbcf50fdbc2 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth <47157394+epananth@users.noreply.github.com> Date: Thu, 17 Sep 2020 10:05:22 -0700 Subject: [PATCH 070/134] V3 publishing (#8598) * v3 --- .vsts-ci.yml | 3 ++- eng/Publishing.props | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 7cbab6ffd..9fe9d0738 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -262,6 +262,7 @@ stages: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: + publishingInfraVersion: 3 enableSymbolValidation: false enableSigningValidation: false enableNugetValidation: false @@ -286,7 +287,7 @@ stages: dependsOn: # This will run only after all the publishing stages have run. # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - - NetCore_Dev5_Publish + - publish_using_darc jobs: - job: Copy_SDK_To_Latest pool: diff --git a/eng/Publishing.props b/eng/Publishing.props index 99e07962f..a95cdd38d 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -1,6 +1,10 @@ + + 3 + + Sdk $(Product) @@ -152,21 +156,23 @@ + PublishFlatContainer="true" + PublishingVersion="3"/> + PublishFlatContainer="true" + PublishingVersion="3"/> From f34baa9680df6dbbed39f37134f97b132b3b1789 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2020 20:08:04 +0000 Subject: [PATCH 071/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8608) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20467.1 to 11.0.0-beta.20467.2 (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 34c492014..033a96140 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 6c8ea7245625ca1cfb1bf5832760fe887cd4765b + aa8404c36510e1ccb4979f4f25c4abce08b5ee3f - + https://github.com/dotnet/sdk - 6c8ea7245625ca1cfb1bf5832760fe887cd4765b + aa8404c36510e1ccb4979f4f25c4abce08b5ee3f @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 15035c4b138dfeeaf50fa262615022eaeb4b0970 - + https://github.com/dotnet/fsharp - 4a3ffc115246fd0c9b0b7f8e6f42a9ee603a4935 + bbbb08f56f3c3e5afd941dd322e6059560a6ee29 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index e2f2f4e14..032691a35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20467.7 - 5.0.100-rc.2.20467.7 + 5.0.100-rc.2.20467.10 + 5.0.100-rc.2.20467.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da5e37f9f91a0e7d73f852552a6f08cfbbe892e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 01:56:41 +0000 Subject: [PATCH 072/134] Update dependencies from https://github.com/dotnet/sdk build 20200917.12 (#8609) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20466.8 to 5.0.0-rc.2.20467.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20466.8 to 5.0.0-rc.2.20467.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20466.8 to 5.0.0-rc.2.20467.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20466.8 to 5.0.0-rc.2.20467.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20466.8 to 5.0.0-rc.2.20467.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20466.8 to 5.0.0-rc.2.20467.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 033a96140..f4b316981 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop abeeaf5f9ce5076773a12a66f622d0915e509bf9 - + https://github.com/dotnet/runtime - c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 + 80a03cadfeaf1130f7c820e4e360b7973de46f1c - + https://github.com/dotnet/runtime - c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 + 80a03cadfeaf1130f7c820e4e360b7973de46f1c - + https://github.com/dotnet/runtime - c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 + 80a03cadfeaf1130f7c820e4e360b7973de46f1c - + https://github.com/dotnet/runtime - c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 + 80a03cadfeaf1130f7c820e4e360b7973de46f1c - + https://github.com/dotnet/runtime - c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 + 80a03cadfeaf1130f7c820e4e360b7973de46f1c @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c30d4bb26a7cd49890aa81e32e0dc8a87ae96696 + 80a03cadfeaf1130f7c820e4e360b7973de46f1c https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - aa8404c36510e1ccb4979f4f25c4abce08b5ee3f + 70fd2d6c388ce2a7f67cde21be11802c50b54e5e - + https://github.com/dotnet/sdk - aa8404c36510e1ccb4979f4f25c4abce08b5ee3f + 70fd2d6c388ce2a7f67cde21be11802c50b54e5e diff --git a/eng/Versions.props b/eng/Versions.props index 032691a35..2f4b56e0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,23 +54,23 @@ - 5.0.100-rc.2.20467.10 - 5.0.100-rc.2.20467.10 + 5.0.100-rc.2.20467.12 + 5.0.100-rc.2.20467.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20466.8 + 5.0.0-rc.2.20467.1 - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 + 5.0.0-rc.2.20467.1 + 5.0.0-rc.2.20467.1 + 5.0.0-rc.2.20467.1 + 5.0.0-rc.2.20467.1 + 5.0.0-rc.2.20467.1 2.1.0 From cea9e2dc1b196270651940d056a9998afd8f25a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 03:24:09 +0000 Subject: [PATCH 073/134] Update dependencies from https://github.com/dotnet/sdk build 20200917.13 (#8610) [release/5.0.1xx-rc2] 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 f4b316981..993554860 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 70fd2d6c388ce2a7f67cde21be11802c50b54e5e + a0ec4ab0d785311c6afb3bacbbe36171a76ff490 - + https://github.com/dotnet/sdk - 70fd2d6c388ce2a7f67cde21be11802c50b54e5e + a0ec4ab0d785311c6afb3bacbbe36171a76ff490 diff --git a/eng/Versions.props b/eng/Versions.props index 2f4b56e0e..ae4f7bf4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20467.12 - 5.0.100-rc.2.20467.12 + 5.0.100-rc.2.20467.13 + 5.0.100-rc.2.20467.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 391bf9ac86727d25d76f41938bb3c188684ceb04 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 2 Sep 2020 18:46:57 -0700 Subject: [PATCH 074/134] Update Microsoft.Windows.SDK.NET.Ref versions Packages were rebuilt, updating to new version. --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ae4f7bf4b..295f01011 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,9 +130,9 @@ 16.8.0-release-20200902-05 - 10.0.17763.1-preview - 10.0.18362.2-preview - 10.0.19041.1-preview + 10.0.17763.3-preview + 10.0.18362.4-preview + 10.0.19041.3-preview From 9e2382f8cc20de345437716eb7e5098cff41cc09 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 17 Sep 2020 21:16:38 -0700 Subject: [PATCH 075/134] Make a separate props file --- eng/ManualVersions.props | 14 ++++++++++++++ eng/Versions.props | 6 +----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 eng/ManualVersions.props diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props new file mode 100644 index 000000000..11821df82 --- /dev/null +++ b/eng/ManualVersions.props @@ -0,0 +1,14 @@ + + + + + + 10.0.17763.3-preview + 10.0.18362.4-preview + 10.0.19041.3-preview + + diff --git a/eng/Versions.props b/eng/Versions.props index 295f01011..39336b1e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -129,13 +129,9 @@ 2.0.0 16.8.0-release-20200902-05 - - 10.0.17763.3-preview - 10.0.18362.4-preview - 10.0.19041.3-preview - 2.0.1-servicing-26011-01 + From 949f34681632da0333f9493f714d9810c46d50c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 09:14:45 +0000 Subject: [PATCH 076/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8613) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20467.1 to 5.0.0-rc.2.20467.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20467.1 to 5.0.0-rc.2.20467.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20467.1 to 5.0.0-rc.2.20467.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20467.1 to 5.0.0-rc.2.20467.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20467.1 to 5.0.0-rc.2.20467.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20467.1 to 5.0.0-rc.2.20467.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20466.16 to 5.0.0-rc.2.20467.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20466.16 to 5.0.0-rc.2.20467.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20466.16 to 5.0.0-rc.2.20467.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20466.16 to 5.0.0-rc.2.20467.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20466.16 to 5.0.0-rc.2.20467.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20466.16 to 5.0.0-rc.2.20467.16 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20466.16 to 5.0.0-rc.2.20467.16 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 993554860..b6541a35a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop abeeaf5f9ce5076773a12a66f622d0915e509bf9 - + https://github.com/dotnet/runtime - 80a03cadfeaf1130f7c820e4e360b7973de46f1c + 7b7dad97a9b835a6d049ad9d4a86691c60e218bd - + https://github.com/dotnet/runtime - 80a03cadfeaf1130f7c820e4e360b7973de46f1c + 7b7dad97a9b835a6d049ad9d4a86691c60e218bd - + https://github.com/dotnet/runtime - 80a03cadfeaf1130f7c820e4e360b7973de46f1c + 7b7dad97a9b835a6d049ad9d4a86691c60e218bd - + https://github.com/dotnet/runtime - 80a03cadfeaf1130f7c820e4e360b7973de46f1c + 7b7dad97a9b835a6d049ad9d4a86691c60e218bd - + https://github.com/dotnet/runtime - 80a03cadfeaf1130f7c820e4e360b7973de46f1c + 7b7dad97a9b835a6d049ad9d4a86691c60e218bd @@ -39,37 +39,37 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 80a03cadfeaf1130f7c820e4e360b7973de46f1c + 7b7dad97a9b835a6d049ad9d4a86691c60e218bd - + https://github.com/dotnet/aspnetcore - e51468db03ad0264fd14c257f8ae1586e30e35af + 3ee23fb771a8e810defe50fda29296fa9859a92b - + https://github.com/dotnet/aspnetcore - e51468db03ad0264fd14c257f8ae1586e30e35af + 3ee23fb771a8e810defe50fda29296fa9859a92b - + https://github.com/dotnet/aspnetcore - e51468db03ad0264fd14c257f8ae1586e30e35af + 3ee23fb771a8e810defe50fda29296fa9859a92b - + https://github.com/dotnet/aspnetcore - e51468db03ad0264fd14c257f8ae1586e30e35af + 3ee23fb771a8e810defe50fda29296fa9859a92b - + https://github.com/dotnet/aspnetcore - e51468db03ad0264fd14c257f8ae1586e30e35af + 3ee23fb771a8e810defe50fda29296fa9859a92b - + https://github.com/dotnet/aspnetcore - e51468db03ad0264fd14c257f8ae1586e30e35af + 3ee23fb771a8e810defe50fda29296fa9859a92b - + https://github.com/dotnet/aspnetcore - e51468db03ad0264fd14c257f8ae1586e30e35af + 3ee23fb771a8e810defe50fda29296fa9859a92b https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - a0ec4ab0d785311c6afb3bacbbe36171a76ff490 + a11655affa69c9a2acb67ff392e2a852aa965a95 - + https://github.com/dotnet/sdk - a0ec4ab0d785311c6afb3bacbbe36171a76ff490 + a11655affa69c9a2acb67ff392e2a852aa965a95 diff --git a/eng/Versions.props b/eng/Versions.props index ae4f7bf4b..496ed89c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,36 +41,36 @@ - 5.0.0-rc.2.20466.16 - 5.0.0-rc.2.20466.16 - 5.0.0-rc.2.20466.16 - 5.0.0-rc.2.20466.16 - 5.0.0-rc.2.20466.16 - 5.0.0-rc.2.20466.16 - 5.0.0-rc.2.20466.16 + 5.0.0-rc.2.20467.16 + 5.0.0-rc.2.20467.16 + 5.0.0-rc.2.20467.16 + 5.0.0-rc.2.20467.16 + 5.0.0-rc.2.20467.16 + 5.0.0-rc.2.20467.16 + 5.0.0-rc.2.20467.16 0.2.0 - 5.0.100-rc.2.20467.13 - 5.0.100-rc.2.20467.13 + 5.0.100-rc.2.20468.2 + 5.0.100-rc.2.20468.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20467.1 + 5.0.0-rc.2.20467.14 - 5.0.0-rc.2.20467.1 - 5.0.0-rc.2.20467.1 - 5.0.0-rc.2.20467.1 - 5.0.0-rc.2.20467.1 - 5.0.0-rc.2.20467.1 + 5.0.0-rc.2.20467.14 + 5.0.0-rc.2.20467.14 + 5.0.0-rc.2.20467.14 + 5.0.0-rc.2.20467.14 + 5.0.0-rc.2.20467.14 2.1.0 From 893eeff15515d4d41459635bf1d5eeaf4e186d15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 11:44:34 +0000 Subject: [PATCH 077/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.3 (#8614) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20467.16 to 5.0.0-rc.2.20467.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20467.16 to 5.0.0-rc.2.20467.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20467.16 to 5.0.0-rc.2.20467.18 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20467.16 to 5.0.0-rc.2.20467.18 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20467.16 to 5.0.0-rc.2.20467.18 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20467.16 to 5.0.0-rc.2.20467.18 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20467.16 to 5.0.0-rc.2.20467.18 (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 b6541a35a..03c842528 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 7b7dad97a9b835a6d049ad9d4a86691c60e218bd - + https://github.com/dotnet/aspnetcore - 3ee23fb771a8e810defe50fda29296fa9859a92b + b592cf66105e66bce2ee3afdc95768026b6414a0 - + https://github.com/dotnet/aspnetcore - 3ee23fb771a8e810defe50fda29296fa9859a92b + b592cf66105e66bce2ee3afdc95768026b6414a0 - + https://github.com/dotnet/aspnetcore - 3ee23fb771a8e810defe50fda29296fa9859a92b + b592cf66105e66bce2ee3afdc95768026b6414a0 - + https://github.com/dotnet/aspnetcore - 3ee23fb771a8e810defe50fda29296fa9859a92b + b592cf66105e66bce2ee3afdc95768026b6414a0 - + https://github.com/dotnet/aspnetcore - 3ee23fb771a8e810defe50fda29296fa9859a92b + b592cf66105e66bce2ee3afdc95768026b6414a0 - + https://github.com/dotnet/aspnetcore - 3ee23fb771a8e810defe50fda29296fa9859a92b + b592cf66105e66bce2ee3afdc95768026b6414a0 - + https://github.com/dotnet/aspnetcore - 3ee23fb771a8e810defe50fda29296fa9859a92b + b592cf66105e66bce2ee3afdc95768026b6414a0 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - a11655affa69c9a2acb67ff392e2a852aa965a95 + ddfb898b153bc3c52d994a85d0b65a9e82a2b526 - + https://github.com/dotnet/sdk - a11655affa69c9a2acb67ff392e2a852aa965a95 + ddfb898b153bc3c52d994a85d0b65a9e82a2b526 diff --git a/eng/Versions.props b/eng/Versions.props index 496ed89c9..a49114c98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20467.16 - 5.0.0-rc.2.20467.16 - 5.0.0-rc.2.20467.16 - 5.0.0-rc.2.20467.16 - 5.0.0-rc.2.20467.16 - 5.0.0-rc.2.20467.16 - 5.0.0-rc.2.20467.16 + 5.0.0-rc.2.20467.18 + 5.0.0-rc.2.20467.18 + 5.0.0-rc.2.20467.18 + 5.0.0-rc.2.20467.18 + 5.0.0-rc.2.20467.18 + 5.0.0-rc.2.20467.18 + 5.0.0-rc.2.20467.18 0.2.0 - 5.0.100-rc.2.20468.2 - 5.0.100-rc.2.20468.2 + 5.0.100-rc.2.20468.3 + 5.0.100-rc.2.20468.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 38968acb3e8e9621e52670f389ba0931323e7b1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 15:12:32 +0000 Subject: [PATCH 078/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.4 (#8615) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20467.18 to 5.0.0-rc.2.20467.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20467.18 to 5.0.0-rc.2.20467.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20467.18 to 5.0.0-rc.2.20467.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20467.18 to 5.0.0-rc.2.20467.19 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20467.18 to 5.0.0-rc.2.20467.19 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20467.18 to 5.0.0-rc.2.20467.19 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20467.18 to 5.0.0-rc.2.20467.19 (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 03c842528..b342df261 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 7b7dad97a9b835a6d049ad9d4a86691c60e218bd - + https://github.com/dotnet/aspnetcore - b592cf66105e66bce2ee3afdc95768026b6414a0 + 618613495647f658ca4537e44540f25f6509866d - + https://github.com/dotnet/aspnetcore - b592cf66105e66bce2ee3afdc95768026b6414a0 + 618613495647f658ca4537e44540f25f6509866d - + https://github.com/dotnet/aspnetcore - b592cf66105e66bce2ee3afdc95768026b6414a0 + 618613495647f658ca4537e44540f25f6509866d - + https://github.com/dotnet/aspnetcore - b592cf66105e66bce2ee3afdc95768026b6414a0 + 618613495647f658ca4537e44540f25f6509866d - + https://github.com/dotnet/aspnetcore - b592cf66105e66bce2ee3afdc95768026b6414a0 + 618613495647f658ca4537e44540f25f6509866d - + https://github.com/dotnet/aspnetcore - b592cf66105e66bce2ee3afdc95768026b6414a0 + 618613495647f658ca4537e44540f25f6509866d - + https://github.com/dotnet/aspnetcore - b592cf66105e66bce2ee3afdc95768026b6414a0 + 618613495647f658ca4537e44540f25f6509866d https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - ddfb898b153bc3c52d994a85d0b65a9e82a2b526 + 7420cbcdb7d22514c32435fb6b6f377cb53855f6 - + https://github.com/dotnet/sdk - ddfb898b153bc3c52d994a85d0b65a9e82a2b526 + 7420cbcdb7d22514c32435fb6b6f377cb53855f6 diff --git a/eng/Versions.props b/eng/Versions.props index a49114c98..f12bcaef7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20467.18 - 5.0.0-rc.2.20467.18 - 5.0.0-rc.2.20467.18 - 5.0.0-rc.2.20467.18 - 5.0.0-rc.2.20467.18 - 5.0.0-rc.2.20467.18 - 5.0.0-rc.2.20467.18 + 5.0.0-rc.2.20467.19 + 5.0.0-rc.2.20467.19 + 5.0.0-rc.2.20467.19 + 5.0.0-rc.2.20467.19 + 5.0.0-rc.2.20467.19 + 5.0.0-rc.2.20467.19 + 5.0.0-rc.2.20467.19 0.2.0 - 5.0.100-rc.2.20468.3 - 5.0.100-rc.2.20468.3 + 5.0.100-rc.2.20468.4 + 5.0.100-rc.2.20468.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f88a69c889686766503ddd18f970721c1d595d0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 16:46:00 +0000 Subject: [PATCH 079/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/arcade (#8617) [release/5.0.1xx-rc2] Update dependencies from dotnet/arcade - Update task location --- eng/Version.Details.xml | 8 ++--- eng/Versions.props | 2 +- eng/common/sdk-task.ps1 | 2 +- .../templates/steps/perf-send-to-helix.yml | 36 +++++-------------- eng/common/tools.ps1 | 25 +++++++++---- global.json | 4 +-- src/redist/targets/GenerateMSIs.targets | 2 +- 7 files changed, 36 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b342df261..21fa6f223 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -140,13 +140,13 @@ - + https://github.com/dotnet/arcade - fa0486ddb04a76341d822903c8977fb9fa088d1e + b63ea25b8dc50bb3dfcef128d415254bd5ca4dc8 - + https://github.com/dotnet/arcade - fa0486ddb04a76341d822903c8977fb9fa088d1e + b63ea25b8dc50bb3dfcef128d415254bd5ca4dc8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f12bcaef7..11d4de0c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 5.0.0-beta.20465.7 + 5.0.0-beta.20467.6 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index e159c6f18..f55c43c6f 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.5.0-alpha" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.8.0-preview3" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index e003fe2ef..8427de59c 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -19,12 +19,18 @@ parameters: DisplayNamePrefix: 'Send job to Helix' # optional -- rename the beginning of the displayName of the steps in AzDO condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + osGroup: '' # required -- operating system for the job steps: - - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 $(Build.SourcesDirectory)\eng\common\performance\${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)\artifacts\log\$env:BuildConfig\SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} (Windows) - env: +- template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml + parameters: + osGroup: ${{ parameters.osGroup }} + sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + environment: BuildConfig: $(_BuildConfig) HelixSource: ${{ parameters.HelixSource }} HelixType: ${{ parameters.HelixType }} @@ -42,27 +48,3 @@ steps: WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} Creator: ${{ parameters.Creator }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} (Unix) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 37a3a3d68..60066083b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -312,9 +312,15 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = return $global:_MSBuildExe } - $vsMinVersionReqdStr = '16.5' + # Minimum VS version to require. + $vsMinVersionReqdStr = '16.8' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) + # If the version of msbuild is going to be xcopied, + # use this version. Version matches a package here: + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.8.0-preview3&view=overview + $defaultXCopyMSBuildVersion = '16.8.0-preview3' + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } $vsMinVersion = [Version]::new($vsMinVersionStr) @@ -349,23 +355,28 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild' $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0] } else { - #if vs version provided in global.json is incompatible then use the default version for xcopy msbuild download + #if vs version provided in global.json is incompatible (too low) then use the default version for xcopy msbuild download if($vsMinVersion -lt $vsMinVersionReqd){ - Write-Host "Using xcopy-msbuild version of $vsMinVersionReqdStr.0-alpha since VS version $vsMinVersionStr provided in global.json is not compatible" - $vsMajorVersion = $vsMinVersionReqd.Major - $vsMinorVersion = $vsMinVersionReqd.Minor + Write-Host "Using xcopy-msbuild version of $defaultXCopyMSBuildVersion since VS version $vsMinVersionStr provided in global.json is not compatible" + $xcopyMSBuildVersion = $defaultXCopyMSBuildVersion } else{ + # If the VS version IS compatible, look for an xcopy msbuild package + # with a version matching VS. + # Note: If this version does not exist, then an explicit version of xcopy msbuild + # can be specified in global.json. This will be required for pre-release versions of msbuild. $vsMajorVersion = $vsMinVersion.Major $vsMinorVersion = $vsMinVersion.Minor + $xcopyMSBuildVersion = "$vsMajorVersion.$vsMinorVersion.0" } - - $xcopyMSBuildVersion = "$vsMajorVersion.$vsMinorVersion.0-alpha" } $vsInstallDir = $null if ($xcopyMSBuildVersion.Trim() -ine "none") { $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install + if ($vsInstallDir -eq $null) { + throw "Could not xcopy msbuild. Please check that package 'RoslynTools.MSBuild @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'." + } } if ($vsInstallDir -eq $null) { throw 'Unable to find Visual Studio that has required version and components installed' diff --git a/global.json b/global.json index cf9977c7d..45865275f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-preview.6.20310.4", + "dotnet": "5.0.100-rc.1.20452.10", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20465.7" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20467.6" } } diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 93c431620..4b1875933 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -5,7 +5,7 @@ - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp2.0\Microsoft.DotNet.Build.Tasks.Installers.dll + $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Installers.dll $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll From d5c1880a2424358102f7a1a0ea27216011d6a3d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 17:10:27 +0000 Subject: [PATCH 080/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.7 (#8619) [release/5.0.1xx-rc2] 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 21fa6f223..01585ec24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 7420cbcdb7d22514c32435fb6b6f377cb53855f6 + 2669ad249d4a8b5c24170f7c8022b330d091bfbc - + https://github.com/dotnet/sdk - 7420cbcdb7d22514c32435fb6b6f377cb53855f6 + 2669ad249d4a8b5c24170f7c8022b330d091bfbc diff --git a/eng/Versions.props b/eng/Versions.props index 11d4de0c4..b44236352 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20468.4 - 5.0.100-rc.2.20468.4 + 5.0.100-rc.2.20468.7 + 5.0.100-rc.2.20468.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 66227056494a8719e97d3da64328e6819a0414a3 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 18 Sep 2020 10:34:56 -0700 Subject: [PATCH 081/134] Update eng/ManualVersions.props Co-authored-by: Daniel Plaisted --- eng/ManualVersions.props | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 11821df82..cb76746e4 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -1,10 +1,12 @@ - 10.0.17763.3-preview From 03b7ec459d0fdadf3b2ec2aa210e4754aeb48e24 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 18 Sep 2020 13:38:18 -0700 Subject: [PATCH 082/134] Remove double publish in stable builds (#8553) https://github.com/dotnet/arcade/pull/6051 fixed the issue where the install scripts require matching names of files to directories. Remove the double publish change introduced in 3.0 Co-authored-by: dotnet-bot --- eng/Publishing.props | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index a95cdd38d..9520cf240 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -103,30 +103,6 @@ PropertyName="FullNugetVersion"/> - - - - $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)')) - - - $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)')) - - - - - - - - - - @@ -141,20 +117,10 @@ $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) - - - $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) - NonShipping=true - - - - $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) - NonShipping=true - Date: Fri, 18 Sep 2020 21:22:11 +0000 Subject: [PATCH 083/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.10 (#8623) [release/5.0.1xx-rc2] 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 01585ec24..9b6539a0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 2669ad249d4a8b5c24170f7c8022b330d091bfbc + fa28f5e4c7f1da17a8cfbd36c6cd15b195885f40 - + https://github.com/dotnet/sdk - 2669ad249d4a8b5c24170f7c8022b330d091bfbc + fa28f5e4c7f1da17a8cfbd36c6cd15b195885f40 diff --git a/eng/Versions.props b/eng/Versions.props index bd9cae893..8e9db5b20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20468.7 - 5.0.100-rc.2.20468.7 + 5.0.100-rc.2.20468.10 + 5.0.100-rc.2.20468.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4d53a8000d72cba8c757c9cd51ddf7936ed7a92e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Sep 2020 01:07:57 +0000 Subject: [PATCH 084/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8626) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20467.19 to 5.0.0-rc.2.20468.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20467.19 to 5.0.0-rc.2.20468.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20467.19 to 5.0.0-rc.2.20468.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20467.19 to 5.0.0-rc.2.20468.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20467.19 to 5.0.0-rc.2.20468.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20467.19 to 5.0.0-rc.2.20468.2 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20467.19 to 5.0.0-rc.2.20468.2 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20467.2 to 11.0.0-beta.20468.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200902-05 to 16.8.0-release-20200918-09 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 5.0.0-rc.1.20461.1 to 5.0.0-rc.2.20468.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.8.0-preview-20464-02 to 16.8.0-preview-20468-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b6539a0e..d384183f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 7b7dad97a9b835a6d049ad9d4a86691c60e218bd - + https://github.com/dotnet/aspnetcore - 618613495647f658ca4537e44540f25f6509866d + f6723f5b0dc648267e9d9e32ab73f816a751ac48 - + https://github.com/dotnet/aspnetcore - 618613495647f658ca4537e44540f25f6509866d + f6723f5b0dc648267e9d9e32ab73f816a751ac48 - + https://github.com/dotnet/aspnetcore - 618613495647f658ca4537e44540f25f6509866d + f6723f5b0dc648267e9d9e32ab73f816a751ac48 - + https://github.com/dotnet/aspnetcore - 618613495647f658ca4537e44540f25f6509866d + f6723f5b0dc648267e9d9e32ab73f816a751ac48 - + https://github.com/dotnet/aspnetcore - 618613495647f658ca4537e44540f25f6509866d + f6723f5b0dc648267e9d9e32ab73f816a751ac48 - + https://github.com/dotnet/aspnetcore - 618613495647f658ca4537e44540f25f6509866d + f6723f5b0dc648267e9d9e32ab73f816a751ac48 - + https://github.com/dotnet/aspnetcore - 618613495647f658ca4537e44540f25f6509866d + f6723f5b0dc648267e9d9e32ab73f816a751ac48 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - fa28f5e4c7f1da17a8cfbd36c6cd15b195885f40 + 0614cdb5b5d386fdc039b7245b4365e529ad265a - + https://github.com/dotnet/sdk - fa28f5e4c7f1da17a8cfbd36c6cd15b195885f40 + 0614cdb5b5d386fdc039b7245b4365e529ad265a @@ -100,26 +100,26 @@ https://github.com/dotnet/wpf 15035c4b138dfeeaf50fa262615022eaeb4b0970 - + https://github.com/dotnet/fsharp - bbbb08f56f3c3e5afd941dd322e6059560a6ee29 + a745c7cc6635bb63ceba137f483106315779c9e7 - + https://github.com/microsoft/vstest - 0c0fafa64de5c73981e7c40a99d7363f57635f60 + 70a599d905c8033982e34dfb3b00290bf9df1961 - + https://github.com/mono/linker - c1de87e49fd158526a337c4da32d3d12c5eb1251 + 6d26f7ac409c5723bca669385e65582e69b4da75 linker https://github.com/dotnet/roslyn d57cda76c2b76cff75487a085d289cfadd99150b - + https://github.com/dotnet/msbuild - 0220c5eaeac8dd1770a597a7ba4306651c421bf4 + e938b8f1d7f9eeee54c393dbd5fdf1a86c176922 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 8e9db5b20..94dd3e04f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20467.19 - 5.0.0-rc.2.20467.19 - 5.0.0-rc.2.20467.19 - 5.0.0-rc.2.20467.19 - 5.0.0-rc.2.20467.19 - 5.0.0-rc.2.20467.19 - 5.0.0-rc.2.20467.19 + 5.0.0-rc.2.20468.2 + 5.0.0-rc.2.20468.2 + 5.0.0-rc.2.20468.2 + 5.0.0-rc.2.20468.2 + 5.0.0-rc.2.20468.2 + 5.0.0-rc.2.20468.2 + 5.0.0-rc.2.20468.2 0.2.0 - 5.0.100-rc.2.20468.10 - 5.0.100-rc.2.20468.10 + 5.0.100-rc.2.20468.13 + 5.0.100-rc.2.20468.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.8.0-release-20200902-05 + 16.8.0-release-20200918-09 From 50b4b3f1e497e8c635869389cdb4cdbd2b3ce332 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Sep 2020 02:45:34 +0000 Subject: [PATCH 085/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.16 (#8628) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20467.14 to 5.0.0-rc.2.20468.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20467.14 to 5.0.0-rc.2.20468.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20467.14 to 5.0.0-rc.2.20468.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20467.14 to 5.0.0-rc.2.20468.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20467.14 to 5.0.0-rc.2.20468.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20467.14 to 5.0.0-rc.2.20468.4 (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 d384183f7..fb428391f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop abeeaf5f9ce5076773a12a66f622d0915e509bf9 - + https://github.com/dotnet/runtime - 7b7dad97a9b835a6d049ad9d4a86691c60e218bd + 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/runtime - 7b7dad97a9b835a6d049ad9d4a86691c60e218bd + 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/runtime - 7b7dad97a9b835a6d049ad9d4a86691c60e218bd + 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/runtime - 7b7dad97a9b835a6d049ad9d4a86691c60e218bd + 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/runtime - 7b7dad97a9b835a6d049ad9d4a86691c60e218bd + 906b4a81f72967bcf5749436a971a8277d37871a @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7b7dad97a9b835a6d049ad9d4a86691c60e218bd + 906b4a81f72967bcf5749436a971a8277d37871a https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 0614cdb5b5d386fdc039b7245b4365e529ad265a + 686f9f24a9c4dd3d0e406a4db150aa5a1421a19f - + https://github.com/dotnet/sdk - 0614cdb5b5d386fdc039b7245b4365e529ad265a + 686f9f24a9c4dd3d0e406a4db150aa5a1421a19f diff --git a/eng/Versions.props b/eng/Versions.props index 94dd3e04f..056a48744 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,23 +54,23 @@ - 5.0.100-rc.2.20468.13 - 5.0.100-rc.2.20468.13 + 5.0.100-rc.2.20468.16 + 5.0.100-rc.2.20468.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20467.14 + 5.0.0-rc.2.20468.4 - 5.0.0-rc.2.20467.14 - 5.0.0-rc.2.20467.14 - 5.0.0-rc.2.20467.14 - 5.0.0-rc.2.20467.14 - 5.0.0-rc.2.20467.14 + 5.0.0-rc.2.20468.4 + 5.0.0-rc.2.20468.4 + 5.0.0-rc.2.20468.4 + 5.0.0-rc.2.20468.4 + 5.0.0-rc.2.20468.4 2.1.0 From 2a3c65474815190d081b29aa1ab449cd7001a941 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 02:46:52 +0000 Subject: [PATCH 086/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.16 -> To Version 5.0.100-rc.2.20468.15 --- 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 fb428391f..9dae02a76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 686f9f24a9c4dd3d0e406a4db150aa5a1421a19f + 7eb4ec4b38747058cc6fd93f46c4dbcf15be334e - + https://github.com/dotnet/sdk - 686f9f24a9c4dd3d0e406a4db150aa5a1421a19f + 7eb4ec4b38747058cc6fd93f46c4dbcf15be334e diff --git a/eng/Versions.props b/eng/Versions.props index 056a48744..6ccc4cfb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20468.16 - 5.0.100-rc.2.20468.16 + 5.0.100-rc.2.20468.15 + 5.0.100-rc.2.20468.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9dacd152ed34fe0d9340fa752372f2c3c2594563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 02:47:02 +0000 Subject: [PATCH 087/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.15 -> To Version 5.0.100-rc.2.20468.17 --- 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 9dae02a76..dc2c01d78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 7eb4ec4b38747058cc6fd93f46c4dbcf15be334e + b2d011e87eb5f59726fb9149824b08e688c595dd - + https://github.com/dotnet/sdk - 7eb4ec4b38747058cc6fd93f46c4dbcf15be334e + b2d011e87eb5f59726fb9149824b08e688c595dd diff --git a/eng/Versions.props b/eng/Versions.props index 6ccc4cfb1..96f136669 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20468.15 - 5.0.100-rc.2.20468.15 + 5.0.100-rc.2.20468.17 + 5.0.100-rc.2.20468.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55ab706ecd3fbd9d0d4c92022b8e0e612fb2ecec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 02:47:12 +0000 Subject: [PATCH 088/134] Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch From Version 5.0.0-rc.2.20468.2 -> To Version 5.0.0-rc.2.20468.6 (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 dc2c01d78..839eb3c2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/aspnetcore - f6723f5b0dc648267e9d9e32ab73f816a751ac48 + b1b3d5474f32a37408836c7e32a307fe128cf17f - + https://github.com/dotnet/aspnetcore - f6723f5b0dc648267e9d9e32ab73f816a751ac48 + b1b3d5474f32a37408836c7e32a307fe128cf17f - + https://github.com/dotnet/aspnetcore - f6723f5b0dc648267e9d9e32ab73f816a751ac48 + b1b3d5474f32a37408836c7e32a307fe128cf17f - + https://github.com/dotnet/aspnetcore - f6723f5b0dc648267e9d9e32ab73f816a751ac48 + b1b3d5474f32a37408836c7e32a307fe128cf17f - + https://github.com/dotnet/aspnetcore - f6723f5b0dc648267e9d9e32ab73f816a751ac48 + b1b3d5474f32a37408836c7e32a307fe128cf17f - + https://github.com/dotnet/aspnetcore - f6723f5b0dc648267e9d9e32ab73f816a751ac48 + b1b3d5474f32a37408836c7e32a307fe128cf17f - + https://github.com/dotnet/aspnetcore - f6723f5b0dc648267e9d9e32ab73f816a751ac48 + b1b3d5474f32a37408836c7e32a307fe128cf17f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 96f136669..fde1adf1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,13 +41,13 @@ - 5.0.0-rc.2.20468.2 - 5.0.0-rc.2.20468.2 - 5.0.0-rc.2.20468.2 - 5.0.0-rc.2.20468.2 - 5.0.0-rc.2.20468.2 - 5.0.0-rc.2.20468.2 - 5.0.0-rc.2.20468.2 + 5.0.0-rc.2.20468.6 + 5.0.0-rc.2.20468.6 + 5.0.0-rc.2.20468.6 + 5.0.0-rc.2.20468.6 + 5.0.0-rc.2.20468.6 + 5.0.0-rc.2.20468.6 + 5.0.0-rc.2.20468.6 0.2.0 From 07ba7f3088d92f557fe4d523c26a40b46a92e360 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 03:36:47 +0000 Subject: [PATCH 089/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.16 -> To Version 5.0.100-rc.2.20468.18 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.FSharp.Compiler From Version 5.0.0-rc.2.20468.2 -> To Version 5.0.0-rc.2.20468.6 (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 839eb3c2c..abc794792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - b2d011e87eb5f59726fb9149824b08e688c595dd + d4a4a66ac6204ff6da7e45b3d36e5d410a564478 - + https://github.com/dotnet/sdk - b2d011e87eb5f59726fb9149824b08e688c595dd + d4a4a66ac6204ff6da7e45b3d36e5d410a564478 @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 15035c4b138dfeeaf50fa262615022eaeb4b0970 - + https://github.com/dotnet/fsharp - a745c7cc6635bb63ceba137f483106315779c9e7 + 79c593286e626311e84c8f7882eea796912854c3 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index fde1adf1a..e55722dc5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20468.17 - 5.0.100-rc.2.20468.17 + 5.0.100-rc.2.20468.18 + 5.0.100-rc.2.20468.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b82e9a080cbcf73077edd38dc01eed3c383dffae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 04:34:33 +0000 Subject: [PATCH 090/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.16 -> To Version 5.0.100-rc.2.20468.19 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.FSharp.Compiler From Version 5.0.0-rc.2.20468.2 -> To Version 5.0.0-rc.2.20468.8 (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 abc794792..513a3639f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/aspnetcore - b1b3d5474f32a37408836c7e32a307fe128cf17f + 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 - + https://github.com/dotnet/aspnetcore - b1b3d5474f32a37408836c7e32a307fe128cf17f + 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 - + https://github.com/dotnet/aspnetcore - b1b3d5474f32a37408836c7e32a307fe128cf17f + 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 - + https://github.com/dotnet/aspnetcore - b1b3d5474f32a37408836c7e32a307fe128cf17f + 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 - + https://github.com/dotnet/aspnetcore - b1b3d5474f32a37408836c7e32a307fe128cf17f + 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 - + https://github.com/dotnet/aspnetcore - b1b3d5474f32a37408836c7e32a307fe128cf17f + 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 - + https://github.com/dotnet/aspnetcore - b1b3d5474f32a37408836c7e32a307fe128cf17f + 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - d4a4a66ac6204ff6da7e45b3d36e5d410a564478 + 1841a461b074b7f67cba279d3196b4e42de08d52 - + https://github.com/dotnet/sdk - d4a4a66ac6204ff6da7e45b3d36e5d410a564478 + 1841a461b074b7f67cba279d3196b4e42de08d52 diff --git a/eng/Versions.props b/eng/Versions.props index e55722dc5..6cde5995a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20468.6 - 5.0.0-rc.2.20468.6 - 5.0.0-rc.2.20468.6 - 5.0.0-rc.2.20468.6 - 5.0.0-rc.2.20468.6 - 5.0.0-rc.2.20468.6 - 5.0.0-rc.2.20468.6 + 5.0.0-rc.2.20468.8 + 5.0.0-rc.2.20468.8 + 5.0.0-rc.2.20468.8 + 5.0.0-rc.2.20468.8 + 5.0.0-rc.2.20468.8 + 5.0.0-rc.2.20468.8 + 5.0.0-rc.2.20468.8 0.2.0 - 5.0.100-rc.2.20468.18 - 5.0.100-rc.2.20468.18 + 5.0.100-rc.2.20468.19 + 5.0.100-rc.2.20468.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bcfd94ac09008aa344e753f1ac690dbe616bb781 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 05:10:27 +0000 Subject: [PATCH 091/134] Update dependencies from https://github.com/dotnet/sdk build 20200918.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.16 -> To Version 5.0.100-rc.2.20468.20 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.FSharp.Compiler From Version 5.0.0-rc.2.20468.2 -> To Version 5.0.0-rc.2.20468.8 (parent: Microsoft.NET.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 513a3639f..ca6c096c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 1841a461b074b7f67cba279d3196b4e42de08d52 + 5e0b79af945718108dd295488ae888930a757e5c - + https://github.com/dotnet/sdk - 1841a461b074b7f67cba279d3196b4e42de08d52 + 5e0b79af945718108dd295488ae888930a757e5c diff --git a/eng/Versions.props b/eng/Versions.props index 6cde5995a..ecd0435fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20468.19 - 5.0.100-rc.2.20468.19 + 5.0.100-rc.2.20468.20 + 5.0.100-rc.2.20468.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 328ff354c0625c02af85555be569f9b0346bdd4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 07:35:55 +0000 Subject: [PATCH 092/134] Update dependencies from https://github.com/dotnet/sdk build 20200919.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.16 -> To Version 5.0.100-rc.2.20469.1 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.FSharp.Compiler From Version 5.0.0-rc.2.20468.2 -> To Version 5.0.0-rc.2.20468.8 (parent: Microsoft.NET.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 ca6c096c8..8b7727989 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 5e0b79af945718108dd295488ae888930a757e5c + f988c72aea2d9e5f89308db9b0c61a1b21b55259 - + https://github.com/dotnet/sdk - 5e0b79af945718108dd295488ae888930a757e5c + f988c72aea2d9e5f89308db9b0c61a1b21b55259 diff --git a/eng/Versions.props b/eng/Versions.props index ecd0435fd..a543a893a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20468.20 - 5.0.100-rc.2.20468.20 + 5.0.100-rc.2.20469.1 + 5.0.100-rc.2.20469.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 32c6a2580db1bb76165f9177040ceb9a28b270c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 08:49:19 +0000 Subject: [PATCH 093/134] Update dependencies from https://github.com/dotnet/sdk build 20200919.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.16 -> To Version 5.0.100-rc.2.20469.2 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.FSharp.Compiler From Version 5.0.0-rc.2.20468.2 -> To Version 5.0.0-rc.2.20468.17 (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 8b7727989..f2118910c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/aspnetcore - 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 + bf91253cd3a7797f417845b4f013e5a70fa8055d - + https://github.com/dotnet/aspnetcore - 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 + bf91253cd3a7797f417845b4f013e5a70fa8055d - + https://github.com/dotnet/aspnetcore - 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 + bf91253cd3a7797f417845b4f013e5a70fa8055d - + https://github.com/dotnet/aspnetcore - 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 + bf91253cd3a7797f417845b4f013e5a70fa8055d - + https://github.com/dotnet/aspnetcore - 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 + bf91253cd3a7797f417845b4f013e5a70fa8055d - + https://github.com/dotnet/aspnetcore - 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 + bf91253cd3a7797f417845b4f013e5a70fa8055d - + https://github.com/dotnet/aspnetcore - 611ee61e0eaf91eecd77e2906c01eb78ccf91b55 + bf91253cd3a7797f417845b4f013e5a70fa8055d https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - f988c72aea2d9e5f89308db9b0c61a1b21b55259 + 3f0c59811fb5e52f0ffd9ee0797296cc39ceb7e9 - + https://github.com/dotnet/sdk - f988c72aea2d9e5f89308db9b0c61a1b21b55259 + 3f0c59811fb5e52f0ffd9ee0797296cc39ceb7e9 diff --git a/eng/Versions.props b/eng/Versions.props index a543a893a..61d1a45cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20468.8 - 5.0.0-rc.2.20468.8 - 5.0.0-rc.2.20468.8 - 5.0.0-rc.2.20468.8 - 5.0.0-rc.2.20468.8 - 5.0.0-rc.2.20468.8 - 5.0.0-rc.2.20468.8 + 5.0.0-rc.2.20468.17 + 5.0.0-rc.2.20468.17 + 5.0.0-rc.2.20468.17 + 5.0.0-rc.2.20468.17 + 5.0.0-rc.2.20468.17 + 5.0.0-rc.2.20468.17 + 5.0.0-rc.2.20468.17 0.2.0 - 5.0.100-rc.2.20469.1 - 5.0.100-rc.2.20469.1 + 5.0.100-rc.2.20469.2 + 5.0.100-rc.2.20469.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c4f433cb9e1f47b675d5e054a9e86819a98d1384 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Sep 2020 23:55:53 +0000 Subject: [PATCH 094/134] Update dependencies from https://github.com/dotnet/sdk build 20200919.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.16 -> To Version 5.0.100-rc.2.20469.5 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.FSharp.Compiler From Version 5.0.0-rc.2.20468.2 -> To Version 5.0.0-rc.2.20469.4 (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 f2118910c..eaa4f7dc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/aspnetcore - bf91253cd3a7797f417845b4f013e5a70fa8055d + 6bfffda73420c63ce7f4633ff23766b29f8f0424 - + https://github.com/dotnet/aspnetcore - bf91253cd3a7797f417845b4f013e5a70fa8055d + 6bfffda73420c63ce7f4633ff23766b29f8f0424 - + https://github.com/dotnet/aspnetcore - bf91253cd3a7797f417845b4f013e5a70fa8055d + 6bfffda73420c63ce7f4633ff23766b29f8f0424 - + https://github.com/dotnet/aspnetcore - bf91253cd3a7797f417845b4f013e5a70fa8055d + 6bfffda73420c63ce7f4633ff23766b29f8f0424 - + https://github.com/dotnet/aspnetcore - bf91253cd3a7797f417845b4f013e5a70fa8055d + 6bfffda73420c63ce7f4633ff23766b29f8f0424 - + https://github.com/dotnet/aspnetcore - bf91253cd3a7797f417845b4f013e5a70fa8055d + 6bfffda73420c63ce7f4633ff23766b29f8f0424 - + https://github.com/dotnet/aspnetcore - bf91253cd3a7797f417845b4f013e5a70fa8055d + 6bfffda73420c63ce7f4633ff23766b29f8f0424 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 3f0c59811fb5e52f0ffd9ee0797296cc39ceb7e9 + 94571f27e03615fd90933c66196e59ade9c17ce0 - + https://github.com/dotnet/sdk - 3f0c59811fb5e52f0ffd9ee0797296cc39ceb7e9 + 94571f27e03615fd90933c66196e59ade9c17ce0 diff --git a/eng/Versions.props b/eng/Versions.props index 61d1a45cc..dc9387eb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20468.17 - 5.0.0-rc.2.20468.17 - 5.0.0-rc.2.20468.17 - 5.0.0-rc.2.20468.17 - 5.0.0-rc.2.20468.17 - 5.0.0-rc.2.20468.17 - 5.0.0-rc.2.20468.17 + 5.0.0-rc.2.20469.4 + 5.0.0-rc.2.20469.4 + 5.0.0-rc.2.20469.4 + 5.0.0-rc.2.20469.4 + 5.0.0-rc.2.20469.4 + 5.0.0-rc.2.20469.4 + 5.0.0-rc.2.20469.4 0.2.0 - 5.0.100-rc.2.20469.2 - 5.0.100-rc.2.20469.2 + 5.0.100-rc.2.20469.5 + 5.0.100-rc.2.20469.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 29914d2bef73ff647574f2e352ffec7cb5d222e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 20 Sep 2020 06:30:30 +0000 Subject: [PATCH 095/134] Update dependencies from https://github.com/dotnet/sdk build 20200919.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.2.20468.16 -> To Version 5.0.100-rc.2.20469.6 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.FSharp.Compiler From Version 5.0.0-rc.2.20468.2 -> To Version 5.0.0-rc.2.20469.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 eaa4f7dc8..6aa702bd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/aspnetcore - 6bfffda73420c63ce7f4633ff23766b29f8f0424 + 55b9d2532b7b87acdb664bc44c61ce0768e9d285 - + https://github.com/dotnet/aspnetcore - 6bfffda73420c63ce7f4633ff23766b29f8f0424 + 55b9d2532b7b87acdb664bc44c61ce0768e9d285 - + https://github.com/dotnet/aspnetcore - 6bfffda73420c63ce7f4633ff23766b29f8f0424 + 55b9d2532b7b87acdb664bc44c61ce0768e9d285 - + https://github.com/dotnet/aspnetcore - 6bfffda73420c63ce7f4633ff23766b29f8f0424 + 55b9d2532b7b87acdb664bc44c61ce0768e9d285 - + https://github.com/dotnet/aspnetcore - 6bfffda73420c63ce7f4633ff23766b29f8f0424 + 55b9d2532b7b87acdb664bc44c61ce0768e9d285 - + https://github.com/dotnet/aspnetcore - 6bfffda73420c63ce7f4633ff23766b29f8f0424 + 55b9d2532b7b87acdb664bc44c61ce0768e9d285 - + https://github.com/dotnet/aspnetcore - 6bfffda73420c63ce7f4633ff23766b29f8f0424 + 55b9d2532b7b87acdb664bc44c61ce0768e9d285 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - 94571f27e03615fd90933c66196e59ade9c17ce0 + b68b1980614775c3ad130559f14d33a156fa145a - + https://github.com/dotnet/sdk - 94571f27e03615fd90933c66196e59ade9c17ce0 + b68b1980614775c3ad130559f14d33a156fa145a diff --git a/eng/Versions.props b/eng/Versions.props index dc9387eb7..9219ec8b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20469.4 - 5.0.0-rc.2.20469.4 - 5.0.0-rc.2.20469.4 - 5.0.0-rc.2.20469.4 - 5.0.0-rc.2.20469.4 - 5.0.0-rc.2.20469.4 - 5.0.0-rc.2.20469.4 + 5.0.0-rc.2.20469.5 + 5.0.0-rc.2.20469.5 + 5.0.0-rc.2.20469.5 + 5.0.0-rc.2.20469.5 + 5.0.0-rc.2.20469.5 + 5.0.0-rc.2.20469.5 + 5.0.0-rc.2.20469.5 0.2.0 - 5.0.100-rc.2.20469.5 - 5.0.100-rc.2.20469.5 + 5.0.100-rc.2.20469.6 + 5.0.100-rc.2.20469.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb247778af03e8bc56c0878b42e670ba2abc72f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2020 09:33:13 +0000 Subject: [PATCH 096/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.2 (#8643) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.8.0-preview-20468-01 to 16.8.0-preview-20468-03 (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 6aa702bd7..7c516d984 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5c755c0ba2cb1819c105149a76e323e5865c3630 - + https://github.com/dotnet/sdk - b68b1980614775c3ad130559f14d33a156fa145a + ee3c3d316eb70cb302e9dcfa42f298915d9d5c36 - + https://github.com/dotnet/sdk - b68b1980614775c3ad130559f14d33a156fa145a + ee3c3d316eb70cb302e9dcfa42f298915d9d5c36 @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn d57cda76c2b76cff75487a085d289cfadd99150b - + https://github.com/dotnet/msbuild - e938b8f1d7f9eeee54c393dbd5fdf1a86c176922 + 580f1bbdc0635fc300ed3922524c60796d725142 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 9219ec8b8..ea677c647 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20469.6 - 5.0.100-rc.2.20469.6 + 5.0.100-rc.2.20471.2 + 5.0.100-rc.2.20471.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15ac2074f41ad966c06796549c94d9ce78d22707 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2020 13:57:48 +0000 Subject: [PATCH 097/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.3 (#8644) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.2.20464.2 to 5.0.0-rc.2.20471.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 7c516d984..e423ec288 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 5c755c0ba2cb1819c105149a76e323e5865c3630 + a33529c7ab99427e11848dad0ee2525893c9c531 - + https://github.com/dotnet/sdk - ee3c3d316eb70cb302e9dcfa42f298915d9d5c36 + 2c8069dc680d432a773ec069d437a5583e65159e - + https://github.com/dotnet/sdk - ee3c3d316eb70cb302e9dcfa42f298915d9d5c36 + 2c8069dc680d432a773ec069d437a5583e65159e diff --git a/eng/Versions.props b/eng/Versions.props index ea677c647..ef0f03eaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 5.0.0-rc.2.20464.2 + 5.0.0-rc.2.20471.1 @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20471.2 - 5.0.100-rc.2.20471.2 + 5.0.100-rc.2.20471.3 + 5.0.100-rc.2.20471.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 009692132dbaf3f649cfdaa4025604973c19c163 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2020 16:04:49 +0000 Subject: [PATCH 098/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.4 (#8645) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200918-09 to 16.8.0-release-20200921-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e423ec288..710b10f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating a33529c7ab99427e11848dad0ee2525893c9c531 - + https://github.com/dotnet/sdk - 2c8069dc680d432a773ec069d437a5583e65159e + 1e952255601f0e5fb6bd4173698c54bd0ba2d522 - + https://github.com/dotnet/sdk - 2c8069dc680d432a773ec069d437a5583e65159e + 1e952255601f0e5fb6bd4173698c54bd0ba2d522 @@ -104,7 +104,7 @@ https://github.com/dotnet/fsharp 79c593286e626311e84c8f7882eea796912854c3 - + https://github.com/microsoft/vstest 70a599d905c8033982e34dfb3b00290bf9df1961 diff --git a/eng/Versions.props b/eng/Versions.props index ef0f03eaa..da0648b4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20471.3 - 5.0.100-rc.2.20471.3 + 5.0.100-rc.2.20471.4 + 5.0.100-rc.2.20471.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.8.0-release-20200918-09 + 16.8.0-release-20200921-02 From 6618f705df3e61e746d070d4248df5b4693b4af5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2020 22:45:23 +0000 Subject: [PATCH 099/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.6 (#8647) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20469.5 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20469.5 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20469.5 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20469.5 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20469.5 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20469.5 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20469.5 to 5.0.0-rc.2.20471.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 710b10f5a..b207d1e4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 906b4a81f72967bcf5749436a971a8277d37871a - + https://github.com/dotnet/aspnetcore - 55b9d2532b7b87acdb664bc44c61ce0768e9d285 + a5a2551b020afcfbb7cfbcfe5582fcddf9588caf - + https://github.com/dotnet/aspnetcore - 55b9d2532b7b87acdb664bc44c61ce0768e9d285 + a5a2551b020afcfbb7cfbcfe5582fcddf9588caf - + https://github.com/dotnet/aspnetcore - 55b9d2532b7b87acdb664bc44c61ce0768e9d285 + a5a2551b020afcfbb7cfbcfe5582fcddf9588caf - + https://github.com/dotnet/aspnetcore - 55b9d2532b7b87acdb664bc44c61ce0768e9d285 + a5a2551b020afcfbb7cfbcfe5582fcddf9588caf - + https://github.com/dotnet/aspnetcore - 55b9d2532b7b87acdb664bc44c61ce0768e9d285 + a5a2551b020afcfbb7cfbcfe5582fcddf9588caf - + https://github.com/dotnet/aspnetcore - 55b9d2532b7b87acdb664bc44c61ce0768e9d285 + a5a2551b020afcfbb7cfbcfe5582fcddf9588caf - + https://github.com/dotnet/aspnetcore - 55b9d2532b7b87acdb664bc44c61ce0768e9d285 + a5a2551b020afcfbb7cfbcfe5582fcddf9588caf https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating a33529c7ab99427e11848dad0ee2525893c9c531 - + https://github.com/dotnet/sdk - 1e952255601f0e5fb6bd4173698c54bd0ba2d522 + c3bb71ad2edb8f600731253561128f72ba7ccbac - + https://github.com/dotnet/sdk - 1e952255601f0e5fb6bd4173698c54bd0ba2d522 + c3bb71ad2edb8f600731253561128f72ba7ccbac diff --git a/eng/Versions.props b/eng/Versions.props index da0648b4e..8f17fbc47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20469.5 - 5.0.0-rc.2.20469.5 - 5.0.0-rc.2.20469.5 - 5.0.0-rc.2.20469.5 - 5.0.0-rc.2.20469.5 - 5.0.0-rc.2.20469.5 - 5.0.0-rc.2.20469.5 + 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.2 0.2.0 - 5.0.100-rc.2.20471.4 - 5.0.100-rc.2.20471.4 + 5.0.100-rc.2.20471.6 + 5.0.100-rc.2.20471.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cf3a7d0fedf811904490390373a40a2d1e78fcf0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 00:35:38 +0000 Subject: [PATCH 100/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.7 (#8649) [release/5.0.1xx-rc2] 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 b207d1e4f..6324055f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating a33529c7ab99427e11848dad0ee2525893c9c531 - + https://github.com/dotnet/sdk - c3bb71ad2edb8f600731253561128f72ba7ccbac + d6e1ee4714c0e4a76ba2792fb3581a07fd07a5bb - + https://github.com/dotnet/sdk - c3bb71ad2edb8f600731253561128f72ba7ccbac + d6e1ee4714c0e4a76ba2792fb3581a07fd07a5bb diff --git a/eng/Versions.props b/eng/Versions.props index 8f17fbc47..9c134ee19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20471.6 - 5.0.100-rc.2.20471.6 + 5.0.100-rc.2.20471.7 + 5.0.100-rc.2.20471.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 69b057c220c410884e596e78b843c5396bec02bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 02:26:20 +0000 Subject: [PATCH 101/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.8 (#8653) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20466.10 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20466.10 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20466.5 to 5.0.0-rc.2.20466.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20466.10 to 5.0.0-rc.2.20471.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20466.7 to 5.0.0-rc.2.20466.8 (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 6324055f7..bfc653a7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - abeeaf5f9ce5076773a12a66f622d0915e509bf9 + dc74f421f262a7044b0be8891e50c7710a89b7bf - + https://github.com/dotnet/windowsdesktop - abeeaf5f9ce5076773a12a66f622d0915e509bf9 + dc74f421f262a7044b0be8891e50c7710a89b7bf - + https://github.com/dotnet/windowsdesktop - abeeaf5f9ce5076773a12a66f622d0915e509bf9 + dc74f421f262a7044b0be8891e50c7710a89b7bf https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating a33529c7ab99427e11848dad0ee2525893c9c531 - + https://github.com/dotnet/sdk - d6e1ee4714c0e4a76ba2792fb3581a07fd07a5bb + 294b8b4bdc81c43585bfb44a565f3d5f6d11a226 - + https://github.com/dotnet/sdk - d6e1ee4714c0e4a76ba2792fb3581a07fd07a5bb + 294b8b4bdc81c43585bfb44a565f3d5f6d11a226 - + https://github.com/dotnet/winforms - 41e2b1389654a184769d1eafdc980e55030b4dfd + 361d43382a473992a74fa5a3788b3c47c2b6c3b3 - + https://github.com/dotnet/wpf - 15035c4b138dfeeaf50fa262615022eaeb4b0970 + abdfea6020be052622ae4145f2e51ff6604b94f1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9c134ee19..82ac5c6b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.2.20466.5 + 5.0.0-rc.2.20466.6 - 5.0.0-rc.2.20466.7 + 5.0.0-rc.2.20466.8 @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20471.7 - 5.0.100-rc.2.20471.7 + 5.0.100-rc.2.20471.8 + 5.0.100-rc.2.20471.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -75,9 +75,9 @@ - 5.0.0-rc.2.20466.10 - 5.0.0-rc.2.20466.10 - 5.0.0-rc.2.20466.10 + 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.2 From 03762761e227fd7c23d4e93c68a9a3b4913363a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 03:44:48 +0000 Subject: [PATCH 102/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.9 (#8655) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20468.4 to 5.0.0-rc.2.20471.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20468.4 to 5.0.0-rc.2.20471.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20468.4 to 5.0.0-rc.2.20471.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20468.4 to 5.0.0-rc.2.20471.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20468.4 to 5.0.0-rc.2.20471.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20468.4 to 5.0.0-rc.2.20471.5 (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 bfc653a7d..220965524 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop dc74f421f262a7044b0be8891e50c7710a89b7bf - + https://github.com/dotnet/runtime - 906b4a81f72967bcf5749436a971a8277d37871a + 8b1f30904a3291c987cb67dfa8b98ae0843a3535 - + https://github.com/dotnet/runtime - 906b4a81f72967bcf5749436a971a8277d37871a + 8b1f30904a3291c987cb67dfa8b98ae0843a3535 - + https://github.com/dotnet/runtime - 906b4a81f72967bcf5749436a971a8277d37871a + 8b1f30904a3291c987cb67dfa8b98ae0843a3535 - + https://github.com/dotnet/runtime - 906b4a81f72967bcf5749436a971a8277d37871a + 8b1f30904a3291c987cb67dfa8b98ae0843a3535 - + https://github.com/dotnet/runtime - 906b4a81f72967bcf5749436a971a8277d37871a + 8b1f30904a3291c987cb67dfa8b98ae0843a3535 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 906b4a81f72967bcf5749436a971a8277d37871a + 8b1f30904a3291c987cb67dfa8b98ae0843a3535 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating a33529c7ab99427e11848dad0ee2525893c9c531 - + https://github.com/dotnet/sdk - 294b8b4bdc81c43585bfb44a565f3d5f6d11a226 + 352bbcd830b68f9114e89a1e384bef55f00d8e20 - + https://github.com/dotnet/sdk - 294b8b4bdc81c43585bfb44a565f3d5f6d11a226 + 352bbcd830b68f9114e89a1e384bef55f00d8e20 diff --git a/eng/Versions.props b/eng/Versions.props index 82ac5c6b8..7cb5befd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,23 +54,23 @@ - 5.0.100-rc.2.20471.8 - 5.0.100-rc.2.20471.8 + 5.0.100-rc.2.20471.9 + 5.0.100-rc.2.20471.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20468.4 + 5.0.0-rc.2.20471.5 - 5.0.0-rc.2.20468.4 - 5.0.0-rc.2.20468.4 - 5.0.0-rc.2.20468.4 - 5.0.0-rc.2.20468.4 - 5.0.0-rc.2.20468.4 + 5.0.0-rc.2.20471.5 + 5.0.0-rc.2.20471.5 + 5.0.0-rc.2.20471.5 + 5.0.0-rc.2.20471.5 + 5.0.0-rc.2.20471.5 2.1.0 From 231d49a573f23f3a9ca22f9d11a9a7295d17c109 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 04:37:47 +0000 Subject: [PATCH 103/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.10 (#8656) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.2.20471.1 to 5.0.0-rc.2.20471.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 220965524..546543b17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - a33529c7ab99427e11848dad0ee2525893c9c531 + 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 352bbcd830b68f9114e89a1e384bef55f00d8e20 + c0d7b74b14c98354d0a35b30e26ec2084a440532 - + https://github.com/dotnet/sdk - 352bbcd830b68f9114e89a1e384bef55f00d8e20 + c0d7b74b14c98354d0a35b30e26ec2084a440532 diff --git a/eng/Versions.props b/eng/Versions.props index 7cb5befd0..24567d742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 5.0.0-rc.2.20471.1 + 5.0.0-rc.2.20471.2 @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20471.9 - 5.0.100-rc.2.20471.9 + 5.0.100-rc.2.20471.10 + 5.0.100-rc.2.20471.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33052b8020e27c0ea002253a0fed5b2e87ede507 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 06:03:01 +0000 Subject: [PATCH 104/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.11 (#8657) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20471.5 to 5.0.0-rc.2.20471.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20471.5 to 5.0.0-rc.2.20471.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20471.5 to 5.0.0-rc.2.20471.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20471.5 to 5.0.0-rc.2.20471.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20471.5 to 5.0.0-rc.2.20471.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20471.5 to 5.0.0-rc.2.20471.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 546543b17..87e01301a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop dc74f421f262a7044b0be8891e50c7710a89b7bf - + https://github.com/dotnet/runtime - 8b1f30904a3291c987cb67dfa8b98ae0843a3535 + 25db678ba8ee00cab4dbfef6390cbbd3959e01db - + https://github.com/dotnet/runtime - 8b1f30904a3291c987cb67dfa8b98ae0843a3535 + 25db678ba8ee00cab4dbfef6390cbbd3959e01db - + https://github.com/dotnet/runtime - 8b1f30904a3291c987cb67dfa8b98ae0843a3535 + 25db678ba8ee00cab4dbfef6390cbbd3959e01db - + https://github.com/dotnet/runtime - 8b1f30904a3291c987cb67dfa8b98ae0843a3535 + 25db678ba8ee00cab4dbfef6390cbbd3959e01db - + https://github.com/dotnet/runtime - 8b1f30904a3291c987cb67dfa8b98ae0843a3535 + 25db678ba8ee00cab4dbfef6390cbbd3959e01db @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8b1f30904a3291c987cb67dfa8b98ae0843a3535 + 25db678ba8ee00cab4dbfef6390cbbd3959e01db https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - c0d7b74b14c98354d0a35b30e26ec2084a440532 + 64235214af1fc015fd0f20cb94f6f4d7a8a3bedf - + https://github.com/dotnet/sdk - c0d7b74b14c98354d0a35b30e26ec2084a440532 + 64235214af1fc015fd0f20cb94f6f4d7a8a3bedf diff --git a/eng/Versions.props b/eng/Versions.props index 24567d742..a7fcc39c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,23 +54,23 @@ - 5.0.100-rc.2.20471.10 - 5.0.100-rc.2.20471.10 + 5.0.100-rc.2.20471.11 + 5.0.100-rc.2.20471.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20471.5 + 5.0.0-rc.2.20471.9 - 5.0.0-rc.2.20471.5 - 5.0.0-rc.2.20471.5 - 5.0.0-rc.2.20471.5 - 5.0.0-rc.2.20471.5 - 5.0.0-rc.2.20471.5 + 5.0.0-rc.2.20471.9 + 5.0.0-rc.2.20471.9 + 5.0.0-rc.2.20471.9 + 5.0.0-rc.2.20471.9 + 5.0.0-rc.2.20471.9 2.1.0 From 7da7e8089a340a92ef83eb5491255f9184b35708 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 07:33:03 +0000 Subject: [PATCH 105/134] Update dependencies from https://github.com/dotnet/sdk build 20200921.15 (#8659) [release/5.0.1xx-rc2] 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 87e01301a..07570a438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 64235214af1fc015fd0f20cb94f6f4d7a8a3bedf + 1360b8f8daf8ea87d5e9105bc94d8fdbc743ff97 - + https://github.com/dotnet/sdk - 64235214af1fc015fd0f20cb94f6f4d7a8a3bedf + 1360b8f8daf8ea87d5e9105bc94d8fdbc743ff97 diff --git a/eng/Versions.props b/eng/Versions.props index a7fcc39c7..818ee0b8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20471.11 - 5.0.100-rc.2.20471.11 + 5.0.100-rc.2.20471.15 + 5.0.100-rc.2.20471.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9d8ebaaa9ed79511b936d5118fb8d741a196d7ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 09:40:53 +0000 Subject: [PATCH 106/134] Update dependencies from https://github.com/dotnet/sdk build 20200922.2 (#8662) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20471.23 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20471.23 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20471.23 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20471.23 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20471.23 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20471.23 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20471.23 (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 07570a438..ccde911d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 25db678ba8ee00cab4dbfef6390cbbd3959e01db - + https://github.com/dotnet/aspnetcore - a5a2551b020afcfbb7cfbcfe5582fcddf9588caf + 9a4d5f01b3b852189712cca487b718bb08558232 - + https://github.com/dotnet/aspnetcore - a5a2551b020afcfbb7cfbcfe5582fcddf9588caf + 9a4d5f01b3b852189712cca487b718bb08558232 - + https://github.com/dotnet/aspnetcore - a5a2551b020afcfbb7cfbcfe5582fcddf9588caf + 9a4d5f01b3b852189712cca487b718bb08558232 - + https://github.com/dotnet/aspnetcore - a5a2551b020afcfbb7cfbcfe5582fcddf9588caf + 9a4d5f01b3b852189712cca487b718bb08558232 - + https://github.com/dotnet/aspnetcore - a5a2551b020afcfbb7cfbcfe5582fcddf9588caf + 9a4d5f01b3b852189712cca487b718bb08558232 - + https://github.com/dotnet/aspnetcore - a5a2551b020afcfbb7cfbcfe5582fcddf9588caf + 9a4d5f01b3b852189712cca487b718bb08558232 - + https://github.com/dotnet/aspnetcore - a5a2551b020afcfbb7cfbcfe5582fcddf9588caf + 9a4d5f01b3b852189712cca487b718bb08558232 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 1360b8f8daf8ea87d5e9105bc94d8fdbc743ff97 + 2a021c9a8bbb64e69f597c9012c0d565616f2bc1 - + https://github.com/dotnet/sdk - 1360b8f8daf8ea87d5e9105bc94d8fdbc743ff97 + 2a021c9a8bbb64e69f597c9012c0d565616f2bc1 diff --git a/eng/Versions.props b/eng/Versions.props index 818ee0b8e..df821259a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20471.2 - 5.0.0-rc.2.20471.2 - 5.0.0-rc.2.20471.2 - 5.0.0-rc.2.20471.2 - 5.0.0-rc.2.20471.2 - 5.0.0-rc.2.20471.2 - 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20471.23 + 5.0.0-rc.2.20471.23 + 5.0.0-rc.2.20471.23 + 5.0.0-rc.2.20471.23 + 5.0.0-rc.2.20471.23 + 5.0.0-rc.2.20471.23 + 5.0.0-rc.2.20471.23 0.2.0 - 5.0.100-rc.2.20471.15 - 5.0.100-rc.2.20471.15 + 5.0.100-rc.2.20472.2 + 5.0.100-rc.2.20472.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From afbb4207805f7c5d6ff2fc820517dfeed9dc9098 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 11:11:01 +0000 Subject: [PATCH 107/134] Update dependencies from https://github.com/dotnet/sdk build 20200922.5 (#8663) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20460.2 to 3.8.0-4.20472.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 ccde911d1..5bffeb5b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 2a021c9a8bbb64e69f597c9012c0d565616f2bc1 + d2e16c345e07913da52e982ca6043434a27d18de - + https://github.com/dotnet/sdk - 2a021c9a8bbb64e69f597c9012c0d565616f2bc1 + d2e16c345e07913da52e982ca6043434a27d18de @@ -113,9 +113,9 @@ 6d26f7ac409c5723bca669385e65582e69b4da75 linker - + https://github.com/dotnet/roslyn - d57cda76c2b76cff75487a085d289cfadd99150b + 6b285c423c78d4fd5e099606cafd73bc1980fd38 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index df821259a..bf7d8b95c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,8 +54,8 @@ - 5.0.100-rc.2.20472.2 - 5.0.100-rc.2.20472.2 + 5.0.100-rc.2.20472.5 + 5.0.100-rc.2.20472.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7c8fa9bcb14caa702ebc9370c5697ddfe2d8fc2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 14:53:16 +0000 Subject: [PATCH 108/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8664) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20471.23 to 5.0.0-rc.2.20471.28 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20471.23 to 5.0.0-rc.2.20471.28 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20471.23 to 5.0.0-rc.2.20471.28 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20471.23 to 5.0.0-rc.2.20471.28 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20471.23 to 5.0.0-rc.2.20471.28 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20471.23 to 5.0.0-rc.2.20471.28 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20471.23 to 5.0.0-rc.2.20471.28 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 3.8.0-4.20472.3 to 3.8.0-4.20472.5 (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 5bffeb5b8..939e5a1e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 25db678ba8ee00cab4dbfef6390cbbd3959e01db - + https://github.com/dotnet/aspnetcore - 9a4d5f01b3b852189712cca487b718bb08558232 + 8063c973735124d3ccc245119f83855a981b7d04 - + https://github.com/dotnet/aspnetcore - 9a4d5f01b3b852189712cca487b718bb08558232 + 8063c973735124d3ccc245119f83855a981b7d04 - + https://github.com/dotnet/aspnetcore - 9a4d5f01b3b852189712cca487b718bb08558232 + 8063c973735124d3ccc245119f83855a981b7d04 - + https://github.com/dotnet/aspnetcore - 9a4d5f01b3b852189712cca487b718bb08558232 + 8063c973735124d3ccc245119f83855a981b7d04 - + https://github.com/dotnet/aspnetcore - 9a4d5f01b3b852189712cca487b718bb08558232 + 8063c973735124d3ccc245119f83855a981b7d04 - + https://github.com/dotnet/aspnetcore - 9a4d5f01b3b852189712cca487b718bb08558232 + 8063c973735124d3ccc245119f83855a981b7d04 - + https://github.com/dotnet/aspnetcore - 9a4d5f01b3b852189712cca487b718bb08558232 + 8063c973735124d3ccc245119f83855a981b7d04 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - d2e16c345e07913da52e982ca6043434a27d18de + 69a8b343384435ef6f65789f6d5b471e9a9697da - + https://github.com/dotnet/sdk - d2e16c345e07913da52e982ca6043434a27d18de + 69a8b343384435ef6f65789f6d5b471e9a9697da @@ -113,9 +113,9 @@ 6d26f7ac409c5723bca669385e65582e69b4da75 linker - + https://github.com/dotnet/roslyn - 6b285c423c78d4fd5e099606cafd73bc1980fd38 + faf28c5296d30f0583ff63666511b35580c8f021 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index bf7d8b95c..0571fdc1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ - 5.0.0-rc.2.20471.23 - 5.0.0-rc.2.20471.23 - 5.0.0-rc.2.20471.23 - 5.0.0-rc.2.20471.23 - 5.0.0-rc.2.20471.23 - 5.0.0-rc.2.20471.23 - 5.0.0-rc.2.20471.23 + 5.0.0-rc.2.20471.28 + 5.0.0-rc.2.20471.28 + 5.0.0-rc.2.20471.28 + 5.0.0-rc.2.20471.28 + 5.0.0-rc.2.20471.28 + 5.0.0-rc.2.20471.28 + 5.0.0-rc.2.20471.28 0.2.0 - 5.0.100-rc.2.20472.5 - 5.0.100-rc.2.20472.5 + 5.0.100-rc.2.20472.8 + 5.0.100-rc.2.20472.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e14d4e8b01e73d68536b9b17b9e3d6fc5b6fa5a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 22 Sep 2020 07:59:59 -0700 Subject: [PATCH 109/134] Fixes for stable builds (#8648) - Enable the switch for stable builds - Fixup the calculation of FullNugetVersion to not include the iteration if it is empty --- eng/Versions.props | 4 ++++ src/redist/targets/Versions.targets | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0571fdc1c..312fbcf30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,6 +14,10 @@ 2 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) + + + false + release diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index c4a2914db..4e08d5063 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -1,7 +1,8 @@ - $(VersionPrefix)-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) + $(VersionPrefix)-$(PreReleaseVersionLabel) + $(FullNugetVersion).$(PreReleaseVersionIteration) $(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay) From 4973bec513aad362eecd6b53d7c38e5475a1e5eb Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 22 Sep 2020 11:30:23 -0700 Subject: [PATCH 110/134] Sign redist.dll --- src/redist/targets/Signing.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index c4ebc6ed7..c58bc2df8 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -113,6 +113,7 @@ $(SdkOutputDirectory)**/MSBuild.dll; $(SdkOutputDirectory)**/MSBuild.resources.dll; $(SdkOutputDirectory)**/PresentationBuildTasks.dll; + $(SdkOutputDirectory)**/redist.dll; $(SdkOutputDirectory)**/rzc.dll; $(SdkOutputDirectory)**/testhost.dll; $(SdkOutputDirectory)**/testhost.exe; From 3563fd58852d3d966b4dcb5d796007cbb76c4144 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 18:46:25 +0000 Subject: [PATCH 111/134] Update dependencies from https://github.com/dotnet/arcade build 20200921.1 (#8667) [release/5.0.1xx-rc2] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 3 +-- global.json | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 939e5a1e2..dd9568213 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -140,13 +140,13 @@ - + https://github.com/dotnet/arcade - b63ea25b8dc50bb3dfcef128d415254bd5ca4dc8 + 0365488709f58e37de6c2180e7fb243203ca0a9c - + https://github.com/dotnet/arcade - b63ea25b8dc50bb3dfcef128d415254bd5ca4dc8 + 0365488709f58e37de6c2180e7fb243203ca0a9c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 312fbcf30..66c72fe20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,14 +14,13 @@ 2 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false release - 5.0.0-beta.20467.6 + 5.0.0-beta.20471.1 diff --git a/global.json b/global.json index 45865275f..d4a907589 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20467.6" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20471.1" } } From ebd8ed004cabb36b5ab89fd085184a8a38837cd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 18:50:12 +0000 Subject: [PATCH 112/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8665) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20471.9 to 5.0.0-rc.2.20471.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20471.9 to 5.0.0-rc.2.20471.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20471.9 to 5.0.0-rc.2.20471.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20471.9 to 5.0.0-rc.2.20471.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20471.9 to 5.0.0-rc.2.20471.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20471.9 to 5.0.0-rc.2.20471.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 dd9568213..a365eb561 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop dc74f421f262a7044b0be8891e50c7710a89b7bf - + https://github.com/dotnet/runtime - 25db678ba8ee00cab4dbfef6390cbbd3959e01db + c4c136670f568ffcb73b40d836982825548ed6bc - + https://github.com/dotnet/runtime - 25db678ba8ee00cab4dbfef6390cbbd3959e01db + c4c136670f568ffcb73b40d836982825548ed6bc - + https://github.com/dotnet/runtime - 25db678ba8ee00cab4dbfef6390cbbd3959e01db + c4c136670f568ffcb73b40d836982825548ed6bc - + https://github.com/dotnet/runtime - 25db678ba8ee00cab4dbfef6390cbbd3959e01db + c4c136670f568ffcb73b40d836982825548ed6bc - + https://github.com/dotnet/runtime - 25db678ba8ee00cab4dbfef6390cbbd3959e01db + c4c136670f568ffcb73b40d836982825548ed6bc @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 25db678ba8ee00cab4dbfef6390cbbd3959e01db + c4c136670f568ffcb73b40d836982825548ed6bc https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 69a8b343384435ef6f65789f6d5b471e9a9697da + 8729de8351ea9bdfae57b00d4cd1b72077b86827 - + https://github.com/dotnet/sdk - 69a8b343384435ef6f65789f6d5b471e9a9697da + 8729de8351ea9bdfae57b00d4cd1b72077b86827 diff --git a/eng/Versions.props b/eng/Versions.props index 66c72fe20..d44008bee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 5.0.100-rc.2.20472.8 - 5.0.100-rc.2.20472.8 + 5.0.100-rc.2.20472.10 + 5.0.100-rc.2.20472.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20471.9 + 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.9 - 5.0.0-rc.2.20471.9 - 5.0.0-rc.2.20471.9 - 5.0.0-rc.2.20471.9 - 5.0.0-rc.2.20471.9 + 5.0.0-rc.2.20471.13 + 5.0.0-rc.2.20471.13 + 5.0.0-rc.2.20471.13 + 5.0.0-rc.2.20471.13 + 5.0.0-rc.2.20471.13 2.1.0 From 906df57e8f732b9d85dcbc4b66f6bb20cd74d768 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 20:39:54 +0000 Subject: [PATCH 113/134] Update dependencies from https://github.com/dotnet/sdk build 20200922.11 (#8669) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20471.28 to 5.0.0-rc.2.20472.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20471.28 to 5.0.0-rc.2.20472.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20471.28 to 5.0.0-rc.2.20472.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20471.28 to 5.0.0-rc.2.20472.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20471.28 to 5.0.0-rc.2.20472.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20471.28 to 5.0.0-rc.2.20472.3 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20471.28 to 5.0.0-rc.2.20472.3 (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 a365eb561..a95dfb524 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime c4c136670f568ffcb73b40d836982825548ed6bc - + https://github.com/dotnet/aspnetcore - 8063c973735124d3ccc245119f83855a981b7d04 + f66a1daeda0dce0060821272ca519cc755c73112 - + https://github.com/dotnet/aspnetcore - 8063c973735124d3ccc245119f83855a981b7d04 + f66a1daeda0dce0060821272ca519cc755c73112 - + https://github.com/dotnet/aspnetcore - 8063c973735124d3ccc245119f83855a981b7d04 + f66a1daeda0dce0060821272ca519cc755c73112 - + https://github.com/dotnet/aspnetcore - 8063c973735124d3ccc245119f83855a981b7d04 + f66a1daeda0dce0060821272ca519cc755c73112 - + https://github.com/dotnet/aspnetcore - 8063c973735124d3ccc245119f83855a981b7d04 + f66a1daeda0dce0060821272ca519cc755c73112 - + https://github.com/dotnet/aspnetcore - 8063c973735124d3ccc245119f83855a981b7d04 + f66a1daeda0dce0060821272ca519cc755c73112 - + https://github.com/dotnet/aspnetcore - 8063c973735124d3ccc245119f83855a981b7d04 + f66a1daeda0dce0060821272ca519cc755c73112 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 8729de8351ea9bdfae57b00d4cd1b72077b86827 + e3d37a2c402227910f726a4c07af93841eb69684 - + https://github.com/dotnet/sdk - 8729de8351ea9bdfae57b00d4cd1b72077b86827 + e3d37a2c402227910f726a4c07af93841eb69684 diff --git a/eng/Versions.props b/eng/Versions.props index d44008bee..078404c71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,21 +44,21 @@ - 5.0.0-rc.2.20471.28 - 5.0.0-rc.2.20471.28 - 5.0.0-rc.2.20471.28 - 5.0.0-rc.2.20471.28 - 5.0.0-rc.2.20471.28 - 5.0.0-rc.2.20471.28 - 5.0.0-rc.2.20471.28 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 0.2.0 - 5.0.100-rc.2.20472.10 - 5.0.100-rc.2.20472.10 + 5.0.100-rc.2.20472.11 + 5.0.100-rc.2.20472.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f56648180fa582dcba149c7f017ae14709116e75 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 22 Sep 2020 14:32:10 -0700 Subject: [PATCH 114/134] Use aspnetcore version suffix for template install directory (#8625) This change is required for RTM stable builds. When stable versions are generated the CalculateTemplateVersions task will fail. For .NET 3.x, installer is partially on arcade. It uses its own versioning model, but the arcade generated versions are actually set (specifically VersionSuffix). So even when stable builds are generated, VersionSuffix is available. It is unused when the aspnetcore template versions are stable. For .NET 5, installer is now fully on arcade versioning, which means VersionSuffix is not set when stable versions are generated. Instead of using installer's version suffix if aspnetcore's template versions are unstable, use the version suffix of the aspnetcore template versions. This subtley affects the installer directory of the templates: If the aspnetcore version is: 5.0.0-rc.1.1234.5 And the installer version is: 5.0.100-rc.1.9999.9 Then: Template install dir before this change: .dotnet\templates\5.0.0-rc.1.9999.9 Template install dir after this change: .dotnet\templates\5.0.0-rc.1.1234.5 Of note: The overall template layout doesn't make a ton of sense. The aspnetcore template version is used for the install directory, but many different templates are put in this directory, including some that have completely different versions. --- src/core-sdk-tasks/CalculateTemplateVersions.cs | 11 +++-------- src/redist/targets/BundledTemplates.targets | 12 ++++-------- .../CalculateTemplateVerionsTests.cs | 12 ++++++------ 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index b133ea29c..ed392ed4a 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -12,9 +12,6 @@ namespace Microsoft.DotNet.Cli.Build [Required] public string AspNetCorePackageVersionTemplate { get; set; } - [Required] - public string VersionSuffix { get; set; } - [Output] public string BundledTemplateInstallPath { get; set; } @@ -28,7 +25,7 @@ namespace Microsoft.DotNet.Cli.Build public override bool Execute() { - var result = Calculate(AspNetCorePackageVersionTemplate, VersionSuffix); + var result = Calculate(AspNetCorePackageVersionTemplate); BundledTemplateInstallPath = result.BundledTemplateInstallPath; BundledTemplateMajorMinorVersion = result.BundledTemplateMajorMinorVersion; BundledTemplateMajorMinorPatchVersion = result.BundledTemplateMajorMinorPatchVersion; @@ -40,16 +37,14 @@ namespace Microsoft.DotNet.Cli.Build (string BundledTemplateInstallPath, string BundledTemplateMajorMinorVersion, string BundledTemplateMajorMinorPatchVersion) - Calculate( - string aspNetCorePackageVersionTemplate, - string versionSuffix) + Calculate(string aspNetCorePackageVersionTemplate) { var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); NuGetVersion baseMajorMinorPatch = GetBaseMajorMinorPatch(aspNetCoreTemplate); string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease - ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}" + ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{aspNetCoreTemplate.Release}" : $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}"; return ( diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index b80378d09..00a31f8a3 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -1,29 +1,25 @@ - + - + - + - + diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs index 3d5082f32..29c56731f 100644 --- a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -9,7 +9,7 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds() { - var result = CalculateTemplateVersions.Calculate("3.1.0", "dev"); + var result = CalculateTemplateVersions.Calculate("3.1.0"); result.Should() .Be(("3.1.1", "3.1", "3.1.1"), @@ -20,16 +20,16 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInNonStableBuilds() { - var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "dev"); + var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6"); result.Should() - .Be(("3.0.1-dev", "3.0", "3.0.1")); + .Be(("3.0.1-alpha.1.20071.6", "3.0", "3.0.1")); } [Fact] public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInStableBuilds() { - var result = CalculateTemplateVersions.Calculate("5.1.0", "dev"); + var result = CalculateTemplateVersions.Calculate("5.1.0"); result.Should() .Be(("5.1.0", "5.1", "5.1.0"), @@ -40,10 +40,10 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInNonStableBuilds() { - var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "dev"); + var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6"); result.Should() - .Be(("5.0.0-dev", "5.0", "5.0.0")); + .Be(("5.0.0-alpha.1.20071.6", "5.0", "5.0.0")); } } } From 6c133ed03a0abe2d8d13d649dc956793db24d309 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 23:11:36 +0000 Subject: [PATCH 115/134] Update dependencies from https://github.com/dotnet/sdk build 20200922.15 (#8670) [release/5.0.1xx-rc2] 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 a95dfb524..e6e1cdcd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - e3d37a2c402227910f726a4c07af93841eb69684 + c9588964034e144476e0c398001021057362d524 - + https://github.com/dotnet/sdk - e3d37a2c402227910f726a4c07af93841eb69684 + c9588964034e144476e0c398001021057362d524 diff --git a/eng/Versions.props b/eng/Versions.props index 078404c71..2f3cdee0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20472.11 - 5.0.100-rc.2.20472.11 + 5.0.100-rc.2.20472.15 + 5.0.100-rc.2.20472.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8cb5ffc7ecd03bcb61935efb16665dee235c0867 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 22 Sep 2020 16:16:50 -0700 Subject: [PATCH 116/134] Do not produce reference assembly for redist.dll --- src/redist/redist.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index e3b39487a..852ba97c1 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -3,6 +3,7 @@ $(CoreSdkTargetFramework) true false + false From bdc45507a3cb1a0d3fa592852133362d9fe96608 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 00:33:00 +0000 Subject: [PATCH 117/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8671) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20472.3 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20472.3 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20472.3 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20472.3 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20472.3 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20472.3 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20472.3 to 5.0.0-rc.2.20472.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 e6e1cdcd5..9ef54f0f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime c4c136670f568ffcb73b40d836982825548ed6bc - + https://github.com/dotnet/aspnetcore - f66a1daeda0dce0060821272ca519cc755c73112 + 93f73c77640abc472fb901e18bf5055961e23e44 - + https://github.com/dotnet/aspnetcore - f66a1daeda0dce0060821272ca519cc755c73112 + 93f73c77640abc472fb901e18bf5055961e23e44 - + https://github.com/dotnet/aspnetcore - f66a1daeda0dce0060821272ca519cc755c73112 + 93f73c77640abc472fb901e18bf5055961e23e44 - + https://github.com/dotnet/aspnetcore - f66a1daeda0dce0060821272ca519cc755c73112 + 93f73c77640abc472fb901e18bf5055961e23e44 - + https://github.com/dotnet/aspnetcore - f66a1daeda0dce0060821272ca519cc755c73112 + 93f73c77640abc472fb901e18bf5055961e23e44 - + https://github.com/dotnet/aspnetcore - f66a1daeda0dce0060821272ca519cc755c73112 + 93f73c77640abc472fb901e18bf5055961e23e44 - + https://github.com/dotnet/aspnetcore - f66a1daeda0dce0060821272ca519cc755c73112 + 93f73c77640abc472fb901e18bf5055961e23e44 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - c9588964034e144476e0c398001021057362d524 + 15b641af6f5a4fd7856df4755c31cdbca68f2941 - + https://github.com/dotnet/sdk - c9588964034e144476e0c398001021057362d524 + 15b641af6f5a4fd7856df4755c31cdbca68f2941 diff --git a/eng/Versions.props b/eng/Versions.props index 2f3cdee0d..bd47c60ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,21 +44,21 @@ - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 0.2.0 - 5.0.100-rc.2.20472.15 - 5.0.100-rc.2.20472.15 + 5.0.100-rc.2.20472.18 + 5.0.100-rc.2.20472.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 42dd96924de694b65b74230ad84861ebd4cca91b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 04:07:00 +0000 Subject: [PATCH 118/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8677) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20471.13 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20471.13 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20471.13 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20471.13 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20471.13 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20471.13 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ef54f0f9..c5751bbe8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop dc74f421f262a7044b0be8891e50c7710a89b7bf - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc @@ -39,37 +39,37 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/aspnetcore - 93f73c77640abc472fb901e18bf5055961e23e44 + c0bd50075a17941a1077b8c31b040020ef8796aa - + https://github.com/dotnet/aspnetcore - 93f73c77640abc472fb901e18bf5055961e23e44 + c0bd50075a17941a1077b8c31b040020ef8796aa - + https://github.com/dotnet/aspnetcore - 93f73c77640abc472fb901e18bf5055961e23e44 + c0bd50075a17941a1077b8c31b040020ef8796aa - + https://github.com/dotnet/aspnetcore - 93f73c77640abc472fb901e18bf5055961e23e44 + c0bd50075a17941a1077b8c31b040020ef8796aa - + https://github.com/dotnet/aspnetcore - 93f73c77640abc472fb901e18bf5055961e23e44 + c0bd50075a17941a1077b8c31b040020ef8796aa - + https://github.com/dotnet/aspnetcore - 93f73c77640abc472fb901e18bf5055961e23e44 + c0bd50075a17941a1077b8c31b040020ef8796aa - + https://github.com/dotnet/aspnetcore - 93f73c77640abc472fb901e18bf5055961e23e44 + c0bd50075a17941a1077b8c31b040020ef8796aa https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 15b641af6f5a4fd7856df4755c31cdbca68f2941 + ca6e88d023659210979e0ea568f0768aee3ca8cb - + https://github.com/dotnet/sdk - 15b641af6f5a4fd7856df4755c31cdbca68f2941 + ca6e88d023659210979e0ea568f0768aee3ca8cb diff --git a/eng/Versions.props b/eng/Versions.props index bd47c60ac..979992f84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,36 +44,36 @@ - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 0.2.0 - 5.0.100-rc.2.20472.18 - 5.0.100-rc.2.20472.18 + 5.0.100-rc.2.20472.21 + 5.0.100-rc.2.20472.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20471.13 + 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 2.1.0 From 0da49bd8d7e357960e527bb4f47bec251a76def5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 06:08:30 +0000 Subject: [PATCH 119/134] Update dependencies from https://github.com/dotnet/sdk build 20200922.23 (#8678) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20472.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20472.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20466.6 to 5.0.0-rc.2.20472.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20471.2 to 5.0.0-rc.2.20472.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20466.8 to 5.0.0-rc.2.20472.6 (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 c5751bbe8..3585f1da2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - dc74f421f262a7044b0be8891e50c7710a89b7bf + 3c56e43d0862530e6c734e579e15be1151f98363 - + https://github.com/dotnet/windowsdesktop - dc74f421f262a7044b0be8891e50c7710a89b7bf + 3c56e43d0862530e6c734e579e15be1151f98363 - + https://github.com/dotnet/windowsdesktop - dc74f421f262a7044b0be8891e50c7710a89b7bf + 3c56e43d0862530e6c734e579e15be1151f98363 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - ca6e88d023659210979e0ea568f0768aee3ca8cb + 9d0a608cc136f6b9c6e4498f6930c428cf7c822a - + https://github.com/dotnet/sdk - ca6e88d023659210979e0ea568f0768aee3ca8cb + 9d0a608cc136f6b9c6e4498f6930c428cf7c822a - + https://github.com/dotnet/winforms - 361d43382a473992a74fa5a3788b3c47c2b6c3b3 + e41409eb87faea5c783a0316a28af4f94430dfa7 - + https://github.com/dotnet/wpf - abdfea6020be052622ae4145f2e51ff6604b94f1 + 2cf770541d7d65d796fb12497efc96d732f4b286 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 979992f84..3dd611715 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 5.0.0-rc.2.20466.6 + 5.0.0-rc.2.20472.2 - 5.0.0-rc.2.20466.8 + 5.0.0-rc.2.20472.6 @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20472.21 - 5.0.100-rc.2.20472.21 + 5.0.100-rc.2.20472.23 + 5.0.100-rc.2.20472.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 5.0.0-rc.2.20471.2 - 5.0.0-rc.2.20471.2 - 5.0.0-rc.2.20471.2 + 5.0.0-rc.2.20472.1 + 5.0.0-rc.2.20472.1 + 5.0.0-rc.2.20472.1 From 39f244ef899aa8e55b8b5cdcad9cbf6283d3ea19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 08:27:14 +0000 Subject: [PATCH 120/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8680) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.8.0-preview-20468-03 to 16.8.0-preview-20472-04 (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 3585f1da2..180c1e566 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 9d0a608cc136f6b9c6e4498f6930c428cf7c822a + da2f2459f3bb84cef69ee56aeeb4cb01c9923af8 - + https://github.com/dotnet/sdk - 9d0a608cc136f6b9c6e4498f6930c428cf7c822a + da2f2459f3bb84cef69ee56aeeb4cb01c9923af8 @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn faf28c5296d30f0583ff63666511b35580c8f021 - + https://github.com/dotnet/msbuild - 580f1bbdc0635fc300ed3922524c60796d725142 + 8702c49c24c2ef2f12419e8ab6b28a34aac1aba1 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 3dd611715..6abf89ce3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20472.23 - 5.0.100-rc.2.20472.23 + 5.0.100-rc.2.20472.26 + 5.0.100-rc.2.20472.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8b025a73a6d168ecd38831616f1ab6887704377c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 10:37:57 +0000 Subject: [PATCH 121/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.1 (#8681) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20472.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20472.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20472.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20472.15 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20472.15 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20472.15 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20472.15 (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 180c1e566..c1706d61d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/aspnetcore - c0bd50075a17941a1077b8c31b040020ef8796aa + da3f97b0ad76c4d95c661e51c496fa214c41e824 - + https://github.com/dotnet/aspnetcore - c0bd50075a17941a1077b8c31b040020ef8796aa + da3f97b0ad76c4d95c661e51c496fa214c41e824 - + https://github.com/dotnet/aspnetcore - c0bd50075a17941a1077b8c31b040020ef8796aa + da3f97b0ad76c4d95c661e51c496fa214c41e824 - + https://github.com/dotnet/aspnetcore - c0bd50075a17941a1077b8c31b040020ef8796aa + da3f97b0ad76c4d95c661e51c496fa214c41e824 - + https://github.com/dotnet/aspnetcore - c0bd50075a17941a1077b8c31b040020ef8796aa + da3f97b0ad76c4d95c661e51c496fa214c41e824 - + https://github.com/dotnet/aspnetcore - c0bd50075a17941a1077b8c31b040020ef8796aa + da3f97b0ad76c4d95c661e51c496fa214c41e824 - + https://github.com/dotnet/aspnetcore - c0bd50075a17941a1077b8c31b040020ef8796aa + da3f97b0ad76c4d95c661e51c496fa214c41e824 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - da2f2459f3bb84cef69ee56aeeb4cb01c9923af8 + 250784f8854f3634c8145de8984563d47b0dfda7 - + https://github.com/dotnet/sdk - da2f2459f3bb84cef69ee56aeeb4cb01c9923af8 + 250784f8854f3634c8145de8984563d47b0dfda7 diff --git a/eng/Versions.props b/eng/Versions.props index 6abf89ce3..ac6e521ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,21 +44,21 @@ - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.15 + 5.0.0-rc.2.20472.15 + 5.0.0-rc.2.20472.15 + 5.0.0-rc.2.20472.15 + 5.0.0-rc.2.20472.15 + 5.0.0-rc.2.20472.15 + 5.0.0-rc.2.20472.15 0.2.0 - 5.0.100-rc.2.20472.26 - 5.0.100-rc.2.20472.26 + 5.0.100-rc.2.20473.1 + 5.0.100-rc.2.20473.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 954c445ae899d2cdfc3b66c3483d5ef134a15159 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 11:25:04 +0000 Subject: [PATCH 122/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.2 (#8682) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20472.1 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20472.1 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20472.2 to 5.0.0-rc.2.20472.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20472.1 to 5.0.0-rc.2.20472.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20472.6 to 5.0.0-rc.2.20472.8 (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 c1706d61d..68121d82a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 3c56e43d0862530e6c734e579e15be1151f98363 + a933b9a13c9381e571df3a5d230d9e79b5588040 - + https://github.com/dotnet/windowsdesktop - 3c56e43d0862530e6c734e579e15be1151f98363 + a933b9a13c9381e571df3a5d230d9e79b5588040 - + https://github.com/dotnet/windowsdesktop - 3c56e43d0862530e6c734e579e15be1151f98363 + a933b9a13c9381e571df3a5d230d9e79b5588040 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 250784f8854f3634c8145de8984563d47b0dfda7 + 4cf42b73c8f8a2dbcfa8e54cedae05fb2ba80d43 - + https://github.com/dotnet/sdk - 250784f8854f3634c8145de8984563d47b0dfda7 + 4cf42b73c8f8a2dbcfa8e54cedae05fb2ba80d43 - + https://github.com/dotnet/winforms - e41409eb87faea5c783a0316a28af4f94430dfa7 + 209c20aee296ea0245354e96b828c0527409f8cd - + https://github.com/dotnet/wpf - 2cf770541d7d65d796fb12497efc96d732f4b286 + c765e716b1bd670d0136127d8900d5df2fb78722 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ac6e521ab..d6dc2db14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 5.0.0-rc.2.20472.2 + 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.6 + 5.0.0-rc.2.20472.8 @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20473.1 - 5.0.100-rc.2.20473.1 + 5.0.100-rc.2.20473.2 + 5.0.100-rc.2.20473.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 5.0.0-rc.2.20472.1 - 5.0.0-rc.2.20472.1 - 5.0.0-rc.2.20472.1 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 From 7462fa3ec6f8583cf17698fa18cfab6f69080dee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 14:32:36 +0000 Subject: [PATCH 123/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.3 (#8683) [release/5.0.1xx-rc2] 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 68121d82a..af2b1cbd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 4cf42b73c8f8a2dbcfa8e54cedae05fb2ba80d43 + 0aac614d8da076b5517b52e25a95e539d8654f5f - + https://github.com/dotnet/sdk - 4cf42b73c8f8a2dbcfa8e54cedae05fb2ba80d43 + 0aac614d8da076b5517b52e25a95e539d8654f5f diff --git a/eng/Versions.props b/eng/Versions.props index d6dc2db14..ef19db790 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20473.2 - 5.0.100-rc.2.20473.2 + 5.0.100-rc.2.20473.3 + 5.0.100-rc.2.20473.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a04b937c705910c09d98f59d2e5355a39eb0eae7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 19:51:56 +0000 Subject: [PATCH 124/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.7 (#8689) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20472.7 (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 af2b1cbd6..c9b1c1d5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop a933b9a13c9381e571df3a5d230d9e79b5588040 - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 0aac614d8da076b5517b52e25a95e539d8654f5f + 829f233acfec18bc4fc8df57a61ef0ef87654fa4 - + https://github.com/dotnet/sdk - 0aac614d8da076b5517b52e25a95e539d8654f5f + 829f233acfec18bc4fc8df57a61ef0ef87654fa4 diff --git a/eng/Versions.props b/eng/Versions.props index ef19db790..46d97ce1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 5.0.100-rc.2.20473.3 - 5.0.100-rc.2.20473.3 + 5.0.100-rc.2.20473.7 + 5.0.100-rc.2.20473.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 2.1.0 From aaee33abac122bd7296c774277b46e79c241d693 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 21:36:46 +0000 Subject: [PATCH 125/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.8 (#8690) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20473.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20473.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20473.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20472.5 to 5.0.0-rc.2.20473.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20472.8 to 5.0.0-rc.2.20473.1 (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 c9b1c1d5b..648c988db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - a933b9a13c9381e571df3a5d230d9e79b5588040 + 291ecb5a30caec11956ab4260a8ab1867ac51364 - + https://github.com/dotnet/windowsdesktop - a933b9a13c9381e571df3a5d230d9e79b5588040 + 291ecb5a30caec11956ab4260a8ab1867ac51364 - + https://github.com/dotnet/windowsdesktop - a933b9a13c9381e571df3a5d230d9e79b5588040 + 291ecb5a30caec11956ab4260a8ab1867ac51364 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 829f233acfec18bc4fc8df57a61ef0ef87654fa4 + f11b5fef95cf2c5d03ba4b2fface3be8e02fa7cc - + https://github.com/dotnet/sdk - 829f233acfec18bc4fc8df57a61ef0ef87654fa4 + f11b5fef95cf2c5d03ba4b2fface3be8e02fa7cc - + https://github.com/dotnet/winforms - 209c20aee296ea0245354e96b828c0527409f8cd + c99f8ef69d32c5368dd7431b89fd15bfb9bc4595 - + https://github.com/dotnet/wpf - c765e716b1bd670d0136127d8900d5df2fb78722 + fa4f798f3c823df8065b26e8dfd11a481ef3c987 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 46d97ce1c..6b921844e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20473.1 - 5.0.0-rc.2.20472.8 + 5.0.0-rc.2.20473.1 @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20473.7 - 5.0.100-rc.2.20473.7 + 5.0.100-rc.2.20473.8 + 5.0.100-rc.2.20473.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20473.1 + 5.0.0-rc.2.20473.1 + 5.0.0-rc.2.20473.1 From 9bf911d3dbc9b979b4a55d48ea980235ff2c653d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 23:17:09 +0000 Subject: [PATCH 126/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.9 (#8693) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20472.15 to 5.0.0-rc.2.20473.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20472.15 to 5.0.0-rc.2.20473.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20472.15 to 5.0.0-rc.2.20473.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20472.15 to 5.0.0-rc.2.20473.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20472.15 to 5.0.0-rc.2.20473.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20472.15 to 5.0.0-rc.2.20473.3 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20472.15 to 5.0.0-rc.2.20473.3 (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 648c988db..cccfe8e3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/aspnetcore - da3f97b0ad76c4d95c661e51c496fa214c41e824 + de1bf0abe47f51427a0693db32f206609d407910 - + https://github.com/dotnet/aspnetcore - da3f97b0ad76c4d95c661e51c496fa214c41e824 + de1bf0abe47f51427a0693db32f206609d407910 - + https://github.com/dotnet/aspnetcore - da3f97b0ad76c4d95c661e51c496fa214c41e824 + de1bf0abe47f51427a0693db32f206609d407910 - + https://github.com/dotnet/aspnetcore - da3f97b0ad76c4d95c661e51c496fa214c41e824 + de1bf0abe47f51427a0693db32f206609d407910 - + https://github.com/dotnet/aspnetcore - da3f97b0ad76c4d95c661e51c496fa214c41e824 + de1bf0abe47f51427a0693db32f206609d407910 - + https://github.com/dotnet/aspnetcore - da3f97b0ad76c4d95c661e51c496fa214c41e824 + de1bf0abe47f51427a0693db32f206609d407910 - + https://github.com/dotnet/aspnetcore - da3f97b0ad76c4d95c661e51c496fa214c41e824 + de1bf0abe47f51427a0693db32f206609d407910 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - f11b5fef95cf2c5d03ba4b2fface3be8e02fa7cc + 6f667bcbb6d99f2d2b5f0840187a2cb26d85287e - + https://github.com/dotnet/sdk - f11b5fef95cf2c5d03ba4b2fface3be8e02fa7cc + 6f667bcbb6d99f2d2b5f0840187a2cb26d85287e diff --git a/eng/Versions.props b/eng/Versions.props index 6b921844e..59cc907a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,21 +44,21 @@ - 5.0.0-rc.2.20472.15 - 5.0.0-rc.2.20472.15 - 5.0.0-rc.2.20472.15 - 5.0.0-rc.2.20472.15 - 5.0.0-rc.2.20472.15 - 5.0.0-rc.2.20472.15 - 5.0.0-rc.2.20472.15 + 5.0.0-rc.2.20473.3 + 5.0.0-rc.2.20473.3 + 5.0.0-rc.2.20473.3 + 5.0.0-rc.2.20473.3 + 5.0.0-rc.2.20473.3 + 5.0.0-rc.2.20473.3 + 5.0.0-rc.2.20473.3 0.2.0 - 5.0.100-rc.2.20473.8 - 5.0.100-rc.2.20473.8 + 5.0.100-rc.2.20473.9 + 5.0.100-rc.2.20473.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d48092944326237e31a5bb88280f4e85cbabef7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 01:15:29 +0000 Subject: [PATCH 127/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.10 (#8696) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20473.1 to 5.0.0-rc.2.20473.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20473.1 to 5.0.0-rc.2.20473.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20473.1 to 5.0.0-rc.2.20473.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20473.1 to 5.0.0-rc.2.20473.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20473.1 to 5.0.0-rc.2.20473.2 (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 cccfe8e3c..0162f6f3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 291ecb5a30caec11956ab4260a8ab1867ac51364 + a671214d30e163930bb6256e3b5bb7b373f31913 - + https://github.com/dotnet/windowsdesktop - 291ecb5a30caec11956ab4260a8ab1867ac51364 + a671214d30e163930bb6256e3b5bb7b373f31913 - + https://github.com/dotnet/windowsdesktop - 291ecb5a30caec11956ab4260a8ab1867ac51364 + a671214d30e163930bb6256e3b5bb7b373f31913 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 6f667bcbb6d99f2d2b5f0840187a2cb26d85287e + 4fd3b7d51d551b35803a240eb787ce75c1aacd1a - + https://github.com/dotnet/sdk - 6f667bcbb6d99f2d2b5f0840187a2cb26d85287e + 4fd3b7d51d551b35803a240eb787ce75c1aacd1a - + https://github.com/dotnet/winforms - c99f8ef69d32c5368dd7431b89fd15bfb9bc4595 + 415a15212dcf8f43fe2b6e01526696843d678ff9 - + https://github.com/dotnet/wpf - fa4f798f3c823df8065b26e8dfd11a481ef3c987 + e45821fbb277c36684c7d34adc55c7c4e3a7b8c8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 59cc907a6..02f9fe820 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 5.0.0-rc.2.20473.1 + 5.0.0-rc.2.20473.2 - 5.0.0-rc.2.20473.1 + 5.0.0-rc.2.20473.2 @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20473.9 - 5.0.100-rc.2.20473.9 + 5.0.100-rc.2.20473.10 + 5.0.100-rc.2.20473.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 5.0.0-rc.2.20473.1 - 5.0.0-rc.2.20473.1 - 5.0.0-rc.2.20473.1 + 5.0.0-rc.2.20473.2 + 5.0.0-rc.2.20473.2 + 5.0.0-rc.2.20473.2 From 48b8714c9c2feb2f1ec333471340031e03f457b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 02:43:31 +0000 Subject: [PATCH 128/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.12 (#8697) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-4.20472.5 to 3.8.0-4.20473.2 (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 0162f6f3f..8b935a373 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 4fd3b7d51d551b35803a240eb787ce75c1aacd1a + 521a8a43b153b47062a220440caad08e899347b7 - + https://github.com/dotnet/sdk - 4fd3b7d51d551b35803a240eb787ce75c1aacd1a + 521a8a43b153b47062a220440caad08e899347b7 @@ -113,9 +113,9 @@ 6d26f7ac409c5723bca669385e65582e69b4da75 linker - + https://github.com/dotnet/roslyn - faf28c5296d30f0583ff63666511b35580c8f021 + 30a778a41d233968fee0d4d097f5b65e5caeb831 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 02f9fe820..6794bb666 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20473.10 - 5.0.100-rc.2.20473.10 + 5.0.100-rc.2.20473.12 + 5.0.100-rc.2.20473.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bef6918bb495db1d88b76d1a6f2379d972973b1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 03:57:06 +0000 Subject: [PATCH 129/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8699) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20473.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20473.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20473.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20473.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20473.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20472.7 to 5.0.0-rc.2.20473.5 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.8.0-preview-20472-04 to 16.8.0-preview-20473-01 (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 8b935a373..c58ebeb93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop a671214d30e163930bb6256e3b5bb7b373f31913 - + https://github.com/dotnet/runtime - 3146953047a3f88987d7fb36e3aa4bcd81c73f6c + fd75c08e74bd4a349ed6dca742e4a33f3a617a11 - + https://github.com/dotnet/runtime - 3146953047a3f88987d7fb36e3aa4bcd81c73f6c + fd75c08e74bd4a349ed6dca742e4a33f3a617a11 - + https://github.com/dotnet/runtime - 3146953047a3f88987d7fb36e3aa4bcd81c73f6c + fd75c08e74bd4a349ed6dca742e4a33f3a617a11 - + https://github.com/dotnet/runtime - 3146953047a3f88987d7fb36e3aa4bcd81c73f6c + fd75c08e74bd4a349ed6dca742e4a33f3a617a11 - + https://github.com/dotnet/runtime - 3146953047a3f88987d7fb36e3aa4bcd81c73f6c + fd75c08e74bd4a349ed6dca742e4a33f3a617a11 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3146953047a3f88987d7fb36e3aa4bcd81c73f6c + fd75c08e74bd4a349ed6dca742e4a33f3a617a11 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 521a8a43b153b47062a220440caad08e899347b7 + 7f9a5aae12f2438fd5774db0bce9b5f8d8210f05 - + https://github.com/dotnet/sdk - 521a8a43b153b47062a220440caad08e899347b7 + 7f9a5aae12f2438fd5774db0bce9b5f8d8210f05 @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 30a778a41d233968fee0d4d097f5b65e5caeb831 - + https://github.com/dotnet/msbuild - 8702c49c24c2ef2f12419e8ab6b28a34aac1aba1 + 250161603c003af239d6e276c4fc6357586ba301 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index 6794bb666..3ec31b796 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 5.0.100-rc.2.20473.12 - 5.0.100-rc.2.20473.12 + 5.0.100-rc.2.20473.16 + 5.0.100-rc.2.20473.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20473.5 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 - 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20473.5 + 5.0.0-rc.2.20473.5 + 5.0.0-rc.2.20473.5 + 5.0.0-rc.2.20473.5 + 5.0.0-rc.2.20473.5 2.1.0 From 2725eb35a9534476b4f30e891f4a20e8c17080dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 06:08:43 +0000 Subject: [PATCH 130/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.17 (#8701) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.8.0-preview.3.6823 to 5.8.0-rc.6853 (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 c58ebeb93..121ca04e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 7f9a5aae12f2438fd5774db0bce9b5f8d8210f05 + 59939ae93fa5a2f1fa32dfdddcd95ce90f4d4f0a - + https://github.com/dotnet/sdk - 7f9a5aae12f2438fd5774db0bce9b5f8d8210f05 + 59939ae93fa5a2f1fa32dfdddcd95ce90f4d4f0a @@ -121,9 +121,9 @@ https://github.com/dotnet/msbuild 250161603c003af239d6e276c4fc6357586ba301 - + https://github.com/NuGet/NuGet.Client - 5eaf25677df20ce322acd08478ccdaddd87f1a52 + 0e5413751caebf168e7d363c88b9c22a3560fe60 https://github.com/dotnet/cliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 3ec31b796..9e9fff22a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20473.16 - 5.0.100-rc.2.20473.16 + 5.0.100-rc.2.20473.17 + 5.0.100-rc.2.20473.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 818f3ff9ba18ff887f144c6ab4757908ae9a0b28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 07:16:32 +0000 Subject: [PATCH 131/134] Update dependencies from https://github.com/dotnet/sdk build 20200923.19 (#8702) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.2.20473.5 to 5.0.0-rc.2.20473.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.2.20473.5 to 5.0.0-rc.2.20473.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.2.20473.5 to 5.0.0-rc.2.20473.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.2.20473.5 to 5.0.0-rc.2.20473.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.2.20473.5 to 5.0.0-rc.2.20473.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.2.20473.5 to 5.0.0-rc.2.20473.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20473.3 to 5.0.0-rc.2.20473.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20473.3 to 5.0.0-rc.2.20473.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20473.3 to 5.0.0-rc.2.20473.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20473.3 to 5.0.0-rc.2.20473.11 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20473.3 to 5.0.0-rc.2.20473.11 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20473.3 to 5.0.0-rc.2.20473.11 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20473.3 to 5.0.0-rc.2.20473.11 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 121ca04e8..f40b0a84a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop a671214d30e163930bb6256e3b5bb7b373f31913 - + https://github.com/dotnet/runtime - fd75c08e74bd4a349ed6dca742e4a33f3a617a11 + 467647115ce628504762ee3555d4439ae2da6582 - + https://github.com/dotnet/runtime - fd75c08e74bd4a349ed6dca742e4a33f3a617a11 + 467647115ce628504762ee3555d4439ae2da6582 - + https://github.com/dotnet/runtime - fd75c08e74bd4a349ed6dca742e4a33f3a617a11 + 467647115ce628504762ee3555d4439ae2da6582 - + https://github.com/dotnet/runtime - fd75c08e74bd4a349ed6dca742e4a33f3a617a11 + 467647115ce628504762ee3555d4439ae2da6582 - + https://github.com/dotnet/runtime - fd75c08e74bd4a349ed6dca742e4a33f3a617a11 + 467647115ce628504762ee3555d4439ae2da6582 @@ -39,37 +39,37 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - fd75c08e74bd4a349ed6dca742e4a33f3a617a11 + 467647115ce628504762ee3555d4439ae2da6582 - + https://github.com/dotnet/aspnetcore - de1bf0abe47f51427a0693db32f206609d407910 + 1564ca328c7f81c44426179cf1de1b270ff6c067 - + https://github.com/dotnet/aspnetcore - de1bf0abe47f51427a0693db32f206609d407910 + 1564ca328c7f81c44426179cf1de1b270ff6c067 - + https://github.com/dotnet/aspnetcore - de1bf0abe47f51427a0693db32f206609d407910 + 1564ca328c7f81c44426179cf1de1b270ff6c067 - + https://github.com/dotnet/aspnetcore - de1bf0abe47f51427a0693db32f206609d407910 + 1564ca328c7f81c44426179cf1de1b270ff6c067 - + https://github.com/dotnet/aspnetcore - de1bf0abe47f51427a0693db32f206609d407910 + 1564ca328c7f81c44426179cf1de1b270ff6c067 - + https://github.com/dotnet/aspnetcore - de1bf0abe47f51427a0693db32f206609d407910 + 1564ca328c7f81c44426179cf1de1b270ff6c067 - + https://github.com/dotnet/aspnetcore - de1bf0abe47f51427a0693db32f206609d407910 + 1564ca328c7f81c44426179cf1de1b270ff6c067 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 59939ae93fa5a2f1fa32dfdddcd95ce90f4d4f0a + 9d732f6cfcc9d5eab00b0bbc9e43c2a35371bbe2 - + https://github.com/dotnet/sdk - 59939ae93fa5a2f1fa32dfdddcd95ce90f4d4f0a + 9d732f6cfcc9d5eab00b0bbc9e43c2a35371bbe2 diff --git a/eng/Versions.props b/eng/Versions.props index 9e9fff22a..9870a367b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,36 +44,36 @@ - 5.0.0-rc.2.20473.3 - 5.0.0-rc.2.20473.3 - 5.0.0-rc.2.20473.3 - 5.0.0-rc.2.20473.3 - 5.0.0-rc.2.20473.3 - 5.0.0-rc.2.20473.3 - 5.0.0-rc.2.20473.3 + 5.0.0-rc.2.20473.11 + 5.0.0-rc.2.20473.11 + 5.0.0-rc.2.20473.11 + 5.0.0-rc.2.20473.11 + 5.0.0-rc.2.20473.11 + 5.0.0-rc.2.20473.11 + 5.0.0-rc.2.20473.11 0.2.0 - 5.0.100-rc.2.20473.17 - 5.0.100-rc.2.20473.17 + 5.0.100-rc.2.20473.19 + 5.0.100-rc.2.20473.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.2.20473.5 + 5.0.0-rc.2.20473.9 - 5.0.0-rc.2.20473.5 - 5.0.0-rc.2.20473.5 - 5.0.0-rc.2.20473.5 - 5.0.0-rc.2.20473.5 - 5.0.0-rc.2.20473.5 + 5.0.0-rc.2.20473.9 + 5.0.0-rc.2.20473.9 + 5.0.0-rc.2.20473.9 + 5.0.0-rc.2.20473.9 + 5.0.0-rc.2.20473.9 2.1.0 From 7cab8834d846b0b274a08f8ccbbd7d25fec6f806 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 08:46:45 +0000 Subject: [PATCH 132/134] Update dependencies from https://github.com/dotnet/sdk build 20200924.1 (#8703) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.2.20473.11 to 5.0.0-rc.2.20473.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rc.2.20473.11 to 5.0.0-rc.2.20473.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.2.20473.11 to 5.0.0-rc.2.20473.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.2.20473.11 to 5.0.0-rc.2.20473.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.2.20473.11 to 5.0.0-rc.2.20473.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.2.20473.11 to 5.0.0-rc.2.20473.12 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.2.20473.11 to 5.0.0-rc.2.20473.12 (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 f40b0a84a..f6349a21f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,33 +43,33 @@ https://github.com/dotnet/runtime 467647115ce628504762ee3555d4439ae2da6582 - + https://github.com/dotnet/aspnetcore - 1564ca328c7f81c44426179cf1de1b270ff6c067 + 82fea485edc9654cdd2ceac914399657d006c8b9 - + https://github.com/dotnet/aspnetcore - 1564ca328c7f81c44426179cf1de1b270ff6c067 + 82fea485edc9654cdd2ceac914399657d006c8b9 - + https://github.com/dotnet/aspnetcore - 1564ca328c7f81c44426179cf1de1b270ff6c067 + 82fea485edc9654cdd2ceac914399657d006c8b9 - + https://github.com/dotnet/aspnetcore - 1564ca328c7f81c44426179cf1de1b270ff6c067 + 82fea485edc9654cdd2ceac914399657d006c8b9 - + https://github.com/dotnet/aspnetcore - 1564ca328c7f81c44426179cf1de1b270ff6c067 + 82fea485edc9654cdd2ceac914399657d006c8b9 - + https://github.com/dotnet/aspnetcore - 1564ca328c7f81c44426179cf1de1b270ff6c067 + 82fea485edc9654cdd2ceac914399657d006c8b9 - + https://github.com/dotnet/aspnetcore - 1564ca328c7f81c44426179cf1de1b270ff6c067 + 82fea485edc9654cdd2ceac914399657d006c8b9 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 9d732f6cfcc9d5eab00b0bbc9e43c2a35371bbe2 + e3061d040125f2e3aeb669d4e853c0f3caab9cc0 - + https://github.com/dotnet/sdk - 9d732f6cfcc9d5eab00b0bbc9e43c2a35371bbe2 + e3061d040125f2e3aeb669d4e853c0f3caab9cc0 diff --git a/eng/Versions.props b/eng/Versions.props index 9870a367b..12ff8627f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,21 +44,21 @@ - 5.0.0-rc.2.20473.11 - 5.0.0-rc.2.20473.11 - 5.0.0-rc.2.20473.11 - 5.0.0-rc.2.20473.11 - 5.0.0-rc.2.20473.11 - 5.0.0-rc.2.20473.11 - 5.0.0-rc.2.20473.11 + 5.0.0-rc.2.20473.12 + 5.0.0-rc.2.20473.12 + 5.0.0-rc.2.20473.12 + 5.0.0-rc.2.20473.12 + 5.0.0-rc.2.20473.12 + 5.0.0-rc.2.20473.12 + 5.0.0-rc.2.20473.12 0.2.0 - 5.0.100-rc.2.20473.19 - 5.0.100-rc.2.20473.19 + 5.0.100-rc.2.20474.1 + 5.0.100-rc.2.20474.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b7c3d3169e45e46f669c1631143956ac1462c18a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 14:53:46 +0000 Subject: [PATCH 133/134] Update dependencies from https://github.com/dotnet/sdk build 20200924.2 (#8706) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.2.20473.2 to 5.0.0-rc.2.20473.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.2.20473.2 to 5.0.0-rc.2.20473.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.2.20473.2 to 5.0.0-rc.2.20473.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.2.20473.2 to 5.0.0-rc.2.20473.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.2.20473.2 to 5.0.0-rc.2.20473.5 (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 f6349a21f..5272e5b7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - a671214d30e163930bb6256e3b5bb7b373f31913 + c71e13f80b7e7c62d81dde989c206df42c5924e2 - + https://github.com/dotnet/windowsdesktop - a671214d30e163930bb6256e3b5bb7b373f31913 + c71e13f80b7e7c62d81dde989c206df42c5924e2 - + https://github.com/dotnet/windowsdesktop - a671214d30e163930bb6256e3b5bb7b373f31913 + c71e13f80b7e7c62d81dde989c206df42c5924e2 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - e3061d040125f2e3aeb669d4e853c0f3caab9cc0 + 24062015c16a5359815a3509502a85ff50fb122a - + https://github.com/dotnet/sdk - e3061d040125f2e3aeb669d4e853c0f3caab9cc0 + 24062015c16a5359815a3509502a85ff50fb122a - + https://github.com/dotnet/winforms - 415a15212dcf8f43fe2b6e01526696843d678ff9 + 9d2bbfc661d724bd33869203dc5453910f1bf944 - + https://github.com/dotnet/wpf - e45821fbb277c36684c7d34adc55c7c4e3a7b8c8 + ff605be0f60b590c657e2bc6ad84a5442ce7ca5b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 12ff8627f..81fd6480c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 5.0.0-rc.2.20473.2 + 5.0.0-rc.2.20473.7 - 5.0.0-rc.2.20473.2 + 5.0.0-rc.2.20473.5 @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20474.1 - 5.0.100-rc.2.20474.1 + 5.0.100-rc.2.20474.2 + 5.0.100-rc.2.20474.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 5.0.0-rc.2.20473.2 - 5.0.0-rc.2.20473.2 - 5.0.0-rc.2.20473.2 + 5.0.0-rc.2.20473.6 + 5.0.0-rc.2.20473.6 + 5.0.0-rc.2.20473.6 From 578f19ea9fa84af5eb34ec3076c216c2c025b708 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2020 20:00:28 +0000 Subject: [PATCH 134/134] [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk (#8708) [release/5.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20468.2 to 11.0.0-beta.20471.4 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200921-02 to 16.8.0-release-20200924-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 3.8.0-4.20473.2 to 3.8.0-4.20474.4 (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 5272e5b7e..7ff38de08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 545ef30a75ffd18beaba07430bc04c6991ddfdda - + https://github.com/dotnet/sdk - 24062015c16a5359815a3509502a85ff50fb122a + 0551cfeeadee9779fe94b2da6c74871af938d35a - + https://github.com/dotnet/sdk - 24062015c16a5359815a3509502a85ff50fb122a + 0551cfeeadee9779fe94b2da6c74871af938d35a @@ -100,22 +100,22 @@ https://github.com/dotnet/wpf ff605be0f60b590c657e2bc6ad84a5442ce7ca5b - + https://github.com/dotnet/fsharp - 79c593286e626311e84c8f7882eea796912854c3 + 53e58f4b5814540bf037567a8b01f777066b4961 - + https://github.com/microsoft/vstest - 70a599d905c8033982e34dfb3b00290bf9df1961 + 2418d9ec492e93245e1ce8699d6ae9cd7b86649b https://github.com/mono/linker 6d26f7ac409c5723bca669385e65582e69b4da75 linker - + https://github.com/dotnet/roslyn - 30a778a41d233968fee0d4d097f5b65e5caeb831 + cec38d8c307bb51596c35b6517f45607d8ea9cc8 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 81fd6480c..026111ca7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 5.0.100-rc.2.20474.2 - 5.0.100-rc.2.20474.2 + 5.0.100-rc.2.20474.10 + 5.0.100-rc.2.20474.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -130,7 +130,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.8.0-release-20200921-02 + 16.8.0-release-20200924-01