Merge pull request #62 from JeringTech/add-package-lock

Added packages.lock.jsons.

Author: JeremyTCD

.gitignore

@@ -3,9 +3,6 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
-# Nuget
-nuget.config
-
 # User-specific files
 *.suo
 *.user

Jering.Javascript.NodeJS.sln

@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		codecov.yml = codecov.yml
 		Jering.Javascript.NodeJS.ruleset = Jering.Javascript.NodeJS.ruleset
 		License.md = License.md
+		NuGet.Config = NuGet.Config
 		ReadMe.md = ReadMe.md
 		ThirdPartyLicenses.txt = ThirdPartyLicenses.txt
 	EndProjectSection

NuGet.Config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>

azure-pipelines.yml

@@ -14,6 +14,7 @@ jobs:
     nugetUnreleasedPrereleasePushEndpoint: "https://www.myget.org/F/jering/api/v3/index.json"
     outOfProcessBuildDependencies: ["nodejs"]
     codecovKey: "e5de9f48-fb06-43c6-8368-44de5cf7e5d4"
+    cacheYarnPackages: true
 - template: templates/docs/main.yml@templates
   parameters:
     nugetRestoreEndpoints: "https://pkgs.dev.azure.com/JeremyTCD/_packaging/Main/nuget/v2"

perf/NodeJS/ConcurrencyBenchmarks.cs

