Use packageSourceMapping to control source of NuGet packages

Contrary to common-sense, NuGet package sources are not ordered.
Thus, the existence of nuget_official.config is pointless as it was
an attempt to prefer already published .nupkgs over newly built
.nupkgs in post-GA builds.

Instead, NuGet introduced packageSourceMapping which is a more
powerful solution to address post-GA package resolution.

4 files changed, 11 insertions, 16 deletions

diff --git a/nuget.config b/nuget.config
index 2151ef89..34dfa486 100644
--- a/nuget.config
+++ b/nuget.config
@@ -7,6 +7,15 @@
     <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>
+
+  <packageSourceMapping>
+    <packageSource key="nuget">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="build">
+      <package pattern="WixToolset.*" />
+      <package pattern="WixBuildTools.*" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8e013300..90de177c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -6,7 +6,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <NoWarn>$(NoWarn);NU1507;MSB3026</NoWarn>
+    <NoWarn>$(NoWarn);MSB3026</NoWarn>
 
     <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
     <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder>
diff --git a/src/build_official.cmd b/src/build_official.cmd
index 63566260..56c2a708 100644
--- a/src/build_official.cmd
+++ b/src/build_official.cmd
@@ -1,8 +1,6 @@
 @setlocal
 @pushd %~dp0
 
-@copy nuget_official.config ..\nuget.config
-
 build_all.cmd Release Official
 
 @popd
diff --git a/src/nuget_official.config b/src/nuget_official.config
deleted file mode 100644
index 25adbeed..00000000
--- a/src/nuget_official.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="github" value="https://nuget.pkg.github.com/wixtoolset/UnifiedTest1/index.json" /> -->
-    <add key="build" value="build\artifacts" />
-  </packageSources>
-</configuration>