fixed NuGetUtilities and cross compile dependency model dll

filipw · filipw · commit ba028b052977 · 2019-05-29T11:00:00.000+02:00
diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <Authors>dotnet-script</Authors>
     <Company>dotnet-script</Company>
     <Description>Provides runtime and compilation dependency resolution for dotnet-script based scripts.</Description>
diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/NuGetUtilities.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/NuGetUtilities.cs
@@ -26,7 +26,7 @@ public static void CreateNuGetConfigFromLocation(string pathToEvaluate, string t
 
         private static void CopySection(ISettings sourceSettings, ISettings targetSettings, string sectionName)
         {
-            var existingAddItems = sourceSettings.GetSection(sectionName)?.Items.Cast<AddItem>();
+            var existingAddItems = sourceSettings.GetSection(sectionName)?.Items.Where(item => item is object && item is SourceItem && item.ElementName.ToLowerInvariant() == "add").Cast<AddItem>();
 
             if (existingAddItems == null)
             {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static void CreateNuGetConfigFromLocation(string pathToEvaluate, string t`
`26`	`26`
`27`	`27`	`private static void CopySection(ISettings sourceSettings, ISettings targetSettings, string sectionName)`
`28`	`28`	`{`
`29`		`- var existingAddItems = sourceSettings.GetSection(sectionName)?.Items.Cast<AddItem>();`
	`29`	`+ var existingAddItems = sourceSettings.GetSection(sectionName)?.Items.Where(item => item is object && item is SourceItem && item.ElementName.ToLowerInvariant() == "add").Cast<AddItem>();`
`30`	`30`
`31`	`31`	`if (existingAddItems == null)`
`32`	`32`	`{`