Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Hammer.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<OutputType>Exe</OutputType>
<PackageId>Hammer.Validator</PackageId>
<IsPackable>false</IsPackable>
<Version>0.0.2</Version>
Expand All @@ -9,6 +11,7 @@
<PackageProjectUrl>https://github.com/health-validator/Hammer</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/health-validator/Hammer/blob/master/LICENSE</PackageLicenseUrl>
<PackageIconUrl>https://github.com/health-validator/Hammer/raw/master/assets/hammer-logo.png</PackageIconUrl>
<ApplicationIcon>assets/hammer-logo.ico</ApplicationIcon>
<RepositoryUrl>https://github.com/health-validator/Hammer</RepositoryUrl>
<PackageTags>validator, fhir, xml, json, crossplatform</PackageTags>
</PropertyGroup>
Expand All @@ -17,10 +20,6 @@
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux')) and '$(Configuration)' == 'Release'">
<OutputType>Exe</OutputType>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
Expand Down Expand Up @@ -122,6 +121,7 @@
<Content Include="*.qml" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
<Content Include="assets/run-hammer.sh" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
<Content Include="assets/run-hammer.bat" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
<Content Include="assets/hammer-logo.ico" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
<Content Include="assets/fonts/RobotoCondensed-Regular.ttf" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
<Content Include="RobotoMono-Regular.ttf" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,7 @@ static int Main(string[] args)
QCoreApplication.OrganizationDomain = "Hammer.mc";
QCoreApplication.OrganizationName = "Hammer";
engine.Load(Path.Combine(AppModel.Extensions.GetApplicationLocation(), "Main.qml"));
app.SetWindowIcon(Path.Combine(AppModel.Extensions.GetApplicationLocation(), "assets", "hammer-logo.png"));

// Once the GUI is loaded, we can start working with the AppModel
// instance.
Expand Down