From b29c8c140b5948b674bacc0cf8c2a4f986face88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Apr 2021 12:21:43 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/msbuild build 20210408.5 Microsoft.Build.Localization , Microsoft.Build From Version 16.10.0-preview-21205-05 -> To Version 16.10.0-preview-21208-05 --- 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 54a40c205f3c..d717d5343923 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime a06eccb3600b702d911bcdf8fb0caa50970858d9 - + https://github.com/dotnet/msbuild - 7804350cd4fe271bee48b3dc99e9f4681ee686c5 + 9bcc06cbe19ae2482ab18eab90a82fd079b26897 - + https://github.com/dotnet/msbuild - 7804350cd4fe271bee48b3dc99e9f4681ee686c5 + 9bcc06cbe19ae2482ab18eab90a82fd079b26897 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0d445fa806f9..7f4e6933d313 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -90,10 +90,10 @@ - 16.10.0-preview-21205-05 + 16.10.0-preview-21208-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.10.0-preview-21205-05 + 16.10.0-preview-21208-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 0e125a5278b9a826cbeea60e8efff3531f232139 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Apr 2021 12:13:53 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/msbuild build 20210413.2 Microsoft.Build.Localization , Microsoft.Build From Version 16.10.0-preview-21205-05 -> To Version 16.10.0-preview-21213-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 d717d5343923..762e8fc40549 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime a06eccb3600b702d911bcdf8fb0caa50970858d9 - + https://github.com/dotnet/msbuild - 9bcc06cbe19ae2482ab18eab90a82fd079b26897 + 47be9829672e2c207626419971aa1cba8f445409 - + https://github.com/dotnet/msbuild - 9bcc06cbe19ae2482ab18eab90a82fd079b26897 + 47be9829672e2c207626419971aa1cba8f445409 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7f4e6933d313..1c157b1d4f30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -90,10 +90,10 @@ - 16.10.0-preview-21208-05 + 16.10.0-preview-21213-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.10.0-preview-21208-05 + 16.10.0-preview-21213-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 63d34c0c2b4d84c60aa9ffe1de6abc77427ac0b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Apr 2021 12:20:38 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/msbuild build 20210414.2 Microsoft.Build.Localization , Microsoft.Build From Version 16.10.0-preview-21205-05 -> To Version 16.10.0-preview-21214-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 762e8fc40549..ebcaae8deb0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime a06eccb3600b702d911bcdf8fb0caa50970858d9 - + https://github.com/dotnet/msbuild - 47be9829672e2c207626419971aa1cba8f445409 + 077ef330851c0b5a4f6396eb4adf323e9944d630 - + https://github.com/dotnet/msbuild - 47be9829672e2c207626419971aa1cba8f445409 + 077ef330851c0b5a4f6396eb4adf323e9944d630 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1c157b1d4f30..202a759e8cb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -90,10 +90,10 @@ - 16.10.0-preview-21213-02 + 16.10.0-preview-21214-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.10.0-preview-21213-02 + 16.10.0-preview-21214-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From ec8ff83985a39f750afbc985c58bf898f081db70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Apr 2021 12:22:30 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/msbuild build 20210415.5 Microsoft.Build.Localization , Microsoft.Build From Version 16.10.0-preview-21205-05 -> To Version 16.10.0-preview-21215-05 --- 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 ebcaae8deb0c..b23d4d5b6a4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime a06eccb3600b702d911bcdf8fb0caa50970858d9 - + https://github.com/dotnet/msbuild - 077ef330851c0b5a4f6396eb4adf323e9944d630 + 369631b4b21ef485f4d6f35e16b0c839a971b0e9 - + https://github.com/dotnet/msbuild - 077ef330851c0b5a4f6396eb4adf323e9944d630 + 369631b4b21ef485f4d6f35e16b0c839a971b0e9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 202a759e8cb5..1c1fb736dbae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -90,10 +90,10 @@ - 16.10.0-preview-21214-02 + 16.10.0-preview-21215-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.10.0-preview-21214-02 + 16.10.0-preview-21215-05 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From df4b3642ebe5e0ce7e4bb1d05e07bcb13fa5a89f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 19 Apr 2021 13:21:38 -0700 Subject: [PATCH 5/5] Fix test to not try to restore project which doesn't have Restore target --- .../dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs b/src/Tests/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs index 0fee23bb6e46..c82a7277b2c8 100644 --- a/src/Tests/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs +++ b/src/Tests/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs @@ -40,14 +40,14 @@ public void ItRunsSpecifiedTargetsWithPropertiesCorrectly() var testProjectDirectory = testInstance.Path; new MSBuildCommand(Log, "SayHello", testProjectDirectory) - .Execute() + .ExecuteWithoutRestore() .Should() .Pass() .And .HaveStdOutContaining("Hello, from MSBuild!"); new MSBuildCommand(Log, "SayGoodbye", testProjectDirectory) - .Execute() + .ExecuteWithoutRestore() .Should() .Pass() .And