Quick update to pass in the progress bar.

ejr06006 · Apr 4, 2012 · 16ee938 · 16ee938
1 parent 6b36ec5
commit 16ee938
Show file tree

Hide file tree

Showing 11 changed files with 225 additions and 3 deletions.
diff --git a/DataScraperGUI/DataScraperGUI.csproj b/DataScraperGUI/DataScraperGUI.csproj
@@ -15,6 +15,27 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>false</Install>
+    <InstallFrom>Unc</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <InstallUrl>\\erik.business.uconn.edu\sd\</InstallUrl>
+    <TargetCulture>en</TargetCulture>
+    <ProductName>DataScraper</ProductName>
+    <PublisherName>UConn ECE Senior Design - Group 155</PublisherName>
+    <WebPage>Publish.htm</WebPage>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>0.1.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -35,6 +56,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>B30451217B1E0B0973659EDE99000E6FE53FCD24</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>DataScraperGUI_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -90,12 +129,36 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="DataScraperGUI_TemporaryKey.pfx" />
+    <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/DataScraperGUI/DataScraperGUI_TemporaryKey.pfx b/DataScraperGUI/DataScraperGUI_TemporaryKey.pfx
diff --git a/DataScraperGUI/MainWindow.xaml.cs b/DataScraperGUI/MainWindow.xaml.cs
@@ -32,7 +32,7 @@ namespace DataScraperGUI {
         private void runButton_Click (object sender, RoutedEventArgs e) {
             logger.LogWarning("Run button pressed!");
 
-            var p = new NormalProgram(logger);
+            var p = new NormalProgram(logger, progressBar);
             p.Execute();
         }
     }

diff --git a/DataScraperGUI/Programs/NormalProgram.cs b/DataScraperGUI/Programs/NormalProgram.cs
@@ -2,15 +2,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Windows.Controls;
 using DataScraperGUI.Infrastructure;
 
 namespace DataScraperGUI.Programs {
     public class NormalProgram : Program {
-        public NormalProgram (Logger l) : base(l) { }
+        public NormalProgram (Logger l, ProgressBar p) : base(l, p) { }
 
 
         public override void Execute() {
             logger.LogError("This program has not yet been implemented.");
+            progressBar.Value = 100;
         }
     }
 }
