Properly place samples in segment and modernize ThmViewerPackage

6 files changed, 15 insertions, 42 deletions

diff --git a/src/samples/Directory.Build.props b/src/samples/Directory.Build.props
new file mode 100644
index 00000000..9e04afb6
--- /dev/null
+++ b/src/samples/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project>
+  <PropertyGroup>
+    <SegmentName>samples</SegmentName>
+  </PropertyGroup>
+
+  <Import Project="..\Directory.Build.props" />
+</Project>
diff --git a/src/samples/ThmViewerPackage/Package.wxs b/src/samples/ThmViewerPackage/Package.wxs
index cb2139cf..dae6a9d0 100644
--- a/src/samples/ThmViewerPackage/Package.wxs
+++ b/src/samples/ThmViewerPackage/Package.wxs
@@ -1,6 +1,6 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89" Compressed="yes" InstallerVersion="200">
+  <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />
 
diff --git a/src/samples/ThmViewerPackage/ThmViewerPackage.wixproj b/src/samples/ThmViewerPackage/ThmViewerPackage.wixproj
index 23d24654..9b2a2b02 100644
--- a/src/samples/ThmViewerPackage/ThmViewerPackage.wixproj
+++ b/src/samples/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -1,35 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-
+<Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
-    <ProjectGuid>59c4b122-5167-445b-8fc4-09dcd4eced89</ProjectGuid>
-    <OutputName>thmviewer</OutputName>
-    <OutputType>Package</OutputType>
+    <OutputPath>$(PackageOutputPath)</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Package.wxs" />
+    <ProjectReference Include="..\thmviewer\thmviewer.vcxproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\thmviewer\thmviewer.vcxproj">
-      <Name>thmviewer</Name>
-      <Project>{95228C13-97F5-484A-B4A2-ECF4618B0881}</Project>
-    </ProjectReference>
-  </ItemGroup>
-
-  <Import Project="$(WixTargetsPath)" />
-
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
-  </Target>
-  <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
 </Project>
diff --git a/src/samples/ThmViewerPackage/packages.config b/src/samples/ThmViewerPackage/packages.config
deleted file mode 100644
index 7e55f706..00000000
--- a/src/samples/ThmViewerPackage/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Nerdbank.GitVersioning" version="3.3.37" developmentDependency="true" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/src/samples/thmviewer/packages.config b/src/samples/thmviewer/packages.config
deleted file mode 100644
index cadaff8a..00000000
--- a/src/samples/thmviewer/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="GitInfo" version="2.1.2" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.DUtil" version="4.0.0-preview.0-build.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/samples/thmviewer/thmviewer.vcxproj b/src/samples/thmviewer/thmviewer.vcxproj
index 180a18c6..3fd87878 100644
--- a/src/samples/thmviewer/thmviewer.vcxproj
+++ b/src/samples/thmviewer/thmviewer.vcxproj
@@ -66,4 +66,4 @@
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>