Permalink
Browse files

updates to fix a few bugs related to git

  • Loading branch information...
1 parent 1c78993 commit cb52ef18dca75e7d912f8717e6253581335514d8 @hickeys hickeys committed May 23, 2016
Showing with 2,838 additions and 862 deletions.
  1. +4 −0 .gitignore
  2. BIN Bootstrapper/Packages/DotNetFX30/EnableDotNet3.exe
  3. BIN Bootstrapper/Packages/DotNetFX30/OutlookCheck.exe
  4. BIN Bootstrapper/Packages/DotNetFX30/dotnetfx3.exe
  5. +321 −0 Bootstrapper/Packages/DotNetFX30/en/eula.rtf
  6. +19 −0 Bootstrapper/Packages/DotNetFX30/en/package.xml
  7. +95 −0 Bootstrapper/Packages/DotNetFX30/product.xml
  8. +500 −0 Bootstrapper/Packages/DotNetFX35SP1/en/eula.rtf
  9. +70 −0 Bootstrapper/Packages/DotNetFX35SP1/en/package.xml
  10. +76 −0 Bootstrapper/Packages/DotNetFX35SP1/product.xml
  11. BIN Bootstrapper/Packages/Office2003PIA/ComponentCheck.exe
  12. BIN Bootstrapper/Packages/Office2003PIA/OutlookCheck.exe
  13. +57 −0 Bootstrapper/Packages/Office2003PIA/en/eula.txt
  14. +27 −0 Bootstrapper/Packages/Office2003PIA/en/package.xml
  15. BIN Bootstrapper/Packages/Office2003PIA/o2003pia.MSI
  16. +65 −0 Bootstrapper/Packages/Office2003PIA/product.xml
  17. BIN Bootstrapper/Packages/Office2007PIA/ComponentCheck.exe
  18. BIN Bootstrapper/Packages/Office2007PIA/OutlookCheck.exe
  19. +27 −0 Bootstrapper/Packages/Office2007PIA/en/package.xml
  20. BIN Bootstrapper/Packages/Office2007PIA/o2007pia.msi
  21. +76 −0 Bootstrapper/Packages/Office2007PIA/product.xml
  22. BIN Bootstrapper/Packages/Office2010PIARedist/ComponentCheck.exe
  23. +22 −0 Bootstrapper/Packages/Office2010PIARedist/en/package.xml
  24. +65 −0 Bootstrapper/Packages/Office2010PIARedist/eula.txt
  25. +42 −0 Bootstrapper/Packages/Office2010PIARedist/product.xml
  26. BIN Bootstrapper/Packages/VSTOR30/OutlookCheck.exe
  27. +592 −0 Bootstrapper/Packages/VSTOR30/en/eula.rtf
  28. +32 −0 Bootstrapper/Packages/VSTOR30/en/package.xml
  29. +85 −0 Bootstrapper/Packages/VSTOR30/product.xml
  30. BIN Bootstrapper/Packages/VSTOR30/vstor30.exe
  31. BIN Bootstrapper/Packages/VSTOR30/vstor30sp1-KB949258-x86.exe
  32. BIN Bootstrapper/Packages/VSTOSERuntime/OutlookCheck.exe
  33. BIN Bootstrapper/Packages/VSTOSERuntime/en/eula.txt
  34. +34 −0 Bootstrapper/Packages/VSTOSERuntime/en/package.xml
  35. +59 −0 Bootstrapper/Packages/VSTOSERuntime/product.xml
  36. +10 −0 Bootstrapper/Packages/VSTOSERuntime/vstor.exe.manifest
  37. +4 −0 Certificates/MakeSelfSignedCert.cmd
  38. BIN Certificates/Placeholder.cer
  39. +1 −0 Certificates/Placeholder.pfx.password
  40. BIN Certificates/Placeholder.pvk
  41. BIN Certificates/Placeholder.spc
  42. +1 −0 Certificates/ThawteCodeSigning2048Intermediate.cer
  43. +6 −4 CodeSigning.targets
  44. +1 −1 Common.targets
  45. +4 −4 DeploymentCA/DeploymentCA.csproj
  46. +117 −334 Filer.Setup/XiantFiler.wxs
  47. +22 −0 Filer.sln
  48. +15 −19 XiantFilerDiagnostics/AddinInspector.cs
  49. +11 −10 XiantFilerDiagnostics/AddinLoadConfirmation.cs
  50. +25 −30 XiantFilerDiagnostics/DiskInspector.cs
  51. +37 −57 XiantFilerDiagnostics/FilerInspector.cs
  52. +18 −24 XiantFilerDiagnostics/FxInspector.cs
  53. +11 −14 XiantFilerDiagnostics/OfficeInspector.cs
  54. +80 −102 XiantFilerDiagnostics/OutlookInspector.cs
  55. +76 −78 XiantFilerDiagnostics/Program.cs
  56. +4 −4 XiantFilerDiagnostics/Properties/Strings.Designer.cs
  57. +17 −42 XiantFilerDiagnostics/VSTOInspector.cs
  58. +10 −19 XiantFilerDiagnostics/VstoLogger.cs
  59. +55 −88 XiantFilerDiagnostics/WDSInspector.cs
  60. +1 −3 XiantFilerDiagnostics/WindowsInspector.cs
  61. +12 −7 XiantFilerDiagnostics/XiantFilerDiagnostics.csproj
  62. +4 −2 XiantFilerDiagnostics/XiantFilerDiagnostics.sln
  63. +28 −20 build.proj
