diff --git a/Dll/Bass/BassDlls.csproj b/Dll/Bass/BassDlls.csproj
index 1b840db7..32be2407 100644
--- a/Dll/Bass/BassDlls.csproj
+++ b/Dll/Bass/BassDlls.csproj
@@ -4,7 +4,7 @@
win-x64;win-x86;linux-x64;osx-x64
-
+
%(Filename)%(Extension)
Always
@@ -16,7 +16,7 @@
Always
-
+
%(Filename)%(Extension)
Always
diff --git a/Dll/BassEnc/BassEncDlls.csproj b/Dll/BassEnc/BassEncDlls.csproj
index cfa2c6b4..ff0ba003 100644
--- a/Dll/BassEnc/BassEncDlls.csproj
+++ b/Dll/BassEnc/BassEncDlls.csproj
@@ -4,7 +4,7 @@
win-x64;win-x86;linux-x64;osx-x64
-
+
%(Filename)%(Extension)
Always
@@ -16,7 +16,7 @@
Always
-
+
%(Filename)%(Extension)
Always
diff --git a/Dll/Directory.Build.props b/Dll/Directory.Build.props
new file mode 100644
index 00000000..54016da4
--- /dev/null
+++ b/Dll/Directory.Build.props
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/Dll/FFmpeg/FFmpegExe.csproj b/Dll/FFmpeg/FFmpegExe.csproj
index 66fd1013..7c97dc92 100644
--- a/Dll/FFmpeg/FFmpegExe.csproj
+++ b/Dll/FFmpeg/FFmpegExe.csproj
@@ -4,7 +4,7 @@
win-x64;win-x86;linux-x64;osx-x64
-
+
%(Filename)%(Extension)
Always
diff --git a/Publish/publish-win-all b/Publish/publish-win-all
index 06f7a11b..f0e5e6f0 100755
--- a/Publish/publish-win-all
+++ b/Publish/publish-win-all
@@ -1,11 +1,19 @@
-./publish-win Player432Hz win-x64
-./publish-win Player432Hz win-x86
+./publish-win Player432Hz win-x64 zip
+./publish-win Player432Hz win-x86 zip
+./publish-win Player432Hz win-x64 setup
+./publish-win Player432Hz win-x86 setup
-./publish-win Converter432Hz win-x64
-./publish-win Converter432Hz win-x86
+./publish-win Converter432Hz win-x64 zip
+./publish-win Converter432Hz win-x86 zip
+./publish-win Converter432Hz win-x64 setup
+./publish-win Converter432Hz win-x86 setup
-./publish-win PowerliminalsPlayer win-x64
-./publish-win PowerliminalsPlayer win-x86
+./publish-win PowerliminalsPlayer win-x64 zip
+./publish-win PowerliminalsPlayer win-x86 zip
+./publish-win PowerliminalsPlayer win-x64 setup
+./publish-win PowerliminalsPlayer win-x86 setup
-./publish-win YangDownloader win-x64
-./publish-win YangDownloader win-x86
+./publish-win YangDownloader win-x64 zip
+./publish-win YangDownloader win-x86 zip
+./publish-win YangDownloader win-x64 setup
+./publish-win YangDownloader win-x86 setup
diff --git a/Publish/publish-win-all.bat b/Publish/publish-win-all.bat
index fdbb0a8c..358e9116 100644
--- a/Publish/publish-win-all.bat
+++ b/Publish/publish-win-all.bat
@@ -1,19 +1,35 @@
-call publish-win Player432Hz win-x64
+call publish-win Player432Hz win-x64 zip
if ERRORLEVEL 1 exit /b !ERRORLEVEL!
-call publish-win Player432Hz win-x86
+call publish-win Player432Hz win-x86 zip
+if ERRORLEVEL 1 exit /b !ERRORLEVEL!
+::call publish-win Player432Hz win-x64 setup
+if ERRORLEVEL 1 exit /b !ERRORLEVEL!
+::call publish-win Player432Hz win-x86 setup
if ERRORLEVEL 1 exit /b !ERRORLEVEL!
-call publish-win Converter432Hz win-x64
+call publish-win Converter432Hz win-x64 zip
+if ERRORLEVEL 1 exit /b !ERRORLEVEL!
+call publish-win Converter432Hz win-x86 zip
+if ERRORLEVEL 1 exit /b !ERRORLEVEL!
+::call publish-win Converter432Hz win-x64 setup
if ERRORLEVEL 1 exit /b !ERRORLEVEL!
-call publish-win Converter432Hz win-x86
+::call publish-win Converter432Hz win-x86 setup
if ERRORLEVEL 1 exit /b !ERRORLEVEL!
-call publish-win PowerliminalsPlayer win-x64
+call publish-win PowerliminalsPlayer win-x64 zip
if ERRORLEVEL 1 exit /b !ERRORLEVEL!
-call publish-win PowerliminalsPlayer win-x86
+call publish-win PowerliminalsPlayer win-x86 zip
+if ERRORLEVEL 1 exit /b !ERRORLEVEL!
+::call publish-win PowerliminalsPlayer win-x64 setup
+if ERRORLEVEL 1 exit /b !ERRORLEVEL!
+::call publish-win PowerliminalsPlayer win-x86 setup
if ERRORLEVEL 1 exit /b !ERRORLEVEL!
-call publish-win YangDownloader win-x64
+call publish-win YangDownloader win-x64 zip
+if ERRORLEVEL 1 exit /b !ERRORLEVEL!
+call publish-win YangDownloader win-x86 zip
+if ERRORLEVEL 1 exit /b !ERRORLEVEL!
+::call publish-win YangDownloader win-x64 setup
if ERRORLEVEL 1 exit /b !ERRORLEVEL!
-call publish-win YangDownloader win-x86
+::call publish-win YangDownloader win-x86 setup
diff --git a/Src/App.Converter432Hz/Converter432Hz/Converter432Hz.csproj b/Src/App.Converter432Hz/Converter432Hz/Converter432Hz.csproj
index 971bfba0..930b722b 100644
--- a/Src/App.Converter432Hz/Converter432Hz/Converter432Hz.csproj
+++ b/Src/App.Converter432Hz/Converter432Hz/Converter432Hz.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/Src/App.Converter432Hz/Deploy/pupnet.conf b/Src/App.Converter432Hz/Deploy/pupnet.conf
index b6aeca10..e020ce8c 100644
--- a/Src/App.Converter432Hz/Deploy/pupnet.conf
+++ b/Src/App.Converter432Hz/Deploy/pupnet.conf
@@ -278,7 +278,7 @@ DebianRecommends = """
# Boolean (true or false) which specifies whether the application is to be installed in administrative
# mode, or per-user. Default is false. See: https://jrsoftware.org/ishelp/topic_admininstallmode.htm
-SetupAdminInstall = false
+SetupAdminInstall = true
# Optional command prompt title. The Windows installer will NOT add your application to the path. However,
# if your package contains a command-line utility, setting this value will ensure that a 'Command Prompt'
diff --git a/Src/App.NaturalGroundingPlayer/NaturalGroundingPlayer/ViewLocator.cs b/Src/App.NaturalGroundingPlayer/NaturalGroundingPlayer/ViewLocator.cs
index d7899911..60f6b6d3 100644
--- a/Src/App.NaturalGroundingPlayer/NaturalGroundingPlayer/ViewLocator.cs
+++ b/Src/App.NaturalGroundingPlayer/NaturalGroundingPlayer/ViewLocator.cs
@@ -1,4 +1,3 @@
-using System;
using Avalonia.Controls;
using Avalonia.Controls.Templates;
using HanumanInstitute.MvvmDialogs.Avalonia;
diff --git a/Src/App.Player432Hz/Deploy/pupnet.conf b/Src/App.Player432Hz/Deploy/pupnet.conf
index db1c499c..ec442e60 100644
--- a/Src/App.Player432Hz/Deploy/pupnet.conf
+++ b/Src/App.Player432Hz/Deploy/pupnet.conf
@@ -278,7 +278,7 @@ DebianRecommends = """
# Boolean (true or false) which specifies whether the application is to be installed in administrative
# mode, or per-user. Default is false. See: https://jrsoftware.org/ishelp/topic_admininstallmode.htm
-SetupAdminInstall = false
+SetupAdminInstall = true
# Optional command prompt title. The Windows installer will NOT add your application to the path. However,
# if your package contains a command-line utility, setting this value will ensure that a 'Command Prompt'
diff --git a/Src/App.Player432Hz/Player432Hz/Player432Hz.csproj b/Src/App.Player432Hz/Player432Hz/Player432Hz.csproj
index 673369ff..c803a625 100644
--- a/Src/App.Player432Hz/Player432Hz/Player432Hz.csproj
+++ b/Src/App.Player432Hz/Player432Hz/Player432Hz.csproj
@@ -8,13 +8,11 @@
-
-
-
+
diff --git a/Src/App.PowerliminalsPlayer/Deploy/pupnet.conf b/Src/App.PowerliminalsPlayer/Deploy/pupnet.conf
index 3c436fba..d02a058a 100644
--- a/Src/App.PowerliminalsPlayer/Deploy/pupnet.conf
+++ b/Src/App.PowerliminalsPlayer/Deploy/pupnet.conf
@@ -278,7 +278,7 @@ DebianRecommends = """
# Boolean (true or false) which specifies whether the application is to be installed in administrative
# mode, or per-user. Default is false. See: https://jrsoftware.org/ishelp/topic_admininstallmode.htm
-SetupAdminInstall = false
+SetupAdminInstall = true
# Optional command prompt title. The Windows installer will NOT add your application to the path. However,
# if your package contains a command-line utility, setting this value will ensure that a 'Command Prompt'
diff --git a/Src/App.PowerliminalsPlayer/PowerliminalsPlayer/PowerliminalsPlayer.csproj b/Src/App.PowerliminalsPlayer/PowerliminalsPlayer/PowerliminalsPlayer.csproj
index 080e681e..4d42c288 100644
--- a/Src/App.PowerliminalsPlayer/PowerliminalsPlayer/PowerliminalsPlayer.csproj
+++ b/Src/App.PowerliminalsPlayer/PowerliminalsPlayer/PowerliminalsPlayer.csproj
@@ -8,15 +8,14 @@
-
-
-
+
+
all
diff --git a/Src/App.YangDownloader/Deploy/pupnet.conf b/Src/App.YangDownloader/Deploy/pupnet.conf
index c5270680..7a392908 100644
--- a/Src/App.YangDownloader/Deploy/pupnet.conf
+++ b/Src/App.YangDownloader/Deploy/pupnet.conf
@@ -278,7 +278,7 @@ DebianRecommends = """
# Boolean (true or false) which specifies whether the application is to be installed in administrative
# mode, or per-user. Default is false. See: https://jrsoftware.org/ishelp/topic_admininstallmode.htm
-SetupAdminInstall = false
+SetupAdminInstall = true
# Optional command prompt title. The Windows installer will NOT add your application to the path. However,
# if your package contains a command-line utility, setting this value will ensure that a 'Command Prompt'
diff --git a/Src/App.YangDownloader/YangDownloader.Desktop/Program.cs b/Src/App.YangDownloader/YangDownloader.Desktop/Program.cs
index cefd8bc7..29515588 100644
--- a/Src/App.YangDownloader/YangDownloader.Desktop/Program.cs
+++ b/Src/App.YangDownloader/YangDownloader.Desktop/Program.cs
@@ -1,5 +1,7 @@
using System;
+using System.Diagnostics.CodeAnalysis;
using Avalonia;
+using Avalonia.Controls;
using HanumanInstitute.Apps;
namespace HanumanInstitute.YangDownloader.Desktop;
@@ -11,6 +13,7 @@ public class Program
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
// yet and stuff might break.
[STAThread]
+ [DynamicDependency(DynamicallyAccessedMemberTypes.PublicEvents, typeof(WindowBase))]
public static void Main(string[] args) => AppStarter.Start(args,
() => ViewModelLocator.SettingsProvider.Value,
() => ViewModelLocator.AppPathService.UnhandledExceptionLogPath);
diff --git a/Src/App.YangDownloader/YangDownloader/Roots.xml b/Src/App.YangDownloader/YangDownloader/Roots.xml
index ba0caa73..5ceb4ebc 100644
--- a/Src/App.YangDownloader/YangDownloader/Roots.xml
+++ b/Src/App.YangDownloader/YangDownloader/Roots.xml
@@ -2,4 +2,9 @@
+
+
+
+
+
diff --git a/Src/App.YangDownloader/YangDownloader/YangDownloader.csproj b/Src/App.YangDownloader/YangDownloader/YangDownloader.csproj
index a1c2f5b2..0df6caf1 100644
--- a/Src/App.YangDownloader/YangDownloader/YangDownloader.csproj
+++ b/Src/App.YangDownloader/YangDownloader/YangDownloader.csproj
@@ -11,15 +11,13 @@
-
-
-
-
-
+
+
+
diff --git a/Src/BassAudio/BassAudio.csproj b/Src/BassAudio/BassAudio.csproj
index c35894f4..2be2eb9c 100644
--- a/Src/BassAudio/BassAudio.csproj
+++ b/Src/BassAudio/BassAudio.csproj
@@ -11,6 +11,7 @@
+
@@ -20,7 +21,6 @@
-
diff --git a/Src/HanumanInstituteApps.sln b/Src/HanumanInstituteApps.sln
index 92916789..8352c6ab 100644
--- a/Src/HanumanInstituteApps.sln
+++ b/Src/HanumanInstituteApps.sln
@@ -27,10 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BassAudio", "BassAudio\Bass
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BassAudio.Tests", "BassAudio.Tests\BassAudio.Tests.csproj", "{0E6275FF-12BE-4B62-BD93-C2E455FDEEAD}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaPlayer.Avalonia", "..\..\MediaPlayerUI.NET\Avalonia\MediaPlayer.Avalonia.csproj", "{8C4531B9-61FD-4425-A751-F2B54D14F111}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaPlayer.Avalonia.Bass", "..\..\MediaPlayerUI.NET\Avalonia.Bass\MediaPlayer.Avalonia.Bass.csproj", "{1697E531-1E21-4076-844E-6B12D572D6FD}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Player432Hz.Tests", "App.Player432Hz\Player432Hz.Tests\Player432Hz.Tests.csproj", "{8652B70C-58DD-42AA-A569-596B723EED65}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YangDownloader.Tests", "App.YangDownloader\YangDownloader.Tests\YangDownloader.Tests.csproj", "{3B7BA209-F325-4261-B924-D25E4C6BC2FD}"
@@ -145,14 +141,6 @@ Global
{0E6275FF-12BE-4B62-BD93-C2E455FDEEAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E6275FF-12BE-4B62-BD93-C2E455FDEEAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E6275FF-12BE-4B62-BD93-C2E455FDEEAD}.Release|Any CPU.Build.0 = Release|Any CPU
- {8C4531B9-61FD-4425-A751-F2B54D14F111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8C4531B9-61FD-4425-A751-F2B54D14F111}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8C4531B9-61FD-4425-A751-F2B54D14F111}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8C4531B9-61FD-4425-A751-F2B54D14F111}.Release|Any CPU.Build.0 = Release|Any CPU
- {1697E531-1E21-4076-844E-6B12D572D6FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1697E531-1E21-4076-844E-6B12D572D6FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1697E531-1E21-4076-844E-6B12D572D6FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1697E531-1E21-4076-844E-6B12D572D6FD}.Release|Any CPU.Build.0 = Release|Any CPU
{8652B70C-58DD-42AA-A569-596B723EED65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8652B70C-58DD-42AA-A569-596B723EED65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8652B70C-58DD-42AA-A569-596B723EED65}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -297,8 +285,6 @@ Global
{C188E071-0108-4AFA-A924-0D41CC0B393E} = {773F8319-6427-490A-961C-51102B229014}
{660D6AB9-E0D7-4BE1-B5A3-1B1ECD1E9A6B} = {773F8319-6427-490A-961C-51102B229014}
{CD2F9633-80D2-4B5D-AC4B-187F74488E76} = {F9C7F9DA-0464-4BC9-9E97-696A4FC8D86D}
- {8C4531B9-61FD-4425-A751-F2B54D14F111} = {F9C7F9DA-0464-4BC9-9E97-696A4FC8D86D}
- {1697E531-1E21-4076-844E-6B12D572D6FD} = {F9C7F9DA-0464-4BC9-9E97-696A4FC8D86D}
{B9D35B98-BC89-45D1-AD30-B96C9A06E987} = {3A46E6E2-0C87-44FF-9C60-0D8422857424}
{E71151BE-68FD-44D1-96E4-DFA941AFBC42} = {3A46E6E2-0C87-44FF-9C60-0D8422857424}
{BFCB242E-980E-46EF-A144-D5415F60C9BA} = {3A46E6E2-0C87-44FF-9C60-0D8422857424}