Fixed architecture bug with libraries

rajkumar-rangaraj · Feb 1, 2016 · d349597 · d349597
1 parent 8abbad0
commit d349597
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 9 deletions.
diff --git a/SymbolFetch.sln b/SymbolFetch.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SymbolFetch", "SymbolFetch\SymbolFetch.csproj", "{D3D57E4E-D72D-4011-99B2-C9BF5487E53C}"
 EndProject

diff --git a/SymbolFetch/App.config b/SymbolFetch/App.config
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
+  <appSettings>
+    <add key="SymbolServer" value="http://msdl.microsoft.com/download/symbols"/>
+  </appSettings>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>

diff --git a/SymbolFetch/DownloadTool/PDBDownloader.exe b/SymbolFetch/DownloadTool/PDBDownloader.exe
diff --git a/SymbolFetch/Helpers/Constants.cs b/SymbolFetch/Helpers/Constants.cs
@@ -16,7 +16,7 @@ static Constants()
         {
             SymbolServer = @"Microsoft-Symbol-Server/10.0.10522.521";
             DownloadFolder = @"c:\symbols";
-            EnableBulkDownload = true;
+            EnableBulkDownload = false;
         }
 
         #endregion

diff --git a/SymbolFetch/MainWindow.xaml.cs b/SymbolFetch/MainWindow.xaml.cs
@@ -82,7 +82,6 @@ private void Downloader_FileDownloadSucceeded(object sender, EventArgs e)
 
         private void btnStart_Click(object sender, RoutedEventArgs e)
         {
-
             var builder = new UrlBuilder();
             downloader.LocalDirectory = downloader.DownloadLocation;
             downloader.Files.Clear();

diff --git a/SymbolFetch/PeHeaderReader.cs b/SymbolFetch/PeHeaderReader.cs
@@ -432,8 +432,9 @@ public bool Is32BitHeader
         {
             get
             {
-                UInt16 IMAGE_FILE_32BIT_MACHINE = 0x0100;
-                return (IMAGE_FILE_32BIT_MACHINE & FileHeader.Characteristics) == IMAGE_FILE_32BIT_MACHINE;
+                //UInt16 IMAGE_FILE_32BIT_MACHINE = 0x0100;
+                //return (IMAGE_FILE_32BIT_MACHINE & FileHeader.Characteristics) == IMAGE_FILE_32BIT_MACHINE;
+                return (FileHeader.Machine == 332) ? true : false; //14C = X86
             }
         }
 

diff --git a/SymbolFetch/Properties/AssemblyInfo.cs b/SymbolFetch/Properties/AssemblyInfo.cs
@@ -7,12 +7,12 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SymbolFetch")]
+[assembly: AssemblyTitle("PDB Downloader")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SymbolFetch")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/SymbolFetch/SymbolFetch.csproj b/SymbolFetch/SymbolFetch.csproj
@@ -15,7 +15,7 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
+    <PublishUrl>C:\temp\PDB\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -25,9 +25,11 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <AutorunEnabled>true</AutorunEnabled>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -61,6 +63,37 @@
   <PropertyGroup>
     <SignManifests>false</SignManifests>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>F7996280624A7FF6C596CAED869AF819D2D68E26</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>SymbolFetch_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>false</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.configuration" />