Rename "samples" segment to "tools"
This segment is a bit of a "miscellaneous section" in the WiX repo. As such it has been difficult to name. I originally eschewed the name "tools" because what is in the "wix" segment was once called "tools". However, now that wix.exe is firmly established as the entry point for WiX operations, I've become comfortable with its segment being named "wix". That meant "tools" was again available and "tools" better describes the content of this section.
Rob Mensching committed
Jul 14, 2022 at 15:19 UTC
229242cf7c328b89b5aa65ed7a04e33c8b93b393
104 files changed
+34
-34
src/build_all.cmd
+2
-2
@@ -49,9 +49,9 @@ call wix\wix.cmd %_C% || exit /b
49
call ext\ext.cmd %_C% || exit /b
50
51
52
-:: samples
52
+:: tools
53
54
-call samples\samples.cmd %_C% || exit /b
54
+call tools\tools.cmd %_C% || exit /b
55
56
57
:: integration tests
src/tools/Directory.Build.props
renamed
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project>
5
<PropertyGroup>
6
- <SegmentName>samples</SegmentName>
6
+ <SegmentName>tools</SegmentName>
7
</PropertyGroup>
8
9
<Import Project="..\Directory.Build.props" />
src/tools/Dtf/DDiff/CabDiffEngine.cs
renamed
+1
-1
@@ -6,7 +6,7 @@ using System.Collections;
6
using System.Collections.Generic;
7
using WixToolset.Dtf.Compression.Cab;
8
9
-namespace WixToolset.Dtf.Samples.DDiff
9
+namespace WixToolset.Dtf.Tools.DDiff
10
{
11
public class CabDiffEngine : IDiffEngine
12
{
src/tools/Dtf/DDiff/DDiff.cs
renamed
+1
-1
@@ -4,7 +4,7 @@ using System;
4
using System.IO;
5
using System.Text;
6
7
-namespace WixToolset.Dtf.Samples.DDiff
7
+namespace WixToolset.Dtf.Tools.DDiff
8
{
9
public class DDiff
10
{
src/tools/Dtf/DDiff/DDiff.csproj
renamed
+1
-1
@@ -6,7 +6,7 @@
6
<PropertyGroup>
7
<ProjectGuid>{1CDF4242-4C00-4744-BBCD-085128978FF3}</ProjectGuid>
8
<OutputType>Exe</OutputType>
9
- <RootNamespace>WixToolset.Dtf.Samples.DDiff</RootNamespace>
9
+ <RootNamespace>WixToolset.Dtf.Tools.DDiff</RootNamespace>
10
<AssemblyName>DDiff</AssemblyName>
11
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
12
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
src/tools/Dtf/DDiff/DirectoryDiffEngine.cs
renamed
+1
-1
@@ -4,7 +4,7 @@ using System;
4
using System.IO;
5
using System.Collections;
6
7
-namespace WixToolset.Dtf.Samples.DDiff
7
+namespace WixToolset.Dtf.Tools.DDiff
8
{
9
public class DirectoryDiffEngine : IDiffEngine
10
{
src/tools/Dtf/DDiff/FileDiffEngine.cs
renamed
+1
-1
@@ -3,7 +3,7 @@
3
using System;
4
using System.IO;
5
6
-namespace WixToolset.Dtf.Samples.DDiff
6
+namespace WixToolset.Dtf.Tools.DDiff
7
{
8
public class FileDiffEngine : IDiffEngine
9
{
src/tools/Dtf/DDiff/IDiffEngine.cs
renamed
+1
-1
@@ -4,7 +4,7 @@ using System;
4
using System.IO;
5
using System.Collections;
6
7
-namespace WixToolset.Dtf.Samples.DDiff
7
+namespace WixToolset.Dtf.Tools.DDiff
8
{
9
public interface IDiffEngine
10
{
src/tools/Dtf/DDiff/MsiDiffEngine.cs
renamed
+1
-1
@@ -7,7 +7,7 @@ using System.Collections.Generic;
7
using WixToolset.Dtf.WindowsInstaller;
8
using WixToolset.Dtf.WindowsInstaller.Package;
9
10
-namespace WixToolset.Dtf.Samples.DDiff
10
+namespace WixToolset.Dtf.Tools.DDiff
11
{
12
public class MsiDiffEngine : IDiffEngine
13
{
src/tools/Dtf/DDiff/MspDiffEngine.cs
renamed
+1
-1
@@ -5,7 +5,7 @@ using System.IO;
5
using WixToolset.Dtf.WindowsInstaller;
6
using WixToolset.Dtf.WindowsInstaller.Package;
7
8
-namespace WixToolset.Dtf.Samples.DDiff
8
+namespace WixToolset.Dtf.Tools.DDiff
9
{
10
public class MspDiffEngine : MsiDiffEngine
11
{
src/tools/Dtf/DDiff/TextFileDiffEngine.cs
renamed
+1
-1
@@ -4,7 +4,7 @@ using System;
4
using System.IO;
5
using System.Diagnostics;
6
7
-namespace WixToolset.Dtf.Samples.DDiff
7
+namespace WixToolset.Dtf.Tools.DDiff
8
{
9
public class TextFileDiffEngine : IDiffEngine
10
{
src/tools/Dtf/DDiff/VersionedFileDiffEngine.cs
renamed
+1
-1
@@ -4,7 +4,7 @@ using System;
4
using System.IO;
5
using WixToolset.Dtf.WindowsInstaller;
6
7
-namespace WixToolset.Dtf.Samples.DDiff
7
+namespace WixToolset.Dtf.Tools.DDiff
8
{
9
public class VersionedFileDiffEngine : IDiffEngine
10
{
src/tools/Dtf/Documents/Guide/Content/about.htm
renamed
src/tools/Dtf/Documents/Guide/Content/buildingcas.htm
renamed
src/tools/Dtf/Documents/Guide/Content/cabpack.htm
renamed
src/tools/Dtf/Documents/Guide/Content/cabs.htm
renamed
src/tools/Dtf/Documents/Guide/Content/cabwrapper.htm
renamed
src/tools/Dtf/Documents/Guide/Content/caconfig.htm
renamed
src/tools/Dtf/Documents/Guide/Content/caproxy.htm
renamed
src/tools/Dtf/Documents/Guide/Content/databases.htm
renamed
src/tools/Dtf/Documents/Guide/Content/debuggingcas.htm
renamed
src/tools/Dtf/Documents/Guide/Content/dependencies.htm
renamed
src/tools/Dtf/Documents/Guide/Content/filepatchwrapper.htm
renamed
src/tools/Dtf/Documents/Guide/Content/history.htm
renamed
src/tools/Dtf/Documents/Guide/Content/installutil.htm
renamed
src/tools/Dtf/Documents/Guide/Content/inventory.htm
renamed
src/tools/Dtf/Documents/Guide/Content/managedcas.htm
renamed
src/tools/Dtf/Documents/Guide/Content/msihelper.htm
renamed
src/tools/Dtf/Documents/Guide/Content/msiwrapper.htm
renamed
src/tools/Dtf/Documents/Guide/Content/packages.htm
renamed
src/tools/Dtf/Documents/Guide/Content/powerdiff.htm
renamed
src/tools/Dtf/Documents/Guide/Content/samplecas.htm
renamed
src/tools/Dtf/Documents/Guide/Content/samples.htm
renamed
src/tools/Dtf/Documents/Guide/Content/support.htm
renamed
src/tools/Dtf/Documents/Guide/Content/using.htm
renamed
src/tools/Dtf/Documents/Guide/Content/whatsnew.htm
renamed
src/tools/Dtf/Documents/Guide/Content/wifile.htm
renamed
src/tools/Dtf/Documents/Guide/Content/writingcas.htm
renamed
src/tools/Dtf/Documents/Guide/DTF.hhc
renamed
src/tools/Dtf/Documents/Guide/DTF.hhk
renamed
src/tools/Dtf/Documents/Guide/DTF.hhp
renamed
src/tools/Dtf/Documents/Guide/dtfguide.helpproj
renamed
src/tools/Dtf/Documents/Guide/styles/presentation.css
renamed
src/tools/Dtf/Documents/Reference/Compression.htm
renamed
src/tools/Dtf/Documents/Reference/Compression1.png
renamed
src/tools/Dtf/Documents/Reference/Compression2.png
renamed
src/tools/Dtf/Documents/Reference/WindowsInstaller.htm
renamed
src/tools/Dtf/Documents/Reference/WindowsInstaller1.png
renamed
src/tools/Dtf/Documents/Reference/WindowsInstaller2.png
renamed
src/tools/Dtf/Documents/Reference/WindowsInstaller3.png
renamed
src/tools/Dtf/Documents/Reference/dtfref.shfbproj
renamed
src/tools/Dtf/Documents/Reference/helplink.js
renamed
src/tools/Dtf/Inventory/Columns.resx
renamed
src/tools/Dtf/Inventory/Features.cs
renamed
+1
-1
@@ -9,7 +9,7 @@ using System.Globalization;
9
using System.Windows.Forms;
10
using WixToolset.Dtf.WindowsInstaller;
11
12
-namespace WixToolset.Dtf.Samples.Inventory
12
+namespace WixToolset.Dtf.Tools.Inventory
13
{
14
/// <summary>
15
/// Provides inventory data about features of products installed on the system.
src/tools/Dtf/Inventory/IInventoryDataProvider.cs
renamed
+1
-1
@@ -3,7 +3,7 @@
3
using System;
4
using System.Data;
5
6
-namespace WixToolset.Dtf.Samples.Inventory
6
+namespace WixToolset.Dtf.Tools.Inventory
7
{
8
/// <summary>
9
/// Reports the total number of items loaded so far by <see cref="IInventoryDataProvider.GetNodes"/>.
src/tools/Dtf/Inventory/Inventory.cs
renamed
+1
-1
@@ -22,7 +22,7 @@ using System.Data;
22
[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode=true)]
23
24
25
-namespace WixToolset.Dtf.Samples.Inventory
25
+namespace WixToolset.Dtf.Tools.Inventory
26
{
27
public class Inventory : System.Windows.Forms.Form
28
{
src/tools/Dtf/Inventory/Inventory.csproj
renamed
+1
-1
@@ -6,7 +6,7 @@
6
<PropertyGroup>
7
<ProjectGuid>{51480F8E-B80F-42DC-91E7-3542C1F12F8C}</ProjectGuid>
8
<OutputType>WinExe</OutputType>
9
- <RootNamespace>WixToolset.Dtf.Samples.Inventory</RootNamespace>
9
+ <RootNamespace>WixToolset.Dtf.Tools.Inventory</RootNamespace>
10
<AssemblyName>Inventory</AssemblyName>
11
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
12
<ApplicationIcon>Inventory.ico</ApplicationIcon>
src/tools/Dtf/Inventory/Inventory.ico
renamed
src/tools/Dtf/Inventory/Inventory.resx
renamed
src/tools/Dtf/Inventory/components.cs
renamed
+1
-1
@@ -12,7 +12,7 @@ using Microsoft.Win32;
12
using WixToolset.Dtf.WindowsInstaller;
13
using View = WixToolset.Dtf.WindowsInstaller.View;
14
15
-namespace WixToolset.Dtf.Samples.Inventory
15
+namespace WixToolset.Dtf.Tools.Inventory
16
{
17
/// <summary>
18
/// Provides inventory data about components of products installed on the system.
src/tools/Dtf/Inventory/msiutils.cs
renamed
+1
-1
@@ -5,7 +5,7 @@ using System.Collections;
5
using WixToolset.Dtf.WindowsInstaller;
6
7
8
-namespace WixToolset.Dtf.Samples.Inventory
8
+namespace WixToolset.Dtf.Tools.Inventory
9
{
10
public class MsiUtils
11
{
src/tools/Dtf/Inventory/patches.cs
renamed
+1
-1
@@ -9,7 +9,7 @@ using System.Globalization;
9
using System.Windows.Forms;
10
using WixToolset.Dtf.WindowsInstaller;
11
12
-namespace WixToolset.Dtf.Samples.Inventory
12
+namespace WixToolset.Dtf.Tools.Inventory
13
{
14
/// <summary>
15
/// Provides inventory data about patches installed on the system.
src/tools/Dtf/Inventory/products.cs
renamed
+1
-1
@@ -7,7 +7,7 @@ using System.Collections;
7
using System.Windows.Forms;
8
using WixToolset.Dtf.WindowsInstaller;
9
10
-namespace WixToolset.Dtf.Samples.Inventory
10
+namespace WixToolset.Dtf.Tools.Inventory
11
{
12
/// <summary>
13
/// Provides inventory data about products installed or advertised on the system.
src/tools/Dtf/Inventory/xp.manifest
renamed
src/tools/Dtf/WiFile/WiFile.cs
renamed
src/tools/Dtf/WiFile/WiFile.csproj
renamed
+1
-1
@@ -6,7 +6,7 @@
6
<PropertyGroup>
7
<ProjectGuid>{AE562F7F-EE33-41D6-A962-DA488FEFBD08}</ProjectGuid>
8
<OutputType>Exe</OutputType>
9
- <RootNamespace>WixToolset.Dtf.Samples.WiFile</RootNamespace>
9
+ <RootNamespace>WixToolset.Dtf.Tools.WiFile</RootNamespace>
10
<AssemblyName>WiFile</AssemblyName>
11
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
12
</PropertyGroup>
src/tools/Dtf/XPack/AssemblyInfo.cs
renamed
src/tools/Dtf/XPack/XPack.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace WixToolset.Dtf.Samples.XPack
3
+namespace WixToolset.Dtf.Tools.XPack
4
{
5
using System;
6
using System.IO;
src/tools/Dtf/XPack/XPack.csproj
renamed
+1
-1
@@ -6,7 +6,7 @@
6
<PropertyGroup>
7
<ProjectGuid>{03E55D95-DABE-4571-9CDA-92A44F92A465}</ProjectGuid>
8
<OutputType>Exe</OutputType>
9
- <RootNamespace>WixToolset.Dtf.Samples.XPack</RootNamespace>
9
+ <RootNamespace>WixToolset.Dtf.Tools.XPack</RootNamespace>
10
<AssemblyName>XPack</AssemblyName>
11
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
12
</PropertyGroup>
src/tools/ThmViewerPackage/Package.wxs
renamed
src/tools/ThmViewerPackage/ThmViewerPackage.wixproj
renamed
src/tools/WixToolset.Templates/WixToolset.Templates.csproj
renamed
src/tools/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
renamed
src/tools/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
renamed
src/tools/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
renamed
src/tools/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
renamed
src/tools/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
renamed
src/tools/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
renamed
src/tools/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
renamed
src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
renamed
src/tools/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
renamed
src/tools/WixToolset.Templates/templates/PackageProject/.template.config/template.json
renamed
src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
renamed
src/tools/burn/ManagedBundleRunner/BundleErrorEventArgs.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace Wix.Samples
3
+namespace WixToolset.Tools
4
{
5
using System;
6
src/tools/burn/ManagedBundleRunner/BundleProgressEventArgs.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace Wix.Samples
3
+namespace WixToolset.Tools
4
{
5
using System;
6
src/tools/burn/ManagedBundleRunner/BundleResult.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace Wix.Samples
3
+namespace WixToolset.Tools
4
{
5
/// <summary>
6
/// Result codes.
src/tools/burn/ManagedBundleRunner/BundleRunner.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace Wix.Samples
3
+namespace WixToolset.Tools
4
{
5
using System;
6
using System.Diagnostics;
src/tools/burn/runbundle/AssemblyInfo.cs
renamed
src/tools/burn/runbundle/Program.cs
renamed
+2
-2
@@ -1,10 +1,10 @@
1
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3
-namespace Wix.Samples
3
+namespace WixToolset.Tools
4
{
5
using System;
6
using System.Linq;
7
- using Wix.Samples;
7
+ using WixToolset.Tools;
8
9
/// <summary>
10
/// Example executable that installs then immediately uninstalls a bundle showing progress.
src/tools/thmviewer/Resources/LoremIpsum.rtf
renamed
src/tools/thmviewer/Resources/thm.xml
renamed
src/tools/thmviewer/display.cpp
renamed
src/tools/thmviewer/load.cpp
renamed
src/tools/thmviewer/precomp.cpp
renamed
src/tools/thmviewer/precomp.h
renamed
src/tools/thmviewer/resource.h
renamed
src/tools/thmviewer/thmviewer.cpp
renamed
src/tools/thmviewer/thmviewer.manifest
renamed
src/tools/thmviewer/thmviewer.rc
renamed
src/tools/thmviewer/thmviewer.v3.ncrunchproject
renamed
src/tools/thmviewer/thmviewer.vcxproj
renamed
src/tools/thmviewer/thmviewer.vcxproj.filters
renamed
src/tools/tools.cmd
renamed
+3
-3
@@ -6,13 +6,13 @@
6
@if /i "%1"=="release" set _C=Release
7
@if not "%1"=="" shift & goto parse_args
8
9
-@echo Building samples %_C%
9
+@echo Building tools %_C%
10
11
-:: samples
11
+:: tools
12
13
nuget restore || exit /b
14
15
-msbuild -t:Build -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\samples_build.binlog || exit /b
15
+msbuild -t:Build -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\tools_build.binlog || exit /b
16
17
@popd
18
@endlocal
src/tools/tools.sln
renamed
+1
-1
@@ -1,4 +1,4 @@
1
-
1
+
2
Microsoft Visual Studio Solution File, Format Version 12.00
3
# Visual Studio Version 16
4
VisualStudioVersion = 16.0.30711.63