From 2842612683ae4c7478144e0a14284fc509ab24f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Jul 2020 22:08:36 +0000 Subject: [PATCH 01/25] Update dependencies from https://github.com/dotnet/fsharp build 20200724.3 (#12634) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20373.2 to 11.0.0-beta.20374.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 954b67fe500f..351b3fc21dd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild e8338f5ad91d42c3196218648859e9e837099842 - + https://github.com/dotnet/fsharp - 494e1dca147f0454b4627bfce625148e7815d81e + 72f462067ec79a97c27ffa746ef1b0300e78556a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8d21ec34c6e8..bbd297e9ee0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 11.0.0-beta.20373.2 + 11.0.0-beta.20374.3 From f9e30fa170a700c5443c62716fe23b4dfc02c712 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Jul 2020 13:36:25 +0000 Subject: [PATCH 02/25] Update dependencies from https://github.com/dotnet/fsharp build 20200725.1 (#12638) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20374.3 to 11.0.0-beta.20375.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 351b3fc21dd1..7f58d97f272d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild e8338f5ad91d42c3196218648859e9e837099842 - + https://github.com/dotnet/fsharp - 72f462067ec79a97c27ffa746ef1b0300e78556a + a038bd41b59c33b5e46a80a0eeea526938ec4aa6 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index bbd297e9ee0f..3832f96b61af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 11.0.0-beta.20374.3 + 11.0.0-beta.20375.1 From 1133bf0f07dce913ecdf2766a3bba4e72392be8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Jul 2020 22:45:56 +0000 Subject: [PATCH 03/25] Update dependencies from https://github.com/dotnet/fsharp build 20200725.2 (#12639) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20375.1 to 11.0.0-beta.20375.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f58d97f272d..e0948fe47dcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/microsoft/msbuild e8338f5ad91d42c3196218648859e9e837099842 - + https://github.com/dotnet/fsharp - a038bd41b59c33b5e46a80a0eeea526938ec4aa6 + 9abe1ba94b260429e5d055f1cc1b9e2a83fddf30 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 3832f96b61af..701869f8820b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,7 +107,7 @@ - 11.0.0-beta.20375.1 + 11.0.0-beta.20375.2 From 0058ea90e4d1c660b42667903d61fa61628afc2e Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Fri, 24 Jul 2020 09:00:55 -0700 Subject: [PATCH 04/25] Fixing merge issues --- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.de.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.es.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.it.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 12 ++++++------ .../GivenThatWeWantToBuildAWindowsDesktopProject.cs | 1 + .../GivenThatWeWantToBuildWithATargetPlatform.cs | 2 +- .../Microsoft.NET.Publish.Tests/PublishWpfApp.cs | 2 +- 16 files changed, 81 insertions(+), 80 deletions(-) diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index e9bdf5b83fa5..cfdd301e2776 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 6b5795b48472..932d989441a4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index d450e364da27..12b009af02a5 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index ad492d332e65..ad6d99edeae3 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 406232a0432d..8907bdd16159 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 79e416ffde98..94eb8c881ed6 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 588a6664dee1..9bda9a150071 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index 8b15e2393e6c..e664a7c86d6e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index e119de3946fb..4cc49be58ab4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index ad5eddc40f31..066fd22b63a8 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index a319c6f86f8e..8f08de105b7a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index 7482e5cc3f3c..090e069030d0 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index b14f14c959b6..5bf479e15412 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1137: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1137: "} + {StrBegin="NETSDK1139: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -656,9 +656,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1136: The target platform identifier {0} was not recognized. - NETSDK1136: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1136: "} + NETSDK1138: The target platform identifier {0} was not recognized. + NETSDK1138: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1138: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index 908817e3f1a8..bee05905475b 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -30,6 +30,7 @@ public void It_errors_when_missing_windows_target_platform(string propertyName) }; testProject.AdditionalProperties[propertyName] = "true"; testProject.AdditionalProperties["TargetPlatformIdentifier"] = "custom"; // Make sure we don't get windows implicitly set as the TPI + testProject.AdditionalProperties["TargetPlatformSupported"] = "true"; var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: propertyName); var buildCommand = new BuildCommand(testAsset); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs index 1e980ec3caee..5da3792a7fe7 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs @@ -78,7 +78,7 @@ public void It_fails_on_unsupported_os() .Should() .Fail() .And - .HaveStdOutContaining("NETSDK1136"); + .HaveStdOutContaining("NETSDK1138"); } } } diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs index 2b2a2f8b282b..fa8bf4ee719c 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs @@ -51,7 +51,7 @@ public void It_publishes_and_runs_self_contained_wpf_app() var publishCommand = new PublishCommand(Log, testDir.Path); - publishCommand.Execute($"/p:RuntimeIdentifier={rid}", "/p:TargetPlatformIdentifier=Windows", "/p:TargetPlatformVersion=7.0") + publishCommand.Execute($"/p:RuntimeIdentifier={rid}") .Should() .Pass(); From a50fb64f93d9991e6886be8298835da057fc2841 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Fri, 24 Jul 2020 11:37:12 -0700 Subject: [PATCH 05/25] Revert Internal feeds for Preview 8 (#12556) --- .vsts-ci.yml | 49 ++++++++++++++----------------------------------- eng/build.yml | 21 +-------------------- 2 files changed, 15 insertions(+), 55 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 346fd082fcfb..3b8c5d88ab1d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -43,11 +43,11 @@ stages: queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCoreInternal-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre + queue: buildpool.windows.10.amd64.vs2017 helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open strategy: matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + ${{ if eq(variables['System.TeamProject'], 'public') }}: Build_Debug: _BuildConfig: Debug _PublishType: none @@ -55,29 +55,22 @@ stages: _Test: -test Build_Release: _BuildConfig: Release - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + ${{ if eq(variables['System.TeamProject'], 'public') }}: _PublishType: none _SignType: test _Test: -test - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + ${{ if ne(variables['System.TeamProject'], 'public') }}: _PublishType: blob _SignType: real _Test: '' - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(variables['System.TeamProject'], 'public') }}: - template: /eng/build.yml parameters: agentOs: Windows_NT_FullFramework pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open - ${{ if ne(variables['System.TeamProject'], 'public') }}: - name: NetCoreInternal-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre - ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open - ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT + name: NetCorePublic-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open strategy: matrix: Build_Debug: @@ -95,12 +88,8 @@ stages: parameters: agentOs: Windows_NT_TestAsTools pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open - ${{ if ne(variables['System.TeamProject'], 'public') }}: - name: NetCoreInternal-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre + name: NetCorePublic-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open strategy: matrix: Build_Debug: @@ -112,16 +101,9 @@ stages: parameters: agentOs: Ubuntu_16_04 pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1604.Amd64.Open - ${{ if ne(variables['System.TeamProject'], 'public') }}: - name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1604.Amd64 - ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Ubuntu.1604.Amd64.Open - ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Ubuntu.1604.Amd64 + name: NetCorePublic-Pool + queue: BuildPool.Ubuntu.1604.Amd64.Open + helixTargetQueue: Ubuntu.1604.Amd64.Open strategy: matrix: Build_Debug: @@ -138,10 +120,7 @@ stages: agentOs: Darwin pool: name: Hosted macOS - ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.1014.Amd64.Open - ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.1014.Amd64 + helixTargetQueue: OSX.1014.Amd64.Open strategy: matrix: Build_Debug: diff --git a/eng/build.yml b/eng/build.yml index 545d16f4d243..4d8274a3c1c1 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -36,8 +36,7 @@ jobs: - _OfficialBuildIdArgs: '' - _PublishArgs: '' - _SignArgs: '' - - _InternalRuntimeDownloadArgs: '' - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access - group: dotnet-benchview @@ -53,21 +52,7 @@ jobs: /p:PublishToAzure=$(_PublishToAzure) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 - - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - group: DotNet-MSRC-Storage - - name: _InternalRuntimeDownloadArgs - value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet - /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) steps: - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: PowerShell@2 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - script: eng\CIBuild.cmd -configuration $(_BuildConfig) @@ -75,7 +60,6 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) - $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) @@ -104,7 +88,6 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) - $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) @@ -135,7 +118,6 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) - $(_InternalRuntimeDownloadArgs) /p:RunTestsAsTool=true displayName: Build env: @@ -149,7 +131,6 @@ jobs: $(_PublishArgs) $(_SignArgs) $(_OfficialBuildIdArgs) - $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) From 3cade8280ddab18c14a98367c8b2cdeaa4ea94b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2020 22:10:44 +0000 Subject: [PATCH 06/25] Update dependencies from https://github.com/dotnet/roslyn build 20200727.3 (#12653) [release/5.0.1xx-preview8] Update dependencies from dotnet/roslyn - Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-1.20373.6 to 3.8.0-1.20377.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0948fe47dcd..b99af31c8043 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 9abe1ba94b260429e5d055f1cc1b9e2a83fddf30 - + https://github.com/dotnet/roslyn - fc5f6179a2521062cb61d44d0e41e1ef596907d9 + 374affbd53fb271172c9fb928baeb51624d99764 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 701869f8820b..e8441b6f16e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.8.0-1.20373.6 + 3.8.0-1.20377.3 From e5d8b6ef842724b25dcbfe8af5e3c881f11b1a6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 03:14:31 +0000 Subject: [PATCH 07/25] [release/5.0.1xx-preview8] Update dependencies from dotnet/roslyn (#12657) [release/5.0.1xx-preview8] Update dependencies from dotnet/roslyn - Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-1.20377.3 to 3.8.0-2.20377.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b99af31c8043..79c45f6c5740 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 9abe1ba94b260429e5d055f1cc1b9e2a83fddf30 - + https://github.com/dotnet/roslyn - 374affbd53fb271172c9fb928baeb51624d99764 + 090299636c571b366f284af724bc39b043abc13d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e8441b6f16e5..bc9800b0fa0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.8.0-1.20377.3 + 3.8.0-2.20377.5 From 86d5bb3536dbf931fd23416ecf9532ae28a7cbdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jul 2020 03:27:25 +0000 Subject: [PATCH 08/25] Update dependencies from https://github.com/dotnet/roslyn build 20200728.1 Microsoft.Net.Compilers.Toolset From Version 3.8.0-2.20377.5 -> To Version 3.8.0-1.20378.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79c45f6c5740..103ecafb3314 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 9abe1ba94b260429e5d055f1cc1b9e2a83fddf30 - + https://github.com/dotnet/roslyn - 090299636c571b366f284af724bc39b043abc13d + 8f6d67beadd64b8404935147ed86cdff3d9925bf https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bc9800b0fa0e..c527ab98a3a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.8.0-2.20377.5 + 3.8.0-1.20378.1 From 2f0c5b3259b97cd19e5cae7adc1d79ef7b66279b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 14:42:44 +0000 Subject: [PATCH 09/25] [release/5.0.1xx-preview8] Update dependencies from dotnet/roslyn (#12666) [release/5.0.1xx-preview8] Update dependencies from dotnet/roslyn - Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-1.20378.1 to 3.8.0-2.20378.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 103ecafb3314..681b69d7642d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 9abe1ba94b260429e5d055f1cc1b9e2a83fddf30 - + https://github.com/dotnet/roslyn - 8f6d67beadd64b8404935147ed86cdff3d9925bf + 246681e1889c6b06da98ff5368a14c5e67b08d44 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c527ab98a3a9..52a0e7b92711 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.8.0-1.20378.1 + 3.8.0-2.20378.3 From 911ac531f9f374f64b945869fdea774a25e0c47c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jul 2020 19:28:56 +0000 Subject: [PATCH 10/25] Update dependencies from https://github.com/dotnet/roslyn build 20200728.6 Microsoft.Net.Compilers.Toolset From Version 3.8.0-2.20378.3 -> To Version 3.8.0-1.20378.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 681b69d7642d..bfe1efdaa311 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 9abe1ba94b260429e5d055f1cc1b9e2a83fddf30 - + https://github.com/dotnet/roslyn - 246681e1889c6b06da98ff5368a14c5e67b08d44 + 226c0c3f392232b3dd7ecd527f1fd00f0f86d7e4 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 52a0e7b92711..6436582bb786 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.8.0-2.20378.3 + 3.8.0-1.20378.6 From 887b43d0fab098255f17ea777b3c9f331f001443 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2020 22:21:59 +0000 Subject: [PATCH 11/25] Update dependencies from https://github.com/dotnet/msbuild build 20200728.2 (#12681) [release/5.0.1xx-preview8] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20371-01 to 16.8.0-preview-20378-02 - Microsoft.Build: from 16.8.0-preview-20371-01 to 16.8.0-preview-20378-02 --- 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 681b69d7642d..3e662fbccdf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - - https://github.com/microsoft/msbuild - e8338f5ad91d42c3196218648859e9e837099842 + + https://github.com/dotnet/msbuild + 2724763ffe804066b3de1b71a0eeb04c04c3c560 - - https://github.com/microsoft/msbuild - e8338f5ad91d42c3196218648859e9e837099842 + + https://github.com/dotnet/msbuild + 2724763ffe804066b3de1b71a0eeb04c04c3c560 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 52a0e7b92711..fa468518746f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.8.0-preview-20371-01 + 16.8.0-preview-20378-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20371-01 + 16.8.0-preview-20378-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From ff7893dca6ed05c176cca5c1e84ecc55acafbd2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 05:06:26 +0000 Subject: [PATCH 12/25] Update dependencies from https://github.com/dotnet/msbuild build 20200729.2 (#12684) [release/5.0.1xx-preview8] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20378-02 to 16.8.0-preview-20379-02 - Microsoft.Build: from 16.8.0-preview-20378-02 to 16.8.0-preview-20379-02 --- 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 3e662fbccdf3..118cc25eb8ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 2724763ffe804066b3de1b71a0eeb04c04c3c560 + 8343d638eaad09f38fa145b3fc98a2a316d64512 - + https://github.com/dotnet/msbuild - 2724763ffe804066b3de1b71a0eeb04c04c3c560 + 8343d638eaad09f38fa145b3fc98a2a316d64512 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fa468518746f..21905b074b2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.8.0-preview-20378-02 + 16.8.0-preview-20379-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20378-02 + 16.8.0-preview-20379-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From ac7605204b8b64828fdd6b90cf25601e1f1e76b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 29 Jul 2020 14:50:04 +0200 Subject: [PATCH 13/25] Update vstest to 16.8.0 in 5.0.1xx-preview8 (#12669) * Fix Passed / Failed indicators * Update dependencies from https://github.com/microsoft/vstest build 20200728-02 Microsoft.NET.Test.Sdk From Version 16.7.0-release-20200612-02 -> To Version 16.8.0-preview-20200728-02 * Fix more strings * Revert output where normat output is used * Fix even more output Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 +- eng/Versions.props | 2 +- ...ildsAndRunsTestFromCsprojForMultipleTFM.cs | 8 +-- ...enDotnetTestBuildsAndRunsTestfromCsproj.cs | 62 +++++++++---------- ...tfromCsprojWithCorrectTestRunParameters.cs | 4 +- src/Tests/dotnet-vstest.Tests/VSTestTests.cs | 6 +- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91ad4f798023..496d6ede897e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,9 +61,9 @@ https://github.com/NuGet/NuGet.Client d428c2a79aae81ade1caa326e04f65a119025f42 - + https://github.com/microsoft/vstest - df62aca07cacc5c018dc8e828f03a0cd79ee52da + c4c4491da41cd51039eb64139ec5f26a5a202845 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index ee4a023cc853..5588f3772758 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ - 16.7.0-release-20200612-02 + 16.8.0-preview-20200728-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs index 937c21cd7c72..72c55b3938f8 100644 --- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs +++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs @@ -49,11 +49,11 @@ public void MStestMultiTFM() .Should().Contain("Total tests: 3") .And.Contain("Passed: 2") .And.Contain("Failed: 1") - .And.Contain("\u221a VSTestPassTestDesktop", "because .NET 4.6 tests will pass") + .And.Contain("Passed VSTestPassTestDesktop", "because .NET 4.6 tests will pass") .And.Contain("Total tests: 3") .And.Contain("Passed: 1") .And.Contain("Failed: 2") - .And.Contain("X VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail"); + .And.Contain("Failed VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail"); } result.ExitCode.Should().Be(1); } @@ -87,13 +87,13 @@ public void XunitMultiTFM() result.StdOut.Should().Contain("Total tests: 3"); result.StdOut.Should().Contain("Passed: 2"); result.StdOut.Should().Contain("Failed: 1"); - result.StdOut.Should().Contain("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop"); + result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop"); // for target framework netcoreapp1.0 result.StdOut.Should().Contain("Total tests: 3"); result.StdOut.Should().Contain("Passed: 1"); result.StdOut.Should().Contain("Failed: 2"); - result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp"); + result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp"); } result.ExitCode.Should().Be(1); diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs index 26ce333d9b42..b7b4259b788f 100644 --- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs +++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs @@ -46,8 +46,8 @@ public void MSTestSingleTFM() result.StdOut.Should().Contain("Total tests: 2"); result.StdOut.Should().Contain("Passed: 1"); result.StdOut.Should().Contain("Failed: 1"); - result.StdOut.Should().Contain("\u221a VSTestPassTest"); - result.StdOut.Should().Contain("X VSTestFailTest"); + result.StdOut.Should().Contain("Passed VSTestPassTest"); + result.StdOut.Should().Contain("Failed VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -74,8 +74,8 @@ public void ItImplicitlyRestoresAProjectWhenTesting() result.StdOut.Should().Contain("Total tests: 2"); result.StdOut.Should().Contain("Passed: 1"); result.StdOut.Should().Contain("Failed: 1"); - result.StdOut.Should().Contain("\u221a VSTestPassTest"); - result.StdOut.Should().Contain("X VSTestFailTest"); + result.StdOut.Should().Contain("Passed VSTestPassTest"); + result.StdOut.Should().Contain("Failed VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -142,8 +142,8 @@ public void XunitSingleTFM() result.StdOut.Should().Contain("Total tests: 2"); result.StdOut.Should().Contain("Passed: 1"); result.StdOut.Should().Contain("Failed: 1"); - result.StdOut.Should().Contain("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTest"); - result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest"); + result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTest"); + result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest"); } result.ExitCode.Should().Be(1); @@ -164,10 +164,10 @@ public void GivenAFailingTestItDisplaysFailureDetails() if (!TestContext.IsLocalized()) { - result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest"); - result.StdOut.Should().Contain("Total tests: 2"); - result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest"); + result.StdOut.Should().Contain("Total: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); } } @@ -197,8 +197,8 @@ public void ItAcceptsMultipleLoggersAsCliArguments() // We append current date time to trx file name, hence modifying this check Assert.True(Directory.EnumerateFiles(trxLoggerDirectory, trxFileNamePattern).Any()); - result.StdOut.Should().Contain("\u221a VSTestPassTest"); - result.StdOut.Should().Contain("X VSTestFailTest"); + result.StdOut.Should().Contain("Passed VSTestPassTest"); + result.StdOut.Should().Contain("Failed VSTestFailTest"); } // Cleanup trxLoggerDirectory if it exist @@ -341,8 +341,8 @@ public void ItBuildsAndTestsAppWhenRestoringToSpecificDirectory() result.StdOut.Should().Contain("Total tests: 2"); result.StdOut.Should().Contain("Passed: 1"); result.StdOut.Should().Contain("Failed: 1"); - result.StdOut.Should().Contain("\u221a VSTestPassTest"); - result.StdOut.Should().Contain("X VSTestFailTest"); + result.StdOut.Should().Contain("Passed VSTestPassTest"); + result.StdOut.Should().Contain("Failed VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -362,11 +362,11 @@ public void ItUsesVerbosityPassedToDefineVerbosityOfConsoleLoggerOfTheTests() // Verify if (!TestContext.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2"); - result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("Failed: 1"); - result.StdOut.Should().NotContain("\u221a TestNamespace.VSTestTests.VSTestPassTest"); - result.StdOut.Should().NotContain("X TestNamespace.VSTestTests.VSTestFailTest"); + result.StdOut.Should().Contain("Total: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().NotContain("Passed TestNamespace.VSTestTests.VSTestPassTest"); + result.StdOut.Should().NotContain("Failed TestNamespace.VSTestTests.VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -424,9 +424,9 @@ public void ItAcceptsNoLogoAsCliArguments() if (!TestContext.IsLocalized()) { result.StdOut.Should().NotContain("Microsoft (R) Test Execution Command Line Tool Version"); - result.StdOut.Should().Contain("Total tests: 2"); - result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("Total: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); } } @@ -458,9 +458,9 @@ public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings() // Verify test results if (!TestContext.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2"); - result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("Total: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); } // Verify coverage file. @@ -494,9 +494,9 @@ public void ItCreatesCoverageFileInResultsDirectory() // Verify test results if (!TestContext.IsLocalized()) { - result.StdOut.Should().Contain("Total tests: 2"); - result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("Failed: 1"); + result.StdOut.Should().Contain("Total: 2"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().Contain("Failed: 1"); } // Verify coverage file. @@ -523,9 +523,9 @@ public void ItShouldShowWarningMessageOnCollectCodeCoverage() if (!TestContext.IsLocalized()) { result.StdOut.Should().Contain("No code coverage data available. Code coverage is currently supported only on Windows."); - result.StdOut.Should().Contain("Total tests: 1"); - result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("Test Run Successful."); + result.StdOut.Should().Contain("Total: 1"); + result.StdOut.Should().Contain("Passed: 1"); + result.StdOut.Should().NotContain("Failed!"); } result.ExitCode.Should().Be(0); diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs index bffcf0f862c1..9e0963c1d65f 100644 --- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs +++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs @@ -48,7 +48,7 @@ public void GivenAProjectAndMultipleTestRunParametersItPassesThemToVStestConsole result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid."); result.StdOut.Should().Contain("Total tests: 1"); result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("\u221a VSTestTestRunParameters"); + result.StdOut.Should().Contain("Passed VSTestTestRunParameters"); } result.ExitCode.Should().Be(0); @@ -86,7 +86,7 @@ public void GivenADllAndMultipleTestRunParametersItPassesThemToVStestConsoleInTh result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid."); result.StdOut.Should().Contain("Total tests: 1"); result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("\u221a VSTestTestRunParameters"); + result.StdOut.Should().Contain("Passed VSTestTestRunParameters"); } result.ExitCode.Should().Be(0); diff --git a/src/Tests/dotnet-vstest.Tests/VSTestTests.cs b/src/Tests/dotnet-vstest.Tests/VSTestTests.cs index 7e17986e0caf..209fd493b8c0 100644 --- a/src/Tests/dotnet-vstest.Tests/VSTestTests.cs +++ b/src/Tests/dotnet-vstest.Tests/VSTestTests.cs @@ -48,8 +48,8 @@ public void TestsFromAGivenContainerShouldRunWithExpectedOutput() .Should().Contain("Total tests: 2") .And.Contain("Passed: 1") .And.Contain("Failed: 1") - .And.Contain("\u221a VSTestPassTest") - .And.Contain("X VSTestFailTest"); + .And.Contain("Passed VSTestPassTest") + .And.Contain("Failed VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -88,7 +88,7 @@ public void GivenADllAndMultipleTestRunParametersItPassesThemToVStestConsoleInTh result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid."); result.StdOut.Should().Contain("Total tests: 1"); result.StdOut.Should().Contain("Passed: 1"); - result.StdOut.Should().Contain("\u221a VSTestTestRunParameters"); + result.StdOut.Should().Contain("Passed VSTestTestRunParameters"); } result.ExitCode.Should().Be(0); From 947b170250eb4ad86e0c7489d35bb2191c5d61c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 18:08:20 +0000 Subject: [PATCH 14/25] Update dependencies from https://github.com/dotnet/msbuild build 20200729.3 (#12692) [release/5.0.1xx-preview8] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20379-02 to 16.8.0-preview-20379-03 - Microsoft.Build: from 16.8.0-preview-20379-02 to 16.8.0-preview-20379-03 --- 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 496d6ede897e..2484faf1c027 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 8343d638eaad09f38fa145b3fc98a2a316d64512 + 0e7b70f663ab86af7ab41d5d7b409f72f7143899 - + https://github.com/dotnet/msbuild - 8343d638eaad09f38fa145b3fc98a2a316d64512 + 0e7b70f663ab86af7ab41d5d7b409f72f7143899 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5588f3772758..08f720f1dede 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.8.0-preview-20379-02 + 16.8.0-preview-20379-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20379-02 + 16.8.0-preview-20379-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From acaae38f62630d1cc537dc790ee80edefdf8f154 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 19:40:55 +0000 Subject: [PATCH 15/25] Update dependencies from https://github.com/dotnet/roslyn build 20200729.3 (#12697) [release/5.0.1xx-preview8] Update dependencies from dotnet/roslyn - Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-1.20378.6 to 3.8.0-2.20379.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2484faf1c027..8b9a0fbe3f65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,9 +45,9 @@ https://github.com/dotnet/fsharp 9abe1ba94b260429e5d055f1cc1b9e2a83fddf30 - + https://github.com/dotnet/roslyn - 226c0c3f392232b3dd7ecd527f1fd00f0f86d7e4 + 7238563e5c051535770a9266c45d925012ad2b76 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 08f720f1dede..d224c908f182 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 3.8.0-1.20378.6 + 3.8.0-2.20379.3 From 0b1a5c5160155bdd4f29beaa4659fa194aca584f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2020 04:44:59 +0000 Subject: [PATCH 16/25] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.8.0.6725 (#12705) [release/5.0.1xx-preview8] Update dependencies from nuget/nuget.client - Updates: - NuGet.Build.Tasks: from 5.8.0-preview.1.6718 to 5.8.0-preview.1.6725 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b9a0fbe3f65..edf8384969c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/aspnetcore 303a9bfe3312f1db51aa2ad5e354e3f484b41f00 - + https://github.com/NuGet/NuGet.Client - d428c2a79aae81ade1caa326e04f65a119025f42 + ce6d944538b1b587d87daa4163b8934069360d23 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index d224c908f182..21e1b123800e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ - 5.8.0-preview.1.6718 + 5.8.0-preview.1.6725 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 1b99077265d0c971ba7952e2d17b276769e09089 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2020 13:06:36 +0000 Subject: [PATCH 17/25] Update dependencies from https://github.com/microsoft/vstest build 20200730-02 (#12711) [release/5.0.1xx-preview8] Update dependencies from microsoft/vstest - Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-preview-20200728-02 to 16.8.0-preview-20200730-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edf8384969c8..6137fc6ee854 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,9 +61,9 @@ https://github.com/NuGet/NuGet.Client ce6d944538b1b587d87daa4163b8934069360d23 - + https://github.com/microsoft/vstest - c4c4491da41cd51039eb64139ec5f26a5a202845 + ddb755f58160c0e7fab50964d665be1bf47ff579 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 21e1b123800e..d947c2c43825 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ - 16.8.0-preview-20200728-02 + 16.8.0-preview-20200730-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 61992ab3174f3b9362a679c17fde6b7b0e270813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Thu, 30 Jul 2020 21:45:58 +0200 Subject: [PATCH 18/25] Add modern --blame params to dotnet vstest and dotnet test + dll (#12690) (#12699) * Remove unnecessary test This test is testing CSC behavior. It does not test SDK code. The behaivor is also changed due to https://github.com/dotnet/roslyn/pull/42769 * Add --blame options to dotnet vstest and dotnet test + dll * Uncomment other test cases * Fix comma * Refactor to recude code repetition * Ensure that legacy Blame syntax still works Co-authored-by: William Li Co-authored-by: William Li --- .../dotnet-test/VSTestArgumentConverter.cs | 228 +++++++++++++++++- .../VSTestArgumentConverterTests.cs | 42 +++- 2 files changed, 253 insertions(+), 17 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-test/VSTestArgumentConverter.cs b/src/Cli/dotnet/commands/dotnet-test/VSTestArgumentConverter.cs index 0c228199141a..b4a67bed9016 100644 --- a/src/Cli/dotnet/commands/dotnet-test/VSTestArgumentConverter.cs +++ b/src/Cli/dotnet/commands/dotnet-test/VSTestArgumentConverter.cs @@ -6,6 +6,7 @@ namespace Microsoft.DotNet.Cli using System; using System.Collections.Generic; using System.Linq; + using static BlameArgs; /// /// Converts the given arguments to vstest parsable arguments @@ -62,6 +63,8 @@ public List Convert(string[] args, out List ignoredArgs) ignoredArgs = new List(); string activeArgument = null; + BlameArgs blame = new BlameArgs(); + foreach (var arg in args) { if (arg == "--") @@ -77,6 +80,10 @@ public List Convert(string[] args, out List ignoredArgs) { ignoredArgs.Add(activeArgument); } + else if (blame.IsBlameArg(activeArgument, null)) + { + // do nothing, we process remaining arguments ourselves + } else { newArgList.Add(activeArgument); @@ -101,6 +108,12 @@ public List Convert(string[] args, out List ignoredArgs) continue; } + if (blame.IsBlameArg(argValues[0], argValues[1])) + { + blame.UpdateBlame(argValues[0], argValues[1]); + continue; + } + // Check if the argument is shortname if (ArgumentMapping.TryGetValue(argValues[0].ToLower(), out var longName)) { @@ -111,10 +124,18 @@ public List Convert(string[] args, out List ignoredArgs) } else { - activeArgument = arg.ToLower(); - if (ArgumentMapping.TryGetValue(activeArgument, out var value)) + if (blame.IsBlameSwitch(arg)) { - activeArgument = value; + blame.UpdateBlame(arg, null); + activeArgument = arg; + } + else + { + activeArgument = arg.ToLower(); + if (ArgumentMapping.TryGetValue(activeArgument, out var value)) + { + activeArgument = value; + } } } } @@ -129,6 +150,10 @@ public List Convert(string[] args, out List ignoredArgs) ignoredArgs.Add(activeArgument); ignoredArgs.Add(arg); } + else if (blame.IsBlameArg(activeArgument, arg)) + { + blame.UpdateBlame(activeArgument, arg); + } else { newArgList.Add(string.Concat(activeArgument, ":", arg)); @@ -138,7 +163,14 @@ public List Convert(string[] args, out List ignoredArgs) } else { - newArgList.Add(arg); + if (blame.IsBlameArg(arg, null)) + { + blame.UpdateBlame(arg, null); + } + else + { + newArgList.Add(arg); + } } } @@ -148,12 +180,20 @@ public List Convert(string[] args, out List ignoredArgs) { ignoredArgs.Add(activeArgument); } + else if( blame.IsBlameArg(activeArgument, null)) { + // do nothing, we process remaining arguments ourselves + } else { newArgList.Add(activeArgument); } } + if (blame.Blame) + { + blame.AddCombinedBlameArgs(newArgList); + } + return newArgList; } @@ -172,4 +212,184 @@ private void UpdateVerbosity(string verbosity, List newArgList) newArgList.Add(verbosityString + verbosity); } } + + class BlameArgs + { + public bool Blame = false; + public string LegacyBlame = null; + + public bool CollectCrashDump = false; + public string CollectCrashDumpType = null; + public bool CollectCrashDumpAlways = false; + + public bool CollectHangDump = false; + public string CollectHangDumpType = null; + public string CollectHangDumpTimeout = null; + + public static string BlameParam = "--blame"; + public static string BlameCrashParam = "--blame-crash"; + public static string BlameCrashDumpTypeParam = "--blame-crash-dump-type"; + public static string BlameCrashCollectAlwaysParam = "--blame-crash-collect-always"; + public static string BlameHangParam = "--blame-hang"; + public static string BlameHangDumpTypeParam = "--blame-hang-dump-type"; + public static string BlameHangTimeoutParam = "--blame-hang-timeout"; + + // parameters that expect arguments + private readonly string[] _blameArgList = new string[]{ + BlameCrashDumpTypeParam, + + BlameHangDumpTypeParam, + BlameHangTimeoutParam + }; + + // parameters that don't expect any arguments + private readonly string[] _blameSwitchList = new string[]{ + BlameParam, + + BlameCrashParam, + BlameCrashCollectAlwaysParam, + + BlameHangParam, + }; + + + internal bool IsBlameArg(string parameter, string value) + { + return _blameArgList.Any(p => Eq(p, parameter)) || _blameSwitchList.Any(p => Eq(p, parameter)); + } + + private bool IsLegacyBlame(string parameter, string value) + { + // when provided --blame , we do not want to process it any further + // most likely a legacy call, and the param is already in the format that vstest.console expects + return Eq(BlameParam, parameter) && !string.IsNullOrWhiteSpace(value); + } + + internal bool IsBlame(string parameter) + { + return Eq(BlameParam, parameter); + + } + + internal bool IsBlameSwitch(string parameter) + { + return _blameSwitchList.Any(p => Eq(p, parameter)); + + } + + internal void UpdateBlame(string parameter, string argument) + { + if (IsLegacyBlame(parameter, argument)) + { + Blame = true; + LegacyBlame = argument; + } + + if (Eq(parameter, BlameParam)) + { + Blame = true; + } + + // Any blame-crash param implies that we collect crash dump + if (Eq(parameter, BlameCrashParam)) + { + Blame = true; + CollectCrashDump = true; + } + + if (Eq(parameter, BlameCrashCollectAlwaysParam)) + { + Blame = true; + CollectCrashDump = true; + CollectCrashDumpAlways = true; + } + + if (Eq(parameter, BlameCrashDumpTypeParam)) + { + Blame = true; + CollectCrashDump = true; + CollectCrashDumpType = argument; + } + + // Any Blame-hang param implies that we collect hang dump + if (Eq(parameter, BlameHangParam)) + { + Blame = true; + CollectHangDump = true; + } + + if (Eq(parameter, BlameHangDumpTypeParam)) + { + Blame = true; + CollectHangDump = true; + CollectHangDumpType = argument; + } + + if (Eq(parameter, BlameHangTimeoutParam)) + { + Blame = true; + CollectHangDump = true; + CollectHangDumpTimeout = argument; + } + } + + private bool Eq(string left, string right) + { + return string.Equals(left, right, StringComparison.OrdinalIgnoreCase); + } + + internal void AddCombinedBlameArgs(List newArgList) + { + if (!Blame) + return; + + if (!string.IsNullOrWhiteSpace(LegacyBlame)) + { + // when legacy call is detected don't process + // any more parameters + newArgList.Add($"--blame:{LegacyBlame}"); + return; + } + + string crashDumpArgs = null; + string hangDumpArgs = null; + + if (CollectCrashDump) + { + crashDumpArgs = "CollectDump"; + if (CollectCrashDumpAlways) + { + crashDumpArgs += ";CollectAlways=true"; + } + + if (!string.IsNullOrWhiteSpace(CollectCrashDumpType)) + { + crashDumpArgs += $";DumpType={CollectCrashDumpType}"; + } + } + + if (CollectHangDump) + { + hangDumpArgs = "CollectHangDump"; + if (!string.IsNullOrWhiteSpace(CollectHangDumpType)) + { + hangDumpArgs += $";DumpType={CollectHangDumpType}"; + } + + if (!string.IsNullOrWhiteSpace(CollectHangDumpTimeout)) + { + hangDumpArgs += $";TestTimeout={CollectHangDumpTimeout}"; + } + } + + if (CollectCrashDump || CollectHangDump) + { + newArgList.Add($@"--blame:""{string.Join(";", crashDumpArgs, hangDumpArgs).Trim(';')}"""); + } + else + { + newArgList.Add("--blame"); + } + } + } } diff --git a/src/Tests/dotnet.Tests/ParserTests/VSTestArgumentConverterTests.cs b/src/Tests/dotnet.Tests/ParserTests/VSTestArgumentConverterTests.cs index a140b1150511..35a9a3c41f3b 100644 --- a/src/Tests/dotnet.Tests/ParserTests/VSTestArgumentConverterTests.cs +++ b/src/Tests/dotnet.Tests/ParserTests/VSTestArgumentConverterTests.cs @@ -21,7 +21,7 @@ public void ConvertArgsShouldConvertValidArgsIntoVSTestParsableArgs(string input // Act var convertedArgs = new VSTestArgumentConverter().Convert(args, out var ignoredArgs); - convertedArgs.Should().BeEquivalentTo(convertedArgs); + convertedArgs.Should().BeEquivalentTo(expectedArgs); ignoredArgs.Should().BeEmpty(); } @@ -35,7 +35,7 @@ public void ConvertArgshouldConvertsVerbosityArgsIntoVSTestParsableArgs(string i // Act var convertedArgs = new VSTestArgumentConverter().Convert(args, out var ignoredArgs); - convertedArgs.Should().BeEquivalentTo(convertedArgs); + convertedArgs.Should().BeEquivalentTo(expectedArgs); ignoredArgs.Should().BeEmpty(); } @@ -50,7 +50,7 @@ public void ConvertArgsShouldIgnoreKnownArgsWhileConvertingArgsIntoVSTestParsabl // Act var convertedArgs = new VSTestArgumentConverter().Convert(args, out var ignoredArgs); - convertedArgs.Should().BeEquivalentTo(convertedArgs); + convertedArgs.Should().BeEquivalentTo(expectedArgs); Assert.Equal(expIgnoredArgs, ignoredArgs); } @@ -69,20 +69,36 @@ public static class DataSource { public static IEnumerable ArgTestCases { get; } = new List { - new object[] { "-h", "--help" }, - new object[] { "sometest.dll -s test.settings", "sometest.dll --settings:test.settings" }, - new object[] { "sometest.dll -t", "sometest.dll --listtests" }, - new object[] { "sometest.dll --list-tests", "sometest.dll --listtests" }, - new object[] { "sometest.dll --filter", "sometest.dll --testcasefilter" }, - new object[] { "sometest.dll -l trx", "sometest.dll --logger:trx" }, - new object[] { "sometest.dll -a c:\adapterpath\temp", "sometest.dll --testadapterpath:c:\adapterpath\temp" }, - new object[] { "sometest.dll --test-adapter-path c:\adapterpath\temp", "sometest.dll --testadapterpath:c:\adapterpath\temp" }, - new object[] { "sometest.dll -f net451", "sometest.dll --framework:net451" }, + new object[] { @"-h", "--help" }, + new object[] { @"sometest.dll -s test.settings", @"sometest.dll --settings:test.settings" }, + new object[] { @"sometest.dll -t", @"sometest.dll --listtests" }, + new object[] { @"sometest.dll --list-tests", @"sometest.dll --listtests" }, + new object[] { @"sometest.dll --filter", @"sometest.dll --testcasefilter" }, + new object[] { @"sometest.dll -l trx", @"sometest.dll --logger:trx" }, + new object[] { @"sometest.dll -a c:\adapterpath\temp", @"sometest.dll --testadapterpath:c:\adapterpath\temp" }, + new object[] { @"sometest.dll --test-adapter-path c:\adapterpath\temp", @"sometest.dll --testadapterpath:c:\adapterpath\temp" }, + new object[] { @"sometest.dll -f net451", @"sometest.dll --framework:net451" }, new object[] { @"sometest.dll -d c:\temp\log.txt", @"sometest.dll --diag:c:\temp\log.txt" }, new object[] { @"sometest.dll --results-directory c:\temp\", @"sometest.dll --resultsdirectory:c:\temp\" }, new object[] { @"sometest.dll -s testsettings -t -a c:\path -f net451 -d log.txt --results-directory c:\temp\", @"sometest.dll --settings:testsettings --listtests --testadapterpath:c:\path --framework:net451 --diag:log.txt --resultsdirectory:c:\temp\" }, new object[] { @"sometest.dll -s:testsettings -t -a:c:\path -f:net451 -d:log.txt --results-directory:c:\temp\", @"sometest.dll --settings:testsettings --listtests --testadapterpath:c:\path --framework:net451 --diag:log.txt --resultsdirectory:c:\temp\" }, - new object[] { @"sometest.dll --settings testsettings -t --test-adapter-path c:\path --framework net451 --diag log.txt --results-directory c:\temp\", @"sometest.dll --settings:testsettings --listtests --testadapterpath:c:\path --framework:net451 --diag:log.txt --resultsdirectory:c:\temp\" } + new object[] { @"sometest.dll --settings testsettings -t --test-adapter-path c:\path --framework net451 --diag log.txt --results-directory c:\temp\", @"sometest.dll --settings:testsettings --listtests --testadapterpath:c:\path --framework:net451 --diag:log.txt --resultsdirectory:c:\temp\" }, + new object[] { @"sometest.dll --blame", @"sometest.dll --blame" }, + new object[] { @"sometest.dll --blame-crash", @"sometest.dll --blame:""CollectDump""" }, + new object[] { @"sometest.dll --blame-crash-dump-type full", @"sometest.dll --blame:""CollectDump;DumpType=full""" }, + new object[] { @"sometest.dll --blame-crash-collect-always", @"sometest.dll --blame:""CollectDump;CollectAlways=true""" }, + new object[] { @"sometest.dll --blame --blame-crash-dump-type full --blame-crash-collect-always", @"sometest.dll --blame:""CollectDump;CollectAlways=true;DumpType=full""" }, + new object[] { @"sometest.dll --blame-hang", @"sometest.dll --blame:""CollectHangDump""" }, + new object[] { @"sometest.dll --blame-hang-dump-type full", @"sometest.dll --blame:""CollectHangDump;DumpType=full""" }, + new object[] { @"sometest.dll --blame-hang-timeout 10min", @"sometest.dll --blame:""CollectHangDump;TestTimeout=10min""" }, + new object[] { @"sometest.dll --blame --blame-hang-dump-type full --blame-hang-timeout 10min", @"sometest.dll --blame:""CollectHangDump;DumpType=full;TestTimeout=10min""" }, + new object[] { @"sometest.dll --blame --blame-hang-dump-type full --blame-hang-timeout 10min --blame-crash-dump-type mini --blame-crash-collect-always", @"sometest.dll --blame:""CollectDump;CollectAlways=true;DumpType=mini;CollectHangDump;DumpType=full;TestTimeout=10min""" }, + // using the legacy --blame syntax when we provide the parameter that are already in vstest.console format still works + new object[] { @"sometest.dll --blame ""CollectDump;DumpType=full""", @"sometest.dll --blame:""CollectDump;DumpType=full""" }, + new object[] { @"sometest.dll --blame:""CollectDump;DumpType=full""", @"sometest.dll --blame:""CollectDump;DumpType=full""" }, + + + }; public static IEnumerable VerbosityTestCases { get; } = new List From 53b4184394468b9c652c4fa6309bb93738b41bfb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2020 20:33:11 +0000 Subject: [PATCH 19/25] Update dependencies from https://github.com/dotnet/msbuild build 20200730.3 (#12718) [release/5.0.1xx-preview8] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20379-03 to 16.8.0-preview-20380-03 - Microsoft.Build: from 16.8.0-preview-20379-03 to 16.8.0-preview-20380-03 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6137fc6ee854..b611fdb361bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,11 +33,11 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild 0e7b70f663ab86af7ab41d5d7b409f72f7143899 - + https://github.com/dotnet/msbuild 0e7b70f663ab86af7ab41d5d7b409f72f7143899 diff --git a/eng/Versions.props b/eng/Versions.props index d947c2c43825..b6dddb6efd41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.8.0-preview-20379-03 + 16.8.0-preview-20380-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20379-03 + 16.8.0-preview-20380-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 89d3f30fd742f0b651bbaa00107bf972f76cc4ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2020 21:36:31 +0000 Subject: [PATCH 20/25] Update dependencies from https://github.com/microsoft/vstest build 20200730-03 (#12716) [release/5.0.1xx-preview8] Update dependencies from microsoft/vstest - Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-preview-20200730-02 to 16.8.0-preview-20200730-03 --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b611fdb361bf..9cf70efc724b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,7 +61,7 @@ https://github.com/NuGet/NuGet.Client ce6d944538b1b587d87daa4163b8934069360d23 - + https://github.com/microsoft/vstest ddb755f58160c0e7fab50964d665be1bf47ff579 diff --git a/eng/Versions.props b/eng/Versions.props index b6dddb6efd41..48a33b458ad4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ - 16.8.0-preview-20200730-02 + 16.8.0-preview-20200730-03 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 0ede67eee838f19764c911ad617620408fc0d4a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 19:14:22 +0000 Subject: [PATCH 21/25] Update dependencies from https://github.com/dotnet/msbuild build 20200731.1 (#12729) [release/5.0.1xx-preview8] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20380-03 to 16.8.0-preview-20381-01 - Microsoft.Build: from 16.8.0-preview-20380-03 to 16.8.0-preview-20381-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cf70efc724b..e888fe440fc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,11 +33,11 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild 0e7b70f663ab86af7ab41d5d7b409f72f7143899 - + https://github.com/dotnet/msbuild 0e7b70f663ab86af7ab41d5d7b409f72f7143899 diff --git a/eng/Versions.props b/eng/Versions.props index 48a33b458ad4..a1a3a29ebdc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.8.0-preview-20380-03 + 16.8.0-preview-20381-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20380-03 + 16.8.0-preview-20381-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From a55e9e6317e1f595dd2d45419d70e909842b8844 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 2 Aug 2020 20:15:17 -0700 Subject: [PATCH 22/25] [release/5.0.1xx-preview8] Update dependencies from dotnet/msbuild (#12731) * Update dependencies from https://github.com/dotnet/msbuild build 20200731.3 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-01 -> To Version 16.8.0-preview-20381-03 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.2 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-03 -> To Version 16.8.0-preview-20381-02 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.4 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-02 -> To Version 16.8.0-preview-20381-04 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.5 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-04 -> To Version 16.8.0-preview-20381-05 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.6 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-05 -> To Version 16.8.0-preview-20381-06 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.7 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-06 -> To Version 16.8.0-preview-20381-07 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.8 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-07 -> To Version 16.8.0-preview-20381-08 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.9 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-08 -> To Version 16.8.0-preview-20381-09 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.11 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-09 -> To Version 16.8.0-preview-20381-11 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.10 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-11 -> To Version 16.8.0-preview-20381-10 * Update dependencies from https://github.com/dotnet/msbuild build 20200731.12 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-10 -> To Version 16.8.0-preview-20381-12 * Update dependencies from https://github.com/dotnet/msbuild build 20200801.1 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20381-01 -> To Version 16.8.0-preview-20401-01 Co-authored-by: dotnet-maestro[bot] --- 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 e888fe440fc6..420a47432667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 0e7b70f663ab86af7ab41d5d7b409f72f7143899 + 15307131458845313df37549b1e25c5076519809 - + https://github.com/dotnet/msbuild - 0e7b70f663ab86af7ab41d5d7b409f72f7143899 + 15307131458845313df37549b1e25c5076519809 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a1a3a29ebdc1..e6763369b98c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.8.0-preview-20381-01 + 16.8.0-preview-20401-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20381-01 + 16.8.0-preview-20401-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 4ff0664a9435cabdcbfc7253b9556fa7ae72c5e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2020 20:21:11 +0000 Subject: [PATCH 23/25] Update dependencies from https://github.com/dotnet/msbuild build 20200803.1 (#12749) [release/5.0.1xx-preview8] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20401-01 to 16.8.0-preview-20403-01 - Microsoft.Build: from 16.8.0-preview-20401-01 to 16.8.0-preview-20403-01 --- 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 420a47432667..f83ef6376eca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 15307131458845313df37549b1e25c5076519809 + 22ec4fd5ab25118784f46a8e20fe1dd5b3f02a7c - + https://github.com/dotnet/msbuild - 15307131458845313df37549b1e25c5076519809 + 22ec4fd5ab25118784f46a8e20fe1dd5b3f02a7c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e6763369b98c..a67947b0bd7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.8.0-preview-20401-01 + 16.8.0-preview-20403-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20401-01 + 16.8.0-preview-20403-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From c30f2d119d9836481c9b9efef9e397bcaa3d8fa5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Aug 2020 10:02:22 -0700 Subject: [PATCH 24/25] [release/5.0.1xx-preview8] Update dependencies from dotnet/msbuild (#12754) * Update dependencies from https://github.com/dotnet/msbuild build 20200803.2 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20403-01 -> To Version 16.8.0-preview-20403-02 * Update dependencies from https://github.com/dotnet/msbuild build 20200803.4 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20403-01 -> To Version 16.8.0-preview-20403-04 * Update dependencies from https://github.com/dotnet/msbuild build 20200803.3 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20403-01 -> To Version 16.8.0-preview-20403-03 * Update dependencies from https://github.com/dotnet/msbuild build 20200803.6 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20403-03 -> To Version 16.8.0-preview-20403-06 * Update dependencies from https://github.com/dotnet/msbuild build 20200803.5 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20403-06 -> To Version 16.8.0-preview-20403-05 * Update dependencies from https://github.com/dotnet/msbuild build 20200803.7 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20403-01 -> To Version 16.8.0-preview-20403-07 * Update dependencies from https://github.com/dotnet/msbuild build 20200804.3 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20403-01 -> To Version 16.8.0-preview-20404-03 * Update dependencies from https://github.com/dotnet/msbuild build 20200804.2 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20403-01 -> To Version 16.8.0-preview-20404-02 * Update dependencies from https://github.com/dotnet/msbuild build 20200804.1 Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20404-02 -> To Version 16.8.0-preview-20404-01 Co-authored-by: dotnet-maestro[bot] --- 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 f83ef6376eca..071f065d365d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,13 +33,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 22ec4fd5ab25118784f46a8e20fe1dd5b3f02a7c + df427e8f47f9a5de4c2b2e688911284683974e4f - + https://github.com/dotnet/msbuild - 22ec4fd5ab25118784f46a8e20fe1dd5b3f02a7c + df427e8f47f9a5de4c2b2e688911284683974e4f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a67947b0bd7b..580f19d382b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,10 +83,10 @@ - 16.8.0-preview-20403-01 + 16.8.0-preview-20404-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20403-01 + 16.8.0-preview-20404-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From f15a89611564e7495b9b19ee5009dfd9b11e6dca Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Wed, 5 Aug 2020 11:52:25 -0700 Subject: [PATCH 25/25] Clean up merge --- eng/restore-toolset.ps1 | 2 + global.json | 6 +-- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.de.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 17 ++++--- .../Common/Resources/xlf/Strings.pt-BR.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 17 ++++--- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 17 ++++--- .../Common/Resources/xlf/Strings.zh-Hans.xlf | 17 ++++--- .../Common/Resources/xlf/Strings.zh-Hant.xlf | 17 ++++--- ...osoft.NET.TargetFrameworkInference.targets | 4 ++ ...ThatWeWantToBuildAWindowsDesktopProject.cs | 6 +-- ...venThatWeWantToBuildWithATargetPlatform.cs | 2 +- .../GivenDotnetListPackage.cs | 2 +- .../GivenDotnetRunRunsCsProj.cs | 51 +++++++++++++++++++ ...enDotnetTestBuildsAndRunsTestfromCsproj.cs | 44 ++++++++-------- 21 files changed, 230 insertions(+), 108 deletions(-) diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1 index 353b2d817ae3..5641f7dd29a6 100644 --- a/eng/restore-toolset.ps1 +++ b/eng/restore-toolset.ps1 @@ -50,6 +50,8 @@ set DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$env:DOTNET_INSTALL_DIR set PATH=$env:DOTNET_INSTALL_DIR;%PATH% set NUGET_PACKAGES=$env:NUGET_PACKAGES + +DOSKEY killdotnet=taskkill /F /IM dotnet.exe /T ^& taskkill /F /IM VSTest.Console.exe /T ^& taskkill /F /IM msbuild.exe /T "@ Out-File -FilePath $scriptPath -InputObject $scriptContents -Encoding ASCII diff --git a/global.json b/global.json index 295d0a1010dd..07a5ac26bc5b 100644 --- a/global.json +++ b/global.json @@ -9,10 +9,10 @@ "vs-opt": { "version": "16.8" }, - "xcopy-msbuild": "16.8.0-preview1" + "xcopy-msbuild": "16.8.0-preview2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20374.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20374.1" } } diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index cfdd301e2776..96834b6e0b5e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: Cesty AdditionalProbingPaths byly zadány pro GenerateRuntimeConfigurationFiles, ale vynechávají se, protože RuntimeConfigDevPath je prázdné. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: Hodnota TargetFramework {0} není platná. Pokud chcete cílit na více cílů, použijte raději vlastnost TargetFrameworks. @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 932d989441a4..76d45c6794f7 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: Für GenerateRuntimeConfigurationFiles wurden "AdditionalProbingPaths" angegeben, sie werden jedoch übersprungen, weil "RuntimeConfigDevPath" leer ist. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: Der TargetFramework-Wert "{0}" ist nicht gültig. Verwenden Sie für mehrere Ziele die Eigenschaft "TargetFrameworks". @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index 12b009af02a5..5f446f198a9d 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: Se especificaron valores adicionales de "AdditionalProbingPaths" para GenerateRuntimeConfigurationFiles, pero se van a omitir porque el valor de "RuntimeConfigDevPath" está vacío. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: El valor de TargetFramework "{0}" no es válido. Para varios destinos, use en su lugar la propiedad "TargetFrameworks". @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index ad6d99edeae3..abfe30684aac 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: Des 'AdditionalProbingPaths' ont été spécifiés pour GenerateRuntimeConfigurationFiles, mais ils sont ignorés, car 'RuntimeConfigDevPath' est vide. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: La valeur TargetFramework '{0}' est non valide. Pour effectuer un multiciblage, utilisez la propriété 'TargetFrameworks' à la place. @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 8907bdd16159..403c821ff3da 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: per GenerateRuntimeConfigurationFiles è stato specificato 'AdditionalProbingPaths', ma questo valore verrà ignorato perché 'RuntimeConfigDevPath' è vuoto. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: il valore '{0}' di TargetFramework non è valido. Per impostare più destinazioni, usare la proprietà 'TargetFrameworks'. @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 94eb8c881ed6..391582ebb82f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: 'AdditionalProbingPaths' が GenerateRuntimeConfigurationFiles に指定されましたが、'RuntimeConfigDevPath' が空であるためスキップされます。 {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: TargetFramework 値 '{0}' が無効です。複数をターゲットとするには、代わりに 'TargetFrameworks' プロパティを使用してください。 @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 9bda9a150071..0987fd3811fc 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: GenerateRuntimeConfigurationFiles에 대해 'AdditionalProbingPaths'가 지정되었지만 'RuntimeConfigDevPath'가 비어 있어서 건너뜁니다. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: TargetFramework 값 '{0}'이(가) 잘못되었습니다. 여러 대상을 지정하려면 'TargetFrameworks' 속성을 대신 사용하세요. @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index e664a7c86d6e..de91e7c8ce1f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: Dla elementu GenerateRuntimeConfigurationFiles określono ścieżki AdditionalProbingPaths, ale są one pomijane, ponieważ element „RuntimeConfigDevPath” jest pusty. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: Wartość „{0}” elementu TargetFramework jest nieprawidłowa. Aby obsługiwać wiele środowisk docelowych, użyj zamiast tego właściwości TargetFrameworks. @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index 4cc49be58ab4..77df417cb9b1 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: Os 'AdditionalProbingPaths' foram especificados para os GenerateRuntimeConfigurationFiles, mas estão sendo ignorados porque 'RuntimeConfigDevPath' está vazio. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: O valor '{0}' do TargetFramework não é válido. Para vários destinos, use a propriedade 'TargetFrameworks'. @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 066fd22b63a8..76960df4c2b2 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: для GenerateRuntimeConfigurationFiles были указаны пути "AdditionalProbingPaths", но они будут пропущены, так как "RuntimeConfigDevPath" пуст. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: значение "{0}" свойства TargetFramework недопустимо. Для выбора нескольких целевых платформ используйте свойство "TargetFrameworks". @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 8f08de105b7a..2140dca1cd1f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: GenerateRuntimeConfigurationFiles için 'AdditionalProbingPaths' belirtildi ancak 'RuntimeConfigDevPath' boş olduğundan atlanıyor. {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: '{0}' TargetFramework değeri geçerli değil. Çoklu hedefleme için 'TargetFrameworks' özelliğini kullanın. @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index 090e069030d0..839ee924011a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: "AdditionalProbingPaths" 被指定给 GenerateRuntimeConfigurationFiles，但被跳过，因为 "RuntimeConfigDevPath" 为空。 {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: TargetFramework 值“{0}”无效。若要设置多个目标，请改用 "TargetFrameworks" 属性。 @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 5bf479e15412..9f3c6af658e3 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -396,11 +396,11 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1104: "} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - NETSDK1139: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: + NETSDK1140: {0} is not a valid TargetPlatformVersion for {1}. Valid versions include: {2} - {StrBegin="NETSDK1139: "} + {StrBegin="NETSDK1140: "} NETSDK1061: The project was restored using {0} version {1}, but with current settings, version {2} would be used instead. To resolve this issue, make sure the same settings are used for restore and for subsequent operations such as build or publish. Typically this issue can occur if the RuntimeIdentifier property is set during build or publish but not during restore. For more information, see https://aka.ms/dotnet-runtime-patch-selection. @@ -590,6 +590,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1048: 已為 GenerateRuntimeConfigurationFiles 指定了 'AdditionalProbingPaths'，但因為 'RuntimeConfigDevPath' 是空的，所以已跳過它。 {StrBegin="NETSDK1048: "} + + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + NETSDK1138: The target framework '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy. + {StrBegin="NETSDK1138: "} + NETSDK1046: The TargetFramework value '{0}' is not valid. To multi-target, use the 'TargetFrameworks' property instead. NETSDK1046: TargetFramework 值 '{0}' 無效。若要設定多重目標，請改用 'TargetFrameworks' 屬性。 @@ -656,9 +661,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1045: "} - NETSDK1138: The target platform identifier {0} was not recognized. - NETSDK1138: The target platform identifier {0} was not recognized. - {StrBegin="NETSDK1138: "} + NETSDK1139: The target platform identifier {0} was not recognized. + NETSDK1139: The target platform identifier {0} was not recognized. + {StrBegin="NETSDK1139: "} NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK. diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets index 632dcbc931a6..ecb871d48c4a 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets @@ -234,6 +234,10 @@ Copyright (c) .NET Foundation. All rights reserved. true + + true + +