Add resolve NuGet using TargetFramework

Wyamio · Jun 24, 2019 · 630b2c5 · 630b2c5
1 parent 1ebacb9
commit 630b2c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/core/Wyam.Configuration/NuGet/PackageInstaller.cs b/src/core/Wyam.Configuration/NuGet/PackageInstaller.cs
@@ -207,7 +207,7 @@ internal void InstallPackages(FilePath configFilePath)
                     }
                     catch (Exception ex)
                     {
-                        Trace.Verbose($"Exception while installing packages: {(ex is AggregateException ? string.Join("; ", ((AggregateException)ex).InnerExceptions.Select(x => x.Message)) : ex.Message)}");
+                        Trace.Verbose($"Exception while installing packages: {(ex is AggregateException aex ? aex.Flatten() : ex)}");
                         Trace.Warning("Error while installing packages, attempting without remote repositories");
                         InstallPackages(packageManager, Array.Empty<SourceRepository>(), installedPackages);
                     }
@@ -230,7 +230,7 @@ private void InstallPackages(NuGetPackageManager packageManager, IReadOnlyList<S
         {
             foreach (Package package in _packages.Values)
             {
-                package.Install(installationRepositories, installedPackages, packageManager).Wait();
+                package.Install(installationRepositories, installedPackages, packageManager).GetAwaiter().GetResult();
             }
         }
     }

diff --git a/src/core/Wyam.Configuration/NuGet/WyamFolderNuGetProject.cs b/src/core/Wyam.Configuration/NuGet/WyamFolderNuGetProject.cs
@@ -33,6 +33,7 @@ public WyamFolderNuGetProject(IFileSystem fileSystem, AssemblyLoader assemblyLoa
             _assemblyLoader = assemblyLoader;
             _currentFramework = currentFramework;
             _installedPackages = installedPackages;
+            InternalMetadata[NuGetProjectMetadataKeys.TargetFramework] = _currentFramework;
         }
 
         // This gets called for every package install, including dependencies, and is our only chance to handle dependency PackageIdentity instances