Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Dni will incorrectly display installation_completed message if auto_c…

…lose_if_installed=true and not all components installed successfully.


http://dotnetinstaller.codeplex.com/workitem/7557
Updated documentation to indicate that an elevated command prompt is required to build the project in the development environment
http://dotnetinstaller.codeplex.com/workitem/7578
DVLib::UnitTests::FormatUnitTests::testFormatDateTime unit test fails if running from a timezone other than EST
http://dotnetinstaller.codeplex.com/workitem/7585
Checked in *.*proj files with TFS bindings and add associated vspscc files.
http://dotnetinstaller.codeplex.com/workitem/7673
Outputing running nunit test case name to console
http://dotnetinstaller.codeplex.com/workitem/7672
  • Loading branch information...
commit 946f8172c04f2aabe76c7bd9c82c1a3fa7823965 1 parent bd57c52
icnocop authored
Showing with 761 additions and 14 deletions.
  1. +1 −1  Documentation/Content/Contributing.aml
  2. +1 −1  Documentation/Content/Contributors.aml
  3. +9 −1 Documentation/WhatsNew.html
  4. +4 −0 InstallerConfig/InstallerConfig.csproj
  5. +10 −0 InstallerConfig/InstallerConfig.csproj.vspscc
  6. +4 −0 InstallerDocLib/InstallerDocLib.csproj
  7. +10 −0 InstallerDocLib/InstallerDocLib.csproj.vspscc
  8. +4 −0 InstallerEditor/InstallerEditor.csproj
  9. +10 −0 InstallerEditor/InstallerEditor.csproj.vspscc
  10. +4 −0 InstallerLib/InstallerLib.csproj
  11. +10 −0 InstallerLib/InstallerLib.csproj.vspscc
  12. +4 −0 InstallerLinker/InstallerLinker.csproj
  13. +10 −0 InstallerLinker/InstallerLinker.csproj.vspscc
  14. +4 −0 InstallerMsi/InstallerMsi.wixproj
  15. +10 −0 InstallerMsi/InstallerMsi.wixproj.vspscc
  16. +7 −4 Samples/PackagedSetup/Simple/Simple.vdproj
  17. +10 −0 Samples/PackagedSetup/Simple/Simple.vdproj.vspscc
  18. +6 −2 ThirdParty/Cab/Cab.vcproj
  19. +10 −0 ThirdParty/Cab/Cab.vcproj.vspscc
  20. +4 −0 ThirdParty/CabLib/CabLib.vcproj
  21. +10 −0 ThirdParty/CabLib/CabLib.vcproj.vspscc
  22. +4 −0 ThirdParty/SmartPtr/SmartPtr.vcproj
  23. +10 −0 ThirdParty/SmartPtr/SmartPtr.vcproj.vspscc
  24. +4 −0 UnitTests/CppUnitTestsRunner/CppUnitTestsRunner.vcproj
  25. +10 −0 UnitTests/CppUnitTestsRunner/CppUnitTestsRunner.vcproj.vspscc
  26. +4 −0 UnitTests/InstallerEditorUnitTests/CommandLineParametersUnitTests.cs
  27. +4 −0 UnitTests/InstallerEditorUnitTests/InstallerEditorUnitTests.csproj
  28. +10 −0 UnitTests/InstallerEditorUnitTests/InstallerEditorUnitTests.csproj.vspscc
  29. +1 −0  UnitTests/InstallerLibUnitTests/ConfigFileTests.cs
  30. +19 −0 UnitTests/InstallerLibUnitTests/InstallerLibUnitTests.csproj
  31. +10 −0 UnitTests/InstallerLibUnitTests/InstallerLibUnitTests.csproj.vspscc
  32. +4 −0 UnitTests/TestTimer/TestTimer.csproj
  33. +10 −0 UnitTests/TestTimer/TestTimer.csproj.vspscc
  34. +4 −0 UnitTests/dotNetInstallerLibUnitTests/dotNetInstallerLibUnitTests.vcproj
  35. +10 −0 UnitTests/dotNetInstallerLibUnitTests/dotNetInstallerLibUnitTests.vcproj.vspscc
  36. +2 −2 UnitTests/dotNetInstallerToolsLibUnitTests/FormatUnitTests.cpp
  37. +4 −0 UnitTests/dotNetInstallerToolsLibUnitTests/dotNetInstallerToolsLibUnitTests.vcproj
  38. +10 −0 UnitTests/dotNetInstallerToolsLibUnitTests/dotNetInstallerToolsLibUnitTests.vcproj.vspscc
  39. +99 −0 UnitTests/dotNetInstallerUnitTests/AutoCloseUnitTests.cs
  40. +12 −0 UnitTests/dotNetInstallerUnitTests/AutoStartUnitTests.cs
  41. +17 −1 UnitTests/dotNetInstallerUnitTests/CabUnitTests.cs
  42. +10 −0 UnitTests/dotNetInstallerUnitTests/CompleteCommandUnitTests.cs
  43. +21 −0 UnitTests/dotNetInstallerUnitTests/ComponentArgsUnitTests.cs
  44. +2 −0  UnitTests/dotNetInstallerUnitTests/ConfigurationUnitTests.cs
  45. +10 −0 UnitTests/dotNetInstallerUnitTests/ContinueOnErrorUnitTests.cs
  46. +6 −0 UnitTests/dotNetInstallerUnitTests/DownloadComponentsUnitTests.cs
  47. +6 −0 UnitTests/dotNetInstallerUnitTests/ExitCodeUnitTests.cs
  48. +12 −0 UnitTests/dotNetInstallerUnitTests/LanguageUnitTests.cs
  49. +11 −0 UnitTests/dotNetInstallerUnitTests/LoggingUnitTests.cs
  50. +7 −0 UnitTests/dotNetInstallerUnitTests/RebootUnitTests.cs
  51. +6 −0 UnitTests/dotNetInstallerUnitTests/SelectionUnitTests.cs
  52. +2 −0  UnitTests/dotNetInstallerUnitTests/UILevelUnitTests.cs
  53. +19 −0 UnitTests/dotNetInstallerUnitTests/UninstallUnitTests.cs
  54. +47 −0 UnitTests/dotNetInstallerUnitTests/UserControlUnitTests.cs
  55. +5 −0 UnitTests/dotNetInstallerUnitTests/dotNetInstallerUnitTests.csproj
  56. +10 −0 UnitTests/dotNetInstallerUnitTests/dotNetInstallerUnitTests.csproj.vspscc
  57. +4 −0 UnitTests/dotNetUnitTestsRunner/dotNetUnitTestsRunner.csproj
  58. +10 −0 UnitTests/dotNetUnitTestsRunner/dotNetUnitTestsRunner.csproj.vspscc
  59. +4 −0 Version/Version.csproj
  60. +10 −0 Version/Version.csproj.vspscc
  61. +97 −0 dni.sln
  62. +10 −0 dni.vssscc
  63. +4 −0 dotNetInstaller/dotNetInstaller.vcproj
  64. +10 −0 dotNetInstaller/dotNetInstaller.vcproj.vspscc
  65. +6 −2 dotNetInstallerLib/InstallerUI.cpp
  66. +4 −0 dotNetInstallerLib/dotNetInstallerLib.vcproj
  67. +10 −0 dotNetInstallerLib/dotNetInstallerLib.vcproj.vspscc
  68. +4 −0 dotNetInstallerToolsLib/dotNetInstallerToolsLib.vcproj
  69. +10 −0 dotNetInstallerToolsLib/dotNetInstallerToolsLib.vcproj.vspscc
  70. +4 −0 htmlInstaller/htmlInstaller.vcproj
  71. +10 −0 htmlInstaller/htmlInstaller.vcproj.vspscc
