Fixed obsolete NuGet API

seesharper · seesharper · commit c1dd7ce00cd3 · 2019-05-28T18:10:08.000+02:00
diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
@@ -8,7 +8,7 @@
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
-    <Version>0.8.0</Version>
+    <Version>0.9.0</Version>
     <Description>A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files.</Description>
     <Authors>dotnet-script</Authors>
     <Company>dotnet-script</Company>
diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -11,7 +11,7 @@
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
-    <Version>0.9.0</Version>
+    <Version>0.10.0</Version>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.ProjectModel" Version="4.9.3" />
+    <PackageReference Include="NuGet.ProjectModel" Version="5.0.0" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
 
   </ItemGroup>
diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/NuGetUtilities.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/NuGetUtilities.cs
@@ -1,70 +1,64 @@
 using NuGet.Configuration;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Dotnet.Script.DependencyModel.ProjectSystem
 {
     internal static class NuGetUtilities
     {
-        struct NuGetConfigSection
+        public static void CreateNuGetConfigFromLocation(string pathToEvaluate, string targetDirectory)
         {
-            public string Name;
-            public HashSet<string> KeysForPathValues;
-            public bool AreAllValuesPaths;
+            var sourceSettings = Settings.LoadDefaultSettings(pathToEvaluate);
+            var targetSettings = new Settings(targetDirectory);
+
+            CopySection(sourceSettings, targetSettings, "config");
+            CopySection(sourceSettings, targetSettings, "bindingRedirects");
+            CopySection(sourceSettings, targetSettings, "packageRestore");
+            CopySection(sourceSettings, targetSettings, "solution");
+            CopySection(sourceSettings, targetSettings, "packageSources");
+            CopySection(sourceSettings, targetSettings, "packageSourceCredentials");
+            CopySection(sourceSettings, targetSettings, "apikeys");
+            CopySection(sourceSettings, targetSettings, "disabledPackageSources");
+            CopySection(sourceSettings, targetSettings, "activePackageSource");
+
+            targetSettings.SaveToDisk();
         }
 
-        static readonly NuGetConfigSection[] NuGetSections = 
+        private static void CopySection(ISettings sourceSettings, ISettings targetSettings, string sectionName)
         {
-            new NuGetConfigSection { Name = "config", KeysForPathValues = new HashSet<string> { "globalPackagesFolder", "repositoryPath" } },
-            new NuGetConfigSection { Name = "bindingRedirects" },
-            new NuGetConfigSection { Name = "packageRestore" },
-            new NuGetConfigSection { Name = "solution" },
-            new NuGetConfigSection { Name = "packageSources", AreAllValuesPaths = true },
-            new NuGetConfigSection { Name = "packageSourceCredentials" },
-            new NuGetConfigSection { Name = "apikeys" },
-            new NuGetConfigSection { Name = "disabledPackageSources" },
-            new NuGetConfigSection { Name = "activePackageSource" },
-        };
+            var existingAddItems = sourceSettings.GetSection(sectionName)?.Items.Cast<AddItem>();
 
-        // Create a NuGet file containing all properties with resolved absolute paths
-        public static void CreateNuGetConfigFromLocation(string pathToEvaluate, string targetDirectory)
-        {
-            var settings = Settings.LoadDefaultSettings(pathToEvaluate);
-            var target = new Settings(targetDirectory);
+            if (existingAddItems == null)
+            {
+                return;
+            }
 
-            var valuesToSet = new List<SettingValue>();
-            foreach (var section in NuGetSections)
+            foreach (var addItem in existingAddItems)
             {
-                // Resolve properly path values
-                valuesToSet.Clear();
-                if (section.AreAllValuesPaths)
+                if (ShouldResolvePath(sectionName, addItem.Key))
                 {
-                    // All values are paths
-                    var values = settings.GetSettingValues(section.Name, true);
-                    valuesToSet.AddRange(values);
+                    targetSettings.AddOrUpdate(sectionName, new AddItem(addItem.Key, addItem.GetValueAsPath()));
                 }
                 else
                 {
-                    var values = settings.GetSettingValues(section.Name, false);
-                    if (section.KeysForPathValues != null)
-                    {
-                        // Some values are path
-                        foreach (var value in values)
-                        {
-                            if (section.KeysForPathValues.Contains(value.Key))
-                            {
-                                var val = settings.GetValue(section.Name, value.Key, true);
-                                value.Value = val;
-                            }
-
-                            valuesToSet.Add(value);
-                        }
-                    }
-                    else
-                        // All values are not path
-                        valuesToSet.AddRange(values);
+                    targetSettings.AddOrUpdate(sectionName, addItem);
                 }
-                target.SetValues(section.Name, valuesToSet);
             }
         }
+
+        private static bool ShouldResolvePath(string sectionName, string key)
+        {
+            if (sectionName == "packageSources")
+            {
+                return true;
+            }
+
+            if (sectionName == "config")
+            {
+                return key == "globalPackagesFolder" || key == "repositoryPath";
+            }
+
+            return false;
+        }
     }
 }
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
-        <VersionPrefix>0.29.1</VersionPrefix>
+        <VersionPrefix>0.30.0</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
         <TargetFramework>netcoreapp2.1</TargetFramework>
