Migrating from project.json to MSBuild model for CSX based package

references

Author: fabiocav

appveyor.yml

@@ -39,15 +39,15 @@ test_script:
 
     # see results in app insights AntaresDemo 'functionse2eai'
 
-    dotnet test .\test\WebJobs.Script.Tests -v q --no-build -l appinsights
+    dotnet test .\test\WebJobs.Script.Tests -v q --no-build
 
     $success = $success -and $?
 
-    dotnet test .\test\WebJobs.Script.Tests.Integration\ -v q --no-build --filter Tests.NodeEndToEndTests -l appinsights
+    dotnet test .\test\WebJobs.Script.Tests.Integration\ -v q --no-build --filter Tests.NodeEndToEndTests
 
     $success = $success -and $?    
 
-    dotnet test .\test\WebJobs.Script.Tests.Integration\ -v q --no-build --filter NodeContentTests -l appinsights
+    dotnet test .\test\WebJobs.Script.Tests.Integration\ -v q --no-build --filter NodeContentTests
     
     $success = $success -and $?
 

sample/HttpTrigger-CSharp/run.csx

@@ -1,14 +1,15 @@
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
+using Twilio;
 
 public static IActionResult Run(HttpRequest req, TraceWriter log)
 {
     log.Info("C# HTTP trigger function processed a request.");
 
     if (req.Query.TryGetValue("name", out StringValues value))
     {
-        return new OkObjectResult($"Hello, {value.First()}");
+        return new OkObjectResult($"Hello, {value.ToString()}");
     }
 
     return new BadRequestObjectResult("Please pass a name on the query string or in the request body");

sample/host.json

@@ -22,5 +22,6 @@
         "prefetchCount": 1000,
         "batchCheckpointFrequency": 1
     },
-    "functionTimeout": "00:05:00"
+    "functionTimeout": "00:05:00",
+    "functions": ["HttpTrigger-CSharp"]
 }

src/WebJobs.Script.WebHost/GlobalSuppressions.cs

@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+/*
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+*/
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1313:Parameter names should begin with lower-case letter", Justification = "<Pending>", Scope = "type", Target = "~T:Microsoft.Azure.WebJobs.Script.WebHost.Diagnostics.EventGenerator.FunctionsSystemLogsEventSource")]

src/WebJobs.Script/Description/DotNet/DotNetConstants.cs

@@ -7,8 +7,8 @@ public static class DotNetConstants
     {
         public const string PrivateAssembliesFolderName = "bin";
         public const string CompilationReferenceAssembliesFolderName = "compilationrefs";
-        public const string ProjectFileName = "project.json";
-        public const string ProjectLockFileName = "project.lock.json";
+        public const string ProjectFileName = "function.proj";
+        public const string ProjectLockFileName = "project.assets.json";
 
         public const string MissingFunctionEntryPointCompilationCode = "AF001";
         public const string AmbiguousFunctionEntryPointsCompilationCode = "AF002";

src/WebJobs.Script/Description/DotNet/FunctionMetadataResolver.cs

@@ -143,7 +143,7 @@ public bool TryGetPackageReference(string referenceName, out PackageReference pa
 
             package = _packageAssemblyResolver.Packages.FirstOrDefault(p =>
                 string.Compare(referenceName, p.Name, StringComparison.OrdinalIgnoreCase) == 0 ||
-                p.Assemblies.Keys.Any(a => string.Compare(a.Name, referenceName) == 0));
+                p.CompileTimeAssemblies.Keys.Any(a => string.Compare(a.Name, referenceName) == 0));
 
             return package != null;
         }

src/WebJobs.Script/Description/DotNet/PackageAssemblyResolver.cs

@@ -8,7 +8,10 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using Microsoft.Azure.WebJobs.Host;
 using Newtonsoft.Json.Linq;
