Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jg/221114 testbuild arm64 #461

Open
wants to merge 2 commits into
base: release/1.3
Choose a base branch
from
Open

Jg/221114 testbuild arm64 #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
647811b
first build on ARM64
jglathe Nov 14, 2022
74ac1d1
fix: changes for ARM64 build
jglathe Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added installer/Greenshot-INSTALLER-1.3.275-UNSTABLE.exe
View file
Open in desktop
Binary file not shown.
27 changes: 14 additions & 13 deletions installer/innosetup/setup.iss
View file
Open in desktop
Expand Up @@ -4,8 +4,9 @@
#define BaseDir "..\..\src"
#define GreenshotProjectDir "..\..\src\Greenshot"
#define LanguagesDir "..\..\src\Greenshot\Languages"
#define BinDir "bin\Release\net472"
#define ReleaseDir "..\..\src\Greenshot\bin\Release\net472"
#define BinDir "bin\ARM64\Release\net472"
#define ReleaseDir "..\..\src\Greenshot\bin\ARM64\Release\net472"
#define PluginDirARM64 "..\..\src\Greenshot\bin\ARM64\Release\net472\Plugins"
#define PluginDir "..\..\src\Greenshot\bin\Release\net472\Plugins"

; Include the scripts to install .NET Framework
Expand Down Expand Up @@ -82,15 +83,15 @@ Source: {#LanguagesDir}\*zh-CN*; Excludes: "*installer*,*website*"; DestDir: {ap
Source: {#LanguagesDir}\*zh-TW*; Excludes: "*installer*,*website*"; DestDir: {app}\Languages; Components: languages\zhTW; Flags: overwritereadonly ignoreversion replacesameversion;

;Office Plugin
Source: {#PluginDir}\Greenshot.Plugin.Office\Greenshot.Plugin.Office.dll; DestDir: {app}\Plugins\Office; Components: plugins\office; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDirARM64}\Greenshot.Plugin.Office\Greenshot.Plugin.Office.dll; DestDir: {app}\Plugins\Office; Components: plugins\office; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
;JIRA Plugin
Source: {#PluginDir}\Greenshot.Plugin.Jira\*Jira*.dll; DestDir: {app}\Plugins\Jira; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#BaseDir}\Greenshot.Plugin.Jira\Languages\language_jira*.xml; DestDir: {app}\Languages\Plugins\Jira; Components: plugins\jira; Flags: overwritereadonly ignoreversion replacesameversion;
;Imgur Plugin
Source: {#PluginDir}\Greenshot.Plugin.Imgur\Greenshot.Plugin.Imgur.dll; DestDir: {app}\Plugins\Imgur; Components: plugins\imgur; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDirARM64}\Greenshot.Plugin.Imgur\Greenshot.Plugin.Imgur.dll; DestDir: {app}\Plugins\Imgur; Components: plugins\imgur; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#BaseDir}\Greenshot.Plugin.Imgur\Languages\language_imgur*.xml; DestDir: {app}\Languages\Plugins\Imgur; Components: plugins\imgur; Flags: overwritereadonly ignoreversion replacesameversion;
;Box Plugin
Source: {#PluginDir}\Greenshot.Plugin.Box\Greenshot.Plugin.Box.dll; DestDir: {app}\Plugins\Box; Components: plugins\box; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDirARM64}\Greenshot.Plugin.Box\Greenshot.Plugin.Box.dll; DestDir: {app}\Plugins\Box; Components: plugins\box; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#BaseDir}\Greenshot.Plugin.Box\Languages\language_box*.xml; DestDir: {app}\Languages\Plugins\Box; Components: plugins\box; Flags: overwritereadonly ignoreversion replacesameversion;
;DropBox Plugin
Source: {#PluginDir}\Greenshot.Plugin.DropBox\Greenshot.Plugin.DropBox.dll; DestDir: {app}\Plugins\DropBox; Components: plugins\dropbox; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Expand All @@ -99,17 +100,17 @@ Source: {#BaseDir}\Greenshot.Plugin.DropBox\Languages\language_dropbox*.xml; Des
Source: {#PluginDir}\Greenshot.Plugin.Flickr\Greenshot.Plugin.Flickr.dll; DestDir: {app}\Plugins\Flickr; Components: plugins\flickr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#BaseDir}\Greenshot.Plugin.Flickr\Languages\language_flickr*.xml; DestDir: {app}\Languages\Plugins\Flickr; Components: plugins\flickr; Flags: overwritereadonly ignoreversion replacesameversion;
;Photobucket Plugin
Source: {#PluginDir}\Greenshot.Plugin.Photobucket\Greenshot.Plugin.Photobucket.dll; DestDir: {app}\Plugins\Photobucket; Components: plugins\photobucket; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDirARM64}\Greenshot.Plugin.Photobucket\Greenshot.Plugin.Photobucket.dll; DestDir: {app}\Plugins\Photobucket; Components: plugins\photobucket; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#BaseDir}\Greenshot.Plugin.Photobucket\Languages\language_photo*.xml; DestDir: {app}\Languages\Plugins\Photobucket; Components: plugins\photobucket; Flags: overwritereadonly ignoreversion replacesameversion;
;Confluence Plugin
Source: {#PluginDir}\Greenshot.Plugin.Confluence\Greenshot.Plugin.Confluence.dll; DestDir: {app}\Plugins\Confluence; Components: plugins\confluence; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDirARM64}\Greenshot.Plugin.Confluence\Greenshot.Plugin.Confluence.dll; DestDir: {app}\Plugins\Confluence; Components: plugins\confluence; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#BaseDir}\Greenshot.Plugin.Confluence\Languages\language_confluence*.xml; DestDir: {app}\Languages\Plugins\Confluence; Components: plugins\confluence; Flags: overwritereadonly ignoreversion replacesameversion;
;ExternalCommand Plugin
Source: {#PluginDir}\Greenshot.Plugin.ExternalCommand\Greenshot.Plugin.ExternalCommand.dll; DestDir: {app}\Plugins\ExternalCommand; Components: plugins\externalcommand; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDirARM64}\Greenshot.Plugin.ExternalCommand\Greenshot.Plugin.ExternalCommand.dll; DestDir: {app}\Plugins\ExternalCommand; Components: plugins\externalcommand; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#BaseDir}\Greenshot.Plugin.ExternalCommand\Languages\language_externalcommand*.xml; DestDir: {app}\Languages\Plugins\ExternalCommand; Components: plugins\externalcommand; Flags: overwritereadonly ignoreversion replacesameversion;
;Win 10 Plugin
Source: {#PluginDir}\Greenshot.Plugin.Win10\Greenshot.Plugin.Win10.dll; DestDir: {app}\Plugins\Win10; Components: plugins\win10; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDir}\Greenshot.Plugin.Win10\Microsoft.Toolkit.Uwp.Notifications.dll; DestDir: {app}\Plugins\Win10; Components: plugins\win10; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDirARM64}\Greenshot.Plugin.Win10\Greenshot.Plugin.Win10.dll; DestDir: {app}\Plugins\Win10; Components: plugins\win10; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#PluginDirARM64}\Greenshot.Plugin.Win10\Microsoft.Toolkit.Uwp.Notifications.dll; DestDir: {app}\Plugins\Win10; Components: plugins\win10; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;

[Setup]
; changes associations is used when the installer installs new extensions, it clears the explorer icon cache
Expand Down Expand Up @@ -717,15 +718,15 @@ end;
// Initialize the setup
function InitializeSetup(): Boolean;
begin
// Check for .NET and install 4.7.1 if we don't have it
// Check for .NET and install 4.7.2 if we don't have it
if not hasDotNet() then
begin
// Enhance installer, if needed, otherwise .NET installations won't work
msi20('2.0');
msi31('3.0');

//install .net 4.7.1
dotnetfx47(71);
//install .net 4.7.2
dotnetfx47(72);
end;
Result := true;
end;
Expand Down
1 change: 1 addition & 0 deletions src/Greenshot.Base/Greenshot.Base.csproj
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>

<ItemGroup>
Expand Down
25 changes: 7 additions & 18 deletions src/Greenshot.Editor/Greenshot.Editor.csproj
View file
Open in desktop
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
Expand Down Expand Up @@ -49,30 +50,18 @@
<Compile Update="Drawing\Surface.cs">
<SubType>Component</SubType>
</Compile>
<Compile Update="Forms\ColorDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Forms\ColorDialog.cs" />
<Compile Update="Forms\ColorPickerToolStripButton.cs">
<SubType>Component</SubType>
</Compile>
<Compile Update="Forms\DropShadowSettingsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Forms\EditorForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Forms\ImageEditorForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Forms\DropShadowSettingsForm.cs" />
<Compile Update="Forms\EditorForm.cs" />
<Compile Update="Forms\ImageEditorForm.cs" />
<Compile Update="Forms\MovableShowColorForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Forms\ResizeSettingsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Forms\TornEdgeSettingsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Forms\ResizeSettingsForm.cs" />
<Compile Update="Forms\TornEdgeSettingsForm.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.csproj
View file
Open in desktop
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
3 changes: 3 additions & 0 deletions src/Greenshot.Plugin.Confluence/Greenshot.Plugin.Confluence.csproj
View file
Open in desktop
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
3 changes: 3 additions & 0 deletions src/Greenshot.Plugin.ExternalCommand/Greenshot.Plugin.ExternalCommand.csproj
View file
Open in desktop
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
3 changes: 3 additions & 0 deletions src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.csproj
View file
Open in desktop
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
3 changes: 3 additions & 0 deletions src/Greenshot.Plugin.Office/Greenshot.Plugin.Office.csproj
View file
Open in desktop
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
3 changes: 3 additions & 0 deletions src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.csproj
View file
Open in desktop
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
3 changes: 3 additions & 0 deletions src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj
View file
Open in desktop
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Platforms>AnyCPU;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down