diff --git a/src/DTF/Documents/Reference/dtfref.shfbproj b/src/DTF/Documents/Reference/dtfref.shfbproj index 714f47fa..b011dbe0 100644 --- a/src/DTF/Documents/Reference/dtfref.shfbproj +++ b/src/DTF/Documents/Reference/dtfref.shfbproj @@ -14,9 +14,8 @@ Documentation - 1.8.0.3 + 1.9.9.0 DTFAPI - Namespace, TypeParameter InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, SealedProtected diff --git a/src/chm/documents/wixdev/building_wix.html.md b/src/chm/documents/wixdev/building_wix.html.md index 042b57ef..4dc0a36a 100644 --- a/src/chm/documents/wixdev/building_wix.html.md +++ b/src/chm/documents/wixdev/building_wix.html.md @@ -23,13 +23,13 @@ Then, simply run `msbuild` from the root directory of your clone of the WiX Git In order to fully build WiX, you must have the following Frameworks and SDKs installed: @@ -38,17 +38,7 @@ To build Votive, you must have Visual Studio 2010 and the [Visual Studio 2010 SP More information about the Visual Studio SDK can be found at the Visual Studio Extensibility Center. -To install Votive on Visual Studio 2010, 2012, or 2013, you must have the Professional Edition or higher. The Express editions of Visual Studio do not support packages like Votive. - -To build DTF help files, you need the following tools: - -* [Sandcastle May 2008 Release](http://sandcastle.codeplex.com/releases/view/13873) -* [Sandcastle Help File Builder 1.8.0.3](http://shfb.codeplex.com/releases/view/29710) - -The DTF help build process looks for these tools in an "external" directory parallel to the WiX "src" directory: - -* Sandcastle: external\Sandcastle -* Sandcastle Help File Builder: external\SandcastleBuilder +To install Votive on Visual Studio 2010, 2012, or 2013, you must have the Professional Edition or higher. The Express editions of Visual Studio do not support packages like Votive until VS 2015. To create a build that can be installed on different machines, create a new strong name key pair and point OFFICIAL\_WIX\_BUILD to it: diff --git a/tools/Nuget.targets b/tools/Nuget.targets index f58a97b7..dfecc585 100644 --- a/tools/Nuget.targets +++ b/tools/Nuget.targets @@ -17,6 +17,7 @@ $(NugetPackageFolder)FireGiant.BuildTasks.AzureStorage.1.0.0.0\tools\ $(NugetPackageFolder)MSBuild.Extension.Pack.1.2.0\lib\net40\ + $(NugetPackageFolder)EWSoftware.SHFB.2014.11.22.0\Tools\ $(NugetPackageFolder)xunit.1.9.2\lib\net20\ @@ -28,10 +29,13 @@ ================================================================================================ --> + + 2014.11.22.0 + 1.0.0.0 - + 1.2.0 diff --git a/tools/OneTimeWixBuildInitialization.proj b/tools/OneTimeWixBuildInitialization.proj index 16ca41c7..f55c0ee4 100644 --- a/tools/OneTimeWixBuildInitialization.proj +++ b/tools/OneTimeWixBuildInitialization.proj @@ -7,7 +7,7 @@ LICENSE.TXT at the root directory of the distribution. --> - + @@ -71,13 +71,7 @@ $(ProgramFiles)\HTML Help Workshop $(HelpCompilerPath)\hhc.exe - $(ProgramFiles)\Sandcastle\ - - $(SHFBROOT)\SandcastleHelpFileBuilder.targets - $(ProgramFiles)\EWSoftware\Sandcastle Help File Builder - $(SHFBROOT)\SandcastleHelpFileBuilder.targets - - true + true false @@ -263,6 +257,7 @@ $(OFFICIAL_WIX_BUILD) false true + true diff --git a/tools/WixBuild.shfbproj.targets b/tools/WixBuild.shfbproj.targets index 26a1b2d1..16c7db8d 100644 --- a/tools/WixBuild.shfbproj.targets +++ b/tools/WixBuild.shfbproj.targets @@ -12,5 +12,5 @@ $(HelpCompilerPath) - + \ No newline at end of file