View
2  Documentation/Content/Contributing.aml
@@ -114,7 +114,7 @@
<step>
<content>
<para>
- Open a command prompt and build the project.
+ Open an elevated command prompt and build the project.
<code language="cmd">
<![CDATA[build all]]>
</code>
View
2  Documentation/Content/Contributors.aml
@@ -26,7 +26,7 @@
<linkText>Matthias Jentsch</linkText>
<linkUri>http://www.matthias-jentsch.de/</linkUri>
</externalLink>,
- Peter Mares, Rainer Halanek, Rennie Petersen, Sambourton, Steve and Wolfgang.
+ Peter Mares, Rainer Halanek, Rami AbuGhazaleh, Rennie Petersen, Sambourton, Steve and Wolfgang.
</para>
</content>
</section>
View
10 Documentation/WhatsNew.html
@@ -69,6 +69,10 @@
6.0</code>.</li>
<li><a href="http://dotnetinstaller.codeplex.com/workitem/7575">#7575</a>: Upgraded
to SandCastle 1.9 documentation builder.</li>
+ <li><a href="http://dotnetinstaller.codeplex.com/workitem/7673">#7673</a>: Checked in *.*proj files
+ with TFS bindings and add associated vspscc files.</li>
+ <li><a href="http://dotnetinstaller.codeplex.com/workitem/7672">#7672</a>: Outputing running nunit test
+ case name to console</li>
</ul>
</li>
<li><strong>Bugs</strong>:
@@ -93,8 +97,12 @@
<li><a href="http://dotnetinstaller.codeplex.com/workitem/7567">#7567</a>: If InstallerEditor
is closed minimized it will not correctly restore its position and will not appear
on the screen when restarted.</li>
- <li><a href="http://dotnetinstaller.codeplex.com/workitem/7565">#7565</a>: dni does
+ <li><a href="http://dotnetinstaller.codeplex.com/workitem/7565">#7565</a>: Dni does
not automatically change into uninstall mode if an optional component is not installed.</li>
+ <li><a href="http://dotnetinstaller.codeplex.com/workitem/7557">#7565</a>: Dni will incorrectly
+ display installation_completed message if auto_close_if_installed=true and not all components installed successfully.</li>
+ <li><a href="http://dotnetinstaller.codeplex.com/workitem/7578">#7578</a>: Updated documentation
+ to indicate that an elevated command prompt is required to build the project in the development environment.</li>
</ul>
</li>
</ul>
View
4 InstallerConfig/InstallerConfig.csproj
@@ -14,6 +14,10 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
10 InstallerConfig/InstallerConfig.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 InstallerDocLib/InstallerDocLib.csproj
@@ -9,6 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>InstallerDocLib</RootNamespace>
<AssemblyName>InstallerDocLib</AssemblyName>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
10 InstallerDocLib/InstallerDocLib.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 InstallerEditor/InstallerEditor.csproj
@@ -26,6 +26,10 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
View
10 InstallerEditor/InstallerEditor.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 InstallerLib/InstallerLib.csproj
@@ -14,6 +14,10 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
10 InstallerLib/InstallerLib.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 InstallerLinker/InstallerLinker.csproj
@@ -15,6 +15,10 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
10 InstallerLinker/InstallerLinker.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 InstallerMsi/InstallerMsi.wixproj
@@ -11,6 +11,10 @@
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
<WixToolPath>$(ProgramFiles)\Windows Installer XML v3\bin\</WixToolPath>
<DefineSolutionProperties>False</DefineSolutionProperties>
+ <SccProjectName>SAK</SccProjectName>
+ <SccProvider>SAK</SccProvider>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccLocalPath>SAK</SccLocalPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
View
10 InstallerMsi/InstallerMsi.wixproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
11 Samples/PackagedSetup/Simple/Simple.vdproj
@@ -7,10 +7,10 @@
"LanguageId" = "3:1033"
"CodePage" = "3:1252"
"UILanguageId" = "3:1033"
-"SccProjectName" = "8:"
-"SccLocalPath" = "8:"
-"SccAuxPath" = "8:"
-"SccProvider" = "8:"
+"SccProjectName" = "8:SAK"
+"SccLocalPath" = "8:SAK"
+"SccAuxPath" = "8:SAK"
+"SccProvider" = "8:SAK"
"Hierarchy"
{
}
@@ -665,5 +665,8 @@
"ProjectOutput"
{
}
+ "VJSharpPlugin"
+ {
+ }
}
}
View
10 Samples/PackagedSetup/Simple/Simple.vdproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
8 ThirdParty/Cab/Cab.vcproj
@@ -5,6 +5,10 @@
Name="Cab"
ProjectGUID="{6A9AD5E1-624C-478F-9921-8400B3AD84A8}"
RootNamespace="Cab"
+ SccProjectName="SAK"
+ SccAuxPath="SAK"
+ SccLocalPath="SAK"
+ SccProvider="SAK"
Keyword="Win32Proj"
>
<Platforms>
@@ -229,11 +233,11 @@
>
</File>
<File
- RelativePath=".\File.hpp"
+ RelativePath=".\Cabinet\File.hpp"
>
</File>
<File
- RelativePath=".\Cabinet\File.hpp"
+ RelativePath=".\File.hpp"
>
</File>
<File
View
10 ThirdParty/Cab/Cab.vcproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 ThirdParty/CabLib/CabLib.vcproj
@@ -5,6 +5,10 @@
Name="CabLib"
ProjectGUID="{96A9878C-7B75-41F7-AA11-7268672C16DD}"
RootNamespace="CabLib_x32"
+ SccProjectName="SAK"
+ SccAuxPath="SAK"
+ SccLocalPath="SAK"
+ SccProvider="SAK"
Keyword="ManagedCProj"
>
<Platforms>
View
10 ThirdParty/CabLib/CabLib.vcproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 ThirdParty/SmartPtr/SmartPtr.vcproj
@@ -5,6 +5,10 @@
Name="SmartPtr"
ProjectGUID="{8185F399-F6DE-40B3-ADD6-42FC5F330CA8}"
RootNamespace="SmartPtr"
+ SccProjectName="SAK"
+ SccAuxPath="SAK"
+ SccLocalPath="SAK"
+ SccProvider="SAK"
Keyword="Win32Proj"
>
<Platforms>
View
10 ThirdParty/SmartPtr/SmartPtr.vcproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 UnitTests/CppUnitTestsRunner/CppUnitTestsRunner.vcproj
@@ -5,6 +5,10 @@
Name="CppUnitTestsRunner"
ProjectGUID="{6542C25E-A71E-401E-A818-71910821444C}"
RootNamespace="CppUnitTestsRunner"
+ SccProjectName="SAK"
+ SccAuxPath="SAK"
+ SccLocalPath="SAK"
+ SccProvider="SAK"
Keyword="Win32Proj"
>
<Platforms>
View
10 UnitTests/CppUnitTestsRunner/CppUnitTestsRunner.vcproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 UnitTests/InstallerEditorUnitTests/CommandLineParametersUnitTests.cs
@@ -44,6 +44,8 @@ public void TestRunHelp()
[Test]
public void TestRunFileDoesntExist()
{
+ //TODO: High: ok button on error window is not automatically clicked on windows 7 ultimate x64
+
InstallerEditorExeUtils.RunOptions options = new InstallerEditorExeUtils.RunOptions();
options.args = Guid.NewGuid().ToString();
ProcessStartInfo pi = new ProcessStartInfo(InstallerEditorExeUtils.Executable, options.CommandLineArgs);
@@ -93,6 +95,8 @@ public void TestRunFileConfiguration()
[Test]
public void TestRunFileIsADirectory()
{
+ //TODO: High: ok button on error window is not automatically clicked on windows 7 ultimate x64
+
InstallerEditorExeUtils.RunOptions options = new InstallerEditorExeUtils.RunOptions();
options.args = Environment.SystemDirectory;
ProcessStartInfo pi = new ProcessStartInfo(InstallerEditorExeUtils.Executable, options.CommandLineArgs);
View
4 UnitTests/InstallerEditorUnitTests/InstallerEditorUnitTests.csproj
@@ -9,6 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>InstallerEditorUnitTests</RootNamespace>
<AssemblyName>InstallerEditorUnitTests</AssemblyName>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
10 UnitTests/InstallerEditorUnitTests/InstallerEditorUnitTests.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
1  UnitTests/InstallerLibUnitTests/ConfigFileTests.cs
@@ -180,6 +180,7 @@ public void TestLoadClear()
xmlConfigFile.Load(configFilename);
configFile.LoadXml(xmlConfigFile);
Assert.AreEqual(previousConfigurationCount, configFile.ConfigurationCount);
+ File.Delete(configFilename);
}
}
}
View
19 UnitTests/InstallerLibUnitTests/InstallerLibUnitTests.csproj
@@ -14,6 +14,10 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -121,6 +125,21 @@
<EmbeddedResource Include="..\..\Samples\ExeSetup\Configuration.xml">
<Link>Samples\ExeSetup\Configuration.xml</Link>
</EmbeddedResource>
+ <EmbeddedResource Include="..\..\Samples\Invalid\NoMatchingOSFilter.xml">
+ <Link>Samples\Invalid\NoMatchingOSFilter.xml</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\Samples\LicenseAgreement\Configuration.xml">
+ <Link>Samples\LicenseAgreement\Configuration.xml</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\Samples\MultipleConfig\Configuration.xml">
+ <Link>Samples\MultipleConfig\Configuration.xml</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\Samples\MultipleSetup\Configuration.xml">
+ <Link>Samples\MultipleSetup\Configuration.xml</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\Samples\PatchSetup\Configuration.xml">
+ <Link>Samples\PatchSetup\Configuration.xml</Link>
+ </EmbeddedResource>
<Content Include="Manifests\asInvoker.manifest">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
View
10 UnitTests/InstallerLibUnitTests/InstallerLibUnitTests.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 UnitTests/TestTimer/TestTimer.csproj
@@ -9,6 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TestTimer</RootNamespace>
<AssemblyName>TestTimer</AssemblyName>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
10 UnitTests/TestTimer/TestTimer.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 UnitTests/dotNetInstallerLibUnitTests/dotNetInstallerLibUnitTests.vcproj
@@ -5,6 +5,10 @@
Name="dotNetInstallerLibUnitTests"
ProjectGUID="{48FFB2FD-215B-4DEE-8C38-EC1DB518477F}"
RootNamespace="dotNetInstallerLibUnitTests"
+ SccProjectName="SAK"
+ SccAuxPath="SAK"
+ SccLocalPath="SAK"
+ SccProvider="SAK"
Keyword="Win32Proj"
>
<Platforms>
View
10 UnitTests/dotNetInstallerLibUnitTests/dotNetInstallerLibUnitTests.vcproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 UnitTests/dotNetInstallerToolsLibUnitTests/FormatUnitTests.cpp
@@ -87,9 +87,9 @@ void FormatUnitTests::testFormatBytes()
void FormatUnitTests::testFormatDateTime()
{
- CPPUNIT_ASSERT("1969-12-31 19:00:00" == DVLib::FormatDateTimeA(0));
+ CPPUNIT_ASSERT(DVLib::FormatDateTimeA(0).find_first_of("1969-12-31") == 0);
CPPUNIT_ASSERT("1969" == DVLib::FormatDateTimeA(0, "%Y"));
- CPPUNIT_ASSERT(L"1969-12-31 19:00:00" == DVLib::FormatDateTimeW(0));
+ CPPUNIT_ASSERT(DVLib::FormatDateTimeW(0).find_first_of(L"1969-12-31") == 0);
CPPUNIT_ASSERT(L"1969" == DVLib::FormatDateTimeW(0, L"%Y"));
}
View
4 UnitTests/dotNetInstallerToolsLibUnitTests/dotNetInstallerToolsLibUnitTests.vcproj
@@ -5,6 +5,10 @@
Name="dotNetInstallerToolsLibUnitTests"
ProjectGUID="{56390342-5DE6-4FE4-A7A6-3EC30CF4B34F}"
RootNamespace="dotNetInstallerToolsLibUnitTests"
+ SccProjectName="SAK"
+ SccAuxPath="SAK"
+ SccLocalPath="SAK"
+ SccProvider="SAK"
Keyword="Win32Proj"
>
<Platforms>
View
10 UnitTests/dotNetInstallerToolsLibUnitTests/dotNetInstallerToolsLibUnitTests.vcproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
99 UnitTests/dotNetInstallerUnitTests/AutoCloseUnitTests.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using InstallerLib;
+using dotNetUnitTestsRunner;
+using System.IO;
+using Microsoft.Win32;
+using System.Diagnostics;
+
+namespace dotNetInstallerUnitTests
+{
+ [TestFixture]
+ public class AutoCloseUnitTests
+ {
+ [Test]
+ public void TestAutoCloseIfInstalledWithComponentInstallSuccess()
+ {
+ Console.WriteLine("TestAutoCloseIfInstalledWithComponentInstallSuccess");
+
+ //configuration with a component that will run and succeed and so dni will auto close
+
+ // marker that makes installed check succeeed after installation
+ string markerFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+
+ ConfigFile configFile = new ConfigFile();
+ SetupConfiguration setupConfiguration = new SetupConfiguration();
+ setupConfiguration.auto_start = true;
+ setupConfiguration.auto_close_if_installed = true;
+ configFile.Children.Add(setupConfiguration);
+
+ // dummy component
+ ComponentCmd component = new ComponentCmd();
+ setupConfiguration.Children.Add(component);
+ component.required_install = true;
+ component.supports_install = true;
+ component.command = string.Format("cmd.exe /C dir > \"{0}\"", markerFilename);
+
+ InstalledCheckFile check = new InstalledCheckFile();
+ check.filename = markerFilename;
+ check.comparison = installcheckfile_comparison.exists;
+ component.Children.Add(check);
+
+ string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
+ Console.WriteLine("Writing '{0}'", configFilename);
+ configFile.SaveAs(configFilename);
+
+ // will auto close since all components installed successfully
+ Assert.AreEqual(0, dotNetInstallerExeUtils.Run(configFilename));
+
+ File.Delete(configFilename);
+ File.Delete(markerFilename);
+ }
+
+ [Test]
+ public void TestAutoCloseIfInstalledWithComponentInstallFailure()
+ {
+ Console.WriteLine("TestAutoCloseIfInstalledWithComponentInstallFailure");
+
+ //configuration with a component that will run and fail and so dni will not auto close
+
+ ConfigFile configFile = new ConfigFile();
+ SetupConfiguration setupConfiguration = new SetupConfiguration();
+ setupConfiguration.auto_start = true;
+ setupConfiguration.auto_close_if_installed = true;
+ setupConfiguration.failed_exec_command_continue = string.Empty;
+ configFile.Children.Add(setupConfiguration);
+
+ ComponentCmd cmd = new ComponentCmd();
+ cmd.command = "cmd.exe /C exit /b 1";
+ cmd.required_install = true;
+ cmd.supports_install = true;
+ setupConfiguration.Children.Add(cmd);
+
+ InstalledCheckRegistry check = new InstalledCheckRegistry();
+ check.path = @"SOFTWARE\KeyDoesntExists";
+ check.comparison = installcheckregistry_comparison.exists;
+ cmd.Children.Add(check);
+
+ string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
+ Console.WriteLine("Writing '{0}'", configFilename);
+ configFile.SaveAs(configFilename);
+
+ // will not auto close since all required components failed to install
+ Assert.AreNotEqual(0, dotNetInstallerExeUtils.Run(configFilename));
+
+ dotNetInstallerExeUtils.RunOptions options = new dotNetInstallerExeUtils.RunOptions(configFilename);
+ options.quiet = false;
+
+ Process p = dotNetInstallerExeUtils.Detach(options);
+ Assert.IsFalse(p.WaitForExit(3 * 1000));
+ p.Kill();
+ p.WaitForExit();
+ Assert.AreEqual(-1, p.ExitCode);
+
+ File.Delete(configFilename);
+ }
+ }
+}
View
12 UnitTests/dotNetInstallerUnitTests/AutoStartUnitTests.cs
@@ -15,16 +15,20 @@ public class AutoStartUnitTests
[Test]
public void TestAutoStart()
{
+ Console.WriteLine("TestAutoStart");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
setupConfiguration.auto_start = true;
setupConfiguration.installation_completed = string.Empty;
+ setupConfiguration.installation_none = string.Empty;
configFile.Children.Add(setupConfiguration);
// dummy component
ComponentCmd component = new ComponentCmd();
setupConfiguration.Children.Add(component);
component.command = "cmd.exe /C exit /b 0";
+ component.installcompletemessage = string.Empty;
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
configFile.SaveAs(configFilename);
@@ -38,6 +42,8 @@ public void TestAutoStart()
[Test]
public void TestNoAutoStart()
{
+ Console.WriteLine("TestNoAutoStart");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -64,17 +70,21 @@ public void TestNoAutoStart()
[Test]
public void TestAutoContinueOnReboot()
{
+ Console.WriteLine("TestAutoContinueOnReboot");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
setupConfiguration.auto_start = false;
setupConfiguration.auto_continue_on_reboot = true;
setupConfiguration.installation_completed = string.Empty;
+ setupConfiguration.installation_none = string.Empty;
configFile.Children.Add(setupConfiguration);
// dummy component
ComponentCmd component = new ComponentCmd();
setupConfiguration.Children.Add(component);
component.command = "cmd.exe /C exit /b 0";
+ component.installcompletemessage = string.Empty;
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
configFile.SaveAs(configFilename);
@@ -88,6 +98,8 @@ public void TestAutoContinueOnReboot()
[Test]
public void TestNoAutoContinueOnReboot()
{
+ Console.WriteLine("TestNoAutoContinueOnReboot");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
View
18 UnitTests/dotNetInstallerUnitTests/CabUnitTests.cs
@@ -14,6 +14,8 @@ public class CabUnitTests
[Test]
public void TestCabPathAutoDeleteFalse()
{
+ Console.WriteLine("TestCabPathAutoDeleteFalse");
+
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
@@ -34,6 +36,8 @@ public void TestCabPathAutoDeleteFalse()
[Test]
public void TestCabPathAutoDeleteTrue()
{
+ Console.WriteLine("TestCabPathAutoDeleteTrue");
+
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
@@ -54,6 +58,8 @@ public void TestCabPathAutoDeleteTrue()
[Test]
public void TestExtractCab()
{
+ Console.WriteLine("TestExtractCab");
+
// create a self-extracting bootstrapper
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -84,6 +90,8 @@ public void TestExtractCab()
[Test]
public void TestExtractCabPerComponent()
{
+ Console.WriteLine("TestExtractCabPerComponent");
+
InstallerLinkerArguments args = new InstallerLinkerArguments();
args.config = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", args.config);
@@ -119,6 +127,8 @@ public void TestExtractCabPerComponent()
[Test]
public void TestExtractAndRunCabPerComponent()
{
+ Console.WriteLine("TestExtractAndRunCabPerComponent");
+
InstallerLinkerArguments args = new InstallerLinkerArguments();
args.config = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", args.config);
@@ -134,6 +144,7 @@ public void TestExtractAndRunCabPerComponent()
configFile.Children.Add(setupConfiguration);
ComponentCmd component = new ComponentCmd();
component.command = "cmd.exe /C copy \"#CABPATH\\component\\before.xml\" \"#CABPATH\\component\\after.xml\"";
+ component.required_install = true;
setupConfiguration.Children.Add(component);
EmbedFile embedfile = new EmbedFile();
embedfile.sourcefilepath = args.config;
@@ -154,12 +165,15 @@ public void TestExtractAndRunCabPerComponent()
Assert.IsTrue(File.Exists(Path.Combine(Path.GetTempPath(), @"testExtractAndRunCabPerComponent\component\after.xml")));
File.Delete(args.config);
File.Delete(args.output);
- Directory.Delete(extractedComponentPath, true);
+ Directory.Delete(setupConfiguration.cab_path, true);
+ File.Delete(logfile);
}
[Test]
public void TestDisplayCab()
{
+ Console.WriteLine("TestDisplayCab");
+
// create a self-extracting bootstrapper
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -185,6 +199,8 @@ public void TestDisplayCab()
[Test]
public void TestExtractCabTwoComponentsSameName()
{
+ Console.WriteLine("TestExtractCabTwoComponentsSameName");
+
InstallerLinkerArguments args = new InstallerLinkerArguments();
args.config = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", args.config);
View
10 UnitTests/dotNetInstallerUnitTests/CompleteCommandUnitTests.cs
@@ -15,6 +15,8 @@ public class CompleteCommandTests
[Test]
public void TestNoComponents()
{
+ Console.WriteLine("TestNoComponents");
+
// a configuration with no components, complete command is executed
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -32,11 +34,14 @@ public void TestNoComponents()
File.Delete(configFilename);
Assert.IsTrue(File.Exists(markerFilename + ".silent"));
File.Delete(markerFilename);
+ File.Delete(markerFilename + ".silent");
}
[Test]
public void TestFailingComponent()
{
+ Console.WriteLine("TestFailingComponent");
+
// a configuration with a component that fails, complete command is not executed
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -48,6 +53,7 @@ public void TestFailingComponent()
ComponentCmd component = new ComponentCmd();
setupConfiguration.Children.Add(component);
component.command = "cmd.exe /C exit /b 123";
+ component.required_install = true;
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
@@ -61,6 +67,8 @@ public void TestFailingComponent()
[Test]
public void TestWaitForCompleteCommand()
{
+ Console.WriteLine("TestWaitForCompleteCommand");
+
ConfigFile configFile = new ConfigFile();
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -81,6 +89,8 @@ public void TestWaitForCompleteCommand()
[Test]
public void TestDontWaitForCompleteCommand()
{
+ Console.WriteLine("TestDontWaitForCompleteCommand");
+
ConfigFile configFile = new ConfigFile();
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
SetupConfiguration setupConfiguration = new SetupConfiguration();
View
21 UnitTests/dotNetInstallerUnitTests/ComponentArgsUnitTests.cs
@@ -15,6 +15,8 @@ public class ComponentArgsUnitTests
[Test]
public void TestComponentArgCmd()
{
+ Console.WriteLine("TestComponentArgCmd");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -24,6 +26,7 @@ public void TestComponentArgCmd()
component.id = "cmd1";
component.display_name = "command 1";
component.command = "cmd.exe /C dir";
+ component.required_install = true;
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
configFile.SaveAs(configFilename);
@@ -36,6 +39,8 @@ public void TestComponentArgCmd()
[Test]
public void TestComponentNameArgCmd()
{
+ Console.WriteLine("TestComponentNameArgCmd");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -45,6 +50,7 @@ public void TestComponentNameArgCmd()
component.id = "cmd1";
component.display_name = "command 1";
component.command = "cmd.exe /C dir";
+ component.required_install = true;
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
configFile.SaveAs(configFilename);
@@ -57,6 +63,8 @@ public void TestComponentNameArgCmd()
[Test]
public void TestComponentNameArgQuotes()
{
+ Console.WriteLine("TestComponentNameArgQuotes");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -66,6 +74,7 @@ public void TestComponentNameArgQuotes()
component.id = "cmd1";
component.display_name = "command 1";
component.command = "cmd.exe /C dir";
+ component.required_install = true;
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
configFile.SaveAs(configFilename);
@@ -78,6 +87,8 @@ public void TestComponentNameArgQuotes()
[Test]
public void TestAllArgCmd()
{
+ Console.WriteLine("TestAllArgCmd");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -87,11 +98,13 @@ public void TestAllArgCmd()
component1.id = "cmd1";
component1.display_name = "command 1";
component1.command = "cmd.exe /C exit /b ";
+ component1.required_install = true;
ComponentCmd component2 = new ComponentCmd();
setupConfiguration.Children.Add(component2);
component2.id = "cmd2";
component2.display_name = "command 2";
component2.command = "cmd.exe /C exit /b ";
+ component2.required_install = true;
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
configFile.SaveAs(configFilename);
@@ -104,6 +117,8 @@ public void TestAllArgCmd()
[Test]
public void TestComponentIdAndNameArgCmd()
{
+ Console.WriteLine("TestComponentIdAndNameArgCmd");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -113,6 +128,7 @@ public void TestComponentIdAndNameArgCmd()
component.id = "cmd1";
component.display_name = "command 1";
component.command = "cmd.exe /C dir";
+ component.required_install = true;
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
configFile.SaveAs(configFilename);
@@ -125,6 +141,8 @@ public void TestComponentIdAndNameArgCmd()
[Test]
public void TestComponentArgCmd2()
{
+ Console.WriteLine("TestComponentArgCmd2");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -134,6 +152,7 @@ public void TestComponentArgCmd2()
component.id = "cmd1";
component.display_name = "command 1";
component.command = "cmd.exe /C dir";
+ component.required_install = true;
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
configFile.SaveAs(configFilename);
@@ -146,6 +165,8 @@ public void TestComponentArgCmd2()
[Test]
public void TestComponentArgIgnored()
{
+ Console.WriteLine("TestComponentArgIgnored");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
View
2  UnitTests/dotNetInstallerUnitTests/ConfigurationUnitTests.cs
@@ -16,6 +16,8 @@ public class ConfigurationUnitTests
[Test]
public void TestInvalidVersionContinues()
{
+ Console.WriteLine("TestInvalidVersionContinues");
+
// a configuration with a mismatched version
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
View
10 UnitTests/dotNetInstallerUnitTests/ContinueOnErrorUnitTests.cs
@@ -15,6 +15,8 @@ public class ContinueOnErrorTests
[Test]
public void TestContinueOnError()
{
+ Console.WriteLine("TestContinueOnError");
+
ConfigFile configFile = new ConfigFile();
string markerFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
string markerFilename1 = string.Format("{0}.1", markerFilename);
@@ -24,9 +26,11 @@ public void TestContinueOnError()
ComponentCmd cmd1 = new ComponentCmd();
setupConfiguration.Children.Add(cmd1);
cmd1.command = string.Format("cmd.exe /C dir > \"{0}\" & exit /b 1", markerFilename1);
+ cmd1.required_install = true;
ComponentCmd cmd2 = new ComponentCmd();
setupConfiguration.Children.Add(cmd2);
cmd2.command = string.Format("cmd.exe /C dir > \"{0}\" & exit /b 2", markerFilename2);
+ cmd2.required_install = true;
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
@@ -60,6 +64,8 @@ public void TestContinueOnError()
[Test]
public void TestContinueOnErrorNoMessage()
{
+ Console.WriteLine("TestContinueOnErrorNoMessage");
+
// test that with all failed_exec_command_continue blanked,
// user is never asked a question in full UI mode (not blocked)
ConfigFile configFile = new ConfigFile();
@@ -72,12 +78,16 @@ public void TestContinueOnErrorNoMessage()
setupConfiguration.auto_start = true;
// running in full UI mode, installation is expected to fail, auto-close
setupConfiguration.auto_close_on_error = true;
+ setupConfiguration.installation_none = string.Empty;
+ setupConfiguration.installation_completed = string.Empty;
ComponentCmd cmd1 = new ComponentCmd();
setupConfiguration.Children.Add(cmd1);
cmd1.command = string.Format("cmd.exe /C dir > \"{0}\" & exit /b 1", markerFilename1);
+ cmd1.required_install = true;
ComponentCmd cmd2 = new ComponentCmd();
setupConfiguration.Children.Add(cmd2);
cmd2.command = string.Format("cmd.exe /C dir > \"{0}\" & exit /b 2", markerFilename2);
+ cmd2.required_install = true;
// continue on error by default -> continues on the first and the second component, returns the last error code
cmd1.default_continue_on_error = true;
cmd2.default_continue_on_error = true;
View
6 UnitTests/dotNetInstallerUnitTests/DownloadComponentsUnitTests.cs
@@ -16,6 +16,8 @@ public class DownloadComponentsUnitTests
[Test]
public void TestDownloadConfiguration()
{
+ Console.WriteLine("TestDownloadConfiguration");
+
// a configuration with a single component that contains two download components
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -23,6 +25,7 @@ public void TestDownloadConfiguration()
ComponentCmd component1 = new ComponentCmd();
setupConfiguration.Children.Add(component1);
component1.command = "cmd.exe /C exit /b 0";
+ component1.required_install = true;
DownloadDialog component1downloaddialog = new DownloadDialog(
string.Format("{0} Download Dialog", component1.id));
component1.Children.Add(component1downloaddialog);
@@ -54,6 +57,8 @@ public void TestDownloadConfiguration()
[Test]
public void TestNoDownloadWhenSourceFileExsts()
{
+ Console.WriteLine("TestNoDownloadWhenSourceFileExsts");
+
// a configuration where the source file exists, no download dialog should show
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -61,6 +66,7 @@ public void TestNoDownloadWhenSourceFileExsts()
ComponentCmd cmd = new ComponentCmd();
setupConfiguration.Children.Add(cmd);
cmd.command = "cmd.exe /C exit /b 0";
+ cmd.required_install = true;
DownloadDialog cmddownloaddialog = new DownloadDialog(
string.Format("{0} Download Dialog", cmd.id));
cmd.Children.Add(cmddownloaddialog);
View
6 UnitTests/dotNetInstallerUnitTests/ExitCodeUnitTests.cs
@@ -14,6 +14,8 @@ public class ExitCodeUnitTests
[Test]
public void TestNoComponentsSuccess()
{
+ Console.WriteLine("TestNoComponentsSuccess");
+
// a configuration with no components
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -30,6 +32,8 @@ public void TestNoComponentsSuccess()
[Test]
public void TestMissingConfigFile()
{
+ Console.WriteLine("TestMissingConfigFile");
+
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Assert.AreEqual(-1, dotNetInstallerExeUtils.Run(configFilename));
}
@@ -37,6 +41,8 @@ public void TestMissingConfigFile()
[Test]
public void TestBadConfigFile()
{
+ Console.WriteLine("TestBadConfigFile");
+
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
File.WriteAllText(configFilename, "bogus xml");
Assert.AreEqual(-1, dotNetInstallerExeUtils.Run(configFilename));
View
12 UnitTests/dotNetInstallerUnitTests/LanguageUnitTests.cs
@@ -27,11 +27,13 @@ public void TestComponentLcid()
cmdCurrentLcid.os_filter_lcid = CultureInfo.CurrentCulture.LCID.ToString();
Console.WriteLine("Current lcid: {0}", cmdCurrentLcid.os_filter_lcid);
cmdCurrentLcid.command = string.Format("cmd.exe /C dir > \"{0}\"", currentLcidFilename);
+ cmdCurrentLcid.required_install = true;
setupConfiguration.Children.Add(cmdCurrentLcid);
// empty lcid
string emptyLcidFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
ComponentCmd cmdEmptyLcid = new ComponentCmd();
cmdEmptyLcid.command = string.Format("cmd.exe /C dir > \"{0}\"", emptyLcidFilename);
+ cmdEmptyLcid.required_install = true;
setupConfiguration.Children.Add(cmdEmptyLcid);
// another lcid
string anotherLcidFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
@@ -39,6 +41,7 @@ public void TestComponentLcid()
cmdAnotherLcid.os_filter_lcid = (CultureInfo.CurrentCulture.LCID + 1).ToString();
Console.WriteLine("Another lcid: {0}", cmdAnotherLcid.os_filter_lcid);
cmdAnotherLcid.command = string.Format("cmd.exe /C dir > \"{0}\"", anotherLcidFilename);
+ cmdAnotherLcid.required_install = true;
setupConfiguration.Children.Add(cmdAnotherLcid);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -51,6 +54,7 @@ public void TestComponentLcid()
Assert.IsFalse(File.Exists(anotherLcidFilename));
File.Delete(currentLcidFilename);
File.Delete(emptyLcidFilename);
+ File.Delete(configFilename);
}
[Test]
@@ -66,6 +70,7 @@ public void TestConfigurationLcid()
ComponentCmd cmdCurrentLcid = new ComponentCmd();
Console.WriteLine("Current lcid: {0}", currentLcidConfiguration.lcid_filter);
cmdCurrentLcid.command = string.Format("cmd.exe /C dir > \"{0}\" & exit /b 0", currentLcidFilename);
+ cmdCurrentLcid.required_install = true;
currentLcidConfiguration.Children.Add(cmdCurrentLcid);
// empty lcid setup configuration
SetupConfiguration emptyLcidConfiguration = new SetupConfiguration();
@@ -73,6 +78,7 @@ public void TestConfigurationLcid()
string emptyLcidFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
ComponentCmd cmdEmptyLcid = new ComponentCmd();
cmdEmptyLcid.command = string.Format("cmd.exe /C dir > \"{0}\" & exit /b 0", emptyLcidFilename);
+ cmdEmptyLcid.required_install = true;
emptyLcidConfiguration.Children.Add(cmdEmptyLcid);
// another lcid setup configuration
SetupConfiguration anotherLcidConfiguration = new SetupConfiguration();
@@ -82,6 +88,7 @@ public void TestConfigurationLcid()
ComponentCmd cmdAnotherLcid = new ComponentCmd();
Console.WriteLine("Another lcid: {0}", anotherLcidConfiguration.lcid_filter);
cmdAnotherLcid.command = string.Format("cmd.exe /C dir > \"{0}\" & exit /b 0", anotherLcidFilename);
+ cmdAnotherLcid.required_install = true;
anotherLcidConfiguration.Children.Add(cmdAnotherLcid);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -94,6 +101,7 @@ public void TestConfigurationLcid()
Assert.IsFalse(File.Exists(anotherLcidFilename));
File.Delete(currentLcidFilename);
File.Delete(emptyLcidFilename);
+ File.Delete(configFilename);
}
[Test]
@@ -104,6 +112,7 @@ public void TestOsLangID()
configFile.Children.Add(configuration);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b #OSLANGID";
+ cmd.required_install = true;
configuration.Children.Add(cmd);
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
@@ -120,6 +129,7 @@ public void TestConfigNoLangID()
configFile.Children.Add(configuration);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b #LANGID";
+ cmd.required_install = true;
configuration.Children.Add(cmd);
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
Console.WriteLine("Writing '{0}'", configFilename);
@@ -136,6 +146,7 @@ public void TestConfigLangID()
configFile.Children.Add(configuration);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b #LANGID";
+ cmd.required_install = true;
configuration.language_id = "1234";
configuration.Children.Add(cmd);
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -153,6 +164,7 @@ public void TestConfigLanguage()
configFile.Children.Add(configuration);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b #LANGUAGE";
+ cmd.required_install = true;
configuration.language_id = "1234";
configuration.language = "3456";
configuration.Children.Add(cmd);
View
11 UnitTests/dotNetInstallerUnitTests/LoggingUnitTests.cs
@@ -14,6 +14,8 @@ public class LoggingUnitTests
[Test]
public void TestNoLogging()
{
+ Console.WriteLine("TestNoLogging");
+
if (File.Exists(dotNetInstallerExeUtils.RunOptions.DefaultLogFile))
File.Delete(dotNetInstallerExeUtils.RunOptions.DefaultLogFile);
ConfigFile configFile = new ConfigFile();
@@ -33,6 +35,8 @@ public void TestNoLogging()
[Test]
public void TestLogConfigSpecified()
{
+ Console.WriteLine("TestLogConfigSpecified");
+
if (File.Exists(dotNetInstallerExeUtils.RunOptions.DefaultLogFile))
File.Delete(dotNetInstallerExeUtils.RunOptions.DefaultLogFile);
ConfigFile configFile = new ConfigFile();
@@ -52,11 +56,14 @@ public void TestLogConfigSpecified()
File.Delete(configFilename);
Assert.IsFalse(File.Exists(dotNetInstallerExeUtils.RunOptions.DefaultLogFile));
Assert.IsTrue(File.Exists(configFile.log_file));
+ File.Delete(configFile.log_file);
}
[Test]
public void TestLogCommandLineOverwritesConfigFile()
{
+ Console.WriteLine("TestLogCommandLineOverwritesConfigFile");
+
if (File.Exists(dotNetInstallerExeUtils.RunOptions.DefaultLogFile))
File.Delete(dotNetInstallerExeUtils.RunOptions.DefaultLogFile);
ConfigFile configFile = new ConfigFile();
@@ -76,11 +83,14 @@ public void TestLogCommandLineOverwritesConfigFile()
File.Delete(configFilename);
Assert.IsTrue(File.Exists(dotNetInstallerExeUtils.RunOptions.DefaultLogFile));
Assert.IsFalse(File.Exists(configFile.log_file));
+ File.Delete(configFile.log_file);
}
[Test]
public void TestLogAcceptsPathVariables()
{
+ Console.WriteLine("TestLogAcceptsPathVariables");
+
string resolved_logfile = Path.Combine(Path.GetTempPath(), "TestLogAcceptsPathVariables.log");
if (File.Exists(dotNetInstallerExeUtils.RunOptions.DefaultLogFile))
File.Delete(dotNetInstallerExeUtils.RunOptions.DefaultLogFile);
@@ -101,6 +111,7 @@ public void TestLogAcceptsPathVariables()
File.Delete(configFilename);
Assert.IsTrue(File.Exists(resolved_logfile), string.Format("Missing {0}", resolved_logfile));
Assert.IsFalse(File.Exists(dotNetInstallerExeUtils.RunOptions.DefaultLogFile));
+ File.Delete(resolved_logfile);
}
}
}
View
7 UnitTests/dotNetInstallerUnitTests/RebootUnitTests.cs
@@ -14,12 +14,15 @@ public class RebootUnitTests
[Test]
public void TestRebootRequired()
{
+ Console.WriteLine("TestRebootRequired");
+
// a configuration with a component that requires reboot, exit code will be 3010
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b 3010";
+ cmd.required_install = true;
cmd.returncodes_reboot = "3010";
setupConfiguration.Children.Add(cmd);
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -33,17 +36,21 @@ public void TestRebootRequired()
[Test]
public void TestRebootExitCode()
{
+ Console.WriteLine("TestRebootExitCode");
+
// reboot exit code doesn't override a previous error
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
ComponentCmd cmd_error = new ComponentCmd();
cmd_error.command = "cmd.exe /C exit /b 42";
+ cmd_error.required_install = true;
cmd_error.allow_continue_on_error = true;
cmd_error.default_continue_on_error = true;
setupConfiguration.Children.Add(cmd_error);
ComponentCmd cmd_reboot = new ComponentCmd();
cmd_reboot.command = "cmd.exe /C exit /b 3010";
+ cmd_error.required_install = true;
cmd_reboot.returncodes_reboot = "3010";
setupConfiguration.Children.Add(cmd_reboot);
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
View
6 UnitTests/dotNetInstallerUnitTests/SelectionUnitTests.cs
@@ -14,6 +14,8 @@ public class SelectionUnitTests
[Test]
public void TestDefaultSelectionInstall()
{
+ Console.WriteLine("TestDefaultSelectionInstall");
+
ConfigFile configFile = new ConfigFile();
// setup configuration
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -22,11 +24,13 @@ public void TestDefaultSelectionInstall()
ComponentCmd component1 = new ComponentCmd();
setupConfiguration.Children.Add(component1);
component1.command = "cmd.exe /C exit /b 57";
+ component1.required_install = true;
component1.selected_install = false;
// dummy component 2
ComponentCmd component2 = new ComponentCmd();
setupConfiguration.Children.Add(component2);
component2.command = "cmd.exe /C exit /b 42";
+ component2.required_install = true;
component2.selected_install = true;
// second component is selected and runs, not the first one
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -45,6 +49,8 @@ public void TestDefaultSelectionInstall()
[Test]
public void TestDefaultSelectionUninstall()
{
+ Console.WriteLine("TestDefaultSelectionUninstall");
+
InstalledCheckFile existsCheck = new InstalledCheckFile();
existsCheck.filename = dotNetInstallerExeUtils.Executable;
existsCheck.comparison = installcheckfile_comparison.exists;
View
2  UnitTests/dotNetInstallerUnitTests/UILevelUnitTests.cs
@@ -14,6 +14,8 @@ public class UILevelUnitTests
[Test]
public void TestSilentMode()
{
+ Console.WriteLine("TestSilentMode");
+
InstallUILevel[] testUILevels = { InstallUILevel.basic, InstallUILevel.silent };
foreach (InstallUILevel uilevel in testUILevels)
{
View
19 UnitTests/dotNetInstallerUnitTests/UninstallUnitTests.cs
@@ -14,6 +14,8 @@ public class UninstallUnitTests
[Test]
public void TestSupportsNone()
{
+ Console.WriteLine("TestSupportsNone");
+
// a configuration with no components
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -32,6 +34,8 @@ public void TestSupportsNone()
[Test]
public void TestSupportsInstall()
{
+ Console.WriteLine("TestSupportsInstall");
+
// a configuration with no components
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -54,6 +58,8 @@ public void TestSupportsInstall()
[Test]
public void TestSupportsUninstall()
{
+ Console.WriteLine("TestSupportsUninstall");
+
// a configuration with no components
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -76,12 +82,15 @@ public void TestSupportsUninstall()
[Test]
public void TestUninstallSwitch()
{
+ Console.WriteLine("TestUninstallSwitch");
+
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
ComponentCmd cmd = new ComponentCmd();
setupConfiguration.Children.Add(cmd);
cmd.command = "cmd.exe /C exit /b 1"; // would fail if ran
+ cmd.required_install = true;
cmd.uninstall_command = "cmd.exe /C exit /b 0";
cmd.supports_install = true;
cmd.supports_uninstall = true;
@@ -100,6 +109,8 @@ public void TestUninstallSwitch()
[Test]
public void TestUninstallAuto()
{
+ Console.WriteLine("TestUninstallAuto");
+
// a component that's already installed
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -129,11 +140,14 @@ public void TestUninstallAuto()
configFile.SaveAs(configFilename);
// will fallback to uninstall since all components are installed
Assert.AreEqual(0, dotNetInstallerExeUtils.Run(configFilename));
+ File.Delete(configFilename);
}
[Test]
public void TestUninstallMsiSilentMode()
{
+ Console.WriteLine("TestUninstallMsiSilentMode");
+
InstallUILevel[] testUILevels = { InstallUILevel.basic, InstallUILevel.silent };
foreach (InstallUILevel uilevel in testUILevels)
{
@@ -168,6 +182,8 @@ public void TestUninstallMsiSilentMode()
[Test]
public void TestUninstallMspSilentMode()
{
+ Console.WriteLine("TestUninstallMspSilentMode");
+
InstallUILevel[] testUILevels = { InstallUILevel.basic, InstallUILevel.silent };
foreach (InstallUILevel uilevel in testUILevels)
{
@@ -202,6 +218,8 @@ public void TestUninstallMspSilentMode()
[Test]
public void TestUninstallAutoWithOptionalComponent()
{
+ Console.WriteLine("TestUninstallAutoWithOptionalComponent");
+
// a component that's already installed
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -232,6 +250,7 @@ public void TestUninstallAutoWithOptionalComponent()
configFile.SaveAs(configFilename);
// will fallback to uninstall since all required components are installed
Assert.AreEqual(0, dotNetInstallerExeUtils.Run(configFilename));
+ File.Delete(configFilename);
}
}
}
View
47 UnitTests/dotNetInstallerUnitTests/UserControlUnitTests.cs
@@ -16,6 +16,8 @@ public class UserControlUnitTests
[Test]
public void TestUserControlCheckbox()
{
+ Console.WriteLine("TestUserControlCheckbox");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -29,6 +31,7 @@ public void TestUserControlCheckbox()
setupConfiguration.Children.Add(checkbox);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [checkbox1]";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -49,6 +52,8 @@ public void TestUserControlCheckbox()
[Test]
public void TestUserControlCheckboxInstallCheck()
{
+ Console.WriteLine("TestUserControlCheckboxInstallCheck");
+
// a configuration with a checkbox control which has an installed check that disables it
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -68,6 +73,7 @@ public void TestUserControlCheckboxInstallCheck()
// command that depends on the value of checkbox1
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [checkbox1]5";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -88,6 +94,8 @@ public void TestUserControlCheckboxInstallCheck()
[Test]
public void TestUserControlEdit()
{
+ Console.WriteLine("TestUserControlEdit");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -98,6 +106,7 @@ public void TestUserControlEdit()
setupConfiguration.Children.Add(edit);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [edit1]";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -111,6 +120,8 @@ public void TestUserControlEdit()
[Test]
public void TestUserControlEditInstalledCheckBoth()
{
+ Console.WriteLine("TestUserControlEditInstalledCheckBoth");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -127,6 +138,7 @@ public void TestUserControlEditInstalledCheckBoth()
edit.Children.Add(check);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [edit1]5";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -140,6 +152,8 @@ public void TestUserControlEditInstalledCheckBoth()
[Test]
public void TestUserControlEditInstalledCheckHasValueDisabled()
{
+ Console.WriteLine("TestUserControlEditInstalledCheckHasValueDisabled");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -157,6 +171,7 @@ public void TestUserControlEditInstalledCheckHasValueDisabled()
edit.Children.Add(check);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [edit1]5";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -170,6 +185,8 @@ public void TestUserControlEditInstalledCheckHasValueDisabled()
[Test]
public void TestUserControlEditInstalledCheckHasNoValueDisabled()
{
+ Console.WriteLine("TestUserControlEditInstalledCheckHasNoValueDisabled");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -187,6 +204,7 @@ public void TestUserControlEditInstalledCheckHasNoValueDisabled()
edit.Children.Add(check);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [edit1]5";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -200,6 +218,8 @@ public void TestUserControlEditInstalledCheckHasNoValueDisabled()
[Test]
public void TestUserControlEditInstalledCheckDisplay()
{
+ Console.WriteLine("TestUserControlEditInstalledCheckDisplay");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -216,6 +236,7 @@ public void TestUserControlEditInstalledCheckDisplay()
edit.Children.Add(check);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [edit1]5";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -229,6 +250,8 @@ public void TestUserControlEditInstalledCheckDisplay()
[Test]
public void TestUserControlHyperlink()
{
+ Console.WriteLine("TestUserControlHyperlink");
+
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
@@ -251,6 +274,8 @@ public void TestUserControlHyperlink()
[Test]
public void TestUserControlBrowse()
{
+ Console.WriteLine("TestUserControlBrowse");
+
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
@@ -260,6 +285,7 @@ public void TestUserControlBrowse()
setupConfiguration.Children.Add(browse);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [browse1]";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -273,6 +299,8 @@ public void TestUserControlBrowse()
[Test]
public void TestUserControlBrowseBackslashStripped()
{
+ Console.WriteLine("TestUserControlBrowseBackslashStripped");
+
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
@@ -295,6 +323,8 @@ public void TestUserControlBrowseBackslashStripped()
[Test]
public void TestUserControlBrowseDrive()
{
+ Console.WriteLine("TestUserControlBrowseDrive");
+
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
@@ -317,6 +347,8 @@ public void TestUserControlBrowseDrive()
[Test]
public void TestUserControlImage()
{
+ Console.WriteLine("TestUserControlImage");
+
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
@@ -339,6 +371,8 @@ public void TestUserControlImage()
[Test]
public void TestUserControlLicense()
{
+ Console.WriteLine("TestUserControlLicense");
+
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
// a configuration with a license agreement control
ConfigFile configFile = new ConfigFile();
@@ -351,6 +385,7 @@ public void TestUserControlLicense()
setupConfiguration.Children.Add(license);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [MY_RES_LICENSE]";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
Console.WriteLine("Writing '{0}'", configFilename);
@@ -372,12 +407,15 @@ public void TestUserControlLicense()
[Test]
public void TestNoUserControl()
{
+ Console.WriteLine("TestNoUserControl");
+
// a configuration wthout a user control, value is blank
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
configFile.Children.Add(setupConfiguration);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [doesntexist]5[doesntexist]";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -391,6 +429,8 @@ public void TestNoUserControl()
[Test]
public void TestUserControlCheckboxControlArgs()
{
+ Console.WriteLine("TestUserControlCheckboxControlArgs");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -404,6 +444,7 @@ public void TestUserControlCheckboxControlArgs()
setupConfiguration.Children.Add(checkbox);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [checkbox1]";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -427,6 +468,8 @@ public void TestUserControlCheckboxControlArgs()
[Test]
public void TestUserControlEditControlArgs()
{
+ Console.WriteLine("TestUserControlEditControlArgs");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -437,6 +480,7 @@ public void TestUserControlEditControlArgs()
setupConfiguration.Children.Add(edit);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [edit1]";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
@@ -454,6 +498,8 @@ public void TestUserControlEditControlArgs()
[Test]
public void TestUserControlBrowseControlArgs()
{
+ Console.WriteLine("TestUserControlBrowseControlArgs");
+
// a configuration with a checkbox control
ConfigFile configFile = new ConfigFile();
SetupConfiguration setupConfiguration = new SetupConfiguration();
@@ -464,6 +510,7 @@ public void TestUserControlBrowseControlArgs()
setupConfiguration.Children.Add(browse);
ComponentCmd cmd = new ComponentCmd();
cmd.command = "cmd.exe /C exit /b [browse1]";
+ cmd.required_install = true;
setupConfiguration.Children.Add(cmd);
// save config file
string configFilename = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
View
5 UnitTests/dotNetInstallerUnitTests/dotNetInstallerUnitTests.csproj
@@ -14,6 +14,10 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -48,6 +52,7 @@
<Compile Include="..\..\Version\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
+ <Compile Include="AutoCloseUnitTests.cs" />
<Compile Include="AutoStartUnitTests.cs" />
<Compile Include="CabUnitTests.cs" />
<Compile Include="CommandLineParametersUnitTests.cs" />
View
10 UnitTests/dotNetInstallerUnitTests/dotNetInstallerUnitTests.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 UnitTests/dotNetUnitTestsRunner/dotNetUnitTestsRunner.csproj
@@ -9,6 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>dotNetUnitTestsRunner</RootNamespace>
<AssemblyName>dotNetUnitTestsRunner</AssemblyName>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
10 UnitTests/dotNetUnitTestsRunner/dotNetUnitTestsRunner.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
4 Version/Version.csproj
@@ -27,6 +27,10 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
View
10 Version/Version.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
View
97 dni.sln
@@ -443,7 +443,103 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CabLib", "ThirdParty\CabLib
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DownloadSetup", "DownloadSetup", "{DA2F3B93-F800-4AD0-BABE-F84B0C5128E0}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+ ProjectSection(SolutionItems) = preProject
+ Samples\DownloadSetup\Configuration.xml = Samples\DownloadSetup\Configuration.xml
+ EndProjectSection
+EndProject
Global
+ GlobalSection(TeamFoundationVersionControl) = preSolution
+ SccNumberOfProjects = 24
+ SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
+ SccTeamFoundationServer = https://tfs.codeplex.com/tfs/TFS08
+ SccLocalPath0 = .
+ SccProjectUniqueName1 = dotNetInstaller\\dotNetInstaller.vcproj
+ SccProjectName1 = dotNetInstaller
+ SccLocalPath1 = dotNetInstaller
+ SccProjectUniqueName2 = InstallerEditor\\InstallerEditor.csproj
+ SccProjectName2 = InstallerEditor
+ SccLocalPath2 = InstallerEditor
+ SccProjectUniqueName3 = Version\\Version.csproj
+ SccProjectName3 = Version
+ SccLocalPath3 = Version
+ SccProjectUniqueName4 = Samples\\PackagedSetup\\Simple\\Simple.vdproj
+ SccProjectTopLevelParentUniqueName4 = dni.sln
+ SccProjectName4 = Samples/PackagedSetup/Simple
+ SccLocalPath4 = Samples\\PackagedSetup\\Simple
+ SccProjectUniqueName5 = InstallerLinker\\InstallerLinker.csproj
+ SccProjectName5 = InstallerLinker
+ SccLocalPath5 = InstallerLinker
+ SccProjectUniqueName6 = InstallerLib\\InstallerLib.csproj
+ SccProjectName6 = InstallerLib
+ SccLocalPath6 = InstallerLib
+ SccProjectUniqueName7 = UnitTests\\InstallerLibUnitTests\\InstallerLibUnitTests.csproj
+ SccProjectTopLevelParentUniqueName7 = dni.sln
+ SccProjectName7 = UnitTests/InstallerLibUnitTests
+ SccLocalPath7 = UnitTests\\InstallerLibUnitTests
+ SccProjectUniqueName8 = InstallerConfig\\InstallerConfig.csproj
+ SccProjectName8 = InstallerConfig
+ SccLocalPath8 = InstallerConfig
+ SccProjectUniqueName9 = InstallerMsi\\InstallerMsi.wixproj
+ SccProjectName9 = InstallerMsi
+ SccLocalPath9 = InstallerMsi
+ SccProjectUniqueName10 = UnitTests\\dotNetInstallerLibUnitTests\\dotNetInstallerLibUnitTests.vcproj
+ SccProjectTopLevelParentUniqueName10 = dni.sln
+ SccProjectName10 = UnitTests/dotNetInstallerLibUnitTests
+ SccLocalPath10 = UnitTests\\dotNetInstallerLibUnitTests
+ SccProjectUniqueName11 = UnitTests\\CppUnitTestsRunner\\CppUnitTestsRunner.vcproj
+ SccProjectTopLevelParentUniqueName11 = dni.sln
+ SccProjectName11 = UnitTests/CppUnitTestsRunner
+ SccLocalPath11 = UnitTests\\CppUnitTestsRunner
+ SccProjectUniqueName12 = dotNetInstallerLib\\dotNetInstallerLib.vcproj
+ SccProjectName12 = dotNetInstallerLib
+ SccLocalPath12 = dotNetInstallerLib
+ SccProjectUniqueName13 = dotNetInstallerToolsLib\\dotNetInstallerToolsLib.vcproj
+ SccProjectName13 = dotNetInstallerToolsLib
+ SccLocalPath13 = dotNetInstallerToolsLib
+ SccProjectUniqueName14 = UnitTests\\dotNetInstallerToolsLibUnitTests\\dotNetInstallerToolsLibUnitTests.vcproj
+ SccProjectTopLevelParentUniqueName14 = dni.sln
+ SccProjectName14 = UnitTests/dotNetInstallerToolsLibUnitTests
+ SccLocalPath14 = UnitTests\\dotNetInstallerToolsLibUnitTests
+ SccProjectUniqueName15 = ThirdParty\\Cab\\Cab.vcproj
+ SccProjectTopLevelParentUniqueName15 = dni.sln
+ SccProjectName15 = ThirdParty/Cab
+ SccLocalPath15 = ThirdParty\\Cab
+ SccProjectUniqueName16 = ThirdParty\\SmartPtr\\SmartPtr.vcproj
+ SccProjectTopLevelParentUniqueName16 = dni.sln
+ SccProjectName16 = ThirdParty/SmartPtr
+ SccLocalPath16 = ThirdParty\\SmartPtr
+ SccProjectUniqueName17 = UnitTests\\dotNetInstallerUnitTests\\dotNetInstallerUnitTests.csproj
+ SccProjectTopLevelParentUniqueName17 = dni.sln
+ SccProjectName17 = UnitTests/dotNetInstallerUnitTests
+ SccLocalPath17 = UnitTests\\dotNetInstallerUnitTests
+ SccProjectUniqueName18 = UnitTests\\dotNetUnitTestsRunner\\dotNetUnitTestsRunner.csproj
+ SccProjectTopLevelParentUniqueName18 = dni.sln
+ SccProjectName18 = UnitTests/dotNetUnitTestsRunner
+ SccLocalPath18 = UnitTests\\dotNetUnitTestsRunner
+ SccProjectUniqueName19 = UnitTests\\TestTimer\\TestTimer.csproj
+ SccProjectTopLevelParentUniqueName19 = dni.sln
+ SccProjectName19 = UnitTests/TestTimer
+ SccLocalPath19 = UnitTests\\TestTimer
+ SccProjectUniqueName20 = UnitTests\\InstallerEditorUnitTests\\InstallerEditorUnitTests.csproj
+ SccProjectTopLevelParentUniqueName20 = dni.sln
+ SccProjectName20 = UnitTests/InstallerEditorUnitTests
+ SccLocalPath20 = UnitTests\\InstallerEditorUnitTests
+ SccProjectUniqueName21 = htmlInstaller\\htmlInstaller.vcproj
+ SccProjectName21 = htmlInstaller
+ SccLocalPath21 = htmlInstaller
+ SccProjectUniqueName22 = InstallerDocLib\\InstallerDocLib.csproj
+ SccProjectName22 = InstallerDocLib
+ SccLocalPath22 = InstallerDocLib
+ SccProjectUniqueName23 = ThirdParty\\CabLib\\CabLib.vcproj
+ SccProjectTopLevelParentUniqueName23 = dni.sln
+ SccProjectName23 = ThirdParty/CabLib
+ SccLocalPath23 = ThirdParty\\CabLib
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
@@ -557,6 +653,7 @@ Global
{1F971F63-F0D9-4E48-BAC0-37959E44FDE0} = {C5E3E607-AA22-4796-B113-E9A1BAA374E9}
{18EBB4B9-ED75-43E0-881B-DAA19C621589} = {C5E3E607-AA22-4796-B113-E9A1BAA374E9}
{DCE563E3-05E7-456C-AC45-97173CED2F7F} = {C5E3E607-AA22-4796-B113-E9A1BAA374E9}
+ {DA2F3B93-F800-4AD0-BABE-F84B0C5128E0} = {C5E3E607-AA22-4796-B113-E9A1BAA374E9}
{5DDA5610-5927-404B-9B03-76071159F8BE} = {AA6599BC-B3BA-4EC0-980D-5B66336A1350}
{49A3BD48-D506-4108-8F47-7CD7081C046C} = {E1BC9224-5EAE-4C49-B54D-39210DA8C43C}
{48FFB2FD-215B-4DEE-8C38-EC1DB518477F} = {E1BC9224-5EAE-4C49-B54D-39210DA8C43C}
View
10 dni.vssscc