From d15c04e29d7ac167e382efe37365b8fa451728de Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 1 Mar 2021 14:57:38 -0800
Subject: Update to latest build infrastructure
---
src/wixext/WixToolset.VisualStudio.wixext.csproj | 11 ++++++-----
src/wixext/WixToolset.VisualStudio.wixext.nuspec | 23 +++++++++++++++++++++++
2 files changed, 29 insertions(+), 5 deletions(-)
create mode 100644 src/wixext/WixToolset.VisualStudio.wixext.nuspec
(limited to 'src/wixext')
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.csproj b/src/wixext/WixToolset.VisualStudio.wixext.csproj
index bb7bba6b..82aa0d1d 100644
--- a/src/wixext/WixToolset.VisualStudio.wixext.csproj
+++ b/src/wixext/WixToolset.VisualStudio.wixext.csproj
@@ -8,23 +8,24 @@
<Description>WiX Toolset Visual Studio Extension</Description>
<Title>WiX Toolset VS Extension</Title>
<IsTool>true</IsTool>
- <ContentTargetFolders>build</ContentTargetFolders>
+ <IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>
<ItemGroup>
- <Content Include="$(MSBuildThisFileName).targets" />
<EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
+ <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
+ <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
</ItemGroup>
</Project>
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/wixext/WixToolset.VisualStudio.wixext.nuspec
new file mode 100644
index 00000000..51c9708e
--- /dev/null
+++ b/src/wixext/WixToolset.VisualStudio.wixext.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata minClientVersion="4.0">
+ <id>$id$</id>
+ <version>$version$</version>
+ <title>$title$</title>
+ <description>$description$</description>
+ <authors>$authors$</authors>
+ <license type="expression">MS-RL</license>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <copyright>$copyright$</copyright>
+ <projectUrl>$projectUrl$</projectUrl>
+ <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+ </metadata>
+
+ <files>
+ <file src="$projectFolder$$id$.targets" target="build" />
+
+ <file src="netstandard2.0\$id$.dll" target="tools" />
+
+ <file src="x86\*.pdb" target="pdbs\x86" />
+ </files>
+</package>
--
cgit v1.2.3-55-g6feb