diff --git a/Directory.Build.props b/Directory.Build.props
index b3141a62d..b9b05c5bb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -63,6 +63,14 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
+  <Target Name="Test Variables" BeforeTargets="PrepareForBuild" >
+    <Message Text="Box Client Id $(Box_ClientId)" Importance="high"/>
+    <Message Text="DropBox Client Id $(DropBox_ClientId)" Importance="high"/>
+    <Message Text="Flickr Client Id $(Flickr_ClientId)" Importance="high"/>
+    <Message Text="Photobucket Client Id $(Photobucket_ClientId)" Importance="high"/>
+    <Message Text="Picasa Client Id $(Picasa_ClientId)" Importance="high"/>
+  </Target>
+
   <ItemGroup>
     <Tokens Include="Box_ClientId">
       <ReplacementValue>$(Box_ClientId)</ReplacementValue>
@@ -109,7 +117,7 @@
   <Import Project="$(PkgTools_MSBuildTasks)MSBuild.Community.Tasks.Targets" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')"/>
 
   <Target Name="ProcessTemplates" BeforeTargets="PrepareForBuild" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')">
-    <Message Text="Processing: $(ProjectDir)$(ProjectName).Credentials.template" /> 
+    <Message Text="Processing: $(ProjectDir)$(ProjectName).Credentials.template" Importance="high"/> 
     <TemplateFile Template="$(ProjectDir)$(ProjectName).Credentials.template" OutputFilename="$(ProjectDir)$(ProjectName).Credentials.cs" Tokens="@(Tokens)" />
   </Target>
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 25ca84c4f..ff9fd8056 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,9 +15,6 @@ stages:
 - stage: Build
   jobs:
   - job: Build
-    pool:
-      vmImage: 'Windows-latest'
-
     variables:
     - group: 'Plug-in Credentials'
     - name: solution
@@ -27,6 +24,9 @@ stages:
     - name: buildConfiguration
       value: 'Release'
 
+    pool:
+      vmImage: 'Windows-latest'
+
     steps:
     - task: NuGetToolInstaller@1