Adds command to update dependencies and tool version

ThadHouse · ThadHouse · commit ec8f6343c01c · 2017-05-28T14:36:22.000-07:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,8 +9,9 @@
             "program": "${workspaceRoot}\\src\\dotnet-frc\\bin\\Debug\\netcoreapp1.1\\win7-x64\\dotnet-frc.dll",
             "args": [
                 "C:\\Users\\thadh\\Documents\\RobotTest",
-                "deploy",
-                "-v"
+                "update",
+                "-v",
+                "-t"
             ],
             "cwd": "${workspaceRoot}",
             "externalConsole": false,
diff --git a/src/FRC.CLI.Base/Interfaces/IProjectInformationProvider.cs b/src/FRC.CLI.Base/Interfaces/IProjectInformationProvider.cs
@@ -8,8 +8,5 @@ public interface IProjectInformationProvider
          Task<string> GetProjectRootDirectoryAsync();
          Task<string> GetProjectBuildDirectoryAsync();
          Task<string> GetProjectExecutableNameAsync();
-         Task<List<string>> GetFrcDependenciesAsync();
-         Task SetFrcDependenciesAsync(IList<(string dep, string version)> dependencies);
-         Task SetFrcTooling((string tool, string version) tool);
     }
 }
diff --git a/src/dotnet-frc/AutoFacUtilites.cs b/src/dotnet-frc/AutoFacUtilites.cs
@@ -10,7 +10,7 @@ namespace dotnet_frc
     internal static class AutoFacUtilites
     {
         public static void AddCommonServicesToContainer(ContainerBuilder builder, string fileOrDirectory,
-            FrcSubCommandBase command, bool debug)
+            FrcSubCommandBase command, bool debug, bool useTeam = true)
         {
             builder.RegisterType<ConsoleWriter>().As<IOutputWriter>();
             builder.RegisterType<JsonFrcSettingsProvider>().As<IFrcSettingsProvider>();
@@ -29,8 +29,11 @@ public static void AddCommonServicesToContainer(ContainerBuilder builder, string
                 MsBuildProject msBuild = MsBuildProject.FromFileOrDirectory(ProjectCollection.GlobalProjectCollection, fileOrDirectory);
                 return new DotNetProjectInformationProvider(msBuild);
             }).As<IProjectInformationProvider>();
-            builder.RegisterType<DotNetTeamNumberProvider>().As<ITeamNumberProvider>().WithParameter(new TypedParameter(typeof(int?), 
-                DotNetTeamNumberProvider.GetTeamNumberFromCommandOption(command._teamOption)));
+            if (useTeam)
+            {
+                builder.RegisterType<DotNetTeamNumberProvider>().As<ITeamNumberProvider>().WithParameter(new TypedParameter(typeof(int?), 
+                    DotNetTeamNumberProvider.GetTeamNumberFromCommandOption(command._teamOption)));
+            }
             builder.Register(c => new DotNetBuildSettingsProvider(debug, command._verboseOption.HasValue())).As<IBuildSettingsProvider>();    
             builder.RegisterType<DotNetWPILibUserFolderResolver>().As<IWPILibUserFolderResolver>();
             builder.RegisterType<HttpClientFileDownloadProvider>().As<IFileDownloadProvider>();
diff --git a/src/dotnet-frc/Commands/UpdateCommand.cs b/src/dotnet-frc/Commands/UpdateCommand.cs
@@ -1,7 +1,9 @@
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Autofac;
 using FRC.CLI.Base.Interfaces;
 using FRC.CLI.Common.Implementations;
+using Microsoft.Build.Evaluation;
 using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.CommandLine;
 
@@ -21,7 +23,7 @@ public static DotNetSubCommandBase Create()
                 HandleRemainingArguments = false
             };
 
-            SetupBaseOptions(command);
+            SetupBaseOptions(command, false);
 
             command._toolsOption = command.Option(
                 "-t|--tools",
@@ -42,7 +44,13 @@ public override async Task<int> RunAsync(string fileOrDirectory)
         {
             var builder = new ContainerBuilder();
             AutoFacUtilites.AddCommonServicesToContainer(builder, fileOrDirectory, this,
-                false);
+                false, false);
+            builder.Register(c =>
+            {
+                MsBuildProject msBuild = MsBuildProject.FromFileOrDirectory(ProjectCollection.GlobalProjectCollection, fileOrDirectory);
+                return new DotNetProjectInformationProvider(msBuild);
+            }).As<DotNetProjectInformationProvider>();
+
             var container = builder.Build();
 
             using (var scope = container.BeginLifetimeScope())
@@ -53,6 +61,34 @@ public override async Task<int> RunAsync(string fileOrDirectory)
                         "No argument specified. Must provide an argument to use"
                     );
                 }