+using NuGet.Frameworks;
+using NuGet.ProjectModel;
 
 namespace Microsoft.Azure.WebJobs.Script.Description
 {
@@ -18,7 +21,6 @@ namespace Microsoft.Azure.WebJobs.Script.Description
     public sealed class PackageAssemblyResolver
     {
         private const string EmptyFolderFileMarker = "_._";
-        private const string FrameworkTargetName = ".NETFramework,Version=v4.6";
 
         private readonly ImmutableArray<PackageReference> _packages;
 
@@ -41,7 +43,7 @@ public IEnumerable<string> AssemblyReferences
             {
                 return _packages.Aggregate(new List<string>(), (assemblies, p) =>
                 {
-                    assemblies.AddRange(p.Assemblies.Values);
+                    assemblies.AddRange(p.CompileTimeAssemblies.Values);
                     assemblies.AddRange(p.FrameworkAssemblies.Values);
                     return assemblies;
                 }).Distinct();
@@ -55,68 +57,65 @@ private static ImmutableArray<PackageReference> InitializeAssemblyRegistry(strin
 
             if (File.Exists(fileName))
             {
-                var jobject = JObject.Parse(File.ReadAllText(fileName));
-
-                var target = jobject.SelectTokens(string.Format(CultureInfo.InvariantCulture, "$.targets['{0}']", FrameworkTargetName)).FirstOrDefault();
-
-                if (target != null)
+                LockFile lockFile = null;
+                try
                 {
-                    string nugetHome = PackageManager.GetNugetPackagesPath();
+                    var reader = new LockFileFormat();
+                    lockFile = reader.Read(fileName);
+
+                    var target = lockFile.Targets
+                        .FirstOrDefault(t => string.Equals(t.TargetFramework.DotNetFrameworkName, FrameworkConstants.CommonFrameworks.NetStandard20.DotNetFrameworkName));
 
-                    foreach (JProperty token in target)
+                    if (target != null)
                     {
-                        var referenceNameParts = token.Name.Split('/');
-                        if (referenceNameParts.Length != 2)
+                        string nugetCachePath = PackageManager.GetNugetPackagesPath();
+
+                        // Get all the referenced libraries for the target, excluding the framework references we add by default
+                        var libraries = target.Libraries.Where(s => !DotNetConstants.FrameworkReferences.Contains(s.Name));
+                        foreach (var library in libraries)
                         {
-                            throw new FormatException(string.Format(CultureInfo.InvariantCulture, "The package name '{0}' is not correctly formatted.", token.Name));
-                        }
+                            var package = new PackageReference(library.Name, library.Version.ToFullString());
 
-                        var package = new PackageReference(referenceNameParts[0], referenceNameParts[1]);
+                            var assemblies = GetAssembliesList(library.CompileTimeAssemblies, nugetCachePath, package);
 
-                        var references = token.SelectTokens("$..compile").FirstOrDefault();
-                        if (references != null)
-                        {
-                            foreach (JProperty reference in references)
-                            {
-                                if (!reference.Name.EndsWith(EmptyFolderFileMarker, StringComparison.Ordinal))
-                                {
-                                    string path = Path.Combine(nugetHome, token.Name, reference.Name);
-                                    path = path.Replace('/', '\\');
-
-                                    if (File.Exists(path))
-                                    {
-                                        package.Assemblies.Add(AssemblyName.GetAssemblyName(path), path);
-                                    }
-                                }
-                            }
-                        }
+                            package.CompileTimeAssemblies.AddRange(assemblies);
 
-                        var frameworkAssemblies = token.SelectTokens("$..frameworkAssemblies").FirstOrDefault();
-                        if (frameworkAssemblies != null)
-                        {
-                            foreach (var assembly in frameworkAssemblies)
-                            {
-                                string assemblyName = assembly.ToString();
-                                package.FrameworkAssemblies.Add(new AssemblyName(assemblyName), assemblyName);
-                            }
-                        }
+                            assemblies = GetAssembliesList(library.RuntimeAssemblies, nugetCachePath, package);
 
-                        builder.Add(package);
+                            package.RuntimeAssemblies.AddRange(assemblies);
+
+                            var frameworkAssemblies = library.FrameworkAssemblies.ToDictionary(a => new AssemblyName(a));
+                            package.FrameworkAssemblies.AddRange(frameworkAssemblies);
+
+                            builder.Add(package);
+                        }
                     }
                 }
+                catch (FileFormatException)
+                {
+                    return ImmutableArray<PackageReference>.Empty;
+                }
             }
 
             return builder.ToImmutableArray();
         }
 
+        private static IReadOnlyDictionary<AssemblyName, string> GetAssembliesList(IList<LockFileItem> compileTimeAssemblies, string nugetCachePath, PackageReference package)
+        {
+            string packagePath = Path.Combine(nugetCachePath, package.Name, package.Version.ToString());
+            return compileTimeAssemblies.Select(i => Path.Combine(packagePath, i.Path))
+                                .Where(p => !p.EndsWith(EmptyFolderFileMarker) && File.Exists(p))
+                                .ToDictionary(p => AssemblyName.GetAssemblyName(p), p => new Uri(p).LocalPath);
+        }
+
         public bool TryResolveAssembly(string name, out string path)
         {
             path = null;
             var assemblyName = new AssemblyName(name);
 
             foreach (var package in _packages)
             {
-                if (package.Assemblies.TryGetValue(assemblyName, out path) ||
+                if (package.RuntimeAssemblies.TryGetValue(assemblyName, out path) ||
                     package.FrameworkAssemblies.TryGetValue(assemblyName, out path))
                 {
                     break;