Skip to content

Commit ec42f8e

Browse files
committed
v1.2.0 alpha commit - repository is once again fork-friendly
1 parent 87775bc commit ec42f8e

40 files changed

+2131
-1026
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.

Advanced Installer/Advanced Installer.aip

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
<ROW Property="ALLUSERS" Value="1"/>
2929
<ROW Property="ARPCOMMENTS" Value="The software that lets you control your computer using your personal assistants (Amazon Alexa or Google Assistant)" ValueLocId="*"/>
3030
<ROW Property="ARPCONTACT" Value="https://twitter.com/ACC_HomeAlexa"/>
31-
<ROW Property="ARPHELPLINK" Value="https://acc.albe.pw/#get-in-touch"/>
31+
<ROW Property="ARPHELPLINK" Value="https://assistantcomputercontrol.com/#get-in-touch"/>
3232
<ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
3333
<ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
3434
<ROW Property="ARPPRODUCTICON" Value="logoico.exe" Type="8"/>
35-
<ROW Property="ARPURLINFOABOUT" Value="https://acc.albe.pw/"/>
36-
<ROW Property="ARPURLUPDATEINFO" Value="https://acc.albe.pw/"/>
35+
<ROW Property="ARPURLINFOABOUT" Value="https://assistantcomputercontrol.com/"/>
36+
<ROW Property="ARPURLUPDATEINFO" Value="https://assistantcomputercontrol.com/"/>
3737
<ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:banner.png" Type="1" MsiKey="BannerBitmap"/>
3838
<ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:dialogbitmap.png" Type="1" MsiKey="DialogBitmap"/>
3939
<ROW Property="Manufacturer" Value="Albert MN."/>
40-
<ROW Property="ProductCode" Value="1033:{C7450E85-3B70-43E5-8B80-14073ECA4E1A} " Type="16"/>
40+
<ROW Property="ProductCode" Value="1033:{5094A6BE-49B8-4539-8E0C-A96AEE65DA2C} " Type="16"/>
4141
<ROW Property="ProductLanguage" Value="1033"/>
4242
<ROW Property="ProductName" Value="AssistantComputerControl"/>
43-
<ROW Property="ProductVersion" Value="1.1.3.8" Type="32"/>
43+
<ROW Property="ProductVersion" Value="1.1.5.0" Type="32"/>
4444
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
4545
<ROW Property="UpgradeCode" Value="{8E6F4399-B513-420B-8E11-36837A8550EE}"/>
4646
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -55,41 +55,58 @@
5555
<COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
5656
<ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
5757
<ROW Directory="AssistantComputerControl_Dir" Directory_Parent="PersonalFolder" DefaultDir="ASSIST~1|AssistantComputerControl"/>
58-
<ROW Directory="NewFolder_Dir" Directory_Parent="APPDIR" DefaultDir="ABOUTV~1|AboutVersionWeb"/>
5958
<ROW Directory="PersonalFolder" Directory_Parent="TARGETDIR" DefaultDir="PERSON~1|PersonalFolder" IsPseudoRoot="1"/>
6059
<ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/>
6160
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
62-
<ROW Directory="assets_Dir" Directory_Parent="NewFolder_Dir" DefaultDir="assets"/>
61+
<ROW Directory="WebFiles_Dir" Directory_Parent="APPDIR" DefaultDir="WebFiles"/>
62+
<ROW Directory="assets_Dir" Directory_Parent="WebFiles_Dir" DefaultDir="assets"/>
63+
<ROW Directory="cloud_services_Dir" Directory_Parent="assets_Dir" DefaultDir="CLOUD_~1|cloud_services"/>
64+
<ROW Directory="gifs_Dir" Directory_Parent="assets_Dir" DefaultDir="gifs"/>
6365
<ROW Directory="shortcuts_Dir" Directory_Parent="AssistantComputerControl_Dir" DefaultDir="SHORTC~1|shortcuts"/>
6466
</COMPONENT>
6567
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
6668
<ROW Component="AI_ExePath" ComponentId="{6A7517F1-AD5E-4733-B687-97C1799E298C}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
6769
<ROW Component="AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe" ComponentId="{96EDF0E9-D6F9-4B38-84EE-46DB345E2EE4}" Directory_="APPDIR" Attributes="0" KeyPath="AssistantComputerControl.exe"/>
6870
<ROW Component="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" ComponentId="{75B8D396-B011-4F76-943A-6FD24E3726E3}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.WindowsAPICodePack.dll" Type="0"/>
71+
<ROW Component="AboutVersion.html" ComponentId="{0A203C51-FFCA-4640-B9DF-80AA6D0BA39A}" Directory_="WebFiles_Dir" Attributes="0" KeyPath="AboutVersion.html" Type="0"/>
6972
<ROW Component="AssistantComputerControl_PrimaryOutput" ComponentId="{6D6B0D60-588B-4115-BB23-8350BF6AD151}" Directory_="APPDIR" Attributes="0" KeyPath="AssistantComputerControl.exe.config"/>
7073
<ROW Component="ProductInformation" ComponentId="{72E5C433-D45C-45F4-AF47-0DD66CC8E52E}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
7174
<ROW Component="SHORTCUTDIR" ComponentId="{4405308F-0979-4250-8A8D-0622FA7AF17C}" Directory_="SHORTCUTDIR" Attributes="0"/>
72-
<ROW Component="acc_logo.png" ComponentId="{1B4574A4-7ACC-4427-829D-EDF16B7C0CDC}" Directory_="assets_Dir" Attributes="0" KeyPath="acc_logo.png" Type="0"/>
73-
<ROW Component="index.html" ComponentId="{B4547172-2B7D-42F0-A492-A45125B194BF}" Directory_="NewFolder_Dir" Attributes="0" KeyPath="index.html" Type="0"/>
75+
<ROW Component="acc_logo.png" ComponentId="{4890DA1F-3186-412E-96C5-DAE09D9AB930}" Directory_="assets_Dir" Attributes="0" KeyPath="acc_logo.png" Type="0"/>
76+
<ROW Component="dropbox.png" ComponentId="{D37A979E-CD29-4402-AAD8-C7B59CFFBC6B}" Directory_="cloud_services_Dir" Attributes="0" KeyPath="dropbox.png" Type="0"/>
77+
<ROW Component="onedrive_howto.gif" ComponentId="{A4027689-B15E-409E-8C55-69C1B6E37135}" Directory_="gifs_Dir" Attributes="0" KeyPath="onedrive_howto.gif" Type="0"/>
7478
<ROW Component="shortcuts" ComponentId="{3AD7B8C4-6A66-4FF8-99B1-47940292F2CC}" Directory_="shortcuts_Dir" Attributes="0"/>
7579
</COMPONENT>
7680
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
77-
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_ExePath AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll AssistantComputerControl_PrimaryOutput ProductInformation SHORTCUTDIR acc_logo.png index.html shortcuts"/>
81+
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_ExePath AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll AboutVersion.html AssistantComputerControl_PrimaryOutput ProductInformation SHORTCUTDIR acc_logo.png dropbox.png onedrive_howto.gif shortcuts"/>
7882
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
7983
</COMPONENT>
8084
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
85+
<ROW File="AboutVersion.html" Component_="AboutVersion.html" FileName="ABOUTV~1.HTM|AboutVersion.html" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\AboutVersion.html" SelfReg="false" NextFile="GettingStarted.html"/>
8186
<ROW File="AssistantComputerControl.exe" Component_="AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe" FileName="ASSIST~1.EXE|[|AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_AssistantComputerControl.exe&gt;" SelfReg="false" NextFile="AssistantComputerControl.exe.config" DigSign="true"/>
8287
<ROW File="AssistantComputerControl.exe.config" Component_="AssistantComputerControl_PrimaryOutput" FileName="ASSIST~1.CON|[|AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe.config]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_AssistantComputerControl.exe.config&gt;" SelfReg="false" NextFile="Microsoft.WindowsAPICodePack.dll"/>
88+
<ROW File="GettingStarted.html" Component_="AboutVersion.html" FileName="GETTIN~1.HTM|GettingStarted.html" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\GettingStarted.html" SelfReg="false" NextFile="ifttt_bot_test.html"/>
8389
<ROW File="Microsoft.WindowsAPICodePack.Shell.dll" Component_="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" FileName="MICROS~2.DLL|[|AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.Shell.dll]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_Microsoft.WindowsAPICodePack.Shell.dll&gt;" SelfReg="false" NextFile="Newtonsoft.Json.dll"/>
8490
<ROW File="Microsoft.WindowsAPICodePack.dll" Component_="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" FileName="MICROS~1.DLL|[|AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_Microsoft.WindowsAPICodePack.dll&gt;" SelfReg="false" NextFile="Microsoft.WindowsAPICodePack.Shell.dll"/>
91+
<ROW File="NewVersion.Designer.cs" Component_="AboutVersion.html" FileName="NEWVER~2.CS|NewVersion.Designer.cs" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\NewVersion.Designer.cs" SelfReg="false" NextFile="NewVersion.resx"/>
92+
<ROW File="NewVersion.cs" Component_="AboutVersion.html" FileName="NEWVER~1.CS|NewVersion.cs" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\NewVersion.cs" SelfReg="false" NextFile="NewVersion.Designer.cs"/>
93+
<ROW File="NewVersion.resx" Component_="AboutVersion.html" FileName="NEWVER~1.RES|NewVersion.resx" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\NewVersion.resx" SelfReg="false" NextFile="acc_logo.png"/>
8594
<ROW File="Newtonsoft.Json.dll" Component_="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" FileName="NEWTON~1.DLL|[|AI_PROPPATH_FILENAME_PERBUILD_Newtonsoft.Json.dll]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_Newtonsoft.Json.dll&gt;" SelfReg="false" NextFile="Sentry.dll"/>
8695
<ROW File="Sentry.PlatformAbstractions.dll" Component_="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" FileName="SENTRY~2.DLL|[|AI_PROPPATH_FILENAME_PERBUILD_Sentry.PlatformAbstractions.dll]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_Sentry.PlatformAbstractions.dll&gt;" SelfReg="false" NextFile="Sentry.Protocol.dll"/>
8796
<ROW File="Sentry.Protocol.dll" Component_="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" FileName="SENTRY~3.DLL|[|AI_PROPPATH_FILENAME_PERBUILD_Sentry.Protocol.dll]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_Sentry.Protocol.dll&gt;" SelfReg="false" NextFile="System.Collections.Immutable.dll"/>
8897
<ROW File="Sentry.dll" Component_="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" FileName="[|AI_PROPPATH_FILENAME_PERBUILD_Sentry.dll]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_Sentry.dll&gt;" SelfReg="false" NextFile="Sentry.PlatformAbstractions.dll"/>
89-
<ROW File="System.Collections.Immutable.dll" Component_="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" FileName="SYSTEM~2.DLL|[|AI_PROPPATH_FILENAME_PERBUILD_System.Collections.Immutable.dll]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_System.Collections.Immutable.dll&gt;" SelfReg="false" NextFile="index.html"/>
90-
<ROW File="acc_logo.png" Component_="acc_logo.png" FileName="acc_logo.png" Attributes="0" SourcePath="..\AssistantComputerControl\AboutVersionWeb\assets\acc_logo.png" SelfReg="false" NextFile="bootstrap.min.css"/>
91-
<ROW File="bootstrap.min.css" Component_="acc_logo.png" FileName="BOOTST~1.CSS|bootstrap.min.css" Attributes="0" SourcePath="..\AssistantComputerControl\AboutVersionWeb\assets\bootstrap.min.css" SelfReg="false"/>
92-
<ROW File="index.html" Component_="index.html" FileName="INDEX~1.HTM|index.html" Attributes="0" SourcePath="..\AssistantComputerControl\AboutVersionWeb\index.html" SelfReg="false" NextFile="acc_logo.png"/>
98+
<ROW File="System.Collections.Immutable.dll" Component_="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" FileName="SYSTEM~2.DLL|[|AI_PROPPATH_FILENAME_PERBUILD_System.Collections.Immutable.dll]" Attributes="0" SourcePath="&lt;AI_APPPATH_PERBUILD_System.Collections.Immutable.dll&gt;" SelfReg="false" NextFile="AboutVersion.html"/>
99+
<ROW File="acc_logo.png" Component_="acc_logo.png" FileName="acc_logo.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\acc_logo.png" SelfReg="false" NextFile="bootstrap.min.css"/>
100+
<ROW File="bootstrap.min.css" Component_="acc_logo.png" FileName="BOOTST~1.CSS|bootstrap.min.css" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\bootstrap.min.css" SelfReg="false" NextFile="jquery.js"/>
101+
<ROW File="dropbox.png" Component_="dropbox.png" FileName="dropbox.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\cloud_services\dropbox.png" SelfReg="false" NextFile="expert.png"/>
102+
<ROW File="expert.png" Component_="dropbox.png" FileName="expert.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\cloud_services\expert.png" SelfReg="false" NextFile="googledrive.png"/>
103+
<ROW File="googledrive.png" Component_="dropbox.png" FileName="GOOGLE~1.PNG|googledrive.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\cloud_services\googledrive.png" SelfReg="false" NextFile="onedrive.png"/>
104+
<ROW File="ifttt_bot_test.html" Component_="AboutVersion.html" FileName="IFTTT_~1.HTM|ifttt_bot_test.html" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\ifttt_bot_test.html" SelfReg="false" NextFile="NewVersion.cs"/>
105+
<ROW File="jquery.js" Component_="acc_logo.png" FileName="jquery.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\jquery.js" SelfReg="false" NextFile="onedrive_howto.gif"/>
106+
<ROW File="onedrive.png" Component_="dropbox.png" FileName="onedrive.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\cloud_services\onedrive.png" SelfReg="false"/>
107+
<ROW File="onedrive_howto.gif" Component_="onedrive_howto.gif" FileName="ONEDRI~1.GIF|onedrive_howto.gif" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\gifs\onedrive_howto.gif" SelfReg="false" NextFile="sync_all_folders.gif"/>
108+
<ROW File="sync_all_folders.gif" Component_="onedrive_howto.gif" FileName="SYNC_A~1.GIF|sync_all_folders.gif" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\gifs\sync_all_folders.gif" SelfReg="false" NextFile="sync_specific_folder.gif"/>
109+
<ROW File="sync_specific_folder.gif" Component_="onedrive_howto.gif" FileName="SYNC_S~1.GIF|sync_specific_folder.gif" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\gifs\sync_specific_folder.gif" SelfReg="false" NextFile="dropbox.png"/>
93110
</COMPONENT>
94111
<COMPONENT cid="caphyon.advinst.msicomp.AppPathsComponent">
95112
<ROW Name="AI_APPPATH_PERBUILD_AssistantComputerControl.exe" Path="[|AI_PROPPATH_DIR_PERBUILD_AssistantComputerControl.exe]\[|AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe]" Type="2" Content="0"/>

AssistantComputerControl/ACC_Updater.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
namespace AssistantComputerControl {
1111
class ACC_Updater {
12-
private const string releaseJsonUrl = "http://acc.albe.pw/versions/latest_version.php?type=release";
13-
private const string betaJsonUrl = "http://acc.albe.pw/versions/latest_version.php?type=beta";
12+
private const string releaseJsonUrl = "https://assistantcomputercontrol.com/versions/latest_version.php?type=release";
13+
private const string betaJsonUrl = "https://assistantcomputercontrol.com/versions/latest_version.php?type=beta";
1414

1515
public bool Check(bool debug = false) {
1616
if (MainProgram.isCheckingForUpdate)

0 commit comments

Comments
 (0)