From 229242cf7c328b89b5aa65ed7a04e33c8b93b393 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 14 Jul 2022 15:19:53 -0700
Subject: 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.
---
 .../WixToolset.Templates.csproj                    | 20 -----------------
 .../FragmentItem/.template.config/template.json    | 14 ------------
 .../templates/FragmentItem/Fragment.wxs            |  4 ----
 .../LibraryProject/$safeprojectname$.wixproj       |  5 -----
 .../LibraryProject/.template.config/template.json  | 14 ------------
 .../templates/LibraryProject/Fragment.wxs          |  4 ----
 .../ModuleProject/$safeprojectname$.wixproj        |  5 -----
 .../ModuleProject/.template.config/template.json   | 26 ----------------------
 .../templates/ModuleProject/Module.wxs             |  8 -------
 .../PackageProject/$safeprojectname$.wixproj       |  2 --
 .../PackageProject/.template.config/template.json  | 26 ----------------------
 .../templates/PackageProject/Package.wxs           | 24 --------------------
 12 files changed, 152 deletions(-)
 delete mode 100644 src/samples/WixToolset.Templates/WixToolset.Templates.csproj
 delete mode 100644 src/samples/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
 delete mode 100644 src/samples/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
 delete mode 100644 src/samples/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
 delete mode 100644 src/samples/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
 delete mode 100644 src/samples/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
 delete mode 100644 src/samples/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
 delete mode 100644 src/samples/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
 delete mode 100644 src/samples/WixToolset.Templates/templates/ModuleProject/Module.wxs
 delete mode 100644 src/samples/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
 delete mode 100644 src/samples/WixToolset.Templates/templates/PackageProject/.template.config/template.json
 delete mode 100644 src/samples/WixToolset.Templates/templates/PackageProject/Package.wxs

(limited to 'src/samples/WixToolset.Templates')

