From 82bfd1218699a08c8d9cd775fc9e3eef3ec519a2 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 23 Feb 2022 17:49:50 -0800
Subject: Move nuget.config, global.json and Directory.Packages.props to root

Putting these files in the root means they can be used by the test
projects support projects that get copied to the `build` folder.
---
 src/test/wix/TestData/Directory.Packages.props                   | 9 ---------
 .../WixprojPackageVcxprojWindowsApp.wixproj                      | 6 +++++-
 src/test/wix/WixE2E/WixE2E.csproj                                | 1 -
 3 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 src/test/wix/TestData/Directory.Packages.props

(limited to 'src/test')

diff --git a/src/test/wix/TestData/Directory.Packages.props b/src/test/wix/TestData/Directory.Packages.props
deleted file mode 100644
index 5a625aca..00000000
--- a/src/test/wix/TestData/Directory.Packages.props
+++ /dev/null
@@ -1,9 +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>
-  <!--
-    This file prevents the import of WiX standard Directory.Packages.props
-    from the root src directory
-  -->
-</Project>
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
index bbd39870..63caf5c0 100644
--- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
+++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
@@ -1,11 +1,15 @@
 <!-- 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='WixToolset.Sdk'> 
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\VcxprojWindowsApp\VcxprojWindowsApp.vcxproj" />
     <ProjectReference Include="..\WixprojLibraryVcxprojDll\WixprojLibraryVcxprojDll.wixproj" />
     <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" />
 
-    <PackageReference Include="Wixtoolset.UI.wixext" Version="4.0.0-preview.1-build.205" />
+    <PackageReference Include="Wixtoolset.UI.wixext" />
   </ItemGroup>
 </Project>
diff --git a/src/test/wix/WixE2E/WixE2E.csproj b/src/test/wix/WixE2E/WixE2E.csproj
index 21e1f9f2..031979b6 100644
--- a/src/test/wix/WixE2E/WixE2E.csproj
+++ b/src/test/wix/WixE2E/WixE2E.csproj
@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="..\..\..\global.json" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="..\TestData\**" CopyToOutputDirectory="PreserveNewest" Link="TestData\%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
-- 
cgit v1.2.3-55-g6feb