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.

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

Add Windows Installer #8

Merged
merged 12 commits into from
Oct 18, 2023
Merged
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
9 changes: 7 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
name: Continuous Integration

on:
[push, pull_request]
push:
branches:
- main
pull_request:
branches:
- '*'

jobs:
build:
Expand All @@ -21,7 +26,7 @@ jobs:
with:
dotnet-version: 7.0.x
- name: Build & Test
run: ./Build/continuous-integration.ps1
run: ./Build/build-and-test.ps1
shell: pwsh
- name: Upoload Coverage Badge
if: github.event_name != 'pull_request' && matrix.os == 'windows-latest'
Expand Down
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,6 @@ DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
Expand Down Expand Up @@ -348,4 +345,6 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/
/Build/output

# Solution specific items
/Publish/output
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
dotnet build $PSScriptRoot\..\Elzik.FmSync.sln

dotnet test `
--no-build `
-c Release `
--verbosity normal `
-p:CollectCoverage=true `
-p:CoverletOutput=TestResults/coverage.opencover.xml `
Expand Down
20 changes: 20 additions & 0 deletions Build/build-windows-installer.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
dotnet publish $PSScriptRoot\..\src\Elzik.FmSync.Worker\Elzik.FmSync.Worker.csproj `
--runtime win-x64 `
--self-contained true `
--configuration Release `
-p:Platform=x64 `
-p:PublishSingleFile=true

dotnet publish $PSScriptRoot\..\src\Elzik.FmSync.Console\Elzik.FmSync.Console.csproj `
--runtime win-x64 `
--self-contained true `
--configuration Release `
-p:Platform=x64 `
-p:PublishSingleFile=true

