github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 05:23:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Working on making the build run with azure-pipelines.yml, some changes were needed to fix the paths

Browse source
This commit is contained in:
Robin 2020-03-03 13:57:37 +01:00
commit 2aaac6edc6
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Directory.Build.props
View file

@ -102,18 +102,18 @@
</Tokens> </Tokens>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="Exists('$(ProjectName).Credentials.template')"> <ItemGroup Condition="Exists('$(SolutionDir)$(ProjectName).Credentials.template')">
<PackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true"/> <PackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true"/>
</ItemGroup> </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')"> <Target Name="Process templates" BeforeTargets="PrepareForBuild" Condition="Exists('$(SolutionDir)$(ProjectName).Credentials.template')">
<Message Text="Processing: $(ProjectName).Credentials.template" /> <Message Text="Processing: $(SolutionDir)$(ProjectName).Credentials.template" />
<TemplateFile Template="$(ProjectName).Credentials.template" OutputFilename="$(ProjectName).Credentials.cs" Tokens="@(Tokens)" /> <TemplateFile Template="$(SolutionDir)$(ProjectName).Credentials.template" OutputFilename="$(SolutionDir)$(ProjectName).Credentials.cs" Tokens="@(Tokens)" />
</Target> </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=" <Exec Command="
xcopy /y /d &quot;$(TargetDir)$(TargetName).*&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA; xcopy /y /d &quot;$(TargetDir)$(TargetName).*&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;

5
Greenshot/releases/innosetup/setup.iss
View file

@ -1,6 +1,7 @@
#define ExeName "Greenshot" #define ExeName "Greenshot"
#define Version GetEnv('BuildVersionSimple') #define Version GetEnv('BuildVersionSimple')
#define FileVersion GetEnv('AssemblyInformationalVersion') #define FileVersion GetEnv('AssemblyInformationalVersion')
#define BaseDir "..\..\.."
#define ReleaseDir "..\..\bin\Release\net472" #define ReleaseDir "..\..\bin\Release\net472"
; Include the scripts to install .NET Framework ; Include the scripts to install .NET Framework
@ -81,8 +82,8 @@ Source: {#ReleaseDir}\Languages\language_office*.xml; DestDir: {app}\Languages\P
;OCR Plugin ;OCR Plugin
Source: {#ReleaseDir}\GreenshotOCRPlugin.dll; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion; 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: {#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: {#BaseDir}\GreenshotOCRCommand\bin\Release\net472\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.config; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
;JIRA Plugin ;JIRA Plugin
Source: {#ReleaseDir}\GreenshotJiraPlugin.dll; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion; 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; Source: {#ReleaseDir}\Dapplo.Jira.dll; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;

1
GreenshotPlugin/GreenshotPlugin.csproj
View file

@ -13,6 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.10.9" />
<PackageReference Include="log4net" version="2.0.8" /> <PackageReference Include="log4net" version="2.0.8" />
<PackageReference Include="Svg" Version="3.0.102" /> <PackageReference Include="Svg" Version="3.0.102" />
<PackageReference Include="ZXing.Net" Version="0.16.5" /> <PackageReference Include="ZXing.Net" Version="0.16.5" />

1
azure-pipelines.yml
View file

@ -22,6 +22,7 @@ stages:
solution: 'Greenshot.sln' solution: 'Greenshot.sln'
buildPlatform: 'Any CPU' buildPlatform: 'Any CPU'
buildConfiguration: 'Release' buildConfiguration: 'Release'
group: 'Plug-in Credentials'
steps: steps:
- task: NuGetToolInstaller@1 - task: NuGetToolInstaller@1