View
@@ -258,5 +258,9 @@ paket-files/
!Vendor/*/*/
!Vendor/*/*/*/
!Vendor/*/*/*/*/
+!Bootstrapper/Packages/*/
+!Bootstrapper/Packages/*/*/
+!Bootstrapper/Packages/*/*/*/
+!Bootstrapper/Packages/*/*/*/*/
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package Name="DisplayName" LicenseAgreement="eula.rtf" Culture="Culture" xmlns="http://schemas.microsoft.com/developer/2004/01/bootstrapper">
+ <PackageFiles CopyAllPackageFiles="false">
+ <PackageFile Name="eula.rtf" />
+ </PackageFiles>
+ <Strings>
+ <String Name="Culture">en</String>
+ <String Name="DisplayName">.NET Framework 3.0 (x86)</String>
+ <String Name="NetFX3HomeSite">http://go.microsoft.com/fwlink/?LinkId=96723</String>
+ <String Name="IncorrectOS">Installation of the .NET Framework 3.0 requires Windows XP Service Pack 2 or Windows Server 2k3 SP1 or later. Contact your application vendor.</String>
+ <String Name="No64BitSupport">This version of the .NET Framework 3.0 is not supported on a 64-bit operating system. Contact your application vendor.</String>
+ <String Name="AdminRequired">Administrator permissions are required to install the .NET Framework 3.0. Contact your administrator.</String>
+ <String Name="RequireIE60">Error message: Installation of the .NET Framework 3.0 requires Internet Explorer 6.00 or greater. Contact your application vendor.</String>
+ <String Name="CancelledInstall">The user has cancelled the installation. The .NET Framework 3.0 has not been installed.</String>
+ <String Name="GeneralFailure">A failure occurred attempting to install the .NET Framework 3.0.</String>
+ <String Name="ErrorDownloading">A failure occurred while downloading .NET Framework 3.0 package.</String>
+ <String Name="Betaversion">A beta version of the .NET Framework was detected on the computer. Uninstall any previous beta versions of .NET Framework before continuing.</String>
+ </Strings>
+</Package>
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product ProductCode="Microsoft.Net.Framework.3.0" xmlns="http://schemas.microsoft.com/developer/2004/01/bootstrapper">
+
+ <PackageFiles CopyAllPackageFiles="false">
+ <PackageFile Name="dotnetfx3.exe" HomeSite="NetFX3HomeSite" PublicKey="3082010A0282010100CD819638AE5CA2F2C1DFDED0AB958DD63C9D1F8BC35D862E5DF0B172F5ABAC886AB5DAB1227B0BC8C8A54B915E2213E9F9F5239DB5F46E76AEEFEEA43CC7C4C0595C3FABB3733326A662816179A162F46E8895D06EDDC79FD2A451117661BA708A65A1961689A75D81D04466E5DB569E40CAFCDC76242E443000E5D67D7B9511D5581DA3E84F0BC988DCA2D653996CCA63CA996A9A925E4C4D11E82FD35B5B5E5F52A3732DA5BB84450D8C191576CB08DA9AA67015E84DEC69FD5DB26B8FED295137388BC6464915945098B0F468A4D7DE097167749E778C1D856B97EAE75F45CCE0E6710DD16300937B31988E0BB413BDB3D0EEF1DF21EEA96061EE37433DC30203010001" />
+ <PackageFile Name="EnableDotNet3.exe" />
+ <PackageFile Name="OutlookCheck.exe"/>
+ </PackageFiles>
+
+ <RelatedProducts>
+ <IncludesProduct Code="Microsoft.Net.Framework.2.0" />
+ <DependsOnProduct Code="Microsoft.Windows.Installer.3.1" />
+ </RelatedProducts>
+
+ <InstallChecks>
+ <RegistryCheck Property="NetFx3Installed" Key="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup" Value="InstallSuccess" />
+ <RegistryCheck Property="IEVersion" Key="HKLM\Software\Microsoft\Internet Explorer" Value="Version" />
+ <ExternalCheck
+ Property="Outlook20072003Exists"
+ PackageFile="OutlookCheck.exe"
+ Arguments="{24AAE126-0911-478F-A019-07B875EB9996} {BC174BAD-2F53-4855-A1D5-0D575C19B1EA}"/>
+ </InstallChecks>
+
+ <Commands Reboot="Immediate">
+
+ <Command PackageFile="dotnetfx3.exe" Arguments="/q /norestart" EstimatedInstalledBytes="100000000" EstimatedInstallSeconds="300" EstimatedTempBytes="100000000">
+ <InstallConditions>
+ <!-- Skip install if NetFX3 basic package is already installed -->
+ <BypassIf Property="NetFx3Installed" Compare="ValueEqualTo" Value="1" />
+
+ <!-- Skip running setup if the OS is Vista or later -->
+ <BypassIf Property="VersionNT" Compare="VersionGreaterThanOrEqualTo" Value="6.0.0" />
+
+ <!-- Block install if user does not have admin privileges -->
+ <FailIf Property="AdminUser" Compare="ValueEqualTo" Value="false" String="AdminRequired"/>
+
+ <!-- Block install if user does not have IE 6.0 or higher -->
+ <FailIf Property="IEVersion" Compare="ValueNotExists" String="RequireIE60" />
+ <FailIf Property="IEVersion" Compare="VersionLessThan" Value="6.0" String="RequireIE60" />
+
+ <!-- Block install on Windows 95 -->
+ <FailIf Property="Version9x" Compare="ValueExists" String="IncorrectOS"/>
+
+ <!-- Block install on less than Windows XP SP2 -->
+ <FailIf Property="VersionNT" Compare="VersionLessThan" Value="5.1.2" String="IncorrectOS"/>
+
+ <!-- Block install on W2K3 with no service pack -->
+ <FailIf Property="VersionNT" Compare="VersionEqualTo" Value="5.2.0" String="IncorrectOS"/>
+
+ <!-- Block install if the platform is not x86 -->
+ <FailIf Property="ProcessorArchitecture" Compare="ValueNotEqualTo" Value="Intel" String="No64BitSupport" />
+
+ <!-- Do not skip for Outlook 2003 and 2007 -->
+ <BypassIf Property="Outlook20072003Exists" Compare="ValueNotEqualTo" Value="0"/>
+
+ </InstallConditions>
+ <ExitCodes>
+ <ExitCode Value="0" Result="Success" />
+ <ExitCode Value="1602" Result="Fail" String="CancelledInstall" />
+ <ExitCode Value="1603" Result="Fail" String="GeneralFailure" />
+ <ExitCode Value="1636" Result="Fail" String="ErrorDownloading" />
+ <ExitCode Value="3010" Result="SuccessReboot" />
+ <ExitCode Value="5100" Result="Fail" String="Betaversion" />
+ <DefaultExitCode Result="Fail" String="GeneralFailure" FormatMessageFromSystem="true" />
+ </ExitCodes>
+ </Command>
+
+ <Command PackageFile="EnableDotNet3.exe" EstimatedInstalledBytes="30000000" EstimatedInstallSeconds="60" EstimatedTempBytes="30000000">
+ <InstallConditions>
+ <!-- Skip install if NetFX3 basic package is already installed -->
+ <BypassIf Property="NetFx3Installed" Compare="ValueEqualTo" Value="1" />
+
+ <!-- Skip running setup if the OS is earlier than Vista -->
+ <BypassIf Property="VersionNT" Compare="VersionLessThan" Value="6.0.0" />
+
+ <!-- Block install if user does not have admin privileges -->
+ <FailIf Property="AdminUser" Compare="ValueEqualTo" Value="false" String="AdminRequired"/>
+
+ <!-- Block install if the platform is not x86 -->
+ <FailIf Property="ProcessorArchitecture" Compare="ValueNotEqualTo" Value="Intel" String="No64BitSupport" />
+
+ <!-- Do not skip for Outlook 2003 and 2007 -->
+ <BypassIf Property="Outlook20072003Exists" Compare="ValueNotEqualTo" Value="0"/>
+
+ </InstallConditions>
+ <ExitCodes>
+ <ExitCode Value="0" Result="Success" />
+ <ExitCode Value="3010" Result="SuccessReboot" />
+ <DefaultExitCode Result="Fail" String="GeneralFailure" FormatMessageFromSystem="true" />
+ </ExitCodes>
+ </Command>
+
+ </Commands>
+
+</Product>
Oops, something went wrong.

0 comments on commit cb52ef1

Please sign in to comment.