From 0e5ffd9f4d6abb1a6be9a352155430a52063655b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Aug 2023 13:58:25 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/source-build-externals build 20230829.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23428.2 -> To Version 8.0.0-alpha.1.23429.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4ee5fae2c7a..ef8a18e0c126 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -330,9 +330,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 13370d763ada41a7eacae2b19ad1b2e35dd78ae6 + 0603839a51f5e18b89c60a3690aff5e81fa666ca From 03ba15889d5a734d5df0ee35681d1323fe67529c Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 29 Aug 2023 09:31:01 -0500 Subject: [PATCH 2/5] Update Newtonsoft.Json from 13.0.1 to 13.0.3 --- eng/Versions.props | 2 +- .../AddPackageReference/.template.config/template.json | 2 +- .../AddPackageReference/Basic/.template.config/template.json | 2 +- .../BasicWithFiles/.template.config/template.json | 2 +- .../PostActions/AddProjectToSolution/Basic/Basic.csproj | 2 +- .../AddProjectToSolution/BasicInSolutionRoot/Basic.csproj | 2 +- .../AddProjectToSolution/BasicWithFiles/Basic.csproj | 2 +- .../PostActions/RestoreNuGet/Basic/Basic.csproj | 2 +- .../PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj | 2 +- .../RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj | 2 +- .../CustomSourcePathFiles/Custom/Path/Basic.csproj | 2 +- .../CustomSourceTargetPath/Src/Custom/Path/Basic.csproj | 2 +- .../CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj | 2 +- .../PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj | 2 +- .../RestoreNuGet/CustomTargetPathFiles/Basic.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../Files_MismatchSpecifiedFiles/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../Files_SupportSemicolonDelimitedList/Tool/Tool.csproj | 2 +- .../PostActions/RestoreNuGet/Invalid/Invalid.csproj | 2 +- .../RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj | 2 +- .../PostActions/RestoreNuGet/SourceRename/Basic.csproj | 2 +- .../PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj | 2 +- .../Custom/MyTestProject.Tests/MyTestProject.Tests.csproj | 2 +- .../Custom/MyTestProject/MyTestProject.csproj | 2 +- .../Custom/MyTestProject.Tests/MyTestProject.Tests.csproj | 2 +- .../Custom/MyTestProject/MyTestProject.csproj | 2 +- .../TemplateProject1/TemplateProject1.csproj | 2 +- .../TemplateProject2/TemplateProject2.csproj | 2 +- .../TemplateProject1/TemplateProject1.csproj | 2 +- .../TemplateProject2/TemplateProject2.csproj | 2 +- ...ests.AddPackageReference_Basic_Approval.Linux.verified.txt | 2 +- ...nTests.AddPackageReference_Basic_Approval.OSX.verified.txt | 2 +- ...ts.AddPackageReference_Basic_Approval.Windows.verified.txt | 2 +- src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs | 2 +- src/Tests/dotnet-new.Tests/PostActionTests.cs | 4 ++-- 44 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8d2f674fff42..b7e7d67d940b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 2.1.0-preview2-26306-03 2.21.0 2.0.1-servicing-26011-01 - 13.0.1 + 13.0.3 1.2.0-beta.435 7.0.0 4.0.0 diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/AddPackageReference/.template.config/template.json b/src/Assets/TestPackages/dotnet-new/test_templates/AddPackageReference/.template.config/template.json index 95291e3dcd7a..9391e55b25d9 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/AddPackageReference/.template.config/template.json +++ b/src/Assets/TestPackages/dotnet-new/test_templates/AddPackageReference/.template.config/template.json @@ -21,7 +21,7 @@ "args": { "referenceType": "package", "reference": "Newtonsoft.Json", - "version": "13.0.1", + "version": "13.0.3", "projectFileExtensions": ".csproj" } } diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json index 7d641959b994..61b17f391df4 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json @@ -21,7 +21,7 @@ "args": { "referenceType": "package", "reference": "Newtonsoft.Json", - "version": "13.0.1", + "version": "13.0.3", "projectFileExtensions": ".csproj" } } diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json index f8d2ecc19371..36d9c7ecb588 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json @@ -22,7 +22,7 @@ "files": [ "Basic.csproj" ], "referenceType": "package", "reference": "Newtonsoft.Json", - "version": "13.0.1" + "version": "13.0.3" } } ] diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicInSolutionRoot/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicInSolutionRoot/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicInSolutionRoot/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicInSolutionRoot/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool.Library/Tool.Library.csproj index 933c8b28e4fb..f958b9731a58 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj index 19751522afbf..d6f03cfa4b76 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool.Library/Tool.Library.csproj index 933c8b28e4fb..f958b9731a58 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool/Tool.csproj index 19751522afbf..d6f03cfa4b76 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool.Library/Tool.Library.csproj index 933c8b28e4fb..f958b9731a58 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj index 19751522afbf..d6f03cfa4b76 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool.Library/Tool.Library.csproj index 933c8b28e4fb..f958b9731a58 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj index 19751522afbf..d6f03cfa4b76 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool.Library/Tool.Library.csproj index 933c8b28e4fb..f958b9731a58 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj index 19751522afbf..d6f03cfa4b76 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool.Library/Tool.Library.csproj index 933c8b28e4fb..f958b9731a58 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool/Tool.csproj index 19751522afbf..d6f03cfa4b76 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj index fd5b8f594c88..f7168ba58543 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj index fd5b8f594c88..f7168ba58543 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj index daa3300ebf42..1e626621ef77 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Linux.verified.txt index cfc2aa9607f2..98365a9d3e2b 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Linux.verified.txt @@ -1,6 +1,6 @@ The template "TestAssets.PostActions.AddPackageReference.Basic" was created successfully. Processing post-creation actions... -Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file %working directory%/MyProject.csproj: +Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file %working directory%/MyProject.csproj: %CALLBACK OUTPUT% Successfully added a reference to the project file. \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.OSX.verified.txt index cfc2aa9607f2..98365a9d3e2b 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.OSX.verified.txt @@ -1,6 +1,6 @@ The template "TestAssets.PostActions.AddPackageReference.Basic" was created successfully. Processing post-creation actions... -Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file %working directory%/MyProject.csproj: +Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file %working directory%/MyProject.csproj: %CALLBACK OUTPUT% Successfully added a reference to the project file. \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Windows.verified.txt index 55158c992664..d248ce181e08 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Windows.verified.txt @@ -1,6 +1,6 @@ The template "TestAssets.PostActions.AddPackageReference.Basic" was created successfully. Processing post-creation actions... -Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file %working directory%\MyProject.csproj: +Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file %working directory%\MyProject.csproj: %CALLBACK OUTPUT% Successfully added a reference to the project file. \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs b/src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs index fb5efcd983f6..53513fefdbcd 100644 --- a/src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs +++ b/src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs @@ -88,7 +88,7 @@ public Task AddPackageReference_Basic_Approval() output.Replace("{TempPath}", "/tmp/"); output.Replace(workingDirectory, "%working directory%"); output.UnixifyNewlines(); - output.ScrubByRegex("(?<=Adding a package reference Newtonsoft.Json \\(version: 13.0.1\\) to project file %working directory%(\\\\|\\/)MyProject.csproj:\\n)(.*?)(?=\\nSuccessfully added a reference to the project file.)", "%CALLBACK OUTPUT%", System.Text.RegularExpressions.RegexOptions.Singleline); + output.ScrubByRegex("(?<=Adding a package reference Newtonsoft.Json \\(version: 13.0.3\\) to project file %working directory%(\\\\|\\/)MyProject.csproj:\\n)(.*?)(?=\\nSuccessfully added a reference to the project file.)", "%CALLBACK OUTPUT%", System.Text.RegularExpressions.RegexOptions.Singleline); }); } diff --git a/src/Tests/dotnet-new.Tests/PostActionTests.cs b/src/Tests/dotnet-new.Tests/PostActionTests.cs index 5e53bed4e235..b96d728dc533 100644 --- a/src/Tests/dotnet-new.Tests/PostActionTests.cs +++ b/src/Tests/dotnet-new.Tests/PostActionTests.cs @@ -435,7 +435,7 @@ public void AddPackageReference_Basic(string templateLocation, string templateNa .And.NotHaveStdErr() .And.HaveStdOutContaining($"The template \"{templateName}\" was created successfully.") .And.HaveStdOutContaining("Successfully added a reference to the project file.") - .And.HaveStdOutContaining("Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file") + .And.HaveStdOutContaining("Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file") .And.NotHaveStdOutContaining("Manual instructions: Manually add"); new DotnetBuildCommand(_log) @@ -885,7 +885,7 @@ public void ItCanCreateTemplate_WithAddPackageReference() .WithCustomHive(tempSettingsDir) .Execute("TestAssets.AddReference", "-o", workingDirectory); cmd.Should().Pass() - .And.HaveStdOutContaining("Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file") + .And.HaveStdOutContaining("Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file") .And.HaveStdOutContaining("Successfully added a reference to the project file."); } From d31ec91a9a4948e26abf4bc39f41dfe8ed3f22e4 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 29 Aug 2023 12:24:10 -0500 Subject: [PATCH 3/5] Updated expected TFM dir name for Newtonsoft.Json 13.0.1's highest TFM is netstandard2.0 13.0.3's highest TFM is net6.0 --- .../GivenThatWeWantToStoreAProjectWithDependencies.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index b8b880bc0399..a6fd431b92d0 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -174,7 +174,7 @@ public void compose_multifile() "artifact.xml", "newtonsoft.json/9.0.2-beta2/lib/netstandard1.1/Newtonsoft.Json.dll", "newtonsoft.json/9.0.1/lib/netstandard1.0/Newtonsoft.Json.dll", - $"newtonsoft.json/{ToolsetInfo.GetNewtonsoftJsonPackageVersion()}/lib/netstandard2.0/Newtonsoft.Json.dll", + $"newtonsoft.json/{ToolsetInfo.GetNewtonsoftJsonPackageVersion()}/lib/net6.0/Newtonsoft.Json.dll", "fluentassertions/4.12.0/lib/netstandard1.3/FluentAssertions.Core.dll", "fluentassertions/4.12.0/lib/netstandard1.3/FluentAssertions.dll", "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll", @@ -280,7 +280,7 @@ public void It_creates_profiling_symbols() } else { - var newtonsoftSymbolsFolder = symbolsFolder.Sub("newtonsoft.json").Sub(ToolsetInfo.GetNewtonsoftJsonPackageVersion()).Sub("lib").Sub("netstandard2.0"); + var newtonsoftSymbolsFolder = symbolsFolder.Sub("newtonsoft.json").Sub(ToolsetInfo.GetNewtonsoftJsonPackageVersion()).Sub("lib").Sub("net6.0"); newtonsoftSymbolsFolder.Should().Exist(); var newtonsoftSymbolsFiles = newtonsoftSymbolsFolder.GetFiles().ToArray(); @@ -324,7 +324,7 @@ public void It_stores_when_targeting_netcoreapp3(bool isExe) new DirectoryInfo(outputFolder).Should().OnlyHaveFiles(new List { "artifact.xml", - $"newtonsoft.json/{ToolsetInfo.GetNewtonsoftJsonPackageVersion()}/lib/netstandard2.0/Newtonsoft.Json.dll", + $"newtonsoft.json/{ToolsetInfo.GetNewtonsoftJsonPackageVersion()}/lib/net6.0/Newtonsoft.Json.dll", }); } From d06afa25381f07a3f32d94afda158d970749632b Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 29 Aug 2023 15:36:44 -0500 Subject: [PATCH 4/5] Revert test changes --- .../AddPackageReference/.template.config/template.json | 2 +- .../Basic/.template.config/template.json | 2 +- .../BasicWithFiles/.template.config/template.json | 2 +- .../PostActions/AddProjectToSolution/Basic/Basic.csproj | 2 +- .../AddProjectToSolution/BasicInSolutionRoot/Basic.csproj | 2 +- .../AddProjectToSolution/BasicWithFiles/Basic.csproj | 2 +- .../PostActions/RestoreNuGet/Basic/Basic.csproj | 2 +- .../PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj | 2 +- .../RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj | 2 +- .../CustomSourcePathFiles/Custom/Path/Basic.csproj | 2 +- .../CustomSourceTargetPath/Src/Custom/Path/Basic.csproj | 2 +- .../Src/Custom/Path/Basic.csproj | 2 +- .../PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj | 2 +- .../RestoreNuGet/CustomTargetPathFiles/Basic.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../Files_MismatchSpecifiedFiles/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj | 2 +- .../Tool.Library/Tool.Library.csproj | 2 +- .../Files_SupportSemicolonDelimitedList/Tool/Tool.csproj | 2 +- .../PostActions/RestoreNuGet/Invalid/Invalid.csproj | 2 +- .../RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj | 2 +- .../PostActions/RestoreNuGet/SourceRename/Basic.csproj | 2 +- .../PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj | 2 +- .../Custom/MyTestProject.Tests/MyTestProject.Tests.csproj | 2 +- .../Custom/MyTestProject/MyTestProject.csproj | 2 +- .../Custom/MyTestProject.Tests/MyTestProject.Tests.csproj | 2 +- .../Custom/MyTestProject/MyTestProject.csproj | 2 +- .../TemplateProject1/TemplateProject1.csproj | 2 +- .../TemplateProject2/TemplateProject2.csproj | 2 +- .../TemplateProject1/TemplateProject1.csproj | 2 +- .../TemplateProject2/TemplateProject2.csproj | 2 +- .../GivenThatWeWantToStoreAProjectWithDependencies.cs | 6 +++--- ...ts.AddPackageReference_Basic_Approval.Linux.verified.txt | 2 +- ...ests.AddPackageReference_Basic_Approval.OSX.verified.txt | 2 +- ....AddPackageReference_Basic_Approval.Windows.verified.txt | 2 +- src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs | 2 +- src/Tests/dotnet-new.Tests/PostActionTests.cs | 4 ++-- 44 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/AddPackageReference/.template.config/template.json b/src/Assets/TestPackages/dotnet-new/test_templates/AddPackageReference/.template.config/template.json index 9391e55b25d9..95291e3dcd7a 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/AddPackageReference/.template.config/template.json +++ b/src/Assets/TestPackages/dotnet-new/test_templates/AddPackageReference/.template.config/template.json @@ -21,7 +21,7 @@ "args": { "referenceType": "package", "reference": "Newtonsoft.Json", - "version": "13.0.3", + "version": "13.0.1", "projectFileExtensions": ".csproj" } } diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json index 61b17f391df4..7d641959b994 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/Basic/.template.config/template.json @@ -21,7 +21,7 @@ "args": { "referenceType": "package", "reference": "Newtonsoft.Json", - "version": "13.0.3", + "version": "13.0.1", "projectFileExtensions": ".csproj" } } diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json index 36d9c7ecb588..f8d2ecc19371 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddPackageReference/BasicWithFiles/.template.config/template.json @@ -22,7 +22,7 @@ "files": [ "Basic.csproj" ], "referenceType": "package", "reference": "Newtonsoft.Json", - "version": "13.0.3" + "version": "13.0.1" } } ] diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/Basic/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicInSolutionRoot/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicInSolutionRoot/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicInSolutionRoot/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicInSolutionRoot/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectToSolution/BasicWithFiles/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Basic/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/BasicWithFiles/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePath/Custom/Path/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourcePathFiles/Custom/Path/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPath/Src/Custom/Path/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomSourceTargetPathFiles/Src/Custom/Path/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPath/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/CustomTargetPathFiles/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool.Library/Tool.Library.csproj index f958b9731a58..933c8b28e4fb 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj index d6f03cfa4b76..19751522afbf 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MatchSpecifiedFiles/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool.Library/Tool.Library.csproj index f958b9731a58..933c8b28e4fb 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool/Tool.csproj index d6f03cfa4b76..19751522afbf 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_MismatchSpecifiedFiles/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool.Library/Tool.Library.csproj index f958b9731a58..933c8b28e4fb 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj index d6f03cfa4b76..19751522afbf 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithFileName/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool.Library/Tool.Library.csproj index f958b9731a58..933c8b28e4fb 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj index d6f03cfa4b76..19751522afbf 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithGlobstar/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool.Library/Tool.Library.csproj index f958b9731a58..933c8b28e4fb 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj index d6f03cfa4b76..19751522afbf 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_PatternWithWildcard/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool.Library/Tool.Library.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool.Library/Tool.Library.csproj index f958b9731a58..933c8b28e4fb 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool.Library/Tool.Library.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool.Library/Tool.Library.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool/Tool.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool/Tool.csproj index d6f03cfa4b76..19751522afbf 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool/Tool.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Files_SupportSemicolonDelimitedList/Tool/Tool.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj index f7168ba58543..fd5b8f594c88 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid/Invalid.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj index f7168ba58543..fd5b8f594c88 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/Invalid_ContinueOnError/Invalid.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRename/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/SourceRenameFiles/Basic.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsFiles/Custom/MyTestProject/MyTestProject.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject.Tests/MyTestProject.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsPrimaryOutputs/Custom/MyTestProject/MyTestProject.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject1/TemplateProject1.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames/TemplateProject2/TemplateProject2.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject1/TemplateProject1.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj index 1e626621ef77..daa3300ebf42 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj +++ b/src/Assets/TestPackages/dotnet-new/test_templates/PostActions/RestoreNuGet/TwoProjectsWithSourceRenames2/TemplateProject2/TemplateProject2.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index a6fd431b92d0..b8b880bc0399 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -174,7 +174,7 @@ public void compose_multifile() "artifact.xml", "newtonsoft.json/9.0.2-beta2/lib/netstandard1.1/Newtonsoft.Json.dll", "newtonsoft.json/9.0.1/lib/netstandard1.0/Newtonsoft.Json.dll", - $"newtonsoft.json/{ToolsetInfo.GetNewtonsoftJsonPackageVersion()}/lib/net6.0/Newtonsoft.Json.dll", + $"newtonsoft.json/{ToolsetInfo.GetNewtonsoftJsonPackageVersion()}/lib/netstandard2.0/Newtonsoft.Json.dll", "fluentassertions/4.12.0/lib/netstandard1.3/FluentAssertions.Core.dll", "fluentassertions/4.12.0/lib/netstandard1.3/FluentAssertions.dll", "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll", @@ -280,7 +280,7 @@ public void It_creates_profiling_symbols() } else { - var newtonsoftSymbolsFolder = symbolsFolder.Sub("newtonsoft.json").Sub(ToolsetInfo.GetNewtonsoftJsonPackageVersion()).Sub("lib").Sub("net6.0"); + var newtonsoftSymbolsFolder = symbolsFolder.Sub("newtonsoft.json").Sub(ToolsetInfo.GetNewtonsoftJsonPackageVersion()).Sub("lib").Sub("netstandard2.0"); newtonsoftSymbolsFolder.Should().Exist(); var newtonsoftSymbolsFiles = newtonsoftSymbolsFolder.GetFiles().ToArray(); @@ -324,7 +324,7 @@ public void It_stores_when_targeting_netcoreapp3(bool isExe) new DirectoryInfo(outputFolder).Should().OnlyHaveFiles(new List { "artifact.xml", - $"newtonsoft.json/{ToolsetInfo.GetNewtonsoftJsonPackageVersion()}/lib/net6.0/Newtonsoft.Json.dll", + $"newtonsoft.json/{ToolsetInfo.GetNewtonsoftJsonPackageVersion()}/lib/netstandard2.0/Newtonsoft.Json.dll", }); } diff --git a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Linux.verified.txt index 98365a9d3e2b..cfc2aa9607f2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Linux.verified.txt @@ -1,6 +1,6 @@ The template "TestAssets.PostActions.AddPackageReference.Basic" was created successfully. Processing post-creation actions... -Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file %working directory%/MyProject.csproj: +Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file %working directory%/MyProject.csproj: %CALLBACK OUTPUT% Successfully added a reference to the project file. \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.OSX.verified.txt index 98365a9d3e2b..cfc2aa9607f2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.OSX.verified.txt @@ -1,6 +1,6 @@ The template "TestAssets.PostActions.AddPackageReference.Basic" was created successfully. Processing post-creation actions... -Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file %working directory%/MyProject.csproj: +Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file %working directory%/MyProject.csproj: %CALLBACK OUTPUT% Successfully added a reference to the project file. \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Windows.verified.txt index d248ce181e08..55158c992664 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/PostActionTests.AddPackageReference_Basic_Approval.Windows.verified.txt @@ -1,6 +1,6 @@ The template "TestAssets.PostActions.AddPackageReference.Basic" was created successfully. Processing post-creation actions... -Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file %working directory%\MyProject.csproj: +Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file %working directory%\MyProject.csproj: %CALLBACK OUTPUT% Successfully added a reference to the project file. \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs b/src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs index 53513fefdbcd..fb5efcd983f6 100644 --- a/src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs +++ b/src/Tests/dotnet-new.Tests/PostActionTests.Approval.cs @@ -88,7 +88,7 @@ public Task AddPackageReference_Basic_Approval() output.Replace("{TempPath}", "/tmp/"); output.Replace(workingDirectory, "%working directory%"); output.UnixifyNewlines(); - output.ScrubByRegex("(?<=Adding a package reference Newtonsoft.Json \\(version: 13.0.3\\) to project file %working directory%(\\\\|\\/)MyProject.csproj:\\n)(.*?)(?=\\nSuccessfully added a reference to the project file.)", "%CALLBACK OUTPUT%", System.Text.RegularExpressions.RegexOptions.Singleline); + output.ScrubByRegex("(?<=Adding a package reference Newtonsoft.Json \\(version: 13.0.1\\) to project file %working directory%(\\\\|\\/)MyProject.csproj:\\n)(.*?)(?=\\nSuccessfully added a reference to the project file.)", "%CALLBACK OUTPUT%", System.Text.RegularExpressions.RegexOptions.Singleline); }); } diff --git a/src/Tests/dotnet-new.Tests/PostActionTests.cs b/src/Tests/dotnet-new.Tests/PostActionTests.cs index b96d728dc533..5e53bed4e235 100644 --- a/src/Tests/dotnet-new.Tests/PostActionTests.cs +++ b/src/Tests/dotnet-new.Tests/PostActionTests.cs @@ -435,7 +435,7 @@ public void AddPackageReference_Basic(string templateLocation, string templateNa .And.NotHaveStdErr() .And.HaveStdOutContaining($"The template \"{templateName}\" was created successfully.") .And.HaveStdOutContaining("Successfully added a reference to the project file.") - .And.HaveStdOutContaining("Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file") + .And.HaveStdOutContaining("Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file") .And.NotHaveStdOutContaining("Manual instructions: Manually add"); new DotnetBuildCommand(_log) @@ -885,7 +885,7 @@ public void ItCanCreateTemplate_WithAddPackageReference() .WithCustomHive(tempSettingsDir) .Execute("TestAssets.AddReference", "-o", workingDirectory); cmd.Should().Pass() - .And.HaveStdOutContaining("Adding a package reference Newtonsoft.Json (version: 13.0.3) to project file") + .And.HaveStdOutContaining("Adding a package reference Newtonsoft.Json (version: 13.0.1) to project file") .And.HaveStdOutContaining("Successfully added a reference to the project file."); } From 20cd326f7db7983c4f0875a514b37c8e639c4dff Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 30 Aug 2023 03:14:19 -0700 Subject: [PATCH 5/5] Fix the failures for It_publishes_the_project_correctly test --- .../GivenThatWeWantToPublishAProjectWithAllFeatures.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs index 22c71b8338e3..f0889c2c1ab8 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs @@ -36,7 +36,7 @@ public void It_publishes_the_project_correctly(string targetFramework, string [] // TestLibrary has a hard dependency on Newtonsoft.Json. // TestApp has a PrivateAssets=All dependency on Microsoft.Extensions.DependencyModel, which depends on Newtonsoft.Json. // This verifies that P2P references get walked correctly when doing PrivateAssets exclusion. - VerifyDependency(dependencyContext, "Newtonsoft.Json", targetFramework == "net6.0" ? "lib/netstandard2.0/" : "lib/netstandard1.3/", null); + VerifyDependency(dependencyContext, "Newtonsoft.Json", targetFramework == "net6.0" ? "lib/net6.0/" : "lib/netstandard1.3/", null); // Verify P2P references get created correctly in the .deps.json file. VerifyDependency(dependencyContext, "TestLibrary", "", null,