@@ -13,6 +13,7 @@ public class ConcurrencyBenchmarks
     {
         private const string DUMMY_WARMUP_MODULE = "module.exports = (callback) => callback()";
         private const string DUMMY_CONCURRENCY_MODULE_FILE = "dummyConcurrencyModule.js";
+        private static readonly string _projectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../../../../../Javascript");  // BenchmarkDotNet creates a project nested deep in bin
 
         private ServiceProvider _serviceProvider;
         private INodeJSService _nodeJSService;
@@ -24,7 +25,7 @@ public void INodeJSService_Concurrency_MultiProcess_Setup()
         {
             var services = new ServiceCollection();
             services.AddNodeJS();
-            services.Configure<NodeJSProcessOptions>(options => options.ProjectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../.."));
+            services.Configure<NodeJSProcessOptions>(options => options.ProjectPath = _projectPath);
             services.Configure<OutOfProcessNodeJSServiceOptions>(options => options.Concurrency = Concurrency.MultiProcess);
             _serviceProvider = services.BuildServiceProvider();
             _nodeJSService = _serviceProvider.GetRequiredService<INodeJSService>();
@@ -56,7 +57,7 @@ public void INodeJSService_Concurrency_None_Setup()
         {
             var services = new ServiceCollection();
             services.AddNodeJS();
-            services.Configure<NodeJSProcessOptions>(options => options.ProjectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../.."));
+            services.Configure<NodeJSProcessOptions>(options => options.ProjectPath = _projectPath);
             _serviceProvider = services.BuildServiceProvider();
             _nodeJSService = _serviceProvider.GetRequiredService<INodeJSService>();
 
@@ -85,7 +86,7 @@ public void INodeServices_Concurrency_Setup()
             var services = new ServiceCollection();
             services.AddNodeServices(options =>
             {
-                options.ProjectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../..");
+                options.ProjectPath = _projectPath;
                 options.WatchFileExtensions = null;
             });
             _serviceProvider = services.BuildServiceProvider();

perf/NodeJS/dummyConcurrencyModule.js perf/NodeJS/Javascript/dummyConcurrencyModule.js

@@ -5,7 +5,9 @@
         <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
         <CodeAnalysisRuleSet>../../Jering.Javascript.NodeJS.ruleset</CodeAnalysisRuleSet>
-        <DefaultItemExcludes>node_modules\**;$(DefaultItemExcludes)</DefaultItemExcludes>
+        <DefaultItemExcludes>Javascript\node_modules\**;$(DefaultItemExcludes)</DefaultItemExcludes>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+        <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     </PropertyGroup>
 
     <ItemGroup>
@@ -15,17 +17,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Content Include="dummyRealWorkloadModule.js" copyToOutputDirectory="PreserveNewest" />
-        <Content Include="dummyLatencyModule.js" copyToOutputDirectory="PreserveNewest" />
-        <Content Include="dummyConcurrencyModule.js" copyToOutputDirectory="PreserveNewest" />
+        <ProjectReference Include="..\..\src\NodeJS\Jering.Javascript.NodeJS.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\src\NodeJS\Jering.Javascript.NodeJS.csproj" />
-    </ItemGroup>
-
-    <Target Name="YarnInstall" BeforeTargets="DispatchToInnerBuilds;PreBuildEvent">
-        <Yarn WorkingDirectory="." Command="run build" />
+    <Target Name="JavascriptBuild" BeforeTargets="PreBuildEvent">
+        <Yarn WorkingDirectory=".\Javascript" Command="run build" />
     </Target>
 
 </Project>

perf/NodeJS/dummyLatencyModule.js perf/NodeJS/Javascript/dummyLatencyModule.js

@@ -14,6 +14,7 @@ public class LatencyBenchmarks
         private const string DUMMY_WARMUP_MODULE = "module.exports = (callback) => callback()";
         private const string DUMMY_LATENCY_MODULE_FILE = "dummyLatencyModule.js";
         private const string DUMMY_MODULE_IDENTIFIER = "dummyLatencyModuleIdentifier";
+        private static readonly string _projectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../../../../../Javascript"); // BenchmarkDotNet creates a project nested deep in bin
 
         private ServiceProvider _serviceProvider;
         private int _counter;
@@ -26,7 +27,7 @@ public void INodeJSService_Latency_InvokeFromFile_Setup()
         {
             var services = new ServiceCollection();
             services.AddNodeJS();
-            services.Configure<NodeJSProcessOptions>(options => options.ProjectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../.."));
+            services.Configure<NodeJSProcessOptions>(options => options.ProjectPath = _projectPath);
             _serviceProvider = services.BuildServiceProvider();
             _nodeJSService = _serviceProvider.GetRequiredService<INodeJSService>();
             _counter = 0;
@@ -62,7 +63,7 @@ public async Task<DummyResult> INodeJSService_Latency_InvokeFromCache()
 
         private string DummyModuleFactory()
         {
-            return File.ReadAllText(Path.Combine(Directory.GetCurrentDirectory(), "../../../..", DUMMY_LATENCY_MODULE_FILE));
+            return File.ReadAllText(Path.Combine(_projectPath, DUMMY_LATENCY_MODULE_FILE));
         }
 
         [Obsolete]
@@ -72,7 +73,7 @@ public void INodeServices_Latency_Setup()
             var services = new ServiceCollection();
             services.AddNodeServices(options =>
             {
-                options.ProjectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../..");
+                options.ProjectPath = _projectPath;
                 options.WatchFileExtensions = null;
             });
             _serviceProvider = services.BuildServiceProvider();

perf/NodeJS/dummyRealWorkloadModule.js perf/NodeJS/Javascript/dummyRealWorkloadModule.js

@@ -22,6 +22,7 @@ public static void Main(string[] args)
         Console.WriteLine(""Hello world {0}!"");
     }}
 }}";
+        private static readonly string _projectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../../../../../Javascript"); // BenchmarkDotNet creates a project nested deep in bin
 
         private int _counter;
         private ServiceProvider _serviceProvider;
@@ -34,7 +35,7 @@ public void INodeJSService_RealWorkload_Setup()
         {
             var services = new ServiceCollection();
             services.AddNodeJS();
-            services.Configure<NodeJSProcessOptions>(options => options.ProjectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../.."));
+            services.Configure<NodeJSProcessOptions>(options => options.ProjectPath = _projectPath); // Module loads prismjs from node_modules
             services.Configure<OutOfProcessNodeJSServiceOptions>(options => options.Concurrency = Concurrency.MultiProcess);
             _serviceProvider = services.BuildServiceProvider();
             _nodeJSService = _serviceProvider.GetRequiredService<INodeJSService>();
@@ -65,7 +66,7 @@ public async Task<string[]> INodeJSService_RealWorkload()
 
         private string DummyModuleFactory()
         {
-            return File.ReadAllText(Path.Combine(Directory.GetCurrentDirectory(), "../../../..", DUMMY_REAL_WORKLOAD_MODULE_FILE));
+            return File.ReadAllText(Path.Combine(_projectPath, DUMMY_REAL_WORKLOAD_MODULE_FILE));
         }
 
         [Obsolete]
@@ -75,7 +76,7 @@ public void INodeServices_RealWorkload_Setup()
             var services = new ServiceCollection();
             services.AddNodeServices(options =>
             {
-                options.ProjectPath = Path.Combine(Directory.GetCurrentDirectory(), "../../../..");
+                options.ProjectPath = _projectPath;
                 options.WatchFileExtensions = null;
             });
             _serviceProvider = services.BuildServiceProvider();