From 5899d97ec2c4cc65af35dedb0f280c441e7438c1 Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Thu, 28 Jan 2021 21:49:02 +0100 Subject: [PATCH] Another try to fix the build. --- Directory.Build.props | 2 +- Directory.Build.targets | 6 +++++- azure-pipelines.yml | 13 ++----------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index b1f50e7b1..c87c75734 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -104,7 +104,7 @@ - + diff --git a/Directory.Build.targets b/Directory.Build.targets index e84907085..f2ce406a1 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,10 @@ - + + $(PkgMSBuildTasks)\tools\ + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5043dd397..21d640496 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,22 +28,13 @@ stages: vmImage: 'Windows-latest' steps: - - task: NuGetToolInstaller@1 - - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - command: 'restore' - restoreSolution: '$(solution)' - feedsToUse: config - - task: MSBuild@1 - displayName: Generate templates + displayName: Restore nuget packages and generate credential templates inputs: solution: '$(solution)' platform: $(buildPlatform) configuration: $(buildConfiguration) - msbuildArguments: '/t:PrepareForBuild' + msbuildArguments: '/restore /t:PrepareForBuild' - task: MSBuild@1 displayName: Build and package