Properly place samples in segment and modernize ThmViewerPackage
Rob Mensching committed
Jan 3, 2022 at 20:52 UTC
db44f6cf3b1eb476e47384f2eccba5712808def5
6 files changed
+15
-42
src/samples/Directory.Build.props
new
+10
@@ -0,0 +1,10 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<!-- 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. -->
3
+
4
+<Project>
5
+ <PropertyGroup>
6
+ <SegmentName>samples</SegmentName>
7
+ </PropertyGroup>
8
+
9
+ <Import Project="..\Directory.Build.props" />
10
+</Project>
src/samples/ThmViewerPackage/Package.wxs
+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
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
- <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">
3
+ <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89">
4
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
5
<MediaTemplate EmbedCab="yes" />
6
src/samples/ThmViewerPackage/ThmViewerPackage.wixproj
+3
-28
@@ -1,35 +1,10 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
4
-
2
+<Project Sdk="WixToolset.Sdk">
3
<PropertyGroup>
6
- <ProjectGuid>59c4b122-5167-445b-8fc4-09dcd4eced89</ProjectGuid>
7
- <OutputName>thmviewer</OutputName>
8
- <OutputType>Package</OutputType>
4
+ <OutputPath>$(PackageOutputPath)</OutputPath>
5
</PropertyGroup>
6
7
<ItemGroup>
12
- <Compile Include="Package.wxs" />
8
+ <ProjectReference Include="..\thmviewer\thmviewer.vcxproj" />
9
</ItemGroup>
14
-
15
- <ItemGroup>
16
- <None Include="packages.config" />
17
- </ItemGroup>
18
-
19
- <ItemGroup>
20
- <ProjectReference Include="..\thmviewer\thmviewer.vcxproj">
21
- <Name>thmviewer</Name>
22
- <Project>{95228C13-97F5-484A-B4A2-ECF4618B0881}</Project>
23
- </ProjectReference>
24
- </ItemGroup>
25
-
26
- <Import Project="$(WixTargetsPath)" />
27
-
28
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
29
- <PropertyGroup>
30
- <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>
31
- </PropertyGroup>
32
- <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'))" />
33
- </Target>
34
- <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
10
</Project>
src/samples/ThmViewerPackage/packages.config
deleted
-4
@@ -1,4 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="Nerdbank.GitVersioning" version="3.3.37" developmentDependency="true" targetFramework="net40" />
4
-</packages>
\ No newline at end of file
src/samples/thmviewer/packages.config
deleted
-8
@@ -1,8 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
4
- <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5
- <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6
- <package id="GitInfo" version="2.1.2" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.DUtil" version="4.0.0-preview.0-build.1" targetFramework="native" />
8
-</packages>
\ No newline at end of file
src/samples/thmviewer/thmviewer.vcxproj
+1
-1
@@ -66,4 +66,4 @@
66
</ItemGroup>
67
68
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
69
-</Project>
\ No newline at end of file
69
+</Project>