From 61d6e7558d7fa5b32836e1c88cdcf9b547eebc08 Mon Sep 17 00:00:00 2001
From: Robin Krom <robin.krom@gmail.com>
Date: Mon, 29 Apr 2019 22:52:19 +0200
Subject: [PATCH] Using Azure DevOps pipeline build for publishing a single-exe
 Greenshot

---
 azure-pipelines.yml                      | 27 ++++++++++++-----
 src/Directory.Build.props                |  2 +-
 src/Greenshot/Forms/AboutForm.cs         |  8 ++++-
 src/Greenshot/Helpers/EnvironmentInfo.cs | 37 +++++++++++++++---------
 4 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8ada15d18..4db6aa0c7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,20 +29,31 @@ steps:
     restoreSolution: '$(solution)'
     feedsToUse: config
 
-- task: VSBuild@1
-  displayName: 'Build solution **\*.sln'
+- task: DotNetCoreCLI@2
+  displayName: Publish single-exe x64
   inputs:
-    vsVersion: 'latest'
-    solution: '$(solution)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    command: 'publish'
+    publishWebProjects: false
+    projects: 'src\Greenshot\Greenshot.csproj'
+    arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x64'
+    zipAfterPublish: false
+
+- task: DotNetCoreCLI@2
+  displayName: Publish single-exe x86
+  inputs:
+    command: 'publish'
+    publishWebProjects: false
+    projects: 'src\Greenshot\Greenshot.csproj'
+    arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x86'
+    zipAfterPublish: false
 
 - task: CopyFiles@2
   displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
   inputs:
-    SourceFolder: '$(Build.SourcesDirectory)\src\Greenshot\bin\$(BuildConfiguration)'
+    SourceFolder: '$(Build.SourcesDirectory)\src\Greenshot\bin\Release\netcoreapp3.0'
     Contents: |
-     **
+     win-x64\publish\Greenshot.exe
+     win-x86\publish\Greenshot.exe
     TargetFolder: '$(build.artifactstagingdirectory)'
     flattenFolders: false
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index de13677e1..03fb7ef19 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -57,7 +57,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
   </ItemGroup>
 
-  <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="$(MSBuildProjectName.Contains('Addon.')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo')) And ($(OsProductName.Contains('Windows 10')) Or (!$(OsProductName.Contains('Windows 10')) And !$(MSBuildProjectName.Contains('Win10'))))">
+  <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true' And $(MSBuildProjectName.Contains('Addon.')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo')) And ($(OsProductName.Contains('Windows 10')) Or (!$(OsProductName.Contains('Windows 10')) And !$(MSBuildProjectName.Contains('Win10'))))">
     <Exec Command="
     xcopy /q /y /d &quot;$(TargetDir)$(TargetName).*&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
     xcopy /q /y /d &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
diff --git a/src/Greenshot/Forms/AboutForm.cs b/src/Greenshot/Forms/AboutForm.cs
index 17616deb0..2eda362f5 100644
--- a/src/Greenshot/Forms/AboutForm.cs
+++ b/src/Greenshot/Forms/AboutForm.cs
@@ -34,6 +34,9 @@ using Greenshot.Addons.Animation;
 using Greenshot.Addons.Controls;
 using Greenshot.Addons.Core;
 using Greenshot.Gfx;
+using Dapplo.Windows.User32;
+using Dapplo.Windows.Dpi;
+using System.Text;
 
 namespace Greenshot.Forms
 {
@@ -354,7 +357,10 @@ namespace Greenshot.Forms
                         DialogResult = DialogResult.Cancel;
                         break;
                     case Keys.E:
-                        MessageBox.Show(EnvironmentInfo.EnvironmentToString(true));
+                        var info = new StringBuilder(EnvironmentInfo.EnvironmentToString(true));
+                        var screenboundsSize = DisplayInfo.ScreenBounds.Size;
+                        info.AppendFormat("Screen: {0} at {1}%", $"{screenboundsSize.Width} x {screenboundsSize.Height}", FormDpiHandler.ScaleWithCurrentDpi(100));
+                        MessageBox.Show(info.ToString(), "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         break;
                     case Keys.L:
                         // TODO: Open the log file
diff --git a/src/Greenshot/Helpers/EnvironmentInfo.cs b/src/Greenshot/Helpers/EnvironmentInfo.cs
index 6be15ad63..5da2b4a4a 100644
--- a/src/Greenshot/Helpers/EnvironmentInfo.cs
+++ b/src/Greenshot/Helpers/EnvironmentInfo.cs
@@ -59,8 +59,7 @@ namespace Greenshot.Helpers
 
 		public static string EnvironmentToString(bool newline)
 		{
-			var environment = new StringBuilder();
-			environment.Append("Software version: " + Application.ProductVersion);
+			var environment = new StringBuilder("Software version: " + Application.ProductVersion);
 			environment.Append(" (" + OsInfo.Bits + " bit)");
 
 			if (newline)
@@ -88,6 +87,16 @@ namespace Greenshot.Helpers
 
 			if (IsWindows)
 			{
+                if (newline)
+                {
+                    environment.AppendLine();
+                }
+                else
+                {
+                    environment.Append(", ");
+                }
+
+				environment.AppendFormat("OS: {0} {1} {2} (x{3}) {4}", OsInfo.Name, OsInfo.Edition, OsInfo.ServicePack, OsInfo.Bits, OsInfo.VersionString);
 				if (newline)
 				{
 					environment.AppendLine();
@@ -96,17 +105,19 @@ namespace Greenshot.Helpers
 				{
 					environment.Append(", ");
 				}
-				environment.Append(string.Format("OS: {0} {1} {2} (x{3})  {4}", OsInfo.Name, OsInfo.Edition, OsInfo.ServicePack, OsInfo.Bits, OsInfo.VersionString));
-				if (newline)
-				{
-					environment.AppendLine();
-				}
-				else
-				{
-					environment.Append(", ");
-				}
-				// Get some important information for fixing GDI related Problems
-				environment.AppendFormat("GDI object count: {0}", User32Api.GetGuiResourcesGdiCount());
+
+                environment.AppendFormat("Location: {0}", Assembly.GetEntryAssembly()?.Location);
+                if (newline)
+                {
+                    environment.AppendLine();
+                }
+                else
+                {
+                    environment.Append(", ");
+                }
+
+                // Get some important information for fixing GDI related Problems
+                environment.AppendFormat("GDI object count: {0}", User32Api.GetGuiResourcesGdiCount());
 				if (newline)
 				{
 					environment.AppendLine();