Skip to content

Commit fc13fcd

Browse files
AlbertMNAlbertMN
committed
v1.3.2 commit
1 parent 5ac92d4 commit fc13fcd

40 files changed

+2872
-274
lines changed

‎Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.exe

10.3 MB
Binary file not shown.

‎Advanced Installer/Advanced Installer-cache/part1/ACCsetup1.cab

21 KB
Binary file not shown.

‎Advanced Installer/Advanced Installer-cache/part1/output-info.ini

342 Bytes
Binary file not shown.

‎Advanced Installer/Advanced Installer.aip

+5-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
<ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:banner.png" Type="1" MsiKey="BannerBitmap"/>
3939
<ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:dialogbitmap.png" Type="1" MsiKey="DialogBitmap"/>
4040
<ROW Property="Manufacturer" Value="Albert MN."/>
41-
<ROW Property="ProductCode" Value="1033:{CAAFD843-42AE-4386-9031-52DFB2170D36} " Type="16"/>
41+
<ROW Property="ProductCode" Value="1033:{C1681279-6544-47D9-91C8-29CA6B4EA6FE} " Type="16"/>
4242
<ROW Property="ProductLanguage" Value="1033"/>
4343
<ROW Property="ProductName" Value="AssistantComputerControl"/>
44-
<ROW Property="ProductVersion" Value="1.3.0" Type="32"/>
44+
<ROW Property="ProductVersion" Value="1.3.2" Type="32"/>
4545
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
4646
<ROW Property="UpgradeCode" Value="{8E6F4399-B513-420B-8E11-36837A8550EE}"/>
4747
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -87,6 +87,7 @@
8787
<ROW File="AssistantComputerControl.exe" Component_="AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe" FileName="ASSIST~1.EXE|[|AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe]" Version="65535.65535.65535.65535" Attributes="512" SourcePath="&lt;AI_APPPATH_PERBUILD_AssistantComputerControl.exe&gt;" SelfReg="false" NextFile="AssistantComputerControl.exe.config" DigSign="true"/>
8888
<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"/>
8989
<ROW File="GettingStarted.html" Component_="AboutVersion.html" FileName="GETTIN~1.HTM|GettingStarted.html" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\GettingStarted.html" SelfReg="false" NextFile="NewVersion.cs"/>
90+
<ROW File="IECheck.html" Component_="AboutVersion.html" FileName="IECHEC~1.HTM|IECheck.html" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\IECheck.html" SelfReg="false"/>
9091
<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"/>
9192
<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"/>
9293
<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"/>
@@ -108,7 +109,7 @@
108109
<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"/>
109110
<ROW File="popper.min.js" Component_="acc_logo.png" FileName="POPPER~1.JS|popper.min.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\popper.min.js" SelfReg="false" NextFile="sweetalert2.min.css"/>
110111
<ROW File="sweetalert2.min.css" Component_="acc_logo.png" FileName="SWEETA~1.CSS|sweetalert2.min.css" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\sweetalert2.min.css" SelfReg="false" NextFile="sweetalert2.min.js"/>
111-
<ROW File="sweetalert2.min.js" Component_="acc_logo.png" FileName="SWEETA~1.JS|sweetalert2.min.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\sweetalert2.min.js" SelfReg="false"/>
112+
<ROW File="sweetalert2.min.js" Component_="acc_logo.png" FileName="SWEETA~1.JS|sweetalert2.min.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\sweetalert2.min.js" SelfReg="false" NextFile="IECheck.html"/>
112113
<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"/>
113114
<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="jquery.js"/>
114115
</COMPONENT>
@@ -134,7 +135,7 @@
134135
<ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
135136
</COMPONENT>
136137
<COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
137-
<ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" UseSha256="1" Thumbprint="a245f9f65b4520255edc006e003525de7c4fd3ad Subject: TestCert_2019-5-23_22-20-47&#10;Issuer: TestCert_2019-5-23_22-20-47&#10;Valid from 05/23/2019 to 05/23/2020"/>
138+
<ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" UseSha256="1" Thumbprint="afa6b9566c7c7423bdb32b766390d51fb71090ba Subject: AssistantComputerControl&#10;Issuer: AssistantComputerControl&#10;Valid from 10/27/2019 to 10/27/2020"/>
138139
</COMPONENT>
139140
<COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
140141
<ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>