diff --git a/src/samples/WixToolset.Templates/WixToolset.Templates.csproj b/src/samples/WixToolset.Templates/WixToolset.Templates.csproj
deleted file mode 100644
index 00b6c6d3..00000000
--- a/src/samples/WixToolset.Templates/WixToolset.Templates.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <PackageType>Template</PackageType>
-    <Title>WixToolset Templates</Title>
-    <Description>Project and item template for the WiX Toolset.</Description>
-
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <NoWarn>$(NoWarn);NU5128</NoWarn>
-
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <IncludeContentInPack>true</IncludeContentInPack>
-    <ContentTargetFolders>content</ContentTargetFolders>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**" />
-    <Content Include="templates\**" />
-  </ItemGroup>
-</Project>
diff --git a/src/samples/WixToolset.Templates/templates/FragmentItem/.template.config/template.json b/src/samples/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
deleted file mode 100644
index 2bd67b11..00000000
--- a/src/samples/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "$schema": "http://json.schemastore.org/template",
-    "identity": "WixToolset.Templates.FragmentItem",
-    "name": "WiX Toolset Fragment",
-    "shortName": "fragment",
-    "author": "WiX Toolset Team",
-    "classifications": ["WixToolset", "Code"],
-    "tags": {
-        "language": "WiX",
-        "type": "item"
-    },
-    "sourceName": "$safeprojectname$",
-    "defaultName": "Fragment"
-}
diff --git a/src/samples/WixToolset.Templates/templates/FragmentItem/Fragment.wxs b/src/samples/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
deleted file mode 100644
index 12e1bfc3..00000000
--- a/src/samples/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
+++ /dev/null
@@ -1,4 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-  </Fragment>
-</Wix>
diff --git a/src/samples/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj b/src/samples/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
deleted file mode 100644
index c3536151..00000000
--- a/src/samples/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.0">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-  </PropertyGroup>
-</Project>
diff --git a/src/samples/WixToolset.Templates/templates/LibraryProject/.template.config/template.json b/src/samples/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
deleted file mode 100644
index ddfa82e9..00000000
--- a/src/samples/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "$schema": "http://json.schemastore.org/template",
-    "identity": "WixToolset.Templates.LibraryProject",
-    "name": "WiX Toolset Library",
-    "shortName": "wixlib",
-    "author": "WiX Toolset Team",
-    "classifications": ["WixToolset", "Library"],
-    "tags": {
-        "language": "WiX",
-        "type": "project"
-    },
-    "sourceName": "$safeprojectname$",
-    "defaultName": "Library"
-}
diff --git a/src/samples/WixToolset.Templates/templates/LibraryProject/Fragment.wxs b/src/samples/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
deleted file mode 100644
index 12e1bfc3..00000000
--- a/src/samples/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
+++ /dev/null
@@ -1,4 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-  </Fragment>
-</Wix>
diff --git a/src/samples/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj b/src/samples/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
deleted file mode 100644
index cc813aab..00000000
--- a/src/samples/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.0">
-  <PropertyGroup>
-    <OutputType>Module</OutputType>
-  </PropertyGroup>
-</Project>
diff --git a/src/samples/WixToolset.Templates/templates/ModuleProject/.template.config/template.json b/src/samples/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
deleted file mode 100644
index 2be72f83..00000000
--- a/src/samples/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "$schema": "http://json.schemastore.org/template",
-    "identity": "WixToolset.Templates.ModuleProject",
-    "name": "WiX Toolset Module",
-    "shortName": "msm",
-    "author": "WiX Toolset Team",
-    "classifications": ["WixToolset", "Module"],
-    "tags": {
-        "language": "WiX",
-        "type": "project"
-    },
-    "symbols": {
-      "company": {
-        "type": "parameter",
-        "defaultValue": "Your Company Name",
-        "replaces": "$company$"
-      },
-      "version": {
-        "type": "parameter",
-        "defaultValue": "0.0.1",
-        "replaces": "$version$"
-      }
-    },
-    "sourceName": "$safeprojectname$",
-    "defaultName": "Module"
-}
diff --git a/src/samples/WixToolset.Templates/templates/ModuleProject/Module.wxs b/src/samples/WixToolset.Templates/templates/ModuleProject/Module.wxs
deleted file mode 100644
index 592c844d..00000000
--- a/src/samples/WixToolset.Templates/templates/ModuleProject/Module.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Module Id="$safeprojectname$" Guid="PUT-GUID-HERE" Manufacturer="$company$" Language="0" Version="$version$">
-    <Component Guid='PUT-GUID-HERE' Directory='TARGETDIR'>
-        <!-- TODO: Install something more useful than this source code file itself -->
-        <File Source="Module.wxs" />
-    </Component>
-  </Module>
-</Wix>
diff --git a/src/samples/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj b/src/samples/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
deleted file mode 100644
index 17640703..00000000
--- a/src/samples/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.0">
-</Project>
diff --git a/src/samples/WixToolset.Templates/templates/PackageProject/.template.config/template.json b/src/samples/WixToolset.Templates/templates/PackageProject/.template.config/template.json
deleted file mode 100644
index d12f3109..00000000
--- a/src/samples/WixToolset.Templates/templates/PackageProject/.template.config/template.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "$schema": "http://json.schemastore.org/template",
-    "identity": "WixToolset.Templates.PackageProject",
-    "name": "WiX Toolset Package",
-    "shortName": "msi",
-    "author": "WiX Toolset Team",
-    "classifications": ["WixToolset", "Package"],
-    "tags": {
-        "language": "WiX",
-        "type": "project"
-    },
-    "symbols": {
-      "company": {
-        "type": "parameter",
-        "defaultValue": "Your Company Name",
-        "replaces": "$company$"
-      },
-      "version": {
-        "type": "parameter",
-        "defaultValue": "0.0.1",
-        "replaces": "$version$"
-      }
-    },
-    "sourceName": "$safeprojectname$",
-    "defaultName": "Package"
-}
diff --git a/src/samples/WixToolset.Templates/templates/PackageProject/Package.wxs b/src/samples/WixToolset.Templates/templates/PackageProject/Package.wxs
deleted file mode 100644
index ac69e549..00000000
--- a/src/samples/WixToolset.Templates/templates/PackageProject/Package.wxs
+++ /dev/null
@@ -1,24 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="$safeprojectname$" Manufacturer="$company$" Version="$version$" UpgradeCode="PUT-GUID-HERE">
-    <MajorUpgrade DowngradeError="A newer version of [ProductName] is already installed" />
-
-    <Feature Id="Main">
-      <ComponentGroupRef Id="Components" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
-      <Component>
-        <!-- TODO: Install something more useful than this source code file itself -->
-        <File Source="Package.wxs" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFiles6432Folder">
-      <Directory Id="INSTALLFOLDER" Name="!(Property.Manufacturer) !(Property.ProductName)" />
-    </StandardDirectory>
-  </Fragment>
-</Wix>
-- 
cgit v1.2.3-55-g6feb