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.
---
 .gitignore                                                   |  6 +++---
 nuget.config                                                 | 12 ++++++++++++
 src/build_official.cmd                                       |  2 +-
 src/clean.cmd                                                |  3 +++
 src/internal/SetBuildNumber/SetBuildNumber.proj              |  4 ++--
 src/nuget.config                                             | 12 ------------
 src/nuget_official.config                                    |  4 ++--
 src/test/wix/TestData/Directory.Packages.props               |  9 ---------
 .../WixprojPackageVcxprojWindowsApp.wixproj                  |  6 +++++-
 src/test/wix/WixE2E/WixE2E.csproj                            |  1 -
 10 files changed, 28 insertions(+), 31 deletions(-)
 create mode 100644 nuget.config
 delete mode 100644 src/nuget.config
 delete mode 100644 src/test/wix/TestData/Directory.Packages.props

diff --git a/.gitignore b/.gitignore
index 2b62131b..85fdfe74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -207,7 +207,7 @@ PublishScripts/
 *.nuget.targets
 
 # Nuget personal access tokens and Credentials
-nuget.config
+# nuget.config
 
 # Microsoft Azure Build Output
 csx/
@@ -391,8 +391,8 @@ FodyWeavers.xsd
 # WiX Specific Ignores
 
 # Ignore global.json and Directory.Package.props since they are generated
-src/global.json
-src/Directory.Packages.props
+global.json
+Directory.Packages.props
 
 # Ignore downloaded tools
 build/.tools/
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 00000000..2151ef89
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <config>
+    <add key="repositoryPath" value="packages" />
+  </config>
+  <packageSources>
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="build" value="build\artifacts" />
+    <!-- <add key="github" value="https://nuget.pkg.github.com/wixtoolset/UnifiedTest1/index.json" /> -->
+  </packageSources>
+</configuration>
diff --git a/src/build_official.cmd b/src/build_official.cmd
index 55ac3550..63566260 100644
--- a/src/build_official.cmd
+++ b/src/build_official.cmd
@@ -1,7 +1,7 @@
 @setlocal
 @pushd %~dp0
 
-@copy nuget_official.config nuget.config
+@copy nuget_official.config ..\nuget.config
 
 build_all.cmd Release Official
 
diff --git a/src/clean.cmd b/src/clean.cmd
index 97a7dd3d..94f9a618 100644
--- a/src/clean.cmd
+++ b/src/clean.cmd
@@ -11,6 +11,9 @@ if exist ..\packages rd /s/q ..\packages
 if exist Directory.Packages.props (del Directory.Packages.props)
 if exist global.json (del global.json)
 
+if exist ..\Directory.Packages.props (del ..\Directory.Packages.props)
+if exist ..\global.json (del ..\global.json)
+
 if exist "%_NUGET_CACHE%\wixbuildtools.testsupport" rd /s/q "%_NUGET_CACHE%\wixbuildtools.testsupport"
 if exist "%_NUGET_CACHE%\wixtoolset.bal.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.bal.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.balutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.balutil"
diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj
index 6eb7d741..72bb2a0c 100644
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ b/src/internal/SetBuildNumber/SetBuildNumber.proj
@@ -20,8 +20,8 @@
       SetDirectoryPackagesProps;
     </SetBuildNumbersDependsOn>
 
-    <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\global.json))</GlobalJsonPath>
-    <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\Directory.Packages.props))</CentralPackageVersionsPath>
+    <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath>
+    <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props))</CentralPackageVersionsPath>
   </PropertyGroup>
 
   <Target Name="SetAppVeyorBuildNumber"
diff --git a/src/nuget.config b/src/nuget.config
deleted file mode 100644
index c2f68b16..00000000
--- a/src/nuget.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <config>
-    <add key="repositoryPath" value="..\packages" />
-  </config>
-  <packageSources>
-    <clear />
-    <add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="build" value="..\build\artifacts" />
-    <!-- <add key="github" value="https://nuget.pkg.github.com/wixtoolset/UnifiedTest1/index.json" /> -->
-  </packageSources>
-</configuration>
diff --git a/src/nuget_official.config b/src/nuget_official.config
index 6d3c9a07..25adbeed 100644
--- a/src/nuget_official.config
+++ b/src/nuget_official.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <config>
-    <add key="repositoryPath" value="..\packages" />
+    <add key="repositoryPath" value="packages" />
   </config>
   <packageSources>
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <!-- <add key="github" value="https://nuget.pkg.github.com/wixtoolset/UnifiedTest1/index.json" /> -->
-    <add key="build" value="..\build\artifacts" />
+    <add key="build" value="build\artifacts" />
   </packageSources>
 </configuration>
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