‎AssistantComputerControl/ACC_Updater.cs

+27-20
Original file line numberDiff line numberDiff line change
@@ -150,29 +150,36 @@ public static bool RemoteFileExists(string url) {
150150

151151
private static string targetLocation = "";
152152
public static void DownloadFile(string url) {
153+
url += "&upgrade_id=" + Guid.NewGuid();
153154
if (RemoteFileExists(url)) {
154-
MainProgram.DoDebug("Downloading file...");
155-
WebClient client = new WebClient();
156-
Uri uri = new Uri(url);
157-
158-
MainProgram.updateProgressWindow = new UpdateProgress();
159-
MainProgram.updateProgressWindow.Show();
160-
161-
client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(DownloadProgressChanged);
162-
client.DownloadFileCompleted += new AsyncCompletedEventHandler(FileDownloadedCallback);
163-
164-
targetLocation = Path.Combine(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "Downloads"), "ACCsetup.exe");
165-
if (File.Exists(targetLocation)) {
166-
try {
167-
File.Delete(targetLocation);
168-
} catch (Exception ex) {
169-
MainProgram.DoDebug("Failed to delete file at " + targetLocation);
170-
MainProgram.DoDebug("Error; " + ex);
155+
MainProgram.DoDebug("Downloading file from url; " + url);
156+
157+
try {
158+
WebClient client = new WebClient();
159+
Uri uri = new Uri(url);
160+
161+
MainProgram.updateProgressWindow = new UpdateProgress();
162+
MainProgram.updateProgressWindow.Show();
163+
164+
client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(DownloadProgressChanged);
165+
client.DownloadFileCompleted += new AsyncCompletedEventHandler(FileDownloadedCallback);
166+
167+
targetLocation = Path.Combine(Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "Downloads"), "ACCsetup.exe");
168+
if (File.Exists(targetLocation)) {
169+
try {
170+
File.Delete(targetLocation);
171+
} catch (Exception ex) {
172+
MainProgram.DoDebug("Failed to delete file at " + targetLocation);
173+
MainProgram.DoDebug("Error; " + ex);
174+
}
171175
}
172-
}
173-
client.DownloadFileAsync(uri, targetLocation);
176+
client.DownloadFileAsync(uri, targetLocation);
174177

175-
Application.Run();
178+
Application.Run();
179+
} catch (Exception e) {
180+
MainProgram.DoDebug("Failed to download the new ACC installer; " + e.Message);
181+
MessageBox.Show("Failed to download the new ACC installer. Try again later, or download it manually from AssistantComputerControl.com", "Error | " + MainProgram.messageBoxTitle);
182+
}
176183
} else {
177184
MainProgram.DoDebug("Failed to update, installation URL does not exist (" + url + ").");
178185
MessageBox.Show("Couldn't find the new version online. Please try again later.", "Error | " + MainProgram.messageBoxTitle);

‎AssistantComputerControl/Actions.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void Shutdown(string parameter) {
7474

7575
if (MainProgram.testingAction) {
7676
successMessage = "Simulated shutdown";
77-
wasFatal = true;
77+
wasFatal = false;
7878
} else {
7979
if (shutdownParameters != "abort") {
8080
MainProgram.DoDebug("Shutting down computer...");
@@ -342,7 +342,8 @@ public void Open(string parameter) {
342342
p.StartInfo.Arguments = arguments;
343343
p.Start();
344344
successMessage = "OPEN: opened file/url; " + fileLocation;
345-
} catch {
345+
} catch (Exception e) {
346+
MainProgram.DoDebug("Failed to open file; " + e.Message);
346347
Error("Failed to open file (" + fileLocation + ")");
347348
}
348349
} else {

‎AssistantComputerControl/App.config

+15
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@
5656
<setting name="LastKnownVersion" serializeAs="String">
5757
<value />
5858
</setting>
59+
<setting name="UpdateSettings" serializeAs="String">
60+
<value>True</value>
61+
</setting>
62+
<setting name="FileReadDelay" serializeAs="String">
63+
<value>0</value>
64+
</setting>
65+
<setting name="LastUpdated" serializeAs="String">
66+
<value />
67+
</setting>
68+
<setting name="TimesOpened" serializeAs="String">
69+
<value>0</value>
70+
</setting>
71+
<setting name="HasPromptedFeedback" serializeAs="String">
72+
<value>False</value>
73+
</setting>
5974
</AssistantComputerControl.Properties.Settings>
6075
</userSettings>
6176
<runtime>

‎AssistantComputerControl/AssistantComputerControl.csproj

+25-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
3636
<WebPage>publish.htm</WebPage>
3737
<ApplicationRevision>0</ApplicationRevision>
38-
<ApplicationVersion>1.3.0.%2a</ApplicationVersion>
38+
<ApplicationVersion>1.3.2.%2a</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<CreateDesktopShortcut>true</CreateDesktopShortcut>
4141
<PublishWizardCompleted>true</PublishWizardCompleted>
@@ -71,7 +71,7 @@
7171
<SignManifests>false</SignManifests>
7272
</PropertyGroup>
7373
<PropertyGroup>
74-
<SignAssembly>true</SignAssembly>
74+
<SignAssembly>false</SignAssembly>
7575
</PropertyGroup>
7676
<PropertyGroup>
7777
<ManifestCertificateThumbprint>A11F159F4F4FE3DEA3D920DE0238C12162022396</ManifestCertificateThumbprint>
@@ -170,6 +170,12 @@
170170
<DesignTime>True</DesignTime>
171171
<DependentUpon>Resources.resx</DependentUpon>
172172
</Compile>
173+
<Compile Include="UserFeedback.cs">
174+
<SubType>Form</SubType>
175+
</Compile>
176+
<Compile Include="UserFeedback.Designer.cs">
177+
<DependentUpon>UserFeedback.cs</DependentUpon>
178+
</Compile>
173179
<Compile Include="WebFiles\NewVersion.cs">
174180
<SubType>Form</SubType>
175181
</Compile>
@@ -257,6 +263,9 @@
257263
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
258264
</Content>
259265
<Content Include="FodyWeavers.xml" />
266+
<Content Include="WebFiles\IECheck.html">
267+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
268+
</Content>
260269
<None Include="Resources\logo PNG.png" />
261270
<None Include="app.manifest" />
262271
<None Include="Resources\1484353419397.png" />
@@ -279,6 +288,9 @@
279288
<EmbeddedResource Include="GettingStarted.resx">
280289
<DependentUpon>GettingStarted.cs</DependentUpon>
281290
</EmbeddedResource>
291+
<EmbeddedResource Include="UserFeedback.resx">
292+
<DependentUpon>UserFeedback.cs</DependentUpon>
293+
</EmbeddedResource>
282294
<EmbeddedResource Include="WebFiles\NewVersion.resx">
283295
<DependentUpon>NewVersion.cs</DependentUpon>
284296
</EmbeddedResource>
@@ -308,7 +320,17 @@
308320
<Install>false</Install>
309321
</BootstrapperPackage>
310322
</ItemGroup>
311-
<ItemGroup />
323+
<ItemGroup>
324+
<COMReference Include="Shell32">
325+
<Guid>{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}</Guid>
326+
<VersionMajor>1</VersionMajor>
327+
<VersionMinor>0</VersionMinor>
328+
<Lcid>0</Lcid>
329+
<WrapperTool>tlbimp</WrapperTool>
330+
<Isolated>False</Isolated>
331+
<EmbedInteropTypes>True</EmbedInteropTypes>
332+
</COMReference>
333+
</ItemGroup>
312334
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
313335
<Import Project="..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
314336
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

0 commit comments

Comments
 (0)