diff --git a/DataScraperGUI/Programs/Program.cs b/DataScraperGUI/Programs/Program.cs
@@ -2,14 +2,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Windows.Controls;
 using DataScraperGUI.Infrastructure;
 
 namespace DataScraperGUI.Programs {
     public class Program : IProgram {
         protected Logger logger;
+        protected ProgressBar progressBar;
 
-        public Program (Logger l) {
+        public Program (Logger l, ProgressBar p) {
             logger = l;
+            progressBar = p;
         }
 
         protected Program() {

diff --git a/DataScraperGUI/Properties/app.manifest b/DataScraperGUI/Properties/app.manifest
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel node will disable file and registry virtualization.
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
+    </application>
+  </compatibility>
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!-- <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>-->
+</asmv1:assembly>
diff --git a/DataScraperGUI/publish/Application Files/DataScraperGUI_0_1_0_0/DataScraperGUI.application b/DataScraperGUI/publish/Application Files/DataScraperGUI_0_1_0_0/DataScraperGUI.application
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity name="DataScraperGUI.application" version="0.1.0.0" publicKeyToken="eac93f9f9bd7204e" language="en" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="UConn ECE Senior Design - Group 155" asmv2:product="DataScraper" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <deployment install="false" mapFileExtensions="true" />
+  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
+    <framework targetVersion="4.0" profile="Client" supportedRuntime="4.0.30319" />
+    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
+  </compatibleFrameworks>
+  <dependency>
+    <dependentAssembly dependencyType="install" codebase="Application Files\DataScraperGUI_0_1_0_0\DataScraperGUI.exe.manifest" size="7474">
+      <assemblyIdentity name="DataScraperGUI.exe" version="0.1.0.0" publicKeyToken="eac93f9f9bd7204e" language="en" processorArchitecture="x86" type="win32" />
+      <hash>
+        <dsig:Transforms>
+          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+        </dsig:Transforms>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+        <dsig:DigestValue>V26u1sSojsacmxxMZVrZCU6cmFQ=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+<publisherIdentity name="CN=BUSINESS\ereynolds" issuerKeyHash="01f430c587809dcc596208395c6632dcb8fdbf72" /><Signature Id="StrongNameSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>MSNEqVaD6+fP95f17lyP0pIWxVw=</DigestValue></Reference></SignedInfo><SignatureValue>c6u+AWUUGmOrX9qtOhFh/+yrm9sCCNUfF1nZ6ag7Y9uFueUIEDDgsCItGyijQKZcAvSwRSSZOlRYO6iD0pCIEjYmIMA9O9u1yRvhaXMNUoibCsD8pFf1kws5pGdViWbnya45gFZSbLxP3hzJz3htVLSkQRXSTchZLPz/nffspFE=</SignatureValue><KeyInfo Id="StrongNameKeyInfo"><KeyValue><RSAKeyValue><Modulus>lqcGztgZ3+iB06yODoQ+pft4x095cVIiK4rDjF8/GGIvrm1rP59ICp95BeFU47V9OOMPc4T5DtuJrDvbY6gvuaxn/0vre7UPswatkowwqXcd+cmdHc4y+zHLCzkwyKK/aFoskZMHSkXyltqQscfQ4I2JmaZJZOxwBqhuZPeqFv0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><msrel:RelData xmlns:msrel="http://schemas.microsoft.com/windows/rel/2005/reldata"><r:license xmlns:r="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:as="http://schemas.microsoft.com/windows/pki/2005/Authenticode"><r:grant><as:ManifestInformation Hash="5cc51692d28f5ceef597f7cfe7eb8356a9442331" Description="" Url=""><as:assemblyIdentity name="DataScraperGUI.application" version="0.1.0.0" publicKeyToken="eac93f9f9bd7204e" language="en" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" /></as:ManifestInformation><as:SignedBy /><as:AuthenticodePublisher><as:X509SubjectName>CN=BUSINESS\ereynolds</as:X509SubjectName></as:AuthenticodePublisher></r:grant><r:issuer><Signature Id="AuthenticodeSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>ozCqJ1WEM43o0uaIcC58kDutK1M=</DigestValue></Reference></SignedInfo><SignatureValue>StJJYCpnDy/kmdHdnKTAJV0zOQ3Ano267IN8Sqi+UEup9cp9Q+rC5nHhEc+4U3LT2S+eBSlChnjsd8sgaTg/izb3tP1KDplGSoVYPiklIQgxgcpLLwoTqq1B6D5ZrGpZjnnScJQQebZhWDj7SJUDzFBgNnlIOi2/e4HVbqnyXLc=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>lqcGztgZ3+iB06yODoQ+pft4x095cVIiK4rDjF8/GGIvrm1rP59ICp95BeFU47V9OOMPc4T5DtuJrDvbY6gvuaxn/0vre7UPswatkowwqXcd+cmdHc4y+zHLCzkwyKK/aFoskZMHSkXyltqQscfQ4I2JmaZJZOxwBqhuZPeqFv0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><X509Data><X509Certificate>MIIB4TCCAUqgAwIBAgIQE04Z249+J4hHO2FjXBs9vzANBgkqhkiG9w0BAQUFADAvMS0wKwYDVQQDHiQAQgBVAFMASQBOAEUAUwBTAFwAZQByAGUAeQBuAG8AbABkAHMwHhcNMTIwNDA0MTkzNTE1WhcNMTMwNDA1MDEzNTE1WjAvMS0wKwYDVQQDHiQAQgBVAFMASQBOAEUAUwBTAFwAZQByAGUAeQBuAG8AbABkAHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJanBs7YGd/ogdOsjg6EPqX7eMdPeXFSIiuKw4xfPxhiL65taz+fSAqfeQXhVOO1fTjjD3OE+Q7biaw722OoL7msZ/9L63u1D7MGrZKMMKl3HfnJnR3OMvsxyws5MMiiv2haLJGTB0pF8pbakLHH0OCNiZmmSWTscAaobmT3qhb9AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEARXvaMaaXZS+DVCwocP49P5R63vlrN7B+nafuZfJ3hnhhegN2TGYLJoI3yER+3GA7KMgxBJZgrrdCK+edfgQMQUVMm3jHc5mzUK1EFSHFrM+9r6S+QV2kFxt3Jv0yBQp1MZfcaMK1o/x69U1slpq/PQRs53tykyPR53NIXoxzACI=</X509Certificate></X509Data></KeyInfo></Signature></r:issuer></r:license></msrel:RelData></KeyInfo></Signature></asmv1:assembly>
diff --git a/DataScraperGUI/publish/Application Files/DataScraperGUI_0_1_0_0/DataScraperGUI.exe.deploy b/DataScraperGUI/publish/Application Files/DataScraperGUI_0_1_0_0/DataScraperGUI.exe.deploy