diff --git a/SevenEighter.v11.suo b/SevenEighter.v11.suo index 5f07551..b079f44 100644 Binary files a/SevenEighter.v11.suo and b/SevenEighter.v11.suo differ diff --git a/SevenEighter/App.config b/SevenEighter/App.config index d3d2996..c5db603 100644 --- a/SevenEighter/App.config +++ b/SevenEighter/App.config @@ -2,5 +2,5 @@ - + diff --git a/SevenEighter/Form1.cs b/SevenEighter/Form1.cs index 5f0342e..2808269 100644 --- a/SevenEighter/Form1.cs +++ b/SevenEighter/Form1.cs @@ -24,7 +24,8 @@ public partial class Form1 : Form public Form1() { InitializeComponent(); - if (System.Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles).Contains("x86")) + + if (System.Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86).Contains("x86")) { //hack: it's a 64-bit os bin += @"\x64\UpdateWP.exe"; @@ -58,7 +59,7 @@ void doUpdate() pro.WaitForExit(); string output = pro.StandardOutput.ReadToEnd(); - + System.Diagnostics.Debug.WriteLine(output); if (output.Contains("Zune is currently running")) { MessageBox.Show("Zune is running. Close it and try again."); @@ -240,11 +241,39 @@ void doUpdate() } if (currentversion.Contains("8858")) { - + lblStatus.Text = "Downloading WP7.8 fix..."; + + packages.Clear(); + + packages.Add(availablePackages.ver8860); + + System.Threading.Thread th = new System.Threading.Thread(() => + { + installPackages(); + }); + th.Start(); + + } + if (currentversion.Contains("8860")) + { + lblStatus.Text = "Downloading WP7.8 fix #2..."; + + packages.Clear(); + + packages.Add(availablePackages.ver8862); + + System.Threading.Thread th = new System.Threading.Thread(() => + { + installPackages(); + }); + th.Start(); + } + if (currentversion.Contains("8862")) + { progressBar1.Enabled = false; - + MessageBox.Show("Congratulations! You're done!"); - this.Close(); + } } diff --git a/SevenEighter/SevenEighter.csproj b/SevenEighter/SevenEighter.csproj index 5daac40..9ca2ed9 100644 --- a/SevenEighter/SevenEighter.csproj +++ b/SevenEighter/SevenEighter.csproj @@ -9,7 +9,7 @@ Properties SevenEighter SevenEighter - v3.5 + v4.5 512 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -31,6 +32,7 @@ TRACE prompt 4 + false diff --git a/SevenEighter/availablePackages.cs b/SevenEighter/availablePackages.cs index c417b6e..e3d1f0b 100644 --- a/SevenEighter/availablePackages.cs +++ b/SevenEighter/availablePackages.cs @@ -170,6 +170,13 @@ class availablePackages "http://download.windowsupdate.com/msdownload/update/software/dflt/2012/11/diff-7.10.8783.12-7.10.8858.136-armv7-retail-microsoft.lang_0809.pks_45cef4457233690e536db6b7821af0a39b8aeb98.cab", "http://download.windowsupdate.com/msdownload/update/software/dflt/2012/11/diff-7.10.8783.12-7.10.8858.136-armv7-retail-microsoft.lang_0816.pks_8d78f889ff380ced118e823feed328487dce668b.cab", "http://download.windowsupdate.com/msdownload/update/software/dflt/2012/11/diff-7.10.8783.12-7.10.8858.136-armv7-retail-microsoft.lang_0c0a.pks_29c153eae13ce7184ac8abc63eb6345694e9fce0.cab"}; + + public static string ver8860 = "http://download.windowsupdate.com/msdownload/update/software/dflt/2013/02/diff-7.10.8858.136-7.10.8860.142-armv7-retail-microsoft.pks_4a5e9f454174c7bdcb2da953d1e18fe5443ba7e8.cab"; + + public static string ver8862 = "http://download.windowsupdate.com/msdownload/update/software/dflt/2013/03/diff-7.10.8860.142-7.10.8862.144-armv7-retail-microsoft.plustuner.pks_d802531eab4e9bce3ab747805ea7e33fc8cd29bf.cab"; + } + + } diff --git a/SevenEighter/bin/Debug/SevenEighter.exe b/SevenEighter/bin/Debug/SevenEighter.exe index fd5b7e1..f051dff 100644 Binary files a/SevenEighter/bin/Debug/SevenEighter.exe and b/SevenEighter/bin/Debug/SevenEighter.exe differ diff --git a/SevenEighter/bin/Debug/SevenEighter.exe.config b/SevenEighter/bin/Debug/SevenEighter.exe.config index d3d2996..c5db603 100644 --- a/SevenEighter/bin/Debug/SevenEighter.exe.config +++ b/SevenEighter/bin/Debug/SevenEighter.exe.config @@ -2,5 +2,5 @@ - + diff --git a/SevenEighter/bin/Debug/SevenEighter.pdb b/SevenEighter/bin/Debug/SevenEighter.pdb index bb25c76..6fa9650 100644 Binary files a/SevenEighter/bin/Debug/SevenEighter.pdb and b/SevenEighter/bin/Debug/SevenEighter.pdb differ diff --git a/SevenEighter/bin/Debug/SevenEighter.vshost.exe b/SevenEighter/bin/Debug/SevenEighter.vshost.exe index b6ed6ae..3c5dcfb 100644 Binary files a/SevenEighter/bin/Debug/SevenEighter.vshost.exe and b/SevenEighter/bin/Debug/SevenEighter.vshost.exe differ diff --git a/SevenEighter/bin/Debug/SevenEighter.vshost.exe.config b/SevenEighter/bin/Debug/SevenEighter.vshost.exe.config index d3d2996..c5db603 100644 --- a/SevenEighter/bin/Debug/SevenEighter.vshost.exe.config +++ b/SevenEighter/bin/Debug/SevenEighter.vshost.exe.config @@ -2,5 +2,5 @@ - + diff --git a/SevenEighter/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/SevenEighter/obj/Debug/DesignTimeResolveAssemblyReferences.cache index d06d6bf..e35e9c1 100644 Binary files a/SevenEighter/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/SevenEighter/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/SevenEighter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SevenEighter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3b84e7e..8e14f96 100644 Binary files a/SevenEighter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SevenEighter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SevenEighter/obj/Debug/SevenEighter.Form1.resources b/SevenEighter/obj/Debug/SevenEighter.Form1.resources index 06c24d0..6c05a97 100644 Binary files a/SevenEighter/obj/Debug/SevenEighter.Form1.resources and b/SevenEighter/obj/Debug/SevenEighter.Form1.resources differ diff --git a/SevenEighter/obj/Debug/SevenEighter.Properties.Resources.resources b/SevenEighter/obj/Debug/SevenEighter.Properties.Resources.resources index befa6a9..cb3cf16 100644 Binary files a/SevenEighter/obj/Debug/SevenEighter.Properties.Resources.resources and b/SevenEighter/obj/Debug/SevenEighter.Properties.Resources.resources differ diff --git a/SevenEighter/obj/Debug/SevenEighter.csproj.FileListAbsolute.txt b/SevenEighter/obj/Debug/SevenEighter.csproj.FileListAbsolute.txt index 374d3e3..41699f1 100644 --- a/SevenEighter/obj/Debug/SevenEighter.csproj.FileListAbsolute.txt +++ b/SevenEighter/obj/Debug/SevenEighter.csproj.FileListAbsolute.txt @@ -9,12 +9,12 @@ c:\users\jaxbot\documents\visual studio 2012\Projects\Crapps\SevenEighter\SevenE c:\users\jaxbot\documents\visual studio 2012\Projects\Crapps\SevenEighter\SevenEighter\obj\Debug\SevenEighter.pdb c:\users\jaxbot\documents\visual studio 2012\Projects\Crapps\SevenEighter\SevenEighter\obj\Debug\SevenEighter.languagelist.resources C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\bin\Debug\SevenEighter.exe.config -C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.exe -C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.pdb +C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\bin\Debug\SevenEighter.exe +C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\bin\Debug\SevenEighter.pdb C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.csprojResolveAssemblyReference.cache C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.Form1.resources C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.languagelist.resources C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.Properties.Resources.resources C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.csproj.GenerateResource.Cache -C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\bin\Debug\SevenEighter.exe -C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\bin\Debug\SevenEighter.pdb +C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.exe +C:\Users\Jaxbot\Documents\Visual Studio 2012\Projects\SevenEighter\SevenEighter\obj\Debug\SevenEighter.pdb diff --git a/SevenEighter/obj/Debug/SevenEighter.csproj.GenerateResource.Cache b/SevenEighter/obj/Debug/SevenEighter.csproj.GenerateResource.Cache index d4b9ddc..4d3b701 100644 Binary files a/SevenEighter/obj/Debug/SevenEighter.csproj.GenerateResource.Cache and b/SevenEighter/obj/Debug/SevenEighter.csproj.GenerateResource.Cache differ diff --git a/SevenEighter/obj/Debug/SevenEighter.csprojResolveAssemblyReference.cache b/SevenEighter/obj/Debug/SevenEighter.csprojResolveAssemblyReference.cache index 159cfd6..938efe4 100644 Binary files a/SevenEighter/obj/Debug/SevenEighter.csprojResolveAssemblyReference.cache and b/SevenEighter/obj/Debug/SevenEighter.csprojResolveAssemblyReference.cache differ diff --git a/SevenEighter/obj/Debug/SevenEighter.exe b/SevenEighter/obj/Debug/SevenEighter.exe index fd5b7e1..f051dff 100644 Binary files a/SevenEighter/obj/Debug/SevenEighter.exe and b/SevenEighter/obj/Debug/SevenEighter.exe differ diff --git a/SevenEighter/obj/Debug/SevenEighter.languagelist.resources b/SevenEighter/obj/Debug/SevenEighter.languagelist.resources index 06c24d0..6c05a97 100644 Binary files a/SevenEighter/obj/Debug/SevenEighter.languagelist.resources and b/SevenEighter/obj/Debug/SevenEighter.languagelist.resources differ diff --git a/SevenEighter/obj/Debug/SevenEighter.pdb b/SevenEighter/obj/Debug/SevenEighter.pdb index bb25c76..6fa9650 100644 Binary files a/SevenEighter/obj/Debug/SevenEighter.pdb and b/SevenEighter/obj/Debug/SevenEighter.pdb differ diff --git a/SevenEighter/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/SevenEighter/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 37f6b0a..add367f 100644 Binary files a/SevenEighter/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/SevenEighter/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