From 5a763523b9a7391f92c122066788dd0bb46f3edc Mon Sep 17 00:00:00 2001
From: Robin <robin@getgreenshot.org>
Date: Tue, 3 Mar 2020 15:15:10 +0100
Subject: [PATCH] Forcing generation of the templates before the build runs.

---
 Directory.Build.props | 10 +++++-----
 azure-pipelines.yml   | 13 ++++++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 2986c4f3e..ea400bff8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -102,15 +102,15 @@
     </Tokens>
   </ItemGroup>
 
-  <ItemGroup Condition="Exists('$(SolutionDir)$(ProjectName).Credentials.template')">
+  <ItemGroup Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')">
     <PackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true"/>
   </ItemGroup>
 
-  <Import Project="$(PkgTools_MSBuildTasks)MSBuild.Community.Tasks.Targets" Condition="Exists('$(SolutionDir)$(ProjectName).Credentials.template')"/>
+  <Import Project="$(PkgTools_MSBuildTasks)MSBuild.Community.Tasks.Targets" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')"/>
 
-  <Target Name="Process templates" BeforeTargets="PrepareForBuild" Condition="Exists('$(SolutionDir)$(ProjectName).Credentials.template')">
-    <Message Text="Processing: $(SolutionDir)$(ProjectName).Credentials.template" /> 
-    <TemplateFile Template="$(SolutionDir)$(ProjectName).Credentials.template" OutputFilename="$(SolutionDir)$(ProjectName).Credentials.cs" Tokens="@(Tokens)" />
+  <Target Name="ProcessTemplates" BeforeTargets="PrepareForBuild" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')">
+    <Message Text="Processing: $(ProjectDir)$(ProjectName).Credentials.template" /> 
+    <TemplateFile Template="$(ProjectDir)$(ProjectName).Credentials.template" OutputFilename="$(ProjectDir)$(ProjectName).Credentials.cs" Tokens="@(Tokens)" />
   </Target>
 
   <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="$(MSBuildProjectName.Contains('Plugin')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 61840eada..99660ec98 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,13 +34,20 @@ stages:
         restoreSolution: '$(solution)'
         feedsToUse: config
 
-    - task: VSBuild@1
+    - task: MSBuild@1
+      displayName: Generate templates
+      inputs:
+        solution: '$(solution)'
+        platform: $(buildPlatform)
+        configuration: $(buildConfiguration)
+        msbuildArgs: '/t:PrepareForBuild
+
+    - task: MSBuild@1
+      displayName: Build and package
       inputs:
         solution: '$(solution)'
-        vsVersion: 'latest'
         platform: $(buildPlatform)
         configuration: $(buildConfiguration)
-        msbuildArgs: '/t:PrepareForBuild /t:Rebuild'
 
     - task: CopyFiles@2
       displayName: 'Copy Files to: $(build.artifactstagingdirectory)'