From d996d6f8d66cde3272dd8e739b3380b21ccd5dfb Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Sun, 17 Jul 2022 13:12:07 +0100
Subject: [PATCH] Revert "Added Wix installer as a nuget package.  Hopefully
 this will fix the new build agent."

This reverts commit 57a76383bc5254a38f0cd26f873c924a97d12e85.
---
 Meade.net.Setup/Meade.net.Setup.wixproj | 10 ----------
 Meade.net.Setup/packages.config         |  4 ----
 2 files changed, 14 deletions(-)
 delete mode 100644 Meade.net.Setup/packages.config

diff --git a/Meade.net.Setup/Meade.net.Setup.wixproj b/Meade.net.Setup/Meade.net.Setup.wixproj
index b981fc4..a02f724 100644
--- a/Meade.net.Setup/Meade.net.Setup.wixproj
+++ b/Meade.net.Setup/Meade.net.Setup.wixproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\packages\WiX.3.11.2\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,8 +8,6 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Meade.net.Setup</OutputName>
     <OutputType>Package</OutputType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
@@ -52,7 +49,6 @@
   <ItemGroup>
     <Content Include="Config.wxi" />
     <Content Include="License.rtf" />
-    <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Meade.net.focuser\Meade.net.focuser.csproj">
@@ -85,12 +81,6 @@
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.2\build\wix.props'))" />
-  </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
diff --git a/Meade.net.Setup/packages.config b/Meade.net.Setup/packages.config
deleted file mode 100644
index 48182e9..0000000
--- a/Meade.net.Setup/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="WiX" version="3.11.2" />
-</packages>
\ No newline at end of file