From 306f1d0c528cb6c151594ff96a41b5c01a5c4d9b Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 21 Jul 2018 07:36:34 -0700
Subject: Integrate tools from Core project

---
 src/WixToolset.MSBuild/WixToolset.MSBuild.csproj | 28 ++++++++++++++++++++++++
 src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | 21 ++++++++++++++++++
 src/WixToolset.MSBuild/WixToolset.MSBuild.props  |  9 ++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
 create mode 100644 src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
 create mode 100644 src/WixToolset.MSBuild/WixToolset.MSBuild.props

(limited to 'src/WixToolset.MSBuild')

diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
new file mode 100644
index 00000000..76e42911
--- /dev/null
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.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>WiX Toolset MSBuild integration</Description>
+    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)publish\WixToolset.MSBuild\</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.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
new file mode 100644
index 00000000..1a21315a
--- /dev/null
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
@@ -0,0 +1,21 @@
+<?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="net461\*" target="tools\net461" />
+    <file src="net461\runtimes\win-x86\native\*.exe" target="tools\net461" />
+    <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
+    <file src="netcoreapp2.1\runtimes\**" target="tools\netcoreapp2.1\runtimes" />
+    <file src="netcoreapp2.1\runtimes\win-x86\native\*.exe" target="tools\netcoreapp2.1" />
+  </files>
+</package>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/WixToolset.MSBuild.props
new file mode 100644
index 00000000..b1d207f4
--- /dev/null
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.props
@@ -0,0 +1,9 @@
+<?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)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\wix.targets'))</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath>
+  </PropertyGroup>
+</Project>
-- 
cgit v1.2.3-55-g6feb