+
+                var project = scope.Resolve<DotNetProjectInformationProvider>();
+
+                if (_dependenciesOption.HasValue())
+                {
+                    List<(string, string)> packageVersions = new List<(string, string)>();
+                    var packages = await project.GetFrcDependenciesAsync();
+                    foreach(var package in packages)
+                    {
+                        var newest = await DotNetNugetVersionDetector.FindNewestPackageVersion(package, true);
+                        if (newest == null) continue;
+                        packageVersions.Add((package, newest));
+                    }
+                    await project.SetFrcDependenciesAsync(packageVersions);
+                }
+
+                if (_toolsOption.HasValue())
+                {
+                    string toolName = "FRC.DotNet.CLI";
+                    var newest = await DotNetNugetVersionDetector.FindNewestPackageVersion(toolName, true);
+                    if (newest != null)
+                    {
+                        await project.SetFrcTooling((toolName, newest));
+                    }
+                }
+
+                var writer = scope.Resolve<IOutputWriter>();
+                await writer.WriteLineAsync("Dependencies have been updated. Please run dotnet restore.");
             }
             return 0;
         }
diff --git a/src/dotnet-frc/DotNetNugetVersionDetector.cs b/src/dotnet-frc/DotNetNugetVersionDetector.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using NuGet.Common;
+using NuGet.Configuration;
+using NuGet.Protocol;
+using NuGet.Protocol.Core.Types;
+using NuGet.Versioning;
+
+namespace dotnet_frc
+{
+    public class DotNetNugetVersionDetector
+    {
+        public static async Task<string> FindNewestPackageVersion(string package, bool includePrerelease)
+        {
+            Logger logger = new Logger();
+            List<Lazy<INuGetResourceProvider>> providers = new List<Lazy<INuGetResourceProvider>>();
+            providers.AddRange(Repository.Provider.GetCoreV3());  // Add v3 API support
+            //providers.AddRange(Repository.Provider.GetCoreV2());  // Add v2 API support
+            PackageSource packageSource = new PackageSource("https://api.nuget.org/v3/index.json");
+            SourceRepository sourceRepository = new SourceRepository(packageSource, providers);
+            PackageMetadataResource packageMetadataResource = await sourceRepository.GetResourceAsync<PackageMetadataResource>();
+            IEnumerable<IPackageSearchMetadata> searchMetadata = await packageMetadataResource.GetMetadataAsync(package, true, true, logger, CancellationToken.None);
+            NuGetVersion newest = null;
+            foreach(var item in searchMetadata)
+            {
+                if (item is PackageSearchMetadata itemMetadata)
+                {
+                    var version = itemMetadata.Version;
+                    if (!itemMetadata.IsListed) continue;
+                    if (version.IsPrerelease && !includePrerelease) continue;
+                    if (newest == null)
+                    {
+                        newest = version;
+                        continue;
+                    }
+                    if (version.CompareTo(newest.Version) > 0)
+                    {
+                        newest = version;
+                    }
+                }
+            }
+            if (newest == null) return null;
+            return newest.ToNormalizedString();
+        }
+    }
+
+    public class Logger : ILogger
+{
+  public void LogDebug(string data) => Console.WriteLine($"DEBUG: {data}");
+  public void LogVerbose(string data) => Console.WriteLine($"VERBOSE: {data}");
+  public void LogInformation(string data) => Console.WriteLine($"INFORMATION: {data}");
+  public void LogMinimal(string data) => Console.WriteLine($"MINIMAL: {data}");
+  public void LogWarning(string data) => Console.WriteLine($"WARNING: {data}");
+  public void LogError(string data) => Console.WriteLine($"ERROR: {data}");
+  public void LogSummary(string data) => Console.WriteLine($"SUMMARY: {data}");
+
+        public void LogInformationSummary(string data)
+        {
+            
+        }
+
+        public void LogErrorSummary(string data)
+        {
+        }
+    }
+}
diff --git a/src/dotnet-frc/DotNetProjectInformationProvider.cs b/src/dotnet-frc/DotNetProjectInformationProvider.cs
@@ -85,7 +85,8 @@ public Task SetFrcDependenciesAsync(IList<(string dep, string version)> dependen
 
         public Task SetFrcTooling((string tool, string version) tool)
         {
-            throw new NotImplementedException();
+            BuildProject.SetDotNetToolingVersion(tool);
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/src/dotnet-frc/FrcCommand.cs b/src/dotnet-frc/FrcCommand.cs
@@ -21,7 +21,8 @@ public class FrcCommand : DotNetTopLevelCommandBase
                 DeployCommand.Create,
                 KillCommand.Create,
                 SettingsCommand.Create,
-                RuntimeCommand.Create
+                RuntimeCommand.Create,
+                UpdateCommand.Create
             };
 
         public static int Run(string[] args)
diff --git a/src/dotnet-frc/FrcSubCommandBase.cs b/src/dotnet-frc/FrcSubCommandBase.cs
@@ -10,15 +10,18 @@ internal abstract class FrcSubCommandBase : DotNetSubCommandBase
         internal CommandOption _teamOption;
         internal CommandOption _verboseOption;
 
-        public static void SetupBaseOptions(FrcSubCommandBase command)
+        public static void SetupBaseOptions(FrcSubCommandBase command, bool useTeam = true)
         {
             command.HelpOption("-h|--help");
             
-            command._teamOption = command.Option(
-                "-t|--team",
-                "Force a team",
-                CommandOptionType.SingleValue
-            );
+            if (useTeam)
+            {
+                command._teamOption = command.Option(
+                    "-t|--team",
+                    "Force a team",
+                    CommandOptionType.SingleValue
+                );
+            }
 
             command._verboseOption = command.Option(
                 "-v|--verbose <VERBOSE>",
diff --git a/src/dotnet-frc/Utilities/MsBuildProject.cs b/src/dotnet-frc/Utilities/MsBuildProject.cs
@@ -92,6 +92,30 @@ public void SetWPILibPackages(IList<(string dep, string version)> dependencies)
             ProjectRoot.Save();
         }
 
+        public void SetDotNetToolingVersion((string tool, string version) tooling)
+        {
+            foreach (var item in ProjectRoot.Items)
+            {
+                if (item.ItemType == "DotNetCliToolReference")
+                {
+                    if (item.Include == tooling.tool)
+                    {
+                        foreach(var child in item.Children)
+                        {
+                            if (child is ProjectMetadataElement childData)
+                            {
+                                if (childData.Name == "Version")
+                                {
+                                    childData.Value = tooling.version;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            ProjectRoot.Save();
+        }
+
         public string GetProjectAssemblyName()
         {
             foreach(var item in ProjectRoot.Properties)
diff --git a/src/dotnet-frc/dotnet-frc.csproj b/src/dotnet-frc/dotnet-frc.csproj
@@ -3,10 +3,11 @@
     <PackageReference Include="autofac">
       <Version>4.3.0</Version>
     </PackageReference>
-    <ProjectReference Include="..\FRC.CLI.Base\FRC.CLI.Base.csproj" >
+    <PackageReference Include="NuGet.Protocol.Core.v3" Version="4.0.0" />
+    <ProjectReference Include="..\FRC.CLI.Base\FRC.CLI.Base.csproj">
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
-    <ProjectReference Include="..\FRC.CLI.Common\FRC.CLI.Common.csproj" >
+    <ProjectReference Include="..\FRC.CLI.Common\FRC.CLI.Common.csproj">
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
     <PackageReference Include="Microsoft.DotNet.CLI.Utils">

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,5 @@ public interface IProjectInformationProvider`
`8`	`8`	`Task<string> GetProjectRootDirectoryAsync();`
`9`	`9`	`Task<string> GetProjectBuildDirectoryAsync();`
`10`	`10`	`Task<string> GetProjectExecutableNameAsync();`
`11`		`- Task<List<string>> GetFrcDependenciesAsync();`
`12`		`- Task SetFrcDependenciesAsync(IList<(string dep, string version)> dependencies);`
`13`		`- Task SetFrcTooling((string tool, string version) tool);`
`14`	`11`	`}`
`15`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ public Task SetFrcDependenciesAsync(IList<(string dep, string version)> dependen`
`85`	`85`
`86`	`86`	`public Task SetFrcTooling((string tool, string version) tool)`
`87`	`87`	`{`
`88`		`- throw new NotImplementedException();`
	`88`	`+ BuildProject.SetDotNetToolingVersion(tool);`
	`89`	`+ return Task.CompletedTask;`
`89`	`90`	`}`
`90`	`91`	`}`
`91`	`92`	`}`