From feea62d5bd1f90bb012cb7cf2c84c9703f6568b2 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 24 Sep 2017 15:06:23 -0700
Subject: Publish Core tools for internal use

---
 src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj |  9 +++++----
 src/WixToolset.BuildTasks/redirect.wix.ca.targets      | 11 -----------
 src/WixToolset.BuildTasks/redirect.wix.targets         | 11 -----------
 src/WixToolset.BuildTasks/redirects/wix.ca.targets     | 10 ++++++++++
 src/WixToolset.BuildTasks/redirects/wix.props          |  8 ++++++++
 src/WixToolset.BuildTasks/redirects/wix.targets        | 10 ++++++++++
 6 files changed, 33 insertions(+), 26 deletions(-)
 delete mode 100644 src/WixToolset.BuildTasks/redirect.wix.ca.targets
 delete mode 100644 src/WixToolset.BuildTasks/redirect.wix.targets
 create mode 100644 src/WixToolset.BuildTasks/redirects/wix.ca.targets
 create mode 100644 src/WixToolset.BuildTasks/redirects/wix.props
 create mode 100644 src/WixToolset.BuildTasks/redirects/wix.targets

(limited to 'src/WixToolset.BuildTasks')

diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 34a1a9f5..ce65ea41 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <Description></Description>
     <Title>WiX Toolset MSBuild Tasks</Title>
   </PropertyGroup>
@@ -14,8 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="redirect.wix.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="redirect.wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="redirects\wix.props" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
@@ -32,7 +33,7 @@
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="all" Condition="'$(TargetFramework)'=='net462' " />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="all" Condition="'$(TargetFramework)'=='net461' " />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" PrivateAssets="all" Condition="'$(TargetFramework)'=='netstandard2.0' " />
   </ItemGroup>
 </Project>
diff --git a/src/WixToolset.BuildTasks/redirect.wix.ca.targets b/src/WixToolset.BuildTasks/redirect.wix.ca.targets
deleted file mode 100644
index 74e6ec3c..00000000
--- a/src/WixToolset.BuildTasks/redirect.wix.ca.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
-  </PropertyGroup>
-
-  <Import Project="$(WixInstallFolder)sdk\wix.ca.targets" />
-</Project>
diff --git a/src/WixToolset.BuildTasks/redirect.wix.targets b/src/WixToolset.BuildTasks/redirect.wix.targets
deleted file mode 100644
index b40c4c36..00000000
--- a/src/WixToolset.BuildTasks/redirect.wix.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
-  </PropertyGroup>
-
-  <Import Project="$(WixInstallFolder)bin\wix.targets" />
-</Project>
diff --git a/src/WixToolset.BuildTasks/redirects/wix.ca.targets b/src/WixToolset.BuildTasks/redirects/wix.ca.targets
new file mode 100644
index 00000000..ecb6e09f
--- /dev/null
+++ b/src/WixToolset.BuildTasks/redirects/wix.ca.targets
@@ -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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
+  </PropertyGroup>
+
+  <Import Project="$(WixInstallFolder)sdk\wix.ca.targets" />
+</Project>
diff --git a/src/WixToolset.BuildTasks/redirects/wix.props b/src/WixToolset.BuildTasks/redirects/wix.props
new file mode 100644
index 00000000..7448d192
--- /dev/null
+++ b/src/WixToolset.BuildTasks/redirects/wix.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>$(MSBuildThisFileDirectory)..\tools\wix.targets</WixTargetsPath>
+  </PropertyGroup>
+</Project>
diff --git a/src/WixToolset.BuildTasks/redirects/wix.targets b/src/WixToolset.BuildTasks/redirects/wix.targets
new file mode 100644
index 00000000..ba354b65
--- /dev/null
+++ b/src/WixToolset.BuildTasks/redirects/wix.targets
@@ -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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
+  </PropertyGroup>
+
+  <Import Project="$(WixInstallFolder)bin\wix.targets" />
+</Project>
-- 
cgit v1.2.3-55-g6feb