From 2aaac6edc6f2b46fa38afd1e74228e897867b49f Mon Sep 17 00:00:00 2001
From: Robin <robin@getgreenshot.org>
Date: Tue, 3 Mar 2020 13:57:37 +0100
Subject: [PATCH] Working on making the build run with azure-pipelines.yml,
 some changes were needed to fix the paths

---
 Directory.Build.props                  | 12 ++++++------
 Greenshot/releases/innosetup/setup.iss |  5 +++--
 GreenshotPlugin/GreenshotPlugin.csproj |  1 +
 azure-pipelines.yml                    |  1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 5008ba798..2986c4f3e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -102,18 +102,18 @@
     </Tokens>
   </ItemGroup>
 
-  <ItemGroup Condition="Exists('$(ProjectName).Credentials.template')">
+  <ItemGroup Condition="Exists('$(SolutionDir)$(ProjectName).Credentials.template')">
     <PackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true"/>
   </ItemGroup>
 
-  <Import Project="$(PkgTools_MSBuildTasks)MSBuild.Community.Tasks.Targets" Condition="Exists('$(ProjectName).Credentials.template')"/>
+  <Import Project="$(PkgTools_MSBuildTasks)MSBuild.Community.Tasks.Targets" Condition="Exists('$(SolutionDir)$(ProjectName).Credentials.template')"/>
 
-  <Target Name="Process templates" BeforeTargets="PrepareForBuild" Condition="Exists('$(ProjectName).Credentials.template')">
-    <Message Text="Processing: $(ProjectName).Credentials.template" /> 
-    <TemplateFile Template="$(ProjectName).Credentials.template" OutputFilename="$(ProjectName).Credentials.cs" Tokens="@(Tokens)" />
+  <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>
 
-  <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true' And $(MSBuildProjectName.Contains('Plugin')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
+  <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="$(MSBuildProjectName.Contains('Plugin')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
     <Exec Command="
 
     xcopy /y /d &quot;$(TargetDir)$(TargetName).*&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss
index 15bcb5f22..8ef3323ec 100644
--- a/Greenshot/releases/innosetup/setup.iss
+++ b/Greenshot/releases/innosetup/setup.iss
@@ -1,6 +1,7 @@
 #define ExeName "Greenshot"
 #define Version GetEnv('BuildVersionSimple')
 #define FileVersion GetEnv('AssemblyInformationalVersion')
+#define BaseDir "..\..\.."
 #define ReleaseDir "..\..\bin\Release\net472"
 
 ; Include the scripts to install .NET Framework
@@ -81,8 +82,8 @@ Source: {#ReleaseDir}\Languages\language_office*.xml; DestDir: {app}\Languages\P
 ;OCR Plugin
 Source: {#ReleaseDir}\GreenshotOCRPlugin.dll; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
 Source: {#ReleaseDir}\Languages\language_ocr*.xml; DestDir: {app}\Languages\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly ignoreversion replacesameversion;
-Source: ..\..\..\GreenshotOCRCommand\bin\Release\net471\GreenshotOCRCommand.exe; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
-Source: ..\..\..\GreenshotOCRCommand\bin\Release\net471\GreenshotOCRCommand.exe.config; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: {#BaseDir}\GreenshotOCRCommand\bin\Release\net472\GreenshotOCRCommand.exe; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+Source: {#BaseDir}\GreenshotOCRCommand\bin\Release\net472\GreenshotOCRCommand.exe.config; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
 ;JIRA Plugin
 Source: {#ReleaseDir}\GreenshotJiraPlugin.dll; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
 Source: {#ReleaseDir}\Dapplo.Jira.dll; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj
index 05c7ba595..16ba0a08c 100644
--- a/GreenshotPlugin/GreenshotPlugin.csproj
+++ b/GreenshotPlugin/GreenshotPlugin.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.10.9" />
     <PackageReference Include="log4net" version="2.0.8" />
     <PackageReference Include="Svg" Version="3.0.102" />
     <PackageReference Include="ZXing.Net" Version="0.16.5" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7d2f5177b..2733806ca 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,6 +22,7 @@ stages:
       solution: 'Greenshot.sln'
       buildPlatform: 'Any CPU'
       buildConfiguration: 'Release'
+      group: 'Plug-in Credentials'
 
     steps:
     - task: NuGetToolInstaller@1