Integrate tools from Core project

3 files changed, 56 insertions, 0 deletions

diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
new file mode 100644
index 00000000..73f331ff
--- /dev/null
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
@@ -0,0 +1,28 @@
+<?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 Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <Description>Internal WiX Toolset Tools</Description>
+    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)publish</NuspecBasePath>
+    <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn>
+  </PropertyGroup>
+  <Target Name="SetNuspecVersion">
+    <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
+
+    <PropertyGroup>
+      <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
new file mode 100644
index 00000000..a461557a
--- /dev/null
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+  </metadata>
+
+  <files>
+    <file src="$projectFolder$$id$.props" target="build" />
+
+    <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
+    <file src="net461\*" target="tools\net461" />
+    <file src="net461\redirects\*" target="msbuild" />
+  </files>
+</package>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
new file mode 100644
index 00000000..8d71aa66
--- /dev/null
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
@@ -0,0 +1,8 @@
+<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\net461\wix.targets</WixTargetsPath>
+  </PropertyGroup>
+</Project>