dotnet build $PSScriptRoot\..\Installer\Elzik.FmSync.WindowsInstaller\Elzik.FmSync.WindowsInstaller.wixproj `
--runtime win-x64 `
--self-contained true `
--configuration Release `
-p:Platform=x64 `
-p:PublishSingleFile=true
15 changes: 0 additions & 15 deletions Build/local-install.ps1

This file was deleted.

4 changes: 4 additions & 0 deletions Build/local-pipeline.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
$ErrorActionPreference = "Stop"

& Build/build-and-test.ps1
& Build/build-windows-installer.ps1
18 changes: 0 additions & 18 deletions Build/publish.ps1

This file was deleted.

116 changes: 113 additions & 3 deletions Elzik.FmSync.sln
Original file line number Diff line number Diff line change
Expand Up @@ -26,52 +26,162 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{0FE56BA0-BDDF-4291-9BDD-A6D512610FAE}"
ProjectSection(SolutionItems) = preProject
Build\continuous-integration.ps1 = Build\continuous-integration.ps1
Build\local-install.ps1 = Build\local-install.ps1
Build\publish.ps1 = Build\publish.ps1
Build\build-and-test.ps1 = Build\build-and-test.ps1
Build\build-windows-installer.ps1 = Build\build-windows-installer.ps1
Build\local-pipeline.ps1 = Build\local-pipeline.ps1
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{069FD2C8-3AFB-4D61-A19A-3257331FC223}"
EndProject
Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Elzik.FmSync.WindowsInstaller", "Installer\Elzik.FmSync.WindowsInstaller\Elzik.FmSync.WindowsInstaller.wixproj", "{534679A3-D29B-4D63-882B-C09F4D0EA8CB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1035A230-3923-494E-A01A-C41670922EE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Debug|ARM64.Build.0 = Debug|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Debug|x64.ActiveCfg = Debug|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Debug|x64.Build.0 = Debug|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Debug|x86.ActiveCfg = Debug|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Debug|x86.Build.0 = Debug|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Release|Any CPU.Build.0 = Release|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Release|ARM64.ActiveCfg = Release|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Release|ARM64.Build.0 = Release|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Release|x64.ActiveCfg = Release|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Release|x64.Build.0 = Release|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Release|x86.ActiveCfg = Release|Any CPU
{1035A230-3923-494E-A01A-C41670922EE9}.Release|x86.Build.0 = Release|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Debug|ARM64.Build.0 = Debug|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Debug|x64.ActiveCfg = Debug|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Debug|x64.Build.0 = Debug|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Debug|x86.ActiveCfg = Debug|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Debug|x86.Build.0 = Debug|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Release|Any CPU.Build.0 = Release|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Release|ARM64.ActiveCfg = Release|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Release|ARM64.Build.0 = Release|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Release|x64.ActiveCfg = Release|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Release|x64.Build.0 = Release|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Release|x86.ActiveCfg = Release|Any CPU
{8313B3C5-6FF8-449E-B3DE-6304BAACD62C}.Release|x86.Build.0 = Release|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Debug|ARM64.Build.0 = Debug|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Debug|x64.ActiveCfg = Debug|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Debug|x64.Build.0 = Debug|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Debug|x86.ActiveCfg = Debug|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Debug|x86.Build.0 = Debug|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Release|Any CPU.Build.0 = Release|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Release|ARM64.ActiveCfg = Release|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Release|ARM64.Build.0 = Release|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Release|x64.ActiveCfg = Release|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Release|x64.Build.0 = Release|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Release|x86.ActiveCfg = Release|Any CPU
{FF4D804A-C032-4E93-92A0-14580AA7D0CE}.Release|x86.Build.0 = Release|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Debug|ARM64.Build.0 = Debug|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Debug|x64.ActiveCfg = Debug|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Debug|x64.Build.0 = Debug|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Debug|x86.ActiveCfg = Debug|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Debug|x86.Build.0 = Debug|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Release|Any CPU.Build.0 = Release|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Release|ARM64.ActiveCfg = Release|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Release|ARM64.Build.0 = Release|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Release|x64.ActiveCfg = Release|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Release|x64.Build.0 = Release|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Release|x86.ActiveCfg = Release|Any CPU
{7A787CA3-E960-4FC2-8703-D0E0031EED46}.Release|x86.Build.0 = Release|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Debug|ARM64.Build.0 = Debug|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Debug|x64.ActiveCfg = Debug|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Debug|x64.Build.0 = Debug|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Debug|x86.ActiveCfg = Debug|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Debug|x86.Build.0 = Debug|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Release|Any CPU.Build.0 = Release|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Release|ARM64.ActiveCfg = Release|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Release|ARM64.Build.0 = Release|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Release|x64.ActiveCfg = Release|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Release|x64.Build.0 = Release|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Release|x86.ActiveCfg = Release|Any CPU
{5DB426BF-24B5-4E04-A593-A803FE5DC304}.Release|x86.Build.0 = Release|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Debug|ARM64.Build.0 = Debug|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Debug|x64.ActiveCfg = Debug|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Debug|x64.Build.0 = Debug|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Debug|x86.ActiveCfg = Debug|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Debug|x86.Build.0 = Debug|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Release|Any CPU.Build.0 = Release|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Release|ARM64.ActiveCfg = Release|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Release|ARM64.Build.0 = Release|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Release|x64.ActiveCfg = Release|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Release|x64.Build.0 = Release|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Release|x86.ActiveCfg = Release|Any CPU
{1367919E-184E-4550-B8BB-ECB37C056594}.Release|x86.Build.0 = Release|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Debug|ARM64.Build.0 = Debug|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Debug|x64.ActiveCfg = Debug|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Debug|x64.Build.0 = Debug|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Debug|x86.ActiveCfg = Debug|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Debug|x86.Build.0 = Debug|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Release|Any CPU.Build.0 = Release|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Release|ARM64.ActiveCfg = Release|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Release|ARM64.Build.0 = Release|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Release|x64.ActiveCfg = Release|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Release|x64.Build.0 = Release|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Release|x86.ActiveCfg = Release|Any CPU
{A3BB6C79-4D8F-4515-92B5-F169F929AF94}.Release|x86.Build.0 = Release|Any CPU
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Debug|Any CPU.ActiveCfg = Debug|x64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Debug|Any CPU.Build.0 = Debug|x64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Debug|ARM64.ActiveCfg = Debug|ARM64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Debug|ARM64.Build.0 = Debug|ARM64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Debug|x64.ActiveCfg = Debug|x64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Debug|x64.Build.0 = Debug|x64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Debug|x86.ActiveCfg = Debug|x86
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Debug|x86.Build.0 = Debug|x86
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Release|Any CPU.ActiveCfg = Release|x64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Release|ARM64.ActiveCfg = Release|ARM64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Release|ARM64.Build.0 = Release|ARM64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Release|x64.ActiveCfg = Release|x64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Release|x64.Build.0 = Release|x64
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Release|x86.ActiveCfg = Release|x86
{534679A3-D29B-4D63-882B-C09F4D0EA8CB}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1367919E-184E-4550-B8BB-ECB37C056594} = {CF17A395-4536-42A5-B10B-D2D8EC602BC3}
{A3BB6C79-4D8F-4515-92B5-F169F929AF94} = {CF17A395-4536-42A5-B10B-D2D8EC602BC3}
{534679A3-D29B-4D63-882B-C09F4D0EA8CB} = {069FD2C8-3AFB-4D61-A19A-3257331FC223}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {87997352-098C-46F7-8BDC-29A370A780DB}
Expand Down
2 changes: 2 additions & 0 deletions Elzik.FmSync.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=Elzik/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=fmsync/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=INSTALLFOLDER/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=msync/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Synchronised/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Synchroniser/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Synchronising/@EntryIndexedValue">True</s:Boolean>
Expand Down
24 changes: 24 additions & 0 deletions Installer/Elzik.FmSync.WindowsInstaller/ConsoleComponentGroup.wxs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<ComponentGroup Id="Console" Directory="CONSOLE_INSTALLFOLDER">
<Component Id="ConsoleExecutable" Bitness="always64">
<File Id="Elzik.FmSync.Console.exe"
Source="$(var.Elzik.FmSync.Console.TargetDir)publish\fmsync.exe"
KeyPath="true" />
<Environment Id="Path"
Name="PATH"
Value="[CONSOLE_INSTALLFOLDER]"
Permanent="no"
Part="last"
Action="set"
System="yes" />
<RemoveFile Id="ALL_CONSOLE_EXECUTABLES" Name="*.exe" On="both" />
</Component>
<Component Id="ConsoleConfig" Permanent="true">
<File Id="console.appSettings.json"
Source="$(var.Elzik.FmSync.Console.TargetDir)publish\appSettings.json"
KeyPath="true" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="WixToolset.Sdk/4.0.0">
<PropertyGroup>
<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
<GenerateGitVersionInformation>false</GenerateGitVersionInformation>
</PropertyGroup>
<ItemGroup>
<None Include="LICENSE.rtf" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Elzik.FmSync.Console\Elzik.FmSync.Console.csproj" />
<ProjectReference Include="..\..\src\Elzik.FmSync.Worker\Elzik.FmSync.Worker.csproj" />
</ItemGroup>
</Project>
15 changes: 15 additions & 0 deletions Installer/Elzik.FmSync.WindowsInstaller/Folders.wxs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?define Manufacturer = "Elzik" ?>
<?define Name = "fmsync" ?>

<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<StandardDirectory Id="ProgramFiles6432Folder">
<Directory Id="ELZIK_INSTALLFOLDER" Name="$(var.Manufacturer)">
<Directory Id="FMSYNC_INSTALLFOLDER" Name="$(var.Name)">
<Directory Id="WORKER_INSTALLFOLDER" Name="Service" />
<Directory Id="CONSOLE_INSTALLFOLDER" Name="CommandLine" />
</Directory>
</Directory>
</StandardDirectory>
</Fragment>
</Wix>
Loading