From 0f9b59684cb0796d4e57fe0921d52ea19c5551ac Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 25 Jul 2022 13:22:39 +0000 Subject: [PATCH 01/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220725.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.400-rtm.22375.3 Dependency coherency updates Microsoft.Build From Version 17.3.0 -> To Version 17.3.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index b7ec3e5c7..4d97ff5b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -22,6 +22,8 @@ + + @@ -48,6 +50,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e71e8c28..9f51ec116 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e + 247888ccd4eaf2128b14d2c3c94d33839058ecec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 533f5a20a40174a9fa9c3fd9c0bf954e9ebd132e + 247888ccd4eaf2128b14d2c3c94d33839058ecec @@ -148,7 +148,7 @@ https://github.com/dotnet/msbuild - 92e0776509a23ed2c1e24bf906a92f045899b885 + f67e3d35edb936d1b2d4a00f74be446f5c4ba495 diff --git a/eng/Versions.props b/eng/Versions.props index 88e7e5977..6a9436af1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-rtm.22368.21 - 6.0.400-rtm.22368.21 + 6.0.400-rtm.22375.3 + 6.0.400-rtm.22375.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a64bc66e6ced51b0cda62babb6c51fc39f049d49 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 2 Aug 2022 23:04:03 +0000 Subject: [PATCH 02/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220802.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22402.24 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4d97ff5b3..e720e55fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -16,12 +17,17 @@ + + + + + @@ -42,16 +48,22 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f51ec116..4670ee2a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 247888ccd4eaf2128b14d2c3c94d33839058ecec + bc76ee097e5ba4e00fa9d50d4a6c8282f2424ce4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 247888ccd4eaf2128b14d2c3c94d33839058ecec + bc76ee097e5ba4e00fa9d50d4a6c8282f2424ce4 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 7a75fd34f53bc300206bd8cfc636527934dd17af - + https://github.com/dotnet/fsharp - 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 + 80858f017d7121a4d3f6c1228cc05b063dfe8082 - + https://github.com/dotnet/fsharp - 1b94f89d4d1f41f20f9be73c76f4b229d4e49078 + 80858f017d7121a4d3f6c1228cc05b063dfe8082 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - dd078d4e43fca042188bafc4548e6fe2abb62250 + 41ae77386c335929113f61d6f51f2663d2780443 diff --git a/eng/Versions.props b/eng/Versions.props index 6a9436af1..9ff4990d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-rtm.22375.3 - 6.0.400-rtm.22375.3 + 6.0.401-servicing.22402.24 + 6.0.401-servicing.22402.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1dc565363fa462def5c116960de9ab0bbc11dfe1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Aug 2022 00:17:33 +0000 Subject: [PATCH 03/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220802.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22402.31 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (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 4670ee2a8..03d20038b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc76ee097e5ba4e00fa9d50d4a6c8282f2424ce4 + f2fdf16017b4b7e0f961c7a90c0f4a2f69172e91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc76ee097e5ba4e00fa9d50d4a6c8282f2424ce4 + f2fdf16017b4b7e0f961c7a90c0f4a2f69172e91 diff --git a/eng/Versions.props b/eng/Versions.props index 9ff4990d8..ba2c870ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22402.24 - 6.0.401-servicing.22402.24 + 6.0.401-servicing.22402.31 + 6.0.401-servicing.22402.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a90a7195fae98b6d5f7cf2ef2ccc4332d384063d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Aug 2022 09:08:08 +0000 Subject: [PATCH 04/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220803.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22403.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (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 03d20038b..de2c5a283 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2fdf16017b4b7e0f961c7a90c0f4a2f69172e91 + a71f9396bd874d39866ab1fcc02b3e03b0f4365e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2fdf16017b4b7e0f961c7a90c0f4a2f69172e91 + a71f9396bd874d39866ab1fcc02b3e03b0f4365e diff --git a/eng/Versions.props b/eng/Versions.props index ba2c870ae..583586caa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22402.31 - 6.0.401-servicing.22402.31 + 6.0.401-servicing.22403.3 + 6.0.401-servicing.22403.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0d8768abc559cf97fa8ccde99476cdd8df8bf2c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 3 Aug 2022 22:48:21 +0000 Subject: [PATCH 05/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220803.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22403.20 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (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 de2c5a283..56c61a4fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a71f9396bd874d39866ab1fcc02b3e03b0f4365e + bfaf027dee691ea79cfc71b942dcc8f2224ca6dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a71f9396bd874d39866ab1fcc02b3e03b0f4365e + bfaf027dee691ea79cfc71b942dcc8f2224ca6dc diff --git a/eng/Versions.props b/eng/Versions.props index 583586caa..544c6fa4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22403.3 - 6.0.401-servicing.22403.3 + 6.0.401-servicing.22403.20 + 6.0.401-servicing.22403.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3e8243f20c411f51bcefa2f6c4d15497a4f8ba37 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 4 Aug 2022 19:12:34 +0000 Subject: [PATCH 06/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220804.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22404.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (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 56c61a4fc..d8809434f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfaf027dee691ea79cfc71b942dcc8f2224ca6dc + d3cac29f251213d85e7f1a228bac3bd5d6376862 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bfaf027dee691ea79cfc71b942dcc8f2224ca6dc + d3cac29f251213d85e7f1a228bac3bd5d6376862 diff --git a/eng/Versions.props b/eng/Versions.props index 544c6fa4d..c732959ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22403.20 - 6.0.401-servicing.22403.20 + 6.0.401-servicing.22404.9 + 6.0.401-servicing.22404.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44ef08cb3d0dcc2323bc3ca253c905d69034fcaa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 5 Aug 2022 20:19:28 +0000 Subject: [PATCH 07/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220805.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22405.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (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 d8809434f..dc0ef9e62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3cac29f251213d85e7f1a228bac3bd5d6376862 + e5f68761ed9e7d0698aa4fa7d870ab7db0612025 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3cac29f251213d85e7f1a228bac3bd5d6376862 + e5f68761ed9e7d0698aa4fa7d870ab7db0612025 diff --git a/eng/Versions.props b/eng/Versions.props index c732959ab..90a30725e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22404.9 - 6.0.401-servicing.22404.9 + 6.0.401-servicing.22405.9 + 6.0.401-servicing.22405.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b40e5505b342e3548f3af1e3c57cdbfdfc7a9468 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 8 Aug 2022 03:02:14 +0000 Subject: [PATCH 08/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220807.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22407.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (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 dc0ef9e62..dae04267b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5f68761ed9e7d0698aa4fa7d870ab7db0612025 + 4c0bf3084642f527f80fdd2631bf8d395ca36b42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5f68761ed9e7d0698aa4fa7d870ab7db0612025 + 4c0bf3084642f527f80fdd2631bf8d395ca36b42 diff --git a/eng/Versions.props b/eng/Versions.props index 90a30725e..485514f08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22405.9 - 6.0.401-servicing.22405.9 + 6.0.401-servicing.22407.5 + 6.0.401-servicing.22407.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e8eb1efc27d2592b58dbeabc6cd9f32923735d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Aug 2022 17:37:40 +0000 Subject: [PATCH 09/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (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 dae04267b..159ff2451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c0bf3084642f527f80fdd2631bf8d395ca36b42 + 555e57592038c7243d11c0c44334cc1ce4af5af1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c0bf3084642f527f80fdd2631bf8d395ca36b42 + 555e57592038c7243d11c0c44334cc1ce4af5af1 @@ -130,7 +130,7 @@ 80858f017d7121a4d3f6c1228cc05b063dfe8082 - + https://github.com/microsoft/vstest c7ba2ca721808f830482ace6be06ae93077e0e7b diff --git a/eng/Versions.props b/eng/Versions.props index 485514f08..507da660a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22407.5 - 6.0.401-servicing.22407.5 + 6.0.401-servicing.22409.10 + 6.0.401-servicing.22409.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-release-20220708-01 + 17.3.0 From c5d3d51a99bb1b31c9f8cb7f710ec252d18564db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Aug 2022 00:01:10 +0000 Subject: [PATCH 10/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.25 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 22 ++-------------------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index e720e55fc..6c42273dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -16,20 +17,10 @@ - - - - - - - - - - @@ -49,22 +40,13 @@ + - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 159ff2451..67863b671 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 555e57592038c7243d11c0c44334cc1ce4af5af1 + 30fdd35bcf10c662e637e72f44b01e51d8e0ee01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 555e57592038c7243d11c0c44334cc1ce4af5af1 + 30fdd35bcf10c662e637e72f44b01e51d8e0ee01 diff --git a/eng/Versions.props b/eng/Versions.props index 507da660a..d1828923e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22409.10 - 6.0.401-servicing.22409.10 + 6.0.401-servicing.22409.25 + 6.0.401-servicing.22409.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7525ef84ba90ad6e8de6114eac9477a96238b195 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Aug 2022 07:18:28 +0000 Subject: [PATCH 11/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.41 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.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 67863b671..6c46504bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 30fdd35bcf10c662e637e72f44b01e51d8e0ee01 + 525e8c102f8712e91b8aa60d0dfdda836083537b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 30fdd35bcf10c662e637e72f44b01e51d8e0ee01 + 525e8c102f8712e91b8aa60d0dfdda836083537b @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 41ae77386c335929113f61d6f51f2663d2780443 + 3afc3513e29bb157c2437ab3564fe0a622fe2ccc diff --git a/eng/Versions.props b/eng/Versions.props index d1828923e..887f43938 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22409.25 - 6.0.401-servicing.22409.25 + 6.0.401-servicing.22409.41 + 6.0.401-servicing.22409.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d2a4b82011f1f271a09251b616136a89414c1915 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Aug 2022 22:21:51 +0000 Subject: [PATCH 12/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220810.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22410.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (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 6c46504bb..f84b1aaa5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 525e8c102f8712e91b8aa60d0dfdda836083537b + 23034d3a8a858fae9697a1b655c4c6c5071a9940 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 525e8c102f8712e91b8aa60d0dfdda836083537b + 23034d3a8a858fae9697a1b655c4c6c5071a9940 diff --git a/eng/Versions.props b/eng/Versions.props index 887f43938..bb9a68f57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22409.41 - 6.0.401-servicing.22409.41 + 6.0.401-servicing.22410.13 + 6.0.401-servicing.22410.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 155edd719b95d9402b5598a68305efc8447d965d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Aug 2022 04:20:25 +0000 Subject: [PATCH 13/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220810.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22410.21 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22410.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f84b1aaa5..e9005b958 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 23034d3a8a858fae9697a1b655c4c6c5071a9940 + 2fa12af19521498400119cb8ba0b6c3f5455c53c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 23034d3a8a858fae9697a1b655c4c6c5071a9940 + 2fa12af19521498400119cb8ba0b6c3f5455c53c @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 7a75fd34f53bc300206bd8cfc636527934dd17af - + https://github.com/dotnet/fsharp - 80858f017d7121a4d3f6c1228cc05b063dfe8082 + d5218142e9d56ab25bb5d0034a77484be4dd7c17 - + https://github.com/dotnet/fsharp - 80858f017d7121a4d3f6c1228cc05b063dfe8082 + d5218142e9d56ab25bb5d0034a77484be4dd7c17 diff --git a/eng/Versions.props b/eng/Versions.props index bb9a68f57..cb8d89544 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22410.13 - 6.0.401-servicing.22410.13 + 6.0.401-servicing.22410.21 + 6.0.401-servicing.22410.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d2ff774735b7219b77c4aae6f9a592e3aef6491 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Aug 2022 08:00:42 +0000 Subject: [PATCH 14/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220810.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22410.25 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22410.1 (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 e9005b958..7faf154fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fa12af19521498400119cb8ba0b6c3f5455c53c + 70739da657f41ba15886961e86940f163b512be8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fa12af19521498400119cb8ba0b6c3f5455c53c + 70739da657f41ba15886961e86940f163b512be8 diff --git a/eng/Versions.props b/eng/Versions.props index cb8d89544..08efbd8be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22410.21 - 6.0.401-servicing.22410.21 + 6.0.401-servicing.22410.25 + 6.0.401-servicing.22410.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c6b2f5764949041912aa7ee1e1bd6a536c05746 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 12 Aug 2022 02:57:48 +0000 Subject: [PATCH 15/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220811.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22411.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22410.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c42273dc..c605aadf2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -39,9 +36,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7faf154fb..98d73769f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70739da657f41ba15886961e86940f163b512be8 + 4fbf4f02cb39f77b5cd73723483fc4f8bd2ee102 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70739da657f41ba15886961e86940f163b512be8 + 4fbf4f02cb39f77b5cd73723483fc4f8bd2ee102 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 3afc3513e29bb157c2437ab3564fe0a622fe2ccc + 7749c2fd98d96e7d69850877111d6a41efabb714 diff --git a/eng/Versions.props b/eng/Versions.props index 08efbd8be..428c22d52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22410.25 - 6.0.401-servicing.22410.25 + 6.0.401-servicing.22411.17 + 6.0.401-servicing.22411.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dbea761dd97c4f4d231ac8b65f58ae3a1283ad1b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 12 Aug 2022 20:36:24 +0000 Subject: [PATCH 16/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220812.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22412.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22410.1 (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 98d73769f..df8e547da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4fbf4f02cb39f77b5cd73723483fc4f8bd2ee102 + 5795d1a9c113121917238ca01069cffcbf0d92c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4fbf4f02cb39f77b5cd73723483fc4f8bd2ee102 + 5795d1a9c113121917238ca01069cffcbf0d92c5 diff --git a/eng/Versions.props b/eng/Versions.props index 428c22d52..86db81d6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22411.17 - 6.0.401-servicing.22411.17 + 6.0.401-servicing.22412.14 + 6.0.401-servicing.22412.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 64d3eb8f661b3faa7fc0dc87a3e50948268d12f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 00:05:04 +0000 Subject: [PATCH 17/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220812.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.14 -> To Version 6.0.401-servicing.22412.29 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22411.3 -> To Version 4.3.0-3.22412.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 70a55d2d1..a852eff8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5795d1a9c113121917238ca01069cffcbf0d92c5 + c9c78ee49c10d7b27bcfa2d1cab364ad133abe98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5795d1a9c113121917238ca01069cffcbf0d92c5 + c9c78ee49c10d7b27bcfa2d1cab364ad133abe98 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 7749c2fd98d96e7d69850877111d6a41efabb714 + c97184bafab9a34d61e85f1c1ef34f25283ce9ba diff --git a/eng/Versions.props b/eng/Versions.props index 44a4185a5..117f0babc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22412.14 - 6.0.401-servicing.22412.14 + 6.0.401-servicing.22412.29 + 6.0.401-servicing.22412.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ba6ba00723487763210b5fc04bbc3196fadaec60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 06:36:42 +0000 Subject: [PATCH 18/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220812.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22412.41 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index c605aadf2..f5ff9f72a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + @@ -41,6 +42,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a852eff8a..1080d6d4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c78ee49c10d7b27bcfa2d1cab364ad133abe98 + c9eb70d0ab5809d89ac68c53f8050ff562a1e539 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c78ee49c10d7b27bcfa2d1cab364ad133abe98 + c9eb70d0ab5809d89ac68c53f8050ff562a1e539 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms bcdb000de284571bf5267aa3d052dee7918c1e6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7a75fd34f53bc300206bd8cfc636527934dd17af + a0940a4217049e37408907ce806b02c46d6fbaea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 117f0babc..f21cb7dfa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.8-servicing.22368.7 + 6.0.9-servicing.22412.11 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22412.29 - 6.0.401-servicing.22412.29 + 6.0.401-servicing.22412.41 + 6.0.401-servicing.22412.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.8-servicing.22368.4 - 6.0.8-servicing.22368.4 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22412.14 + 6.0.9-servicing.22412.14 + 6.0.9 + 6.0.9 From e1e2b736749ec615917be13be5587793fef6f1be Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 17:55:10 +0000 Subject: [PATCH 19/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220813.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22413.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index f5ff9f72a..cdb2f751b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,8 @@ + + @@ -39,6 +41,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1080d6d4a..b16c0eabb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9eb70d0ab5809d89ac68c53f8050ff562a1e539 + 24f26fa27467ff5b596504fb0489f7656d7fe1c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9eb70d0ab5809d89ac68c53f8050ff562a1e539 + 24f26fa27467ff5b596504fb0489f7656d7fe1c2 diff --git a/eng/Versions.props b/eng/Versions.props index f21cb7dfa..48b122cde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22412.41 - 6.0.401-servicing.22412.41 + 6.0.401-servicing.22413.4 + 6.0.401-servicing.22413.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.8-servicing.22363.6 - 6.0.8-servicing.22363.6 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22412.2 + 6.0.9-servicing.22412.2 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 2.1.0 From dc8acba32c7706b8545fd32a0766fb32c5509397 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 07:16:41 +0000 Subject: [PATCH 20/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220814.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22414.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index cdb2f751b..00ac53fcc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b16c0eabb..2d74fe388 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 + 30b3bb5110a42021492c8026f2dd6505636ef935 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1a2d6d3fa1af68bd4cca49ff41811c0075711e17 + 30b3bb5110a42021492c8026f2dd6505636ef935 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24f26fa27467ff5b596504fb0489f7656d7fe1c2 + 0ebf82ce0798a931f65c4c21296d4b632e55fc91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24f26fa27467ff5b596504fb0489f7656d7fe1c2 + 0ebf82ce0798a931f65c4c21296d4b632e55fc91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a0940a4217049e37408907ce806b02c46d6fbaea + 40c4c0c7ea7ef93bf9876838aa895402464a69ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 48b122cde..7e88ab0dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.8-servicing.22368.4 + 6.0.9-servicing.22412.3 - 6.0.9-servicing.22412.11 + 6.0.9-servicing.22412.12 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22413.4 - 6.0.401-servicing.22413.4 + 6.0.401-servicing.22414.5 + 6.0.401-servicing.22414.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22412.14 - 6.0.9-servicing.22412.14 + 6.0.9-servicing.22413.1 + 6.0.9-servicing.22413.1 6.0.9 6.0.9 From 389b9280b5ae4d484fc373a5b78af8d5d1a93944 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 08:17:17 +0000 Subject: [PATCH 21/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22415.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (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 2d74fe388..11475fab8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ebf82ce0798a931f65c4c21296d4b632e55fc91 + 46e77834a7b847579c6f50b132ac2570deaf0616 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ebf82ce0798a931f65c4c21296d4b632e55fc91 + 46e77834a7b847579c6f50b132ac2570deaf0616 diff --git a/eng/Versions.props b/eng/Versions.props index 7e88ab0dc..60b938564 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22414.5 - 6.0.401-servicing.22414.5 + 6.0.401-servicing.22415.2 + 6.0.401-servicing.22415.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0000f7b51543eda9cd6fbfd5fa01e68a1208376e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 18:42:53 +0000 Subject: [PATCH 22/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22415.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00ac53fcc..c618bb6e4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,8 +14,7 @@ - - + @@ -41,8 +40,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11475fab8..21376019a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46e77834a7b847579c6f50b132ac2570deaf0616 + 3543bd0d4f52d89a1981373c20663feef5922736 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 46e77834a7b847579c6f50b132ac2570deaf0616 + 3543bd0d4f52d89a1981373c20663feef5922736 diff --git a/eng/Versions.props b/eng/Versions.props index 60b938564..9f169dc9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.2 - 6.0.401-servicing.22415.2 + 6.0.401-servicing.22415.5 + 6.0.401-servicing.22415.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22412.2 - 6.0.9-servicing.22412.2 + 6.0.9-servicing.22413.8 + 6.0.9-servicing.22413.8 6.0.9 6.0.9 6.0.9 From 3aeea109503ae50b5f217994ec90737f3ccad6f6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 19:46:39 +0000 Subject: [PATCH 23/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22412.29 -> To Version 6.0.401-servicing.22415.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++++ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index c618bb6e4..5e7a6aab0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -17,6 +18,7 @@ + @@ -38,10 +40,12 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21376019a..b1a8ae6bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bb5ba57f877b922b418138a969b82b3c1b4e40ad + a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3543bd0d4f52d89a1981373c20663feef5922736 + 0588b782eb99e01f9dff6058a25d86bf397af47c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3543bd0d4f52d89a1981373c20663feef5922736 + 0588b782eb99e01f9dff6058a25d86bf397af47c diff --git a/eng/Versions.props b/eng/Versions.props index 9f169dc9c..31f28527a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.400 + 6.0.401 @@ -44,20 +44,20 @@ - 6.0.8 - 6.0.8 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 + 6.0.9 + 6.0.9 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 0.2.0 - 6.0.401-servicing.22415.5 - 6.0.401-servicing.22415.5 + 6.0.401-servicing.22415.9 + 6.0.401-servicing.22415.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400 + 6.0.401 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From c0c8ef424ce48d5ce63577c32c57c5f69b075679 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 20:57:49 +0000 Subject: [PATCH 24/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22415.9 -> To Version 6.0.401-servicing.22415.16 Dependency coherency updates Microsoft.Build From Version 17.3.0 -> To Version 17.3.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e7a6aab0..a242b20b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 943f534b7..e1044f420 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0588b782eb99e01f9dff6058a25d86bf397af47c + ec7f5f3ba4877fd5e4c6d6c26beeb1c72164c467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0588b782eb99e01f9dff6058a25d86bf397af47c + ec7f5f3ba4877fd5e4c6d6c26beeb1c72164c467 @@ -146,9 +146,9 @@ c97184bafab9a34d61e85f1c1ef34f25283ce9ba - + https://github.com/dotnet/msbuild - f67e3d35edb936d1b2d4a00f74be446f5c4ba495 + 2badb37d109910fbd3155cf8743224b7a27494d8 diff --git a/eng/Versions.props b/eng/Versions.props index d988bcb75..841da1ec1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.9 - 6.0.401-servicing.22415.9 + 6.0.401-servicing.22415.16 + 6.0.401-servicing.22415.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f5c2aabb1aeae44b7d45e6b757f4fbe06fc9b467 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 22:16:28 +0000 Subject: [PATCH 25/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22415.16 -> To Version 6.0.401-servicing.22415.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a242b20b7..2bc1ffe75 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1044f420..8f1de58f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + b6525b6e5a7c03977c5a32714c69bc140faa7e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + b6525b6e5a7c03977c5a32714c69bc140faa7e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + b6525b6e5a7c03977c5a32714c69bc140faa7e8e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + b6525b6e5a7c03977c5a32714c69bc140faa7e8e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec7f5f3ba4877fd5e4c6d6c26beeb1c72164c467 + c08f831341a15bc9b4d5c33f95e86d8617e3538c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec7f5f3ba4877fd5e4c6d6c26beeb1c72164c467 + c08f831341a15bc9b4d5c33f95e86d8617e3538c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb + 70ab481a2ed42f7766251c73066d47148e902d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 40c4c0c7ea7ef93bf9876838aa895402464a69ea + 25d1762cda6d0b2b8e29ea08a3bed65e29e8ae04 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 841da1ec1..e53c0faed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22412.3 + 6.0.9-servicing.22412.5 - 6.0.9-servicing.22412.12 + 6.0.9-servicing.22415.2 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.16 - 6.0.401-servicing.22415.16 + 6.0.401-servicing.22415.19 + 6.0.401-servicing.22415.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22413.1 - 6.0.9-servicing.22413.1 + 6.0.9-servicing.22415.4 + 6.0.9-servicing.22415.4 6.0.9 6.0.9 From 0844cbac035fb2854f9df42493f33f56e6a8e134 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 23:13:59 +0000 Subject: [PATCH 26/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220815.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22415.16 -> To Version 6.0.401-servicing.22415.26 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (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 8f1de58f5..b5d180866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c08f831341a15bc9b4d5c33f95e86d8617e3538c + 9f57ed592a54ea5d8e1b942e84e3accb60eea4e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c08f831341a15bc9b4d5c33f95e86d8617e3538c + 9f57ed592a54ea5d8e1b942e84e3accb60eea4e4 diff --git a/eng/Versions.props b/eng/Versions.props index e53c0faed..754d5e409 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.19 - 6.0.401-servicing.22415.19 + 6.0.401-servicing.22415.26 + 6.0.401-servicing.22415.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a79f67ace3fe49a3dd2433b8daab7a8e5a33c3d9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 11:11:29 +0000 Subject: [PATCH 27/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22415.26 -> To Version 6.0.401-servicing.22416.6 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22412.4 -> To Version 4.3.0-3.22415.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 b5d180866..1ad152ccc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f57ed592a54ea5d8e1b942e84e3accb60eea4e4 + 548c5a3219ee76f082ffc717dfc63546151816b9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f57ed592a54ea5d8e1b942e84e3accb60eea4e4 + 548c5a3219ee76f082ffc717dfc63546151816b9 @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - c97184bafab9a34d61e85f1c1ef34f25283ce9ba + 8301d4840fa1a3e822c2cb17fdf7056fa6b41583 diff --git a/eng/Versions.props b/eng/Versions.props index 754d5e409..1b05b692e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22415.26 - 6.0.401-servicing.22415.26 + 6.0.401-servicing.22416.6 + 6.0.401-servicing.22416.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9518fe3af0e566458623af1308b7da81ac01e5a1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 21:04:56 +0000 Subject: [PATCH 28/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.6 -> To Version 6.0.401-servicing.22416.14 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bc1ffe75..68a00048f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ad152ccc..8de59dca7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a01c5a400b9d2802de06d85444835ec280534d82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 548c5a3219ee76f082ffc717dfc63546151816b9 + ffcd4da78edf263c16308e54e8c91dffd29f1d24 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 548c5a3219ee76f082ffc717dfc63546151816b9 + ffcd4da78edf263c16308e54e8c91dffd29f1d24 diff --git a/eng/Versions.props b/eng/Versions.props index 1b05b692e..2a1ba09f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 + 6.0.9-servicing.22416.1 0.2.0 - 6.0.401-servicing.22416.6 - 6.0.401-servicing.22416.6 + 6.0.401-servicing.22416.14 + 6.0.401-servicing.22416.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f4d4bc37aab342b18f3a36f7cab7bee5827a402 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 22:14:30 +0000 Subject: [PATCH 29/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.6 -> To Version 6.0.401-servicing.22416.15 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.9-servicing.22413.8 -> To Version 6.0.9-servicing.22415.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 68a00048f..1532c5e31 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,10 @@ - + - + @@ -43,9 +43,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8de59dca7..c8882bbc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop b6525b6e5a7c03977c5a32714c69bc140faa7e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + b114055b16ac8213ce47891aae7de2f7ccda93ab @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a01c5a400b9d2802de06d85444835ec280534d82 + 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a01c5a400b9d2802de06d85444835ec280534d82 + 6998c930209fc5adcce334f2cd5931fb7a4d649f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a01c5a400b9d2802de06d85444835ec280534d82 + 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ffcd4da78edf263c16308e54e8c91dffd29f1d24 + 0c6fee16ca0d101edbf5b354b484973f676fdbc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ffcd4da78edf263c16308e54e8c91dffd29f1d24 + 0c6fee16ca0d101edbf5b354b484973f676fdbc7 diff --git a/eng/Versions.props b/eng/Versions.props index 2a1ba09f0..5c0c3c328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22416.14 - 6.0.401-servicing.22416.14 + 6.0.401-servicing.22416.15 + 6.0.401-servicing.22416.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22413.8 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22415.12 + 6.0.9-servicing.22415.12 6.0.9 6.0.9 6.0.9 From 99842d4cc100adde0892d68e3b1424b955a33f62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 23:14:18 +0000 Subject: [PATCH 30/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.15 -> To Version 6.0.401-servicing.22416.22 --- 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 c8882bbc5..6c7303fdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c6fee16ca0d101edbf5b354b484973f676fdbc7 + f524f07a4f755bbe9b50cad934e6036503c46195 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c6fee16ca0d101edbf5b354b484973f676fdbc7 + f524f07a4f755bbe9b50cad934e6036503c46195 diff --git a/eng/Versions.props b/eng/Versions.props index 5c0c3c328..7c6936239 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22416.15 - 6.0.401-servicing.22416.15 + 6.0.401-servicing.22416.22 + 6.0.401-servicing.22416.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c5e1ec90dde3263bed1c7d43439e8f423e19696c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 00:17:54 +0000 Subject: [PATCH 31/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.15 -> To Version 6.0.401-servicing.22416.30 --- 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 6c7303fdc..da9823be3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f524f07a4f755bbe9b50cad934e6036503c46195 + 66dec49b894a7c90bff07379c5ffcc1078efe100 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f524f07a4f755bbe9b50cad934e6036503c46195 + 66dec49b894a7c90bff07379c5ffcc1078efe100 diff --git a/eng/Versions.props b/eng/Versions.props index 7c6936239..a648d7a5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22416.22 - 6.0.401-servicing.22416.22 + 6.0.401-servicing.22416.30 + 6.0.401-servicing.22416.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5be219aaa77cce427e4204ed7d2f4b1f3de504d9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 17:37:49 +0000 Subject: [PATCH 32/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.11 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver From Version 6.0.9-servicing.22415.12 -> To Version 6.0.9-servicing.22416.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1532c5e31..ce7604cf1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da9823be3..3b7a80f93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop b6525b6e5a7c03977c5a32714c69bc140faa7e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66dec49b894a7c90bff07379c5ffcc1078efe100 + c65c0fe91bbb4833bbebc0bd07a6d9a85033233b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66dec49b894a7c90bff07379c5ffcc1078efe100 + c65c0fe91bbb4833bbebc0bd07a6d9a85033233b diff --git a/eng/Versions.props b/eng/Versions.props index a648d7a5f..b8fb7c373 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22416.30 - 6.0.401-servicing.22416.30 + 6.0.401-servicing.22417.11 + 6.0.401-servicing.22417.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22415.12 - 6.0.9-servicing.22415.12 + 6.0.9-servicing.22416.9 + 6.0.9-servicing.22416.9 6.0.9 6.0.9 6.0.9 From 1a7ffaaa4c5c585abf9768eff3cf3d4dd15ba995 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 19:14:40 +0000 Subject: [PATCH 33/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce7604cf1..9ae6e6b22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b7a80f93..f324774be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b6525b6e5a7c03977c5a32714c69bc140faa7e8e + edefa501d7d9bd9208eb15de3d028e689a427dce - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b6525b6e5a7c03977c5a32714c69bc140faa7e8e + edefa501d7d9bd9208eb15de3d028e689a427dce - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b6525b6e5a7c03977c5a32714c69bc140faa7e8e + edefa501d7d9bd9208eb15de3d028e689a427dce https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b6525b6e5a7c03977c5a32714c69bc140faa7e8e + edefa501d7d9bd9208eb15de3d028e689a427dce https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c65c0fe91bbb4833bbebc0bd07a6d9a85033233b + c41f2c550636c63e3232e84ebb2a4db71202be98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c65c0fe91bbb4833bbebc0bd07a6d9a85033233b + c41f2c550636c63e3232e84ebb2a4db71202be98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 70ab481a2ed42f7766251c73066d47148e902d5e + 491c3f44dc132435722e1b1efe55da8b11be1b28 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 25d1762cda6d0b2b8e29ea08a3bed65e29e8ae04 + 6a23a1d9f93fe4b6de8683ceebd699f68c841e2a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b8fb7c373..c3e6b88f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22412.5 + 6.0.9-servicing.22416.1 - 6.0.9-servicing.22415.2 + 6.0.9-servicing.22416.8 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.11 - 6.0.401-servicing.22417.11 + 6.0.401-servicing.22417.13 + 6.0.401-servicing.22417.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22415.4 - 6.0.9-servicing.22415.4 + 6.0.9-servicing.22416.10 + 6.0.9-servicing.22416.10 6.0.9 6.0.9 From 6e464725db07de96af01c5a0cea77a5ccf818fbe Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:51:28 -0400 Subject: [PATCH 34/63] Update ManualVersions.props for upcoming Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ .../targets/GenerateBundledVersions.targets | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index efb09817f..7707ace1a 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.26 - 10.0.18362.26 - 10.0.19041.26 - 10.0.20348.26 - 10.0.22000.26 - 10.0.22621.26 + 10.0.17763.27 + 10.0.18362.27 + 10.0.19041.27 + 10.0.20348.27 + 10.0.22000.27 + 10.0.22621.27 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e8948ec0b..45d27f020 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -675,11 +675,18 @@ Copyright (c) .NET Foundation. All rights reserved. - - - - - + + + + + + + + + + + + From 5360f4cf1a4ad3b9db95ab4b51d3de42a8815541 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 22:02:52 +0000 Subject: [PATCH 35/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ae6e6b22..10bd367f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f324774be..dd9deff77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6998c930209fc5adcce334f2cd5931fb7a4d649f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c41f2c550636c63e3232e84ebb2a4db71202be98 + 687a73809e097009f580bb7c2ffada11330cd366 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c41f2c550636c63e3232e84ebb2a4db71202be98 + 687a73809e097009f580bb7c2ffada11330cd366 diff --git a/eng/Versions.props b/eng/Versions.props index c3e6b88f1..e7a0a82c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 - 6.0.9-servicing.22416.1 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 0.2.0 - 6.0.401-servicing.22417.13 - 6.0.401-servicing.22417.13 + 6.0.401-servicing.22417.27 + 6.0.401-servicing.22417.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7bd702fbe52607dac3a9bea1b52624e2eb0cdf63 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 23:03:05 +0000 Subject: [PATCH 36/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.32 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 10bd367f6..354037b95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd9deff77..bb79a13fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6998c930209fc5adcce334f2cd5931fb7a4d649f + bcbd2e9b360a268f6dccc561da736e08032d58c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6998c930209fc5adcce334f2cd5931fb7a4d649f + bcbd2e9b360a268f6dccc561da736e08032d58c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6998c930209fc5adcce334f2cd5931fb7a4d649f + bcbd2e9b360a268f6dccc561da736e08032d58c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 687a73809e097009f580bb7c2ffada11330cd366 + 38dae725d01eb7c447b164c28225d80918cf26ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 687a73809e097009f580bb7c2ffada11330cd366 + 38dae725d01eb7c447b164c28225d80918cf26ae diff --git a/eng/Versions.props b/eng/Versions.props index e7a0a82c4..3553845cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.27 - 6.0.401-servicing.22417.27 + 6.0.401-servicing.22417.32 + 6.0.401-servicing.22417.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9d3f9c9bfa1bce717712aaa5dd2e7cc557daf7db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 05:36:39 +0000 Subject: [PATCH 37/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.45 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 354037b95..4a6876363 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb79a13fd..0d2bbf7fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bcbd2e9b360a268f6dccc561da736e08032d58c7 + 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bcbd2e9b360a268f6dccc561da736e08032d58c7 + 346710a5b64152b6c28e9f7a44cf2ff9162916aa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bcbd2e9b360a268f6dccc561da736e08032d58c7 + 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38dae725d01eb7c447b164c28225d80918cf26ae + 83df2bf05d92e9e80162d74d6058ea361eea9672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38dae725d01eb7c447b164c28225d80918cf26ae + 83df2bf05d92e9e80162d74d6058ea361eea9672 diff --git a/eng/Versions.props b/eng/Versions.props index 3553845cd..b2671867d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.32 - 6.0.401-servicing.22417.32 + 6.0.401-servicing.22417.45 + 6.0.401-servicing.22417.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48d0a3928516768c2ed8affa79c23269a4aa53f6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 06:39:36 +0000 Subject: [PATCH 38/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22417.48 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (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 0d2bbf7fa..abce23389 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83df2bf05d92e9e80162d74d6058ea361eea9672 + c88d7d9a996738295b12c2cd09f1384926b2dbe2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83df2bf05d92e9e80162d74d6058ea361eea9672 + c88d7d9a996738295b12c2cd09f1384926b2dbe2 diff --git a/eng/Versions.props b/eng/Versions.props index b2671867d..b91400b46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.45 - 6.0.401-servicing.22417.45 + 6.0.401-servicing.22417.48 + 6.0.401-servicing.22417.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26e07307a94324564f1932e1376a642d1b70a15b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 09:43:20 +0000 Subject: [PATCH 39/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22416.30 -> To Version 6.0.401-servicing.22419.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (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 abce23389..1a92896ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c88d7d9a996738295b12c2cd09f1384926b2dbe2 + 41ba136a5aed02df450a9ccea2918c809cf84a7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c88d7d9a996738295b12c2cd09f1384926b2dbe2 + 41ba136a5aed02df450a9ccea2918c809cf84a7c diff --git a/eng/Versions.props b/eng/Versions.props index b91400b46..fc7df88dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22417.48 - 6.0.401-servicing.22417.48 + 6.0.401-servicing.22419.5 + 6.0.401-servicing.22419.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be22bc7844e7369b680836891f53ed08525c0b2c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 17 Aug 2022 00:28:54 +0000 Subject: [PATCH 40/63] Updated TestsToSkipPortableLinux.xml to add a similar test that failed for a similar reason. Likely related to ulimit --- test/SdkTests/TestsToSkipPortableLinux.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index d0ea16a8d..f9fe2c166 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -3,5 +3,9 @@ + + From f01ad81fdd4ffc3ce410ba2f00e510c430001653 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 19:41:50 +0000 Subject: [PATCH 41/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.5 -> To Version 6.0.401-servicing.22419.14 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a6876363..d6af126ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f649eb3ee..9226b8ca2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + d7028999dec2febc64a5dd51af7f778a2fa2ba82 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41ba136a5aed02df450a9ccea2918c809cf84a7c + 52425efdfaa32850a49dca447424a148f51b9090 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41ba136a5aed02df450a9ccea2918c809cf84a7c + 52425efdfaa32850a49dca447424a148f51b9090 diff --git a/eng/Versions.props b/eng/Versions.props index fc7df88dc..463cfbfbc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 + 6.0.9-servicing.22418.24 + 6.0.9-servicing.22418.24 + 6.0.9-servicing.22418.24 + 6.0.9-servicing.22418.24 0.2.0 - 6.0.401-servicing.22419.5 - 6.0.401-servicing.22419.5 + 6.0.401-servicing.22419.14 + 6.0.401-servicing.22419.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 304bf1e408b97d4672f9c47c6afdeaa201a188aa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 20:44:32 +0000 Subject: [PATCH 42/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.5 -> To Version 6.0.401-servicing.22419.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index d6af126ea..4125dd15b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9226b8ca2..1cc5e0194 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edefa501d7d9bd9208eb15de3d028e689a427dce + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edefa501d7d9bd9208eb15de3d028e689a427dce + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edefa501d7d9bd9208eb15de3d028e689a427dce + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - edefa501d7d9bd9208eb15de3d028e689a427dce + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52425efdfaa32850a49dca447424a148f51b9090 + e827623fcb0612646c9effae6da0f0951d75334f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52425efdfaa32850a49dca447424a148f51b9090 + e827623fcb0612646c9effae6da0f0951d75334f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 491c3f44dc132435722e1b1efe55da8b11be1b28 + 5d275019237fbf9f4bf5d867f779c616ec264718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6a23a1d9f93fe4b6de8683ceebd699f68c841e2a + c5b159a97f5af3c690d6515f35241c04c16b2b80 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 463cfbfbc..bff5a89bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22416.1 + 6.0.9-servicing.22417.1 - 6.0.9-servicing.22416.8 + 6.0.9-servicing.22417.4 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22419.14 - 6.0.401-servicing.22419.14 + 6.0.401-servicing.22419.20 + 6.0.401-servicing.22419.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22416.10 - 6.0.9-servicing.22416.10 + 6.0.9-servicing.22417.4 + 6.0.9-servicing.22417.4 6.0.9 6.0.9 From 0b307dfabd77cd7e2af29ce35e1655081ae5dbdf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Aug 2022 06:53:55 +0000 Subject: [PATCH 43/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.20 -> To Version 6.0.401-servicing.22419.38 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver From Version 6.0.9-servicing.22416.9 -> To Version 6.0.9-servicing.22419.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4125dd15b..1930fe818 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cc5e0194..1090d776a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e827623fcb0612646c9effae6da0f0951d75334f + 5cc1488af94975607dc606204289c98ad541822b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e827623fcb0612646c9effae6da0f0951d75334f + 5cc1488af94975607dc606204289c98ad541822b diff --git a/eng/Versions.props b/eng/Versions.props index bff5a89bf..4c8991084 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22419.20 - 6.0.401-servicing.22419.20 + 6.0.401-servicing.22419.38 + 6.0.401-servicing.22419.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22416.9 - 6.0.9-servicing.22416.9 + 6.0.9-servicing.22419.5 + 6.0.9-servicing.22419.5 6.0.9 6.0.9 6.0.9 From a246dcf711b441a7f30c59475cb69f9bc607d304 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Aug 2022 07:49:26 +0000 Subject: [PATCH 44/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.20 -> To Version 6.0.401-servicing.22419.41 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.9-servicing.22416.9 -> To Version 6.0.9-servicing.22419.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1930fe818..b079642f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1090d776a..97e50fe1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d7028999dec2febc64a5dd51af7f778a2fa2ba82 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 346710a5b64152b6c28e9f7a44cf2ff9162916aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5cc1488af94975607dc606204289c98ad541822b + 17c8d8e868c025f01fe3557f5bc75f24ca45bfbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5cc1488af94975607dc606204289c98ad541822b + 17c8d8e868c025f01fe3557f5bc75f24ca45bfbb diff --git a/eng/Versions.props b/eng/Versions.props index 4c8991084..ef2091198 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22418.24 - 6.0.9-servicing.22418.24 - 6.0.9-servicing.22418.24 - 6.0.9-servicing.22418.24 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 0.2.0 - 6.0.401-servicing.22419.38 - 6.0.401-servicing.22419.38 + 6.0.401-servicing.22419.41 + 6.0.401-servicing.22419.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 63dd000cddc73328b8a1cee6a58b18f2d44e4edf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Aug 2022 06:49:06 +0000 Subject: [PATCH 45/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220820.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.41 -> To Version 6.0.401-servicing.22420.11 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.401 -> To Version 6.0.401 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b079642f2..4a5b3e74d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97e50fe1f..8d07aa368 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 346710a5b64152b6c28e9f7a44cf2ff9162916aa + 62e67411619cc3cf284e993ce2c2da3e16c69ff0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 346710a5b64152b6c28e9f7a44cf2ff9162916aa + 62e67411619cc3cf284e993ce2c2da3e16c69ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 346710a5b64152b6c28e9f7a44cf2ff9162916aa + 62e67411619cc3cf284e993ce2c2da3e16c69ff0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17c8d8e868c025f01fe3557f5bc75f24ca45bfbb + 0bfffee8f673daab0d11a0202e97ddc5d542ec39 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17c8d8e868c025f01fe3557f5bc75f24ca45bfbb + 0bfffee8f673daab0d11a0202e97ddc5d542ec39 diff --git a/eng/Versions.props b/eng/Versions.props index ef2091198..3364af816 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22419.41 - 6.0.401-servicing.22419.41 + 6.0.401-servicing.22420.11 + 6.0.401-servicing.22420.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b9dc4295d06967a416de81278018603b63c09bf3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Aug 2022 07:48:17 +0000 Subject: [PATCH 46/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220820.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.41 -> To Version 6.0.401-servicing.22420.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a5b3e74d..141417d34 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d07aa368..7c572a940 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 62e67411619cc3cf284e993ce2c2da3e16c69ff0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfffee8f673daab0d11a0202e97ddc5d542ec39 + ed5baa44710ee9337df44cfd8044e5513dba77ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfffee8f673daab0d11a0202e97ddc5d542ec39 + ed5baa44710ee9337df44cfd8044e5513dba77ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5d275019237fbf9f4bf5d867f779c616ec264718 + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c5b159a97f5af3c690d6515f35241c04c16b2b80 + a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3364af816..6ff3ec4ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22417.1 + 6.0.9-servicing.22419.10 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22420.4 @@ -56,8 +56,8 @@ - 6.0.401-servicing.22420.11 - 6.0.401-servicing.22420.11 + 6.0.401-servicing.22420.14 + 6.0.401-servicing.22420.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.9-servicing.22417.4 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22420.3 + 6.0.9-servicing.22420.3 6.0.9 6.0.9 From 1474578b5d34ea044b2ce536375203bbfa00c0aa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Aug 2022 17:06:53 +0000 Subject: [PATCH 47/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220821.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.401-servicing.22419.41 -> To Version 6.0.401-servicing.22421.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 141417d34..1cd04a927 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c572a940..d5c2ce963 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 62e67411619cc3cf284e993ce2c2da3e16c69ff0 + 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 62e67411619cc3cf284e993ce2c2da3e16c69ff0 + 4ac7f473472dd810f75a183a760c16990c78fe34 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 62e67411619cc3cf284e993ce2c2da3e16c69ff0 + 4ac7f473472dd810f75a183a760c16990c78fe34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed5baa44710ee9337df44cfd8044e5513dba77ef + 18485c488a5469beb10ad61263885275f2d3b170 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed5baa44710ee9337df44cfd8044e5513dba77ef + 18485c488a5469beb10ad61263885275f2d3b170 diff --git a/eng/Versions.props b/eng/Versions.props index 6ff3ec4ab..3423f9240 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.401-servicing.22420.14 - 6.0.401-servicing.22420.14 + 6.0.401-servicing.22421.5 + 6.0.401-servicing.22421.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7b5f9d3a3955684c660edf8119b63e55727a8963 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Sep 2022 12:48:05 +0000 Subject: [PATCH 48/63] Update dependencies from https://github.com/dotnet/test-templates build 20220905.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.0.2-beta4.22451.1 -> To Version 1.0.2-beta4.22455.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 187ba3aa6..6311055d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,17 +90,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - cd8f3b66281574d2e879c33114d1b76ced3afe96 + 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/test-templates - cd8f3b66281574d2e879c33114d1b76ced3afe96 + 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/test-templates - cd8f3b66281574d2e879c33114d1b76ced3afe96 + 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc diff --git a/eng/Versions.props b/eng/Versions.props index 5fd5fdaae..b1b91f487 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,9 +39,9 @@ 1.0.2-beta4.22406.1 - 1.0.2-beta4.22451.1 - 1.0.2-beta4.22451.1 - 1.0.2-beta4.22451.1 + 1.0.2-beta4.22455.1 + 1.0.2-beta4.22455.1 + 1.0.2-beta4.22455.1 From 97aa46b7d2cf2d52ced9cbb3644e643e27e3576d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Sep 2022 10:31:38 -0700 Subject: [PATCH 49/63] Update branding to 6.0.305 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1558013b..319168073 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b1ee7db7b0397deed473ddd25ab42855daae086a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Sep 2022 10:31:43 -0700 Subject: [PATCH 50/63] Update branding to 6.0.402 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f50b8c44..345614c44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From ba6337a5d0fb5403d843ec261c803048ceaec336 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 01:58:16 +0000 Subject: [PATCH 51/63] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14412) * Update dependencies from https://github.com/dotnet/sdk build 20220828.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22428.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22426.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220828.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22428.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22426.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220829.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22429.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220829.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22429.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220829.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22429.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220829.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22429.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220829.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22429.22 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220830.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22430.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220830.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22430.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220830.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22430.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220830.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22430.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220830.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22430.23 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220830.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22430.25 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22429.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220830.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22430.29 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22430.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22430.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22430.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22430.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22430.4 (parent: Microsoft.NET.Sdk * Bump the emscripten manifest names and versions * Update dependencies from https://github.com/dotnet/sdk build 20220831.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.22 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220831.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22431.34 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220901.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22451.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.2 (parent: Microsoft.NET.Sdk * Update the bundled manifests * Don't use multiple globs in Exclude * Update to .NET MAUI 7 RC 1 baseline manifests (#14368) * Update to .NET MAUI 7 RC 1 baseline manifests These are the latest set of .NET 7 RC 1 builds that we have available right now. The versions of the final builds will be nearly the same, except the commit distance will be higher. After `.\build.cmd -pack -publish`, manually tested the workloads: > $env:DOTNET_MULTILEVEL_LOOKUP=0 > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update Installing pack Microsoft.Android.Sdk.Windows version 33.0.0-rc.1.136... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install ios --skip-manifest-update Writing workload pack installation record for Microsoft.iOS.Sdk version 15.4.1006-rc.1... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install macos --skip-manifest-update Installing pack Microsoft.macOS.Sdk version 12.3.1006-rc.1... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maccatalyst --skip-manifest-update Installing pack Microsoft.MacCatalyst.Sdk version 15.4.1006-rc.1... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install tvos --skip-manifest-update Installing pack Microsoft.tvOS.Sdk version 15.4.1006-rc.1... ... > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --skip-manifest-update Installing pack Microsoft.Maui.Core.Ref.android version 7.0.0-rc.1.6430... * Introduce $(MauiFeatureBand) This should solve the error: src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj(0,0): error NU1102: (NETCORE_ENGINEERING_TELEMETRY=Build) Unable to find package Microsoft.NET.Sdk.iOS.Manifest-6.0.300 with version (= 15.4.1006-rc.1) Co-authored-by: Larry Ewing * Update Versions.props fix version * Add BufferedReporter.WriteLine(string format, params object?[] args) implmentation * add #nullable enable * Update dependencies from https://github.com/dotnet/sdk build 20220901.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22451.28 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220901.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22451.32 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220902.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22452.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220902.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22452.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Bump emsdk to latest * Update dependencies from https://github.com/dotnet/sdk build 20220902.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22452.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220902.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22452.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220904.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22454.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220904.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22454.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220904.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22454.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220905.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22455.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220905.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22455.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220905.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22455.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220905.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22455.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220906.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22456.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220906.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22456.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflicts * Update dependencies from https://github.com/dotnet/sdk build 20220906.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22426.31 -> To Version 7.0.100-rc.2.22456.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22426.1 -> To Version 7.0.0-rc.2.22431.6 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: Larry Ewing Co-authored-by: Jonathan Peppers Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 136 +++++++++--------- eng/Versions.props | 66 ++++----- .../Arcade/tools/TextOnlyPackages.csproj | 18 +-- .../0001-Update-System.Memory-to-4.5.5.patch | 25 ---- ....Build.Traversal-version-we-have-a-r.patch | 24 ---- .../0002-Update-for-new-MSBuild-warning.patch | 24 ---- ...ilt-assets-during-source-build-for-r.patch | 2 +- ...CA1420.patch => 0001-Disable-CA1420.patch} | 0 ...-Look-for-VSTest-in-net7.0-directory.patch | 23 +++ src/redist/targets/BundledManifests.targets | 21 +-- .../BufferedReporter.cs | 4 + 11 files changed, 153 insertions(+), 190 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/fsharp/0001-Update-System.Memory-to-4.5.5.patch delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch delete mode 100644 src/SourceBuild/tarball/patches/llvm-project/0002-Update-for-new-MSBuild-warning.patch rename src/SourceBuild/tarball/patches/sdk/{0002-Disable-CA1420.patch => 0001-Disable-CA1420.patch} (100%) create mode 100644 src/SourceBuild/tarball/patches/sdk/0002-Look-for-VSTest-in-net7.0-directory.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6311055d0..ced8ba92c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - 46326d53fa4b0503bad23be24bd815c6b8a21e08 + 9c70886ce692eb31afed39239ff5921abab65798 - + https://github.com/dotnet/windowsdesktop - 46326d53fa4b0503bad23be24bd815c6b8a21e08 + 9c70886ce692eb31afed39239ff5921abab65798 - + https://github.com/dotnet/windowsdesktop - 46326d53fa4b0503bad23be24bd815c6b8a21e08 + 9c70886ce692eb31afed39239ff5921abab65798 - + https://github.com/dotnet/windowsdesktop - 46326d53fa4b0503bad23be24bd815c6b8a21e08 + 9c70886ce692eb31afed39239ff5921abab65798 - + https://github.com/dotnet/llvm-project - e73d65f0f80655b463162bd41a8365377ba6565d + c1304304028d603e34f6803b0740c34441f80d2e - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 6d10e4c8bcd9f96ccd73748ff827561afa09af57 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ef077d0b58ffddcf54fa73bd85dace6b999b8992 + 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/dotnet/aspnetcore - 5eff673ad892e09e6e27d94158e3695d83a61fdd + 59a0a28436a4a8785302e71d40ac7fd58890a967 - + https://github.com/dotnet/aspnetcore - 5eff673ad892e09e6e27d94158e3695d83a61fdd + 59a0a28436a4a8785302e71d40ac7fd58890a967 - + https://github.com/dotnet/aspnetcore - 5eff673ad892e09e6e27d94158e3695d83a61fdd + 59a0a28436a4a8785302e71d40ac7fd58890a967 - + https://github.com/dotnet/aspnetcore - 5eff673ad892e09e6e27d94158e3695d83a61fdd + 59a0a28436a4a8785302e71d40ac7fd58890a967 - + https://github.com/dotnet/aspnetcore - 5eff673ad892e09e6e27d94158e3695d83a61fdd + 59a0a28436a4a8785302e71d40ac7fd58890a967 - + https://github.com/dotnet/aspnetcore - 5eff673ad892e09e6e27d94158e3695d83a61fdd + 59a0a28436a4a8785302e71d40ac7fd58890a967 - + https://github.com/dotnet/aspnetcore - 5eff673ad892e09e6e27d94158e3695d83a61fdd + 59a0a28436a4a8785302e71d40ac7fd58890a967 https://github.com/dotnet/test-templates @@ -103,74 +103,78 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 09083d87809007e99d0b49fe77371abfdfd692d6 + a8e9c118bd0a2f797ac799cb293b091204694e34 - + https://github.com/dotnet/sdk - 09083d87809007e99d0b49fe77371abfdfd692d6 + a8e9c118bd0a2f797ac799cb293b091204694e34 - + https://github.com/dotnet/sdk - 09083d87809007e99d0b49fe77371abfdfd692d6 + a8e9c118bd0a2f797ac799cb293b091204694e34 - + https://github.com/dotnet/sdk - 09083d87809007e99d0b49fe77371abfdfd692d6 + a8e9c118bd0a2f797ac799cb293b091204694e34 - + https://github.com/dotnet/winforms - daa8568529ecbd6302d7130bc27669ff8fcb6430 + 8eae0a9764548296263b8d7de19115cd7f9834c2 - + https://github.com/dotnet/wpf - d2c8f1b16f9d5e0e056ceb72f7c4641e0205f13b + 0d7c37b9e225939c41da228ec38a229e5862532c - + https://github.com/dotnet/fsharp - 4e67cca0eff2507bcc1e5c63ea10834949b92a8a + 753fc58b631d7a5f7f0b085d4a3adb3b4d47c7e6 - + https://github.com/dotnet/fsharp - 4e67cca0eff2507bcc1e5c63ea10834949b92a8a + 753fc58b631d7a5f7f0b085d4a3adb3b4d47c7e6 - + https://github.com/microsoft/vstest - ef0aa102e9c7d5cf55af06c2747d11e07d12b69a + 713a8cdc0cebcbd0dbdff4bcd039ac2d51504452 - + https://github.com/dotnet/linker - 313671b195b1b36d56a8888a9a0e12edaac52c57 + 5f9bfd94d9c687207872ae03f751ea19704381c0 linker - + https://github.com/dotnet/roslyn - 5b4dc7134d51a1010616d1f4cb15590a8a911218 + 22ead106f53cd07c583dca42c68e2d41bddc71d9 - + https://github.com/dotnet/msbuild - 5d102ae37163fc1f22610bb433c3ab9a2fff91f0 + 2db11c256ade886f673ed56d12780fb70e6ef92e - + https://github.com/nuget/nuget.client - 745617ea6fc239737c80abb424e13faca4249bf1 + b396ad8b56c089ec3fa189f1013530d237a0e8c2 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 216093204c415b6e37dfadfcbcf183881b443636 + f0b0035bb362fd964d1c2e53d7ba8e973f660b09 + + + https://github.com/dotnet/emsdk + f0b0035bb362fd964d1c2e53d7ba8e973f660b09 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index b1b91f487..e6702ccc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-rc.2.22425.10 + 7.0.0-rc.2.22431.4 - 7.0.0-rc.2.22425.10 + 7.0.0-rc.2.22431.4 @@ -49,46 +49,46 @@ - 7.0.0-rc.2.22426.4 - 7.0.0-rc.2.22426.4 - 7.0.0-rc.2.22426.4 - 7.0.0-rc.2.22426.4 - 7.0.0-rc.2.22426.4 - 7.0.0-rc.2.22426.4 - 7.0.0-rc.2.22426.4 + 7.0.0-rc.2.22452.11 + 7.0.0-rc.2.22452.11 + 7.0.0-rc.2.22452.11 + 7.0.0-rc.2.22452.11 + 7.0.0-rc.2.22452.11 + 7.0.0-rc.2.22452.11 + 7.0.0-rc.2.22452.11 0.2.0 - 7.0.100-rc.2.22426.31 - 7.0.100-rc.2.22426.31 - 7.0.100-rc.2.22426.31 + 7.0.100-rc.2.22456.13 + 7.0.100-rc.2.22456.13 + 7.0.100-rc.2.22456.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.1.22422.12 + 7.0.0-rc.2.22451.11 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 - 7.0.0-rc.1.22422.12 + 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22451.11 2.1.0 - 7.0.0-rc.2.22426.1 - 7.0.0-rc.2.22426.1 - 7.0.0-rc.2.22426.1 - 7.0.0-rc.2.22426.1 + 7.0.0-rc.2.22431.6 + 7.0.0-rc.2.22431.6 + 7.0.0-rc.2.22431.6 + 7.0.0-rc.2.22431.6 @@ -170,7 +170,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220813-01 + 17.4.0-preview-20220905-03 @@ -197,15 +197,17 @@ - 6.0.312 - 32.0.301 - 15.4.303 - 15.4.303 - 12.3.303 - 15.4.303 + 7.0.100-rc.1 + 7.0.0-rc.1.6430 + 33.0.0-rc.1.136 + 15.4.1006-rc.1 + 15.4.1006-rc.1 + 12.3.1006-rc.1 + 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.1.22411.1 - $(MicrosoftNETWorkloadEmscriptenManifest70100Version) + 7.0.0-rc.2.22451.4 + 7.0.0-rc.2.22451.4 + $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index f99075302..067fcdc25 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -11,14 +11,16 @@ should be added to source-build-reference-packages. --> - - - - - - - - + + + + + + + + + + - -+ AdditionalProperties="%(ProjectReference.AdditionalProperties);FileVersion=$(FileVersion)" /> - - - diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index feaf36b71..d1ae9b05d 100644 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -219,7 +219,7 @@ index fe90e93ca..01b64e055 100644 +++ b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj @@ -3,6 +3,7 @@ Exe - net6.0 + net7.0 true + true diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Disable-CA1420.patch b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch similarity index 100% rename from src/SourceBuild/tarball/patches/sdk/0002-Disable-CA1420.patch rename to src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-VSTest-in-net7.0-directory.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-VSTest-in-net7.0-directory.patch new file mode 100644 index 000000000..98a60451a --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-VSTest-in-net7.0-directory.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Tue, 6 Sep 2022 15:50:53 -0700 +Subject: [PATCH] Look for VSTest in net7.0 directory + +Backport: https://github.com/dotnet/sdk/pull/27716 +--- + src/Layout/redist/targets/GenerateLayout.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets +index 85adb4ed8a..148464df9e 100644 +--- a/src/Layout/redist/targets/GenerateLayout.targets ++++ b/src/Layout/redist/targets/GenerateLayout.targets +@@ -161,7 +161,7 @@ + BeforeTargets="Build"> + + netcoreapp3.1 +- net6.0 ++ net7.0 + $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ + + diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 503354311..6c42909d8 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,13 +1,15 @@ - - - - - - - - + + + + + + + + + + @@ -53,8 +55,7 @@ + Exclude="Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7" /> diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/BufferedReporter.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/BufferedReporter.cs index d4c865b08..e657e324c 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/BufferedReporter.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/BufferedReporter.cs @@ -1,3 +1,5 @@ +#nullable enable + using System; using System.Collections.Generic; using Microsoft.DotNet.Cli.Utils; @@ -8,6 +10,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { public List Lines { get; private set; } = new List(); + public void WriteLine(string format, params object?[] args) => WriteLine(string.Format(format, args)); + public void WriteLine(string message) { Lines.Add(message); From 5ef2909fe8e350177534087e253322821082e701 Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Wed, 7 Sep 2022 07:31:15 -0700 Subject: [PATCH 52/63] Add additional supported RIDs to ILCompiler package --- src/redist/targets/GenerateBundledVersions.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index cac2a23e1..26ad54b28 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -249,7 +249,8 @@ - + + From 5b138901abdfe8f971b6df0f0593e0dc84b96879 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 7 Sep 2022 16:04:49 -0700 Subject: [PATCH 53/63] Remove direct dependency on diagnostics repo (#14465) --- eng/Version.Details.xml | 5 -- ...t.Extensions.Logging-version-so-that.patch | 68 ------------------- 2 files changed, 73 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ced8ba92c..05f91a68a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,11 +181,6 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/diagnostics - ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1 - - https://github.com/dotnet/source-build-externals e53b62ccc6a887987efdb820334594b674f6071d diff --git a/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch b/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch deleted file mode 100644 index df105b15d..000000000 --- a/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Thu, 2 Jun 2022 19:27:41 +0000 -Subject: [PATCH] Pin the Microsoft.Extensions.Logging version so that - source-build does not pick up latest - -Backport: https://github.com/dotnet/diagnostics/pull/3121 ---- - eng/Versions.props | 2 +- - .../Microsoft.Diagnostics.Monitoring.EventPipe.csproj | 2 +- - .../Microsoft.Diagnostics.NETCore.Client.csproj | 2 +- - src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj | 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index b4edc421..17c6f9d3 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -48,7 +48,7 @@ - 2.0.250401 - 16.9.0-beta1.21055.5 - 2.0.64 -- 2.1.1 -+ 2.1.1 - - 5.0.1 - 2.0.0-beta1.20468.1 -diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj -index 733d18da..db90173d 100644 ---- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj -+++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj -@@ -29,7 +29,7 @@ - - - -- -+ - - - -diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -index 929f82d0..5cb2d582 100644 ---- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -+++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -@@ -20,7 +20,7 @@ - - - -- -+ - - - -diff --git a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj -index 73fd6f82..3afa7132 100644 ---- a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj -+++ b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj -@@ -22,8 +22,8 @@ - - - -- -- -+ -+ - - - From 0945d9566aac9229770201f50f5370288d9d450c Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 8 Sep 2022 14:23:06 -0500 Subject: [PATCH 54/63] Add support for using --with-packages with smoke-tests. (#14387) * Add support for using --with-packages with smoke-tests. * Use a better variable name for custom packages directory. * Swap conditions so we don't have to delete the archive directory. Fixes https://github.com/dotnet/source-build/issues/2900. * Update src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs Co-authored-by: Michael Simons * Address review feedback. Co-authored-by: Michael Simons --- src/SourceBuild/tarball/content/build.proj | 1 + src/SourceBuild/tarball/content/build.sh | 29 ++++++++++++------- .../Config.cs | 2 ++ .../DotNetHelper.cs | 18 ++++++++++++ .../assets/local.NuGet.Config | 1 + 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 7164fb0e8..731e5665e 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -107,6 +107,7 @@ SMOKE_TESTS_SDK_TARBALL_PATH=$(SdkTarballPath); SMOKE_TESTS_TARGET_RID=$(TargetRid); SMOKE_TESTS_PORTABLE_RID=$(PortableRid); + SMOKE_TESTS_CUSTOM_PACKAGES_PATH=$(CustomSourceBuiltPackagesPath); $(CustomTestEnvVars)" /> diff --git a/src/SourceBuild/tarball/content/build.sh b/src/SourceBuild/tarball/content/build.sh index 86dddeaa1..0d6bbb91e 100755 --- a/src/SourceBuild/tarball/content/build.sh +++ b/src/SourceBuild/tarball/content/build.sh @@ -19,8 +19,9 @@ SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" MSBUILD_ARGUMENTS=("/flp:v=detailed") CUSTOM_REF_PACKAGES_DIR='' -CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR='' +CUSTOM_PACKAGES_DIR='' alternateTarget=false +runningSmokeTests=false CUSTOM_SDK_DIR='' while :; do @@ -41,15 +42,15 @@ while :; do ;; --run-smoke-test) alternateTarget=true + runningSmokeTests=true MSBUILD_ARGUMENTS+=( "/t:RunSmokeTest" ) ;; --with-packages) - CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR="$(cd -P "$2" && pwd)" - if [ ! -d "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" ]; then - echo "Custom prviously built packages directory '$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR' does not exist" + CUSTOM_PACKAGES_DIR="$(cd -P "$2" && pwd)" + if [ ! -d "$CUSTOM_PACKAGES_DIR" ]; then + echo "Custom prviously built packages directory '$CUSTOM_PACKAGES_DIR' does not exist" exit 1 fi - MSBUILD_ARGUMENTS+=( "/p:CustomPrebuiltSourceBuiltPackagesPath=$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" ) shift ;; --with-sdk) @@ -82,13 +83,21 @@ while :; do shift done +if [ "$CUSTOM_PACKAGES_DIR" != "" ]; then + if [ "$runningSmokeTests" == "true" ]; then + MSBUILD_ARGUMENTS+=( "/p:CustomSourceBuiltPackagesPath=$CUSTOM_PACKAGES_DIR" ) + else + MSBUILD_ARGUMENTS+=( "/p:CustomPrebuiltSourceBuiltPackagesPath=$CUSTOM_PACKAGES_DIR" ) + fi +fi + if [ -f "$SCRIPT_ROOT/packages/archive/archiveArtifacts.txt" ]; then ARCHIVE_ERROR=0 if [ ! -d "$SCRIPT_ROOT/.dotnet" ] && [ "$CUSTOM_SDK_DIR" == "" ]; then echo "ERROR: SDK not found at $SCRIPT_ROOT/.dotnet" ARCHIVE_ERROR=1 fi - if [ ! -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts*.tar.gz ] && [ "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR" == "" ]; then + if [ ! -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts*.tar.gz ] && [ "$CUSTOM_PACKAGES_DIR" == "" ]; then echo "ERROR: Private.SourceBuilt.Artifacts artifact not found at $SCRIPT_ROOT/packages/archive/ - Either run prep.sh or pass --with-packages parameter" ARCHIVE_ERROR=1 fi @@ -120,7 +129,9 @@ fi packageVersionsPath='' restoredPackagesDir="$SCRIPT_ROOT/packages/restored" -if [ -d "$SCRIPT_ROOT/packages/archive" ]; then +if [[ "$CUSTOM_PACKAGES_DIR" != "" && -f "$CUSTOM_PACKAGES_DIR/PackageVersions.props" ]]; then + packageVersionsPath="$CUSTOM_PACKAGES_DIR/PackageVersions.props" +elif [ -d "$SCRIPT_ROOT/packages/archive" ]; then sourceBuiltArchive=`find $SCRIPT_ROOT/packages/archive -maxdepth 1 -name 'Private.SourceBuilt.Artifacts*.tar.gz'` if [ -f "$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props" ]; then packageVersionsPath=$SCRIPT_ROOT/packages/previously-source-built/PackageVersions.props @@ -128,14 +139,12 @@ if [ -d "$SCRIPT_ROOT/packages/archive" ]; then tar -xzf "$sourceBuiltArchive" -C /tmp PackageVersions.props packageVersionsPath=/tmp/PackageVersions.props fi -elif [ -f "$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" ]; then - packageVersionsPath="$CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" fi if [ ! -f "$packageVersionsPath" ]; then echo "Cannot find PackagesVersions.props. Debugging info:" echo " Attempted archive path: $SCRIPT_ROOT/packages/archive" - echo " Attempted custom PVP path: $CUSTOM_PREVIOUSLY_BUILT_PACKAGES_DIR/PackageVersions.props" + echo " Attempted custom PVP path: $CUSTOM_PACKAGES_DIR/PackageVersions.props" exit 1 fi diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index fc077fb19..b2ed5661f 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -15,6 +15,7 @@ internal static class Config public const string PoisonReportPathEnv = "SMOKE_TESTS_POISON_REPORT_PATH"; public const string PortableRidEnv = "SMOKE_TESTS_PORTABLE_RID"; public const string PrereqsPathEnv = "SMOKE_TESTS_PREREQS_PATH"; + public const string CustomPackagesPathEnv = "SMOKE_TESTS_CUSTOM_PACKAGES_PATH"; public const string SdkTarballPathEnv = "SMOKE_TESTS_SDK_TARBALL_PATH"; public const string TargetRidEnv = "SMOKE_TESTS_TARGET_RID"; public const string WarnPoisonDiffsEnv = "SMOKE_TESTS_WARN_POISON_DIFFS"; @@ -27,6 +28,7 @@ internal static class Config public static string PortableRid { get; } = Environment.GetEnvironmentVariable(PortableRidEnv) ?? throw new InvalidOperationException($"'{Config.PortableRidEnv}' must be specified"); public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv); + public static string? CustomPackagesPath { get; } = Environment.GetEnvironmentVariable(CustomPackagesPathEnv); public static string? SdkTarballPath { get; } = Environment.GetEnvironmentVariable(SdkTarballPathEnv); public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ?? throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified"); diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index a9361453e..ae5508aa4 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics; using System.IO; +using System.Linq; using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -66,6 +67,8 @@ internal class DotNetHelper if (useLocalPackages) { + // When using local packages this feed is always required. It contains packages that are + // not produced by source-build but are required by the various project templates. if (!Directory.Exists(Config.PrereqsPath)) { throw new InvalidOperationException( @@ -74,6 +77,21 @@ internal class DotNetHelper string nugetConfig = File.ReadAllText(nugetConfigPath); nugetConfig = nugetConfig.Replace("SMOKE_TEST_PACKAGE_FEED", Config.PrereqsPath); + + // This package feed is optional. You can use an additional feed of source-built packages to run the + // smoke-tests as offline as possible. + if (Config.CustomPackagesPath != null) + { + if (!Directory.Exists(Config.CustomPackagesPath)) + { + throw new ArgumentException($"Specified --with-packages {Config.CustomPackagesPath} does not exist."); + } + nugetConfig = nugetConfig.Replace("CUSTOM_PACKAGE_FEED", Config.CustomPackagesPath); + } + else + { + nugetConfig = string.Join(Environment.NewLine, nugetConfig.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).Where(s => !s.Contains("CUSTOM_PACKAGE_FEED")).ToArray()); + } File.WriteAllText(nugetConfigPath, nugetConfig); } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config index 78195779b..feac553a9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config @@ -3,5 +3,6 @@ + From b409362aaf5182da9c4c0c32163fae2ac5937b25 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 31 Aug 2022 16:27:22 -0700 Subject: [PATCH 55/63] Merge pull request #14423 from dotnet/marcpopMSFT-implicitversion Update implicit versions for the September release --- .../targets/GenerateBundledVersions.targets | 4 +- test/SdkTests/TestConfig.xml | 165 ++++++++++++++++++ 2 files changed, 167 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 26ad54b28..23b445934 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -61,9 +61,9 @@ 30 - 28 + 29 17 - 8 + 9 diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 7f25ca27a..17376f7d9 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -145,5 +145,170 @@ Skip="true" Issue="" Reason="https://github.com/dotnet/installer/pull/8966#issuecomment-721111308"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4b7b6fd34fdb2be3068d051e320c677577dc82a2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 8 Sep 2022 15:24:27 -0700 Subject: [PATCH 56/63] Update bundled versions for October release. --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 23b445934..eacbf4a96 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -61,9 +61,9 @@ 30 - 29 + 30 17 - 9 + 10 From eaac63b9d78aeffcbbdd76891c5080d05da4f9bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 09:14:15 -0500 Subject: [PATCH 57/63] Update dependencies from https://github.com/dotnet/arcade build 20220908.5 (#14468) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22418.4 -> To Version 7.0.0-beta.22458.5 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 4.4.0-3.22431.2 -> To Version 4.4.0-3.22430.19 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 32 +++++++-------- eng/Versions.props | 6 +-- eng/common/cross/arm/sources.list.focal | 11 +++++ eng/common/cross/arm/sources.list.jammy | 11 +++++ eng/common/cross/arm64/sources.list.focal | 11 +++++ eng/common/cross/arm64/sources.list.jammy | 11 +++++ eng/common/cross/build-rootfs.sh | 41 +++++++++++-------- eng/common/generate-locproject.ps1 | 4 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-build.yml | 4 +- .../templates/job/source-index-stage1.yml | 4 +- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- .../templates/post-build/post-build.yml | 8 ++-- global.json | 6 +-- 16 files changed, 103 insertions(+), 54 deletions(-) create mode 100644 eng/common/cross/arm/sources.list.focal create mode 100644 eng/common/cross/arm/sources.list.jammy create mode 100644 eng/common/cross/arm64/sources.list.focal create mode 100644 eng/common/cross/arm64/sources.list.jammy diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05f91a68a..aa211913d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 22ead106f53cd07c583dca42c68e2d41bddc71d9 + c5d3485aaab167b5b8d19ae8c317c7cf1693a08a @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - f0b0035bb362fd964d1c2e53d7ba8e973f660b09 + 8d8d2122b16c81df4b158fe43995f958e8fe115e - + https://github.com/dotnet/emsdk - f0b0035bb362fd964d1c2e53d7ba8e973f660b09 + 8d8d2122b16c81df4b158fe43995f958e8fe115e https://github.com/dotnet/deployment-tools @@ -193,32 +193,32 @@ - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 622c2dc5ced5df5af002a3b06a52f9584b726b28 - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 622c2dc5ced5df5af002a3b06a52f9584b726b28 - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 622c2dc5ced5df5af002a3b06a52f9584b726b28 https://github.com/dotnet/source-build-reference-packages ddc5b4880b0bf18783fc6808c4d407214f7bdae1 - + https://github.com/dotnet/sourcelink - 42bee1e7ae672add1a19e8f5a74499c15e497b07 + e57efa1ed395dd6975b33052719facb24f03ee0b - + https://github.com/dotnet/xliff-tasks - 47a504cdc72993370f057a11c2a39a7faa3111ad + 740189d758fb3bbdc118c5b6171ef1a7351a8c44 diff --git a/eng/Versions.props b/eng/Versions.props index e6702ccc3..1c5965e76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22418.4 + 7.0.0-beta.22458.5 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.2.22451.4 - 7.0.0-rc.2.22451.4 + 7.0.0-rc.2.22430.5 + 7.0.0-rc.2.22430.5 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/eng/common/cross/arm/sources.list.focal b/eng/common/cross/arm/sources.list.focal new file mode 100644 index 000000000..4de2600c1 --- /dev/null +++ b/eng/common/cross/arm/sources.list.focal @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.jammy b/eng/common/cross/arm/sources.list.jammy new file mode 100644 index 000000000..6bb045302 --- /dev/null +++ b/eng/common/cross/arm/sources.list.jammy @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.focal b/eng/common/cross/arm64/sources.list.focal new file mode 100644 index 000000000..4de2600c1 --- /dev/null +++ b/eng/common/cross/arm64/sources.list.focal @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.jammy b/eng/common/cross/arm64/sources.list.jammy new file mode 100644 index 000000000..6bb045302 --- /dev/null +++ b/eng/common/cross/arm64/sources.list.jammy @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 032f5f193..5680980fa 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -186,32 +186,27 @@ while :; do __UbuntuArch=i386 __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; - lldb3.6) - __LLDB_Package="lldb-3.6-dev" - ;; - lldb3.8) - __LLDB_Package="lldb-3.8-dev" - ;; - lldb3.9) - __LLDB_Package="liblldb-3.9-dev" - ;; - lldb4.0) - __LLDB_Package="liblldb-4.0-dev" - ;; - lldb5.0) - __LLDB_Package="liblldb-5.0-dev" - ;; - lldb6.0) - __LLDB_Package="liblldb-6.0-dev" + lldb*) + version="${lowerI/lldb/}" + parts=(${version//./ }) + + # for versions > 6.0, lldb has dropped the minor version + if [[ "${parts[0]}" -gt 6 ]]; then + version="${parts[0]}" + fi + + __LLDB_Package="liblldb-${version}-dev" ;; no-lldb) unset __LLDB_Package ;; llvm*) - version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + version="${lowerI/llvm/}" parts=(${version//./ }) __LLVM_MajorVersion="${parts[0]}" __LLVM_MinorVersion="${parts[1]}" + + # for versions > 6.0, llvm has dropped the minor version if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then __LLVM_MinorVersion=0; fi @@ -231,6 +226,16 @@ while :; do __CodeName=bionic fi ;; + focal) # Ubuntu 20.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=focal + fi + ;; + jammy) # Ubuntu 22.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=jammy + fi + ;; jessie) # Debian 8 __CodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 846e7950c..bab18543d 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -62,7 +62,7 @@ $locJson = @{ $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) + if ($_.FullName.Contains($exclusion)) { $continue = $false } @@ -98,7 +98,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) + if ($_.FullName.Contains($exclusion)) { $continue = $false } diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a6..aaeb83b4d 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 6c523b714..6b8fc9970 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -40,7 +40,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 variables: diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a6..b6137f44a 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 21fd12276..59a42c338 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -28,10 +28,10 @@ jobs: ${{ if eq(parameters.pool, '') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 64e5929f2..297e7946b 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -95,7 +95,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 87fcae940..957375c1c 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -106,7 +106,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -143,7 +143,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -203,7 +203,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -262,7 +262,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index ce1ad10b7..834d82468 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-preview.7.22377.5", + "dotnet": "7.0.100-rc.1.22425.9", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22418.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22458.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22458.5" } } From 0490cee5fe78f4ea946cd7acaa1f3ca555db5a50 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 13 Sep 2022 12:26:52 -0700 Subject: [PATCH 58/63] [release/7.0.1xx] Inbuild sign on (#14471) * In build sign enable * Update arcade --- .vsts-ci.yml | 9 +++++++-- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5a477ec2f..ff04a8a6f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -8,12 +8,17 @@ trigger: - internal/release/3.* - internal/release/5.* - internal/release/6.* + - internal/release/7.* variables: - name: _PublishUsingPipelines value: false -- name: PostBuildSign - value: true +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params diff --git a/NuGet.config b/NuGet.config index d2a6d621d..dbd29f96e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa211913d..727a54e2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 622c2dc5ced5df5af002a3b06a52f9584b726b28 + a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 - + https://github.com/dotnet/arcade - 622c2dc5ced5df5af002a3b06a52f9584b726b28 + a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 - + https://github.com/dotnet/arcade - 622c2dc5ced5df5af002a3b06a52f9584b726b28 + a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 1c5965e76..a55282169 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22458.5 + 7.0.0-beta.22462.6 diff --git a/global.json b/global.json index 834d82468..2735d8bee 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22458.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22458.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22462.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22462.6" } } From 8a0eb58a5a825e10ea2bf06a892dd441355818c8 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 13 Sep 2022 15:55:40 -0500 Subject: [PATCH 59/63] Eliminate 7.0 source-build prebuilts (#14167) * Add runtime patch to fully qualify conflicting runtime and roslyn APIs * Add aspnetcore patch for lifetime scope * Add prebuilt removal patches for fixes that haven't flowed * Use repo name for git-info version number special cases * Delete aspnetcore patches * Update Microsoft.Deployment.DotNet.Releases Versions.Details.xml dependency * Remove backported sdk patch * Add runtime patch to disable analyzers * Add patch to remove app host prebuilt * Add source-build patch for jwt prebuilt * Add patches for command-line-api and msbuild net7.0 TFM * Update aspnetcore patch * Update source-build-externals * Update aspnetcore patch * Add source-build-externals patch * Update SBRP version * Revert tfm patches * Revert "Revert tfm patches" This reverts commit 9cf3f5f6230c0f88e0a9955dbeb545495bc3e855. * Revert msbuild net70 tfm patch * misc updates * Add linker patch * Add linker patch * Add patch for retargeting fsharp * Add patch for retargeting sdk * Resolve patch conflict from latest merge * Remove failing patches * Remove unnecessary patch * Re-add msbuild patch for net7.0 TFM * Revert "Remove failing patches" This reverts commit 9ca3256e9b670d2fc23aeebb785fa8b5c5cca6a4. * Fix fsharp patch * Fix msbuild patch typo * Update fsharp patch * Clean up SDK patch * Resolve patch conflicts from last merge * Fix discrepancy between versions of DotNetDeltaApplier TFM version * Update SDK patch * Fix fsharp patch * Fix msbuild build error * Update nuget-client to net7.0 * Update order of projects in known-good * Fix fsharp xml doc path for net7.0 * Add missing change in msbuild patch * Fix SDK patch * Add runtime patch for targeting net7.0 * Fix runtime-portable build * Add patch for roslyn-analyzers net7.0 TFM * Fix runtime patches * Add patch for targeting net7.0 in roslyn * Fix Microsoft.CSharp.Core.targets location * Update patches * Update roslyn patch * Update prebuilts version * Update roslyn patch again * Add vstest patch for targeting net7.0 * Change minimum supported TFM in runtime * Revert "Add vstest patch for targeting net7.0" This reverts commit 9049c9f585e52194312118ad8e5d15c0d19296b2. * Add patch to update compatibility suppressions in runtime * Use dev/haplois/net67 branch of vstest for validation. PR: https://github.com/microsoft/vstest/pull/3944 * Get rid of 2.0.X prebuilts from xliff * Disable targeting windows in roslyn for source-build * Delete backported runtime patches * Fix xliff patch * Remove backported roslyn patch * Remove backported fsharp patch * Update SDK patch * Remove backported source build patches * Update patches * Remove roslyn patch for net7.0 TFM * Update SDK patch roslyn bits location Co-authored-by: Logan Bussell --- .../tarball/content/repos/known-good.proj | 4 +- ...s-to-net7.0-TFM-with-shared-property.patch | 268 +++++++++++++++ ...001-Change-TargetFramework-to-net7.0.patch | 313 ++++++++++++++++++ ...ref-struct-in-Enumerator-constructor.patch | 31 ++ ...pdate-TFM-to-net7.0-for-source-build.patch | 129 ++++++++ ...Microsoft.CodeAnalysis.Common-depend.patch | 4 +- ...h-out-native-sourcelink-file-check-i.patch | 2 +- ...conflicting-runtime-and-roslyn-APIs.patch} | 4 +- ...Target-net7.0-in-additional-projects.patch | 65 ++++ .../patches/sdk/0001-Disable-CA1420.patch | 4 +- ...002-Change-TargetFramework-to-net7.0.patch | 143 ++++++++ ...-Look-for-VSTest-in-net7.0-directory.patch | 23 -- 12 files changed, 958 insertions(+), 32 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch create mode 100644 src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch create mode 100644 src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0003-Update-TFM-to-net7.0-for-source-build.patch rename src/SourceBuild/tarball/patches/runtime/{0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch => 0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch} (95%) create mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Target-net7.0-in-additional-projects.patch create mode 100644 src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch delete mode 100644 src/SourceBuild/tarball/patches/sdk/0002-Look-for-VSTest-in-net7.0-directory.patch diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 7d907a9f1..937ab8f54 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -35,17 +35,17 @@ + - - + diff --git a/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch b/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch new file mode 100644 index 000000000..d875d0aeb --- /dev/null +++ b/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch @@ -0,0 +1,268 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Tue, 19 Jul 2022 14:47:28 -0700 +Subject: [PATCH] Update projects to net7.0 TFM with shared property, Only enable trimming for .NET Core + +Backport PR: https://github.com/dotnet/command-line-api/pull/1803 +--- + Directory.Build.props | 1 + + global.json | 7 ++++--- + .../System.CommandLine.ApiCompatibility.Tests.csproj | 2 +- + .../System.CommandLine.Benchmarks.csproj | 4 ++-- + .../System.CommandLine.DragonFruit.Tests.csproj | 2 +- + .../System.CommandLine.Generator.Tests.csproj | 2 +- + .../System.CommandLine.Hosting.Tests.csproj | 2 +- + .../System.CommandLine.NamingConventionBinder.Tests.csproj | 2 +- + .../System.CommandLine.Rendering.Tests.csproj | 2 +- + .../EndToEndTestApp/EndToEndTestApp.csproj | 2 +- + .../dotnet-suggest.Tests.csproj | 2 +- + src/System.CommandLine.Suggest/dotnet-suggest.csproj | 2 +- + .../System.CommandLine.Tests.csproj | 2 +- + .../TestApps/NativeAOT/NativeAOT.csproj | 4 ++-- + .../TestApps/Trimming/Trimming.csproj | 4 ++-- + src/System.CommandLine/System.CommandLine.csproj | 7 +++++-- + 16 files changed, 26 insertions(+), 21 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index c0c5f79a..901c57c7 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -9,6 +9,7 @@ + $(NoWarn);CS8714;CS8765;CS8600;CS8601;CS8602;CS8603;CS8604 + MIT + 10.0 ++ net7.0 + + + +diff --git a/global.json b/global.json +index 1c6fd268..f5bec611 100644 +--- a/global.json ++++ b/global.json +@@ -1,12 +1,13 @@ + { + "tools": { +- "dotnet": "6.0.100", ++ "dotnet": "7.0.100-preview.6.22352.1", + "runtimes": { + "dotnet": [ +- "5.0.10" ++ "5.0.17", ++ "6.0.7" + ] + }, +- "xcopy-msbuild": "16.10.0-preview2" ++ "xcopy-msbuild": "17.1.0" + }, + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2" +diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj +index 30bcd139..4cc48fde 100644 +--- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj ++++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ $(TargetFrameworkForNETSDK) + false + + +diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj +index e54aabc4..185ba62a 100644 +--- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj ++++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj +@@ -9,8 +9,8 @@ + false + + +- net461;net5.0;net6.0; +- net5.0;net6.0; ++ net461;net5.0;net6.0;net7.0 ++ net5.0;net6.0;net7.0 + + + False +diff --git a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj +index 7eee0b38..e504f7e8 100644 +--- a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj ++++ b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj +@@ -1,6 +1,6 @@ +  + +- net6.0 ++ $(TargetFrameworkForNETSDK) + AutoGeneratedProgram + + true +diff --git a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj +index a423eb1e..20f0f410 100644 +--- a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj ++++ b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj +@@ -1,6 +1,6 @@ +  + +- net6.0 ++ $(TargetFrameworkForNETSDK) + $(TargetFrameworks);net462 + true + true +diff --git a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj +index 328b4e12..8e2cd6ea 100644 +--- a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj ++++ b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ $(TargetFrameworkForNETSDK) + $(TargetFrameworks);net462 + false + +diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj +index 43eb7c29..7bff1796 100644 +--- a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj ++++ b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj +@@ -1,6 +1,6 @@ +  + +- net6.0 ++ $(TargetFrameworkForNETSDK) + $(TargetFrameworks);net462 + 10 + +diff --git a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj +index 1c116508..afd6dc6a 100644 +--- a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj ++++ b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ $(TargetFrameworkForNETSDK) + false + + +diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj +index 9a3eb54d..76add0d5 100644 +--- a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj ++++ b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj +@@ -6,7 +6,7 @@ + + + Exe +- net6.0 ++ $(TargetFrameworkForNETSDK) + + + +diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj +index da6abedf..f1711a10 100644 +--- a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj ++++ b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ $(TargetFrameworkForNETSDK) + + + +diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj +index fd825008..ce4bda1d 100644 +--- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj ++++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj +@@ -1,7 +1,7 @@ +  + + Exe +- net6.0 ++ $(TargetFrameworkForNETSDK) + true + true + dotnet-suggest +diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj +index c1988ec4..44b5c9fc 100644 +--- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj ++++ b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj +@@ -1,6 +1,6 @@ +  + +- net6.0 ++ $(TargetFrameworkForNETSDK) + $(TargetFrameworks);net462 + false + +diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj +index b0036ed0..cc306fea 100644 +--- a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj ++++ b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj +@@ -2,13 +2,13 @@ + + + Exe +- net6.0 ++ $(TargetFrameworkForNETSDK) + + false + + + +- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll ++ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll + + + +diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj +index 6dcf8892..615b0764 100644 +--- a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj ++++ b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ $(TargetFrameworkForNETSDK) + enable + enable + true +@@ -10,7 +10,7 @@ + + + +- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll ++ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll + + + +diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj +index 424053a6..37115d70 100644 +--- a/src/System.CommandLine/System.CommandLine.csproj ++++ b/src/System.CommandLine/System.CommandLine.csproj +@@ -3,7 +3,7 @@ + + true + System.CommandLine +- net6.0;netstandard2.0 ++ $(TargetFrameworkForNETSDK);netstandard2.0 + enable + true + 10 +@@ -15,9 +15,12 @@ + * Test and debug support + + true ++ true ++ ++ ++ + true + true +- true + + + diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch new file mode 100644 index 000000000..bf87a65d5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch @@ -0,0 +1,313 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ben Villalobos <4691428+BenVillalobos@users.noreply.github.com> +Date: Tue, 5 Jul 2022 16:33:56 -0500 +Subject: [PATCH] Change TargetFramework to net7.0 + +Add nowarn for SYSLIB warnings +Resolve CS8981: lowercase preserved types + +Backport PR: https://github.com/dotnet/msbuild/pull/7790 +--- + Directory.Build.props | 2 +- + eng/BootStrapMSBuild.targets | 2 +- + eng/cibuild_bootstrapped_msbuild.ps1 | 2 +- + eng/cibuild_bootstrapped_msbuild.sh | 2 +- + global.json | 2 +- + scripts/Deploy-MSBuild.ps1 | 2 +- + .../RemoteProjectsProviderMock/CollectionsHelpers.cs | 8 ++++---- + .../Microsoft.Build.Engine.UnitTests.csproj | 4 ++-- + src/Build/Definition/ToolsetReader.cs | 4 ++-- + src/Build/Microsoft.Build.csproj | 2 +- + src/Directory.BeforeCommon.targets | 2 +- + src/Directory.Build.props | 6 +++--- + src/Framework/README.md | 2 +- + src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj | 2 +- + src/Package/Localization/Localization.csproj | 2 +- + src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj | 4 ++-- + src/Tasks/Microsoft.Build.Tasks.csproj | 2 +- + src/Utilities/README.md | 2 +- + 18 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 0df28a5b8..3a959f894 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -38,7 +38,7 @@ + SYSLIB0011: Removing binary formatter will happen as part of a larger .NET-wide effort. + --> + +- $(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011 ++ $(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011;SYSLIB0037;SYSLIB0044 + + + +diff --git a/eng/BootStrapMSBuild.targets b/eng/BootStrapMSBuild.targets +index 288c062da..4ba21444d 100644 +--- a/eng/BootStrapMSBuild.targets ++++ b/eng/BootStrapMSBuild.targets +@@ -210,7 +210,7 @@ + Copy it from "next to MSBuild" in the pre-bootstrap SDK to our little weirdo bootstrap + layout next to the SDK tasks, so it can get loaded by the SDK tasks that need it. --> + ++ DestinationFolder="$(BootstrapDestination)Sdks\Microsoft.NET.Sdk\tools\net7.0" /> + + +diff --git a/eng/cibuild_bootstrapped_msbuild.ps1 b/eng/cibuild_bootstrapped_msbuild.ps1 +index b9c1cf4fe..906a33dc1 100644 +--- a/eng/cibuild_bootstrapped_msbuild.ps1 ++++ b/eng/cibuild_bootstrapped_msbuild.ps1 +@@ -91,7 +91,7 @@ try { + else + { + $buildToolPath = $dotnetExePath +- $buildToolCommand = Join-Path $bootstrapRoot "net6.0\MSBuild\MSBuild.dll" ++ $buildToolCommand = Join-Path $bootstrapRoot "net7.0\MSBuild\MSBuild.dll" + $buildToolFramework = "netcoreapp3.1" + } + +diff --git a/eng/cibuild_bootstrapped_msbuild.sh b/eng/cibuild_bootstrapped_msbuild.sh +index e5425507f..b4404b7e4 100755 +--- a/eng/cibuild_bootstrapped_msbuild.sh ++++ b/eng/cibuild_bootstrapped_msbuild.sh +@@ -63,7 +63,7 @@ bootstrapRoot="$Stage1Dir/bin/bootstrap" + if [ $host_type = "core" ] + then + _InitializeBuildTool="$_InitializeDotNetCli/dotnet" +- _InitializeBuildToolCommand="$bootstrapRoot/net6.0/MSBuild/MSBuild.dll" ++ _InitializeBuildToolCommand="$bootstrapRoot/net7.0/MSBuild/MSBuild.dll" + _InitializeBuildToolFramework="netcoreapp3.1" + elif [ $host_type = "mono" ] + then +diff --git a/global.json b/global.json +index 471f88dbc..efd25efd1 100644 +--- a/global.json ++++ b/global.json +@@ -3,7 +3,7 @@ + "allowPrerelease": true + }, + "tools": { +- "dotnet": "6.0.200", ++ "dotnet": "7.0.100-preview.5.22307.18", + "vs": { + "version": "17.0" + } +diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1 +index ef1959fc3..8cfecb6a0 100644 +--- a/scripts/Deploy-MSBuild.ps1 ++++ b/scripts/Deploy-MSBuild.ps1 +@@ -69,7 +69,7 @@ else { + if ($runtime -eq "Desktop") { + $targetFramework = "net472" + } else { +- $targetFramework = "net6.0" ++ $targetFramework = "net7.0" + } + + $bootstrapBinDirectory = "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework" +diff --git a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs +index b6d935f41..83035cd50 100644 +--- a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs ++++ b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs +@@ -85,13 +85,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting + } + + +- public static IDictionary ImportDictionary(this ProjectCollectionLinker importer, IDictionary source) ++ public static IDictionary ImportDictionary(this ProjectCollectionLinker importer, IDictionary source) + where T : class + where RMock : MockLinkRemoter, new() + { + if (source == null) return null; + // Just copy ... +- Dictionary result = new Dictionary(); ++ Dictionary result = new Dictionary(); + foreach (var sRemoter in source) + { + var value = importer.Import(sRemoter.Value); +@@ -101,13 +101,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting + return result; + } + +- public static IDictionary ExportDictionary(this ProjectCollectionLinker exporter, IDictionary source) ++ public static IDictionary ExportDictionary(this ProjectCollectionLinker exporter, IDictionary source) + where T : class + where RMock : MockLinkRemoter, new() + { + if (source == null) return null; + // Just copy ... +- Dictionary result = new Dictionary(); ++ Dictionary result = new Dictionary(); + foreach (var s in source) + { + var valueRemoter = exporter.Export(s.Value); +diff --git a/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj b/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj +index 8ddca6108..83a4382d8 100644 +--- a/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj ++++ b/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj +@@ -36,14 +36,14 @@ + + TargetFramework=$(FullFrameworkTFM) + TargetFramework=$(FullFrameworkTFM) +- TargetFramework=net6.0 ++ TargetFramework=net7.0 + + + + + TargetFramework=$(FullFrameworkTFM) + TargetFramework=$(FullFrameworkTFM) +- TargetFramework=net6.0 ++ TargetFramework=net7.0 + + + +diff --git a/src/Build/Definition/ToolsetReader.cs b/src/Build/Definition/ToolsetReader.cs +index 8887b9cca..ddb164cb7 100644 +--- a/src/Build/Definition/ToolsetReader.cs ++++ b/src/Build/Definition/ToolsetReader.cs +@@ -12,7 +12,7 @@ using Microsoft.Build.Execution; + using Microsoft.Build.Framework; + using Microsoft.Build.Internal; + using Microsoft.Build.Shared.FileSystem; +-using error = Microsoft.Build.Shared.ErrorUtilities; ++using ErrorUtils = Microsoft.Build.Shared.ErrorUtilities; + using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; + using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; + using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; +@@ -366,7 +366,7 @@ namespace Microsoft.Build.Evaluation + out string defaultOverrideToolsVersion + ) + { +- error.VerifyThrowArgumentNull(toolsets, "Toolsets"); ++ ErrorUtils.VerifyThrowArgumentNull(toolsets, "Toolsets"); + + ReadEachToolset(toolsets, globalProperties, initialProperties, accumulateProperties); + +diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj +index 309d14bdc..c4eb0bce6 100644 +--- a/src/Build/Microsoft.Build.csproj ++++ b/src/Build/Microsoft.Build.csproj +@@ -4,7 +4,7 @@ + + + +- $(FullFrameworkTFM);net6.0 ++ $(FullFrameworkTFM);net7.0 + $(RuntimeOutputTargetFrameworks) + Microsoft.Build + Microsoft.Build +diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets +index 6696e3861..40bc57ecb 100644 +--- a/src/Directory.BeforeCommon.targets ++++ b/src/Directory.BeforeCommon.targets +@@ -92,7 +92,7 @@ + $(DefineConstants);FEATURE_SYMLINK_TARGET + + +- ++ + $(DefineConstants);FEATURE_PIPEOPTIONS_CURRENTUSERONLY + $(DefineConstants);FEATURE_NODE_REUSE + +diff --git a/src/Directory.Build.props b/src/Directory.Build.props +index ccffd9b5c..6e12f1557 100644 +--- a/src/Directory.Build.props ++++ b/src/Directory.Build.props +@@ -30,13 +30,13 @@ + AnyCPU;x64;arm64 + + +- $(FullFrameworkTFM);net6.0;netstandard2.0 +- net6.0;netstandard2.0 ++ $(FullFrameworkTFM);net7.0;netstandard2.0 ++ net7.0;netstandard2.0 + $(FullFrameworkTFM);netstandard2.0 + AnyCPU + + +- net6.0 ++ net7.0 + $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) + $(FullFrameworkTFM) + +diff --git a/src/Framework/README.md b/src/Framework/README.md +index 1b72454f5..8a86bc21c 100644 +--- a/src/Framework/README.md ++++ b/src/Framework/README.md +@@ -6,6 +6,6 @@ The items in this namespace are primarily base-level classes and interfaces shar + [`ITask`](https://docs.microsoft.com/dotnet/api/microsoft.build.framework.itask), and [`ILogger`](https://docs.microsoft.com/dotnet/api/microsoft.build.framework.ilogger). + + ### netstandard2.0 target +-The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net6.0` or `net472`. Please use the `net6.0`-targeted assemblies for .NET Core 6+ scenarios. ++The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net7.0` or `net472`. Please use the `net7.0`-targeted assemblies for .NET Core 6+ scenarios. + + For context, see https://github.com/dotnet/msbuild/pull/6148 +\ No newline at end of file +diff --git a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj +index 9bb2da049..4766c0418 100644 +--- a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj ++++ b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj +@@ -43,7 +43,7 @@ + + + +- ++ + + + +diff --git a/src/Package/Localization/Localization.csproj b/src/Package/Localization/Localization.csproj +index e15af6ed0..e6c8a82ee 100644 +--- a/src/Package/Localization/Localization.csproj ++++ b/src/Package/Localization/Localization.csproj +@@ -1,6 +1,6 @@ +  + +- net6.0 ++ net7.0 + net472 + Microsoft.Build.Localization.nuspec + false +diff --git a/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj b/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj +index 6972b5e9a..0e37d41d9 100644 +--- a/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj ++++ b/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj +@@ -4,8 +4,8 @@ + false + false + +- net6.0 +- $(FullFrameworkTFM);net6.0 ++ net7.0 ++ $(FullFrameworkTFM);net7.0 + $(RuntimeOutputTargetFrameworks) + + +diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj +index 5bd98bfbe..547075939 100644 +--- a/src/Tasks/Microsoft.Build.Tasks.csproj ++++ b/src/Tasks/Microsoft.Build.Tasks.csproj +@@ -1013,7 +1013,7 @@ + + + +- ++ + + + +diff --git a/src/Utilities/README.md b/src/Utilities/README.md +index a85d56e11..99a1651b5 100644 +--- a/src/Utilities/README.md ++++ b/src/Utilities/README.md +@@ -7,6 +7,6 @@ This package contains `Microsoft.Build.Utilities.Core.dll`, which defines helper + * [`Logger`](https://docs.microsoft.com/dotnet/api/microsoft.build.utilities.logger), a base class for custom logging functionality. + + ### netstandard2.0 target +-The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net6.0` or `net472`. Please use the `net6.0`-targeted assemblies for .NET Core 6+ scenarios. ++The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net7.0` or `net472`. Please use the `net7.0`-targeted assemblies for .NET Core 6+ scenarios. + + For context, see https://github.com/dotnet/msbuild/pull/6148 +\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch new file mode 100644 index 000000000..7a7d5bf8f --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Wed, 3 Aug 2022 10:37:03 -0700 +Subject: [PATCH] Don't use ref struct in Enumerator constructor + +--- + src/StringTools/InternableString.cs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/StringTools/InternableString.cs b/src/StringTools/InternableString.cs +index f04d2a9e9..dc788767a 100644 +--- a/src/StringTools/InternableString.cs ++++ b/src/StringTools/InternableString.cs +@@ -33,7 +33,7 @@ namespace Microsoft.NET.StringTools + /// + private int _charIndex; + +- internal Enumerator(ref InternableString str) ++ internal Enumerator(InternableString str) + { + _string = str; + _spanIndex = -1; +@@ -170,7 +170,7 @@ namespace Microsoft.NET.StringTools + /// The enumerator. + public Enumerator GetEnumerator() + { +- return new Enumerator(ref this); ++ return new Enumerator(this); + } + + /// diff --git a/src/SourceBuild/tarball/patches/nuget-client/0003-Update-TFM-to-net7.0-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Update-TFM-to-net7.0-for-source-build.patch new file mode 100644 index 000000000..054c48eb5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0003-Update-TFM-to-net7.0-for-source-build.patch @@ -0,0 +1,129 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 1 Aug 2022 15:31:27 -0700 +Subject: [PATCH] Update TFM to net7.0 for source-build + +--- + build/common.project.props | 6 +++--- + build/common.targets | 2 +- + eng/source-build/global.json | 2 +- + .../NuGet.Configuration/NuGet.Configuration.csproj | 2 +- + src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs | 2 ++ + src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs | 6 ++++++ + .../NuGet.PackageManagement/NuGet.PackageManagement.csproj | 2 +- + 7 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/build/common.project.props b/build/common.project.props +index 93287fdde..059adfa51 100644 +--- a/build/common.project.props ++++ b/build/common.project.props +@@ -14,18 +14,18 @@ + v4.7.2 + net472 + netcoreapp3.1 +- net6.0 ++ net7.0 + net6.0 + netstandard2.0 + $(NETFXTargetFramework);$(NETCoreTargetFramework) + $(NETCoreTargetFramework) + $(TargetFrameworksExe);netcoreapp5.0 + $(NETCoreTargetFramework);netcoreapp5.0 +- $(TargetFrameworksExe);net6.0 ++ $(TargetFrameworksExe);net7.0 + $(NETFXTargetFramework);$(NetStandardVersion) + $(NETCoreTargetFramework);$(NETFXTargetFramework);$(NetStandardVersion) + $(TargetFrameworksLibrary);netcoreapp5.0 +- $(TargetFrameworksLibrary);net6.0 ++ $(TargetFrameworksLibrary);net7.0 + $(NETFXTargetFramework);net6.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ + $(RepositoryRootDirectory)build\ +diff --git a/build/common.targets b/build/common.targets +index 69c72499b..01ec1b568 100644 +--- a/build/common.targets ++++ b/build/common.targets +@@ -6,7 +6,7 @@ + true + + +- ++ + $(DefineConstants);IS_CORECLR + true + +diff --git a/eng/source-build/global.json b/eng/source-build/global.json +index 2b9604572..d4d319b20 100644 +--- a/eng/source-build/global.json ++++ b/eng/source-build/global.json +@@ -1,6 +1,6 @@ + { + "tools": { +- "dotnet": "6.0.100-preview.7.21379.14" ++ "dotnet": "7.0.100-preview.6.22352.1" + }, + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21309.7" +diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +index 53e500248..5edbc8281 100644 +--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj ++++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +@@ -29,7 +29,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs b/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs +index 6ec51bdd2..4839a2952 100644 +--- a/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs ++++ b/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs +@@ -12,6 +12,7 @@ public static class FrameworkConstants + public static readonly Version MaxVersion = new Version(int.MaxValue, 0, 0, 0); + public static readonly Version Version5 = new Version(5, 0, 0, 0); + public static readonly Version Version6 = new Version(6, 0, 0, 0); ++ public static readonly Version Version7 = new Version(7, 0, 0, 0); + public static readonly Version Version10 = new Version(10, 0, 0, 0); + public static readonly FrameworkRange DotNetAll = new FrameworkRange( + new NuGetFramework(FrameworkIdentifiers.NetPlatform, FrameworkConstants.EmptyVersion), +@@ -186,6 +187,7 @@ public static class CommonFrameworks + // .NET 5.0 and later has NetCoreApp identifier + public static readonly NuGetFramework Net50 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version5); + public static readonly NuGetFramework Net60 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6); ++ public static readonly NuGetFramework Net70 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7); + + public static readonly NuGetFramework Native = new NuGetFramework(FrameworkIdentifiers.Native, new Version(0, 0, 0, 0)); + } +diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs b/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs +index cbbb3af0c..67a355cc8 100644 +--- a/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs ++++ b/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs +@@ -686,6 +686,12 @@ private static bool TryParseCommonFramework(string frameworkString, out NuGetFra + case "net60": + framework = FrameworkConstants.CommonFrameworks.Net60; + break; ++ case "netcoreapp7.0": ++ case "netcoreapp70": ++ case "net7.0": ++ case "net70": ++ framework = FrameworkConstants.CommonFrameworks.Net70; ++ break; + } + + return framework != null; +diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +index 8a9bc1778..01e0a0221 100644 +--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj ++++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +@@ -35,7 +35,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch index 722a34526..6096888d1 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:15:23 +0000 -Subject: [PATCH] lift version of Microsoft.CodeAnalysis.Common dependencies to - previously source built versions +Subject: [PATCH 1/2] lift version of Microsoft.CodeAnalysis.Common + dependencies to previously source built versions Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch --- diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch b/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch index 5611ac154..3d7ba1e1f 100644 --- a/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch +++ b/src/SourceBuild/tarball/patches/runtime/0001-Temporarily-patch-out-native-sourcelink-file-check-i.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 1 Jun 2022 10:10:01 -0500 -Subject: [PATCH] Temporarily patch out native sourcelink file check in +Subject: [PATCH 1/5] Temporarily patch out native sourcelink file check in source-build. This returns source-build to its old behavior. Backport: https://github.com/dotnet/source-build/issues/2883 diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch b/src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch similarity index 95% rename from src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch rename to src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch index 5325b7a93..f88b9fdf3 100644 --- a/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch +++ b/src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 14 Jul 2022 14:53:35 -0700 -Subject: [PATCH] Fully qualify conflicting runtime and roslyn APIs +Subject: [PATCH 3/5] Fully qualify conflicting runtime and roslyn APIs --- .../System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs | 2 +- @@ -22,7 +22,7 @@ index 43a498b589a..1bad8f3753c 100644 const string EventSourceAttribute = "System.Diagnostics.Tracing.EventSourceAttribute"; diff --git a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs -index 33dd18fc67f..13005b9d0a9 100644 +index 7a472a994c9..36dc7500bea 100644 --- a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs +++ b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs @@ -20,7 +20,7 @@ public partial class RegexGenerator diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Target-net7.0-in-additional-projects.patch b/src/SourceBuild/tarball/patches/runtime/0003-Target-net7.0-in-additional-projects.patch new file mode 100644 index 000000000..883a61e0e --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0003-Target-net7.0-in-additional-projects.patch @@ -0,0 +1,65 @@ +From 01e9fdd1449324e547230530aea2532488e0b0ce Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 12 Sep 2022 09:50:31 -0700 +Subject: [PATCH] [release/7.0] Target only net7.0 during source-build (#75168) + +* Target net7.0 in additional projects + +Backport: https://github.com/dotnet/runtime/pull/75168 +--- + Directory.Build.props | 1 + + eng/SourceBuild.props | 1 + + .../src/System.Diagnostics.DiagnosticSource.csproj | 2 -- + .../tools/GenerateRegexCasingTable.csproj | 2 +- + 4 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 60a661e66ca44..ce67527ff8ed1 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -54,6 +54,7 @@ + .NET $(NetCoreAppCurrentVersion) + net$(NetCoreAppCurrentVersion) + net6.0 ++ $(NetCoreAppCurrent) + + 7.0 + net$(NetCoreAppToolCurrentVersion) +diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props +index c17838918f8ce..9ca390c502f75 100644 +--- a/eng/SourceBuild.props ++++ b/eng/SourceBuild.props +@@ -39,6 +39,7 @@ + $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable) + $(InnerBuildArgs) /p:BuildDebPackage=false + $(InnerBuildArgs) /p:EnableNgenOptimization=false ++ $(InnerBuildArgs) /p:EnablePackageValidation=false + + + +diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +index 9c22bce30dae9..6d40be2f856b7 100644 +--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj ++++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +@@ -6,8 +6,6 @@ + $(NoWarn);SA1205;CA1845 + false + true +- +- 10 + true + Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools) + +diff --git a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj +index 26b5733684c3f..4df9075220402 100644 +--- a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj ++++ b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ $(NetCoreAppToolCurrent) + latest + enable + diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch index d95cf8479..f49d2ed95 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 25 Jul 2022 19:15:47 +0000 -Subject: [PATCH] Disable CA1420 +Subject: [PATCH 1/2] Disable CA1420 Workaround until NuGet updates to build with latest .NET toolset. --- @@ -9,7 +9,7 @@ Workaround until NuGet updates to build with latest .NET toolset. 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 8ee962ab1d..ce999a306f 100644 +index 1353696a29..4e7463a453 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,9 +13,11 @@ diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch new file mode 100644 index 000000000..bb3c2b80f --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch @@ -0,0 +1,143 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Fri, 22 Jul 2022 15:10:08 -0700 +Subject: [PATCH] Change TargetFramework to net7.0 + +--- + .../Microsoft.DotNet.ApiCompat.Task.csproj | 2 +- + .../build/Microsoft.DotNet.ApiCompat.Task.targets | 2 +- + .../Microsoft.DotNet.ApiCompat.Tool.csproj | 2 +- + .../Microsoft.DotNet.ApiCompatibility.csproj | 2 +- + .../Microsoft.DotNet.PackageValidation.csproj | 2 +- + .../Microsoft.Extensions.DotNetDeltaApplier.csproj | 2 +- + .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- + src/Layout/redist/targets/GenerateLayout.targets | 4 ++-- + src/Layout/redist/targets/OverlaySdkOnLKG.targets | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj +index 8177095a90..0c1f7acebf 100644 +--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj ++++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0;net472 ++ net7.0;net472 + true + true + Open +diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets +index fb49a12fb4..2ce737c75d 100644 +--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets ++++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets +@@ -2,7 +2,7 @@ + + + $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.ApiCompat.Task.dll +- $(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.DotNet.ApiCompat.Task.dll ++ $(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.ApiCompat.Task.dll + true + + true +diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj +index 2de17ce715..32e6580920 100644 +--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj ++++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net7.0 + Exe + enable + true +diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj +index 7b8569a72b..b1e1e4d53e 100644 +--- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj ++++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0;net472 ++ net7.0;net472 + Open + enable + +diff --git a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +index aa6de655f5..fca12f7f67 100644 +--- a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj ++++ b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0;net472 ++ net7.0;net472 + Open + enable + +diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj +index 40927ae1f2..3c2236e38d 100644 +--- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj ++++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net7.0 + MicrosoftAspNetCore + + false +diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +index 006f56939d..ddcfe2e362 100644 +--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj ++++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +@@ -22,7 +22,7 @@ + + + +- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll ++ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll + + + +diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets +index 85adb4ed8a..d399fe6f29 100644 +--- a/src/Layout/redist/targets/GenerateLayout.targets ++++ b/src/Layout/redist/targets/GenerateLayout.targets +@@ -161,7 +161,7 @@ + BeforeTargets="Build"> + + netcoreapp3.1 +- net6.0 ++ net7.0 + $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ + + +@@ -196,7 +196,7 @@ + + + +- ++ + + + +diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets +index b31188d592..4052c1581b 100644 +--- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets ++++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets +@@ -77,7 +77,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-VSTest-in-net7.0-directory.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-VSTest-in-net7.0-directory.patch deleted file mode 100644 index 98a60451a..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-VSTest-in-net7.0-directory.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 6 Sep 2022 15:50:53 -0700 -Subject: [PATCH] Look for VSTest in net7.0 directory - -Backport: https://github.com/dotnet/sdk/pull/27716 ---- - src/Layout/redist/targets/GenerateLayout.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets -index 85adb4ed8a..148464df9e 100644 ---- a/src/Layout/redist/targets/GenerateLayout.targets -+++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -161,7 +161,7 @@ - BeforeTargets="Build"> - - netcoreapp3.1 -- net6.0 -+ net7.0 - $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ - - From fc74ae4df810086e14d4c0360f6e9a1cc6057ed9 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 9 Sep 2022 19:16:44 +0000 Subject: [PATCH 60/63] Remove roslyn patch --- ...Microsoft.CodeAnalysis.Common-depend.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch deleted file mode 100644 index 6096888d1..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Thu, 21 Oct 2021 23:15:23 +0000 -Subject: [PATCH 1/2] lift version of Microsoft.CodeAnalysis.Common - dependencies to previously source built versions - -Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch ---- - .../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj -index 7eae8afa275..a50822a6aeb 100644 ---- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj -+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj -@@ -27,5 +27,9 @@ - - - -+ -+ -+ -+ - - -\ No newline at end of file From 581e179517fa4cdc4e12cf8755833a61296ac0f7 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 12 Sep 2022 16:48:46 +0000 Subject: [PATCH 61/63] Remove unneeded ExtraPackageVersionPropsPackageInfo from Roslyn source-build project --- src/SourceBuild/tarball/content/repos/roslyn.proj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 29e53696f..51efdd92e 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -32,10 +32,6 @@ need to support VS. --> - - - - From 59de5e7e995237a3657c1bc429036445da9349a3 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 14 Sep 2022 10:00:00 -0700 Subject: [PATCH 62/63] [7.0.1] Update template versions from dotnet/aspnetcore (#14490) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a55282169..59e4114fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.8 + 6.0.9 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -149,7 +149,7 @@ 3.1.27 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.28 + 3.1.29 3.2.1 4.8.0-rc2.19462.10 From 32aa619da0a4fcb4a925bebac2b2c84df0f9ad42 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 14 Sep 2022 16:22:08 -0700 Subject: [PATCH 63/63] Source-build updates from .NET 7.0.0-rc1 September 2022 release (#14500) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 59e4114fd..3f2dd5e62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -192,8 +192,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 0.1.0-7.0.100-bootstrap.11 - 0.1.0-7.0.100-8 + 7.0.100-rc.1 + 0.1.0-7.0.100-9 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 3cbdebc33..8d6aba31b 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22410.15" + "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",