Installer improvements

elzik · Oct 15, 2023 · be052fd · be052fd
1 parent 5f94d32
commit be052fd
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 51 deletions.
diff --git a/Build/continuous-integration.ps1 → Build/build-and-test.ps1 b/Build/continuous-integration.ps1 → Build/build-and-test.ps1
@@ -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 `

diff --git a/Build/build-windows-installer.ps1 b/Build/build-windows-installer.ps1
@@ -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
diff --git a/Elzik.FmSync.sln b/Elzik.FmSync.sln
@@ -26,16 +26,13 @@ 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\build-and-test.ps1 = Build\build-and-test.ps1
+		Build\build-windows-installer.ps1 = Build\build-windows-installer.ps1
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Publish", "Publish", "{069FD2C8-3AFB-4D61-A19A-3257331FC223}"
-	ProjectSection(SolutionItems) = preProject
-		Publish\local-install.ps1 = Publish\local-install.ps1
-		Publish\publish.ps1 = Publish\publish.ps1
-	EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{069FD2C8-3AFB-4D61-A19A-3257331FC223}"
 EndProject
-Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Elzik.FmSync.WindowsInstaller", "Publish\Elzik.FmSync.WindowsInstaller\Elzik.FmSync.WindowsInstaller.wixproj", "{534679A3-D29B-4D63-882B-C09F4D0EA8CB}"
+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

diff --git a/...indowsInstaller/ConsoleComponentGroup.wxs → ...indowsInstaller/ConsoleComponentGroup.wxs b/...indowsInstaller/ConsoleComponentGroup.wxs → ...indowsInstaller/ConsoleComponentGroup.wxs
@@ -3,7 +3,7 @@
 	  <ComponentGroup Id="Console" Directory="CONSOLE_INSTALLFOLDER">
 		  <Component Id="ConsoleExecutable" Bitness="always64">
 			  <File Id="Elzik.FmSync.Console.exe"
-			        Source="$(var.SolutionDir)Publish\output\Elzik.FmSync.Console\win-x64\fmsync.exe"
+			        Source="$(var.Elzik.FmSync.Console.TargetDir)publish\fmsync.exe"
 			        KeyPath="true" />
 			  <Environment Id="Path"
 						   Name="PATH"
@@ -16,7 +16,7 @@
 		  </Component>
 		  <Component Id="ConsoleConfig" Permanent="true">
 			  <File Id="console.appSettings.json"
-			        Source="$(var.SolutionDir)Publish\output\Elzik.FmSync.Console\win-x64\appSettings.json"
+			        Source="$(var.Elzik.FmSync.Console.TargetDir)publish\appSettings.json"
 			        KeyPath="true" />
 		  </Component>
 	  </ComponentGroup>

diff --git a/...ler/Elzik.FmSync.WindowsInstaller.wixproj → ...ler/Elzik.FmSync.WindowsInstaller.wixproj b/...ler/Elzik.FmSync.WindowsInstaller.wixproj → ...ler/Elzik.FmSync.WindowsInstaller.wixproj
@@ -1,12 +1,12 @@
 <Project Sdk="WixToolset.Sdk/4.0.0">
   <ItemGroup>
-    <None Include="CreateEula.ps1" />
     <None Include="LICENSE.rtf" />
   </ItemGroup>
   <ItemGroup>
     <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>
diff --git a/...Elzik.FmSync.WindowsInstaller/Folders.wxs → ...Elzik.FmSync.WindowsInstaller/Folders.wxs b/...Elzik.FmSync.WindowsInstaller/Folders.wxs → ...Elzik.FmSync.WindowsInstaller/Folders.wxs
diff --git a/...Elzik.FmSync.WindowsInstaller/LICENSE.rtf → ...Elzik.FmSync.WindowsInstaller/LICENSE.rtf b/...Elzik.FmSync.WindowsInstaller/LICENSE.rtf → ...Elzik.FmSync.WindowsInstaller/LICENSE.rtf
diff --git a/...FmSync.WindowsInstaller/Package.en-us.wxl → ...FmSync.WindowsInstaller/Package.en-us.wxl b/...FmSync.WindowsInstaller/Package.en-us.wxl → ...FmSync.WindowsInstaller/Package.en-us.wxl
diff --git a/...Elzik.FmSync.WindowsInstaller/Package.wxs → ...Elzik.FmSync.WindowsInstaller/Package.wxs b/...Elzik.FmSync.WindowsInstaller/Package.wxs → ...Elzik.FmSync.WindowsInstaller/Package.wxs
diff --git a/...WindowsInstaller/WorkerComponentGroup.wxs → ...WindowsInstaller/WorkerComponentGroup.wxs b/...WindowsInstaller/WorkerComponentGroup.wxs → ...WindowsInstaller/WorkerComponentGroup.wxs
@@ -6,7 +6,7 @@
 	  <ComponentGroup Id="Worker" Directory="WORKER_INSTALLFOLDER">
 		  <Component Id="WorkerExecutable" Bitness="always64">
 			  <File Id="Elzik.FmSync.Worker.exe"
-			        Source="$(var.SolutionDir)Publish\output\Elzik.FmSync.Worker\win-x64\Elzik.FmSync.Worker.exe"
+			        Source="$(var.Elzik.FmSync.Worker.TargetDir)publish\Elzik.FmSync.Worker.exe"
 			        KeyPath="true" />
 
 				    <RemoveFile Id="ALL_WORKER_EXECUTABLES" Name="*.exe" On="both" />
@@ -28,7 +28,7 @@
 		  </Component>
 		  <Component Id="WorkerConfig" Permanent="true">
 			  <File Id="worker.appSettings.json"
-			        Source="$(var.SolutionDir)Publish\output\Elzik.FmSync.Worker\win-x64\appSettings.json"
+			        Source="$(var.Elzik.FmSync.Worker.TargetDir)publish\appSettings.json"
 			        KeyPath="true" />
 		  </Component>
 	  </ComponentGroup>

diff --git a/Publish/local-install.ps1 b/Publish/local-install.ps1
diff --git a/Publish/publish.ps1 b/Publish/publish.ps1