author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
410,218 |
29.04.2017 00:56:48
| 25,200 |
b40d16eb8ca8ee3745cada58954803f7be0d3bb6
|
Ensure things close down correctly
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/ExportRunner/exportrunner.js",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/ExportRunner/exportrunner.js",
"diff": "@@ -107,5 +107,6 @@ var run_tests = function (testCases, callback) {\ntype: 'suite end',\nresult: result\n});\n+ process.exit();\n};\nmodule.exports.run_tests = run_tests;\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/run_tests.js",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/run_tests.js",
"diff": "@@ -8,6 +8,7 @@ var rl = readline.createInterface({\n});\nrl.on('line', (line) => {\n+ rl.close();\nvar testCases = JSON.parse(line);\n// get rid of leftover quotations from C# (necessary?)\nfor (var test in testCases) {\n@@ -33,7 +34,4 @@ rl.on('line', (line) => {\n}\n// run the test\nframework.run_tests(testCases, postResult);\n-\n- // close readline interface\n- rl.close();\n});\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Ensure things close down correctly
|
410,217 |
20.04.2017 16:33:50
| 25,200 |
531ff5b820c47a3901f58f3b321eeb104f4028b6
|
Fix color contrast for blue theme
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/ReplWindow/Repl/ReplOutputClassificationFormatDefinitions.cs",
"new_path": "Common/Product/ReplWindow/Repl/ReplOutputClassificationFormatDefinitions.cs",
"diff": "@@ -64,7 +64,7 @@ namespace Microsoft.NodejsTools.Repl\npublic InteractiveDarkGreenFormatDefinition()\n{\nDisplayName = Name;\n- ForegroundColor = Color.FromRgb(0x00, 0x7f, 0);\n+ ForegroundColor = Color.FromRgb(0x00, 0x40, 0);\n}\n}\n@@ -183,7 +183,7 @@ namespace Microsoft.NodejsTools.Repl\npublic InteractiveDarkGrayFormatDefinition()\n{\nDisplayName = Name;\n- ForegroundColor = Color.FromRgb(0x7f, 0x7f, 0x7f);\n+ ForegroundColor = Color.FromRgb(0x76, 0x76, 0x76);\n}\n}\n@@ -203,7 +203,7 @@ namespace Microsoft.NodejsTools.Repl\npublic InteractiveRedFormatDefinition()\n{\nDisplayName = Name;\n- ForegroundColor = Color.FromRgb(0xff, 0, 0);\n+ ForegroundColor = Color.FromRgb(0xEE, 0, 0);\n}\n}\n@@ -223,7 +223,7 @@ namespace Microsoft.NodejsTools.Repl\npublic InteractiveGreenFormatDefinition()\n{\nDisplayName = Name;\n- ForegroundColor = Color.FromRgb(0x00, 0xff, 0);\n+ ForegroundColor = Color.FromRgb(0x00, 0x80, 0);\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix color contrast for blue theme
|
410,218 |
01.05.2017 17:00:09
| 25,200 |
8ff40680a5914ce72bce4de7799347e4fec981aa
|
Minor fixes to test runners
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/Tape/tape.js",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/Tape/tape.js",
"diff": "@@ -112,7 +112,6 @@ function run_tests(testInfo, callback) {\n});\nharness.onFinish(function () {\n- // TODO: This still doesn't seem to handle async tests with plan issues.\nif (capture) {\n// Something didn't finish. Finish it now.\nresult.passed = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js",
"diff": "@@ -92,7 +92,7 @@ var run_tests = function (testCases, callback) {\nvar mocha = initializeMocha(Mocha, testCases[0].projectFolder);\nvar testGrepString = '^(' + testCases.map(function (testCase) {\n- return testCase.testName\n+ return escapeRegExp(testCase.testName);\n}).join('|') + ')$';\nif (testGrepString) {\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Minor fixes to test runners
|
410,204 |
03.05.2017 13:02:00
| 25,200 |
ee3f641cd1316f446c49392139befe7e71038315
|
Fixed path to the node debug adapter
Fixed path to the node debug adapter
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -353,7 +353,7 @@ namespace Microsoft.NodejsTools.Project\nvar visualStudioInstallationInstanceID = setupConfiguration.GetInstanceForCurrentProcess().GetInstanceId();\nvar pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n- $@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\out\\src\\nodeDebug.js\"\"\");\n+ $@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\extension\\out\\src\\nodeDebug.js\"\"\");\nvar cwd = _project.GetWorkingDirectory(); // Current working directory\nvar configuration = new JObject(\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed path to the node debug adapter
Fixed path to the node debug adapter
|
410,224 |
03.05.2017 14:06:06
| 25,200 |
34b070f2ec4d9bd008906098868d583d8e835fc6
|
Changes to the parameters we pass to PineZorro, including the new install path for the Willow-installed VS instance of node.exe
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -350,11 +350,17 @@ namespace Microsoft.NodejsTools.Project\nvar setupConfiguration = new SetupConfiguration();\n- var visualStudioInstallationInstanceID = setupConfiguration.GetInstanceForCurrentProcess().GetInstanceId();\n+ var setupInstance = setupConfiguration.GetInstanceForCurrentProcess();\n+\n+ var visualStudioInstallationInstanceID = setupInstance.GetInstanceId();\n+\n+ var pathToNodeExe = setupInstance.GetInstallationPath() + \"\\\\JavaScript\\\\Node.JS\\\\v6.4.0_x86\\\\Node.exe\";\nvar pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n$@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\extension\\out\\src\\nodeDebug.js\"\"\");\n+ var adapterString = pathToNodeExe + \" \" + pathToNode2DebugAdapterRuntime;\n+\nvar cwd = _project.GetWorkingDirectory(); // Current working directory\nvar configuration = new JObject(\nnew JProperty(\"name\", \"Debug Node.js program from Visual Studio\"),\n@@ -366,8 +372,7 @@ namespace Microsoft.NodejsTools.Project\nnew JProperty(\"diagnosticLogging\", CheckEnableDiagnosticLoggingOption()),\nnew JProperty(\"sourceMaps\", true),\nnew JProperty(\"stopOnEntry\", true),\n- new JProperty(\"$adapter\", pathToNode2DebugAdapterRuntime),\n- new JProperty(\"$adapterRuntime\", \"node\"));\n+ new JProperty(\"$adapter\", pathToNode2DebugAdapterRuntime));\nvar jsonContent = configuration.ToString();\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Changes to the parameters we pass to PineZorro, including the new install path for the Willow-installed VS instance of node.exe
|
410,224 |
04.05.2017 12:45:36
| 25,200 |
a344a97b687cda95caad969f23b08e8522bbf0c6
|
Fixed the way I'm putting the new strings in the params. With this change, the debugger seems to launch correctly, but at least on my dev box, I don't see chrome launching.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -359,8 +359,6 @@ namespace Microsoft.NodejsTools.Project\nvar pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n$@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\extension\\out\\src\\nodeDebug.js\"\"\");\n- var adapterString = pathToNodeExe + \" \" + pathToNode2DebugAdapterRuntime;\n-\nvar cwd = _project.GetWorkingDirectory(); // Current working directory\nvar configuration = new JObject(\nnew JProperty(\"name\", \"Debug Node.js program from Visual Studio\"),\n@@ -372,7 +370,8 @@ namespace Microsoft.NodejsTools.Project\nnew JProperty(\"diagnosticLogging\", CheckEnableDiagnosticLoggingOption()),\nnew JProperty(\"sourceMaps\", true),\nnew JProperty(\"stopOnEntry\", true),\n- new JProperty(\"$adapter\", pathToNode2DebugAdapterRuntime));\n+ new JProperty(\"$adapter\", pathToNodeExe),\n+ new JProperty(\"$adapterArgs\", pathToNode2DebugAdapterRuntime));\nvar jsonContent = configuration.ToString();\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed the way I'm putting the new strings in the params. With this change, the debugger seems to launch correctly, but at least on my dev box, I don't see chrome launching.
|
410,224 |
04.05.2017 14:18:37
| 25,200 |
8ae39cc0fb52fb44cfca4a659012db7d27bb6db1
|
Adds Path.Combine and a version-explaining comment as requested by Paul
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -354,7 +354,8 @@ namespace Microsoft.NodejsTools.Project\nvar visualStudioInstallationInstanceID = setupInstance.GetInstanceId();\n- var pathToNodeExe = setupInstance.GetInstallationPath() + \"\\\\JavaScript\\\\Node.JS\\\\v6.4.0_x86\\\\Node.exe\";\n+ // The Node2Adapter depends on features only in Node v6+, so the old v5.4 version of node will not suffice for this scenario\n+ var pathToNodeExe = Path.Combine(setupInstance.GetInstallationPath(), \"\\\\JavaScript\\\\Node.JS\\\\v6.4.0_x86\\\\Node.exe\");\nvar pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n$@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\extension\\out\\src\\nodeDebug.js\"\"\");\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Adds Path.Combine and a version-explaining comment as requested by Paul
|
410,217 |
04.05.2017 14:45:15
| 25,200 |
e80697d0a19fca74b5975cc0e4d458a0ac59f56f
|
Start webbrowser when using the webkit debugger.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -86,7 +86,7 @@ namespace Microsoft.NodejsTools.Project\n}\nelse\n{\n- StartAndAttachDebugger(file, nodePath);\n+ StartAndAttachDebugger(file, nodePath, startBrowser);\n}\n}\nelse\n@@ -118,7 +118,7 @@ namespace Microsoft.NodejsTools.Project\nreturn StringComparer.OrdinalIgnoreCase.Equals(optionString, \"true\");\n}\n- private void StartAndAttachDebugger(string file, string nodePath)\n+ private void StartAndAttachDebugger(string file, string nodePath, bool startBrowser)\n{\n// start the node process\nvar workingDir = _project.GetWorkingDirectory();\n@@ -128,6 +128,12 @@ namespace Microsoft.NodejsTools.Project\nvar debugOptions = this.GetDebugOptions();\nvar script = GetFullArguments(file, includeNodeArgs: false);\n+ Uri uri = null;\n+ if (!String.IsNullOrWhiteSpace(url))\n+ {\n+ uri = new Uri(url);\n+ }\n+\nvar process = NodeDebugger.StartNodeProcessWithInspect(exe: nodePath, script: script, dir: workingDir, env: env, interpreterOptions: interpreterOptions, debugOptions: debugOptions);\nprocess.Start();\n@@ -152,6 +158,18 @@ namespace Microsoft.NodejsTools.Project\ndbgInfo.bstrExe = $\"\\01\";\nAttachDebugger(dbgInfo);\n+\n+ if (startBrowser && uri != null)\n+ {\n+ OnPortOpenedHandler.CreateHandler(\n+ uri.Port,\n+ shortCircuitPredicate: () => process.HasExited,\n+ action: () =>\n+ {\n+ VsShellUtilities.OpenBrowser(url, (uint)__VSOSPFLAGS.OSP_LaunchNewBrowser);\n+ }\n+ );\n+ }\n}\nprivate NodeDebugOptions GetDebugOptions()\n@@ -470,7 +488,6 @@ namespace Microsoft.NodejsTools.Project\ndbgInfo.fSendStdoutToOutputWindow = 0;\ndbgInfo.bstrEnv = GetEnvironmentVariablesString(url);\n-\n// Set the Node debugger\ndbgInfo.clsidCustom = AD7Engine.DebugEngineGuid;\ndbgInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Start webbrowser when using the webkit debugger.
|
410,200 |
04.05.2017 22:39:58
| 0 |
4e9cfaa5c1635c156e113b8d334fb617b4155751
|
Report skipped Mocha tests as "Skipped"
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js",
"diff": "var EOL = require('os').EOL;\nvar fs = require('fs');\nvar path = require('path');\n-var result = {\n- 'title': '',\n- 'passed': false,\n- 'stdOut': '',\n- 'stdErr': ''\n-};\n// Choose 'tap' rather than 'min' or 'xunit'. The reason is that\n// 'min' produces undisplayable text to stdout and stderr under piped/redirect,\n// and 'xunit' does not print the stack trace from the test.\n@@ -22,6 +16,17 @@ function hook_outputs() {\nprocess.stdout.write = append_stdout;\nprocess.stderr.write = append_stderr;\n}\n+function reset_result() {\n+ return {\n+ 'title': '',\n+ 'passed': false,\n+ 'pending': false,\n+ 'stdOut': '',\n+ 'stdErr': ''\n+ };\n+}\n+\n+var result = reset_result();\nhook_outputs();\n@@ -142,6 +147,17 @@ var run_tests = function (testCases, callback) {\n});\n});\n+ runner.on('pending', function (test) {\n+ result.pending = true;\n+ result.title = test.fullTitle();\n+ post({\n+ type: 'pending',\n+ title: result.title,\n+ result: result\n+ });\n+ result = reset_result();\n+ });\n+\nrunner.on('test', function (test) {\nresult.title = test.fullTitle();\npost({\n@@ -162,14 +178,10 @@ var run_tests = function (testCases, callback) {\npost({\ntype: 'result',\ntitle: result.title,\n- result: result\n+ result: result,\n+ pending: false\n});\n- result = {\n- 'title': '',\n- 'passed': false,\n- 'stdOut': '',\n- 'stdErr': ''\n- }\n+ result = reset_result();\n});\nrunner.on('fail', function (test, err) {\n@@ -177,14 +189,10 @@ var run_tests = function (testCases, callback) {\npost({\ntype: 'result',\ntitle: result.title,\n- result: result\n+ result: result,\n+ pending: false\n});\n- result = {\n- 'title': '',\n- 'passed': false,\n- 'stdOut': '',\n- 'stdErr': ''\n- }\n+ result = reset_result();\n});\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutor.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutor.cs",
"diff": "@@ -88,18 +88,29 @@ namespace Microsoft.NodejsTools.TestAdapter {\n{\nTestEvent testEvent = JsonConvert.DeserializeObject<TestEvent>(line);\n// Extract test from list of tests\n- var test = _currentTests.Where(n => n.DisplayName == testEvent.title);\n- if (test.Count() > 0)\n+ var tests = _currentTests.Where(n => n.DisplayName == testEvent.title);\n+ if (tests.Count() > 0)\n{\n- if (testEvent.type == \"test start\")\n+ switch (testEvent.type)\n{\n- _currentResult = new TestResult(test.First());\n+ case \"test start\":\n+ {\n+ _currentResult = new TestResult(tests.First());\n_currentResult.StartTime = DateTimeOffset.Now;\n- _frameworkHandle.RecordStart(test.First());\n+ _frameworkHandle.RecordStart(tests.First());\n+ }\n+ break;\n+ case \"result\":\n+ {\n+ RecordEnd(_frameworkHandle, tests.First(), _currentResult, testEvent.result);\n}\n- else if (testEvent.type == \"result\")\n+ break;\n+ case \"pending\":\n{\n- RecordEnd(_frameworkHandle, test.First(), _currentResult, testEvent.result);\n+ _currentResult = new TestResult(tests.First());\n+ RecordEnd(_frameworkHandle, tests.First(), _currentResult, testEvent.result);\n+ }\n+ break;\n}\n}\nelse if (testEvent.type == \"suite end\")\n@@ -345,9 +356,17 @@ namespace Microsoft.NodejsTools.TestAdapter {\nprivate void RecordEnd(IFrameworkHandle frameworkHandle, TestCase test, TestResult result, ResultObject resultObject) {\nString[] standardOutputLines = resultObject.stdout.Split('\\n');\nString[] standardErrorLines = resultObject.stderr.Split('\\n');\n+\n+ if (null != resultObject.pending && (bool)resultObject.pending)\n+ {\n+ result.Outcome = TestOutcome.Skipped;\n+ }\n+ else\n+ {\nresult.EndTime = DateTimeOffset.Now;\nresult.Duration = result.EndTime - result.StartTime;\nresult.Outcome = resultObject.passed ? TestOutcome.Passed : TestOutcome.Failed;\n+ }\nresult.Messages.Add(new TestResultMessage(TestResultMessage.StandardOutCategory, String.Join(Environment.NewLine, standardOutputLines)));\nresult.Messages.Add(new TestResultMessage(TestResultMessage.StandardErrorCategory, String.Join(Environment.NewLine, standardErrorLines)));\nresult.Messages.Add(new TestResultMessage(TestResultMessage.AdditionalInfoCategory, String.Join(Environment.NewLine, standardErrorLines)));\n@@ -397,11 +416,13 @@ class ResultObject {\npublic ResultObject() {\ntitle = String.Empty;\npassed = false;\n+ pending = false;\nstdout = String.Empty;\nstderr = String.Empty;\n}\npublic string title { get; set; }\npublic bool passed { get; set; }\n+ public bool? pending { get; set; }\npublic string stdout { get; set; }\npublic string stderr { get; set; }\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Report skipped Mocha tests as "Skipped"
|
410,217 |
04.05.2017 13:08:30
| 25,200 |
402d892ab45089b3858ff268f91a33a44c73576b
|
Minimal work to support the new NPM protocol for package search.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"diff": "@@ -64,7 +64,6 @@ namespace Microsoft.NodejsTools {\n[InstalledProductRegistration(\"#110\", \"#112\", AssemblyVersionInfo.Version, IconResourceID = 400)]\n[Guid(Guids.NodejsPackageString)]\n[ProvideOptionPage(typeof(NodejsGeneralOptionsPage), \"Node.js Tools\", \"General\", 114, 115, true)]\n- [ProvideOptionPage(typeof(NodejsNpmOptionsPage), \"Node.js Tools\", \"Npm\", 114, 116, true)]\n[ProvideDebugEngine(\"Node.js Debugging\", typeof(AD7ProgramProvider), typeof(AD7Engine), AD7Engine.DebugEngineId, setNextStatement: false, hitCountBp: true, justMyCodeStepping: false)]\n#if DEV14\n[ProvideLanguageService(typeof(NodejsLanguageInfo), NodejsConstants.Nodejs, 106, RequestStockColors = true, ShowSmartIndent = true, ShowCompletion = true, DefaultToInsertSpaces = true, HideAdvancedMembersByDefault = true, EnableAdvancedMembersOption = true, ShowDropDownOptions = true)]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"diff": "</Grid>\n<GridSplitter Grid.Column=\"1\" Grid.Row=\"0\" Grid.RowSpan=\"3\" Width=\"6\" Background=\"Transparent\" VerticalAlignment=\"Stretch\" HorizontalAlignment=\"Center\" ShowsPreview=\"True\" />\n- <Grid Grid.Row=\"2\" VerticalAlignment=\"Top\" Margin=\"0 4 0 0\">\n- <Grid.ColumnDefinitions>\n- <ColumnDefinition Width=\"*\" />\n- <ColumnDefinition Width=\"Auto\" />\n- </Grid.ColumnDefinitions>\n-\n- <!-- Package cache control -->\n-\n-\n- <ContentControl Grid.Column=\"0\"\n- Content=\"{Binding LastRefreshedMessage}\"\n- Foreground=\"{DynamicResource {x:Static wpf:Controls.ForegroundKey}}\"\n- VerticalAlignment=\"Center\"\n- HorizontalAlignment=\"Stretch\"\n- Focusable=\"False\"\n- IsTabStop=\"False\"/>\n-\n- <Button Grid.Column=\"1\" HorizontalAlignment=\"Right\" Margin=\"0\"\n- Name=\"RefreshButton\"\n- Command=\"{x:Static npmUi:NpmPackageInstallViewModel.RefreshCatalogCommand}\"\n- KeyboardNavigation.TabIndex=\"8\"\n- xml:space=\"preserve\"\n- Content=\"{x:Static resx:NpmInstallWindowResources.RefreshButtonContent}\" />\n- </Grid>\n-\n<Grid Grid.Column=\"2\" Grid.RowSpan=\"2\" Margin=\"8 0 0 0\" >\n<Grid.RowDefinitions>\n<RowDefinition Height=\"*\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/IPackageCatalog.cs",
"new_path": "Nodejs/Product/Npm/IPackageCatalog.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.IO;\n+using System.Linq;\n+using System.Net;\nusing System.Threading.Tasks;\n+using Newtonsoft.Json;\n+using Newtonsoft.Json.Linq;\nnamespace Microsoft.NodejsTools.Npm {\npublic interface IPackageCatalog {\nDateTime LastRefreshed { get; }\n- Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterText, Uri registryUrl = null);\n-\n- IPackage this[string name] { get; }\n+ Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterText);\nlong? ResultsCount { get; }\n}\n+\n+ // This class is a wrapper catalog to directly query the NPM repo\n+ // instead of downloading the entire catalog (which is no longer supported).\n+ internal sealed class EmptyPackageCatalog : IPackageCatalog {\n+\n+ private static readonly Uri defaultRegistryUri = new Uri(\"https://registry.npmjs.org/\");\n+\n+ public static readonly IPackageCatalog Instance = new EmptyPackageCatalog();\n+\n+ private EmptyPackageCatalog() { }\n+\n+ public DateTime LastRefreshed => DateTime.Now;\n+\n+ public long? ResultsCount => 0;\n+\n+ public async Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterText) {\n+ var relativeUri = string.Format(\"/-/v1/search?text={0}\", filterText);\n+ var searchUri = new Uri(defaultRegistryUri, relativeUri);\n+\n+ var request = WebRequest.Create(searchUri);\n+ using (var response = await request.GetResponseAsync()) {\n+ var reader = new StreamReader(response.GetResponseStream());\n+ using (var jsonReader = new JsonTextReader(reader)) {\n+ while (jsonReader.Read()) {\n+ switch (jsonReader.TokenType) {\n+ case JsonToken.StartObject:\n+ case JsonToken.PropertyName:\n+ continue;\n+ case JsonToken.StartArray:\n+ return ReadPackagesFromArray(jsonReader);\n+ default:\n+ throw new InvalidOperationException(\"Unexpected json token.\");\n+ }\n+ }\n+ }\n+ }\n+\n+ // should never get here\n+ throw new InvalidOperationException(\"Unexpected json token.\");\n+ }\n+\n+ private IEnumerable<IPackage> ReadPackagesFromArray(JsonTextReader jsonReader) {\n+ var pkgList = new List<IPackage>();\n+\n+ // Inside the array, each object is an NPM package\n+ var builder = new NodeModuleBuilder();\n+ while (jsonReader.Read()) {\n+ switch (jsonReader.TokenType) {\n+ case JsonToken.PropertyName:\n+ if (StringComparer.OrdinalIgnoreCase.Equals(jsonReader.Value, \"package\")) {\n+ var token = (JProperty)JToken.ReadFrom(jsonReader);\n+ var package = ReadPackage(token.Value, builder);\n+ if (package != null) {\n+ pkgList.Add(package);\n+ }\n+ }\n+ continue;\n+ case JsonToken.EndArray:\n+ // This is the spot the function should always exit on valid data\n+ return pkgList;\n+ default:\n+ continue;\n+ }\n+ }\n+ throw new JsonException(\"Unexpected end of stream reading the NPM catalog data array\");\n+ }\n+\n+ private IPackage ReadPackage(JToken package, NodeModuleBuilder builder) {\n+ builder.Reset();\n+\n+ try {\n+ builder.Name = (string)package[\"name\"];\n+ if (string.IsNullOrEmpty(builder.Name)) {\n+ // I don't believe this should ever happen if the data returned is\n+ // well formed. Could throw an exception, but just skip instead for\n+ // resiliency on the NTVS side.\n+ return null;\n+ }\n+\n+ builder.AppendToDescription((string)package[\"description\"] ?? string.Empty);\n+\n+ var date = package[\"date\"];\n+ if (date != null) {\n+ builder.AppendToDate((string)date);\n+ }\n+\n+ var version = package[\"version\"];\n+ if (version != null) {\n+ var semver = SemverVersion.Parse((string)version);\n+ builder.AddVersion(semver);\n+ }\n+\n+ AddKeywords(builder, package[\"keywords\"]);\n+ AddAuthor(builder, package[\"author\"]);\n+ AddHomepage(builder, package[\"links\"]);\n+\n+ return builder.Build();\n+ } catch (InvalidOperationException) {\n+ // Occurs if a JValue appears where we expect JProperty\n+ return null;\n+ } catch (ArgumentException) {\n+ return null;\n+ }\n+ }\n+\n+ private static void AddKeywords(NodeModuleBuilder builder, JToken keywords) {\n+ if (keywords != null) {\n+ foreach (var keyword in keywords.Select(v => (string)v)) {\n+ builder.AddKeyword(keyword);\n+ }\n+ }\n+ }\n+\n+ private static void AddHomepage(NodeModuleBuilder builder, JToken links) {\n+ var homepage = links?[\"homepage\"];\n+ if (homepage != null) {\n+ builder.AddHomepage((string)homepage);\n+ }\n+ }\n+\n+ private static void AddAuthor(NodeModuleBuilder builder, JToken author) {\n+ var name = author?[\"name\"];\n+ if (author != null) {\n+ builder.AddAuthor((string)name);\n+ }\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/NodeModuleBuilder.cs",
"new_path": "Nodejs/Product/Npm/NodeModuleBuilder.cs",
"diff": "@@ -144,6 +144,13 @@ namespace Microsoft.NodejsTools.Npm {\n}\n}\n+ public void AddVersion(SemverVersion version) {\n+ if( version > this.LatestVersion) {\n+ this.LatestVersion = version;\n+ }\n+ this._availableVersions.Add(version);\n+ }\n+\npublic IPackage Build() {\nvar proxy = new PackageProxy {\nAuthor = Author,\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/SPI/NpmController.cs",
"new_path": "Nodejs/Product/Npm/SPI/NpmController.cs",
"diff": "@@ -22,7 +22,7 @@ using System.Threading.Tasks;\nnamespace Microsoft.NodejsTools.Npm.SPI {\ninternal class NpmController : AbstractNpmLogSource, INpmController {\n- private IPackageCatalog _sRepoCatalog;\n+ private IPackageCatalog _sRepoCatalog = EmptyPackageCatalog.Instance;\nprivate string _fullPathToRootPackageDirectory;\nprivate string _cachePath;\nprivate bool _showMissingDevOptionalSubPackages;\n@@ -174,28 +174,8 @@ namespace Microsoft.NodejsTools.Npm.SPI {\nOnCommandCompleted(e.Arguments, e.WithErrors, e.Cancelled);\n}\n- public async Task<IPackageCatalog> GetRepositoryCatalogAsync(bool forceDownload, IProgress<string> progress) {\n- // This should really be thread-safe but await can't be inside a lock so\n- // we'll just have to hope and pray this doesn't happen concurrently. Worst\n- // case is we'll end up with two retrievals, one of which will be binned,\n- // which isn't the end of the world.\n- _sRepoCatalog = null;\n- if (null == _sRepoCatalog || _sRepoCatalog.ResultsCount == 0 || forceDownload) {\n- Exception ex = null;\n- using (var commander = CreateNpmCommander()) {\n- EventHandler<NpmExceptionEventArgs> exHandler = (sender, args) => { LogException(sender, args); ex = args.Exception; };\n- commander.ErrorLogged += LogError;\n- commander.ExceptionLogged += exHandler;\n- _sRepoCatalog = await commander.GetCatalogAsync(forceDownload, progress);\n- commander.ErrorLogged -= LogError;\n- commander.ExceptionLogged -= exHandler;\n- }\n- if (null != ex) {\n- OnOutputLogged(ex.ToString());\n- throw ex;\n- }\n- }\n- return _sRepoCatalog;\n+ public Task<IPackageCatalog> GetRepositoryCatalogAsync(bool forceDownload, IProgress<string> progress) {\n+ return Task.FromResult(_sRepoCatalog);\n}\npublic IPackageCatalog MostRecentlyLoadedCatalog {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/SPI/NpmGetCatalogCommand.cs",
"new_path": "Nodejs/Product/Npm/SPI/NpmGetCatalogCommand.cs",
"diff": "@@ -622,7 +622,7 @@ etc.\npublic IPackageCatalog Catalog { get { return this; } }\n- public async Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterText, Uri registryUrl = null) {\n+ public async Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterText) {\nIEnumerable<IPackage> packages = null;\nusing (var semaphore = GetDatabaseSemaphore()) {\n// Wait until file is downloaded/parsed if another download is already in session.\n@@ -635,7 +635,7 @@ etc.\n}\ntry {\n- registryUrl = registryUrl ?? await GetRegistryUrl();\n+ var registryUrl = await GetRegistryUrl();\nRegistryFileMapping registryFileMapping = null;\nusing (var db = new SQLiteConnection(DatabaseCacheFilePath)) {\nregistryFileMapping = db.Table<RegistryFileMapping>().FirstOrDefault(info => info.RegistryUrl == registryUrl.ToString());\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Minimal work to support the new NPM protocol for package search.
|
410,217 |
05.05.2017 11:20:16
| 25,200 |
5e2663e0d6cd804c74ddcca82327759c43b19bd9
|
Disable no longer used tests
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/NpmTests/NpmSearchTests.cs",
"new_path": "Nodejs/Tests/NpmTests/NpmSearchTests.cs",
"diff": "@@ -133,7 +133,7 @@ namespace NpmTests {\nreturn new MockPackageCatalog(GetTestPackageList(filename, out byName));\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckDatabaseCreation() {\nstring databaseFilename = NpmGetCatalogCommand.DatabaseCacheFilename;\nstring registryFilename = NpmGetCatalogCommand.RegistryCacheFilename;\n@@ -175,7 +175,7 @@ namespace NpmTests {\n);\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckDatabaseUpdate() {\nstring cachePath = \"NpmCacheUpdate\";\nstring registryPath = Path.Combine(cachePath, \"registry\", NpmGetCatalogCommand.RegistryCacheFilename);\n@@ -226,7 +226,7 @@ namespace NpmTests {\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckDatabaseUpdateArray() {\nstring cachePath = \"NpmCacheUpdate\";\nstring registryPath = Path.Combine(cachePath, \"registry\", NpmGetCatalogCommand.RegistryCacheFilename);\n@@ -277,7 +277,7 @@ namespace NpmTests {\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckPackageWithBuildPreReleaseInfo() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\n@@ -366,28 +366,28 @@ namespace NpmTests {\nCheckSensibleNumberOfNonZeroVersions(target);\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckCorrectPackageCount() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\nAssert.AreEqual(89924, target.Count, \"Unexpected package count in catalogue list.\");\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckNoDuplicatePackages() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\nCheckOnlyOneOfEachPackage(target);\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckListAndDictByNameSameSize() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\nAssert.AreEqual(target.Count, byName.Count, \"Number of packages should be same in list and dictionary.\");\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckFirstPackageInCatalog() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\n@@ -406,7 +406,7 @@ namespace NpmTests {\nEnumerable.Empty<string>());\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckLastPackageInCatalog_zzz() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\n@@ -425,7 +425,7 @@ namespace NpmTests {\nEnumerable.Empty<string>());\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckPackageEqualsInDescription() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\n@@ -444,7 +444,7 @@ namespace NpmTests {\nEnumerable.Empty<string>());\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckPackageNoDescriptionAuthorVersion() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\n@@ -462,7 +462,7 @@ namespace NpmTests {\nEnumerable.Empty<string>());\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckPackageNoDescription() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Disable no longer used tests
|
410,224 |
05.05.2017 11:28:06
| 25,200 |
7115ed043b25f7b28db376fedb470d59cba15438
|
NTVS node2 debug protocol launching changes, in progress, not yet testing
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -82,7 +82,7 @@ namespace Microsoft.NodejsTools.Project\n{\nif (CheckUseNewChromeDebugProtocolOption())\n{\n- StartWithChromeV2Debugger(file, nodePath);\n+ StartWithChromeV2Debugger(file, nodePath, StartBrowser);\n}\nelse\n{\n@@ -118,6 +118,13 @@ namespace Microsoft.NodejsTools.Project\nreturn StringComparer.OrdinalIgnoreCase.Equals(optionString, \"true\");\n}\n+ private static string CheckForRegistrySpecifiedNodeParams()\n+ {\n+ var paramString = NodejsDialogPage.LoadString(name: \"NodeCmdParams\", cat: \"Debugging\");\n+\n+ return paramString;\n+ }\n+\nprivate void StartAndAttachDebugger(string file, string nodePath)\n{\n// start the node process\n@@ -344,7 +351,7 @@ namespace Microsoft.NodejsTools.Project\n}\n}\n- private void StartWithChromeV2Debugger(string program, string nodeRuntimeExecutable)\n+ private void StartWithChromeV2Debugger(string program, string nodeRuntimeExecutable, bool startBrowser)\n{\nvar serviceProvider = _project.Site;\n@@ -354,12 +361,31 @@ namespace Microsoft.NodejsTools.Project\nvar visualStudioInstallationInstanceID = setupInstance.GetInstanceId();\n+\n+\n// The Node2Adapter depends on features only in Node v6+, so the old v5.4 version of node will not suffice for this scenario\nvar pathToNodeExe = Path.Combine(setupInstance.GetInstallationPath(), \"\\\\JavaScript\\\\Node.JS\\\\v6.4.0_x86\\\\Node.exe\");\n+ // We check the registry to see if any parameters for the node.exe invocation have been specified (like \"--inspect\"), and append them if we find them.\n+ string nodeParams = CheckForRegistrySpecifiedNodeParams();\n+ if (!string.IsNullOrEmpty(nodeParams))\n+ {\n+ pathToNodeExe = pathToNodeExe + \" \" + nodeParams;\n+ }\n+\nvar pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n$@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\extension\\out\\src\\nodeDebug.js\"\"\");\n+ if (!File.Exists(pathToNode2DebugAdapterRuntime))\n+ {\n+ pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n+ $@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\out\\src\\nodeDebug.js\"\"\");\n+ }\n+\n+\n+ // Here we need to massage the env variables into the format expected by node and vs code\n+ string envVarsString = GetEnvironmentVariables().ToString();\n+\nvar cwd = _project.GetWorkingDirectory(); // Current working directory\nvar configuration = new JObject(\nnew JProperty(\"name\", \"Debug Node.js program from Visual Studio\"),\n@@ -368,6 +394,7 @@ namespace Microsoft.NodejsTools.Project\nnew JProperty(\"program\", program),\nnew JProperty(\"runtimeExecutable\", nodeRuntimeExecutable),\nnew JProperty(\"cwd\", cwd),\n+ new JProperty(\"env\", envVarsString),\nnew JProperty(\"diagnosticLogging\", CheckEnableDiagnosticLoggingOption()),\nnew JProperty(\"sourceMaps\", true),\nnew JProperty(\"stopOnEntry\", true),\n@@ -389,6 +416,17 @@ namespace Microsoft.NodejsTools.Project\nvar debugger = serviceProvider.GetService(typeof(SVsShellDebugger)) as IVsDebugger4;\ndebugger.LaunchDebugTargets4(1, debugTargets, processInfo);\n+\n+ // Launch browser\n+ var webBrowserUrl = GetFullUrl();\n+ Uri uri = null;\n+ if (!String.IsNullOrWhiteSpace(webBrowserUrl))\n+ {\n+ uri = new Uri(webBrowserUrl);\n+ psi.EnvironmentVariables[\"PORT\"] = uri.Port.ToString();\n+ }\n+\n+\n}\nprivate void LaunchDebugger(IServiceProvider provider, VsDebugTargetInfo dbgInfo)\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
NTVS node2 debug protocol launching changes, in progress, not yet testing
|
410,217 |
05.05.2017 11:31:51
| 25,200 |
540248c46e0c1ee99eed81e929eeb681d5c292a9
|
Disable the last test
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/NpmTests/NpmSearchTests.cs",
"new_path": "Nodejs/Tests/NpmTests/NpmSearchTests.cs",
"diff": "@@ -359,7 +359,7 @@ namespace NpmTests {\n}\n}\n- [TestMethod, Priority(0)]\n+ //[TestMethod, Priority(0)]\npublic void CheckNonZeroPackageVersionsExist() {\nIDictionary<string, IPackage> byName;\nvar target = GetTestPackageList(PackageCacheDirectory, out byName);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Disable the last test
|
410,224 |
05.05.2017 13:52:34
| 25,200 |
b1244775b317c4907cc5a9b837f4207a32d364e8
|
Fixes for PZ<->NTVS integration bugs, and making PZ the default (opt out by specifying V1)
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -82,7 +82,7 @@ namespace Microsoft.NodejsTools.Project\n{\nif (CheckUseNewChromeDebugProtocolOption())\n{\n- StartWithChromeV2Debugger(file, nodePath, StartBrowser);\n+ StartWithChromeV2Debugger(file, nodePath, startBrowser);\n}\nelse\n{\n@@ -101,7 +101,7 @@ namespace Microsoft.NodejsTools.Project\n{\nvar optionString = NodejsDialogPage.LoadString(name: \"WebKitVersion\", cat: \"Debugging\");\n- return StringComparer.OrdinalIgnoreCase.Equals(optionString, \"V2\");\n+ return !StringComparer.OrdinalIgnoreCase.Equals(optionString, \"V1\");\n}\nprivate static bool CheckDebugProtocolOption()\n@@ -135,12 +135,6 @@ namespace Microsoft.NodejsTools.Project\nvar debugOptions = this.GetDebugOptions();\nvar script = GetFullArguments(file, includeNodeArgs: false);\n- Uri uri = null;\n- if (!String.IsNullOrWhiteSpace(url))\n- {\n- uri = new Uri(url);\n- }\n-\nvar process = NodeDebugger.StartNodeProcessWithInspect(exe: nodePath, script: script, dir: workingDir, env: env, interpreterOptions: interpreterOptions, debugOptions: debugOptions);\nprocess.Start();\n@@ -166,7 +160,15 @@ namespace Microsoft.NodejsTools.Project\nAttachDebugger(dbgInfo);\n- if (startBrowser && uri != null)\n+ if (startBrowser)\n+ {\n+ Uri uri = null;\n+ if (!String.IsNullOrWhiteSpace(url))\n+ {\n+ uri = new Uri(url);\n+ }\n+\n+ if (uri != null)\n{\nOnPortOpenedHandler.CreateHandler(\nuri.Port,\n@@ -178,6 +180,7 @@ namespace Microsoft.NodejsTools.Project\n);\n}\n}\n+ }\nprivate NodeDebugOptions GetDebugOptions()\n{\n@@ -379,10 +382,8 @@ namespace Microsoft.NodejsTools.Project\nvar visualStudioInstallationInstanceID = setupInstance.GetInstanceId();\n-\n-\n// The Node2Adapter depends on features only in Node v6+, so the old v5.4 version of node will not suffice for this scenario\n- var pathToNodeExe = Path.Combine(setupInstance.GetInstallationPath(), \"\\\\JavaScript\\\\Node.JS\\\\v6.4.0_x86\\\\Node.exe\");\n+ var pathToNodeExe = Path.Combine(setupInstance.GetInstallationPath(), \"JavaScript\\\\Node.JS\\\\v6.4.0_x86\\\\Node.exe\");\n// We check the registry to see if any parameters for the node.exe invocation have been specified (like \"--inspect\"), and append them if we find them.\nstring nodeParams = CheckForRegistrySpecifiedNodeParams();\n@@ -394,7 +395,8 @@ namespace Microsoft.NodejsTools.Project\nvar pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n$@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\extension\\out\\src\\nodeDebug.js\"\"\");\n- if (!File.Exists(pathToNode2DebugAdapterRuntime))\n+ string trimmedPathToNode2DebugAdapter = pathToNode2DebugAdapterRuntime.Replace(\"\\\"\", \"\");\n+ if (!File.Exists(trimmedPathToNode2DebugAdapter))\n{\npathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n$@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\out\\src\\nodeDebug.js\"\"\");\n@@ -402,7 +404,7 @@ namespace Microsoft.NodejsTools.Project\n// Here we need to massage the env variables into the format expected by node and vs code\n- string envVarsString = GetEnvironmentVariables().ToString();\n+ object envVars = GetEnvironmentVariables();\nvar cwd = _project.GetWorkingDirectory(); // Current working directory\nvar configuration = new JObject(\n@@ -412,7 +414,7 @@ namespace Microsoft.NodejsTools.Project\nnew JProperty(\"program\", program),\nnew JProperty(\"runtimeExecutable\", nodeRuntimeExecutable),\nnew JProperty(\"cwd\", cwd),\n- new JProperty(\"env\", envVarsString),\n+ new JProperty(\"env\", envVars),\nnew JProperty(\"diagnosticLogging\", CheckEnableDiagnosticLoggingOption()),\nnew JProperty(\"sourceMaps\", true),\nnew JProperty(\"stopOnEntry\", true),\n@@ -436,12 +438,26 @@ namespace Microsoft.NodejsTools.Project\ndebugger.LaunchDebugTargets4(1, debugTargets, processInfo);\n// Launch browser\n+ if (startBrowser)\n+ {\nvar webBrowserUrl = GetFullUrl();\nUri uri = null;\nif (!String.IsNullOrWhiteSpace(webBrowserUrl))\n{\nuri = new Uri(webBrowserUrl);\n- psi.EnvironmentVariables[\"PORT\"] = uri.Port.ToString();\n+ }\n+\n+ if (uri != null)\n+ {\n+ OnPortOpenedHandler.CreateHandler(\n+ uri.Port,\n+ shortCircuitPredicate: () => false,\n+ action: () =>\n+ {\n+ VsShellUtilities.OpenBrowser(webBrowserUrl, (uint)__VSOSPFLAGS.OSP_LaunchNewBrowser);\n+ }\n+ );\n+ }\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixes for PZ<->NTVS integration bugs, and making PZ the default (opt out by specifying V1)
|
410,224 |
05.05.2017 15:00:05
| 25,200 |
2b26a09b4ea40c24b9615b3e142f2640472c36cf
|
In response to PR suggestions from Paul, I added an explanatory comment about the debug node path, and I removed some extra blank lines I had inadvertently added.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -383,6 +383,7 @@ namespace Microsoft.NodejsTools.Project\nvar visualStudioInstallationInstanceID = setupInstance.GetInstanceId();\n// The Node2Adapter depends on features only in Node v6+, so the old v5.4 version of node will not suffice for this scenario\n+ // This node.exe will be the one used by the node2 debug adapter, not the one used to host the user code.\nvar pathToNodeExe = Path.Combine(setupInstance.GetInstallationPath(), \"JavaScript\\\\Node.JS\\\\v6.4.0_x86\\\\Node.exe\");\n// We check the registry to see if any parameters for the node.exe invocation have been specified (like \"--inspect\"), and append them if we find them.\n@@ -402,7 +403,6 @@ namespace Microsoft.NodejsTools.Project\n$@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\out\\src\\nodeDebug.js\"\"\");\n}\n-\n// Here we need to massage the env variables into the format expected by node and vs code\nobject envVars = GetEnvironmentVariables();\n@@ -459,8 +459,6 @@ namespace Microsoft.NodejsTools.Project\n);\n}\n}\n-\n-\n}\nprivate void LaunchDebugger(IServiceProvider provider, VsDebugTargetInfo dbgInfo)\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
In response to PR suggestions from Paul, I added an explanatory comment about the debug node path, and I removed some extra blank lines I had inadvertently added.
|
410,217 |
08.05.2017 12:52:17
| 25,200 |
3352dc633fddf7ece1d05ab7f135d4b839310a15
|
Inlcude v1.3 branch in appveyor script.
|
[
{
"change_type": "MODIFY",
"old_path": "appveyor.yml",
"new_path": "appveyor.yml",
"diff": "except:\n- v1.1.x\n- v1.2.x\n+ - v1.3.x\nskip_tags: true\nimage: Visual Studio 2015\nenvironment:\n- path: NTVS_Out\nname: NtvsOut\ntype: zip\n+-\n+ version: 1.0.{build}\n+ branches:\n+ only:\n+ - v1.3.x\n+ skip_tags: true\n+ image: Visual Studio 2015\n+ environment:\n+ matrix:\n+ - nodejs_version: 6\n+ vs_version: 14.0\n+ architecture: x64\n+ - nodejs_version: 7\n+ vs_version: 14.0\n+ architecture: x86\n+ install: *default_install_script\n+ build_script: *default_build_script\n+ test_script: *default_test_script\n+ artifacts: *default_artifacts\n-\nversion: 1.0.{build}\nbranches:\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Inlcude v1.3 branch in appveyor script.
|
410,217 |
08.05.2017 12:56:18
| 25,200 |
268a5d053e13b23ed8b8abb30da8deee0ebf110c
|
Move appveyor for master to LTS and Stable
|
[
{
"change_type": "MODIFY",
"old_path": "appveyor.yml",
"new_path": "appveyor.yml",
"diff": "image: Visual Studio 2015\nenvironment:\nmatrix:\n- - nodejs_version: 4\n+ - nodejs_version: Stable\nvs_version: 14.0\narchitecture: x64\n- - nodejs_version: 5\n+ - nodejs_version: LTS\nvs_version: 14.0\narchitecture: x86\ninstall: &default_install_script\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Move appveyor for master to LTS and Stable
|
410,217 |
08.05.2017 16:01:32
| 25,200 |
0b3a9cc290f103b6e065291974591c4bf56b5d2f
|
Add the 'debug' typings to the Express templates.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\serve-static.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\mine.typings.json\" />\n+ <TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\debug.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\express-serve-static-core.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\express.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\serve-static.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\mine.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\typings.json\" />\n+ <TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\debug.typings.json\" />\n<ZipItem Include=\"Templates\\Files\\EmptyJson\\EmptyJson.json\" />\n<ZipItem Include=\"Templates\\Files\\EmptyLess\\EmptyLess.less\" />\n<ZipItem Include=\"Templates\\Files\\EmptyPug\\EmptyPug.pug\" />\n<ItemGroup>\n<ZipItem Include=\"Templates\\Files\\EmptyTs\\EmptyTs.ts\" />\n</ItemGroup>\n+ <ItemGroup>\n+ <TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\debug.d.ts\" />\n+ <TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\debug.d.ts\" />\n+ </ItemGroup>\n<PropertyGroup>\n<!--\nTo specify a different registry root to register your package, uncomment the TargetRegistryRoot\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate",
"diff": "<ProjectItem TargetFileName=\"index.d.ts\">serve-static.d.ts</ProjectItem>\n<ProjectItem TargetFileName=\"typings.json\">serve-static.typings.json</ProjectItem>\n</Folder>\n+ <Folder Name=\"debug\">\n+ <ProjectItem TargetFileName=\"index.d.ts\">debug.d.ts</ProjectItem>\n+ <ProjectItem TargetFileName=\"typings.json\">debug.typings.json</ProjectItem>\n+ </Folder>\n</Folder>\n</Folder>\n<ProjectItem OpenInEditor=\"true\">app.ts</ProjectItem>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.d.ts",
"diff": "+// Generated by typings\n+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts\n+declare var debug: debug.IDebug;\n+\n+// Support AMD require\n+declare module 'debug' {\n+ export = debug;\n+}\n+\n+declare namespace debug {\n+ export interface IDebug {\n+ (namespace: string): debug.IDebugger,\n+ coerce: (val: any) => any,\n+ disable: () => void,\n+ enable: (namespaces: string) => void,\n+ enabled: (namespaces: string) => boolean,\n+\n+ names: string[],\n+ skips: string[],\n+\n+ formatters: IFormatters\n+ }\n+\n+ export interface IFormatters {\n+ [formatter: string]: Function\n+ }\n+\n+ export interface IDebugger {\n+ (formatter: any, ...args: any[]): void;\n+\n+ enabled: boolean;\n+ log: Function;\n+ namespace: string;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/debug.typings.json",
"diff": "+{\n+ \"resolution\": \"main\",\n+ \"tree\": {\n+ \"src\": \"https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts\",\n+ \"raw\": \"registry:dt/debug#0.0.0+20160317120654\",\n+ \"typings\": \"https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts\"\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/typings.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/typings.json",
"diff": "{\n- \"dependencies\": {},\n\"globalDependencies\": {\n- \"express\": \"registry:dt/express#4.0.0+20160708185218\",\n- \"express-serve-static-core\": \"registry:dt/express-serve-static-core#4.0.0+20160829034835\",\n+ \"body-parser\": \"registry:dt/body-parser#0.0.0+20160317120654\",\n+ \"cookie-parser\": \"registry:dt/cookie-parser#1.3.4+20160316155526\",\n+ \"debug\": \"registry:dt/debug#0.0.0+20160317120654\",\n+ \"express\": \"registry:dt/express#4.0.0+20160317120654\",\n+ \"express-serve-static-core\": \"registry:dt/express-serve-static-core#0.0.0+20160602151406\",\n\"mime\": \"registry:dt/mime#0.0.0+20160316155526\",\n+ \"morgan\": \"registry:dt/morgan#1.7.0+20160524142355\",\n+ \"serve-favicon\": \"registry:dt/serve-favicon#0.0.0+20160316155526\",\n\"serve-static\": \"registry:dt/serve-static#0.0.0+20160606155157\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate",
"diff": "<ProjectItem TargetFileName=\"index.d.ts\">serve-static.d.ts</ProjectItem>\n<ProjectItem TargetFileName=\"typings.json\">serve-static.typings.json</ProjectItem>\n</Folder>\n+ <Folder Name=\"debug\">\n+ <ProjectItem TargetFileName=\"index.d.ts\">debug.d.ts</ProjectItem>\n+ <ProjectItem TargetFileName=\"typings.json\">debug.typings.json</ProjectItem>\n+ </Folder>\n</Folder>\n</Folder>\n<ProjectItem OpenInEditor=\"true\">app.ts</ProjectItem>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/debug.d.ts",
"diff": "+// Generated by typings\n+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts\n+declare var debug: debug.IDebug;\n+\n+// Support AMD require\n+declare module 'debug' {\n+ export = debug;\n+}\n+\n+declare namespace debug {\n+ export interface IDebug {\n+ (namespace: string): debug.IDebugger,\n+ coerce: (val: any) => any,\n+ disable: () => void,\n+ enable: (namespaces: string) => void,\n+ enabled: (namespaces: string) => boolean,\n+\n+ names: string[],\n+ skips: string[],\n+\n+ formatters: IFormatters\n+ }\n+\n+ export interface IFormatters {\n+ [formatter: string]: Function\n+ }\n+\n+ export interface IDebugger {\n+ (formatter: any, ...args: any[]): void;\n+\n+ enabled: boolean;\n+ log: Function;\n+ namespace: string;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/debug.typings.json",
"diff": "+{\n+ \"resolution\": \"main\",\n+ \"tree\": {\n+ \"src\": \"https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts\",\n+ \"raw\": \"registry:dt/debug#0.0.0+20160317120654\",\n+ \"typings\": \"https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/debug/debug.d.ts\"\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/typings.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/typings.json",
"diff": "{\n- \"dependencies\": {},\n\"globalDependencies\": {\n- \"express\": \"registry:dt/express#4.0.0+20160708185218\",\n- \"express-serve-static-core\": \"registry:dt/express-serve-static-core#4.0.0+20160829034835\",\n+ \"body-parser\": \"registry:dt/body-parser#0.0.0+20160317120654\",\n+ \"cookie-parser\": \"registry:dt/cookie-parser#1.3.4+20160316155526\",\n+ \"debug\": \"registry:dt/debug#0.0.0+20160317120654\",\n+ \"express\": \"registry:dt/express#4.0.0+20160317120654\",\n+ \"express-serve-static-core\": \"registry:dt/express-serve-static-core#0.0.0+20160602151406\",\n\"mime\": \"registry:dt/mime#0.0.0+20160316155526\",\n+ \"morgan\": \"registry:dt/morgan#1.7.0+20160524142355\",\n+ \"serve-favicon\": \"registry:dt/serve-favicon#0.0.0+20160316155526\",\n\"serve-static\": \"registry:dt/serve-static#0.0.0+20160606155157\"\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add the 'debug' typings to the Express templates.
|
410,217 |
08.05.2017 17:06:32
| 25,200 |
4edb663ab20d2fe6a0df24a01a147fb9fa3524ea
|
Url Encode the filter text for the NPM query
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/IPackageCatalog.cs",
"new_path": "Nodejs/Product/Npm/IPackageCatalog.cs",
"diff": "@@ -50,8 +50,7 @@ namespace Microsoft.NodejsTools.Npm {\n// All exceptions thrown here and in the called methods are handled by the\n// NPM search dialog, so we don't have to do any exception handling here.\n-\n- var relativeUri = string.Format(\"/-/v1/search?text={0}\", filterText);\n+ var relativeUri = string.Format(\"/-/v1/search?text={0}\", WebUtility.UrlEncode(filterText));\nvar searchUri = new Uri(defaultRegistryUri, relativeUri);\nvar request = WebRequest.Create(searchUri);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Url Encode the filter text for the NPM query
|
410,217 |
09.05.2017 10:35:05
| 25,200 |
757aeb66c052af8b8b317c58ab3f5f2cbd9add4e
|
Make the threading in the NPM worker more straight forward.
Fix typo in comment
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"diff": "// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.Collections.Concurrent;\nusing System.Collections.Generic;\n+using System.Diagnostics;\nusing System.IO;\nusing System.Linq;\nusing System.Net;\n@@ -19,14 +21,11 @@ namespace Microsoft.NodejsTools.NpmUI\nprivate static readonly Uri defaultRegistryUri = new Uri(\"https://registry.npmjs.org/\");\nprivate readonly INpmController npmController;\n- private readonly Queue<QueuedNpmCommandInfo> commandQueue = new Queue<QueuedNpmCommandInfo>();\n- private readonly object queuelock = new object();\n+ private readonly BlockingCollection<QueuedNpmCommandInfo> commandQueue = new BlockingCollection<QueuedNpmCommandInfo>();\n+ private readonly Thread worker;\nprivate bool isDisposed;\n- private bool isExecutingCommand;\n- private readonly Thread worker;\nprivate QueuedNpmCommandInfo currentCommand;\n- private INpmCommander commander;\npublic NpmWorker(INpmController controller)\n{\n@@ -34,112 +33,63 @@ namespace Microsoft.NodejsTools.NpmUI\nthis.worker = new Thread(this.Run)\n{\n- Name = \"npm worker Execution\",\n+ Name = \"NPM worker Execution\",\nIsBackground = true\n};\nthis.worker.Start();\n}\n- private void Pulse()\n- {\n- lock (this.queuelock)\n- {\n- Monitor.PulseAll(this.queuelock);\n- }\n- }\n-\n- public bool IsExecutingCommand\n- {\n- get\n- {\n- lock (this.queuelock)\n- {\n- return this.isExecutingCommand;\n- }\n- }\n- set\n- {\n- lock (this.queuelock)\n- {\n- this.isExecutingCommand = value;\n- Pulse();\n- }\n- }\n- }\n-\nprivate void QueueCommand(QueuedNpmCommandInfo info)\n{\n- lock (this.queuelock)\n- {\n- if (this.commandQueue.Contains(info)\n+ if (!this.commandQueue.IsAddingCompleted\n+ || this.commandQueue.Contains(info)\n|| info.Equals(this.currentCommand))\n{\nreturn;\n}\n- this.commandQueue.Enqueue(info);\n- Monitor.PulseAll(this.queuelock);\n- }\n+\n+ this.commandQueue.Add(info);\n}\npublic void QueueCommand(string arguments)\n{\n- QueueCommand(new QueuedNpmCommandInfo(arguments));\n+ // this is safe since the we use a blocking collection to\n+ // store the commands\n+ this.QueueCommand(new QueuedNpmCommandInfo(arguments));\n}\n- private async void Execute(QueuedNpmCommandInfo info)\n+ private void Execute(QueuedNpmCommandInfo info)\n{\n- this.IsExecutingCommand = true;\n- INpmCommander cmdr = null;\n+ // Wait on the command to complete.\n+ // this way we're sure there's only one command being executed,\n+ // since the only thread starting this commands is the worker thread\n+ Debug.Assert(Thread.CurrentThread == this.worker, \"The worked thread should be executing the NPM commands.\");\n+\n+ var cmdr = this.npmController.CreateNpmCommander();\ntry\n{\n- lock (this.queuelock)\n- {\n- cmdr = this.npmController.CreateNpmCommander();\n-\n- this.commander = cmdr;\n- }\n-\n- await cmdr.ExecuteNpmCommandAsync(info.Arguments);\n+ cmdr.ExecuteNpmCommandAsync(info.Arguments).Wait();\n}\n- finally\n+ catch (AggregateException e) when (e.InnerException is TaskCanceledException)\n{\n- lock (this.queuelock)\n- {\n- this.commander = null;\n- }\n- this.IsExecutingCommand = false;\n+ // TaskCanceledException is not un-expected,\n+ // and should not tear down this thread.\n+ // Other exceptions are handled higher up the stack.\n}\n}\nprivate void Run()\n{\n- var count = 0;\n// We want the thread to continue running queued commands before\n// exiting so the user can close the install window without having to wait\n// for commands to complete.\n- while (!this.isDisposed || count > 0)\n- {\n- lock (this.queuelock)\n- {\n- while ((this.commandQueue.Count == 0 && !this.isDisposed)\n- || this.npmController == null\n- || this.IsExecutingCommand)\n- {\n- Monitor.Wait(this.queuelock);\n- }\n-\n- if (this.commandQueue.Count > 0)\n+ while (!this.isDisposed && !this.commandQueue.IsCompleted)\n{\n- this.currentCommand = this.commandQueue.Dequeue();\n- }\n- else\n- {\n- this.currentCommand = null;\n- }\n- count = this.commandQueue.Count;\n- }\n-\n- if (null != this.currentCommand)\n+ // The Take method will block the worker thread when there are no items left in the queue\n+ // and the thread will be signalled when new items are items to the queue, or the queue is\n+ // marked completed.\n+ this.currentCommand = this.commandQueue.Take();\n+ if (this.currentCommand != null)\n{\nExecute(this.currentCommand);\n}\n@@ -148,7 +98,12 @@ namespace Microsoft.NodejsTools.NpmUI\npublic async Task<IEnumerable<IPackage>> GetCatalogPackagesAsync(string filterText)\n{\n- var relativeUri = string.Format(\"/-/v1/search?text={0}\", filterText);\n+ if (string.IsNullOrWhiteSpace(filterText))\n+ {\n+ return Enumerable.Empty<IPackage>();\n+ }\n+\n+ var relativeUri = string.Format(\"/-/v1/search?text={0}\", WebUtility.UrlEncode(filterText));\nvar searchUri = new Uri(defaultRegistryUri, relativeUri);\nvar request = WebRequest.Create(searchUri);\n@@ -286,19 +241,18 @@ namespace Microsoft.NodejsTools.NpmUI\npublic void Dispose()\n{\n+ this.commandQueue.CompleteAdding();\nthis.isDisposed = true;\n- Pulse();\n}\nprivate sealed class QueuedNpmCommandInfo\n{\npublic QueuedNpmCommandInfo(string arguments)\n{\n- this.Name = arguments;\n+ this.Arguments = arguments;\n}\n- public string Arguments => this.Name;\n- public string Name { get; }\n+ public string Arguments { get; }\npublic bool Equals(QueuedNpmCommandInfo other)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/SPI/NpmController.cs",
"new_path": "Nodejs/Product/Npm/SPI/NpmController.cs",
"diff": "@@ -240,7 +240,7 @@ namespace Microsoft.NodejsTools.Npm.SPI\n{\nstring path = e.FullPath;\n- // Check that the file is either a package.json file, or exists in the nodemodules directory\n+ // Check that the file is either a package.json file, or exists in the node_modules directory\n// This allows us to properly detect both installed and uninstalled/linked packages (where we don't receive an event for package.json)\nif (path.EndsWith(\"package.json\", StringComparison.OrdinalIgnoreCase) || path.IndexOf(NodejsConstants.NodeModulesFolder, StringComparison.OrdinalIgnoreCase) != -1)\n{\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Make the threading in the NPM worker more straight forward.
Fix typo in comment
|
410,204 |
09.05.2017 09:16:51
| 25,200 |
06a6c7d4338b5bd4e7a5e71c73819875f1a4f1ba
|
Now WebKit V2 debugger will launch the Node process in an external terminal
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -404,7 +404,8 @@ namespace Microsoft.NodejsTools.Project\n}\n// Here we need to massage the env variables into the format expected by node and vs code\n- object envVars = GetEnvironmentVariables();\n+ var webBrowserUrl = GetFullUrl();\n+ var envVars = GetEnvironmentVariables(webBrowserUrl);\nvar cwd = _project.GetWorkingDirectory(); // Current working directory\nvar configuration = new JObject(\n@@ -414,7 +415,8 @@ namespace Microsoft.NodejsTools.Project\nnew JProperty(\"program\", program),\nnew JProperty(\"runtimeExecutable\", nodeRuntimeExecutable),\nnew JProperty(\"cwd\", cwd),\n- new JProperty(\"env\", envVars),\n+ new JProperty(\"console\", \"externalTerminal\"),\n+ new JProperty(\"env\", JObject.FromObject(envVars)),\nnew JProperty(\"diagnosticLogging\", CheckEnableDiagnosticLoggingOption()),\nnew JProperty(\"sourceMaps\", true),\nnew JProperty(\"stopOnEntry\", true),\n@@ -440,7 +442,6 @@ namespace Microsoft.NodejsTools.Project\n// Launch browser\nif (startBrowser)\n{\n- var webBrowserUrl = GetFullUrl();\nUri uri = null;\nif (!String.IsNullOrWhiteSpace(webBrowserUrl))\n{\n@@ -552,6 +553,26 @@ namespace Microsoft.NodejsTools.Project\n}\nprivate string GetEnvironmentVariablesString(string url)\n+ {\n+ var env = GetEnvironmentVariables(url);\n+ if (env.Count > 0)\n+ {\n+ //Environment variables should be passed as a\n+ //null-terminated block of null-terminated strings.\n+ //Each string is in the following form:name=value\\0\n+ var buf = new StringBuilder();\n+ foreach (var entry in env)\n+ {\n+ buf.AppendFormat(\"{0}={1}\\0\", entry.Key, entry.Value);\n+ }\n+ buf.Append(\"\\0\");\n+ return buf.ToString();\n+ }\n+\n+ return null;\n+ }\n+\n+ private Dictionary<string, string> GetEnvironmentVariables(string url)\n{\nvar env = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);\nif (!string.IsNullOrWhiteSpace(url))\n@@ -577,20 +598,9 @@ namespace Microsoft.NodejsTools.Project\nenv.Add(strKey, (string)variables[key]);\n}\n}\n-\n- //Environment variables should be passed as a\n- //null-terminated block of null-terminated strings.\n- //Each string is in the following form:name=value\\0\n- var buf = new StringBuilder();\n- foreach (var entry in env)\n- {\n- buf.AppendFormat(\"{0}={1}\\0\", entry.Key, entry.Value);\n- }\n- buf.Append(\"\\0\");\n- return buf.ToString();\n}\n- return null;\n+ return env;\n}\nprivate bool ShouldStartBrowser()\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Now WebKit V2 debugger will launch the Node process in an external terminal
|
410,217 |
09.05.2017 13:21:01
| 25,200 |
884b6f50b57edbb706b014fc19ad498d1f77846c
|
Cleanup of typings.json in Express templates for TypeScript
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\express.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\serve-static.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\typings.json\" />\n- <TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\mine.typings.json\" />\n+ <TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\mime.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\debug.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\express-serve-static-core.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\express.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\serve-static.typings.json\" />\n- <TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\mine.typings.json\" />\n+ <TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\mime.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptAzureExpressApp\\debug.typings.json\" />\n<ZipItem Include=\"Templates\\Files\\EmptyJson\\EmptyJson.json\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj",
"diff": "<TypeScriptCompile Include=\"app.ts\" />\n<TypeScriptCompile Include=\"routes\\index.ts\" />\n<TypeScriptCompile Include=\"routes\\user.ts\" />\n+ <TypeScriptCompile Include=\"typings\\globals\\debug\\index.d.ts\" />\n<TypeScriptCompile Include=\"typings\\globals\\express\\index.d.ts\" />\n<TypeScriptCompile Include=\"typings\\globals\\express-serve-static-core\\index.d.ts\" />\n<TypeScriptCompile Include=\"typings\\globals\\mime\\index.d.ts\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.vstemplate",
"diff": "</Folder>\n<Folder Name=\"mime\">\n<ProjectItem TargetFileName=\"index.d.ts\">mime.d.ts</ProjectItem>\n- <ProjectItem TargetFileName=\"typings.json\">mine.typings.json</ProjectItem>\n+ <ProjectItem TargetFileName=\"typings.json\">mime.typings.json</ProjectItem>\n</Folder>\n<Folder Name=\"serve-static\">\n<ProjectItem TargetFileName=\"index.d.ts\">serve-static.d.ts</ProjectItem>\n"
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/mine.typings.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/mime.typings.json",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/typings.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/typings.json",
"diff": "{\n\"globalDependencies\": {\n- \"body-parser\": \"registry:dt/body-parser#0.0.0+20160317120654\",\n- \"cookie-parser\": \"registry:dt/cookie-parser#1.3.4+20160316155526\",\n\"debug\": \"registry:dt/debug#0.0.0+20160317120654\",\n\"express\": \"registry:dt/express#4.0.0+20160317120654\",\n\"express-serve-static-core\": \"registry:dt/express-serve-static-core#0.0.0+20160602151406\",\n\"mime\": \"registry:dt/mime#0.0.0+20160316155526\",\n- \"morgan\": \"registry:dt/morgan#1.7.0+20160524142355\",\n- \"serve-favicon\": \"registry:dt/serve-favicon#0.0.0+20160316155526\",\n\"serve-static\": \"registry:dt/serve-static#0.0.0+20160606155157\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj",
"diff": "<TypeScriptCompile Include=\"app.ts\" />\n<TypeScriptCompile Include=\"routes\\index.ts\" />\n<TypeScriptCompile Include=\"routes\\user.ts\" />\n+ <TypeScriptCompile Include=\"typings\\globals\\debug\\index.d.ts\" />\n<TypeScriptCompile Include=\"typings\\globals\\express\\index.d.ts\" />\n<TypeScriptCompile Include=\"typings\\globals\\express-serve-static-core\\index.d.ts\" />\n<TypeScriptCompile Include=\"typings\\globals\\mime\\index.d.ts\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate",
"diff": "</Folder>\n<Folder Name=\"mime\">\n<ProjectItem TargetFileName=\"index.d.ts\">mime.d.ts</ProjectItem>\n- <ProjectItem TargetFileName=\"typings.json\">mine.typings.json</ProjectItem>\n+ <ProjectItem TargetFileName=\"typings.json\">mime.typings.json</ProjectItem>\n</Folder>\n<Folder Name=\"serve-static\">\n<ProjectItem TargetFileName=\"index.d.ts\">serve-static.d.ts</ProjectItem>\n"
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/mine.typings.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/mime.typings.json",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/typings.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/typings.json",
"diff": "{\n\"globalDependencies\": {\n- \"body-parser\": \"registry:dt/body-parser#0.0.0+20160317120654\",\n- \"cookie-parser\": \"registry:dt/cookie-parser#1.3.4+20160316155526\",\n\"debug\": \"registry:dt/debug#0.0.0+20160317120654\",\n\"express\": \"registry:dt/express#4.0.0+20160317120654\",\n\"express-serve-static-core\": \"registry:dt/express-serve-static-core#0.0.0+20160602151406\",\n\"mime\": \"registry:dt/mime#0.0.0+20160316155526\",\n- \"morgan\": \"registry:dt/morgan#1.7.0+20160524142355\",\n- \"serve-favicon\": \"registry:dt/serve-favicon#0.0.0+20160316155526\",\n\"serve-static\": \"registry:dt/serve-static#0.0.0+20160606155157\"\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Cleanup of typings.json in Express templates for TypeScript
|
410,217 |
09.05.2017 13:58:57
| 25,200 |
52f001bfe8e8f5f32d3254eb1c3f9696a2f9214b
|
Fix the names and descriptions for the project templates
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/CloudService/CloudService.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/CloudService/CloudService.vstemplate",
"diff": "<VSTemplate Version=\"3.0.0\" Type=\"Project\" xmlns=\"http://schemas.microsoft.com/developer/vstemplate/2005\">\n<TemplateData>\n<Name Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3065\"/>\n- <Description Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3067\"/>\n+ <Description Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3066\"/>\n<ProjectType>JavaScript</ProjectType>\n<TemplateGroupID>CloudServiceProject</TemplateGroupID>\n<TemplateID>Microsoft.CloudServiceProject.CloudService_js</TemplateID>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate",
"diff": "<VSTemplate Version=\"3.0.0\" Type=\"Project\" xmlns=\"http://schemas.microsoft.com/developer/vstemplate/2005\">\n<TemplateData>\n- <Name Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3066\"/>\n+ <Name Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3067\"/>\n<Description Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3068\"/>\n<Icon Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"406\"/>\n<ProjectType>JavaScript</ProjectType>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.vstemplate",
"diff": "<VSTemplate Version=\"3.0.0\" Type=\"Project\" xmlns=\"http://schemas.microsoft.com/developer/vstemplate/2005\">\n<TemplateData>\n- <Name Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3080\"/>\n+ <Name Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3081\"/>\n<Description Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3082\"/>\n<Icon Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"410\"/>\n<ProjectType>TypeScript</ProjectType>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/VSPackage.resx",
"new_path": "Nodejs/Product/Nodejs/VSPackage.resx",
"diff": "<value>A TypeScript Tape UnitTest file</value>\n</data>\n<data name=\"3059\" xml:space=\"preserve\">\n- <value>Basic Azure Node.js Express 4 Application</value>\n+ <value>Node.js Express 4 Application for Microsoft Azure</value>\n</data>\n<data name=\"3060\" xml:space=\"preserve\">\n- <value>A basic Node.js Express 4 application for Microsoft Azure.</value>\n+ <value>A Node.js Express 4 application for Microsoft Azure.</value>\n</data>\n<data name=\"3061\" xml:space=\"preserve\">\n- <value>Blank Azure Node.js Web Application</value>\n+ <value>Node.js Web Application for Microsoft Azure</value>\n</data>\n<data name=\"3062\" xml:space=\"preserve\">\n<value>An empty Node.js application for Microsoft Azure.</value>\n</data>\n<data name=\"3063\" xml:space=\"preserve\">\n- <value>Blank Azure Node.js Worker Role</value>\n+ <value>Node.js Worker Role for Microsoft Azure</value>\n</data>\n<data name=\"3064\" xml:space=\"preserve\">\n<value>An empty Node.js worker role for Microsoft Azure.</value>\n<value>A project for creating a scalable service that runs on Microsoft Azure.</value>\n</data>\n<data name=\"3067\" xml:space=\"preserve\">\n- <value>Basic Node.js Express 4 Application.</value>\n+ <value>Node.js Express 4 Application</value>\n</data>\n<data name=\"3068\" xml:space=\"preserve\">\n<value>A basic Node.js Express 4 application.</value>\n<value>Creates a new Node.js project from existing code.</value>\n</data>\n<data name=\"3071\" xml:space=\"preserve\">\n- <value>Blank Node.js Console Application</value>\n+ <value>Node.js Console Application</value>\n</data>\n<data name=\"3072\" xml:space=\"preserve\">\n<value>An empty Node.js application.</value>\n</data>\n<data name=\"3073\" xml:space=\"preserve\">\n- <value>Blank Node.js Web Application</value>\n+ <value>Node.js Web Application</value>\n</data>\n<data name=\"3074\" xml:space=\"preserve\">\n<value>An empty Node.js Web application.</value>\n</data>\n<data name=\"3075\" xml:space=\"preserve\">\n- <value>Basic Azure Node.js Express 4 Application</value>\n+ <value>Node.js Express 4 Application for Microsoft Azure</value>\n</data>\n<data name=\"3076\" xml:space=\"preserve\">\n<value>A basic Node.js Express 4 application for Microsoft Azure.</value>\n</data>\n<data name=\"3077\" xml:space=\"preserve\">\n- <value>Blank Azure Node.js Worker Role</value>\n+ <value>Node.js Worker Role for Microsoft Azure</value>\n</data>\n<data name=\"3078\" xml:space=\"preserve\">\n<value>An empty Node.js worker role for Microsoft Azure.</value>\n</data>\n<data name=\"3079\" xml:space=\"preserve\">\n- <value>Blank Azure Node.js Worker Role</value>\n+ <value>Azure Node.js Worker Role</value>\n</data>\n<data name=\"3080\" xml:space=\"preserve\">\n<value>An empty Node.js worker role for Microsoft Azure.</value>\n</data>\n<data name=\"3081\" xml:space=\"preserve\">\n- <value>Blank Azure Node.js Web Application</value>\n+ <value>Node.js Web Application for Microsoft Azure</value>\n</data>\n<data name=\"3082\" xml:space=\"preserve\">\n<value>An empty Node.js application for Microsoft Azure.</value>\n</data>\n<data name=\"3083\" xml:space=\"preserve\">\n- <value>Blank Azure Node.js Web Application</value>\n+ <value>Node.js Web Application for Microsoft Azure</value>\n</data>\n<data name=\"3084\" xml:space=\"preserve\">\n- <value>An empty Node.js application for Microsoft Azure.</value>\n+ <value>An empty Node.js web application for Microsoft Azure.</value>\n</data>\n<data name=\"3085\" xml:space=\"preserve\">\n- <value>Blank Node.js Console Application</value>\n+ <value>Node.js Console Application</value>\n</data>\n<data name=\"3086\" xml:space=\"preserve\">\n<value>An empty Node.js application.</value>\n</data>\n<data name=\"3087\" xml:space=\"preserve\">\n- <value>Basic Node.js Express 4 Application</value>\n+ <value>Node.js Express 4 Application</value>\n</data>\n<data name=\"3088\" xml:space=\"preserve\">\n<value>A basic Node.js Express 4 application.</value>\n<value>Creates a new Node.js project from existing code.</value>\n</data>\n<data name=\"3091\" xml:space=\"preserve\">\n- <value>Blank Node.js Web Application</value>\n+ <value>Node.js Web Application</value>\n</data>\n<data name=\"3092\" xml:space=\"preserve\">\n<value>An empty Node.js application.</value>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix the names and descriptions for the project templates
|
410,217 |
09.05.2017 15:46:33
| 25,200 |
2f70cb49540c8044361a4c6bade5cabaee4fcef0
|
PR feedback
Added comment about the shape of the expected json object
Removed unused field
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"diff": "@@ -18,13 +18,13 @@ namespace Microsoft.NodejsTools.NpmUI\n{\ninternal sealed class NpmWorker : IDisposable\n{\n+ // todo: get this from a user specified location?\nprivate static readonly Uri defaultRegistryUri = new Uri(\"https://registry.npmjs.org/\");\nprivate readonly INpmController npmController;\nprivate readonly BlockingCollection<QueuedNpmCommandInfo> commandQueue = new BlockingCollection<QueuedNpmCommandInfo>();\nprivate readonly Thread worker;\n- private bool isDisposed;\nprivate QueuedNpmCommandInfo currentCommand;\npublic NpmWorker(INpmController controller)\n@@ -83,7 +83,7 @@ namespace Microsoft.NodejsTools.NpmUI\n// We want the thread to continue running queued commands before\n// exiting so the user can close the install window without having to wait\n// for commands to complete.\n- while (!this.isDisposed && !this.commandQueue.IsCompleted)\n+ while (!this.commandQueue.IsCompleted)\n{\n// The Take method will block the worker thread when there are no items left in the queue\n// and the thread will be signalled when new items are items to the queue, or the queue is\n@@ -109,6 +109,54 @@ namespace Microsoft.NodejsTools.NpmUI\nvar request = WebRequest.Create(searchUri);\nusing (var response = await request.GetResponseAsync())\n{\n+ /* We expect the following response:\n+ {\n+ \"objects\": [\n+ {\n+ \"package\": {\n+ \"name\": \"express\",\n+ \"scope\": \"unscoped\",\n+ \"version\": \"4.15.2\",\n+ \"description\": \"Fast, unopinionated, minimalist web framework\",\n+ \"keywords\": [ \"express\", \"framework\", \"sinatra\", \"web\", \"rest\", \"restful\", \"router\", \"app\", \"api\" ],\n+ \"date\": \"2017-03-06T13:42:44.853Z\",\n+ \"links\": {\n+ \"npm\": \"https://www.npmjs.com/package/express\",\n+ \"homepage\": \"http://expressjs.com/\",\n+ \"repository\": \"https://github.com/expressjs/express\",\n+ \"bugs\": \"https://github.com/expressjs/express/issues\"\n+ },\n+ \"author\": {\n+ \"name\": \"TJ Holowaychuk\",\n+ \"email\": \"tj@vision-media.ca\"\n+ },\n+ \"publisher\": {\n+ \"username\": \"dougwilson\",\n+ \"email\": \"doug@somethingdoug.com\"\n+ },\n+ \"maintainers\": [\n+ {\n+ \"username\": \"dougwilson\",\n+ \"email\": \"doug@somethingdoug.com\"\n+ }\n+ ]\n+ },\n+ \"score\": {\n+ \"final\": 0.9549640105248649,\n+ \"detail\": {\n+ \"quality\": 0.9427473299991661,\n+ \"popularity\": 0.9496544159654299,\n+ \"maintenance\": 0.9707450455348992\n+ }\n+ },\n+ \"searchScore\": 100000.95\n+ }\n+ ],\n+ \"total\": 10991,\n+ \"time\": \"Tue May 09 2017 22:41:07 GMT+0000 (UTC)\"\n+ }\n+ */\n+\nvar reader = new StreamReader(response.GetResponseStream());\nusing (var jsonReader = new JsonTextReader(reader))\n{\n@@ -143,7 +191,7 @@ namespace Microsoft.NodejsTools.NpmUI\nswitch (jsonReader.TokenType)\n{\ncase JsonToken.PropertyName:\n- if (StringComparer.OrdinalIgnoreCase.Equals(jsonReader.Value, \"package\"))\n+ if (StringComparer.Ordinal.Equals(jsonReader.Value, \"package\"))\n{\nvar token = (JProperty)JToken.ReadFrom(jsonReader);\nvar package = ReadPackage(token.Value, builder);\n@@ -242,7 +290,6 @@ namespace Microsoft.NodejsTools.NpmUI\npublic void Dispose()\n{\nthis.commandQueue.CompleteAdding();\n- this.isDisposed = true;\n}\nprivate sealed class QueuedNpmCommandInfo\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
PR feedback
Added comment about the shape of the expected json object
Removed unused field
|
410,217 |
09.05.2017 17:09:46
| 25,200 |
a1a03b39ffd9ffc1784a53a63ae43cd6e6f00c24
|
Dynamically generate the version number
|
[
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.settings",
"new_path": "Build/Common.Build.settings",
"diff": "<PropertyGroup>\n<CodeAnalysisRuleSet>$(BuildRoot)\\Build\\xTVS.ruleset</CodeAnalysisRuleSet>\n</PropertyGroup>\n+\n+ <PropertyGroup>\n+ <MajorVersion>1</MajorVersion>\n+ <MinorVersion>4</MinorVersion>\n+\n+ <!-- This was reset for Dev15. It needs to eventually be reset to the current year for Dev16 -->\n+ <VersionZeroYear>2016</VersionZeroYear>\n+ </PropertyGroup>\n+\n+ <!-- BUILD_BUILDNUMBER is expected to be set by the build server.\n+ In case of a local build, we'll default to a very\n+ high number so that the locally built assembly is always picked -->\n+ <PropertyGroup Condition=\"'$(BUILD_BUILDNUMBER)' == ''\">\n+ <BuildVersion>42.42.42.42</BuildVersion>\n+ </PropertyGroup>\n+\n+ <PropertyGroup Condition=\"'$(BUILD_BUILDNUMBER)' != ''\">\n+ <VersionCurrentYearOffset>$([MSBuild]::Subtract($([System.Int32]::Parse($(BUILD_BUILDNUMBER.Substring(0,4)))),$(VersionZeroYear)))</VersionCurrentYearOffset>\n+ <VersionCurrentYearOffset Condition=\" '$(VersionCurrentYearOffset)' == '0' \"></VersionCurrentYearOffset>\n+\n+ <!-- Example version numbers generated by this scheme:\n+ Built on 4/6/2016, targeting Visual Studio 1.4: 1.4.0406.1\n+ Built on 12/6/2017, targeting Visual Studio 1.4: 1.4.11206.1\n+ Built on 4/6/2019, targeting Visual Studio 1.4: 1.4.30406.1 -->\n+ <BuildVersion>$(MajorVersion).$(MinorVersion).$(VersionCurrentYearOffset)$(BUILD_BUILDNUMBER.Substring(4))</BuildVersion>\n+ </PropertyGroup>\n+\n+ <PropertyGroup>\n+ <BuildVersionExtended>$(BuildVersion)</BuildVersionExtended>\n+ <BuildVersionExtended Condition=\"'$(BUILD_SOURCEVERSION)'!=''\">$(BuildVersionExtended) commit:$(BUILD_SOURCEVERSION)</BuildVersionExtended>\n+\n+ <VSIXBuildVersion>$(BuildVersion)</VSIXBuildVersion>\n+ <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>\n+ </PropertyGroup>\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.targets",
"new_path": "Build/Common.Build.targets",
"diff": "<Import Project=\"Common.Build.VSSDK.targets\" Condition=\"$(UseVSSDK) or $(UseVSSDKTemplateOnly)\" />\n<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\" Condition=\"'$(Language)' == 'C++'\" />\n<Import Project=\"Common.Build.Wix.targets\" Condition=\"'$(Language)' == 'WiX'\" />\n+ <Import Project=\"fileVersion.targets\" Condition=\"'$(Language)' == 'C#'\" />\n<!--\nTransforms ProjectReference2 items into references that will be built\n"
},
{
"change_type": "MODIFY",
"old_path": "Common/Product/TestAdapter/VisualStudioApp.cs",
"new_path": "Common/Product/TestAdapter/VisualStudioApp.cs",
"diff": "@@ -116,7 +116,7 @@ namespace Microsoft.VisualStudioTools\nprefix = \"VisualStudio\";\n}\n- var progId = $\"!{prefix}.DTE.{AssemblyVersionInfo.VSVersion}:{processId}\";\n+ var progId = $\"!{prefix}.DTE.15.0:{processId}\";\nobject runningObject = null;\nIBindCtx bindCtx = null;\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/AssemblyVersion.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System.Reflection;\n-\n-// If you get compiler errors CS0579, \"Duplicate '<attributename>' attribute\", check your\n-// Properties\\AssemblyInfo.cs file and remove any lines duplicating the ones below.\n-// (See also AssemblyInfoCommon.cs in this same directory.)\n-\n-#if !SUPPRESS_COMMON_ASSEMBLY_VERSION\n-[assembly: AssemblyVersion(AssemblyVersionInfo.StableVersion)]\n-#endif\n-[assembly: AssemblyFileVersion(AssemblyVersionInfo.Version)]\n-\n-internal class AssemblyVersionInfo\n-{\n- // This version string (and the comment for StableVersion) should be\n- // updated manually between major releases (e.g. from 1.0 to 2.0).\n- // Servicing branches and minor releases should retain the value.\n- public const string ReleaseVersion = \"1.0\";\n-\n- // This version string (and the comment for Version) should be updated\n- // manually between minor releases (e.g. from 1.0 to 1.1).\n- // Servicing branches and prereleases should retain the value.\n- public const string FileVersion = \"1.4\";\n-\n- // This version should never change from \"4100.00\"; BuildRelease.ps1\n- // will replace it with a generated value.\n- public const string BuildNumber = \"4100.00\";\n-\n- public const string VSMajorVersion = \"15\";\n- private const string VSVersionSuffix = \"2017\";\n-\n- public const string VSVersion = VSMajorVersion + \".0\";\n-\n- // Defaults to \"1.0.0.(2012|2013|2015)\"\n- public const string StableVersion = ReleaseVersion + \".0.\" + VSVersionSuffix;\n-\n- // Defaults to \"1.3.4100.00\"\n- public const string Version = FileVersion + \".\" + BuildNumber;\n-}\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/InteractiveWindow/Properties/AssemblyInfo.cs",
"diff": "@@ -9,7 +9,7 @@ using Microsoft.VisualStudio.Shell;\n[assembly: AssemblyDescription(\"\")]\n[assembly: AssemblyConfiguration(\"\")]\n-[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.InteractiveWindow\", CodeBase = \"Microsoft.NodejsTools.InteractiveWindow.dll\", Version = AssemblyVersionInfo.StableVersion)]\n+[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.InteractiveWindow\", CodeBase = \"Microsoft.NodejsTools.InteractiveWindow.dll\", Version = \"1.0.0.0\")]\n[assembly: NeutralResourcesLanguage(\"en\", UltimateResourceFallbackLocation.Satellite)]\n[assembly: InternalsVisibleTo(\"TestUtilities.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n[assembly: InternalsVisibleTo(\"ReplWindowUITests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest",
"diff": "<PackageManifest Version=\"2.0.0\" xmlns=\"http://schemas.microsoft.com/developer/vsx-schema/2011\" xmlns:d=\"http://schemas.microsoft.com/developer/vsx-schema-design/2011\">\n<Metadata>\n- <Identity Id=\"29102E6C-34F2-4FF1-BA2F-C02ADE3846E8\" Version=\"1.4.0.1\" Language=\"en-US\" Publisher=\"Microsoft\" />\n+ <Identity Id=\"29102E6C-34F2-4FF1-BA2F-C02ADE3846E8\" Version=\"|%CurrentProject%;GetVSIXVersion|\" Language=\"en-US\" Publisher=\"Microsoft\" />\n<DisplayName>Node.js Tools - Interactive Window</DisplayName>\n<Description xml:space=\"preserve\">Node.js Tools - Interactive Window.</Description>\n<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>\nId specifications are minimums; any SKU equal or 'higher' will accept\nthem. -->\n<Installation>\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VSWinExpress\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VWDExpress\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VSWinDesktopExpress\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n</Installation>\n<Prerequisites>\n<Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[15.0,16.0)\" DisplayName=\"Visual Studio core editor\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"diff": "@@ -45,7 +45,7 @@ namespace Microsoft.NodejsTools\n[PackageRegistration(UseManagedResourcesOnly = true)]\n// This attribute is used to register the information needed to show this package\n// in the Help/About dialog of Visual Studio.\n- [InstalledProductRegistration(\"#110\", \"#112\", AssemblyVersionInfo.Version, IconResourceID = 400)]\n+ [InstalledProductRegistration(\"#110\", \"#112\", \"1.0.0.0\", IconResourceID = 400)]\n[Guid(Guids.NodejsPackageString)]\n[ProvideOptionPage(typeof(NodejsGeneralOptionsPage), \"Node.js Tools\", \"General\", 114, 115, true)]\n[ProvideOptionPage(typeof(NodejsNpmOptionsPage), \"Node.js Tools\", \"Npm\", 114, 116, true)]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs",
"diff": "@@ -17,11 +17,11 @@ using Microsoft.VisualStudio.Shell;\n[assembly: ComVisible(false)]\n[assembly: CLSCompliant(false)]\n[assembly: NeutralResourcesLanguage(\"en\", UltimateResourceFallbackLocation.Satellite)]\n-[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools\", CodeBase = \"Microsoft.NodejsTools.dll\", Version = AssemblyVersionInfo.StableVersion)]\n-[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.Npm\", CodeBase = \"Microsoft.NodejsTools.Npm.dll\", Version = AssemblyVersionInfo.StableVersion)]\n-[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.PressAnyKey\", CodeBase = \"Microsoft.NodejsTools.PressAnyKey.exe\", Version = AssemblyVersionInfo.StableVersion)]\n+[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools\", CodeBase = \"Microsoft.NodejsTools.dll\", Version = \"1.0.0.0\")]\n+[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.Npm\", CodeBase = \"Microsoft.NodejsTools.Npm.dll\", Version = \"1.0.0.0\")]\n+[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.PressAnyKey\", CodeBase = \"Microsoft.NodejsTools.PressAnyKey.exe\", Version = \"1.0.0.0\")]\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.ProjectWizard\", CodeBase = \"Microsoft.NodejsTools.ProjectWizard.dll\", Version = \"1.0.0.0\")]\n-[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.TestAdapter\", CodeBase = \"Microsoft.NodejsTools.TestAdapter.dll\", Version = AssemblyVersionInfo.StableVersion)]\n+[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.TestAdapter\", CodeBase = \"Microsoft.NodejsTools.TestAdapter.dll\", Version = \"1.0.0.0\")]\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.Telemetry.15.0\", CodeBase = \"Microsoft.NodejsTools.Telemetry.15.0.dll\", Version = \"15.0.1.0\")]\n[assembly: InternalsVisibleTo(\"TestUtilities.NodeJS, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/Nodejs/source.extension.vsixmanifest",
"diff": "<PackageManifest Version=\"2.0.0\" xmlns=\"http://schemas.microsoft.com/developer/vsx-schema/2011\" xmlns:d=\"http://schemas.microsoft.com/developer/vsx-schema-design/2011\">\n<Metadata>\n- <Identity Id=\"FE8A8C3D-328A-476D-99F9-2A24B75F8C7F\" Version=\"1.4.0.1\" Language=\"en-US\" Publisher=\"Microsoft\" />\n+ <Identity Id=\"FE8A8C3D-328A-476D-99F9-2A24B75F8C7F\" Version=\"|%CurrentProject%;GetVSIXVersion|\" Language=\"en-US\" Publisher=\"Microsoft\" />\n<DisplayName>Node.js Tools</DisplayName>\n<Description xml:space=\"preserve\">Provides support for editing and debugging Node.js programs.</Description>\n<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>\n<PackageId>Microsoft.VisualStudio.NodejsTools.NodejsTools</PackageId>\n</Metadata>\n<Installation>\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VSWinExpress\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VWDExpress\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VSWinDesktopExpress\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n</Installation>\n<Dependencies>\n<Dependency Id=\"Microsoft.Framework.NDP\" DisplayName=\"Microsoft .NET Framework\" Version=\"4.5\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Profiling/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/Profiling/source.extension.vsixmanifest",
"diff": "<PackageManifest Version=\"2.0.0\" xmlns=\"http://schemas.microsoft.com/developer/vsx-schema/2011\" xmlns:d=\"http://schemas.microsoft.com/developer/vsx-schema-design/2011\">\n<Metadata>\n- <Identity Id=\"B515653F-FB69-4B64-9D3F-F1FCF8421DD0\" Version=\"1.4.0.1\" Language=\"en-US\" Publisher=\"Microsoft\" />\n+ <Identity Id=\"B515653F-FB69-4B64-9D3F-F1FCF8421DD0\" Version=\"|%CurrentProject%;GetVSIXVersion|\" Language=\"en-US\" Publisher=\"Microsoft\" />\n<DisplayName>Node.js Tools - Profiling</DisplayName>\n<Description xml:space=\"preserve\">Provides support for profiling Node.js projects</Description>\n<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>\nId specifications are minimums; any SKU equal or 'higher' will accept\nthem. -->\n<Installation>\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VSWinExpress\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VWDExpress\" />\n- <InstallationTarget Version=\"[14.0.0,16.0)\" Id=\"Microsoft.VisualStudio.VSWinDesktopExpress\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n</Installation>\n<Prerequisites>\n<Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[15.0,16.0)\" DisplayName=\"Visual Studio core editor\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectAfter.settings",
"new_path": "Nodejs/Product/ProjectAfter.settings",
"diff": "<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n- <Choose>\n- <When Condition=\"'$(Language)' == 'C#'\">\n- <ItemGroup>\n- <Compile Include=\"$(BuildRoot)\\Nodejs\\Product\\AssemblyInfoCommon.cs\">\n- <Link>AssemblyInfoCommon.cs</Link>\n- </Compile>\n- <Compile Include=\"$(BuildRoot)\\Nodejs\\Product\\AssemblyVersion.cs\">\n- <Link>AssemblyVersion.cs</Link>\n- </Compile>\n- </ItemGroup>\n- </When>\n- </Choose>\n-\n<Import Project=\"$(BuildRoot)\\Build\\Common.Build.targets\" />\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/ProjectWizard/Properties/AssemblyInfo.cs",
"diff": "@@ -19,16 +19,3 @@ using System.Runtime.InteropServices;\n// The following GUID is for the ID of the typelib if this project is exposed to COM\n[assembly: Guid(\"dfdf8c10-b0c5-43d5-8ab6-833523131644\")]\n[assembly: NeutralResourcesLanguage(\"en\", UltimateResourceFallbackLocation.Satellite)]\n-\n-// Version information for an assembly consists of the following four values:\n-//\n-// Major Version\n-// Minor Version\n-// Build Number\n-// Revision\n-//\n-// You can specify all the values or you can default the Build and Revision Numbers\n-// by using the '*' as shown below:\n-// [assembly: AssemblyVersion(\"1.0.*\")]\n-[assembly: AssemblyVersion(\"1.0.0.0\")] // Version is fixed so we can refer to it from .vstemplate files\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/WebRole/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/WebRole/Properties/AssemblyInfo.cs",
"diff": "@@ -17,6 +17,3 @@ using System.Runtime.InteropServices;\n// The following GUID is for the ID of the typelib if this project is exposed to COM\n[assembly: Guid(\"A87D74DE-BD73-4FDF-9D76-06D2C76F2460\")]\n-\n-\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/BuildRelease.ps1",
"new_path": "Nodejs/Setup/BuildRelease.ps1",
"diff": "This script is used to build a set of installers for Node.js Tools for\nVisual Studio based on the code in this branch.\n- The assembly and file versions are generated automatically and provided by\n- modifying .\\Build\\AssemblyVersion.cs.\n+ The assembly and file versions are generated automatically by the\n+ fileVersion.targets import.\nThe source is determined from the location of this script; to build another\nbranch, use its Copy-Item of BuildRelease.ps1.\n@@ -144,9 +144,6 @@ $base_year = 2016\n# This value is used to automatically generate outdir for -release and -internal builds\n$base_outdir = \"\\\\pytools\\Release\\Nodejs\"\n-# This file is parsed to find version information\n-$version_file = gi \"$buildroot\\Nodejs\\Product\\AssemblyVersion.cs\"\n-\n$build_project = gi \"$buildroot\\Nodejs\\dirs.proj\"\n$setup_swix_project = gi \"$buildroot\\Nodejs\\Setup\\setup-swix.proj\"\n@@ -188,7 +185,6 @@ function msbuild-exe($target) {\n# VSTarget e.g. 14.0\n# VSName e.g. VS 2013\n# config Name of the build configuration\n-# msi_version X.Y.Z.W installer version\n# release_version X.Y install version\n# assembly_version X.Y.Z assembly version\n# logfile Build log file\n@@ -210,8 +206,6 @@ function msbuild-options($target) {\n\"/p:VisualStudioVersion=$($target.VSTarget)\",\n\"/p:CopyOutputsToPath=$($target.destdir)\",\n\"/p:Configuration=$($target.config)\",\n- \"/p:MsiVersion=$($target.msi_version)\",\n- \"/p:ReleaseVersion=$($target.release_version)\",\n\"/p:DevEnvDir=$($target.vsroot)\\Common7\\IDE\\\\\"\n)\n}\n@@ -399,20 +393,7 @@ if ($name) {\nThrow \"'-name [build name]' must be specified when using '-internal'\"\n}\n-$version_file_backed_up = 0\n-# Force use of a backup if there are pending changes to $version_file\n-$version_file_force_backup = 0\n-$has_tf_workspace = (Get-Command tf -errorAction SilentlyContinue) -and (-not (tf workspaces | Select-String -pattern \"No workspace\", \"Unable to determine the workspace\"))\n-if ($has_tf_workspace) {\n- if (-not (tf status $version_file /format:detailed | Select-String \"There are no pending changes.\")) {\n- Write-Output \"$version_file has pending changes. Using backup instead of tf undo.\"\n- $version_file_force_backup = 1\n- }\n-}\n-$version_file_is_readonly = $version_file.Attributes -band [io.FileAttributes]::ReadOnly\n-\n-$assembly_version = [regex]::Match((Get-Content $version_file), 'ReleaseVersion = \"([0-9.]+)\";').Groups[1].Value\n-$release_version = [regex]::Match((Get-Content $version_file), 'FileVersion = \"([0-9.]+)\";').Groups[1].Value\n+$release_version = \"42.42.42.42\"\nif ($internal) {\n$base_outdir = \"$base_outdir\\Internal\\$name\"\n@@ -450,8 +431,6 @@ if ([int]::Parse([regex]::Match($buildnumber, '^[0-9]+').Value) -ge 65535) {\n(If the year is not yet $($base_year + 7) then something else has gone wrong.)\"\n}\n-$msi_version = \"$release_version.$buildnumber\"\n-\nif ($internal -or $release -or $mockrelease) {\nif (-not $serverBuildNumber) {\n@@ -481,8 +460,6 @@ if ($mockrelease) {\nWrite-Output \"Auto-generated release outdir: $outdir\"\n}\nWrite-Output \"\"\n-Write-Output \"Product version: $assembly_version.`$(VS version)\"\n-Write-Output \"MSI version: $msi_version\"\nWrite-Output \"Building for $([String]::Join(\", \", ($target_versions | % { $_.name })))\"\nWrite-Output \"============================================================\"\nWrite-Output \"\"\n@@ -510,16 +487,6 @@ $failed_logs = @()\nPush-Location $buildroot\ntry {\n$successful = $false\n- if ((-not $version_file_force_backup) -and $has_tf_workspace) {\n- tf edit $version_file | Out-Null\n- }\n- if ($version_file_force_backup -or -not $?) {\n- # running outside of MS\n- Copy-Item -Force $version_file \"$($version_file).bak\"\n- $version_file_backed_up = 1\n- }\n- Set-ItemProperty $version_file -Name IsReadOnly -Value $false\n- (Get-Content $version_file) | %{ $_ -replace ' = \"4100.00\"', (' = \"' + $buildnumber + '\"') } | Set-Content $version_file\nforeach ($config in $target_configs) {\n# See the description near the msbuild_config function\n@@ -530,7 +497,6 @@ try {\ndestdir=mkdir \"$outdir\\$($_.name)\\$config\" -Force;\nlogfile=\"$logdir\\BuildRelease.$config.$($_.number).log\";\nconfig=$config;\n- msi_version=$msi_version;\nrelease_version=$release_version;\nvsroot=$($_.vsroot)\n}\n@@ -724,25 +690,9 @@ try {\n}\n$successful = $true\n-} finally {\n- try {\n- if ($version_file_backed_up) {\n- Move-Item \"$version_file.bak\" $version_file -Force\n- if ($version_file_is_readonly) {\n- Set-ItemProperty $version_file -Name IsReadOnly -Value $true\n- }\n- Write-Output \"Restored $version_file\"\n- } elseif ((-not $version_file_force_backup) -and $has_tf_workspace) {\n- tf undo /noprompt $version_file | Out-Null\n- }\n-\n- if (-not (Get-Content $version_file) -match ' = \"4100.00\"') {\n- Write-Error \"Failed to undo $version_file\"\n- }\n} finally {\nPop-Location\n}\n-}\nif ($successful) {\nWrite-Output \"\"\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Dynamically generate the version number
|
410,217 |
09.05.2017 17:32:15
| 25,200 |
5dc77373c906f5a6f23760ac505983afc238726c
|
Update Profiling assemblies to use the hardcoded assembly version
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Profiling/NodejsProfilingPackage.cs",
"new_path": "Nodejs/Product/Profiling/NodejsProfilingPackage.cs",
"diff": "@@ -35,7 +35,7 @@ namespace Microsoft.NodejsTools.Profiling\n[Description(\"Node.js Tools Profiling Package\")]\n// This attribute is used to register the informations needed to show the this package\n// in the Help/About dialog of Visual Studio.\n- [InstalledProductRegistration(\"#110\", \"#112\", AssemblyVersionInfo.Version, IconResourceID = 400)]\n+ [InstalledProductRegistration(\"#110\", \"#112\", \"1.0.0.0\", IconResourceID = 400)]\n// This attribute is needed to let the shell know that this package exposes some menus.\n[ProvideMenuResource(\"Menus.ctmenu\", 1)]\n[Guid(ProfilingGuids.NodejsProfilingPkgString)]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Profiling/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/Profiling/Properties/AssemblyInfo.cs",
"diff": "@@ -12,7 +12,7 @@ using Microsoft.VisualStudio.Shell;\n[assembly: AssemblyDescription(\"\")]\n[assembly: AssemblyConfiguration(\"\")]\n-[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.Profiling\", CodeBase = \"Microsoft.NodejsTools.Profiling.dll\", Version = AssemblyVersionInfo.StableVersion)]\n+[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.Profiling\", CodeBase = \"Microsoft.NodejsTools.Profiling.dll\", Version = \"1.0.0.0\")]\n// Setting ComVisible to false makes the types in this assembly not visible\n// to COM components. If you need to access a type in this assembly from\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update Profiling assemblies to use the hardcoded assembly version
|
410,217 |
10.05.2017 15:53:10
| 25,200 |
2ff8d254cdc642094a8580e794cd18e0fbcf5ed1
|
Update readme.md for future development plans.
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "-<a href=\"http://aka.ms/explorentvs\" target=\"_blank\"></a>\n-<hr>\n-NTVS is a free, open source plugin that turns Visual Studio into a Node.js IDE. It is designed, developed, and supported by Microsoft and the community.\n+# Node.js tools for Visual Studio\n-[](https://ci.appveyor.com/project/mousetraps/nodejstools/branch/master) [](https://gitter.im/Microsoft/nodejstools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\n+Node.js tools for [Visual Studio 2017](http://aka.ms/explorentvs) is developed and managed here.\n-#### <a href=\"http://aka.ms/explorentvs\" target=\"_blank\">**> Learn more and start developing Node.js applications in Visual Studio**</a>\n+\n+[](https://gitter.im/Microsoft/nodejstools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\n-<a href=\"https://channel9.msdn.com/events/Visual-Studio/Connect-event-2015/801\" target=\"_blank\"></a>\n-NTVS supports **editing**, **Intellisense**, **profiling**, **npm**, **TypeScript**, **debugging locally and remotely** (Windows/MacOS/Linux), as well **Azure Web Sites and Cloud Services**.\n+Visit our page on [VisualStudio.com](https://aka.ms/explorentvs) for an overview and download links,\n+and check out our documentation on [the NTVS wiki](https://github.com/Microsoft/nodejstools/wiki)\n+and our (old) [feature overview](https://channel9.msdn.com/events/Visual-Studio/Connect-event-2015/801) video on Channel 9.\n-## Documentation\n-* [**NTVS documentation**](https://github.com/Microsoft/nodejstools/wiki) is available in the NTVS wiki.\n-* [**Microsoft/nodejs-guidelines**](https://github.com/Microsoft/nodejs-guidelines) includes other tips for working with Node.js.\n+Feel free to file issues or ask questions on our [issue tracker](http://github.com/Microsoft/nodejstools/issues),\n+and we welcome code contributions - see [Contributing](https://github.com/Microsoft/nodejstools/wiki/Contributing) for information.\n+Documentation contributions may be made on the [NTVS wiki](https://github.com/Microsoft/nodejstools/wiki).\n-## Releases\n-* **[Node.js Tools 1.2](http://aka.ms/ntvslateststable)** - Latest and greatest NTVS release (available for Visual Studio 2015 Update 3 RTM)\n-* **[Dev Builds](https://github.com/Microsoft/nodejstools/releases)** - Includes the most recent changes and bugfixes (available for Visual Studio 2015 and VS 15)\n-* **[Node.js Tools 1.1](https://github.com/Microsoft/nodejstools/releases/tag/v1.1.1)** - Legacy NTVS release for Visual Studio 2012, 2013, and 2015\n+## Visual Studio 2017 installation\n-## Contributions\n-We would love to have you as a contributor!\n-* [Contributing to NTVS](https://github.com/Microsoft/nodejstools/wiki/Contributing)\n-* [Build Instructions for NTVS](https://github.com/Microsoft/nodejstools/wiki/Build-Instructions)\n+The Node.js development workload is available as part of [Visual Studio 2017](https://aka.ms/explorentvs) Community, Professional and Enterprise.\n+To install, run the [normal VS installer](https://visualstudio.com/vs/downloads?wt.mc_id=github_microsoft_com)\n+and select the **Node.js development workload**.\n-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.\n+## Visual Studio 2015 and earlier\n+\n+Prior to Visual Studio 2017, the Node.js tools were released as a standalone extension. We are no longer actively developing these versions,\n+but if you are unable to upgrade to Visual Studio 2017 yet, you can use these older installers to get the Node.js tools.\n+\n+[NTVS 1.3](https://github.com/Microsoft/nodejstools/releases/tag/v1.3) is the latest available version for Visual Studio 2015.\n+\n+[NTVS 1.1](https://github.com/Microsoft/nodejstools/releases/tag/v1.1.1) is the last release for Visual Studio 2012, and 2013.\n+\n+## Code of Conduct\n+\n+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).\n+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or\n+contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.\n## License\n[Apache License 2.0 (Apache)](https://github.com/Microsoft/nodejstools/blob/master/LICENSE)\n+\n+Thank you for using and supporting the Node.js Tools for Visual Studio\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update readme.md for future development plans.
|
410,217 |
10.05.2017 23:14:50
| 25,200 |
ea95d8d466b20ce7908cfa00d21ee2185e9b46cb
|
Use VSIX version for the targets VSIX
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj",
"new_path": "Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj",
"diff": "<TargetPath>$(BuildOutputRoot)Setup\\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>\n<WebRoleDll Condition=\"'$(SignedBinariesPath)' != ''\">$(SignedBinariesPath)\\Microsoft.NodejsTools.WebRole.dll</WebRoleDll>\n<WebRoleDll Condition=\"'$(SignedBinariesPath)' == ''\">$(BuildOutputRoot)\\Binaries\\WebRole\\Microsoft.NodejsTools.WebRole.dll</WebRoleDll>\n- <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(MsiVersion);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>\n+ <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(VSIXBuildVersion);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>\n<!--Retrigger a build on webrole.dll to pick up signed version. TODO: see if there's a better way to do this.-->\n<MSBuildAllProjects>$(WebRoleDll)</MSBuildAllProjects>\n</PropertyGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Use VSIX version for the targets VSIX
|
410,217 |
12.05.2017 13:47:32
| 25,200 |
3e8f255cd135a58126a03b156816eb2f6a615f7c
|
update appveyor config to work with vs2017
remove test projects from SLN
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/.nuget/NuGet.exe",
"new_path": "Nodejs/.nuget/NuGet.exe",
"diff": "Binary files a/Nodejs/.nuget/NuGet.exe and b/Nodejs/.nuget/NuGet.exe differ\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/BuildRelease.ps1",
"new_path": "Nodejs/Setup/BuildRelease.ps1",
"diff": "@@ -127,6 +127,7 @@ param(\n[switch] $skipclean,\n[switch] $skipcopy,\n[switch] $skipdebug,\n+ [switch] $skipsetup,\n[switch] $skipbuild,\n[switch] $dev,\n[switch] $copytests\n@@ -170,6 +171,13 @@ if ($skiptests) {\n$global_msbuild_options += \"/p:IncludeTests=true\"\n}\n+if ($skipsetup) {\n+ $global_msbuild_options += \"/p:IncludeSetup=false\"\n+} else {\n+ $global_msbuild_options += \"/p:IncludeSetup=true\"\n+}\n+\n+\nif ($release -or $mockrelease) {\n$global_msbuild_options += \"/p:ReleaseBuild=true\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "appveyor.yml",
"new_path": "appveyor.yml",
"diff": "- v1.1.x\n- v1.2.x\n- v1.3.x\n- - future\nskip_tags: true\n- image: Visual Studio 2015\n+ image: Visual Studio 2017\nenvironment:\nmatrix:\n- nodejs_version: Stable\n- vs_version: 14.0\n+ vs_version: 15.0\narchitecture: x64\n- - nodejs_version: LTS\n- vs_version: 14.0\n- architecture: x86\ninstall: &default_install_script\n- ps: >-\nInstall-Product node $env:nodejs_version $env:architecture\nnode -v\n- \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools\\VsDevCmd.bat\"\n+ \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\VsDevCmd.bat\"\n$node = which node\nmsiexec /package C:\\projects\\nodejstools\\Common\\Tests\\Prerequisites\\VSTestHost.msi /quiet\n- powershell -ExecutionPolicy RemoteSigned C:\\projects\\nodejstools\\Nodejs\\Setup\\BuildRelease.ps1 .\\NTVS_Out -skipcopy -skipdebug -skipclean -vsTarget $env:vs_version\n- test_script: &default_test_script\n- - ps: >-\n- $testsettings_version = $env:vs_version -replace '11.0', '12.0'\n+ c:\\projects\\nodejstools\\Nodejs\\.nuget\\nuget.exe restore \"c:\\projects\\nodejstools\\Nodejs\\NodejsTools.sln\" -PackagesDirectory c:\\projects\\nodejstools\\Nodejs\\packages -ConfigFile c:\\projects\\nodejstools\\Nodejs\\.nuget\\appveyor.Config\n- vstest.console /TestCaseFilter:\"TestCategory!=AppVeyorIgnore&TestCategory!=Ignore\" /logger:Appveyor $(\"C:\\projects\\nodejstools\\BuildOutput\\Release\" + $env:vs_version + \"\\Tests\\NpmTests.dll\") $(\"C:\\projects\\nodejstools\\BuildOutput\\Release\" + $env:vs_version + \"\\Tests\\NodeTests.dll\") $(\"C:\\projects\\nodejstools\\BuildOutput\\Release\" + $env:vs_version + \"\\Tests\\ProfilerTests.dll\") /settings:$(\"C:\\projects\\nodejstools\\Build\\default.\" + $testsettings_version + \"Exp.testsettings\")\n+ C:\\projects\\nodejstools\\Nodejs\\Setup\\BuildRelease.ps1 .\\NTVS_Out -skipsetup -skipcopy -skipdebug -skipclean -skiptests -vsTarget $env:vs_version -vsroot \"$(${env:programfiles(x86)} + \"\\Microsoft Visual Studio\\2017\\Community\")\"\nartifacts: &default_artifacts\n- path: NTVS_Out\nname: NtvsOut\ntype: zip\n\\ No newline at end of file\n--\n- version: 1.0.{build}\n- branches:\n- only:\n- - v1.3.x\n- skip_tags: true\n- image: Visual Studio 2015\n- environment:\n- matrix:\n- - nodejs_version: 6\n- vs_version: 14.0\n- architecture: x64\n- - nodejs_version: 7\n- vs_version: 14.0\n- architecture: x86\n- install: *default_install_script\n- build_script: *default_build_script\n- test_script: *default_test_script\n- artifacts: *default_artifacts\n--\n- version: 1.0.{build}\n- branches:\n- only:\n- - v1.2.x\n- skip_tags: true\n- image: Visual Studio 2015\n- environment:\n- matrix:\n- - nodejs_version: 4\n- vs_version: 14.0\n- architecture: x64\n- - nodejs_version: 5\n- vs_version: 14.0\n- architecture: x86\n- install: *default_install_script\n- build_script: *default_build_script\n- test_script: *default_test_script\n- artifacts: *default_artifacts\n--\n- version: 1.0.{build}\n- branches:\n- only:\n- - v1.1.x\n- skip_tags: true\n- image: Visual Studio 2015\n- environment:\n- matrix:\n- - nodejs_version: 4\n- vs_version: 14.0\n- architecture: x64\n- - nodejs_version: 0.12\n- vs_version: 12.0\n- architecture: x64\n- - nodejs_version: 5\n- vs_version: 14.0\n- architecture: x86\n- install: *default_install_script\n- build_script: *default_build_script\n- test_script: *default_test_script\n- artifacts: *default_artifacts\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
update appveyor config to work with vs2017
remove test projects from SLN
|
410,217 |
12.05.2017 17:29:55
| 25,200 |
527514456af625305bc35cc6b17e239349d88c2d
|
Fix icons in add new item dialog
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate",
"new_path": "Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate",
"diff": "<TemplateData>\n<Name Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3023\"/>\n<Description Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3024\"/>\n- <Icon Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"0\"/>\n+ <Icon Package=\"{AAB75614-2F8F-4DA6-B0A6-763C6DBB2969}\" ID=\"2200\"/>\n<ProjectType>Node.js</ProjectType>\n<DefaultName>Json.json</DefaultName>\n<SortOrder>420</SortOrder>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate",
"new_path": "Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate",
"diff": "<TemplateData>\n<Name Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3038\"/>\n<Description Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3039\"/>\n- <Icon Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"0\"/>\n+ <Icon Package=\"{AAB75614-2F8F-4DA6-B0A6-763C6DBB2969}\" ID=\"2100\"/>\n<ProjectType>Node.js</ProjectType>\n<DefaultName>StyleSheet.less</DefaultName>\n<SortOrder>450</SortOrder>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate",
"new_path": "Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate",
"diff": "<TemplateData>\n<Name Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3017\"/>\n<Description Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3018\"/>\n- <Icon Package=\"{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}\" ID=\"3\"/>\n+ <Icon Package=\"{2ffe45c4-5c73-493c-b187-f2e955ff875e}\" ID=\"3\"></Icon>\n<ProjectType>Node.js</ProjectType>\n<DefaultName>TypeScript.ts</DefaultName>\n<SortOrder>200</SortOrder>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix icons in add new item dialog
|
410,217 |
15.05.2017 13:53:53
| 25,200 |
7c640d111ca47983ae5c2327dfb3670ff8e31040
|
Add regkey to disable the testadapter.
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/TestAdapter/VsProjectExtensions.cs",
"new_path": "Common/Product/TestAdapter/VsProjectExtensions.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Diagnostics;\n+using Microsoft.NodejsTools;\nusing Microsoft.VisualStudio;\n+using Microsoft.VisualStudio.Shell;\nusing Microsoft.VisualStudio.Shell.Flavor;\nusing Microsoft.VisualStudio.Shell.Interop;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel;\n@@ -79,6 +81,11 @@ namespace Microsoft.VisualStudioTools.TestAdapter\n/// </summary>\npublic static bool IsTestProject(this IVsProject project, Guid projectGuid)\n{\n+ if (!IsTestAdapaterEnabled())\n+ {\n+ return false;\n+ }\n+\nValidateArg.NotNull(project, \"project\");\nvar projectTypeGuids = project.GetAggregateProjectTypeGuids();\n@@ -87,6 +94,21 @@ namespace Microsoft.VisualStudioTools.TestAdapter\nreturn (projectTypeGuids.IndexOf(projectGuid.ToString(), StringComparison.OrdinalIgnoreCase) >= 0);\n}\n+ public static bool IsTestAdapaterEnabled()\n+ {\n+ using (var nodeKey = VSRegistry.RegistryRoot(__VsLocalRegistryType.RegType_UserSettings, true).CreateSubKey(NodejsConstants.BaseRegistryKey))\n+ {\n+ using (var optionsKey = nodeKey.CreateSubKey(\"Options\"))\n+ {\n+ using (var categoryKey = optionsKey.CreateSubKey(\"testing\"))\n+ {\n+ // If the value is set to something we disable this testadapter\n+ return string.IsNullOrEmpty(categoryKey.GetValue(\"testadapter\") as string);\n+ }\n+ }\n+ }\n+ }\n+\n/// <summary>\n/// Gets the project home directory.\n/// </summary>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add regkey to disable the testadapter.
|
410,217 |
16.05.2017 13:43:43
| 25,200 |
085bcc7b1e9660e40895ef7d147ec6b1827f4867
|
remove attribute which exports old node.js language settings
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"diff": "@@ -54,10 +54,8 @@ namespace Microsoft.NodejsTools\n[ProvideProjectFactory(typeof(NodejsProjectFactory), null, null, null, null, \".\\\\NullPath\", LanguageVsTemplate = NodejsConstants.Nodejs, SortPriority = 0x17)] // outer flavor, no file extension\n[ProvideDebugPortSupplier(\"Node remote debugging\", typeof(NodeRemoteDebugPortSupplier), NodeRemoteDebugPortSupplier.PortSupplierId)]\n[ProvideMenuResource(\"Menus.ctmenu\", 1)] // This attribute is needed to let the shell know that this package exposes some menus.\n- [WebSiteProject(\"JavaScript\", \"JavaScript\")]\n[ProvideLanguageTemplates(\"{349C5851-65DF-11DA-9384-00065B846F21}\", NodejsConstants.JavaScript, Guids.NodejsPackageString, \"Web\", \"Node.js Project Templates\", \"{\" + Guids.NodejsBaseProjectFactoryString + \"}\", \".js\", NodejsConstants.Nodejs, \"{\" + Guids.NodejsBaseProjectFactoryString + \"}\")]\n[ProvideProjectItem(typeof(BaseNodeProjectFactory), NodejsConstants.Nodejs, \"FileTemplates\\\\NewItem\", 0)]\n- [ProvideTextEditorAutomation(NodejsConstants.Nodejs, 106, 102, ProfileMigrationType.PassThrough)]\n[ProvideLanguageService(typeof(JadeLanguageInfo), JadeContentTypeDefinition.JadeLanguageName, 3041, RequestStockColors = true, ShowSmartIndent = false, ShowCompletion = false, DefaultToInsertSpaces = true, HideAdvancedMembersByDefault = false, EnableAdvancedMembersOption = false, ShowDropDownOptions = false)]\n[ProvideEditorExtension2(typeof(JadeEditorFactory), JadeContentTypeDefinition.JadeFileExtension, 50, __VSPHYSICALVIEWATTRIBUTES.PVA_SupportsPreview, \"*:1\", ProjectGuid = VSConstants.CLSID.MiscellaneousFilesProject_string, NameResourceID = 3041, EditorNameResourceId = 3045)]\n[ProvideEditorExtension2(typeof(JadeEditorFactory), JadeContentTypeDefinition.PugFileExtension, 50, __VSPHYSICALVIEWATTRIBUTES.PVA_SupportsPreview, \"*:1\", ProjectGuid = VSConstants.CLSID.MiscellaneousFilesProject_string, NameResourceID = 3041, EditorNameResourceId = 3045)]\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
remove attribute which exports old node.js language settings
|
410,217 |
16.05.2017 16:04:07
| 25,200 |
2a95876c3dd1ff6c54316caa49193b1745846ea4
|
Race condition between Take and Dispose
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"diff": "@@ -41,7 +41,7 @@ namespace Microsoft.NodejsTools.NpmUI\nprivate void QueueCommand(QueuedNpmCommandInfo info)\n{\n- if (!this.commandQueue.IsAddingCompleted\n+ if (this.commandQueue.IsAddingCompleted\n|| this.commandQueue.Contains(info)\n|| info.Equals(this.currentCommand))\n{\n@@ -88,9 +88,9 @@ namespace Microsoft.NodejsTools.NpmUI\n// The Take method will block the worker thread when there are no items left in the queue\n// and the thread will be signalled when new items are items to the queue, or the queue is\n// marked completed.\n- this.currentCommand = this.commandQueue.Take();\n- if (this.currentCommand != null)\n+ if (this.commandQueue.TryTake(out var command, Timeout.Infinite) && command != null)\n{\n+ this.currentCommand = command;\nExecute(this.currentCommand);\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Race condition between Take and Dispose
|
410,217 |
16.05.2017 17:13:16
| 25,200 |
8c66a7c7613fc9008b8db174b8591b4d3327393e
|
Don't throw unneccessary exception
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Thread.cs",
"new_path": "Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Thread.cs",
"diff": "@@ -40,7 +40,7 @@ namespace Microsoft.NodejsTools.Debugger.DebugEngine\n// NOTE: VS2013 and earlier do not use the result to disable the \"set next statement\" command\nint IDebugThread2.CanSetNextStatement(IDebugStackFrame2 stackFrame, IDebugCodeContext2 codeContext)\n{\n- throw new NotSupportedException(\"Set Next Statement is not supported by Node.js.\");\n+ return VSConstants.E_NOTIMPL;\n}\n// Retrieves a list of the stack frames for this thread.\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Don't throw unneccessary exception
|
410,217 |
16.05.2017 18:36:48
| 25,200 |
0489c0685f086d614d6c43f5634e67caa8d17279
|
Enable Webkit debugger for Open Folder debugging.
note: adding support for the legacy webkit debugger requires changes
to the IVsDebugLaunchTargetProvider. So I decided against that for now.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Debugger/NodeDebugProvider.cs",
"new_path": "Nodejs/Product/Nodejs/Debugger/NodeDebugProvider.cs",
"diff": "using System;\nusing System.ComponentModel.Composition;\n+using System.IO;\n+using Microsoft.NodejsTools.Project;\n+using Microsoft.VisualStudio.Setup.Configuration;\nusing Microsoft.VisualStudio.Shell.Interop;\nusing Microsoft.VisualStudio.Workspace;\nusing Microsoft.VisualStudio.Workspace.Debug;\nusing Microsoft.VisualStudio.Workspace.Extensions.VS.Debug;\n+using Newtonsoft.Json.Linq;\nnamespace Microsoft.NodejsTools.Debugger\n{\n@@ -42,9 +46,24 @@ namespace Microsoft.NodejsTools.Debugger\n}\";\npublic void SetupDebugTargetInfo(ref VsDebugTargetInfo vsDebugTargetInfo, DebugLaunchActionContext debugLaunchContext)\n+ {\n+ var nodeExe = debugLaunchContext.LaunchConfiguration.GetValue<string>(NodeExeKey, defaultValue: Nodejs.GetPathToNodeExecutableFromEnvironment());\n+\n+ var nodeVersion = Nodejs.GetNodeVersion(nodeExe);\n+ if (nodeVersion >= new Version(8, 0) || NodejsProjectLauncher.CheckDebugProtocolOption())\n+ {\n+ SetupDebugTargetInfoForWebkitV2Protocol(ref vsDebugTargetInfo, debugLaunchContext, nodeExe);\n+ }\n+ else\n+ {\n+ this.SetupDebugTargetInfoForNodeProtocol(ref vsDebugTargetInfo, debugLaunchContext, nodeExe);\n+ }\n+ }\n+\n+ private void SetupDebugTargetInfoForNodeProtocol(ref VsDebugTargetInfo vsDebugTargetInfo, DebugLaunchActionContext debugLaunchContext, string nodeExe)\n{\nvar target = vsDebugTargetInfo.bstrExe;\n- vsDebugTargetInfo.bstrExe = debugLaunchContext.LaunchConfiguration.GetValue<string>(NodeExeKey, Nodejs.GetPathToNodeExecutableFromEnvironment());\n+ vsDebugTargetInfo.bstrExe = nodeExe;\nvar nodeJsArgs = vsDebugTargetInfo.bstrArg;\nvsDebugTargetInfo.bstrArg = \"\\\"\" + target + \"\\\"\";\nif (!string.IsNullOrEmpty(nodeJsArgs))\n@@ -58,6 +77,61 @@ namespace Microsoft.NodejsTools.Debugger\nvsDebugTargetInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;\n}\n+ private void SetupDebugTargetInfoForWebkitV2Protocol(ref VsDebugTargetInfo vsDebugTargetInfo, DebugLaunchActionContext debugLaunchContext, string nodeExe)\n+ {\n+ // todo: refactor the debugging and process starting so we can re-use\n+\n+ var setupConfiguration = new SetupConfiguration();\n+ var setupInstance = setupConfiguration.GetInstanceForCurrentProcess();\n+ var visualStudioInstallationInstanceID = setupInstance.GetInstanceId();\n+\n+ // The Node2Adapter depends on features only in Node v6+, so the old v5.4 version of node will not suffice for this scenario\n+ // This node.exe will be the one used by the node2 debug adapter, not the one used to host the user code.\n+ var pathToNodeExe = Path.Combine(setupInstance.GetInstallationPath(), \"JavaScript\\\\Node.JS\\\\v6.4.0_x86\\\\Node.exe\");\n+\n+ // We check the registry to see if any parameters for the node.exe invocation have been specified (like \"--inspect\"), and append them if we find them.\n+ var nodeParams = NodejsProjectLauncher.CheckForRegistrySpecifiedNodeParams();\n+ if (!string.IsNullOrEmpty(nodeParams))\n+ {\n+ pathToNodeExe = pathToNodeExe + \" \" + nodeParams;\n+ }\n+\n+ var pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n+ $@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\extension\\out\\src\\nodeDebug.js\"\"\");\n+\n+ string trimmedPathToNode2DebugAdapter = pathToNode2DebugAdapterRuntime.Replace(\"\\\"\", \"\");\n+ if (!File.Exists(trimmedPathToNode2DebugAdapter))\n+ {\n+ pathToNode2DebugAdapterRuntime = Environment.ExpandEnvironmentVariables(@\"\"\"%ALLUSERSPROFILE%\\\" +\n+ $@\"Microsoft\\VisualStudio\\NodeAdapter\\{visualStudioInstallationInstanceID}\\out\\src\\nodeDebug.js\"\"\");\n+ }\n+\n+ var target = vsDebugTargetInfo.bstrExe;\n+ var cwd = Path.GetDirectoryName(target); // Current working directory\n+\n+ var configuration = new JObject(\n+ new JProperty(\"name\", \"Debug Node.js program from Visual Studio\"),\n+ new JProperty(\"type\", \"node2\"),\n+ new JProperty(\"request\", \"launch\"),\n+ new JProperty(\"program\", target),\n+ new JProperty(\"runtimeExecutable\", nodeExe),\n+ new JProperty(\"cwd\", cwd),\n+ new JProperty(\"console\", \"externalTerminal\"),\n+ new JProperty(\"diagnosticLogging\", NodejsProjectLauncher.CheckEnableDiagnosticLoggingOption()),\n+ new JProperty(\"sourceMaps\", true),\n+ new JProperty(\"stopOnEntry\", true),\n+ new JProperty(\"$adapter\", pathToNodeExe),\n+ new JProperty(\"$adapterArgs\", pathToNode2DebugAdapterRuntime));\n+\n+ var jsonContent = configuration.ToString();\n+\n+ vsDebugTargetInfo.dlo = DEBUG_LAUNCH_OPERATION.DLO_CreateProcess;\n+ vsDebugTargetInfo.clsidCustom = NodejsProjectLauncher.WebKitDebuggerV2Guid;\n+ vsDebugTargetInfo.bstrExe = target;\n+ vsDebugTargetInfo.bstrOptions = jsonContent;\n+ vsDebugTargetInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;\n+ }\n+\n[ExportLaunchConfigurationProvider(LaunchConfigurationProviderType, new[] { \".js\" }, \"nodejs\", NodeJsSchema)]\npublic class LaunchConfigurationProvider : ILaunchConfigurationProvider\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -32,9 +32,9 @@ namespace Microsoft.NodejsTools.Project\nprivate readonly NodejsProjectNode _project;\nprivate int? _testServerPort;\n- private static readonly Guid WebkitDebuggerGuid = Guid.Parse(\"4cc6df14-0ab5-4a91-8bb4-eb0bf233d0fe\");\n- private static readonly Guid WebkitPortSupplierGuid = Guid.Parse(\"4103f338-2255-40c0-acf5-7380e2bea13d\");\n- private static readonly Guid WebKitDebuggerV2Guid = Guid.Parse(\"30d423cc-6d0b-4713-b92d-6b2a374c3d89\");\n+ public static readonly Guid WebkitDebuggerGuid = Guid.Parse(\"4cc6df14-0ab5-4a91-8bb4-eb0bf233d0fe\");\n+ public static readonly Guid WebkitPortSupplierGuid = Guid.Parse(\"4103f338-2255-40c0-acf5-7380e2bea13d\");\n+ internal static readonly Guid WebKitDebuggerV2Guid = Guid.Parse(\"30d423cc-6d0b-4713-b92d-6b2a374c3d89\");\npublic NodejsProjectLauncher(NodejsProjectNode project)\n{\n@@ -97,28 +97,28 @@ namespace Microsoft.NodejsTools.Project\nreturn VSConstants.S_OK;\n}\n- private static bool CheckUseNewChromeDebugProtocolOption()\n+ internal static bool CheckUseNewChromeDebugProtocolOption()\n{\nvar optionString = NodejsDialogPage.LoadString(name: \"WebKitVersion\", cat: \"Debugging\");\nreturn !StringComparer.OrdinalIgnoreCase.Equals(optionString, \"V1\");\n}\n- private static bool CheckDebugProtocolOption()\n+ internal static bool CheckDebugProtocolOption()\n{\nvar optionString = NodejsDialogPage.LoadString(name: \"DebugProtocol\", cat: \"Debugging\");\nreturn StringComparer.OrdinalIgnoreCase.Equals(optionString, \"chrome\");\n}\n- private static bool CheckEnableDiagnosticLoggingOption()\n+ internal static bool CheckEnableDiagnosticLoggingOption()\n{\nvar optionString = NodejsDialogPage.LoadString(name: \"DiagnosticLogging\", cat: \"Debugging\");\nreturn StringComparer.OrdinalIgnoreCase.Equals(optionString, \"true\");\n}\n- private static string CheckForRegistrySpecifiedNodeParams()\n+ internal static string CheckForRegistrySpecifiedNodeParams()\n{\nvar paramString = NodejsDialogPage.LoadString(name: \"NodeCmdParams\", cat: \"Debugging\");\n@@ -372,7 +372,7 @@ namespace Microsoft.NodejsTools.Project\n}\n}\n- private void StartWithChromeV2Debugger(string program, string nodeRuntimeExecutable, bool startBrowser)\n+ private void StartWithChromeV2Debugger(string file, string nodePath, bool startBrowser)\n{\nvar serviceProvider = _project.Site;\n@@ -412,8 +412,8 @@ namespace Microsoft.NodejsTools.Project\nnew JProperty(\"name\", \"Debug Node.js program from Visual Studio\"),\nnew JProperty(\"type\", \"node2\"),\nnew JProperty(\"request\", \"launch\"),\n- new JProperty(\"program\", program),\n- new JProperty(\"runtimeExecutable\", nodeRuntimeExecutable),\n+ new JProperty(\"program\", file),\n+ new JProperty(\"runtimeExecutable\", nodePath),\nnew JProperty(\"cwd\", cwd),\nnew JProperty(\"console\", \"externalTerminal\"),\nnew JProperty(\"env\", JObject.FromObject(envVars)),\n@@ -429,7 +429,7 @@ namespace Microsoft.NodejsTools.Project\nnew VsDebugTargetInfo4() {\ndlo = (uint)DEBUG_LAUNCH_OPERATION.DLO_CreateProcess,\nguidLaunchDebugEngine = WebKitDebuggerV2Guid,\n- bstrExe = program,\n+ bstrExe = file,\nbstrOptions = jsonContent\n}\n};\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Enable Webkit debugger for Open Folder debugging.
note: adding support for the legacy webkit debugger requires changes
to the IVsDebugLaunchTargetProvider. So I decided against that for now.
|
410,217 |
17.05.2017 15:53:28
| 25,200 |
aeb25b53ba23559b9697a6715abeb1a7e69fdf5b
|
No need to ship this assemblies in our VSIX
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/Nodejs/source.extension.vsixmanifest",
"diff": "<Asset Type=\"Microsoft.VisualStudio.Assembly\" d:Source=\"Project\" d:ProjectName=\"ProjectWizard\" Path=\"|ProjectWizard|\" AssemblyName=\"|ProjectWizard;AssemblyName|\" />\n<Asset Type=\"Microsoft.VisualStudio.ProjectTemplate\" d:Source=\"Project\" d:ProjectName=\"%CurrentProject%\" d:TargetPath=\"|%CurrentProject%;TemplateProjectOutputGroup|\" Path=\"ProjectTemplates\" d:VsixSubPath=\"ProjectTemplates\" />\n<Asset Type=\"Microsoft.VisualStudio.ItemTemplate\" d:Source=\"Project\" d:ProjectName=\"%CurrentProject%\" d:TargetPath=\"|%CurrentProject%;TemplateProjectOutputGroup|\" Path=\"ItemTemplates\" d:VsixSubPath=\"ItemTemplates\" />\n- <Asset Type=\"Microsoft.VisualStudio.Assembly\" d:Source=\"File\" Path=\"Newtonsoft.Json.dll\" AssemblyName=\"Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed\" />\n- <Asset Type=\"Microsoft.VisualStudio.Assembly\" d:Source=\"File\" Path=\"Microsoft.VisualStudio.Shell.Interop.dll\" AssemblyName=\"Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" />\n- <Asset Type=\"Microsoft.VisualStudio.Assembly\" d:Source=\"File\" Path=\"Microsoft.VisualStudio.Shell.Interop.8.0.dll\" AssemblyName=\"Microsoft.VisualStudio.Shell.Interop.8.0\" />\n- <Asset Type=\"Microsoft.VisualStudio.Assembly\" d:Source=\"File\" Path=\"envdte.dll\" AssemblyName=\"envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" />\n</Assets>\n</PackageManifest>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
No need to ship this assemblies in our VSIX
|
410,226 |
17.05.2017 17:37:07
| 25,200 |
274a056ddd078de89e5ef8a66fc934857e4cf7f7
|
Stamp latest supported TypeScript version into new projects
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Reference Include=\"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <EmbedInteropTypes>True</EmbedInteropTypes>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs",
"new_path": "Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs",
"diff": "@@ -12,6 +12,7 @@ using System.Windows;\nusing System.Xml;\nusing Microsoft.NodejsTools.Telemetry;\nusing Microsoft.VisualStudio.Language.Intellisense;\n+using Microsoft.VisualStudio.Shell.Interop;\nusing Microsoft.VisualStudioTools;\nnamespace Microsoft.NodejsTools.Project.ImportWizard\n@@ -256,9 +257,10 @@ namespace Microsoft.NodejsTools.Project.ImportWizard\nGuid projectGuid;\ntry\n{\n+ string typeScriptVersion = GetLatestAvailableTypeScriptVersionFromSetup();\nusing (var writer = GetDefaultWriter(projectPath))\n{\n- WriteProjectXml(writer, projectPath, sourcePath, filters, startupFile, true, out projectGuid);\n+ WriteProjectXml(writer, projectPath, sourcePath, filters, startupFile, typeScriptVersion, true, out projectGuid);\n}\nNodejsPackage.Instance?.TelemetryLogger.LogProjectImported(projectGuid);\nsuccess = true;\n@@ -304,6 +306,7 @@ namespace Microsoft.NodejsTools.Project.ImportWizard\nstring sourcePath,\nstring filters,\nstring startupFile,\n+ string typeScriptVersion,\nbool excludeNodeModules,\nout Guid projectGuid\n)\n@@ -346,6 +349,10 @@ namespace Microsoft.NodejsTools.Project.ImportWizard\nwriter.WriteElementString(\"TypeScriptSourceMap\", \"true\");\nwriter.WriteElementString(\"TypeScriptModuleKind\", \"CommonJS\");\nwriter.WriteElementString(\"EnableTypeScript\", \"true\");\n+ if (typeScriptVersion != null)\n+ {\n+ writer.WriteElementString(\"TypeScriptToolsVersion\", typeScriptVersion);\n+ }\n}\nwriter.WriteStartElement(\"VisualStudioVersion\");\n@@ -520,6 +527,35 @@ namespace Microsoft.NodejsTools.Project.ImportWizard\nreturn res;\n}\n+\n+ private const string tsSdkSetupPackageIdPrefix = \"Microsoft.VisualStudio.Component.TypeScript.\";\n+\n+ private static string GetLatestAvailableTypeScriptVersionFromSetup()\n+ {\n+ var setupCompositionService = (IVsSetupCompositionService)CommonPackage.GetGlobalService(typeof(SVsSetupCompositionService));\n+\n+ // Populate the package status\n+ uint count = 0;\n+ uint sizeNeeded = 0;\n+ IVsSetupPackageInfo[] packages = null;\n+ setupCompositionService.GetSetupPackagesInfo(count, packages, out sizeNeeded);\n+\n+ if (sizeNeeded > 0)\n+ {\n+ packages = new IVsSetupPackageInfo[sizeNeeded];\n+ count = sizeNeeded;\n+ setupCompositionService.GetSetupPackagesInfo(count, packages, out sizeNeeded);\n+\n+ return packages.Where(p => (__VsSetupPackageState)p.CurrentState == __VsSetupPackageState.INSTALL_PACKAGE_PRESENT)\n+ .Select(p => p.PackageId)\n+ .Where(p => p.StartsWith(tsSdkSetupPackageIdPrefix))\n+ .Select(p => p.Substring(tsSdkSetupPackageIdPrefix.Length, p.Length - tsSdkSetupPackageIdPrefix.Length))\n+ .OrderByDescending(v => v)\n+ .First();\n+ }\n+\n+ return null;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj",
"diff": "<NodejsPort>1337</NodejsPort>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>true</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorker/Worker.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorker/Worker.njsproj",
"diff": "<NodejsPort>1337</NodejsPort>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>false</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorkerRole/Worker.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorkerRole/Worker.njsproj",
"diff": "<NodejsPort>1337</NodejsPort>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>false</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.njsproj",
"diff": "<NodejsPort>1337</NodejsPort>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>true</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebRole/TypeScriptWebApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebRole/TypeScriptWebApp.njsproj",
"diff": "<NodejsPort>1337</NodejsPort>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>true</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/NodejsConsoleApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/NodejsConsoleApp.njsproj",
"diff": "<ProjectTypeGuids>{3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}</ProjectTypeGuids>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>false</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj",
"diff": "<NodejsPort>1337</NodejsPort>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>true</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptFromExistingCode/FromExistingCode.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptFromExistingCode/FromExistingCode.njsproj",
"diff": "<NodejsPort>1337</NodejsPort>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/NodejsWebApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/NodejsWebApp.njsproj",
"diff": "<NodejsPort>1337</NodejsPort>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>true</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/NodejsPackageParametersExtension.cs",
"new_path": "Nodejs/Product/ProjectWizard/NodejsPackageParametersExtension.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Linq;\nusing System.Text.RegularExpressions;\nusing EnvDTE;\n+using Microsoft.VisualStudio.Shell.Interop;\nusing Microsoft.VisualStudio.TemplateWizard;\nnamespace Microsoft.NodejsTools.ProjectWizard\n{\ninternal class NodejsPackageParametersExtension : IWizard\n{\n+ private const string tsSdkSetupPackageIdPrefix = \"Microsoft.VisualStudio.Component.TypeScript.\";\n+\npublic void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)\n{\nvar projectName = replacementsDictionary[\"$projectname$\"];\nreplacementsDictionary.Add(\"$npmsafeprojectname$\", NormalizeNpmPackageName(projectName));\n+ replacementsDictionary.Add(\"$typescriptversion$\", GetLatestAvailableTypeScriptVersionFromSetup());\n}\npublic void ProjectFinishedGenerating(EnvDTE.Project project)\n@@ -60,6 +65,33 @@ namespace Microsoft.NodejsTools.ProjectWizard\nreturn npmProjectNameTransform.Substring(0, Math.Min(npmProjectNameTransform.Length, NpmPackageNameMaxLength));\n}\n+\n+ private static string GetLatestAvailableTypeScriptVersionFromSetup()\n+ {\n+ var setupCompositionService = (IVsSetupCompositionService)Microsoft.VisualStudio.Shell.ServiceProvider.GlobalProvider.GetService(typeof(SVsSetupCompositionService));\n+\n+ // Populate the package status\n+ uint count = 0;\n+ uint sizeNeeded = 0;\n+ IVsSetupPackageInfo[] packages = null;\n+ setupCompositionService.GetSetupPackagesInfo(count, packages, out sizeNeeded);\n+\n+ if (sizeNeeded > 0)\n+ {\n+ packages = new IVsSetupPackageInfo[sizeNeeded];\n+ count = sizeNeeded;\n+ setupCompositionService.GetSetupPackagesInfo(count, packages, out sizeNeeded);\n+\n+ return packages.Where(p => (__VsSetupPackageState)p.CurrentState == __VsSetupPackageState.INSTALL_PACKAGE_PRESENT)\n+ .Select(p => p.PackageId)\n+ .Where(p => p.StartsWith(tsSdkSetupPackageIdPrefix))\n+ .Select(p => p.Substring(tsSdkSetupPackageIdPrefix.Length, p.Length - tsSdkSetupPackageIdPrefix.Length))\n+ .OrderByDescending(v => v)\n+ .First();\n+ }\n+\n+ return null;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<Reference Include=\"Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <EmbedInteropTypes>True</EmbedInteropTypes>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" />\n<Reference Include=\"Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" />\n<Reference Include=\"Microsoft.VisualStudio.TemplateWizardInterface, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/TestData/CopyPasteRenameProject/CopyPasteRenameProject/CopyPasteRenameProjectTypeScript.njsproj",
"new_path": "Nodejs/Tests/TestData/CopyPasteRenameProject/CopyPasteRenameProject/CopyPasteRenameProjectTypeScript.njsproj",
"diff": "<ProjectView>ShowAllFiles</ProjectView>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n<StartWebBrowser>false</StartWebBrowser>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/TestData/NodejsTypeScriptProfileTestNeedsBuild/NodejsProfileTest.njsproj",
"new_path": "Nodejs/Tests/TestData/NodejsTypeScriptProfileTestNeedsBuild/NodejsProfileTest.njsproj",
"diff": "<ProjectTypeGuids>{3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}</ProjectTypeGuids>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n</PropertyGroup>\n<PropertyGroup Condition=\" '$(Configuration)' == 'Debug' \">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/TestData/NodejsTypeScriptProfileTestWithErrors/NodejsProfileTest.njsproj",
"new_path": "Nodejs/Tests/TestData/NodejsTypeScriptProfileTestWithErrors/NodejsProfileTest.njsproj",
"diff": "<ProjectTypeGuids>{3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}</ProjectTypeGuids>\n<TypeScriptSourceMap>true</TypeScriptSourceMap>\n<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>\n+ <TypeScriptToolsVersion>$typescriptversion$</TypeScriptToolsVersion>\n<EnableTypeScript>true</EnableTypeScript>\n</PropertyGroup>\n<PropertyGroup Condition=\" '$(Configuration)' == 'Debug' \">\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Stamp latest supported TypeScript version into new projects
|
410,226 |
17.05.2017 17:41:05
| 25,200 |
c7b14b62e986f9b9669e2437ec2114064b92fb2d
|
return empty string if no version
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs",
"new_path": "Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs",
"diff": "@@ -554,7 +554,7 @@ namespace Microsoft.NodejsTools.Project.ImportWizard\n.First();\n}\n- return null;\n+ return \"\";\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/NodejsPackageParametersExtension.cs",
"new_path": "Nodejs/Product/ProjectWizard/NodejsPackageParametersExtension.cs",
"diff": "@@ -90,7 +90,7 @@ namespace Microsoft.NodejsTools.ProjectWizard\n.First();\n}\n- return null;\n+ return \"\";\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
return empty string if no version
|
410,204 |
17.05.2017 18:55:59
| 25,200 |
09ca51d9eaf7c94577539c75a8a3c8a4bbcb250b
|
Updated the debugging option to trace: true which is the new option
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -417,7 +417,7 @@ namespace Microsoft.NodejsTools.Project\nnew JProperty(\"cwd\", cwd),\nnew JProperty(\"console\", \"externalTerminal\"),\nnew JProperty(\"env\", JObject.FromObject(envVars)),\n- new JProperty(\"diagnosticLogging\", CheckEnableDiagnosticLoggingOption()),\n+ new JProperty(\"trace\", CheckEnableDiagnosticLoggingOption()),\nnew JProperty(\"sourceMaps\", true),\nnew JProperty(\"stopOnEntry\", true),\nnew JProperty(\"$adapter\", pathToNodeExe),\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Updated the debugging option to trace: true which is the new option
|
410,217 |
22.05.2017 15:12:19
| 25,200 |
3e60b1497fe524ecd17f88950ab3918a46cc29c2
|
Use Telemetry Nuget Package
|
[
{
"change_type": "DELETE",
"old_path": "Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.11.0.dll",
"new_path": "Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.11.0.dll",
"diff": "Binary files a/Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.11.0.dll and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.12.0.dll",
"new_path": "Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.12.0.dll",
"diff": "Binary files a/Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.12.0.dll and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.14.0.dll",
"new_path": "Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.14.0.dll",
"diff": "Binary files a/Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.14.0.dll and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.15.0.dll",
"new_path": "Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.15.0.dll",
"diff": "Binary files a/Nodejs/Common/Telemetry/Microsoft.NodejsTools.Telemetry.15.0.dll and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Common/Telemetry/TelemetryProperties.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-namespace Microsoft.NodejsTools.Telemetry\n-{\n- /// <summary>\n- /// Property names for telemetry events\n- /// </summary>\n- internal static class TelemetryProperties\n- {\n- public const string ProjectGuid = \"ProjectGuid\";\n- }\n-}\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<UpgradeBackupLocation>\n</UpgradeBackupLocation>\n<OldToolsVersion>4.0</OldToolsVersion>\n+ <NuGetPackageImportStamp>\n+ </NuGetPackageImportStamp>\n</PropertyGroup>\n<Import Project=\"..\\ProjectBefore.settings\" />\n<PropertyGroup>\n<Reference Include=\"Microsoft.ApplicationInsights.PersistenceChannel, Version=1.2.3.490, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.PersistenceChannel.1.2.3\\lib\\net45\\Microsoft.ApplicationInsights.PersistenceChannel.dll</HintPath>\n</Reference>\n+ <Reference Include=\"Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\lib\\net45\\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.ImageCatalog, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<!--\n<Reference Include=\"Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.RemoteControl, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.RemoteControl.14.0.262-masterA5CACE98\\lib\\net45\\Microsoft.VisualStudio.RemoteControl.dll</HintPath>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.Setup.Configuration.Interop.1.8.24\\lib\\net35\\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>\n<EmbedInteropTypes>True</EmbedInteropTypes>\n<Reference Include=\"Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.Telemetry.15.3.789-masterCC863119\\lib\\net45\\Microsoft.VisualStudio.Telemetry.dll</HintPath>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n</ItemGroup>\n<ItemGroup>\n<Reference Include=\"Microsoft.VisualStudio.TextManager.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.Utilities.Internal.14.0.72-masterF9EB1D39\\lib\\net45\\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.Validation, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.Validation.15.0.82\\lib\\net45\\Microsoft.VisualStudio.Validation.dll</HintPath>\n<Private>True</Private>\n<Reference Include=\"Microsoft.Build.Utilities.$(MicrosoftBuildAssemblyVersionSuffix), Version=$(MicrosoftBuildAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" />\n<Reference Include=\"Microsoft.CSharp\" />\n<Reference Include=\"Microsoft.JScript\" />\n- <Reference Include=\"Microsoft.NodejsTools.Telemetry\">\n- <HintPath>..\\..\\Common\\Telemetry\\Microsoft.NodejsTools.Telemetry.15.0.dll</HintPath>\n- </Reference>\n<Reference Include=\"microsoft.msxml, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>False</EmbedInteropTypes>\n</Reference>\n<ItemGroup>\n<Reference Include=\"Microsoft.VisualStudio.Shell.Framework, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" />\n</ItemGroup>\n- <ItemGroup>\n- <OutputBinariesToSign Include=\"Microsoft.NodejsTools.Telemetry.$(VSTarget).dll\" />\n- </ItemGroup>\n<ItemGroup>\n<Compile Include=\"..\\TypeScript\\TypeScriptHelpers.cs\">\n<Link>Project\\TypeScriptHelpers.cs</Link>\n<Compile Include=\"Repl\\SaveReplCommand.cs\" />\n<Compile Include=\"Repl\\VsNodejsReplSite.cs\" />\n<Compile Include=\"SourceMapping\\SourceMap.cs\" />\n+ <Compile Include=\"Telemetry\\TelemetryEvents.cs\" />\n<Compile Include=\"TestFrameworks\\TestFrameworkDirectories.cs\" />\n<Compile Include=\"VsMenus.cs\" />\n<Compile Include=\"BaseNodeProjectFactory.cs\" />\n<Compile Include=\"GlobalSuppressions.cs\" />\n<Compile Include=\"NodejsPackage.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n- <Compile Include=\"Telemetry\\NodejsTelemetryExtensions.cs\" />\n- </ItemGroup>\n- <ItemGroup>\n- <TelemetryFiles Include=\"..\\..\\Common\\Telemetry\\*.cs\" />\n- <Compile Include=\"@(TelemetryFiles)\">\n- <Link>Telemetry\\%(TelemetryFiles.FileName).cs</Link>\n- <Visible>true</Visible>\n- </Compile>\n+ <Compile Include=\"Telemetry\\TelemetryHelper.cs\" />\n</ItemGroup>\n<ItemGroup>\n<EmbeddedResource Include=\"ImportWizardResources.cs.resx\" />\n<ZipProject Include=\"ProjectTemplates\\NodejsWebApp\\Preview.png\" />\n<ZipProject Include=\"ProjectTemplates\\AzureNodejsApp\\Preview.png\" />\n<ZipProject Include=\"ProjectTemplates\\NodejsConsoleApp\\Preview.png\" />\n- <Content Include=\"..\\..\\Common\\Telemetry\\Microsoft.NodejsTools.Telemetry.$(VSTarget).dll\">\n- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n- <IncludeInVSIX>true</IncludeInVSIX>\n- <VSIXSubPath>.</VSIXSubPath>\n- </Content>\n<Content Include=\"$(OutputPath)\\Newtonsoft.Json.dll\">\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n<IncludeInVSIX>true</IncludeInVSIX>\n<Content Include=\"TestFrameworks\\Tape\\tape.js\">\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n</Content>\n+ <Resource Include=\"version.txt\" />\n<Content Include=\"VSTemplateStore.pkgdef\">\n<IncludeInVSIX>false</IncludeInVSIX>\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n</PropertyGroup>\n<Error Condition=\"!Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\\.nuget\\NuGet.targets'))\" />\n+ <Error Condition=\"!Exists('..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))\" />\n</Target>\n<!-- To modify your build process, add your task inside one of the targets below and uncomment it.\nOther similar extension points exist, see Microsoft.Common.targets.\n<Target Name=\"_DeleteAfterCreatePkgDef\" AfterTargets=\"GeneratePkgDef\">\n<Delete Files=\"@(_CopiedForCreatePkgdef)\" />\n</Target>\n+ <Import Project=\"..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets\" Condition=\"Exists('..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')\" />\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"diff": "@@ -70,7 +70,6 @@ namespace Microsoft.NodejsTools\ninternal static NodejsPackage Instance;\ninternal HashSet<ITextBuffer> ChangedBuffers = new HashSet<ITextBuffer>();\nprivate NodejsToolsLogger _logger;\n- private ITelemetryLogger _telemetryLogger;\n// Hold references for the subscribed events. Otherwise the callbacks will be garbage collected\n// after the initialization\nprivate List<EnvDTE.CommandEvents> _subscribedCommandEvents = new List<EnvDTE.CommandEvents>();\n@@ -185,20 +184,15 @@ namespace Microsoft.NodejsTools\nprivate void InitializeTelemetry()\n{\n- var thisAssembly = typeof(NodejsPackage).Assembly;\n-\n- // Get telemetry logger\n- this._telemetryLogger = TelemetrySetup.Instance.GetLogger(thisAssembly);\n-\n- TelemetrySetup.Instance.LogPackageLoad(this._telemetryLogger, Guid.Parse(Guids.NodejsPackageString), thisAssembly, Application.ProductVersion);\n+ // Fetch the session synchronously on the UI thread; if this doesn't happen before we try using this on\n+ // the background thread then the VS process will deadlock.\n+ TelemetryHelper.Initialize();\n}\npublic new IComponentModel ComponentModel => this.GetComponentModel();\ninternal NodejsToolsLogger Logger => this._logger;\n- internal ITelemetryLogger TelemetryLogger => this._telemetryLogger;\n-\n/// <summary>\n/// Makes the debugger context available - this enables our debugger when we're installed into\n/// a SKU which doesn't support every installed debugger.\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs",
"new_path": "Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs",
"diff": "@@ -262,7 +262,7 @@ namespace Microsoft.NodejsTools.Project.ImportWizard\n{\nWriteProjectXml(writer, projectPath, sourcePath, filters, startupFile, typeScriptVersion, true, out projectGuid);\n}\n- NodejsPackage.Instance?.TelemetryLogger.LogProjectImported(projectGuid);\n+ TelemetryHelper.LogProjectImported();\nsuccess = true;\nreturn projectPath;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs",
"diff": "@@ -22,7 +22,6 @@ using Microsoft.VisualStudio.Shell;\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.PressAnyKey\", CodeBase = \"Microsoft.NodejsTools.PressAnyKey.exe\", Version = \"1.0.0.0\")]\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.ProjectWizard\", CodeBase = \"Microsoft.NodejsTools.ProjectWizard.dll\", Version = \"1.0.0.0\")]\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.TestAdapter\", CodeBase = \"Microsoft.NodejsTools.TestAdapter.dll\", Version = \"1.0.0.0\")]\n-[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.Telemetry.15.0\", CodeBase = \"Microsoft.NodejsTools.Telemetry.15.0.dll\", Version = \"15.0.1.0\")]\n[assembly: InternalsVisibleTo(\"TestUtilities.NodeJS, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n[assembly: InternalsVisibleTo(\"NodeTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Telemetry/NodejsTelemetryExtensions.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-\n-namespace Microsoft.NodejsTools.Telemetry\n-{\n- /// <summary>\n- /// Extensions for logging telemetry events.\n- /// </summary>\n- internal static class NodejsTelemetryExtensions\n- {\n- public static void LogProjectImported(this ITelemetryLogger logger, Guid projectGuid)\n- {\n- logger.ReportEvent(\n- TelemetryEvents.ProjectImported,\n- TelemetryProperties.ProjectGuid,\n- projectGuid.ToString(\"B\"));\n- }\n- }\n-}\n-\n"
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Common/Telemetry/TelemetryEvents.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"diff": "@@ -7,7 +7,12 @@ namespace Microsoft.NodejsTools.Telemetry\n/// </summary>\ninternal static class TelemetryEvents\n{\n- public const string ProjectImported = \"ProjectImported\";\n+ private const string Prefix = \"VS/NodejsTools/\";\n+\n+ /// <summary>\n+ /// User created a new project from existing code.\n+ /// </summary>\n+ public const string ProjectImported = Prefix + \"ProjectImported\";\n+\n}\n}\n-\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"diff": "+// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n+\n+using Microsoft.VisualStudio.Shell;\n+using Microsoft.VisualStudio.Telemetry;\n+\n+namespace Microsoft.NodejsTools.Telemetry\n+{\n+ /// <summary>\n+ /// Extensions for logging telemetry events.\n+ /// </summary>\n+ internal static class TelemetryHelper\n+ {\n+ private static TelemetrySession defaultSession;\n+\n+ public static void Initialize()\n+ {\n+ ThreadHelper.ThrowIfNotOnUIThread();\n+ defaultSession = TelemetryService.DefaultSession;\n+ }\n+\n+ public static void LogProjectImported()\n+ {\n+ defaultSession.PostUserTask(TelemetryEvents.ProjectImported, TelemetryResult.Success);\n+ }\n+ }\n+}\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/app.config",
"new_path": "Nodejs/Product/Nodejs/app.config",
"diff": "</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Newtonsoft.Json\" publicKeyToken=\"30ad4fe6b2a6aeed\" culture=\"neutral\" />\n- <bindingRedirect oldVersion=\"0.0.0.0-6.0.0.0\" newVersion=\"6.0.0.0\" />\n+ <bindingRedirect oldVersion=\"0.0.0.0-8.0.0.0\" newVersion=\"8.0.0.0\" />\n</dependentAssembly>\n<dependentAssembly>\n<assemblyIdentity name=\"Microsoft.Build.Framework\" publicKeyToken=\"b03f5f7f11d50a3a\" culture=\"neutral\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/packages.config",
"new_path": "Nodejs/Product/Nodejs/packages.config",
"diff": "<package id=\"MicroBuild.Core\" version=\"0.2.0\" targetFramework=\"net46\" />\n<package id=\"Microsoft.ApplicationInsights\" version=\"2.2.0\" targetFramework=\"net46\" />\n<package id=\"Microsoft.ApplicationInsights.PersistenceChannel\" version=\"1.2.3\" targetFramework=\"net46\" />\n+ <package id=\"Microsoft.Diagnostics.Tracing.EventSource.Redist\" version=\"1.1.16-beta\" targetFramework=\"net46\" />\n+ <package id=\"Microsoft.VisualStudio.RemoteControl\" version=\"14.0.262-masterA5CACE98\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Setup.Configuration.Interop\" version=\"1.8.24\" targetFramework=\"net46\" developmentDependency=\"true\" />\n+ <package id=\"Microsoft.VisualStudio.Telemetry\" version=\"15.3.789-masterCC863119\" targetFramework=\"net46\" />\n+ <package id=\"Microsoft.VisualStudio.Utilities.Internal\" version=\"14.0.72-masterF9EB1D39\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Validation\" version=\"15.0.82\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Workspaces\" version=\"15.0.215-pre\" targetFramework=\"net46\" />\n<package id=\"Newtonsoft.Json\" version=\"8.0.3\" targetFramework=\"net46\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/Nodejs/version.txt",
"diff": "+AssemblyFileVersion=15.3-master\n+AssemblyVersion=15.0\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Use Telemetry Nuget Package
|
410,217 |
23.05.2017 11:28:57
| 25,200 |
6f3cfa9db6a23920a08eb68841b7ced0eebf3bcd
|
Telemetry for debugging
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Debugger/NodeDebugProvider.cs",
"new_path": "Nodejs/Product/Nodejs/Debugger/NodeDebugProvider.cs",
"diff": "@@ -4,6 +4,7 @@ using System;\nusing System.ComponentModel.Composition;\nusing System.IO;\nusing Microsoft.NodejsTools.Project;\n+using Microsoft.NodejsTools.Telemetry;\nusing Microsoft.VisualStudio.Setup.Configuration;\nusing Microsoft.VisualStudio.Shell.Interop;\nusing Microsoft.VisualStudio.Workspace;\n@@ -47,16 +48,18 @@ namespace Microsoft.NodejsTools.Debugger\npublic void SetupDebugTargetInfo(ref VsDebugTargetInfo vsDebugTargetInfo, DebugLaunchActionContext debugLaunchContext)\n{\n- var nodeExe = debugLaunchContext.LaunchConfiguration.GetValue<string>(NodeExeKey, defaultValue: Nodejs.GetPathToNodeExecutableFromEnvironment());\n+ var nodeExe = debugLaunchContext.LaunchConfiguration.GetValue(NodeExeKey, defaultValue: Nodejs.GetPathToNodeExecutableFromEnvironment());\nvar nodeVersion = Nodejs.GetNodeVersion(nodeExe);\nif (nodeVersion >= new Version(8, 0) || NodejsProjectLauncher.CheckDebugProtocolOption())\n{\nSetupDebugTargetInfoForWebkitV2Protocol(ref vsDebugTargetInfo, debugLaunchContext, nodeExe);\n+ TelemetryHelper.LogDebuggingStarted(\"ChromeV2\", nodeVersion.ToString(), isProject: false);\n}\nelse\n{\nthis.SetupDebugTargetInfoForNodeProtocol(ref vsDebugTargetInfo, debugLaunchContext, nodeExe);\n+ TelemetryHelper.LogDebuggingStarted(\"Node6\", nodeVersion.ToString(), isProject: false);\n}\n}\n@@ -117,7 +120,7 @@ namespace Microsoft.NodejsTools.Debugger\nnew JProperty(\"runtimeExecutable\", nodeExe),\nnew JProperty(\"cwd\", cwd),\nnew JProperty(\"console\", \"externalTerminal\"),\n- new JProperty(\"diagnosticLogging\", NodejsProjectLauncher.CheckEnableDiagnosticLoggingOption()),\n+ new JProperty(\"trace\", NodejsProjectLauncher.CheckEnableDiagnosticLoggingOption()),\nnew JProperty(\"sourceMaps\", true),\nnew JProperty(\"stopOnEntry\", true),\nnew JProperty(\"$adapter\", pathToNodeExe),\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -17,6 +17,7 @@ using System.Windows.Forms;\nusing Microsoft.NodejsTools.Debugger;\nusing Microsoft.NodejsTools.Debugger.DebugEngine;\nusing Microsoft.NodejsTools.Options;\n+using Microsoft.NodejsTools.Telemetry;\nusing Microsoft.NodejsTools.TypeScript;\nusing Microsoft.VisualStudio;\nusing Microsoft.VisualStudio.Setup.Configuration;\n@@ -32,8 +33,8 @@ namespace Microsoft.NodejsTools.Project\nprivate readonly NodejsProjectNode _project;\nprivate int? _testServerPort;\n- public static readonly Guid WebkitDebuggerGuid = Guid.Parse(\"4cc6df14-0ab5-4a91-8bb4-eb0bf233d0fe\");\n- public static readonly Guid WebkitPortSupplierGuid = Guid.Parse(\"4103f338-2255-40c0-acf5-7380e2bea13d\");\n+ private static readonly Guid WebkitDebuggerGuid = Guid.Parse(\"4cc6df14-0ab5-4a91-8bb4-eb0bf233d0fe\");\n+ private static readonly Guid WebkitPortSupplierGuid = Guid.Parse(\"4103f338-2255-40c0-acf5-7380e2bea13d\");\ninternal static readonly Guid WebKitDebuggerV2Guid = Guid.Parse(\"30d423cc-6d0b-4713-b92d-6b2a374c3d89\");\npublic NodejsProjectLauncher(NodejsProjectNode project)\n@@ -71,27 +72,32 @@ namespace Microsoft.NodejsTools.Project\nreturn VSConstants.S_OK;\n}\n- var chromeProtocolRequired = Nodejs.GetNodeVersion(nodePath) >= new Version(8, 0) || CheckDebugProtocolOption();\n+ var nodeVersion = Nodejs.GetNodeVersion(nodePath);\n+ var chromeProtocolRequired = nodeVersion >= new Version(8, 0) || CheckDebugProtocolOption();\nvar startBrowser = ShouldStartBrowser();\nif (debug && !chromeProtocolRequired)\n{\nStartWithDebugger(file);\n+ TelemetryHelper.LogDebuggingStarted(\"Node6\", nodeVersion.ToString());\n}\nelse if (debug && chromeProtocolRequired)\n{\nif (CheckUseNewChromeDebugProtocolOption())\n{\nStartWithChromeV2Debugger(file, nodePath, startBrowser);\n+ TelemetryHelper.LogDebuggingStarted(\"ChromeV2\", nodeVersion.ToString());\n}\nelse\n{\nStartAndAttachDebugger(file, nodePath, startBrowser);\n+ TelemetryHelper.LogDebuggingStarted(\"Chrome\", nodeVersion.ToString());\n}\n}\nelse\n{\nStartNodeProcess(file, nodePath, startBrowser);\n+ TelemetryHelper.LogDebuggingStarted(\"None\", nodeVersion.ToString());\n}\nreturn VSConstants.S_OK;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"diff": "@@ -14,5 +14,33 @@ namespace Microsoft.NodejsTools.Telemetry\n/// </summary>\npublic const string ProjectImported = Prefix + \"ProjectImported\";\n+ /// <summary>\n+ /// User started debugging.\n+ /// </summary>\n+ public const string DebbugerStarted = Prefix + \"DebuggerStarted\";\n+ }\n+\n+ internal static class TelemetryProperties\n+ {\n+ private const string Prefix = \"VS.NodejsTools.\";\n+\n+ /// <summary>\n+ /// The engine the user is using to debug node. Expected entries are:\n+ /// * Node6\n+ /// * Chrome\n+ /// * ChromeV2\n+ /// * None\n+ /// </summary>\n+ public const string DebuggerEngine = Prefix + \"DebuggerEngine\";\n+\n+ /// <summary>\n+ /// Wether the user started debugging inside a project or in AnyCode.\n+ /// </summary>\n+ public const string IsProject = Prefix + \"IsProject\";\n+\n+ /// <summary>\n+ /// The version of Node the user is using.\n+ /// </summary>\n+ public const string NodeVersion = Prefix + \"NodeVersion\";\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"diff": "@@ -5,6 +5,9 @@ using Microsoft.VisualStudio.Telemetry;\nnamespace Microsoft.NodejsTools.Telemetry\n{\n+ using static TelemetryEvents;\n+ using static TelemetryProperties;\n+\n/// <summary>\n/// Extensions for logging telemetry events.\n/// </summary>\n@@ -20,8 +23,17 @@ namespace Microsoft.NodejsTools.Telemetry\npublic static void LogProjectImported()\n{\n- defaultSession.PostUserTask(TelemetryEvents.ProjectImported, TelemetryResult.Success);\n+ defaultSession.PostUserTask(ProjectImported, TelemetryResult.Success);\n+ }\n+\n+ public static void LogDebuggingStarted(string debuggerName, string nodeVersion, bool isProject = true)\n+ {\n+ var userTask = new UserTaskEvent(DebbugerStarted, TelemetryResult.Success);\n+ userTask.Properties[DebuggerEngine] = debuggerName;\n+ userTask.Properties[NodeVersion] = nodeVersion;\n+ userTask.Properties[IsProject] = isProject;\n+\n+ defaultSession.PostEvent(userTask);\n}\n}\n}\n-\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Telemetry for debugging
|
410,217 |
23.05.2017 15:11:56
| 25,200 |
a6ece0fc8420f7f1aa94fdeac6a8c6a7d79fde57
|
Telemetry for NPM manager
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallViewModel.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallViewModel.cs",
"diff": "@@ -10,6 +10,7 @@ using System.Windows;\nusing System.Windows.Input;\nusing System.Windows.Threading;\nusing Microsoft.NodejsTools.Npm;\n+using Microsoft.NodejsTools.Telemetry;\nusing Microsoft.VisualStudio.Shell;\nnamespace Microsoft.NodejsTools.NpmUI\n@@ -302,6 +303,9 @@ namespace Microsoft.NodejsTools.NpmUI\nif (!string.IsNullOrEmpty(package.Name))\n{\nvar selectedVersion = this.SelectedVersion is SemverVersion ? ((SemverVersion)this.SelectedVersion).ToString() : string.Empty;\n+\n+ TelemetryHelper.LogInstallNpmPackage(package.Name, selectedVersion);\n+\nthis.npmWorker.QueueCommand(\nNpmArgumentBuilder.GetNpmInstallArguments(\npackage.Name,\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"diff": "@@ -11,6 +11,7 @@ using System.Text;\nusing System.Threading;\nusing System.Threading.Tasks;\nusing Microsoft.NodejsTools.Npm;\n+using Microsoft.NodejsTools.Telemetry;\nusing Newtonsoft.Json;\nusing Newtonsoft.Json.Linq;\n@@ -103,6 +104,8 @@ namespace Microsoft.NodejsTools.NpmUI\nreturn Enumerable.Empty<IPackage>();\n}\n+ TelemetryHelper.LogSearchNpm(filterText);\n+\nvar relativeUri = string.Format(\"/-/v1/search?text={0}\", WebUtility.UrlEncode(filterText));\nvar searchUri = new Uri(defaultRegistryUri, relativeUri);\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"diff": "@@ -7,6 +7,7 @@ using System.Linq;\nusing System.Threading;\nusing Microsoft.NodejsTools.Npm;\nusing Microsoft.NodejsTools.NpmUI;\n+using Microsoft.NodejsTools.Telemetry;\nusing Microsoft.VisualStudio;\nusing Microsoft.VisualStudio.Shell.Interop;\nusing Microsoft.VisualStudioTools;\n@@ -620,6 +621,7 @@ namespace Microsoft.NodejsTools.Project\n{\nforeach (var node in selected.OfType<DependencyNode>().Where(this.CheckValidCommandTarget))\n{\n+ TelemetryHelper.LogUnInstallNpmPackage(node.Package.Name);\nawait commander.UninstallPackageAsync(node.Package.Name);\n}\n});\n@@ -632,6 +634,8 @@ namespace Microsoft.NodejsTools.Project\nreturn;\n}\n+ TelemetryHelper.LogUnInstallNpmPackage(node.Package.Name);\n+\nawait RunNpmCommand(async commander =>\n{\nawait commander.UninstallPackageAsync(node.Package.Name);\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"diff": "@@ -18,6 +18,21 @@ namespace Microsoft.NodejsTools.Telemetry\n/// User started debugging.\n/// </summary>\npublic const string DebbugerStarted = Prefix + \"DebuggerStarted\";\n+\n+ /// <summary>\n+ /// User queried NPM for a package.\n+ /// </summary>\n+ public const string SearchNpm = Prefix + \"SearchNpm\";\n+\n+ /// <summary>\n+ /// User installed NPM package.\n+ /// </summary>\n+ public const string InstallNpm = Prefix + \"InstallNpm\";\n+\n+ /// <summary>\n+ /// User uninstalled package.\n+ /// </summary>\n+ public const string UnInstallNpm = Prefix + \"UnInstallNpm\";\n}\ninternal static class TelemetryProperties\n@@ -42,5 +57,20 @@ namespace Microsoft.NodejsTools.Telemetry\n/// The version of Node the user is using.\n/// </summary>\npublic const string NodeVersion = Prefix + \"NodeVersion\";\n+\n+ /// <summary>\n+ /// The query the user send to NPM.\n+ /// </summary>\n+ public const string NpmSearchQuery = Prefix + \"NpmSearchQuery\";\n+\n+ /// <summary>\n+ /// The NPM package being installed/uninstalled/updated.\n+ /// </summary>\n+ public const string NpmPackageName = Prefix + \"NpmPackageName\";\n+\n+ /// <summary>\n+ /// The version of the NPM package being installed/uninstalled/updated.\n+ /// </summary>\n+ public const string NpmPackageVersion = Prefix + \"NpmPackageVersion\";\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"diff": "@@ -5,6 +5,7 @@ using Microsoft.VisualStudio.Telemetry;\nnamespace Microsoft.NodejsTools.Telemetry\n{\n+ using System;\nusing static TelemetryEvents;\nusing static TelemetryProperties;\n@@ -35,5 +36,39 @@ namespace Microsoft.NodejsTools.Telemetry\ndefaultSession.PostEvent(userTask);\n}\n+\n+ public static void LogSearchNpm(string query)\n+ {\n+ var userTask = new UserTaskEvent(SearchNpm, TelemetryResult.Success);\n+ userTask.Properties[NpmSearchQuery] = query;\n+\n+ defaultSession.PostEvent(userTask);\n+ }\n+\n+ public static void LogInstallNpmPackage(string packageName, string version)\n+ {\n+ var userTask = new UserTaskEvent(InstallNpm, TelemetryResult.Success);\n+ userTask.Properties[NpmPackageName] = packageName;\n+ userTask.Properties[NpmPackageVersion] = packageName;\n+\n+ defaultSession.PostEvent(userTask);\n+ }\n+\n+ public static void LogUnInstallNpmPackage(string packageName)\n+ {\n+ var userTask = new UserTaskEvent(UnInstallNpm, TelemetryResult.Success);\n+ userTask.Properties[NpmPackageName] = packageName;\n+\n+ defaultSession.PostEvent(userTask);\n+ }\n+\n+ public static void LogUpdateNpmPackage(string packageName, string version)\n+ {\n+ var userTask = new UserTaskEvent(UpdateNpm, TelemetryResult.Success);\n+ userTask.Properties[NpmPackageName] = packageName;\n+ userTask.Properties[NpmPackageVersion] = version;\n+\n+ defaultSession.PostEvent(userTask);\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Telemetry for NPM manager
|
410,217 |
23.05.2017 15:54:08
| 25,200 |
9dd80012014d5e42277acdc2f93fbda8e96d9bf0
|
Add telemetry to Repl
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Repl/NodejsReplEvaluator.cs",
"new_path": "Nodejs/Product/Nodejs/Repl/NodejsReplEvaluator.cs",
"diff": "@@ -14,6 +14,7 @@ using System.Threading;\nusing System.Threading.Tasks;\nusing System.Web.Script.Serialization;\nusing System.Windows.Forms;\n+using Microsoft.NodejsTools.Telemetry;\nusing Microsoft.VisualStudio.Shell;\nusing Microsoft.VisualStudio.Text;\n@@ -27,6 +28,8 @@ namespace Microsoft.NodejsTools.Repl\nprivate readonly INodejsReplSite _site;\ninternal static readonly object InputBeforeReset = new object(); // used to mark buffers which are no longer valid because we've done a reset\n+ private static bool LoggedReplUse = false;\n+\npublic NodejsReplEvaluator()\n: this(VsNodejsReplSite.Site)\n{\n@@ -93,6 +96,14 @@ namespace Microsoft.NodejsTools.Repl\nreturn ExecutionResult.Failed;\n}\n+ if (!LoggedReplUse)\n+ {\n+ // we only want to log the first time each session,\n+ // and not flood the telemetry with every command.\n+ TelemetryHelper.LogReplUse();\n+ LoggedReplUse = true;\n+ }\n+\nreturn this._listener.ExecuteText(text);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"diff": "@@ -33,6 +33,11 @@ namespace Microsoft.NodejsTools.Telemetry\n/// User uninstalled package.\n/// </summary>\npublic const string UnInstallNpm = Prefix + \"UnInstallNpm\";\n+\n+ /// <summary>\n+ /// User executed some script in the interactive window.\n+ /// </summary>\n+ public const string UsedRepl = Prefix + \"UsedRepl\";\n}\ninternal static class TelemetryProperties\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"diff": "@@ -62,13 +62,9 @@ namespace Microsoft.NodejsTools.Telemetry\ndefaultSession.PostEvent(userTask);\n}\n- public static void LogUpdateNpmPackage(string packageName, string version)\n+ internal static void LogReplUse()\n{\n- var userTask = new UserTaskEvent(UpdateNpm, TelemetryResult.Success);\n- userTask.Properties[NpmPackageName] = packageName;\n- userTask.Properties[NpmPackageVersion] = version;\n-\n- defaultSession.PostEvent(userTask);\n+ defaultSession.PostUserTask(UsedRepl, TelemetryResult.Success);\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add telemetry to Repl
|
410,217 |
23.05.2017 17:06:52
| 25,200 |
7e9518006b0aa49cd07906ff72b1726de9f596c7
|
Telemetry for test adapter
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<UpgradeBackupLocation>\n</UpgradeBackupLocation>\n<OldToolsVersion>4.0</OldToolsVersion>\n+ <NuGetPackageImportStamp>\n+ </NuGetPackageImportStamp>\n</PropertyGroup>\n<Import Project=\"..\\ProjectBefore.settings\" />\n<PropertyGroup>\n<Reference Include=\"envdte90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n<EmbedInteropTypes>False</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\lib\\net45\\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.RemoteControl, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.RemoteControl.14.0.262-masterA5CACE98\\lib\\net45\\Microsoft.VisualStudio.RemoteControl.dll</HintPath>\n+ </Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.Telemetry.15.3.789-masterCC863119\\lib\\net45\\Microsoft.VisualStudio.Telemetry.dll</HintPath>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.TestPlatform.ObjectModel\">\n<HintPath>$(DevEnvDir)CommonExtensions\\Microsoft\\TestWindow\\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>\n<Private>False</Private>\n<Reference Include=\"Microsoft.VisualStudio.ComponentModelHost, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"Microsoft.VisualStudio.CoreUtility\" />\n<Reference Include=\"Microsoft.VisualStudio.OLE.Interop\" />\n+ <Reference Include=\"Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.Utilities.Internal.14.0.72-masterF9EB1D39\\lib\\net45\\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>\n+ </Reference>\n<Reference Include=\"Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Newtonsoft.Json.8.0.3\\lib\\net45\\Newtonsoft.Json.dll</HintPath>\n</Reference>\n</Compile>\n</ItemGroup>\n<ItemGroup>\n+ <None Include=\"app.config\" />\n<None Include=\"packages.config\" />\n</ItemGroup>\n+ <ItemGroup>\n+ <Content Include=\"version.txt\" />\n+ </ItemGroup>\n<Import Project=\"$(BuildRoot)\\Nodejs\\Product\\Nodejs\\SourceMapping\\SourceMapping.proj\" />\n<Import Project=\"..\\ProjectAfter.settings\" />\n<Import Project=\"$(SolutionDir)\\.nuget\\NuGet.targets\" Condition=\"Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" />\n<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n</PropertyGroup>\n<Error Condition=\"!Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\\.nuget\\NuGet.targets'))\" />\n+ <Error Condition=\"!Exists('..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))\" />\n</Target>\n+ <Import Project=\"..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets\" Condition=\"Exists('..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')\" />\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutor.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutor.cs",
"diff": "@@ -10,6 +10,7 @@ using System.Runtime.InteropServices;\nusing System.Text;\nusing System.Threading;\nusing Microsoft.NodejsTools.TestAdapter.TestFrameworks;\n+using Microsoft.VisualStudio.Telemetry;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;\n@@ -182,6 +183,16 @@ namespace Microsoft.NodejsTools.TestAdapter\n}\n}\n+ private void LogTelemetry(int testCount, bool isDebugging)\n+ {\n+ var userTask = new UserTaskEvent(\"VS/NodejsTools/UnitTestsExecuted\", TelemetryResult.Success);\n+ userTask.Properties[\"VS.NodejsTools.TestCount\"] = testCount;\n+ userTask.Properties[\"VS.NodejsTools.IsDebugging\"] = isDebugging;\n+\n+ var defaultSession = TelemetryService.DefaultSession;\n+ defaultSession.PostEvent(userTask);\n+ }\n+\nprivate void RunTestCases(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle, NodejsProjectSettings settings)\n{\n// May be null, but this is handled by RunTestCase if it matters.\n@@ -191,6 +202,7 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\nreturn;\n}\n+\nusing (var app = VisualStudioApp.FromEnvironmentVariable(NodejsConstants.NodeToolsProcessIdEnvironmentVariable))\n{\nvar port = 0;\n@@ -209,6 +221,14 @@ namespace Microsoft.NodejsTools.TestAdapter\nvar testInfo = new NodejsTestInfo(tests.First().FullyQualifiedName);\nvar workingDir = Path.GetDirectoryName(CommonUtils.GetAbsoluteFilePath(settings.WorkingDir, testInfo.ModulePath));\n+ // we can only log telemetry when we're running in VS,\n+ // the required assemblies are not on disk, so we have to keep the call in a separate method\n+ // this way the .NET framework only loads the assemblies when we actually need them.\n+ if (app != null)\n+ {\n+ LogTelemetry(tests.Count(), runContext.IsBeingDebugged);\n+ }\n+\nforeach (var test in tests)\n{\nif (_cancelRequested.WaitOne(0))\n@@ -365,7 +385,8 @@ namespace Microsoft.NodejsTools.TestAdapter\n};\n}\n- private void RecordEnd(IFrameworkHandle frameworkHandle, TestCase test, TestResult result, ResultObject resultObject) {\n+ private void RecordEnd(IFrameworkHandle frameworkHandle, TestCase test, TestResult result, ResultObject resultObject)\n+ {\nString[] standardOutputLines = resultObject.stdout.Split('\\n');\nString[] standardErrorLines = resultObject.stderr.Split('\\n');\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/TestAdapter/version.txt",
"diff": "+AssemblyFileVersion=15.3-master\n+AssemblyVersion=15.0\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Telemetry for test adapter
|
410,217 |
17.05.2017 14:47:43
| 25,200 |
55acb18a1f561bbc242daf3cf3d6006b0364461e
|
Modernize Tuples
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/ReplWindow/Repl/InlineReplAdornmentManager.cs",
"new_path": "Common/Product/ReplWindow/Repl/InlineReplAdornmentManager.cs",
"diff": "@@ -12,13 +12,13 @@ namespace Microsoft.NodejsTools.Repl\ninternal class InlineReplAdornmentManager : ITagger<IntraTextAdornmentTag>\n{\nprivate readonly ITextView _textView;\n- private readonly List<Tuple<SnapshotPoint, ZoomableInlineAdornment>> _tags;\n+ private readonly List<(SnapshotPoint, ZoomableInlineAdornment)> _tags;\nprivate readonly Dispatcher _dispatcher;\ninternal InlineReplAdornmentManager(ITextView textView)\n{\n_textView = textView;\n- _tags = new List<Tuple<SnapshotPoint, ZoomableInlineAdornment>>();\n+ _tags = new List<(SnapshotPoint, ZoomableInlineAdornment)>();\n_dispatcher = Dispatcher.CurrentDispatcher;\n}\n@@ -30,10 +30,9 @@ namespace Microsoft.NodejsTools.Repl\nif (_tags[i].Item1.Snapshot != _textView.TextSnapshot)\n{\n// update to the latest snapshot\n- _tags[i] = new Tuple<SnapshotPoint, ZoomableInlineAdornment>(\n+ _tags[i] = (\n_tags[i].Item1.TranslateTo(_textView.TextSnapshot, PointTrackingMode.Negative),\n- _tags[i].Item2\n- );\n+ _tags[i].Item2);\n}\nvar span = new SnapshotSpan(_textView.TextSnapshot, _tags[i].Item1, 0);\n@@ -64,7 +63,7 @@ namespace Microsoft.NodejsTools.Repl\nreturn;\n}\nvar targetLine = targetLoc.GetContainingLine();\n- _tags.Add(new Tuple<SnapshotPoint, ZoomableInlineAdornment>(targetLoc, uiElement));\n+ _tags.Add((targetLoc, uiElement));\nvar handler = TagsChanged;\nif (handler != null)\n{\n@@ -74,17 +73,10 @@ namespace Microsoft.NodejsTools.Repl\n}\n}\n- public IList<Tuple<SnapshotPoint, ZoomableInlineAdornment>> Adornments\n- {\n- get { return _tags; }\n- }\n+ public IList<(SnapshotPoint, ZoomableInlineAdornment)> Adornments => _tags;\n- public void RemoveAll()\n- {\n- _tags.Clear();\n- }\n+ public void RemoveAll() => _tags.Clear();\npublic event EventHandler<SnapshotSpanEventArgs> TagsChanged;\n}\n}\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"new_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"diff": "<Reference Include=\"System.Data\" />\n<Reference Include=\"System.Design\" />\n<Reference Include=\"System.Drawing\" />\n+ <Reference Include=\"System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\System.ValueTuple.4.4.0-preview1-25305-02\\lib\\netstandard1.0\\System.ValueTuple.dll</HintPath>\n+ </Reference>\n<Reference Include=\"System.Windows.Forms\" />\n<Reference Include=\"System.Xaml\" />\n<Reference Include=\"System.Xml\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n</ItemGroup>\n<ItemGroup>\n+ <None Include=\"packages.config\" />\n<None Include=\"source.extension.vsixmanifest\">\n<SubType>Designer</SubType>\n</None>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Jade/ServiceManager.cs",
"new_path": "Nodejs/Product/Nodejs/Jade/ServiceManager.cs",
"diff": "@@ -16,7 +16,7 @@ namespace Microsoft.NodejsTools.Jade\nprivate Dictionary<Type, object> _servicesByType = new Dictionary<Type, object>();\nprivate Dictionary<Guid, object> _servicesByGuid = new Dictionary<Guid, object>();\n- private Dictionary<Tuple<Type, string>, object> _servicesByContentType = new Dictionary<Tuple<Type, string>, object>();\n+ private Dictionary<(Type, string), object> _servicesByContentType = new Dictionary<(Type, string), object>();\nprivate ServiceManager(IPropertyOwner propertyOwner)\n{\n@@ -209,7 +209,7 @@ namespace Microsoft.NodejsTools.Jade\n{\nobject service = null;\n- this._servicesByContentType.TryGetValue(Tuple.Create(typeof(T), contentType.TypeName), out service);\n+ this._servicesByContentType.TryGetValue((typeof(T), contentType.TypeName), out service);\nif (service != null)\nreturn service as T;\n@@ -293,7 +293,7 @@ namespace Microsoft.NodejsTools.Jade\n{\nif (GetService<T>(contentType) == null)\n{\n- this._servicesByContentType.Add(Tuple.Create(typeof(T), contentType.TypeName), serviceInstance);\n+ this._servicesByContentType.Add((typeof(T), contentType.TypeName), serviceInstance);\n}\n}\n}\n@@ -316,7 +316,7 @@ namespace Microsoft.NodejsTools.Jade\n{\nlock (this._lock)\n{\n- this._servicesByContentType.Remove(Tuple.Create(typeof(T), contentType.TypeName));\n+ this._servicesByContentType.Remove((typeof(T), contentType.TypeName));\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Reference Include=\"System.Design\" />\n<Reference Include=\"System.Drawing\" />\n<Reference Include=\"System.Runtime.Serialization\" />\n+ <Reference Include=\"System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\System.ValueTuple.4.4.0-preview1-25305-02\\lib\\netstandard1.0\\System.ValueTuple.dll</HintPath>\n+ </Reference>\n<Reference Include=\"System.Web\" />\n<Reference Include=\"System.Web.Extensions\" />\n<Reference Include=\"System.Windows.Forms\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Repl/NpmReplCommand.cs",
"new_path": "Nodejs/Product/Nodejs/Repl/NpmReplCommand.cs",
"diff": "@@ -54,7 +54,7 @@ namespace Microsoft.NodejsTools.Repl\nvar solution = Package.GetGlobalService(typeof(SVsSolution)) as IVsSolution;\nvar loadedProjects = solution.EnumerateLoadedProjects(onlyNodeProjects: false);\n- var projectNameToDirectoryDictionary = new Dictionary<string, Tuple<string, IVsHierarchy>>(StringComparer.OrdinalIgnoreCase);\n+ var projectNameToDirectoryDictionary = new Dictionary<string, (string name, IVsHierarchy hierarchy)>(StringComparer.OrdinalIgnoreCase);\nforeach (var project in loadedProjects)\n{\nvar hierarchy = (IVsHierarchy)project;\n@@ -97,7 +97,7 @@ namespace Microsoft.NodejsTools.Repl\nvar projectHomeDirectory = projectHome.Value as string;\nif (!string.IsNullOrEmpty(projectHomeDirectory))\n{\n- projectNameToDirectoryDictionary.Add(projectName, Tuple.Create(projectHomeDirectory, hierarchy));\n+ projectNameToDirectoryDictionary.Add(projectName, (projectHomeDirectory, hierarchy));\ncontinue;\n}\n}\n@@ -107,11 +107,11 @@ namespace Microsoft.NodejsTools.Repl\nvar projectDirectory = string.IsNullOrEmpty(dteProject.FullName) ? null : Path.GetDirectoryName(dteProject.FullName);\nif (!string.IsNullOrEmpty(projectDirectory))\n{\n- projectNameToDirectoryDictionary.Add(projectName, Tuple.Create(projectDirectory, hierarchy));\n+ projectNameToDirectoryDictionary.Add(projectName, (projectDirectory, hierarchy));\n}\n}\n- Tuple<string, IVsHierarchy> projectInfo;\n+ (string Path, IVsHierarchy Hierarchy) projectInfo;\nif (string.IsNullOrEmpty(projectPath) && projectNameToDirectoryDictionary.Count == 1)\n{\nprojectInfo = projectNameToDirectoryDictionary.Values.First();\n@@ -122,13 +122,10 @@ namespace Microsoft.NodejsTools.Repl\n}\nNodejsProjectNode nodejsProject = null;\n- if (projectInfo != null)\n- {\n- projectPath = projectInfo.Item1;\n+ projectPath = projectInfo.Path;\nif (projectInfo.Item2 != null)\n{\n- nodejsProject = projectInfo.Item2.GetProject().GetNodejsProject();\n- }\n+ nodejsProject = projectInfo.Hierarchy.GetProject().GetNodejsProject();\n}\nvar isGlobalCommand = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/packages.config",
"new_path": "Nodejs/Product/Nodejs/packages.config",
"diff": "<package id=\"Microsoft.VisualStudio.Validation\" version=\"15.0.82\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Workspaces\" version=\"15.0.215-pre\" targetFramework=\"net46\" />\n<package id=\"Newtonsoft.Json\" version=\"8.0.3\" targetFramework=\"net46\" />\n+ <package id=\"System.ValueTuple\" version=\"4.4.0-preview1-25305-02\" targetFramework=\"net46\" />\n</packages>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Modernize Tuples
|
410,217 |
26.05.2017 11:17:22
| 25,200 |
245acc190b99740d0078d49002161e0c14bb1d1c
|
Remove profiling from build
|
[
{
"change_type": "MODIFY",
"old_path": "Build/UpdateVsixVersion.ps1",
"new_path": "Build/UpdateVsixVersion.ps1",
"diff": "@@ -50,4 +50,3 @@ function Update-Manifest\nUpdate-Manifest 'InteractiveWindow'\nUpdate-Manifest 'NodeJs'\n-Update-Manifest 'Profiling'\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/dirs.proj",
"new_path": "Nodejs/Product/dirs.proj",
"diff": "<ProjectFile Include=\"Npm\\Npm.csproj\"/>\n<ProjectFile Include=\"PressAnyKey\\PressAnyKey.csproj\"/>\n<ProjectFile Include=\"WebRole\\WebRole.csproj\"/>\n-\n- <ProjectFile Include=\"LogConverter\\LogConverter.csproj\"/>\n-\n<ProjectFile Include=\"Nodejs\\Nodejs.csproj\"/>\n-\n- <ProjectFile Include=\"Profiling\\Profiling.csproj\"/>\n-\n<ProjectFile Include=\"TestAdapter\\TestAdapter.csproj\"/>\n</ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/setup-swix.proj",
"new_path": "Nodejs/Setup/setup-swix.proj",
"diff": "<ItemGroup>\n<ProjectFile Include=\"swix\\Microsoft.VisualStudio.NodejsTools.Targets.swixproj\"/>\n<ProjectFile Include=\"swix\\NodejsTools.vsmanproj\"/>\n- <ProjectFile Include=\"swix\\NodejsTools.Profiling.vsmanproj\" />\n</ItemGroup>\n<Import Project=\"$(TargetsPath)\\Common.Build.Traversal.targets\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove profiling from build
|
410,217 |
26.05.2017 11:41:23
| 25,200 |
6ff387aabc96000bcd545b773f2890439b2bfd17
|
Fixes an issue where the NPM UI would not update on Install
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/PackageCatalogEntryViewModel.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/PackageCatalogEntryViewModel.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Linq;\n+using System.Windows;\nusing Microsoft.NodejsTools.Npm;\nnamespace Microsoft.NodejsTools.NpmUI\n@@ -34,12 +35,26 @@ namespace Microsoft.NodejsTools.NpmUI\n}\npublic virtual string Name { get; }\n+\n+ public string Version => this.version?.ToString() ?? string.Empty;\n+\npublic IEnumerable<SemverVersion> AvailableVersions { get; }\n+\npublic string Author { get; }\n+ public Visibility AuthorVisibility => string.IsNullOrEmpty(this.Author) ? Visibility.Collapsed : Visibility.Visible;\n+\npublic string Description { get; }\n+ public Visibility DescriptionVisibility => string.IsNullOrEmpty(this.Description) ? Visibility.Collapsed : Visibility.Visible;\n+\npublic IEnumerable<string> Homepages { get; }\n+ public Visibility HomepagesVisibility => this.Homepages.Any() ? Visibility.Visible : Visibility.Collapsed;\n+\npublic string Keywords { get; }\n+ public bool IsInstalledLocally => this.localVersion.HasValue;\n+ public bool IsLocalInstallOutOfDate => this.localVersion.HasValue && this.localVersion < this.version;\n+ public string LocalVersion => this.localVersion?.ToString() ?? string.Empty;\n+\npublic override string ToString()\n{\nreturn this.Name;\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixes an issue where the NPM UI would not update on Install
|
410,217 |
26.05.2017 11:47:52
| 25,200 |
68a1c5e42d81bc5199ae10b6ee4e3f0501948df7
|
Fixes issue where the search icon would be overtyped with a long search query
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"diff": "Text=\"{Binding FilterText,UpdateSourceTrigger=PropertyChanged}\"\nPreviewKeyDown=\"FilterTextBox_PreviewKeyDown\"\nTabIndex=\"0\"\n- AutomationProperties.Name=\"{x:Static resx:NpmInstallWindowResources.SearchForPackagesLabel}\" />\n+ AutomationProperties.Name=\"{x:Static resx:NpmInstallWindowResources.SearchForPackagesLabel}\"\n+ Padding=\"0,0,15,0\"/>\n<TextBlock IsEnabled=\"False\" Background=\"{x:Null}\"\nFocusable=\"False\"\nIsHitTestVisible=\"False\"\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixes issue where the search icon would be overtyped with a long search query
|
410,217 |
05.06.2017 14:14:14
| 25,200 |
1a74c0eea54a0528b8bf70b8fc5db92312fbd95f
|
Enable sourcelink support for NodeTools
This requires portable PDBs, and VS 15.3/VS Code
This only affects our MicroBuilds.
|
[
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.CSharp.settings",
"new_path": "Build/Common.Build.CSharp.settings",
"diff": "</PropertyGroup>\n<PropertyGroup Condition=\" '$(Configuration)' == 'Release' \">\n- <DebugType>pdbonly</DebugType>\n+ <DebugType>portable</DebugType>\n<Optimize>true</Optimize>\n<DefineConstants>TRACE;$(DefineConstants)</DefineConstants>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"new_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"diff": "<UpgradeBackupLocation>\n</UpgradeBackupLocation>\n<OldToolsVersion>4.0</OldToolsVersion>\n+ <NuGetPackageImportStamp>\n+ </NuGetPackageImportStamp>\n</PropertyGroup>\n<Import Project=\"..\\ProjectBefore.settings\" />\n<PropertyGroup>\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n</ItemGroup>\n<ItemGroup>\n+ <None Include=\"packages.config\" />\n<None Include=\"source.extension.vsixmanifest\">\n<SubType>Designer</SubType>\n</None>\n</PropertyGroup>\n<Import Project=\"$(BuildRoot)\\Common\\Product\\ReplWindow\\ReplWindow.proj\" />\n<Import Project=\"..\\ProjectAfter.settings\" />\n+ <Import Project=\"..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets\" Condition=\"Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" />\n+ <Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n+ <PropertyGroup>\n+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n+ </PropertyGroup>\n+ <Error Condition=\"!Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets'))\" />\n+ </Target>\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "</PropertyGroup>\n<Error Condition=\"!Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\\.nuget\\NuGet.targets'))\" />\n<Error Condition=\"!Exists('..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))\" />\n+ <Error Condition=\"!Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets'))\" />\n</Target>\n<!-- To modify your build process, add your task inside one of the targets below and uncomment it.\nOther similar extension points exist, see Microsoft.Common.targets.\n<Delete Files=\"@(_CopiedForCreatePkgdef)\" />\n</Target>\n<Import Project=\"..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets\" Condition=\"Exists('..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')\" />\n+ <Import Project=\"..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets\" Condition=\"Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" />\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/packages.config",
"new_path": "Nodejs/Product/Nodejs/packages.config",
"diff": "<package id=\"Microsoft.VisualStudio.Validation\" version=\"15.0.82\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Workspaces\" version=\"15.0.215-pre\" targetFramework=\"net46\" />\n<package id=\"Newtonsoft.Json\" version=\"8.0.3\" targetFramework=\"net46\" />\n+ <package id=\"SourceLink.Create.CommandLine\" version=\"2.1.2\" targetFramework=\"net46\" />\n</packages>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Npm.csproj",
"new_path": "Nodejs/Product/Npm/Npm.csproj",
"diff": "<UpgradeBackupLocation>\n</UpgradeBackupLocation>\n<OldToolsVersion>4.0</OldToolsVersion>\n+ <NuGetPackageImportStamp>\n+ </NuGetPackageImportStamp>\n</PropertyGroup>\n<Import Project=\"..\\ProjectBefore.settings\" />\n<PropertyGroup>\n</ItemGroup>\n<Import Project=\"..\\ProjectAfter.settings\" />\n<Import Project=\"$(SolutionDir)\\.nuget\\nuget.targets\" />\n+ <Import Project=\"..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets\" Condition=\"Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" />\n+ <Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n+ <PropertyGroup>\n+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n+ </PropertyGroup>\n+ <Error Condition=\"!Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets'))\" />\n+ </Target>\n<!-- To modify your build process, add your task inside one of the targets below and uncomment it.\nOther similar extension points exist, see Microsoft.Common.targets.\n<Target Name=\"BeforeBuild\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/packages.config",
"new_path": "Nodejs/Product/Npm/packages.config",
"diff": "<packages>\n<package id=\"MicroBuild.Core\" version=\"0.2.0\" targetFramework=\"net46\" />\n<package id=\"Newtonsoft.Json\" version=\"8.0.3\" targetFramework=\"net46\" />\n+ <package id=\"SourceLink.Create.CommandLine\" version=\"2.1.2\" targetFramework=\"net46\" />\n</packages>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"new_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"diff": "<UpgradeBackupLocation>\n</UpgradeBackupLocation>\n<OldToolsVersion>4.0</OldToolsVersion>\n+ <NuGetPackageImportStamp>\n+ </NuGetPackageImportStamp>\n</PropertyGroup>\n<Import Project=\"..\\ProjectBefore.settings\" />\n<PropertyGroup>\n</ItemGroup>\n<ItemGroup>\n<None Include=\"App.config\" />\n+ <None Include=\"packages.config\" />\n</ItemGroup>\n<Import Project=\"..\\ProjectAfter.settings\" />\n+ <Import Project=\"..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets\" Condition=\"Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" />\n+ <Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n+ <PropertyGroup>\n+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n+ </PropertyGroup>\n+ <Error Condition=\"!Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets'))\" />\n+ </Target>\n<!-- To modify your build process, add your task inside one of the targets below and uncomment it.\nOther similar extension points exist, see Microsoft.Common.targets.\n<Target Name=\"BeforeBuild\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<UpgradeBackupLocation>\n</UpgradeBackupLocation>\n<OldToolsVersion>4.0</OldToolsVersion>\n+ <NuGetPackageImportStamp>\n+ </NuGetPackageImportStamp>\n</PropertyGroup>\n<Import Project=\"..\\ProjectBefore.settings\" />\n<PropertyGroup>\n<EmbeddedResource Include=\"ProjectWizardResources.zh-Hans.resx\" />\n<EmbeddedResource Include=\"ProjectWizardResources.zh-Hant.resx\" />\n</ItemGroup>\n+ <ItemGroup>\n+ <None Include=\"app.config\" />\n+ <None Include=\"packages.config\" />\n+ </ItemGroup>\n<Import Project=\"..\\Nodejs\\SharedResources.proj\" />\n<Import Project=\"..\\ProjectAfter.settings\" />\n+ <Import Project=\"..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets\" Condition=\"Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" />\n+ <Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n+ <PropertyGroup>\n+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n+ </PropertyGroup>\n+ <Error Condition=\"!Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets'))\" />\n+ </Target>\n<!-- To modify your build process, add your task inside one of the targets below and uncomment it.\nOther similar extension points exist, see Microsoft.Common.targets.\n<Target Name=\"BeforeBuild\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "</PropertyGroup>\n<Error Condition=\"!Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\\.nuget\\NuGet.targets'))\" />\n<Error Condition=\"!Exists('..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))\" />\n+ <Error Condition=\"!Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets'))\" />\n</Target>\n<Import Project=\"..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets\" Condition=\"Exists('..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\\build\\portable-net45+win8+wpa81\\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')\" />\n+ <Import Project=\"..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets\" Condition=\"Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" />\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/packages.config",
"new_path": "Nodejs/Product/TestAdapter/packages.config",
"diff": "<package id=\"Microsoft.VisualStudio.Telemetry\" version=\"15.3.789-masterCC863119\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Utilities.Internal\" version=\"14.0.72-masterF9EB1D39\" targetFramework=\"net46\" />\n<package id=\"Newtonsoft.Json\" version=\"8.0.3\" targetFramework=\"net46\" />\n+ <package id=\"SourceLink.Create.CommandLine\" version=\"2.1.2\" targetFramework=\"net46\" />\n</packages>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/WebRole/WebRole.csproj",
"new_path": "Nodejs/Product/WebRole/WebRole.csproj",
"diff": "<UpgradeBackupLocation>\n</UpgradeBackupLocation>\n<OldToolsVersion>4.0</OldToolsVersion>\n+ <NuGetPackageImportStamp>\n+ </NuGetPackageImportStamp>\n</PropertyGroup>\n<Import Project=\"..\\ProjectBefore.settings\" />\n<PropertyGroup>\n</Compile>\n<EmbeddedResource Include=\"WebSocketProxy.html\" />\n</ItemGroup>\n+ <ItemGroup>\n+ <None Include=\"packages.config\" />\n+ </ItemGroup>\n<Import Project=\"..\\ProjectAfter.settings\" />\n<Import Project=\"$(MSBuildExtensionsPath32)\\Microsoft\\VisualStudio\\v$(VSTarget)\\WebApplications\\Microsoft.WebApplication.targets\" />\n+ <Import Project=\"..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets\" Condition=\"Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" />\n+ <Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n+ <PropertyGroup>\n+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n+ </PropertyGroup>\n+ <Error Condition=\"!Exists('..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\SourceLink.Create.CommandLine.2.1.2\\build\\SourceLink.Create.CommandLine.targets'))\" />\n+ </Target>\n<!-- To modify your build process, add your task inside one of the targets below and uncomment it.\nOther similar extension points exist, see Microsoft.Common.targets.\n<Target Name=\"BeforeBuild\">\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Enable sourcelink support for NodeTools
This requires portable PDBs, and VS 15.3/VS Code
This only affects our MicroBuilds.
|
410,217 |
06.06.2017 13:01:44
| 25,200 |
38c8bf001020ee9c3f9ae32355c9cab8f127ff20
|
Checkout package.json before editinggit
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/ErrorHelper.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/ErrorHelper.cs",
"diff": "@@ -89,5 +89,12 @@ namespace Microsoft.NodejsTools.NpmUI\nMessageBoxImage.Error);\n}\n}\n+\n+ public static void ReportPackageJsonNotCheckedOut(Window owner)\n+ {\n+ var message = Resources.PackageJsonNotCheckedOutMessage;\n+ var caption = Resources.PackageJsonNotCheckedOutCaption;\n+ MessageBox.Show(message, caption, MessageBoxButton.OK, MessageBoxImage.Error);\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Globalization;\n+using System.IO;\nusing System.Linq;\nusing System.Threading;\n+using System.Windows;\nusing Microsoft.NodejsTools.Npm;\nusing Microsoft.NodejsTools.NpmUI;\nusing Microsoft.NodejsTools.Telemetry;\n@@ -39,7 +41,6 @@ namespace Microsoft.NodejsTools.Project\nprivate readonly LocalModulesNode _optionalModulesNode;\nprivate Timer _npmIdleTimer;\n- private INpmController _npmController;\nprivate int _npmCommandsExecuting;\nprivate bool _suppressCommands;\nprivate bool _firstHierarchyLoad = true;\n@@ -55,8 +56,8 @@ namespace Microsoft.NodejsTools.Project\npublic NodeModulesNode(NodejsProjectNode root)\n: base(root)\n{\n- this._npmController = DefaultNpmController(this._projectNode.ProjectHome, new NpmPathProvider(this));\n- RegisterWithNpmController(this._npmController);\n+ this.NpmController = DefaultNpmController(this._projectNode.ProjectHome, new NpmPathProvider(this));\n+ RegisterWithNpmController(this.NpmController);\nthis._devModulesNode = new LocalModulesNode(root, this, \"dev\", \"DevelopmentModules\", DependencyType.Development);\nAddChild(this._devModulesNode);\n@@ -78,21 +79,21 @@ namespace Microsoft.NodejsTools.Project\n{\nif (!this._isDisposed)\n{\n- this._npmController.Dispose();\n+ this.NpmController.Dispose();\n- if (null != this._npmIdleTimer)\n+ if (this._npmIdleTimer != null)\n{\nthis._npmIdleTimer.Dispose();\nthis._npmIdleTimer = null;\n}\n- if (null != this._npmController)\n+ if (this.NpmController != null)\n{\n- this._npmController.CommandStarted -= this.NpmController_CommandStarted;\n- this._npmController.OutputLogged -= this.NpmController_OutputLogged;\n- this._npmController.ErrorLogged -= this.NpmController_ErrorLogged;\n- this._npmController.ExceptionLogged -= this.NpmController_ExceptionLogged;\n- this._npmController.CommandCompleted -= this.NpmController_CommandCompleted;\n+ this.NpmController.CommandStarted -= this.NpmController_CommandStarted;\n+ this.NpmController.OutputLogged -= this.NpmController_OutputLogged;\n+ this.NpmController.ErrorLogged -= this.NpmController_ErrorLogged;\n+ this.NpmController.ExceptionLogged -= this.NpmController_ExceptionLogged;\n+ this.NpmController.CommandCompleted -= this.NpmController_CommandCompleted;\n}\nthis._devModulesNode.Dispose();\n@@ -148,7 +149,7 @@ namespace Microsoft.NodejsTools.Project\nReloadHierarchySafe();\n}\n- public INpmController NpmController => this._npmController;\n+ public INpmController NpmController { get; }\ninternal IRootPackage RootPackage => this.NpmController?.RootPackage;\n@@ -331,8 +332,8 @@ namespace Microsoft.NodejsTools.Project\nreturn;\n}\n- var controller = this._npmController;\n- if (null == controller)\n+ var controller = this.NpmController;\n+ if (controller == null)\n{\nreturn;\n}\n@@ -476,6 +477,14 @@ namespace Microsoft.NodejsTools.Project\n{\nCheckNotDisposed();\n+ // Probably overkill to check out before the user actually makes changes, but this is the easiest\n+ // and most reliable in the current codebase.\n+ if (!EnsurePackageJsonCheckedOut())\n+ {\n+ ErrorHelper.ReportPackageJsonNotCheckedOut(Application.Current.MainWindow);\n+ return;\n+ }\n+\nif (this.NpmController.RootPackage == null)\n{\nthis.NpmController.Refresh();\n@@ -489,7 +498,7 @@ namespace Microsoft.NodejsTools.Project\nusing (var npmWorker = new NpmWorker(this.NpmController))\nusing (var manager = new NpmPackageInstallWindow(this.NpmController, npmWorker, dependencyType))\n{\n- manager.Owner = System.Windows.Application.Current.MainWindow;\n+ manager.Owner = Application.Current.MainWindow;\nmanager.ShowModal();\n}\nReloadHierarchy();\n@@ -501,6 +510,18 @@ namespace Microsoft.NodejsTools.Project\nSuppressCommands();\n}\n+ private bool EnsurePackageJsonCheckedOut()\n+ {\n+ // No need to check if the files exist or is actually under sourcecontrol before the call to check them out,\n+ // since the API handles that and returns QER_EditOK.\n+ var packageJsonFileName = Path.Combine(this.NpmController.RootPackage.Path, \"package.json\");\n+ var packageJsonLockFileName = Path.Combine(this.NpmController.RootPackage.Path, \"package-lock.json\");\n+\n+ var queryEditService = (IVsQueryEditQuerySave2)this._projectNode.GetService(typeof(SVsQueryEditQuerySave));\n+ queryEditService.QueryEditFiles((uint)tagVSQueryEditFlags.QEF_DisallowInMemoryEdits, 1, new[] { packageJsonFileName, packageJsonLockFileName }, null, null, out var result, out var _);\n+ return result == (uint)tagVSQueryEditResult.QER_EditOK;\n+ }\n+\nprivate bool CheckValidCommandTarget(DependencyNode node)\n{\nif (null == node)\n@@ -523,6 +544,12 @@ namespace Microsoft.NodejsTools.Project\nprivate async System.Threading.Tasks.Task RunNpmCommand(Func<INpmCommander, System.Threading.Tasks.Task> impl)\n{\nDoPreCommandActions();\n+ if (!EnsurePackageJsonCheckedOut())\n+ {\n+ ErrorHelper.ReportPackageJsonNotCheckedOut(Application.Current.MainWindow);\n+ return;\n+ }\n+\ntry\n{\nusing (var commander = this.NpmController.CreateNpmCommander())\n@@ -552,8 +579,8 @@ namespace Microsoft.NodejsTools.Project\nreturn;\n}\n- var root = this._npmController.RootPackage;\n- if (null == root)\n+ var root = this.NpmController.RootPackage;\n+ if (root == null)\n{\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"diff": "@@ -1647,5 +1647,23 @@ namespace Microsoft.NodejsTools {\nreturn ResourceManager.GetString(\"WorkingDirToolTip\", resourceCulture);\n}\n}\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to Package.json not checked out.\n+ /// </summary>\n+ public static string PackageJsonNotCheckedOutCaption {\n+ get {\n+ return ResourceManager.GetString(\"PackageJsonNotCheckedOutCaption\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to Failed to checkout 'package.json'. Please ..\n+ /// </summary>\n+ public static string PackageJsonNotCheckedOutMessage {\n+ get {\n+ return ResourceManager.GetString(\"PackageJsonNotCheckedOutMessage\", resourceCulture);\n+ }\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.en.resx",
"new_path": "Nodejs/Product/Nodejs/Resources.en.resx",
"diff": "@@ -656,4 +656,10 @@ Error retrieving websocket debug proxy information from web.config.</value>\n<data name=\"PropertiesBrowseDirectoryAccessibleName\" xml:space=\"preserve\">\n<value>Browse for working directory</value>\n</data>\n+ <data name=\"PackageJsonNotCheckedOutCaption\" xml:space=\"preserve\">\n+ <value>Package.json not checked out</value>\n+ </data>\n+ <data name=\"PackageJsonNotCheckedOutMessage\" xml:space=\"preserve\">\n+ <value>Failed to checkout 'package.json'. Please ensure the file is checked out, before adding or removing NPM packages.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Checkout package.json before editinggit
|
410,217 |
08.06.2017 13:33:44
| 25,200 |
48f87cdcf3fb3b79971135ad0b9878523eac439b
|
PR Feedback
Thanks
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/ErrorHelper.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/ErrorHelper.cs",
"diff": "@@ -94,7 +94,7 @@ namespace Microsoft.NodejsTools.NpmUI\n{\nvar message = Resources.PackageJsonNotCheckedOutMessage;\nvar caption = Resources.PackageJsonNotCheckedOutCaption;\n- MessageBox.Show(message, caption, MessageBoxButton.OK, MessageBoxImage.Error);\n+ MessageBox.Show(owner, message, caption, MessageBoxButton.OK, MessageBoxImage.Error);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"diff": "@@ -514,12 +514,14 @@ namespace Microsoft.NodejsTools.Project\n{\n// No need to check if the files exist or is actually under source control before the call to check them out,\n// since the API handles that and returns QER_EditOK.\n- var packageJsonFileName = Path.Combine(this.NpmController.RootPackage.Path, \"package.json\");\n- var packageJsonLockFileName = Path.Combine(this.NpmController.RootPackage.Path, \"package-lock.json\");\n+\n+ var rootPath = this.NpmController.RootPackage.Path;\n+ var packageJsonFileName = Path.Combine(rootPath, \"package.json\");\n+ var packageJsonLockFileName = Path.Combine(rootPath, \"package-lock.json\");\nvar queryEditService = (IVsQueryEditQuerySave2)this._projectNode.GetService(typeof(SVsQueryEditQuerySave));\n- queryEditService.QueryEditFiles((uint)tagVSQueryEditFlags.QEF_DisallowInMemoryEdits, 1, new[] { packageJsonFileName, packageJsonLockFileName }, null, null, out var result, out var _);\n- return result == (uint)tagVSQueryEditResult.QER_EditOK;\n+ var hr = queryEditService.QueryEditFiles((uint)tagVSQueryEditFlags.QEF_DisallowInMemoryEdits, 1, new[] { packageJsonFileName, packageJsonLockFileName }, null, null, out var result, out var _);\n+ return ErrorHandler.Succeeded(hr) && result == (uint)tagVSQueryEditResult.QER_EditOK;\n}\nprivate bool CheckValidCommandTarget(DependencyNode node)\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
PR Feedback
Thanks @amcasey
|
410,217 |
08.06.2017 13:49:02
| 25,200 |
9984239fa4ce9ba8f9f5d196fd1c9311d4e7aa83
|
cleanup signlist
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/BuildRelease.ps1",
"new_path": "Nodejs/Setup/BuildRelease.ps1",
"diff": "@@ -154,10 +154,10 @@ $project_url = \"https://github.com/Microsoft/nodejstools\"\n$project_keywords = \"NTVS; Visual Studio; Node.js\"\n# These people are able to approve code signing operations\n-$approvers = \"smortaz\", \"dinov\", \"stevdo\", \"pminaev\", \"huvalo\", \"jinglou\", \"sitani\", \"crwilcox\"\n+$approvers = \"pvanbren\", \"billti\", \"mhegazy\"\n# These people are the contacts for the symbols uploaded to the symbol server\n-$symbol_contacts = \"$env:username;dinov;smortaz;jinglou\"\n+$symbol_contacts = \"$env:username;pvanbren;billti\"\n# This single person or DL is the contact for virus scan notifications\n$vcs_contact = \"ntvscore\"\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
cleanup signlist
|
410,217 |
09.06.2017 10:57:29
| 25,200 |
57f5fa079f543b1890a02bb2d3b371b68ac60cd6
|
previous signlist didn't do what I expected.
Just replacing sitani with pvanbren for now
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/BuildRelease.ps1",
"new_path": "Nodejs/Setup/BuildRelease.ps1",
"diff": "@@ -154,7 +154,7 @@ $project_url = \"https://github.com/Microsoft/nodejstools\"\n$project_keywords = \"NTVS; Visual Studio; Node.js\"\n# These people are able to approve code signing operations\n-$approvers = \"pvanbren\", \"billti\", \"mhegazy\"\n+$approvers = \"smortaz\", \"dinov\", \"stevdo\", \"pminaev\", \"huvalo\", \"jinglou\", \"pvanbren\", \"crwilcox\"\n# These people are the contacts for the symbols uploaded to the symbol server\n$symbol_contacts = \"$env:username;pvanbren;billti\"\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
previous signlist didn't do what I expected.
Just replacing sitani with pvanbren for now
|
410,217 |
09.06.2017 15:42:35
| 25,200 |
c56d5a6362d962f5069643b6af6743d21b734427
|
Give usefull error when Nodejs exe is corrupt
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/PressAnyKey/PressAnyKey.cs",
"new_path": "Nodejs/Product/PressAnyKey/PressAnyKey.cs",
"diff": "// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n+using System.ComponentModel;\nusing System.Diagnostics;\nusing System.IO;\nusing System.Linq;\n@@ -19,22 +20,35 @@ namespace Microsoft.NodejsTools.PressAnyKey\n}\nConsole.Title = args[2];\n- var psi = new ProcessStartInfo(args[2], string.Join(\" \", args.Skip(3).Select(arg => ProcessOutput.QuoteSingleArgument(arg))));\n- psi.UseShellExecute = false;\n+ var psi = new ProcessStartInfo(args[2], string.Join(\" \", args.Skip(3).Select(arg => ProcessOutput.QuoteSingleArgument(arg))))\n+ {\n+ UseShellExecute = false\n+ };\n+ var exitCode = 0;\n+ try\n+ {\nvar proc = Process.Start(psi);\nFile.WriteAllText(args[1], proc.Id.ToString());\nproc.WaitForExit();\n+ exitCode = proc.ExitCode;\n+ }\n+ catch (Win32Exception exc)\n+ {\n+ Console.WriteLine($\"Failed to start process: '{exc.Message}'.\");\n+ Console.WriteLine(\"Probable cause is the Nodejs exe is corrupt, please re-install.\");\n+ exitCode = -1;\n+ }\nif (args[0] == \"both\" ||\n- (proc.ExitCode == 0 && args[0] == \"normal\") ||\n- (proc.ExitCode != 0 && args[0] == \"abnormal\"))\n+ (exitCode == 0 && args[0] == \"normal\") ||\n+ (exitCode != 0 && args[0] == \"abnormal\"))\n{\nConsole.Write(\"Press any key to continue...\");\nConsole.ReadKey();\n}\n- return proc.ExitCode;\n+ return exitCode;\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Give usefull error when Nodejs exe is corrupt
|
410,217 |
09.06.2017 16:05:11
| 25,200 |
15d68510f7aa0f13435915cd4cda3db6e7045e96
|
Add packages.config to the setup projects.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj",
"new_path": "Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj",
"diff": "<ItemGroup>\n<Package Include=\"Targets_files.swr\" />\n+ <Node Include=\"packages.config\" />\n</ItemGroup>\n<Import Project=\"$(PackagesPath)\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/swix/NodejsTools.Profiling.vsmanproj",
"new_path": "Nodejs/Setup/swix/NodejsTools.Profiling.vsmanproj",
"diff": "<ItemGroup>\n<MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\Profiling\\Microsoft.VisualStudio.NodejsTools.Profiling.json\"/>\n+ <Node Include=\"packages.config\" />\n</ItemGroup>\n<Import Project=\"$(PackagesPath)\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/swix/NodejsTools.vsmanproj",
"new_path": "Nodejs/Setup/swix/NodejsTools.vsmanproj",
"diff": "<ItemGroup>\n<MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\InteractiveWindow\\Microsoft.VisualStudio.NodeJsTools.InteractiveWindow.json\" />\n<MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\NodeJs\\Microsoft.VisualStudio.NodejsTools.NodejsTools.json\" />\n-\n<MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\Microsoft.VisualStudio.NodejsTools.Targets.json\" />\n+ <Node Include=\"packages.config\" />\n</ItemGroup>\n<Import Project=\"$(PackagesPath)\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets\"/>\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Setup/swix/project.json",
"new_path": null,
"diff": "-{\n- \"dependencies\": {\n- \"MicroBuild.Core\": \"0.2.0\",\n- \"MicroBuild.Plugins.SwixBuild\": \"1.0.*\"\n- },\n- \"frameworks\": {\n- \"net461\": {}\n- },\n- \"runtimes\": {\n- \"win\": {}\n- }\n-}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add packages.config to the setup projects.
|
410,217 |
13.06.2017 14:47:28
| 25,200 |
8b15b61d83ddea600314db36b60bba91f9e82e06
|
VSSDK based Targets project
Replace the custom swix project with a VSSDK project for the
NodejsTools msbuild components.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<SubType>Designer</SubType>\n</ZipProject>\n<ZipProject Include=\"ProjectTemplates\\AzureNodejsApp\\server.js\" />\n- <Content Include=\"Microsoft.NodejsTools.targets\">\n- <IncludeInVSIX>true</IncludeInVSIX>\n- <TargetPath>Microsoft.NodejsTools.Developer.targets</TargetPath>\n- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n- <SubType>Designer</SubType>\n- </Content>\n<ZipProject Include=\"ProjectTemplates\\AzureNodejsApp\\AzureNodejsApp.njsproj\">\n<SubType>Designer</SubType>\n</ZipProject>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/ProjectAfter.targets",
"diff": "+<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n+ <Import Project=\"$(BuildRoot)\\Build\\fileVersion.targets\" />\n+</Project>\n"
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/Nodejs/Microsoft.NodejsTools.targets",
"new_path": "Nodejs/Product/Targets/Microsoft.NodejsTools.targets",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/Targets/source.extension.vsixmanifest",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<PackageManifest Version=\"2.0.0\" xmlns=\"http://schemas.microsoft.com/developer/vsx-schema/2011\" xmlns:d=\"http://schemas.microsoft.com/developer/vsx-schema-design/2011\">\n+ <Metadata>\n+ <Identity Id=\"90B6AE2E-9BDC-4D22-A670-78978E6AE4DF\" Version=\"|%CurrentProject%;GetVSIXVersion|\" Language=\"en-US\" Publisher=\"Microsoft\" />\n+ <DisplayName>Microsoft.VisualStudio.NodejsTools.Targets</DisplayName>\n+ <Description xml:space=\"preserve\">MSBuild files for NodejsTools for Visual Studio</Description>\n+ <MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>\n+ <GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>\n+ <Icon>NodeJS.ico</Icon>\n+ <PreviewImage>NodeJS_200x.png</PreviewImage>\n+ <PackageId>Microsoft.VisualStudio.NodejsTools.Targets</PackageId>\n+ </Metadata>\n+ <Installation AllUsers=\"true\">\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n+ <InstallationTarget Version=\"[15.0.0,16.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n+ </Installation>\n+ <Dependencies>\n+ <Dependency Id=\"Microsoft.Framework.NDP\" DisplayName=\"Microsoft .NET Framework\" d:Source=\"Manual\" Version=\"[4.5,)\" />\n+ </Dependencies>\n+ <Assets>\n+ <Asset Type=\"Microsoft.VisualStudio.MefComponent\" d:Source=\"Project\" d:ProjectName=\"WebRole\" Path=\"|WebRole|\" />\n+ </Assets>\n+ <Prerequisites>\n+ <Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[15.0,16.0)\" DisplayName=\"Visual Studio core editor\" />\n+ </Prerequisites>\n+</PackageManifest>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/setup-swix.proj",
"new_path": "Nodejs/Setup/setup-swix.proj",
"diff": "<Import Project=\"SetupProjectBefore.settings\" />\n<ItemGroup>\n- <ProjectFile Include=\"swix\\Microsoft.VisualStudio.NodejsTools.Targets.swixproj\"/>\n<ProjectFile Include=\"swix\\NodejsTools.vsmanproj\"/>\n</ItemGroup>\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj",
"new_path": null,
"diff": "-<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n-\n- <PropertyGroup>\n- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>\n- </PropertyGroup>\n-\n- <Import Project=\"..\\SetupProjectBefore.settings\" />\n- <Import Project=\"$(PackagesPath)\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.props\" />\n-\n- <PropertyGroup>\n- <OutputArchitecture>neutral</OutputArchitecture>\n- <OutputLocalized>false</OutputLocalized>\n- <OutputType>Vsix</OutputType>\n- <IsPackage>true</IsPackage>\n- <TargetName>Microsoft.VisualStudio.NodejsTools.Targets</TargetName>\n- <TargetPath>$(BuildOutputRoot)Setup\\Microsoft.VisualStudio.NodejsTools.Targets.vsix</TargetPath>\n- <WebRoleDll Condition=\"'$(SignedBinariesPath)' != ''\">$(SignedBinariesPath)\\Microsoft.NodejsTools.WebRole.dll</WebRoleDll>\n- <WebRoleDll Condition=\"'$(SignedBinariesPath)' == ''\">$(BuildOutputRoot)\\Binaries\\WebRole\\Microsoft.NodejsTools.WebRole.dll</WebRoleDll>\n- <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(VSIXBuildVersion);WebRoleDll=$(WebRoleDll)</PackagePreprocessorDefinitions>\n- <!--Retrigger a build on webrole.dll to pick up signed version. TODO: see if there's a better way to do this.-->\n- <MSBuildAllProjects>$(WebRoleDll)</MSBuildAllProjects>\n- </PropertyGroup>\n-\n- <Target Name=\"_CopyWixOutputsToPath\"\n- AfterTargets=\"AfterBuild\"\n- Condition=\"'$(CopyOutputsToPath)' != '' and $(OutputType) == 'Vsix'\">\n- <PropertyGroup>\n- <CopyOutputsToPath Condition=\"!HasTrailingSlash($(CopyOutputsToPath))\">$(CopyOutputsToPath)\\</CopyOutputsToPath>\n- <_PathSuffix Condition=\"'$(SignedBinariesPath)' != ''\">SignedBinariesUnsignedMsi\\</_PathSuffix>\n- <_PathSuffix Condition=\"'$(SignedBinariesPath)' == ''\">UnsignedMsi\\</_PathSuffix>\n- </PropertyGroup>\n-\n- <MakeDir Directories=\"$(CopyOutputsToPath)$(_PathSuffix)\"\n- ContinueOnError=\"true\" />\n-\n- <Message Text=\"$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)\"/>\n- <Message Text=\"$(TargetPath)\"/>\n-\n- <Copy SourceFiles=\"$(TargetPath)\"\n- DestinationFiles=\"$(CopyOutputsToPath)$(_PathSuffix)$(TargetName)$(TargetExt)\"\n- SkipUnchangedFiles=\"true\" />\n- </Target>\n-\n- <Target Name=\"GetNativeManifest\" />\n- <Target Name=\"GetTargetFrameworkProperties\" />\n-\n- <ItemGroup>\n- <Package Include=\"Targets_files.swr\" />\n- <Node Include=\"packages.config\" />\n- </ItemGroup>\n-\n- <Import Project=\"$(PackagesPath)\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets\"/>\n-</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/swix/NodejsTools.vsmanproj",
"new_path": "Nodejs/Setup/swix/NodejsTools.vsmanproj",
"diff": "<ItemGroup>\n<MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\InteractiveWindow\\Microsoft.VisualStudio.NodeJsTools.InteractiveWindow.json\" />\n<MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\NodeJs\\Microsoft.VisualStudio.NodejsTools.NodejsTools.json\" />\n- <MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\Microsoft.VisualStudio.NodejsTools.Targets.json\" />\n+ <MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\Targets\\Microsoft.VisualStudio.NodejsTools.Targets.json\" />\n<Node Include=\"packages.config\" />\n</ItemGroup>\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Setup/swix/Targets_files.swr",
"new_path": null,
"diff": "-use vs\n-\n-package name=\"Microsoft.VisualStudio.NodejsTools.Targets\"\n- version=$(BuildVersion)\n-\n-folder \"InstallFolder:\\\"\n- folder \"MSBuild\\Microsoft\\VisualStudio\\v15.0\\Node.js Tools\"\n- file source=$(BuildOutputRoot)\\Binaries\\Nodejs\\Microsoft.NodejsTools.targets\n- file source=$(WebRoleDll)\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
VSSDK based Targets project
Replace the custom swix project with a VSSDK project for the
NodejsTools msbuild components.
|
410,217 |
16.06.2017 18:01:58
| 25,200 |
7ff0c621428a11474594b3a2f26eccd3cefb4793
|
Add signing and clean up name
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/NodejsToolsVsix/NodejsToolsVsix.csproj",
"new_path": "Nodejs/Product/NodejsToolsVsix/NodejsToolsVsix.csproj",
"diff": "<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>\n<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>\n<VSIXSubPath>.</VSIXSubPath>\n- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\n+ <Private>True</Private>\n</ProjectReference>\n<ProjectReference Include=\"..\\Nodejs\\Nodejs.csproj\">\n<Project>{32ec5259-98da-40ca-9e2d-1b1b2e966f88}</Project>\n<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3bTemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>\n<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>\n<VSIXSubPath>.</VSIXSubPath>\n- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\n+ <Private>True</Private>\n</ProjectReference>\n<ProjectReference Include=\"..\\Npm\\Npm.csproj\">\n<Project>{e5ef4b0a-ab41-4b98-8fa8-98d6348003a8}</Project>\n<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>\n<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>\n<VSIXSubPath>.</VSIXSubPath>\n- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\n- <Private>False</Private>\n+ <Private>True</Private>\n</ProjectReference>\n<ProjectReference Include=\"..\\PressAnyKey\\PressAnyKey.csproj\">\n<Project>{cb61d8bd-48dc-40f4-a4ba-5b68a10a7481}</Project>\n<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>\n<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>\n<VSIXSubPath>.</VSIXSubPath>\n- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\n+ <Private>True</Private>\n</ProjectReference>\n<ProjectReference Include=\"..\\ProjectWizard\\ProjectWizard.csproj\">\n<Project>{DBC73DF7-1B4C-48BE-8B48-715297487E7A}</Project>\n<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>\n<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>\n<VSIXSubPath>.</VSIXSubPath>\n- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\n+ <Private>True</Private>\n</ProjectReference>\n</ItemGroup>\n+ <ItemGroup>\n+ <FilesToSign Include=\"$(OutDir)\\$(AssemblyName).vsix\">\n+ <Authenticode>VsixSHA2</Authenticode>\n+ <InProject>false</InProject>\n+ </FilesToSign>\n+ </ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n<Import Project=\"$(VSToolsPath)\\VSSDK\\Microsoft.VsSDK.targets\" Condition=\"'$(VSToolsPath)' != ''\" />\n<Import Project=\"..\\ProjectAfter.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Targets/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/Targets/source.extension.vsixmanifest",
"diff": "<PackageManifest Version=\"2.0.0\" xmlns=\"http://schemas.microsoft.com/developer/vsx-schema/2011\" xmlns:d=\"http://schemas.microsoft.com/developer/vsx-schema-design/2011\">\n<Metadata>\n<Identity Id=\"90B6AE2E-9BDC-4D22-A670-78978E6AE4DF\" Version=\"|%CurrentProject%;GetVSIXVersion|\" Language=\"en-US\" Publisher=\"Microsoft\" />\n- <DisplayName>Microsoft.VisualStudio.NodejsTools.Targets</DisplayName>\n+ <DisplayName>Node.js Tools MSBuild Targets</DisplayName>\n<Description xml:space=\"preserve\">MSBuild files for NodejsTools for Visual Studio</Description>\n<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>\n<GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterVsix/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/TestAdapterVsix/source.extension.vsixmanifest",
"diff": "<PackageManifest Version=\"2.0.0\" xmlns=\"http://schemas.microsoft.com/developer/vsx-schema/2011\" xmlns:d=\"http://schemas.microsoft.com/developer/vsx-schema-design/2011\">\n<Metadata>\n<Identity Id=\"{69795897-7116-44CA-B20F-958C56A5399C}\" Version=\"|%CurrentProject%;GetVSIXVersion|\" Language=\"en-US\" Publisher=\"Microsoft\" />\n- <DisplayName>Microsoft.VisualStudio.NodejsTools.TestAdapter</DisplayName>\n+ <DisplayName>Node.js Test Adapter</DisplayName>\n<Description xml:space=\"preserve\">Unit test adapter for JavaScript files.</Description>\n<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>\n<GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add signing and clean up name
|
410,217 |
20.06.2017 11:46:04
| 25,200 |
5ca0334599f129d84fbfe42ea186f12839a79608
|
Update reference MSFT.VS.Utilities
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"new_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"diff": "<Reference Include=\"envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n</ItemGroup>\n<ItemGroup>\n<Reference Include=\"Microsoft.VisualStudio.Shell.Framework, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" />\n- <Reference Include=\"Microsoft.VisualStudio.Utilities, Version=$(VSTarget).0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n- <HintPath>$(DevEnvDir)\\Microsoft.VisualStudio.Utilities.dll</HintPath>\n- </Reference>\n</ItemGroup>\n<ItemGroup>\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Reference Include=\"Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.Telemetry.15.3.789-masterCC863119\\lib\\net45\\Microsoft.VisualStudio.Telemetry.dll</HintPath>\n</Reference>\n- <Reference Include=\"Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n</ItemGroup>\n<ItemGroup>\n<Reference Include=\"envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n<Reference Include=\"Microsoft.VisualStudio.TextManager.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.Utilities.Internal.14.0.72-masterF9EB1D39\\lib\\net45\\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>\n</Reference>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update reference MSFT.VS.Utilities
|
410,217 |
20.06.2017 14:30:41
| 25,200 |
04c3af6705c7726ecdfa04a50837fb4b233eac92
|
Set DevEnvDir correct
|
[
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.settings",
"new_path": "Build/Common.Build.settings",
"diff": "<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>\n- <DevEnvDir Condition=\"'$(DevEnvDir)' == ''\">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\\Software\\Microsoft\\VisualStudio\\$(VSTarget)', 'InstallDir', null, RegistryView.Registry32))\\</DevEnvDir>\n- <VSSDKDir>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\\Software\\Microsoft\\VisualStudio\\VSIP\\$(VSTarget)', 'InstallDir', null, RegistryView.Registry32))\\</VSSDKDir>\n+ <DevEnvDir Condition=\"'$(DevEnvDir)' == ''\">$(VsInstallRoot)\\Common7\\IDE\\</DevEnvDir>\n</PropertyGroup>\n<ItemDefinitionGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Set DevEnvDir correct
|
410,217 |
20.06.2017 16:13:05
| 25,200 |
62e649b3a935208bf53abf905a6f17df780fcd54
|
update path to mb package
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/NodejsTools.vsmanproj",
"new_path": "Nodejs/Setup/NodejsTools.vsmanproj",
"diff": "<PropertyGroup>\n<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>\n</PropertyGroup>\n-\n+ <Import Project=\"..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.props\" />\n<Import Project=\".\\SetupProjectBefore.settings\" />\n<PropertyGroup>\n<Node Include=\"packages.config\" />\n</ItemGroup>\n- <Import Project=\"$(PackagesPath)\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets\"/>\n+ <Import Project=\"..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets\" />\n<Import Project=\".\\SetupProjectAfter.settings\" />\n</Project>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
update path to mb package
|
410,217 |
20.06.2017 16:19:32
| 25,200 |
f557b0f97e6d8b88e28d5e09d3bb4a1817743a83
|
Don't deploy when building on VSTS
|
[
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.settings",
"new_path": "Build/Common.Build.settings",
"diff": "<IncludeVsixItemsFromTargets Condition=\"'$(IncludeVsixItemsFromTargets)' == ''\">BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup;</IncludeVsixItemsFromTargets>\n<!-- Copies entire VSIX contents to the output directory. -->\n<CopyLocalReferenceVsixItems Condition=\"'$(CopyLocalReferenceVsixItems)' == ''\">false</CopyLocalReferenceVsixItems>\n+ <DeployExtension Condition=\"'$(BUILD_BUILDNUMBER)' != ''\">False</DeployExtension>\n</PropertyGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Don't deploy when building on VSTS
|
410,217 |
20.06.2017 16:23:06
| 25,200 |
c4cc83d4818a6062d97ca5f91d2e81b7b5896212
|
fix path for real
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/NodejsTools.vsmanproj",
"new_path": "Nodejs/Setup/NodejsTools.vsmanproj",
"diff": "<PropertyGroup>\n<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>\n</PropertyGroup>\n- <Import Project=\"..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.props\" />\n+ <Import Project=\"..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.props\" />\n<Import Project=\".\\SetupProjectBefore.settings\" />\n<PropertyGroup>\n<Node Include=\"packages.config\" />\n</ItemGroup>\n- <Import Project=\"..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets\" />\n+ <Import Project=\"..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets\" />\n<Import Project=\".\\SetupProjectAfter.settings\" />\n</Project>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
fix path for real
|
410,217 |
20.06.2017 17:17:20
| 25,200 |
b06917d1b127d7f3d341df148cb9807900a3b743
|
Remove vstarget and build suffix for general case
|
[
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.settings",
"new_path": "Build/Common.Build.settings",
"diff": "Rather than customizing OutputPath or IntermediateOutputPath in projects,\n$(OutputPathSuffix) and $(IntermediateOutputPathSuffix) should be set.\n-->\n- <BuildOutputRoot Condition=\"'$(BuildOutputRoot)' == ''\">$(BuildRoot)\\BuildOutput\\$(Configuration)$(VSTarget)\\</BuildOutputRoot>\n+ <BuildOutputRoot Condition=\"'$(BuildOutputRoot)' == ''\">$(BuildRoot)\\BuildOutput\\$(Configuration)\\</BuildOutputRoot>\n<BuildOutputRoot Condition=\"!HasTrailingSlash($(BuildOutputRoot))\">$(BuildOutputRoot)\\</BuildOutputRoot>\n<OutputPathSuffix Condition=\"'$(OutputPathSuffix)' != '' and !HasTrailingSlash($(OutputPathSuffix))\">$(OutputPathSuffix)\\</OutputPathSuffix>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/SetupProjectBefore.settings",
"new_path": "Nodejs/Setup/SetupProjectBefore.settings",
"diff": "<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n<PropertyGroup>\n<BuildRoot Condition=\"'$(BuildRoot)' == ''\">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>\n- <OutputPathSuffix>Setup</OutputPathSuffix>\n- <IntermediateOutputPathSuffix>obj\\Setup_$(MSBuildProjectName)\\</IntermediateOutputPathSuffix>\n</PropertyGroup>\n<Import Project=\"$(BuildRoot)\\Build\\Common.Build.settings\" />\n</Project>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove vstarget and build suffix for general case
|
410,217 |
20.06.2017 17:28:01
| 25,200 |
2163c480a9c790bbd9f71cf35742a7a2b27a685d
|
Set the output path for the vsman project
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/SetupProjectBefore.settings",
"new_path": "Nodejs/Setup/SetupProjectBefore.settings",
"diff": "<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n<PropertyGroup>\n<BuildRoot Condition=\"'$(BuildRoot)' == ''\">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>\n+ <OutputPathSuffix Condition=\"'$(OutputPathSuffix)' == ''\">Binaries\\$(MSBuildProjectName)\\</OutputPathSuffix>\n+ <IntermediateOutputPathSuffix>obj\\$(MSBuildProjectName)\\</IntermediateOutputPathSuffix>\n</PropertyGroup>\n<Import Project=\"$(BuildRoot)\\Build\\Common.Build.settings\" />\n</Project>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Set the output path for the vsman project
|
410,217 |
21.06.2017 12:46:55
| 25,200 |
07b449d919510e932a240be0a5a4c7ef2feda8f0
|
Change paths for Vsix files
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/VsixProjectBefore.settings",
"diff": "+<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n+ <PropertyGroup>\n+ <BuildRoot Condition=\"'$(BuildRoot)' == ''\">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>\n+ <OutputPathSuffix Condition=\"'$(OutputPathSuffix)' == ''\">Setup\\$(MSBuildProjectName)\\</OutputPathSuffix>\n+ <IntermediateOutputPathSuffix>obj\\$(MSBuildProjectName)\\</IntermediateOutputPathSuffix>\n+ <SolutionDir Condition=\"$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'\">$(BuildRoot)\\Nodejs\\</SolutionDir>\n+ </PropertyGroup>\n+ <Import Project=\"$(BuildRoot)\\Build\\Common.Build.settings\" />\n+</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/NodejsTools.vsmanproj",
"new_path": "Nodejs/Setup/NodejsTools.vsmanproj",
"diff": "</PropertyGroup>\n<ItemGroup>\n- <MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\NodejsToolsVsix\\Microsoft.VisualStudio.NodejsTools.NodejsTools.json\" />\n- <MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\Targets\\Microsoft.VisualStudio.NodejsTools.Targets.json\" />\n- <MergeManifest Include=\"$(BuildOutputRoot)\\Binaries\\TestAdapterVsix\\Microsoft.VisualStudio.NodejsTools.TestAdapter.json\" />\n+ <MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\NodejsToolsVsix\\Microsoft.VisualStudio.NodejsTools.NodejsTools.json\" />\n+ <MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\Targets\\Microsoft.VisualStudio.NodejsTools.Targets.json\" />\n+ <MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\TestAdapterVsix\\Microsoft.VisualStudio.NodejsTools.TestAdapter.json\" />\n<Node Include=\"packages.config\" />\n</ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/SetupProjectBefore.settings",
"new_path": "Nodejs/Setup/SetupProjectBefore.settings",
"diff": "<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n<PropertyGroup>\n<BuildRoot Condition=\"'$(BuildRoot)' == ''\">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>\n- <OutputPathSuffix Condition=\"'$(OutputPathSuffix)' == ''\">Binaries\\$(MSBuildProjectName)\\</OutputPathSuffix>\n+ <OutputPathSuffix Condition=\"'$(OutputPathSuffix)' == ''\">Setup\\$(MSBuildProjectName)\\</OutputPathSuffix>\n<IntermediateOutputPathSuffix>obj\\$(MSBuildProjectName)\\</IntermediateOutputPathSuffix>\n</PropertyGroup>\n<Import Project=\"$(BuildRoot)\\Build\\Common.Build.settings\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Change paths for Vsix files
|
410,217 |
21.06.2017 12:48:41
| 25,200 |
815fb5db51caf447f322e147b6cc5e2bf7093841
|
Rename targets vsix
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -110,6 +110,7 @@ Generated_Code #added for RIA/Silverlight projects\n_UpgradeReport_Files/\nBackup*/\nUpgradeLog*.XML\n+UpgradeLog*.htm\n*.DotSetting.user\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/NodejsTools.sln",
"new_path": "Nodejs/NodejsTools.sln",
"diff": "@@ -22,12 +22,12 @@ Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"TestAdapter\", \"Product\\Test\nEndProject\nProject(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"PressAnyKey\", \"Product\\PressAnyKey\\PressAnyKey.csproj\", \"{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}\"\nEndProject\n-Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"Targets\", \"Product\\Targets\\Targets.csproj\", \"{CBA217C4-4338-4E50-9DEC-9227705F8124}\"\n-EndProject\nProject(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"TestAdapterVsix\", \"Product\\TestAdapterVsix\\TestAdapterVsix.csproj\", \"{4EB09870-7422-4368-B8C8-74582764EAB3}\"\nEndProject\nProject(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"NodejsToolsVsix\", \"Product\\NodejsToolsVsix\\NodejsToolsVsix.csproj\", \"{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}\"\nEndProject\n+Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"TargetsVsix\", \"Product\\TargetsVsix\\TargetsVsix.csproj\", \"{CBA217C4-4338-4E50-9DEC-9227705F8124}\"\n+EndProject\nGlobal\nGlobalSection(SolutionConfigurationPlatforms) = preSolution\nDebug|Any CPU = Debug|Any CPU\n@@ -62,10 +62,6 @@ Global\n{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Debug|Any CPU.Build.0 = Debug|Any CPU\n{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|Any CPU.ActiveCfg = Release|Any CPU\n{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|Any CPU.Build.0 = Release|Any CPU\n- {CBA217C4-4338-4E50-9DEC-9227705F8124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n- {CBA217C4-4338-4E50-9DEC-9227705F8124}.Debug|Any CPU.Build.0 = Debug|Any CPU\n- {CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|Any CPU.ActiveCfg = Release|Any CPU\n- {CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|Any CPU.Build.0 = Release|Any CPU\n{4EB09870-7422-4368-B8C8-74582764EAB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n{4EB09870-7422-4368-B8C8-74582764EAB3}.Debug|Any CPU.Build.0 = Debug|Any CPU\n{4EB09870-7422-4368-B8C8-74582764EAB3}.Release|Any CPU.ActiveCfg = Release|Any CPU\n@@ -74,6 +70,10 @@ Global\n{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}.Debug|Any CPU.Build.0 = Debug|Any CPU\n{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}.Release|Any CPU.ActiveCfg = Release|Any CPU\n{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}.Release|Any CPU.Build.0 = Release|Any CPU\n+ {CBA217C4-4338-4E50-9DEC-9227705F8124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\n+ {CBA217C4-4338-4E50-9DEC-9227705F8124}.Debug|Any CPU.Build.0 = Debug|Any CPU\n+ {CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|Any CPU.ActiveCfg = Release|Any CPU\n+ {CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|Any CPU.Build.0 = Release|Any CPU\nEndGlobalSection\nGlobalSection(SolutionProperties) = preSolution\nHideSolutionNode = FALSE\n@@ -86,9 +86,9 @@ Global\n{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8} = {F9719B35-F359-47A7-A2F8-34F42E53C809}\n{5085DF35-3A32-4894-835E-E5A3956D4F57} = {F9719B35-F359-47A7-A2F8-34F42E53C809}\n{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {F9719B35-F359-47A7-A2F8-34F42E53C809}\n- {CBA217C4-4338-4E50-9DEC-9227705F8124} = {F9719B35-F359-47A7-A2F8-34F42E53C809}\n{4EB09870-7422-4368-B8C8-74582764EAB3} = {F9719B35-F359-47A7-A2F8-34F42E53C809}\n{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3} = {F9719B35-F359-47A7-A2F8-34F42E53C809}\n+ {CBA217C4-4338-4E50-9DEC-9227705F8124} = {F9719B35-F359-47A7-A2F8-34F42E53C809}\nEndGlobalSection\nGlobalSection(ExtensibilityGlobals) = postSolution\nSolutionGuid = {B1CAB318-7961-42BF-A7B1-FBDB3EC225E9}\n"
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/Targets/Microsoft.NodejsTools.targets",
"new_path": "Nodejs/Product/TargetsVsix/Microsoft.NodejsTools.targets",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/Targets/Targets.csproj",
"new_path": "Nodejs/Product/TargetsVsix/TargetsVsix.csproj",
"diff": "<ProjectGuid>{CBA217C4-4338-4E50-9DEC-9227705F8124}</ProjectGuid>\n<OutputType>Library</OutputType>\n<AppDesignerFolder>Properties</AppDesignerFolder>\n- <RootNamespace>Microsoft.NodejsTools.Targets</RootNamespace>\n- <AssemblyName>Microsoft.NodejsTools.Targets</AssemblyName>\n+ <RootNamespace>NodejsToolsTargetsVsix</RootNamespace>\n+ <AssemblyName>NodejsToolsTargetsVsix</AssemblyName>\n<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>\n<GeneratePkgDefFile>false</GeneratePkgDefFile>\n<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>\n</ProjectReference>\n</ItemGroup>\n<ItemGroup>\n- <FilesToSign Include=\"$(OutDir)\\Microsoft.NodejsTools.Targets.vsix\">\n+ <FilesToSign Include=\"$(OutDir)\\$(AssemblyName).vsix\">\n<Authenticode>VsixSHA2</Authenticode>\n<InProject>false</InProject>\n</FilesToSign>\n"
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/Targets/packages.config",
"new_path": "Nodejs/Product/TargetsVsix/packages.config",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/Targets/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/TargetsVsix/source.extension.vsixmanifest",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Setup/NodejsTools.vsmanproj",
"new_path": "Nodejs/Setup/NodejsTools.vsmanproj",
"diff": "<ItemGroup>\n<MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\NodejsToolsVsix\\Microsoft.VisualStudio.NodejsTools.NodejsTools.json\" />\n- <MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\Targets\\Microsoft.VisualStudio.NodejsTools.Targets.json\" />\n+ <MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\TargetsVsix\\Microsoft.VisualStudio.NodejsTools.Targets.json\" />\n<MergeManifest Include=\"$(BuildOutputRoot)\\Setup\\TestAdapterVsix\\Microsoft.VisualStudio.NodejsTools.TestAdapter.json\" />\n<Node Include=\"packages.config\" />\n</ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Rename targets vsix
|
410,217 |
21.06.2017 16:37:52
| 25,200 |
fd62370bb8ee4043ce45eae6bcc785c03163e1da
|
No longer needed specific nuget binaries
|
[
{
"change_type": "DELETE",
"old_path": "Nodejs/.nuget/NuGet.exe",
"new_path": "Nodejs/.nuget/NuGet.exe",
"diff": "Binary files a/Nodejs/.nuget/NuGet.exe and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/.nuget/NuGet.targets",
"new_path": null,
"diff": "-<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<Project ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n- <PropertyGroup>\n- <SolutionDir Condition=\"$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'\">$(MSBuildProjectDirectory)\\..\\</SolutionDir>\n-\n- <!-- Enable the restore command to run before builds -->\n- <RestorePackages Condition=\" '$(RestorePackages)' == '' \">false</RestorePackages>\n-\n- <!-- Property that enables building a package from a project -->\n- <BuildPackage Condition=\" '$(BuildPackage)' == '' \">false</BuildPackage>\n-\n- <!-- Determines if package restore consent is required to restore packages -->\n- <RequireRestoreConsent Condition=\" '$(RequireRestoreConsent)' != 'false' \">true</RequireRestoreConsent>\n-\n- <!-- Download NuGet.exe if it does not already exist -->\n- <DownloadNuGetExe Condition=\" '$(DownloadNuGetExe)' == '' \">false</DownloadNuGetExe>\n- </PropertyGroup>\n-\n- <ItemGroup Condition=\" '$(PackageSources)' == '' \">\n- <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\\NuGet\\NuGet.Config will be used -->\n- <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->\n- <!--\n- <PackageSource Include=\"https://www.nuget.org/api/v2/\" />\n- <PackageSource Include=\"https://my-nuget-source/nuget/\" />\n- -->\n- </ItemGroup>\n-\n- <PropertyGroup Condition=\" '$(OS)' == 'Windows_NT'\">\n- <!-- Windows specific commands -->\n- <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), \".nuget\"))</NuGetToolsPath>\n- <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), \"packages.config\"))</PackagesConfig>\n- </PropertyGroup>\n-\n- <PropertyGroup Condition=\" '$(OS)' != 'Windows_NT'\">\n- <!-- We need to launch nuget.exe with the mono command if we're not on windows -->\n- <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>\n- <PackagesConfig>packages.config</PackagesConfig>\n- </PropertyGroup>\n-\n- <PropertyGroup>\n- <!-- NuGet command -->\n- <NuGetExePath Condition=\" '$(NuGetExePath)' == '' \">$(NuGetToolsPath)\\NuGet.exe</NuGetExePath>\n- <PackageSources Condition=\" $(PackageSources) == '' \">@(PackageSource)</PackageSources>\n-\n- <NuGetCommand Condition=\" '$(OS)' == 'Windows_NT'\">\"$(NuGetExePath)\"</NuGetCommand>\n- <NuGetCommand Condition=\" '$(OS)' != 'Windows_NT' \">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>\n-\n- <PackageOutputDir Condition=\"$(PackageOutputDir) == ''\">$(TargetDir.Trim('\\\\'))</PackageOutputDir>\n-\n- <RequireConsentSwitch Condition=\" $(RequireRestoreConsent) == 'true' \">-RequireConsent</RequireConsentSwitch>\n- <NonInteractiveSwitch Condition=\" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' \">-NonInteractive</NonInteractiveSwitch>\n-\n- <PaddedSolutionDir Condition=\" '$(OS)' == 'Windows_NT'\">\"$(SolutionDir) \"</PaddedSolutionDir>\n- <PaddedSolutionDir Condition=\" '$(OS)' != 'Windows_NT' \">\"$(SolutionDir)\"</PaddedSolutionDir>\n-\n- <!-- Commands -->\n- <RestoreCommand>$(NuGetCommand) install \"$(PackagesConfig)\" -source \"$(PackageSources)\" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>\n- <BuildCommand>$(NuGetCommand) pack \"$(ProjectPath)\" -Properties \"Configuration=$(Configuration);Platform=$(Platform)\" $(NonInteractiveSwitch) -OutputDirectory \"$(PackageOutputDir)\" -symbols</BuildCommand>\n-\n- <!-- We need to ensure packages are restored prior to assembly resolve -->\n- <BuildDependsOn Condition=\"$(RestorePackages) == 'true'\">\n- RestorePackages;\n- $(BuildDependsOn);\n- </BuildDependsOn>\n-\n- <!-- Make the build depend on restore packages -->\n- <BuildDependsOn Condition=\"$(BuildPackage) == 'true'\">\n- $(BuildDependsOn);\n- BuildPackage;\n- </BuildDependsOn>\n- </PropertyGroup>\n-\n- <Target Name=\"CheckPrerequisites\">\n- <!-- Raise an error if we're unable to locate nuget.exe -->\n- <Error Condition=\"'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')\" Text=\"Unable to locate '$(NuGetExePath)'\" />\n- <!--\n- Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.\n- This effectively acts as a lock that makes sure that the download operation will only happen once and all\n- parallel builds will have to wait for it to complete.\n- -->\n- <MsBuild Targets=\"_DownloadNuGet\" Projects=\"$(MSBuildThisFileFullPath)\" Properties=\"Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)\" />\n- </Target>\n-\n- <Target Name=\"_DownloadNuGet\">\n- <DownloadNuGet OutputFilename=\"$(NuGetExePath)\" Condition=\" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')\" />\n- </Target>\n-\n- <Target Name=\"RestorePackages\" DependsOnTargets=\"CheckPrerequisites\">\n- <Exec Command=\"$(RestoreCommand)\"\n- Condition=\"'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')\" />\n-\n- <Exec Command=\"$(RestoreCommand)\"\n- LogStandardErrorAsError=\"true\"\n- Condition=\"'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')\" />\n- </Target>\n-\n- <Target Name=\"BuildPackage\" DependsOnTargets=\"CheckPrerequisites\">\n- <Exec Command=\"$(BuildCommand)\"\n- Condition=\" '$(OS)' != 'Windows_NT' \" />\n-\n- <Exec Command=\"$(BuildCommand)\"\n- LogStandardErrorAsError=\"true\"\n- Condition=\" '$(OS)' == 'Windows_NT' \" />\n- </Target>\n-\n- <UsingTask TaskName=\"DownloadNuGet\" TaskFactory=\"CodeTaskFactory\" AssemblyFile=\"$(MSBuildToolsPath)\\Microsoft.Build.Tasks.v4.0.dll\">\n- <ParameterGroup>\n- <OutputFilename ParameterType=\"System.String\" Required=\"true\" />\n- </ParameterGroup>\n- <Task>\n- <Reference Include=\"System.Core\" />\n- <Using Namespace=\"System\" />\n- <Using Namespace=\"System.IO\" />\n- <Using Namespace=\"System.Net\" />\n- <Using Namespace=\"Microsoft.Build.Framework\" />\n- <Using Namespace=\"Microsoft.Build.Utilities\" />\n- <Code Type=\"Fragment\" Language=\"cs\">\n- <![CDATA[\n- try {\n- OutputFilename = Path.GetFullPath(OutputFilename);\n-\n- Log.LogMessage(\"Downloading latest version of NuGet.exe...\");\n- WebClient webClient = new WebClient();\n- webClient.DownloadFile(\"https://www.nuget.org/nuget.exe\", OutputFilename);\n-\n- return true;\n- }\n- catch (Exception ex) {\n- Log.LogErrorFromException(ex);\n- return false;\n- }\n- ]]>\n- </Code>\n- </Task>\n- </UsingTask>\n-</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>\n<StartArguments>/rootSuffix Exp /Log</StartArguments>\n<SolutionDir Condition=\"$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'\">..\\..\\</SolutionDir>\n- <UICulture>en</UICulture>\n</PropertyGroup>\n<PropertyGroup>\n<DefineConstants>$(DefineConstants);NODEJS_TOOLS;NTVS_FEATURE_INTERACTIVEWINDOW</DefineConstants>\n<Import Project=\"$(BuildRoot)\\Build\\Common.Build.CSharp.targets\" />\n<Import Project=\"$(VSToolsPath)\\VSSDK\\Microsoft.VsSDK.targets\" Condition=\"'$(VSToolsPath)' != ''\" />\n<Import Project=\"..\\ProjectAfter.targets\" />\n- <Import Project=\"$(SolutionDir)\\.nuget\\NuGet.targets\" Condition=\"Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" />\n<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n<PropertyGroup>\n<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n</PropertyGroup>\n- <Error Condition=\"!Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\\.nuget\\NuGet.targets'))\" />\n<Error Condition=\"!Exists('..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.props')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.props'))\" />\n<Error Condition=\"!Exists('..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets'))\" />\n</Target>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Npm.csproj",
"new_path": "Nodejs/Product/Npm/Npm.csproj",
"diff": "</ItemGroup>\n<Import Project=\"$(BuildRoot)\\Build\\Common.Build.CSharp.targets\" />\n<Import Project=\"..\\ProjectAfter.targets\" />\n- <Import Project=\"$(SolutionDir)\\.nuget\\nuget.targets\" />\n<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n<PropertyGroup>\n<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<Import Project=\"$(BuildRoot)\\Nodejs\\Product\\Nodejs\\SourceMapping\\SourceMapping.proj\" />\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n<Import Project=\"..\\ProjectAfter.targets\" />\n- <Import Project=\"$(SolutionDir)\\.nuget\\NuGet.targets\" Condition=\"Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" />\n<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n<PropertyGroup>\n<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n</PropertyGroup>\n- <Error Condition=\"!Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\\.nuget\\NuGet.targets'))\" />\n<Error Condition=\"!Exists('..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.props')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.props'))\" />\n<Error Condition=\"!Exists('..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '..\\..\\packages\\MicroBuild.Core.0.2.0\\build\\MicroBuild.Core.targets'))\" />\n</Target>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
No longer needed specific nuget binaries
|
410,217 |
22.06.2017 11:42:42
| 25,200 |
b7ced9e330c6813975975756bc57c2c88eb68654
|
Remove converter tool
|
[
{
"change_type": "DELETE",
"old_path": "Common/Tools/VsctToXliff/App.config",
"new_path": null,
"diff": "-<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<configuration>\n- <startup>\n- <supportedRuntime version=\"v4.0\" sku=\".NETFramework,Version=v4.6\"/>\n- </startup>\n-</configuration>\n"
},
{
"change_type": "DELETE",
"old_path": "Common/Tools/VsctToXliff/Program.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.IO;\n-\n-namespace VsctToXliff\n-{\n- class Program\n- {\n- private static readonly string[] Locales = new[] { \"cs\", \"de\", \"en\", \"es\", \"fr\", \"it\", \"ja\", \"ko\", \"pl\", \"pt-BR\", \"ru\", \"tr\", \"zh-Hans\", \"zh-Hant\" };\n-\n- private static int Main(string[] args)\n- {\n- var parsedArgs = new Args(args);\n- if (parsedArgs.IsError)\n- {\n- return -1;\n- }\n-\n- switch (parsedArgs.Mode)\n- {\n- case Mode.GenerateXliff:\n- CreateXliffFiles(parsedArgs.SourceFile, parsedArgs.XliffDir);\n- return 0;\n- case Mode.GenerateVsct:\n- CreateVsctFiles(parsedArgs.SourceFile, parsedArgs.XliffDir);\n- return 0;\n- case Mode.Error:\n- default:\n- Console.WriteLine($\"Unexpected processing mode: \\'{parsedArgs.Mode}\\'.\");\n- return -1;\n- }\n- }\n-\n- private static void CreateXliffFiles(string sourceFile, string xlfDir)\n- {\n- if (string.IsNullOrEmpty(sourceFile) || string.IsNullOrEmpty(xlfDir))\n- {\n- throw new ArgumentNullException(\"file and targetDir should be set.\");\n- }\n-\n- var rootName = Utilities.VsctFileNameWithoutExtension(sourceFile);\n-\n- var reader = new VsctFile(sourceFile);\n- var writer = new XliffFile(xlfDir, rootName);\n-\n- foreach (var locale in Locales)\n- {\n- writer.WriteTranslationFile(sourceFile, reader.ReadTranslatableUnits(), locale);\n- }\n- }\n-\n- private static void CreateVsctFiles(string sourceFile, string xlfDir)\n- {\n- if (string.IsNullOrEmpty(sourceFile))\n- {\n- throw new ArgumentNullException(\"file should be set.\");\n- }\n-\n- var targetDir = Path.GetDirectoryName(sourceFile);\n- var rootName = Utilities.VsctFileNameWithoutExtension(sourceFile);\n-\n- var vsctFile = new VsctFile(sourceFile);\n- var xlfFiles = new XliffFile(xlfDir, rootName);\n-\n- foreach (var locale in Locales)\n- {\n- if (StringComparer.OrdinalIgnoreCase.Equals(locale, \"en\"))\n- {\n- // for english just copy the file to a new file name\n- var destFileName = Path.Combine(targetDir, $\"{rootName}.en{VsctFile.VsctExt}\");\n- File.Copy(sourceFile, destFileName, overwrite: true);\n- }\n- else\n- {\n- var translations = xlfFiles.LoadTranslatedElements(locale);\n- vsctFile.WriteTranslatedFile(translations, locale);\n- }\n- }\n- }\n-\n- private class Args\n- {\n- public bool IsError { get; }\n-\n- public string XliffDir { get; }\n-\n- public string SourceFile { get; }\n-\n- public Mode Mode { get; }\n-\n- public Args(string[] args)\n- {\n- if (args.Length < 3)\n- {\n- this.IsError = true;\n- DisplayHelp();\n- }\n- else\n- {\n- this.SourceFile = Utilities.EnsureRootPath(args[0]);\n- this.XliffDir = Utilities.EnsureRootPath(args[1]);\n- switch (args[2].ToLowerInvariant())\n- {\n- case \"--generatexlf\":\n- this.Mode = Mode.GenerateXliff;\n- break;\n- case \"--generatevsct\":\n- this.Mode = Mode.GenerateVsct;\n- break;\n- default:\n- this.IsError = true;\n- break;\n- }\n- }\n- }\n-\n- private void DisplayHelp()\n- {\n- Console.WriteLine(\"usage: VsctToXliff.exe <sourcefile.vsct> <xliff dir> [--generatexlf | --generatevsct].\");\n- Console.WriteLine(\"--generatexlf\\tThis will create xlf files for all VS locales in the xliff dir, overwriting any existing files!\");\n- Console.WriteLine(\"--generatevsct\\tThis will create vsct files for all VS locales in the same dir as the sourecfile.vsct, overwriting any existing files!\");\n- }\n- }\n-\n- private enum Mode\n- {\n- Error,\n- GenerateXliff,\n- GenerateVsct,\n- }\n- }\n-}\n-\n"
},
{
"change_type": "DELETE",
"old_path": "Common/Tools/VsctToXliff/Utilities.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.IO;\n-\n-namespace VsctToXliff\n-{\n- internal static class Utilities\n- {\n- public static string EnsureRootPath(string path)\n- {\n- if (Path.IsPathRooted(path))\n- {\n- return path;\n- }\n-\n- return new FileInfo(Path.Combine(Environment.CurrentDirectory, path)).FullName;\n- }\n-\n- /// <returns>The filename without extension or locale.</returns>\n- public static string VsctFileNameWithoutExtension(string fileName)\n- {\n- // assume filename have the following structure: <filename>.<locale>.vsct\n- var file = Path.GetFileName(fileName);\n-\n- return file.Substring(0, file.IndexOf('.'));\n- }\n- }\n-}\n-\n"
},
{
"change_type": "DELETE",
"old_path": "Common/Tools/VsctToXliff/VsctFile.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.Collections.Generic;\n-using System.IO;\n-using System.Xml.Linq;\n-\n-namespace VsctToXliff\n-{\n- internal sealed class VsctFile\n- {\n- private static readonly XNamespace NS = @\"http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable\";\n- private static readonly string[] ChildNames = { \"ButtonText\", \"ToolTipText\", \"MenuText\", \"CommandName\" };\n-\n- public const string VsctExt = \".vsct\";\n-\n- public string FileName { get; }\n-\n- public VsctFile(string fileName)\n- {\n- if (string.IsNullOrEmpty(fileName))\n- {\n- throw new ArgumentException(\"fileName should be set\");\n- }\n-\n- if (!Path.IsPathRooted(fileName))\n- {\n- throw new ArgumentException(\"Expected a rooted path\");\n- }\n-\n- this.FileName = fileName;\n- }\n-\n- public IEnumerable<ITranslationUnit> ReadTranslatableUnits()\n- {\n- var document = XDocument.Load(this.FileName);\n- foreach (var element in this.GetTranslatableElements(document))\n- {\n- var id = element.Attribute(\"id\").Value;\n- var strings = element.Element(NS + \"Strings\");\n-\n- foreach (var name in ChildNames)\n- {\n- var child = strings.Element(NS + name);\n- if (child != null)\n- {\n- yield return new TranslationUnit($\"{id}|{name}\", child.Value);\n- }\n- }\n- }\n- }\n-\n- private IEnumerable<XElement> GetTranslatableElements(XDocument root)\n- {\n- foreach (var menuItem in root.Descendants(NS + \"Menu\"))\n- {\n- yield return menuItem;\n- }\n- foreach (var menuItem in root.Descendants(NS + \"Button\"))\n- {\n- yield return menuItem;\n- }\n- }\n-\n- public void WriteTranslatedFile(IDictionary<string, string> translations, string targetLanguage)\n- {\n- var document = XDocument.Load(this.FileName);\n- foreach( var element in this.GetTranslatableElements(document))\n- {\n- var id = element.Attribute(\"id\").Value;\n- var strings = element.Element(NS + \"Strings\");\n-\n- foreach (var name in ChildNames)\n- {\n- var child = strings.Element(NS + name);\n- if (child != null && translations.TryGetValue($\"{id}|{name}\", out var value))\n- {\n- child.Value = value;\n- }\n- }\n- }\n-\n- var rootDir = Path.GetDirectoryName(this.FileName);\n- var rootName = Utilities.VsctFileNameWithoutExtension(this.FileName);\n-\n- document.Save(Path.Combine(rootDir, $\"{rootName}.{targetLanguage}{VsctExt}\"));\n- }\n-\n- private sealed class TranslationUnit : ITranslationUnit\n- {\n- public string Key { get; }\n- public string EnglishValue { get; }\n-\n- public TranslationUnit(string key, string value)\n- {\n- this.Key = key;\n- this.EnglishValue = value;\n- }\n- }\n- }\n-\n- internal interface ITranslationUnit\n- {\n- string Key { get; }\n- string EnglishValue { get; }\n- }\n-}\n-\n"
},
{
"change_type": "DELETE",
"old_path": "Common/Tools/VsctToXliff/XliffFile.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.Collections.Generic;\n-using System.IO;\n-using System.Linq;\n-using System.Xml.Linq;\n-\n-namespace VsctToXliff\n-{\n- internal sealed class XliffFile\n- {\n- private static readonly XNamespace XSI = @\"http://www.w3.org/2001/XMLSchema-instance\";\n- private static readonly XNamespace XLIFF = @\"urn:oasis:names:tc:xliff:document:1.2\";\n-\n- private const string XliffExt = \".xlf\";\n-\n- public string XliffFolder { get; }\n- public string FileNameWithoutExtension { get; }\n-\n- public XliffFile(string targetFolder, string fileNameWithoutExtension)\n- {\n- if (string.IsNullOrEmpty(targetFolder))\n- {\n- throw new ArgumentException($\"{nameof(targetFolder)} should be set\");\n- }\n-\n- if (!Path.IsPathRooted(targetFolder))\n- {\n- throw new ArgumentException(\"Expected a rooted path\");\n- }\n-\n- if (string.IsNullOrEmpty(fileNameWithoutExtension))\n- {\n- throw new ArgumentException($\"{nameof(fileNameWithoutExtension)} should be set\");\n-\n- }\n-\n- this.XliffFolder = targetFolder;\n- this.FileNameWithoutExtension = fileNameWithoutExtension;\n- }\n-\n- public void WriteTranslationFile(string originalName, IEnumerable<ITranslationUnit> transUnits, string targetLanguage)\n- {\n- var fileElement = new XElement(XLIFF + \"file\",\n- new XAttribute(\"original\", originalName),\n- new XAttribute(\"source-language\", \"en\"),\n- new XAttribute(\"datatype\", \"xml\"),\n- new XElement(XLIFF + \"body\",\n- transUnits.Select(unit => GenerateTransElements(unit, targetLanguage))\n- )\n- );\n-\n- if (!StringComparer.OrdinalIgnoreCase.Equals(targetLanguage, \"en\"))\n- {\n- fileElement.Add(new XAttribute(\"target-language\", targetLanguage));\n- }\n-\n- var document = new XDocument(\n- new XElement(XLIFF + \"xliff\",\n- new XAttribute(\"xmlns\", \"urn:oasis:names:tc:xliff:document:1.2\"),\n- new XAttribute(XNamespace.Xmlns + \"xsi\", XSI),\n- new XAttribute(XSI + \"schemaLocation\", \"urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd\"),\n- new XAttribute(\"version\", \"1.2\"),\n- fileElement\n- )\n- );\n-\n- Directory.CreateDirectory(Path.Combine(this.XliffFolder, targetLanguage));\n- document.Save(Path.Combine(this.XliffFolder, targetLanguage, $\"{this.FileNameWithoutExtension}{XliffExt}\"));\n- }\n-\n- private XElement GenerateTransElements(ITranslationUnit transUnits, string targetLanguage)\n- {\n- var element = new XElement(XLIFF + \"trans-unit\",\n- new XAttribute(\"id\", transUnits.Key),\n- new XElement(XLIFF + \"source\",\n- new XAttribute(XNamespace.Xml + \"lang\", \"en\"),\n- transUnits.EnglishValue));\n-\n- if (!StringComparer.OrdinalIgnoreCase.Equals(targetLanguage, \"en\"))\n- {\n- element.Add(new XElement(XLIFF + \"target\",\n- new XAttribute(XNamespace.Xml + \"lang\", targetLanguage),\n- new XAttribute(\"state\", \"needs-translation\"),\n- transUnits.EnglishValue)\n- );\n- }\n-\n- return element;\n- }\n-\n- public IDictionary<string, string> LoadTranslatedElements(string targetLanguage)\n- {\n- var translations = new Dictionary<string, string>();\n-\n- var fileName = Path.Combine(this.XliffFolder, targetLanguage, $\"{this.FileNameWithoutExtension}{XliffExt}\");\n- if (File.Exists(fileName))\n- {\n- var document = XDocument.Load(fileName);\n- var elements = document.Descendants(XLIFF + \"trans-unit\");\n- foreach (var element in elements)\n- {\n- var id = element.Attribute(\"id\").Value;\n- var translated = element.Element(XLIFF + \"target\");\n- if (translated != null && !translations.ContainsKey(id))\n- {\n- translations.Add(id, translated.Value);\n- }\n- }\n- }\n-\n- return translations;\n- }\n- }\n-}\n-\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove converter tool
|
410,217 |
23.06.2017 10:43:18
| 25,200 |
1b44714e0b91c1e9baaedc238e6a8713033b8bed
|
Fix telemetry in Repl Window and PR feedback
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/ReplWindow/Repl/ReplWindow.cs",
"new_path": "Common/Product/ReplWindow/Repl/ReplWindow.cs",
"diff": "@@ -21,6 +21,7 @@ using Microsoft.VisualStudio.Editor;\nusing Microsoft.VisualStudio.OLE.Interop;\nusing Microsoft.VisualStudio.Shell;\nusing Microsoft.VisualStudio.Shell.Interop;\n+using Microsoft.VisualStudio.Telemetry;\nusing Microsoft.VisualStudio.Text;\nusing Microsoft.VisualStudio.Text.Classification;\nusing Microsoft.VisualStudio.Text.Editor;\n@@ -181,6 +182,15 @@ namespace Microsoft.NodejsTools.Repl\n#region Initialization\n+ protected override void Initialize()\n+ {\n+ ThreadHelper.ThrowIfNotOnUIThread();\n+ base.Initialize();\n+\n+ //ensure Telemetry is initialized\n+ var defaultSession = TelemetryService.DefaultSession;\n+ }\n+\nprotected override void OnCreate()\n{\nCreateTextViewHost();\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"new_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"diff": "<Reference Include=\"envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\\lib\\net46\\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>\n+ <Private>True</Private>\n+ </Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.RemoteControl, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.RemoteControl.14.0.262-masterA5CACE98\\lib\\net45\\Microsoft.VisualStudio.RemoteControl.dll</HintPath>\n+ <Private>True</Private>\n+ </Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.Telemetry.15.3.795-master67D3E818\\lib\\net45\\Microsoft.VisualStudio.Telemetry.dll</HintPath>\n+ <Private>True</Private>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n+ <Reference Include=\"Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.Utilities.Internal.14.0.73-master6E8F6515\\lib\\net45\\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>\n+ <Private>True</Private>\n+ </Reference>\n+ <Reference Include=\"Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Newtonsoft.Json.9.0.1\\lib\\net45\\Newtonsoft.Json.dll</HintPath>\n+ <Private>True</Private>\n+ </Reference>\n<Reference Include=\"stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/InteractiveWindow/Properties/AssemblyInfo.cs",
"diff": "@@ -10,7 +10,6 @@ using Microsoft.VisualStudio.Shell;\n[assembly: AssemblyConfiguration(\"\")]\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.InteractiveWindow\", CodeBase = \"Microsoft.NodejsTools.InteractiveWindow.dll\", Version = \"1.0.0.0\")]\n-[assembly: NeutralResourcesLanguage(\"en\", UltimateResourceFallbackLocation.Satellite)]\n[assembly: InternalsVisibleTo(\"TestUtilities.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n[assembly: InternalsVisibleTo(\"ReplWindowUITests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n[assembly: InternalsVisibleTo(\"Nodejs.Tests.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Language>JavaScript</Language>\n<VSIXSubpath>ItemTemplates</VSIXSubpath>\n</ZipItem>\n- <VSTemplate>\n+ <!--<VSTemplate>\n<Language>JavaScript</Language>\n<Culture>1033</Culture>\n<OutputSubPath>Node.js</OutputSubPath>\n- </VSTemplate>\n+ </VSTemplate>-->\n</ItemDefinitionGroup>\n<ItemGroup>\n<Reference Include=\"Microsoft.ApplicationInsights, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<ZipItem Include=\"Templates\\Files\\TypeScriptTapeUnitTest\\UnitTest.ts\" />\n<ZipItem Include=\"Templates\\Files\\TypeScriptTsConfig\\tsconfig.json\" />\n<ZipItem Include=\"Templates\\Files\\TypeScriptTsConfig\\tsconfig.vstemplate\" />\n- <None Include=\"app.config\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\express-serve-static-core.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\express.typings.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptExpressApp\\serve-static.typings.json\" />\n<ZipItem Include=\"Templates\\Files\\TypeScriptUnitTest\\UnitTest.vstemplate\">\n<SubType>Designer</SubType>\n</ZipItem>\n- <None Include=\"Theme\\Microsoft.NodejsTools.theme.v14.0.pkgdef\" />\n<None Include=\"Theme\\Microsoft.NodejsTools.theme.v15.0.pkgdef\" />\n<Resource Include=\"version.txt\" />\n<Content Include=\"VSTemplateStore.pkgdef\">\n<RegisterWithCodebase>true</RegisterWithCodebase>\n</PropertyGroup>\n<PropertyGroup>\n- <!--<IsProductComponent>true</IsProductComponent>\n- <ExtensionInstallationRoot>Extensions</ExtensionInstallationRoot>\n- <ExtensionInstallationFolder>Microsoft\\NodeJsTools\\NodeJsTools</ExtensionInstallationFolder>-->\n<CreateVsixContainer>false</CreateVsixContainer>\n<CopyVsixExtensionFiles>false</CopyVsixExtensionFiles>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs",
"diff": "@@ -16,7 +16,6 @@ using Microsoft.VisualStudio.Shell;\n[assembly: ComVisible(false)]\n[assembly: CLSCompliant(false)]\n-[assembly: NeutralResourcesLanguage(\"en\", UltimateResourceFallbackLocation.Satellite)]\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools\", CodeBase = \"Microsoft.NodejsTools.dll\", Version = \"1.0.0.0\")]\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.Npm\", CodeBase = \"Microsoft.NodejsTools.Npm.dll\", Version = \"1.0.0.0\")]\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.PressAnyKey\", CodeBase = \"Microsoft.NodejsTools.PressAnyKey.exe\", Version = \"1.0.0.0\")]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"diff": "using Microsoft.VisualStudio.Shell;\nusing Microsoft.VisualStudio.Telemetry;\n+using static Microsoft.NodejsTools.Telemetry.TelemetryEvents;\n+using static Microsoft.NodejsTools.Telemetry.TelemetryProperties;\nnamespace Microsoft.NodejsTools.Telemetry\n{\n- using System;\n- using static TelemetryEvents;\n- using static TelemetryProperties;\n-\n/// <summary>\n/// Extensions for logging telemetry events.\n/// </summary>\ninternal static class TelemetryHelper\n{\n- private static TelemetrySession defaultSession;\n-\npublic static void Initialize()\n{\nThreadHelper.ThrowIfNotOnUIThread();\n- defaultSession = TelemetryService.DefaultSession;\n+ var defaultSession = TelemetryService.DefaultSession;\n}\npublic static void LogProjectImported()\n{\n- defaultSession.PostUserTask(ProjectImported, TelemetryResult.Success);\n+ TelemetryService.DefaultSession.PostUserTask(ProjectImported, TelemetryResult.Success);\n}\npublic static void LogDebuggingStarted(string debuggerName, string nodeVersion, bool isProject = true)\n@@ -34,27 +30,27 @@ namespace Microsoft.NodejsTools.Telemetry\nuserTask.Properties[NodeVersion] = nodeVersion;\nuserTask.Properties[IsProject] = isProject;\n- defaultSession.PostEvent(userTask);\n+ TelemetryService.DefaultSession.PostEvent(userTask);\n}\npublic static void LogSearchNpm()\n{\n- defaultSession.PostUserTask(SearchNpm, TelemetryResult.Success);\n+ TelemetryService.DefaultSession.PostUserTask(SearchNpm, TelemetryResult.Success);\n}\npublic static void LogInstallNpmPackage()\n{\n- defaultSession.PostUserTask(InstallNpm, TelemetryResult.Success);\n+ TelemetryService.DefaultSession.PostUserTask(InstallNpm, TelemetryResult.Success);\n}\npublic static void LogUnInstallNpmPackage()\n{\n- defaultSession.PostUserTask(UnInstallNpm, TelemetryResult.Success);\n+ TelemetryService.DefaultSession.PostUserTask(UnInstallNpm, TelemetryResult.Success);\n}\npublic static void LogReplUse()\n{\n- defaultSession.PostUserTask(UsedRepl, TelemetryResult.Success);\n+ TelemetryService.DefaultSession.PostUserTask(UsedRepl, TelemetryResult.Success);\n}\n}\n}\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Theme/Microsoft.NodejsTools.theme.v14.0.pkgdef",
"new_path": null,
"diff": "-[$RootKey$\\Themes\\{a5c004b4-2d4b-494e-bf01-45fc492522c7}\\NodejsTools]\n-\"Data\"=hex:91,00,00,00,0b,00,00,00,01,00,00,00,85,56,a0,75,a8,00,ed,4d,ba,e5,e7,a5,0b,fa,92,9a,03,00,00,00,1a,00,00,00,4a,61,64,65,46,69,6c,74,65,72,46,6f,72,6d,61,74,44,65,66,69,6e,69,74,69,6f,6e,00,01,d6,9d,85,ff,1d,00,00,00,4a,61,64,65,49,64,4c,69,74,65,72,61,6c,46,6f,72,6d,61,74,44,65,66,69,6e,69,74,69,6f,6e,00,01,d6,9d,85,ff,1c,00,00,00,4a,61,64,65,56,61,72,69,61,62,6c,65,46,6f,72,6d,61,74,44,65,66,69,6e,69,74,69,6f,6e,00,01,80,80,ff,ff\n-\n-[$RootKey$\\Themes\\{1ded0138-47ce-435e-84ef-9ec1f439b749}\\NodejsTools]\n-\"Data\"=hex:91,00,00,00,0b,00,00,00,01,00,00,00,85,56,a0,75,a8,00,ed,4d,ba,e5,e7,a5,0b,fa,92,9a,03,00,00,00,1a,00,00,00,4a,61,64,65,46,69,6c,74,65,72,46,6f,72,6d,61,74,44,65,66,69,6e,69,74,69,6f,6e,00,01,d6,9d,85,ff,1d,00,00,00,4a,61,64,65,49,64,4c,69,74,65,72,61,6c,46,6f,72,6d,61,74,44,65,66,69,6e,69,74,69,6f,6e,00,01,d6,9d,85,ff,1c,00,00,00,4a,61,64,65,56,61,72,69,61,62,6c,65,46,6f,72,6d,61,74,44,65,66,69,6e,69,74,69,6f,6e,00,01,80,80,ff,ff\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/Npm/Properties/AssemblyInfo.cs",
"diff": "@@ -16,7 +16,6 @@ using System.Runtime.InteropServices;\n// to COM components. If you need to access a type in this assembly from\n// COM, set the ComVisible attribute to true on that type.\n[assembly: ComVisible(false)]\n-[assembly: NeutralResourcesLanguage(\"en\", UltimateResourceFallbackLocation.Satellite)]\n// The following GUID is for the ID of the typelib if this project is exposed to COM\n[assembly: Guid(\"38de5856-defe-4dac-ab7b-43e5a733cfe5\")]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"new_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"diff": "<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n</ItemGroup>\n<ItemGroup>\n- <None Include=\"App.config\" />\n<None Include=\"packages.config\" />\n</ItemGroup>\n<ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/ProjectWizard/Properties/AssemblyInfo.cs",
"diff": "@@ -18,4 +18,3 @@ using System.Runtime.InteropServices;\n// The following GUID is for the ID of the typelib if this project is exposed to COM\n[assembly: Guid(\"dfdf8c10-b0c5-43d5-8ab6-833523131644\")]\n-[assembly: NeutralResourcesLanguage(\"en\", UltimateResourceFallbackLocation.Satellite)]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/Core/NodejsTests.csproj",
"new_path": "Nodejs/Tests/Core/NodejsTests.csproj",
"diff": "<EmbeddedResource Include=\"ruleFormattingTests.json\" />\n</ItemGroup>\n<Import Project=\"..\\TestProjectAfter.settings\" />\n- <Import Project=\"$(SolutionDir)\\.nuget\\NuGet.targets\" Condition=\"Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" />\n<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n<PropertyGroup>\n<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>\n</PropertyGroup>\n- <Error Condition=\"!Exists('$(SolutionDir)\\.nuget\\NuGet.targets')\" Text=\"$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\\.nuget\\NuGet.targets'))\" />\n</Target>\n</Project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/NpmTests/NpmTests.csproj",
"new_path": "Nodejs/Tests/NpmTests/NpmTests.csproj",
"diff": "</Content>\n</ItemGroup>\n<Import Project=\"..\\TestProjectAfter.settings\" />\n- <Import Project=\"$(SolutionDir)\\.nuget\\nuget.targets\" />\n</Project>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix telemetry in Repl Window and PR feedback
|
410,217 |
07.07.2017 16:07:30
| 25,200 |
4853da70b237fca020a9d00ffa7cba165dc17077
|
Bunch of fixes for test adapter
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutor.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutor.cs",
"diff": "@@ -145,8 +145,6 @@ namespace Microsoft.NodejsTools.TestAdapter\n/// <param name=\"frameworkHandle\">Handle to framework. Used for recording results</param>\npublic void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)\n{\n- Debugger.Launch();\n-\nValidateArg.NotNull(tests, \"tests\");\nValidateArg.NotNull(runContext, \"runContext\");\nValidateArg.NotNull(frameworkHandle, \"frameworkHandle\");\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterShim/AssemblyResolver.cs",
"new_path": "Nodejs/Product/TestAdapterShim/AssemblyResolver.cs",
"diff": "using System;\nusing System.IO;\nusing System.Reflection;\n+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\nnamespace Microsoft.NodejsTools.TestAdapter\n{\n@@ -13,11 +14,24 @@ namespace Microsoft.NodejsTools.TestAdapter\nAppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve;\n}\n+ internal static string GetVSInstallDir()\n+ {\n+\n+ var vsTestFrameworkAssembly = typeof(ITestExecutor).Assembly;\n+ var testAdapterPath = vsTestFrameworkAssembly.Location;\n+\n+ // C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\VSUJSLT\\Common7\\IDE\\CommonExtensions\\Microsoft\\NodeJs Tools Unit Test Adapter\\Microsoft.nodejstools.TestAdapter.dll\n+ var indexOfCommon7Ide = testAdapterPath.IndexOf(\"common7\", StringComparison.OrdinalIgnoreCase);\n+ string vsInstallDir = testAdapterPath.Substring(0, indexOfCommon7Ide);\n+\n+ return vsInstallDir;\n+ }\n+\nprivate static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)\n{\n// Use the setup API to find the VS install Dir, then build paths to the Private and Public Assemblies folders\n- string installPath = @\"C:\\vs2017\";\n- string ideFolder = Path.Combine(installPath, \"Common7\\\\IDE\");\n+ var installPath = GetVSInstallDir();\n+ var ideFolder = Path.Combine(installPath, \"Common7\\\\IDE\");\nvar paths = new[] {\nPath.Combine(ideFolder, \"PrivateAssemblies\"),\nPath.Combine(ideFolder, \"PublicAssemblies\"),\n@@ -26,7 +40,7 @@ namespace Microsoft.NodejsTools.TestAdapter\n// This is what comes in for args.Name, but we really just want the dll file name:\n// \"Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\n- string resolveTargetAssemblyName = args.Name.Substring(0, args.Name.IndexOf(',')) + \".dll\";\n+ var resolveTargetAssemblyName = args.Name.Substring(0, args.Name.IndexOf(',')) + \".dll\";\nforeach (var path in paths)\n{\n@@ -42,7 +56,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nprivate static bool ResolveAssemblyPath(string possibleDirectory, string assemblyName, out Assembly resolvedAssembly)\n{\nresolvedAssembly = null;\n- string candidateAssemblyPath = Path.Combine(possibleDirectory, assemblyName);\n+ var candidateAssemblyPath = Path.Combine(possibleDirectory, assemblyName);\nif (File.Exists(candidateAssemblyPath))\n{\nresolvedAssembly = Assembly.LoadFrom(candidateAssemblyPath);\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterVsix/TestAdapterVsix.csproj",
"new_path": "Nodejs/Product/TestAdapterVsix/TestAdapterVsix.csproj",
"diff": "<ProjectReference Include=\"..\\TestAdapter\\TestAdapter.csproj\">\n<Project>{5085df35-3a32-4894-835e-e5a3956d4f57}</Project>\n<Name>TestAdapter</Name>\n- <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>\n+ <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>\n<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>\n<Private>True</Private>\n<VSIXSubPath>.</VSIXSubPath>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Bunch of fixes for test adapter
|
410,217 |
07.07.2017 16:25:42
| 25,200 |
93807c7fea268cbfb92c955c3e6d6b5032e1c007
|
Exclude BAML files, since all strings are in RESX
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"new_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"diff": "<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n<TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).lcl</TranslationFile>\n<LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n+ <SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n</FilesToLocalize>\n<SignFilesDependsOn Include=\"GatherLocalizedOutputsForSigning\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n<TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).lcl</TranslationFile>\n<LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n+ <SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n</FilesToLocalize>\n<SignFilesDependsOn Include=\"GatherLocalizedOutputsForSigning\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Npm.csproj",
"new_path": "Nodejs/Product/Npm/Npm.csproj",
"diff": "<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n<TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).lcl</TranslationFile>\n<LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n+ <SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n</FilesToLocalize>\n<SignFilesDependsOn Include=\"GatherLocalizedOutputsForSigning\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n<TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).lcl</TranslationFile>\n<LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n+ <SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n</FilesToLocalize>\n<SignFilesDependsOn Include=\"GatherLocalizedOutputsForSigning\">\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Exclude BAML files, since all strings are in RESX
|
410,217 |
12.07.2017 16:39:51
| 25,200 |
3a700341aa735f0f853ad5a548bdbc2f3580ec6a
|
Fix resolution of TestFrameworks folder
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.IO;\n+using System.Linq;\nnamespace Microsoft.NodejsTools.TestFrameworks\n{\n@@ -10,52 +11,56 @@ namespace Microsoft.NodejsTools.TestFrameworks\n{\npublic const string ExportRunnerFramework = \"ExportRunner\";\nprivate const string TestFrameworksDirectory = \"TestFrameworks\";\n+ private const string TestAdapterDirectory = \"TestAdapter\";\n- private readonly Dictionary<string, string> _frameworkDirectories;\n+ private readonly Dictionary<string, string> frameworkDirectories;\npublic TestFrameworkDirectories()\n{\n- this._frameworkDirectories = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);\n- foreach (var directory in Directory.GetDirectories(GetBaseTestframeworkFolder()))\n+ this.frameworkDirectories = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);\n+\n+ var testFrameworkRoot = GetTestframeworkFolderRoot();\n+ if(!Directory.Exists(testFrameworkRoot))\n+ {\n+ throw new InvalidOperationException(\"Unable to find test framework folder\");\n+ }\n+\n+ foreach (var directory in Directory.GetDirectories(testFrameworkRoot))\n{\nvar name = Path.GetFileName(directory);\n- this._frameworkDirectories.Add(name, directory);\n+ this.frameworkDirectories.Add(name, directory);\n}\n- string defaultFx;\n- this._frameworkDirectories.TryGetValue(ExportRunnerFramework, out defaultFx);\n- if (defaultFx == null)\n+\n+ if (!this.frameworkDirectories.TryGetValue(ExportRunnerFramework, out var defaultFx) || string.IsNullOrEmpty(defaultFx))\n{\nthrow new InvalidOperationException(\"Missing generic test framework\");\n}\n}\n- public List<string> GetFrameworkNames()\n- {\n- return new List<string>(this._frameworkDirectories.Keys);\n- }\n+ public List<string> GetFrameworkNames() => this.frameworkDirectories.Keys.ToList();\n- public List<string> GetFrameworkDirectories()\n- {\n- return new List<string>(this._frameworkDirectories.Values);\n- }\n+ public List<string> GetFrameworkDirectories() => this.frameworkDirectories.Values.ToList();\n- private static string GetBaseTestframeworkFolder()\n+ private static string GetTestframeworkFolderRoot()\n{\n- var installFolder = GetExecutingAssemblyPath();\n- var baseDirectory = Path.Combine(installFolder, TestFrameworksDirectory);\n+ // This class is used in 2 different assemblies, installed in 2 locations:\n+ //\n+ // \"C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Enterprise\\Common7\\IDE\\Extensions\\Microsoft\\NodeJsTools\\NodeJsTools\\Microsoft.NodejsTools.dll\"\n+ // and\n+ // \"C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Enterprise\\Common7\\IDE\\Extensions\\Microsoft\\NodeJsTools\\TestAdapter\\Microsoft.NodejsTools.TestAdapter.dll\"\n+ //\n+ // However in both cases, we should just go up a folder to the nodejstools root, and then into the TestAdapter folder.\n+\n+ var currentAssembly = typeof(TestFrameworkDirectories).Assembly;\n+ var currentAssemblyFolder = Path.GetDirectoryName(currentAssembly.Location);\n+ var nodejsRootFolder = Path.GetDirectoryName(currentAssemblyFolder);\n+\n+ var baseDirectory = Path.Combine(nodejsRootFolder, TestAdapterDirectory, TestFrameworksDirectory);\n#if DEBUG\n// To allow easier debugging of the test adapter, try to use the local directory as a fallback.\nbaseDirectory = Directory.Exists(baseDirectory) ? baseDirectory : Path.Combine(Directory.GetCurrentDirectory(), TestFrameworksDirectory);\n#endif\nreturn baseDirectory;\n}\n-\n- private static string GetExecutingAssemblyPath()\n- {\n- var codeBase = System.Reflection.Assembly.GetExecutingAssembly().CodeBase;\n- var uri = new UriBuilder(codeBase);\n- var path = Uri.UnescapeDataString(uri.Path);\n- return Path.GetDirectoryName(path);\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "</Reference>\n<Reference Include=\"Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Newtonsoft.Json.9.0.1\\lib\\net45\\Newtonsoft.Json.dll</HintPath>\n- <Private>True</Private>\n+ <Private>False</Private>\n</Reference>\n<Reference Include=\"PresentationCore\" />\n<Reference Include=\"PresentationFramework\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterShim/AssemblyResolver.cs",
"new_path": "Nodejs/Product/TestAdapterShim/AssemblyResolver.cs",
"diff": "@@ -20,7 +20,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nvar vsTestFrameworkAssembly = typeof(ITestExecutor).Assembly;\nvar testAdapterPath = vsTestFrameworkAssembly.Location;\n- // C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\VSUJSLT\\Common7\\IDE\\CommonExtensions\\Microsoft\\NodeJs Tools Unit Test Adapter\\Microsoft.nodejstools.TestAdapter.dll\n+ // C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\VSUJSLT\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow\\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll\nvar indexOfCommon7Ide = testAdapterPath.IndexOf(\"common7\", StringComparison.OrdinalIgnoreCase);\nstring vsInstallDir = testAdapterPath.Substring(0, indexOfCommon7Ide);\n@@ -31,12 +31,12 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\n// Use the setup API to find the VS install Dir, then build paths to the Private and Public Assemblies folders\nvar installPath = GetVSInstallDir();\n- var ideFolder = Path.Combine(installPath, \"Common7\\\\IDE\");\n+ var ideFolder = Path.Combine(installPath, \"Common7\", \"IDE\");\nvar paths = new[] {\nPath.Combine(ideFolder, \"PrivateAssemblies\"),\nPath.Combine(ideFolder, \"PublicAssemblies\"),\n- Path.Combine(installPath, \"MSBuild\\\\15.0\\\\Bin\"),\n- Path.Combine(ideFolder, \"CommonExtensions\\\\Microsoft\\\\WebClient\\\\Project System\") };\n+ Path.Combine(installPath, \"MSBuild\",\"15.0\",\"Bin\"),\n+ Path.Combine(ideFolder, \"CommonExtensions\",\"Microsoft\",\"WebClient\",\"Project System\") };\n// This is what comes in for args.Name, but we really just want the dll file name:\n// \"Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\n@@ -45,7 +45,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nforeach (var path in paths)\n{\n// Check under privateAssemblies\n- if (AssemblyResolver.ResolveAssemblyPath(path, resolveTargetAssemblyName, out var resolvedAssembly))\n+ if (ResolveAssemblyPath(path, resolveTargetAssemblyName, out var resolvedAssembly))\n{\nreturn resolvedAssembly;\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix resolution of TestFrameworks folder
|
410,217 |
12.07.2017 16:49:01
| 25,200 |
ec11bcda8eb9e7fa1425e3d3da4b75d440f28b30
|
Fix up filename for localization
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"new_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).lcl</TranslationFile>\n+ <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n<LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n<SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).lcl</TranslationFile>\n+ <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n<LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n<SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Npm.csproj",
"new_path": "Nodejs/Product/Npm/Npm.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).lcl</TranslationFile>\n+ <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n<LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n<SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).lcl</TranslationFile>\n+ <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n<LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n<SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n"
},
{
"change_type": "DELETE",
"old_path": "loc/lcl/.folder",
"new_path": "loc/lcl/.folder",
"diff": ""
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix up filename for localization
|
410,217 |
12.07.2017 17:30:50
| 25,200 |
09b3fdc38285e38f8533a26a370acb596f4585ac
|
Fix casing for loc task
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"new_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n- <LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n+ <TranslationFile>$(BuildRoot)loc\\lcl\\{Lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n+ <LciCommentFile>$(BuildRoot)loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n<SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n</FilesToLocalize>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n- <LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n+ <TranslationFile>$(BuildRoot)loc\\lcl\\{Lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n+ <LciCommentFile>$(BuildRoot)loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n<SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n</FilesToLocalize>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Npm.csproj",
"new_path": "Nodejs/Product/Npm/Npm.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n- <LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n+ <TranslationFile>$(BuildRoot)loc\\lcl\\{Lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n+ <LciCommentFile>$(BuildRoot)loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n<SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n</FilesToLocalize>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToLocalize Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <TranslationFile>$(BuildRoot)\\loc\\lcl\\{lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n- <LciCommentFile>$(BuildRoot)\\loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n+ <TranslationFile>$(BuildRoot)loc\\lcl\\{Lang}\\$(AssemblyName).dll.lcl</TranslationFile>\n+ <LciCommentFile>$(BuildRoot)loc\\lci\\$(AssemblyName).dll.lci</LciCommentFile>\n<SettingsFile>$(LSBuildRoot)\\MCP_excludeBaml.lss</SettingsFile>\n<InProject>false</InProject>\n</FilesToLocalize>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix casing for loc task
|
410,217 |
14.07.2017 15:23:00
| 25,200 |
3595fa25adde0e870c3d25fc8ee6fcdb846cab93
|
Remove no longer used menus
|
[
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Commands/OpenRemoteDebugDocumentationCommand.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.Diagnostics;\n-using Microsoft.VisualStudioTools;\n-\n-namespace Microsoft.NodejsTools.Commands\n-{\n- internal sealed class OpenRemoteDebugDocumentationCommand : Command\n- {\n- public override void DoCommand(object sender, EventArgs args)\n- {\n- Process.Start(\"https://go.microsoft.com/fwlink/?LinkId=525504\");\n- }\n-\n- public override int CommandId => (int)PkgCmdId.cmdidOpenRemoteDebugDocumentation;\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Commands/OpenRemoteDebugProxyFolderCommand.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.Diagnostics;\n-using System.Globalization;\n-using System.IO;\n-using System.Reflection;\n-using System.Windows.Forms;\n-using Microsoft.VisualStudioTools;\n-using Microsoft.NodejsTools.Project;\n-\n-namespace Microsoft.NodejsTools.Commands\n-{\n- internal sealed class OpenRemoteDebugProxyFolderCommand : Command\n- {\n- private const string remoteDebugJsFileName = \"RemoteDebug.js\";\n-\n- private static string RemoteDebugProxyFolder => Path.Combine(\n- Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),\n- \"RemoteDebug\");\n-\n- public override void DoCommand(object sender, EventArgs args)\n- {\n- // Open explorer to folder\n- var remoteDebugProxyFolder = RemoteDebugProxyFolder;\n- if (string.IsNullOrWhiteSpace(remoteDebugProxyFolder))\n- {\n- MessageBox.Show(Resources.RemoteDebugProxyFolderDoesNotExist, SR.ProductName);\n- return;\n- }\n-\n- var filePath = Path.Combine(remoteDebugProxyFolder, remoteDebugJsFileName);\n- if (!File.Exists(filePath))\n- {\n- MessageBox.Show(string.Format(CultureInfo.CurrentCulture, Resources.RemoteDebugProxyFileDoesNotExist, filePath), SR.ProductName);\n- }\n- else\n- {\n- Process.Start(\"explorer\", string.Format(CultureInfo.InvariantCulture, \"/e,/select,{0}\", filePath));\n- }\n- }\n-\n- public override int CommandId => (int)PkgCmdId.cmdidOpenRemoteDebugProxyFolder;\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.Diagnostics;\n-using Microsoft.VisualStudioTools;\n-\n-namespace Microsoft.NodejsTools.Commands\n-{\n- internal sealed class SendFeedbackCommand : Command\n- {\n- public override void DoCommand(object sender, EventArgs args)\n- {\n- Process.Start(@\"https://aka.ms/ntvs-feedback\");\n- }\n-\n- public override int CommandId => (int)PkgCmdId.cmdidSendFeedback;\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Commands/ShowDocumentationCommand.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System;\n-using System.Diagnostics;\n-using Microsoft.VisualStudioTools;\n-\n-namespace Microsoft.NodejsTools.Commands\n-{\n- internal sealed class ShowDocumentationCommand : Command\n- {\n- public override void DoCommand(object sender, EventArgs args)\n- {\n- Process.Start(@\"https://go.microsoft.com/fwlink/?linkid=785972\");\n- }\n-\n- public override int CommandId => (int)PkgCmdId.cmdidShowDocumentation;\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Compile Include=\"ClassifierProviderMetadata.cs\" />\n<Compile Include=\"Commands\\AzureExplorerAttachDebuggerCommand.cs\" />\n<Compile Include=\"Commands\\ImportWizardCommand.cs\" />\n- <Compile Include=\"Commands\\SendFeedbackCommand.cs\" />\n<Compile Include=\"Commands\\OpenReplWindowCommand.cs\" />\n- <Compile Include=\"Commands\\OpenRemoteDebugDocumentationCommand.cs\" />\n- <Compile Include=\"Commands\\OpenRemoteDebugProxyFolderCommand.cs\" />\n- <Compile Include=\"Commands\\ShowDocumentationCommand.cs\" />\n<Compile Include=\"Debugger\\DebugEngine\\AD7EvalErrorProperty.cs\" />\n<Compile Include=\"Debugger\\NodeDebugProvider.cs\" />\n<Compile Include=\"ImportWizardResources.Designer.cs\">\n</EmbeddedResource>\n<VSCTCompile Include=\"NodejsTools.vsct\">\n<ResourceName>Menus.ctmenu</ResourceName>\n+ <SubType>Designer</SubType>\n</VSCTCompile>\n<Compile Include=\"Resources.Designer.cs\">\n<AutoGen>True</AutoGen>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"diff": "@@ -119,11 +119,7 @@ namespace Microsoft.NodejsTools\n// Add our command handlers for menu (commands must exist in the .vsct file)\nvar commands = new List<Command> {\nnew OpenReplWindowCommand(),\n- new OpenRemoteDebugProxyFolderCommand(),\n- new OpenRemoteDebugDocumentationCommand(),\nnew ImportWizardCommand(),\n- new SendFeedbackCommand(),\n- new ShowDocumentationCommand()\n};\ntry\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsTools.vsct",
"new_path": "Nodejs/Product/Nodejs/NodejsTools.vsct",
"diff": "group as the part of a menu contained between two lines. The parent of a group\nmust be a menu. -->\n<Groups>\n- <!-- Our group of menu items which is displayed on Tools/NodeJS Tools/... -->\n- <Group guid=\"guidNodeToolsCmdSet\" id=\"ToolsMenuItemsGroup\" priority=\"0x0500\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"ToolsMenu\"/>\n- </Group>\n-\n<!-- Group on normal project items -->\n<Group guid=\"guidNodeToolsCmdSet\" id=\"CodeFileGroup\" priority=\"0x600\">\n<Parent guid=\"guidSHLMainMenu\" id=\"IDM_VS_MENU_PROJECT\"/>\n</Group>\n- <!-- Our group of menu items which is displayed on Tools/NodeJS Tools/Remote Debugging Proxy/... -->\n- <Group guid=\"guidNodeToolsCmdSet\" id=\"RemoteDebugProxyGroup\" priority=\"0x0500\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"RemoteDebugProxyMenu\"/>\n- </Group>\n-\n- <Group guid=\"guidNodeToolsCmdSet\" id=\"NtvsHelpGroup\" priority=\"0x0500\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"ToolsMenu\"/>\n- </Group>\n-\n<Group guid=\"guidSHLMainMenu\" id=\"IDG_VS_CTXT_PROJWIN_SCOPE\" priority=\"0x0500\">\n<Parent guid=\"guidNodeToolsNpmCmdSet\" id=\"NpmMenu\"/>\n</Group>\n</Groups>\n<Menus>\n- <Menu guid=\"guidNodeToolsCmdSet\" id=\"ToolsMenu\" priority=\"0x8009\" type=\"Menu\">\n- <Parent guid=\"guidSHLMainMenu\" id=\"IDG_VS_TOOLS_OTHER2\"/>\n- <Strings>\n- <ButtonText>Node.&js Tools</ButtonText>\n- <CommandName>Node.&js Tools</CommandName>\n- </Strings>\n- </Menu>\n-\n- <Menu guid=\"guidNodeToolsCmdSet\" id=\"RemoteDebugProxyMenu\" priority=\"0x0500\" type=\"Menu\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"ToolsMenuItemsGroup\"/>\n- <Strings>\n- <ButtonText>&Remote Debugging Proxy</ButtonText>\n- <CommandName>&Remote Debugging Proxy</CommandName>\n- </Strings>\n- </Menu>\n<Menu guid=\"guidNodeToolsNpmCmdSet\" id=\"NpmMenu\" priority=\"0x0600\" type=\"Context\">\n<Strings>\n<ButtonText>&Npm</ButtonText>\n</Button>\n<Button guid=\"guidNodeToolsCmdSet\" id=\"cmdidOpenCommandPromptHere\" priority=\"0x0600\" type=\"Button\">\n- <Icon guid=\"guidCommandPromptImage\" id=\"1\" />\n<Parent guid=\"guidSHLMainMenu\" id=\"IDG_VS_CTXT_FOLDER_EXPLORE\"/>\n+ <Icon guid=\"guidCommandPromptImage\" id=\"1\" />\n<CommandFlag>DefaultInvisible</CommandFlag>\n<CommandFlag>DynamicVisibility</CommandFlag>\n<Strings>\n</Strings>\n</Button>\n- <Button guid=\"guidNodeToolsCmdSet\" id=\"cmdidOpenRemoteDebugProxyFolder\" priority=\"0x0500\" type=\"Button\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"RemoteDebugProxyGroup\"/>\n- <Strings>\n- <CommandName>Open Containing Folder</CommandName>\n- <ButtonText>&Open Containing Folder</ButtonText>\n- </Strings>\n- </Button>\n-\n- <Button guid=\"guidNodeToolsCmdSet\" id=\"cmdidOpenRemoteDebugDocumentation\" priority=\"0x0510\" type=\"Button\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"RemoteDebugProxyGroup\"/>\n- <Strings>\n- <CommandName>Open Documentation</CommandName>\n- <ButtonText>Open &Documentation</ButtonText>\n- </Strings>\n- </Button>\n-\n- <Button guid=\"guidNodeToolsCmdSet\" id=\"cmdidDocumentation\" priority=\"0x004\" type=\"Button\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"NtvsHelpGroup\"/>\n- <Strings>\n- <ButtonText>&Documentation...</ButtonText>\n- <CommandName>Documentation...</CommandName>\n- </Strings>\n- </Button>\n-\n- <Button guid=\"guidNodeToolsCmdSet\" id=\"cmdidSendFeedback\" priority=\"0x006\" type=\"Button\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"NtvsHelpGroup\"/>\n- <Strings>\n- <ButtonText>&Report Issue or Send Feedback...</ButtonText>\n- <CommandName>Report Issue or Send Feedback...</CommandName>\n- </Strings>\n- </Button>\n-\n<Button guid=\"guidNodeToolsNpmCmdSet\" id=\"cmdidNpmManageModules\" priority=\"0x8000\" type=\"Button\">\n<Parent guid=\"guidNodeToolsNpmCmdSet\" id=\"NpmGroup\" />\n<CommandFlag>DefaultInvisible</CommandFlag>\n</Strings>\n</Button>\n- <Button guid=\"guidNodeToolsNpmCmdSet\" id=\"cmdidNpmOpenModuleHomepage\" priority=\"0x8370\" type=\"Button\">\n- <Parent guid=\"guidNodeToolsNpmCmdSet\" id=\"NpmExploreGroup\" />\n- <CommandFlag>DefaultInvisible</CommandFlag>\n- <CommandFlag>DynamicVisibility</CommandFlag>\n- <Strings>\n- <CommandName>cmdidNpmOpenModuleHomepage</CommandName>\n- <ButtonText>Open &Documentation</ButtonText>\n- </Strings>\n- </Button>\n-\n- <Button guid=\"guidNodeToolsCmdSet\" id=\"cmdidImportWizard\" priority=\"0x010\" type=\"Button\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"ToolsMenuItemsGroup\"/>\n- <CommandFlag>DefaultInvisible</CommandFlag>\n- <Strings>\n- <ButtonText>Import Existing &Project...</ButtonText>\n- <MenuText>Import Existing &Project...</MenuText>\n- <ToolTipText>Import Existing Project...</ToolTipText>\n- <CommandName>Import Existing Project...</CommandName>\n- </Strings>\n- </Button>\n-\n<Button guid=\"guidNodeToolsCmdSet\" id=\"cmdidAzureExplorerAttachNodejsDebugger\" priority=\"0x0110\" type=\"Button\">\n<Parent guid=\"guidAzureExplorerCmdId\" id=\"groupAzureDiagnostics\"/>\n<CommandFlag>DefaultInvisible</CommandFlag>\n<CommandPlacement guid=\"guidNodeToolsCmdSet\" id=\"CodeFileGroup\" priority=\"0x600\">\n<Parent guid=\"guidSHLMainMenu\" id=\"IDM_VS_CTXT_WEBITEMNODE\"/>\n</CommandPlacement>\n- <CommandPlacement guid=\"guidNodeToolsCmdSet\" id=\"cmdidReplWindow\" priority=\"0x102\">\n- <Parent guid=\"guidNodeToolsCmdSet\" id=\"ToolsMenuItemsGroup\"/>\n- </CommandPlacement>\n</CommandPlacements>\n<KeyBindings>\n<GuidSymbol name=\"guidNodeToolsCmdSet\" value=\"{695e37e2-c6df-4e0a-8833-f688e4c65f1f}\">\n<IDSymbol name=\"cmdidReplWindow\" value=\"0x200\" />\n<IDSymbol name=\"cmdidOpenReplWindow\" value=\"0x201\" />\n- <IDSymbol name=\"cmdidOpenRemoteDebugProxyFolder\" value=\"0x0202\" />\n<IDSymbol name=\"cmdidSetAsNodejsStartupFile\" value=\"0x0203\" />\n<IDSymbol name=\"cmdidImportWizard\" value =\"0x0205\" />\n- <IDSymbol name=\"cmdidOpenRemoteDebugDocumentation\" value=\"0x0206\" />\n+\n<IDSymbol name=\"cmdidAzureExplorerAttachNodejsDebugger\" value=\"0x0207\" />\n<IDSymbol name=\"cmdidAddNewFileCommand\" value=\"0x0211\" />\n- <IDSymbol name=\"cmdidSendFeedback\" value=\"0x0215\" />\n- <IDSymbol name=\"cmdidDocumentation\" value=\"0x0216\" />\n<!-- Shared commands, defined in CommonConstants.cs -->\n<IDSymbol name=\"cmdidAddExistingFolder\" value=\"0x10001\" />\n<IDSymbol name=\"cmdidCopyFullPath\" value=\"0x10003\" />\n<!-- Groups -->\n- <IDSymbol name=\"ToolsMenuItemsGroup\" value=\"0x1010\" />\n- <IDSymbol name=\"RemoteDebugProxyGroup\" value=\"0x1011\" />\n<IDSymbol name=\"CodeFileGroup\" value=\"0x1012\" />\n<IDSymbol name=\"AzureExplorerCommandsGroup\" value=\"0x1015\" />\n<IDSymbol name=\"AddNewFileGroup\" value=\"0x1016\"/>\n<IDSymbol name=\"NtvsHelpGroup\" value=\"0x1017\" />\n-\n- <!-- Menus -->\n- <IDSymbol name=\"ToolsMenu\" value =\"0x2001\" />\n- <IDSymbol name=\"RemoteDebugProxyMenu\" value =\"0x2002\" />\n</GuidSymbol>\n<GuidSymbol name=\"guidNodeToolsNpmCmdSet\" value=\"{9F4B31B4-09AC-4937-A2E7-F4BC02BB7DBA}\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/PkgCmdId.cs",
"new_path": "Nodejs/Product/Nodejs/PkgCmdId.cs",
"diff": "namespace Microsoft.NodejsTools\n{\n- internal class PkgCmdId\n+ internal static class PkgCmdId\n{\npublic const int cmdidReplWindow = 0x200;\npublic const int cmdidOpenReplWindow = 0x201;\n- public const int cmdidOpenRemoteDebugProxyFolder = 0x202;\npublic const int cmdidSetAsNodejsStartupFile = 0x203;\npublic const int cmdidImportWizard = 0x205;\n- public const int cmdidOpenRemoteDebugDocumentation = 0x206;\npublic const uint cmdidAzureExplorerAttachNodejsDebugger = 0x207;\npublic const int cmdidDiagnostics = 0x208;\npublic const int cmdidAddFileCommand = 0x211;\n- public const int cmdidSendFeedback = 0x215;\n- public const int cmdidShowDocumentation = 0x216;\npublic const int cmdidNpmManageModules = 0x300;\npublic const int cmdidNpmInstallModules = 0x301;\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove no longer used menus
|
410,217 |
14.07.2017 16:34:28
| 25,200 |
e3bd95c0e086058f8c3ed2f484e600c6d53c2f48
|
Remove another menu
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsTools.vsct",
"new_path": "Nodejs/Product/Nodejs/NodejsTools.vsct",
"diff": "<IDSymbol name=\"CodeFileGroup\" value=\"0x1012\" />\n<IDSymbol name=\"AzureExplorerCommandsGroup\" value=\"0x1015\" />\n<IDSymbol name=\"AddNewFileGroup\" value=\"0x1016\"/>\n- <IDSymbol name=\"NtvsHelpGroup\" value=\"0x1017\" />\n</GuidSymbol>\n<GuidSymbol name=\"guidNodeToolsNpmCmdSet\" value=\"{9F4B31B4-09AC-4937-A2E7-F4BC02BB7DBA}\">\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove another menu
|
410,217 |
14.07.2017 16:45:38
| 25,200 |
943933f978a4ca8f549acec82cc43ce4a7d492a2
|
Remove logger which is no longer used,
since we removed the diagnostics window.
|
[
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Logging/INodejsToolsLogger.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-namespace Microsoft.NodejsTools.Logging\n-{\n- /// <summary>\n- /// Provides an interface for logging events and statistics inside of PTVS.\n- ///\n- /// Multiple loggers can be created which send stats to different locations.\n- ///\n- /// By default there is one logger which shows the stats in\n- /// Tools->Node.js Tools->Diagnostic Info.\n- /// </summary>\n- public interface INodejsToolsLogger\n- {\n- /// <summary>\n- /// Informs the logger of an event. Unknown events should be ignored.\n- /// </summary>\n- void LogEvent(NodejsToolsLogEvent logEvent, object argument);\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Logging/InMemoryLogger.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-using System.ComponentModel.Composition;\n-using System.Text;\n-\n-namespace Microsoft.NodejsTools.Logging\n-{\n- /// <summary>\n- /// Keeps track of logged events and makes them available for display in the diagnostics window.\n- /// </summary>\n- [Export(typeof(INodejsToolsLogger))]\n- [Export(typeof(InMemoryLogger))]\n- internal class InMemoryLogger : INodejsToolsLogger\n- {\n- private int _debugLaunchCount, _normalLaunchCount;\n-\n- #region INodejsToolsLogger Members\n-\n- public void LogEvent(NodejsToolsLogEvent logEvent, object argument)\n- {\n- switch (logEvent)\n- {\n- case NodejsToolsLogEvent.Launch:\n- if ((int)argument != 0)\n- {\n- this._debugLaunchCount++;\n- }\n- else\n- {\n- this._normalLaunchCount++;\n- }\n- break;\n- }\n- }\n-\n- #endregion\n-\n- public override string ToString()\n- {\n- var res = new StringBuilder();\n- res.AppendLine(\" Debug Launches: \" + this._debugLaunchCount);\n- res.AppendLine(\" Normal Launches: \" + this._normalLaunchCount);\n- return res.ToString();\n- }\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Logging/NodejsToolsLogEvent.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-namespace Microsoft.NodejsTools.Logging\n-{\n- /// <summary>\n- /// Defines the list of events which PTVS will log to a INodejsToolsLogger.\n- /// </summary>\n- public enum NodejsToolsLogEvent\n- {\n- /// <summary>\n- /// Logs a debug launch. Data supplied should be 1 or 0 indicating whether\n- /// the launch was without debugging or with.\n- /// </summary>\n- Launch,\n- /// <summary>\n- /// Logs the analysis detail level\n- ///\n- /// Data is an int enum mapping to AnalysisLevel* setting\n- /// </summary>\n- AnalysisLevel\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Logging/NodejsToolsLogger.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-namespace Microsoft.NodejsTools.Logging\n-{\n- /// <summary>\n- /// Main entry point for logging events. A single instance of this logger is created\n- /// by our package and can be used to dispatch log events to all installed loggers.\n- /// </summary>\n- internal class NodejsToolsLogger\n- {\n- private readonly INodejsToolsLogger[] _loggers;\n-\n- public NodejsToolsLogger(INodejsToolsLogger[] loggers)\n- {\n- this._loggers = loggers;\n- }\n-\n- public void LogEvent(NodejsToolsLogEvent logEvent, object data = null)\n- {\n- foreach (var logger in this._loggers)\n- {\n- logger.LogEvent(logEvent, data);\n- }\n- }\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Compile Include=\"Debugger\\LocalFileNameMapper.cs\" />\n<Compile Include=\"Debugger\\NodeProcess.cs\" />\n<Compile Include=\"Debugger\\ScriptTree.cs\" />\n- <Compile Include=\"Logging\\InMemoryLogger.cs\" />\n- <Compile Include=\"Logging\\INodejsToolsLogger.cs\" />\n<Compile Include=\"Logging\\LiveLogger.cs\" />\n- <Compile Include=\"Logging\\NodejsToolsLogEvent.cs\" />\n- <Compile Include=\"Logging\\NodejsToolsLogger.cs\" />\n<Compile Include=\"NodejsPackage.Debugger.cs\" />\n<Compile Include=\"NpmUI\\LastRefreshedMessageProvider.cs\" />\n<Compile Include=\"NpmUI\\NpmInstallWindowResources.Designer.cs\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsPackage.cs",
"diff": "@@ -66,10 +66,10 @@ namespace Microsoft.NodejsTools\ninternal sealed partial class NodejsPackage : CommonPackage\n{\ninternal const string NodeExpressionEvaluatorGuid = \"{F16F2A71-1C45-4BAB-BECE-09D28CFDE3E6}\";\n- private IContentType _contentType;\n+ private IContentType contentType;\ninternal static NodejsPackage Instance;\ninternal HashSet<ITextBuffer> ChangedBuffers = new HashSet<ITextBuffer>();\n- private NodejsToolsLogger _logger;\n+\n// Hold references for the subscribed events. Otherwise the callbacks will be garbage collected\n// after the initialization\nprivate List<EnvDTE.CommandEvents> _subscribedCommandEvents = new List<EnvDTE.CommandEvents>();\n@@ -136,8 +136,6 @@ namespace Microsoft.NodejsTools\nMakeDebuggerContextAvailable();\n- InitializeLogging();\n-\nInitializeTelemetry();\n// The variable is inherited by child processes backing Test Explorer, and is used in\n@@ -177,11 +175,6 @@ namespace Microsoft.NodejsTools\nthis._subscribedCommandEvents.Add(targetEvent);\n}\n- private void InitializeLogging()\n- {\n- this._logger = new NodejsToolsLogger(this.ComponentModel.GetExtensions<INodejsToolsLogger>().ToArray());\n- }\n-\nprivate void InitializeTelemetry()\n{\n// Fetch the session synchronously on the UI thread; if this doesn't happen before we try using this on\n@@ -191,8 +184,6 @@ namespace Microsoft.NodejsTools\npublic new IComponentModel ComponentModel => this.GetComponentModel();\n- internal NodejsToolsLogger Logger => this._logger;\n-\n/// <summary>\n/// Makes the debugger context available - this enables our debugger when we're installed into\n/// a SKU which doesn't support every installed debugger.\n@@ -201,8 +192,8 @@ namespace Microsoft.NodejsTools\n{\nvar monitorSelection = (IVsMonitorSelection)GetService(typeof(SVsShellMonitorSelection));\nvar debugEngineGuid = AD7Engine.DebugEngineGuid;\n- uint contextCookie;\n- if (ErrorHandler.Succeeded(monitorSelection.GetCmdUIContextCookie(ref debugEngineGuid, out contextCookie)))\n+\n+ if (ErrorHandler.Succeeded(monitorSelection.GetCmdUIContextCookie(ref debugEngineGuid, out var contextCookie)))\n{\nErrorHandler.ThrowOnFailure(monitorSelection.SetCmdUIContext(contextCookie, 1));\n}\n@@ -262,11 +253,11 @@ namespace Microsoft.NodejsTools\n{\nget\n{\n- if (this._contentType == null)\n+ if (this.contentType == null)\n{\n- this._contentType = this.ComponentModel.GetService<IContentTypeRegistryService>().GetContentType(NodejsConstants.TypeScript);\n+ this.contentType = this.ComponentModel.GetService<IContentTypeRegistryService>().GetContentType(NodejsConstants.TypeScript);\n}\n- return this._contentType;\n+ return this.contentType;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -52,13 +52,11 @@ namespace Microsoft.NodejsTools.Project\n#region IProjectLauncher Members\npublic int LaunchProject(bool debug)\n{\n- NodejsPackage.Instance.Logger.LogEvent(Logging.NodejsToolsLogEvent.Launch, debug ? 1 : 0);\nreturn Start(ResolveStartupFile(), debug);\n}\npublic int LaunchFile(string file, bool debug)\n{\n- NodejsPackage.Instance.Logger.LogEvent(Logging.NodejsToolsLogEvent.Launch, debug ? 1 : 0);\nreturn Start(file, debug);\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove logger which is no longer used,
since we removed the diagnostics window.
|
410,217 |
17.07.2017 12:58:27
| 25,200 |
9f44a8a0b6c8789b7019e26f43846ba347667e71
|
Make sure we work with both .ts and .tsx files
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs",
"new_path": "Nodejs/Product/Nodejs/Debugger/DebugEngine/AD7Engine.cs",
"diff": "@@ -13,6 +13,7 @@ using Microsoft.NodejsTools.Debugger.Communication;\nusing Microsoft.NodejsTools.Debugger.Remote;\nusing Microsoft.NodejsTools.Logging;\nusing Microsoft.NodejsTools.Project;\n+using Microsoft.NodejsTools.TypeScript;\nusing Microsoft.VisualStudio;\nusing Microsoft.VisualStudio.Debugger.Interop;\nusing Microsoft.VisualStudio.Shell;\n@@ -1370,7 +1371,7 @@ namespace Microsoft.NodejsTools.Debugger.DebugEngine\n}\n// For .ts files, we need to build the project to regenerate .js code.\n- if (StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(module.FileName), NodejsConstants.TypeScriptExtension))\n+ if (TypeScriptHelpers.IsTypeScriptFile(module.FileName))\n{\nif (document.ProjectItem.ContainingProject.GetNodeProject().Build(null, null) != MSBuildResult.Successful)\n{\n@@ -1395,7 +1396,7 @@ namespace Microsoft.NodejsTools.Debugger.DebugEngine\ninternal static void MapLanguageInfo(string filename, out string pbstrLanguage, out Guid pguidLanguage)\n{\n- if (StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(filename), NodejsConstants.TypeScriptExtension))\n+ if (TypeScriptHelpers.IsTypeScriptFile(filename))\n{\npbstrLanguage = NodejsConstants.TypeScript;\npguidLanguage = Guids.TypeScriptDebugLanguage;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsConstants.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsConstants.cs",
"diff": "@@ -9,6 +9,7 @@ namespace Microsoft.NodejsTools\n{\ninternal const string JavaScriptExtension = \".js\";\ninternal const string TypeScriptExtension = \".ts\";\n+ internal const string TypeScriptJsxExtension = \".tsx\";\ninternal const string TypeScriptDeclarationExtension = \".d.ts\";\ninternal const string MapExtension = \".map\";\ninternal const string NodejsProjectExtension = \".njsproj\";\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs",
"diff": "@@ -13,6 +13,7 @@ using System.Threading;\nusing System.Threading.Tasks;\nusing Microsoft.NodejsTools.Npm;\nusing Microsoft.NodejsTools.ProjectWizard;\n+using Microsoft.NodejsTools.TypeScript;\nusing Microsoft.VisualStudio;\nusing Microsoft.VisualStudio.Imaging;\nusing Microsoft.VisualStudio.Imaging.Interop;\n@@ -188,7 +189,7 @@ namespace Microsoft.NodejsTools.Project\nprivate static bool IsProjectTypeScriptSourceFile(string path)\n{\n- return StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(path), NodejsConstants.TypeScriptExtension)\n+ return TypeScriptHelpers.IsTypeScriptFile(path)\n&& !StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(path), NodejsConstants.TypeScriptDeclarationExtension)\n&& !NodejsConstants.ContainsNodeModulesOrBowerComponentsFolder(path);\n}\n@@ -213,8 +214,7 @@ namespace Microsoft.NodejsTools.Project\nreturn node.ItemNode.ItemTypeName;\n}\n- // TODO: make sure this also works for .tsx\n- if (StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(filename), NodejsConstants.TypeScriptExtension))\n+ if (TypeScriptHelpers.IsTypeScriptFile(filename))\n{\nreturn NodejsConstants.TypeScriptCompileItemType;\n}\n@@ -281,13 +281,11 @@ namespace Microsoft.NodejsTools.Project\npublic override CommonFileNode CreateCodeFileNode(ProjectElement item)\n{\nvar fileName = item.Url;\n- if (!string.IsNullOrWhiteSpace(fileName)\n- && Path.GetExtension(fileName).Equals(NodejsConstants.TypeScriptExtension, StringComparison.OrdinalIgnoreCase))\n+ if (!string.IsNullOrWhiteSpace(fileName) && TypeScriptHelpers.IsTypeScriptFile(fileName))\n{\nreturn new NodejsTypeScriptFileNode(this, item);\n}\n- var res = new NodejsFileNode(this, item);\n- return res;\n+ return new NodejsFileNode(this, item);\n}\npublic override string GetProjectName()\n@@ -361,8 +359,8 @@ namespace Microsoft.NodejsTools.Project\npublic override bool IsCodeFile(string fileName)\n{\nvar ext = Path.GetExtension(fileName);\n- return ext.Equals(NodejsConstants.JavaScriptExtension, StringComparison.OrdinalIgnoreCase) ||\n- ext.Equals(NodejsConstants.TypeScriptExtension, StringComparison.OrdinalIgnoreCase);\n+ return StringComparer.OrdinalIgnoreCase.Equals(NodejsConstants.JavaScriptExtension) ||\n+ TypeScriptHelpers.IsTypeScriptFile(fileName);\n}\nprotected override void Reload()\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TypeScript/TypeScriptHelpers.cs",
"new_path": "Nodejs/Product/TypeScript/TypeScriptHelpers.cs",
"diff": "@@ -14,7 +14,10 @@ namespace Microsoft.NodejsTools.TypeScript\n{\ninternal static bool IsTypeScriptFile(string filename)\n{\n- return StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(filename), NodejsConstants.TypeScriptExtension);\n+ var extension = Path.GetExtension(filename);\n+\n+ return StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.TypeScriptExtension)\n+ || StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.TypeScriptJsxExtension);\n}\ninternal static string GetTypeScriptBackedJavaScriptFile(MSBuild.Project project, string pathToFile)\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Make sure we work with both .ts and .tsx files
|
410,217 |
17.07.2017 17:37:39
| 25,200 |
fd141e3ac0b42f18909174de9834d116cd9578bd
|
Add better support for .jsx
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsConstants.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsConstants.cs",
"diff": "@@ -8,6 +8,7 @@ namespace Microsoft.NodejsTools\ninternal static class NodejsConstants\n{\ninternal const string JavaScriptExtension = \".js\";\n+ internal const string JavaScriptJsxExtension = \".jsx\";\ninternal const string TypeScriptExtension = \".ts\";\ninternal const string TypeScriptJsxExtension = \".tsx\";\ninternal const string TypeScriptDeclarationExtension = \".d.ts\";\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs",
"diff": "@@ -198,7 +198,8 @@ namespace Microsoft.NodejsTools.Project\n{\nvar ext = Path.GetExtension(strFileName);\n- return StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptExtension);\n+ return StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptExtension) ||\n+ StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptJsxExtension);\n}\ninternal override string GetItemType(string filename)\n@@ -209,7 +210,7 @@ namespace Microsoft.NodejsTools.Project\nPath.Combine(this.ProjectHome, filename);\nvar node = this.FindNodeByFullPath(absFileName) as NodejsFileNode;\n- if (node != null && node.ItemNode.ItemTypeName != null)\n+ if (node?.ItemNode?.ItemTypeName != null)\n{\nreturn node.ItemNode.ItemTypeName;\n}\n@@ -271,7 +272,14 @@ namespace Microsoft.NodejsTools.Project\nreturn false;\n}\n- public override string[] CodeFileExtensions => new[] { NodejsConstants.JavaScriptExtension };\n+ private static readonly string[] codeFileExtensions = new[] {\n+ NodejsConstants.JavaScriptExtension,\n+ NodejsConstants.JavaScriptJsxExtension,\n+ NodejsConstants.TypeScriptExtension,\n+ NodejsConstants.TypeScriptJsxExtension\n+ };\n+\n+ public override string[] CodeFileExtensions => codeFileExtensions;\nprotected internal override FolderNode CreateFolderNode(ProjectElement element)\n{\n@@ -359,7 +367,8 @@ namespace Microsoft.NodejsTools.Project\npublic override bool IsCodeFile(string fileName)\n{\nvar ext = Path.GetExtension(fileName);\n- return StringComparer.OrdinalIgnoreCase.Equals(NodejsConstants.JavaScriptExtension) ||\n+ return StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptExtension) ||\n+ StringComparer.OrdinalIgnoreCase.Equals(ext, NodejsConstants.JavaScriptJsxExtension) ||\nTypeScriptHelpers.IsTypeScriptFile(fileName);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestContainerDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/TestContainerDiscoverer.cs",
"diff": "@@ -177,7 +177,7 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\nvar testCaseFile = pathToFile;\nvar project = GetTestProjectFromFile(pathToFile);\n- if (null == project)\n+ if (project == null)\n{\n//The file is not included in the project.\n//Don't look for tests in it.\n@@ -198,7 +198,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nreturn false;\n}\n}\n- else if (!NodejsConstants.JavaScriptExtension.Equals(Path.GetExtension(pathToFile), StringComparison.OrdinalIgnoreCase))\n+ else if (!StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(pathToFile), NodejsConstants.JavaScriptExtension))\n{\nreturn false;\n}\n@@ -620,6 +620,18 @@ namespace Microsoft.NodejsTools.TestAdapter\n/// <param name=\"project\">The project which the event is being raised for</param>\nprivate bool OnTestContainersChanged(IVsProject project)\n{\n+ // https://pytools.codeplex.com/workitem/1271\n+ // When test explorer kicks off a run it kicks off a test discovery\n+ // phase, which kicks off a build, which results in us saving files.\n+ // If we raise the files changed event then test explorer immediately turns\n+ // around and queries us for the changed files. Then it continues\n+ // along with the test discovery phase it was already initiating, and\n+ // discovers that no changes have occured - because it already updated\n+ // to the latest changes when we informed it our containers had changed.\n+ // Therefore if we are both building and detecting changes then we\n+ // don't want to raise the event, instead it'll query us in a little\n+ // bit and get the most recent changes.\n+\nif (project != null &&\nproject.TryGetProjectPath(out var projectPath) &&\nthis.knownProjects.TryGetValue(projectPath, out var projectInfo) &&\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add better support for .jsx
|
410,217 |
18.07.2017 15:32:57
| 25,200 |
7176baae8a64f541b9e8525105aecf8418e4ca9a
|
Fire changed events for all revelant controls in project properties.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"diff": "this._nodeExeArguments.Name = \"_nodeExeArguments\";\nthis._nodeExeArguments.Size = new System.Drawing.Size(620, 20);\nthis._nodeExeArguments.TabIndex = 4;\n+ this._nodeExeArguments.TextChanged += new System.EventHandler(this.Changed);\n//\n// _scriptFile\n//\nthis._scriptFile.Name = \"_scriptFile\";\nthis._scriptFile.Size = new System.Drawing.Size(620, 20);\nthis._scriptFile.TabIndex = 6;\n+ this._scriptFile.TextChanged += new System.EventHandler(this.Changed);\n//\n// _browseDirectory\n//\nthis._scriptArguments.Name = \"_scriptArguments\";\nthis._scriptArguments.Size = new System.Drawing.Size(620, 20);\nthis._scriptArguments.TabIndex = 9;\n+ this._scriptArguments.TextChanged += new System.EventHandler(this.Changed);\n//\n// _workingDir\n//\nthis._launchUrl.Name = \"_launchUrl\";\nthis._launchUrl.Size = new System.Drawing.Size(620, 20);\nthis._launchUrl.TabIndex = 13;\n+ this._launchUrl.TextChanged += new System.EventHandler(this.Changed);\n//\n// _nodejsPort\n//\nthis._debuggerPort.Name = \"_debuggerPort\";\nthis._debuggerPort.Size = new System.Drawing.Size(105, 20);\nthis._debuggerPort.TabIndex = 17;\n+ this._debuggerPort.TextChanged += new System.EventHandler(this.PortChanged);\n//\n// _envVars\n//\nthis._envVars.ScrollBars = System.Windows.Forms.ScrollBars.Both;\nthis._envVars.Size = new System.Drawing.Size(620, 84);\nthis._envVars.TabIndex = 19;\n+ this._envVars.TextChanged += new System.EventHandler(this.Changed);\n//\n// _startBrowser\n//\nthis._startBrowser.TabIndex = 20;\nthis._startBrowser.Text = \"_startBrowser\";\nthis._startBrowser.UseVisualStyleBackColor = true;\n+ this._startBrowser.CheckedChanged += new System.EventHandler(this.Changed);\n//\n// _nodeExeErrorProvider\n//\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fire changed events for all revelant controls in project properties.
|
410,217 |
18.07.2017 17:16:42
| 25,200 |
62105d397138bc20a55499db4ddb8aaa8419feb8
|
Move TestAdapter files into project from shared location
|
[
{
"change_type": "RENAME",
"old_path": "Common/Product/TestAdapter/ServiceProviderExtension.cs",
"new_path": "Nodejs/Product/TestAdapter/ServiceProviderExtension.cs",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "</Compile>\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n<Compile Include=\"RunFromContextFileExtensions.cs\" />\n- <Compile Include=\"..\\..\\..\\Common\\Product\\TestAdapter\\ServiceProviderExtension.cs\">\n- <Link>ServiceProviderExtension.cs</Link>\n- </Compile>\n- <Compile Include=\"..\\..\\..\\Common\\Product\\TestAdapter\\TestContainer.cs\">\n- <Link>TestContainer.cs</Link>\n- </Compile>\n+ <Compile Include=\"ServiceProviderExtension.cs\" />\n+ <Compile Include=\"TestContainer.cs\" />\n<Compile Include=\"TestContainerDiscoverer.cs\" />\n<Compile Include=\"TestDiscoverer.cs\" />\n<Compile Include=\"TestExecutor.cs\" />\n- <Compile Include=\"..\\..\\..\\Common\\Product\\TestAdapter\\TestFileAddRemoveListener.cs\">\n- <Link>TestFileAddRemoveListener.cs</Link>\n- </Compile>\n- <Compile Include=\"..\\..\\..\\Common\\Product\\TestAdapter\\TestFilesUpdateWatcher.cs\">\n- <Link>TestFilesUpdateWatcher.cs</Link>\n- </Compile>\n+ <Compile Include=\"TestFileAddRemoveListener.cs\" />\n+ <Compile Include=\"TestFilesUpdateWatcher.cs\" />\n<Compile Include=\"TestFrameworks\\NodejsTestInfo.cs\" />\n<Compile Include=\"TestFrameworks\\TestFramework.cs\" />\n<Compile Include=\"TestFrameworks\\FrameworkDiscover.cs\" />\n<Compile Include=\"TestMethodResolver.cs\" />\n- <Compile Include=\"..\\..\\..\\Common\\Product\\TestAdapter\\VisualStudioApp.cs\">\n- <Link>VisualStudioApp.cs</Link>\n- </Compile>\n- <Compile Include=\"..\\..\\..\\Common\\Product\\TestAdapter\\VsProjectExtensions.cs\">\n- <Link>VsProjectExtensions.cs</Link>\n- </Compile>\n+ <Compile Include=\"VisualStudioApp.cs\" />\n+ <Compile Include=\"VsProjectExtensions.cs\" />\n</ItemGroup>\n<ItemGroup>\n<None Include=\"packages.config\" />\n"
},
{
"change_type": "RENAME",
"old_path": "Common/Product/TestAdapter/TestContainer.cs",
"new_path": "Nodejs/Product/TestAdapter/TestContainer.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "Common/Product/TestAdapter/TestFileAddRemoveListener.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFileAddRemoveListener.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "Common/Product/TestAdapter/TestFilesUpdateWatcher.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFilesUpdateWatcher.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "Common/Product/TestAdapter/VisualStudioApp.cs",
"new_path": "Nodejs/Product/TestAdapter/VisualStudioApp.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "Common/Product/TestAdapter/VsProjectExtensions.cs",
"new_path": "Nodejs/Product/TestAdapter/VsProjectExtensions.cs",
"diff": ""
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Move TestAdapter files into project from shared location
|
410,217 |
18.07.2017 17:19:18
| 25,200 |
51f81e7020e97db8ab4f54cfd18966e22c0f121b
|
Move WebSocket file
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/WebRole/WebRole.csproj",
"new_path": "Nodejs/Product/WebRole/WebRole.csproj",
"diff": "<Reference Include=\"System.Web.ApplicationServices\" />\n</ItemGroup>\n<ItemGroup>\n- <Compile Include=\"$(BuildRoot)\\Common\\Product\\WebRole\\WebSocketProxyBase.cs\">\n- <Link>WebSocketProxyBase.cs</Link>\n- <Visible>true</Visible>\n- </Compile>\n<Compile Include=\"WebSocketProxy.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n+ <Compile Include=\"WebSocketProxyBase.cs\" />\n<Content Include=\"Global.asax\" />\n<Compile Include=\"Global.asax.cs\">\n<DependentUpon>Global.asax</DependentUpon>\n"
},
{
"change_type": "RENAME",
"old_path": "Common/Product/WebRole/WebSocketProxyBase.cs",
"new_path": "Nodejs/Product/WebRole/WebSocketProxyBase.cs",
"diff": ""
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Move WebSocket file
|
410,202 |
20.07.2017 15:08:23
| 25,200 |
495f007a01ebf5b49db2b0407a988e1030a0b828
|
Added double quotes to npm search for allowing one character queries.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"diff": "@@ -106,7 +106,7 @@ namespace Microsoft.NodejsTools.NpmUI\nTelemetryHelper.LogSearchNpm();\n- var relativeUri = string.Format(\"/-/v1/search?text={0}\", WebUtility.UrlEncode(filterText));\n+ var relativeUri = string.Format(\"/-/v1/search?text=\\\"{0}\\\"\", WebUtility.UrlEncode(filterText));\nvar searchUri = new Uri(defaultRegistryUri, relativeUri);\nvar request = WebRequest.Create(searchUri);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added double quotes to npm search for allowing one character queries.
|
410,217 |
25.07.2017 13:23:40
| 25,200 |
e4fab319bd60503e1b277a3c1434779bf9d72573
|
Fixed some names, descriptions for templates.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/VSPackage.resx",
"new_path": "Nodejs/Product/Nodejs/VSPackage.resx",
"diff": "<value>Azure Cloud Service</value>\n</data>\n<data name=\"3066\" xml:space=\"preserve\">\n- <value>Basic Node.js Express 4 Application.</value>\n+ <value>Azure Cloud Service</value>\n</data>\n<data name=\"3067\" xml:space=\"preserve\">\n- <value>Azure Cloud Service</value>\n+ <value>Basic Node.js Express 4 Application.</value>\n</data>\n<data name=\"3068\" xml:space=\"preserve\">\n<value>A basic Node.js Express 4 application.</value>\n<value>Blank Node.js Web Application</value>\n</data>\n<data name=\"3092\" xml:space=\"preserve\">\n- <value>An empty Node.js application.</value>\n+ <value>An empty Node.js Web application.</value>\n</data>\n<data name=\"3093\" xml:space=\"preserve\">\n<value>Express Web Role</value>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed some names, descriptions for templates.
|
410,217 |
27.07.2017 13:55:01
| 25,200 |
79ce38f19c2e8297573784df5e831c4405b3a2e0
|
Fixed string.
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/SharedProject/ProjectResources.resx",
"new_path": "Common/Product/SharedProject/ProjectResources.resx",
"diff": "@@ -633,7 +633,7 @@ Run Visual Studio with the /Log option and check ActivityLog.xml for more detail\n<value>Unable to add '{0}'. A file with that name already exists.</value>\n</data>\n<data name=\"CannotAddFolderAsDescendantOfSelf\" xml:space=\"preserve\">\n- <value>Cannot add folder '{0}' as a child or decedent of self.</value>\n+ <value>Cannot add folder '{0}' as a child or descendant of self.</value>\n</data>\n<data name=\"CannotMoveFolderExists\" xml:space=\"preserve\">\n<value>Cannot move the folder '{0}'. A folder with that name already exists in the destination directory.</value>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed string.
|
410,217 |
16.08.2017 16:34:40
| 25,200 |
9c19193f06fcdf2eb7dd8a52cf47011cc3435f13
|
Move the browse workingdir button to the right location.
And set the correct tabindex
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"diff": "// _scriptArgsLabel\n//\nthis._scriptArgsLabel.AutoSize = true;\n- this._scriptArgsLabel.Location = new System.Drawing.Point(3, 87);\n+ this._scriptArgsLabel.Location = new System.Drawing.Point(3, 84);\nthis._scriptArgsLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._scriptArgsLabel.Name = \"_scriptArgsLabel\";\nthis._scriptArgsLabel.Size = new System.Drawing.Size(85, 13);\n- this._scriptArgsLabel.TabIndex = 8;\n+ this._scriptArgsLabel.TabIndex = 7;\nthis._scriptArgsLabel.Text = \"_scriptArgsLabel\";\n//\n// _workingDirLabel\n//\nthis._workingDirLabel.AutoSize = true;\n- this._workingDirLabel.Location = new System.Drawing.Point(3, 113);\n+ this._workingDirLabel.Location = new System.Drawing.Point(3, 110);\nthis._workingDirLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._workingDirLabel.Name = \"_workingDirLabel\";\nthis._workingDirLabel.Size = new System.Drawing.Size(89, 13);\n- this._workingDirLabel.TabIndex = 10;\n+ this._workingDirLabel.TabIndex = 9;\nthis._workingDirLabel.Text = \"_workingDirLabel\";\n//\n// _launchUrlLabel\nthis.tableLayoutPanel1.Controls.Add(this._nodeExeArguments, 1, 1);\nthis.tableLayoutPanel1.Controls.Add(this._scriptLabel, 0, 2);\nthis.tableLayoutPanel1.Controls.Add(this._scriptFile, 1, 2);\n- this.tableLayoutPanel1.Controls.Add(this._browseDirectory, 2, 2);\nthis.tableLayoutPanel1.Controls.Add(this._scriptArgsLabel, 0, 3);\nthis.tableLayoutPanel1.Controls.Add(this._scriptArguments, 1, 3);\nthis.tableLayoutPanel1.Controls.Add(this._workingDirLabel, 0, 4);\nthis.tableLayoutPanel1.Controls.Add(this._workingDir, 1, 4);\n+ this.tableLayoutPanel1.Controls.Add(this._browseDirectory, 2, 4);\nthis.tableLayoutPanel1.Controls.Add(this._launchUrlLabel, 0, 5);\nthis.tableLayoutPanel1.Controls.Add(this._launchUrl, 1, 5);\nthis.tableLayoutPanel1.Controls.Add(this._nodePortLabel, 0, 6);\n// _browseDirectory\n//\nthis._browseDirectory.AutoSize = true;\n- this._browseDirectory.Location = new System.Drawing.Point(738, 58);\n+ this._browseDirectory.Location = new System.Drawing.Point(738, 110);\nthis._browseDirectory.Name = \"_browseDirectory\";\nthis._browseDirectory.Size = new System.Drawing.Size(26, 23);\n- this._browseDirectory.TabIndex = 7;\n+ this._browseDirectory.TabIndex = 11;\nthis._browseDirectory.Text = \"...\";\nthis._browseDirectory.UseVisualStyleBackColor = true;\nthis._browseDirectory.Click += new System.EventHandler(this.BrowseDirectoryClick);\n//\nthis._scriptArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n| System.Windows.Forms.AnchorStyles.Right)));\n- this._scriptArguments.Location = new System.Drawing.Point(112, 87);\n+ this._scriptArguments.Location = new System.Drawing.Point(112, 84);\nthis._scriptArguments.Name = \"_scriptArguments\";\nthis._scriptArguments.Size = new System.Drawing.Size(620, 20);\n- this._scriptArguments.TabIndex = 9;\n+ this._scriptArguments.TabIndex = 8;\nthis._scriptArguments.TextChanged += new System.EventHandler(this.Changed);\n//\n// _workingDir\n//\nthis._workingDir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n| System.Windows.Forms.AnchorStyles.Right)));\n- this._workingDir.Location = new System.Drawing.Point(112, 113);\n+ this._workingDir.Location = new System.Drawing.Point(112, 110);\nthis._workingDir.Name = \"_workingDir\";\nthis._workingDir.Size = new System.Drawing.Size(620, 20);\n- this._workingDir.TabIndex = 11;\n+ this._workingDir.TabIndex = 10;\nthis._workingDir.TextChanged += new System.EventHandler(this.WorkingDirChanged);\n//\n// _launchUrl\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Move the browse workingdir button to the right location.
And set the correct tabindex
|
410,217 |
17.08.2017 12:57:08
| 25,200 |
01393a1a44556ba23d1de01d13c0aea5f4d35f48
|
Warn user when Node is not installed
Show a dialog when the user tries to debug a js file in Open Folder,
and Node.js is not installed.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Reference Include=\"Microsoft.VisualStudio.TextManager.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<EmbedInteropTypes>True</EmbedInteropTypes>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Threading, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.VisualStudio.Threading.15.3.83\\lib\\net45\\Microsoft.VisualStudio.Threading.dll</HintPath>\n+ <Private>True</Private>\n+ </Reference>\n<Reference Include=\"Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.Utilities.Internal.14.0.72-masterF9EB1D39\\lib\\net45\\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.Workspaces.15.0.215-pre\\lib\\net46\\Microsoft.VisualStudio.Workspace.Extensions.VS.dll</HintPath>\n<Private>False</Private>\n</Reference>\n+ <Reference Include=\"Microsoft.VisualStudio.Workspace.VSIntegration.Contracts, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Newtonsoft.Json.9.0.1\\lib\\net45\\Newtonsoft.Json.dll</HintPath>\n<Private>False</Private>\n<Reference Include=\"System.Data\" />\n<Reference Include=\"System.Design\" />\n<Reference Include=\"System.Drawing\" />\n- <Reference Include=\"System.Runtime.Serialization\" />\n<Reference Include=\"System.Web\" />\n<Reference Include=\"System.Web.Extensions\" />\n<Reference Include=\"System.Windows.Forms\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"diff": "@@ -607,6 +607,15 @@ namespace Microsoft.NodejsTools {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Could not find a Node.js runtime on your computer. Please download and install the current Node.js release from 'https://nodejs.org', or specify the location of your Node.exe in the '{0}'..\n+ /// </summary>\n+ internal static string NodejsNotInstalledAnyCode {\n+ get {\n+ return ResourceManager.GetString(\"NodejsNotInstalledAnyCode\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Node.js has not been detected on your computer.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.resx",
"new_path": "Nodejs/Product/Nodejs/Resources.resx",
"diff": "@@ -668,4 +668,8 @@ Error retrieving websocket debug proxy information from web.config.</value>\n<data name=\"NpmExecuteCommand\" xml:space=\"preserve\">\n<value>Executes npm command. If solution contains multiple projects, specify target project using .npm [ProjectName] <npm arguments></value>\n</data>\n+ <data name=\"NodejsNotInstalledAnyCode\" xml:space=\"preserve\">\n+ <value>Could not find a Node.js runtime on your computer. Please download and install the current Node.js release from 'https://nodejs.org', or specify the location of your Node.exe in the '{0}'.</value>\n+ <comment>Template contains a filename, like launch.json</comment>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/packages.config",
"new_path": "Nodejs/Product/Nodejs/packages.config",
"diff": "<package id=\"Microsoft.VisualStudio.RemoteControl\" version=\"14.0.262-masterA5CACE98\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Setup.Configuration.Interop\" version=\"1.11.2273\" targetFramework=\"net46\" developmentDependency=\"true\" />\n<package id=\"Microsoft.VisualStudio.Telemetry\" version=\"15.3.789-masterCC863119\" targetFramework=\"net46\" />\n+ <package id=\"Microsoft.VisualStudio.Threading\" version=\"15.3.83\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Utilities.Internal\" version=\"14.0.72-masterF9EB1D39\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Validation\" version=\"15.3.15\" targetFramework=\"net46\" />\n<package id=\"Microsoft.VisualStudio.Workspaces\" version=\"15.0.215-pre\" targetFramework=\"net46\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Warn user when Node is not installed
Show a dialog when the user tries to debug a js file in Open Folder,
and Node.js is not installed.
|
410,217 |
17.08.2017 12:59:36
| 25,200 |
92a63fb860eaf52a1345528f1225b577df0bdbae
|
Make sure reference assemblies are not added to VSIX
And clean up whitespace
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"new_path": "Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj",
"diff": "</Reference>\n<Reference Include=\"Microsoft.VisualStudio.RemoteControl, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.RemoteControl.14.0.262-masterA5CACE98\\lib\\net45\\Microsoft.VisualStudio.RemoteControl.dll</HintPath>\n- <Private>True</Private>\n+ <Private>False</Private>\n</Reference>\n<Reference Include=\"Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.Telemetry.15.3.795-master67D3E818\\lib\\net45\\Microsoft.VisualStudio.Telemetry.dll</HintPath>\n<Reference Include=\"Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.VisualStudio.Utilities.Internal.14.0.73-master6E8F6515\\lib\\net45\\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>\n- <Private>True</Private>\n+ <Private>False</Private>\n</Reference>\n<Reference Include=\"Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Newtonsoft.Json.9.0.1\\lib\\net45\\Newtonsoft.Json.dll</HintPath>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Make sure reference assemblies are not added to VSIX
And clean up whitespace
|
410,202 |
17.08.2017 14:28:43
| 25,200 |
3f9f050074786a73a43edfcacfbe1ee72d457596
|
Added Test passed message to ouput.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"diff": "@@ -85,6 +85,7 @@ var run_tests = function (testCases, callback) {\nresult.title = test.testName;\ntestCase[test.testName]();\nresult.passed = true;\n+ result.stdOut += \"Test passed.\";\n} catch (err) {\nresult.passed = false;\nconsole.error(err.name);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added Test passed message to ouput.
|
410,202 |
17.08.2017 14:31:21
| 25,200 |
05435227be1507491295d5c0c0fe90abd25dab23
|
Added end of line.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"diff": "@@ -85,7 +85,7 @@ var run_tests = function (testCases, callback) {\nresult.title = test.testName;\ntestCase[test.testName]();\nresult.passed = true;\n- result.stdOut += \"Test passed.\";\n+ result.stdOut += \"Test passed.\\n\";\n} catch (err) {\nresult.passed = false;\nconsole.error(err.name);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added end of line.
|
410,217 |
21.08.2017 17:22:43
| 25,200 |
512682f7a94181ffb0e6fa5ca5fdf67fda525f3f
|
Clean-up item templates
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Templates/Files/TypeScriptUnitTest/UnitTest.ts",
"new_path": "Nodejs/Product/Nodejs/Templates/Files/TypeScriptUnitTest/UnitTest.ts",
"diff": "export function Test1() {\nassert.ok(true, \"This shouldn't fail\");\n-}\n+};\nexport function Test2() {\nassert.ok(1 === 1, \"This shouldn't fail\");\nassert.ok(false, \"This should fail\");\n-}\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Templates/Files/UnitTest/UnitTest.js",
"new_path": "Nodejs/Product/Nodejs/Templates/Files/UnitTest/UnitTest.js",
"diff": "exports['Test 1'] = function () {\nassert.ok(true, \"This shouldn't fail\");\n-}\n+};\nexports['Test 2'] = function () {\nassert.ok(1 === 1, \"This shouldn't fail\");\nassert.ok(false, \"This should fail\");\n-}\n\\ No newline at end of file\n+};\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Clean-up item templates
|
410,217 |
21.08.2017 17:23:18
| 25,200 |
cb320c2b88b24b7c8c8e18a6def313efb25648bd
|
Remove TypingsAcquisition support
We're moving to so this is no longer needed.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<ZipItem Include=\"Templates\\Files\\EmptyTs\\EmptyTs.vstemplate\" />\n<ZipItem Include=\"Templates\\Files\\EmptyXml\\EmptyXml.vstemplate\" />\n<ZipItem Include=\"Templates\\Files\\EmptyXml\\EmptyXml.xml\" />\n- <Content Include=\"TypingsAcquisitionTool\\index.js\">\n- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n- <IncludeInVSIX>true</IncludeInVSIX>\n- </Content>\n- <Content Include=\"TypingsAcquisitionTool\\package.json\">\n- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n- <IncludeInVSIX>true</IncludeInVSIX>\n- </Content>\n- <Content Include=\"TypingsAcquisitionTool\\bin\\install_typings\">\n- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n- <IncludeInVSIX>true</IncludeInVSIX>\n- </Content>\n<ZipProject Include=\"ProjectTemplates\\CloudService\\CloudService.ccproj\" />\n<ZipProject Include=\"ProjectTemplates\\CloudService\\ServiceConfiguration.Cloud.cscfg\" />\n<ZipProject Include=\"ProjectTemplates\\CloudService\\ServiceConfiguration.Local.cscfg\" />\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/TypingsAcquisitionTool/bin/install_typings",
"new_path": null,
"diff": "-#!/usr/bin/env node\n-/**\n- Tool to aquire typings used for NTVS IntelliSense.\n-\n- This is a simple wrapper around `typings-core`, with the main\n- difference being that missing packages do not stop other typings\n- from being aquired.\n-*/\n-\"use strict\";\n-var events = require('events');\n-var minimist = require('minimist');\n-var typingsTool = require('../index');\n-\n-var argv = minimist(process.argv.slice(2), {\n- boolean: ['save', 'verbose'],\n- string: ['cwd']\n-});\n-\n-var emitter = new events.EventEmitter();\n-\n-var packagesToInstall = argv._;\n-\n-if (!packagesToInstall.length) {\n- // top level package install\n- typingsTool.installTypingsForProject(options)\n-} else {\n- typingsTool.runAll(packagesToInstall.map(function (name) {\n- var options = {\n- save: argv.save,\n- emitter: emitter,\n- global: name === \"node\", // Assume everything else refers to a CommonJS module\n- cwd: argv.cwd || process.cwd()\n- };\n- return typingsTool.installTypingsForPackage(name, options);\n- }));\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/TypingsAcquisitionTool/index.js",
"new_path": null,
"diff": "-var typings = require('typings-core');\n-\n-/**\n- * Create a promise that runs one or more promises sequentially.\n- */\n-module.exports.runAll = function (promises) {\n- return promises.reduce(function (p1, p2) {\n- return p1.then(function () {\n- return p2;\n- });\n- });\n-};\n-\n-/**\n- * Installs the typings for `packageName` with `options`.\n- */\n-module.exports.installTypingsForPackage = function (packageName, options) {\n- return typings.installDependenciesRaw([\"dt~\" + packageName], options)\n- .then(function () {\n- console.log(\"Acquired typings for '\" + packageName + \"'\");\n- })\n- .catch(function (e) {\n- console.error(\"Could not acquire typings for '\" + packageName + \"'\");\n- });\n-};\n-\n-/**\n- * Installs the typings for the current project.\n- */\n-module.exports.installTypingsForProject = function(options) {\n- return typings.install(options)\n- .then(function () {\n- console.log(\"Acquired typings for project\");\n- })\n- .catch(function (e) {\n- console.error(\"Could not acquire typings for project\");\n- });\n-};\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/TypingsAcquisitionTool/package.json",
"new_path": null,
"diff": "-{\n- \"name\": \"ntvs-typings-acquisition-tool\",\n- \"author\": \"Microsoft\",\n- \"version\": \"1.0.0\",\n- \"description\": \"Internal tool that aquires typings to power Node.js Tools For Visual Studio IntelliSense\",\n- \"license\": \"Apache 2\",\n- \"main\": \"index.js\",\n- \"dependencies\": {\n- \"minimist\": \"1.2.0\",\n- \"typings-core\": \"1.3.1\"\n- },\n- \"bin\": {\n- \"ntvs_install_typings\": \"./bin/install_typings\"\n- }\n-}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove TypingsAcquisition support
We're moving to @types so this is no longer needed.
|
410,217 |
22.08.2017 15:54:56
| 25,200 |
99f000d40f60eb511c88cfa3df37bbd2b34f070c
|
Generate version displayed in Help/About based on Build Number
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -38,6 +38,7 @@ x64/\n*.vspscc\n*.vssscc\n.builds\n+GeneratedHelpAboutVersion.cs\n#Include the telemetry pdb\n!Nodejs/Common/Telemetry/*.*\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Compile Include=\"Commands\\OpenReplWindowCommand.cs\" />\n<Compile Include=\"Debugger\\DebugEngine\\AD7EvalErrorProperty.cs\" />\n<Compile Include=\"Debugger\\NodeDebugProvider.cs\" />\n+ <Compile Include=\"GeneratedHelpAboutVersion.cs\">\n+ <AutoGen>True</AutoGen>\n+ <DesignTime>True</DesignTime>\n+ <DependentUpon>GeneratedHelpAboutVersion.tt</DependentUpon>\n+ </Compile>\n<Compile Include=\"ImportWizardResources.Designer.cs\">\n<AutoGen>True</AutoGen>\n<DesignTime>True</DesignTime>\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptWebApp\\Preview.png\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptWebApp\\package.json\" />\n<TypeScriptProject Include=\"ProjectTemplates\\TypeScriptWebApp\\README.md\" />\n+ <Content Include=\"GeneratedHelpAboutVersion.tt\">\n+ <Generator>TextTemplatingFileGenerator</Generator>\n+ <LastGenOutput>GeneratedHelpAboutVersion.cs</LastGenOutput>\n+ </Content>\n<Content Include=\"License.html\">\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n</Content>\n<InProject>false</InProject>\n</FilesToSign>\n</ItemGroup>\n+ <ItemGroup>\n+ <Service Include=\"{508349B6-6B84-4DF5-91F0-309BEEBAD82D}\" />\n+ </ItemGroup>\n+ <ItemGroup>\n+ <T4ParameterValues Include=\"BuildVersion\">\n+ <Value>$(VSIXBuildVersion)</Value>\n+ <Visible>false</Visible>\n+ </T4ParameterValues>\n+ </ItemGroup>\n<PropertyGroup>\n<!--\nTo specify a different registry root to register your package, uncomment the TargetRegistryRoot\n<CreateVsixContainer>false</CreateVsixContainer>\n<CopyVsixExtensionFiles>false</CopyVsixExtensionFiles>\n</PropertyGroup>\n+ <PropertyGroup>\n+ <TransformOnBuild>true</TransformOnBuild>\n+ <TransformOutOfDateOnly>false</TransformOutOfDateOnly>\n+ </PropertyGroup>\n<Import Project=\"$(BuildRoot)\\Build\\Common.Build.CSharp.targets\" />\n<Import Project=\"$(VSToolsPath)\\VSSDK\\Microsoft.VsSDK.targets\" Condition=\"'$(VSToolsPath)' != ''\" />\n+ <Import Project=\"$(VSToolsPath)\\TextTemplating\\Microsoft.TextTemplating.targets\" />\n<Import Project=\"..\\ProjectAfter.targets\" />\n<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">\n<PropertyGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Generate version displayed in Help/About based on Build Number
|
410,217 |
22.08.2017 15:58:02
| 25,200 |
5422a650a94dbdb71fc331bbe46216c27203cae3
|
Remove Service Item
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<InProject>false</InProject>\n</FilesToSign>\n</ItemGroup>\n- <ItemGroup>\n- <Service Include=\"{508349B6-6B84-4DF5-91F0-309BEEBAD82D}\" />\n- </ItemGroup>\n<ItemGroup>\n<T4ParameterValues Include=\"BuildVersion\">\n<Value>$(VSIXBuildVersion)</Value>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove Service Item
|
410,217 |
23.08.2017 14:20:23
| 25,200 |
d1de4ec3674120c033325fc5d0e90468dfab3c8a
|
Remove TypeScript registry switches
We no longer use this.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<DependentUpon>NpmPackageInstallWindow.xaml</DependentUpon>\n</Compile>\n<Compile Include=\"NpmUI\\PackageCatalogEntryViewModel.cs\" />\n- <Compile Include=\"Options\\TypeScriptRegistrySwitches.cs\" />\n<Compile Include=\"Project\\AzureToolsContracts.cs\" />\n<Compile Include=\"Project\\NewFileMenuGroup\\NewFileUtilities.cs\" />\n<Compile Include=\"Project\\NewFileMenuGroup\\NewFileNameForm.cs\">\n"
},
{
"change_type": "DELETE",
"old_path": "Nodejs/Product/Nodejs/Options/TypeScriptRegistrySwitches.cs",
"new_path": null,
"diff": "-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-\n-namespace Microsoft.NodejsTools.Options\n-{\n- /// <summary>\n- /// Copied from TypeScript\\VS\\LanguageService\\TypeScriptLanguageService\\ToolsOptions\\Constants.cs\n- /// </summary>\n- public static class TypeScriptRegistrySwitches\n- {\n- public const string TypeScriptLanguageServiceSubKey = \"TypeScriptLanguageService\";\n-\n- public const string TerminateProcessOnException = \"TerminateProcessOnException\";\n- public const string SimulateCrashOnCompletionRequest = \"SimulateCrashOnCompletionRequest\";\n- public const string EnableDevMode = \"EnableDevMode\";\n- public const string CustomTypeScriptServicesFileLocation = \"CustomTypeScriptServicesFileLocation\";\n- public const string CustomDefaultLibraryLocation = \"CustomDefaultLibraryLocation\";\n- public const string CustomDefaultES6LibraryLocation = \"CustomDefaultES6LibraryLocation\";\n-\n- public const string FormatCompletedLineOnEnter = \"FormatCompletedLineOnEnter_TEMP\"; // TODO: Remove \"TEMP\" when option is supported\n- public const string FormatCompletedStatementOnSemicolon = \"FormatCompletedStatementOnSemicolon\";\n- public const string FormatCompletedBlockOnRightCurlyBrace = \"FormatCompletedBlockOnRightCurlyBrace\";\n- public const string FormatOnPaste = \"FormatOnPaste_TEMP\"; // TODO: Remove \"TEMP\" when option is supported\n-\n- public const string PlaceOpenBraceOnNewLineForFunctions = \"PlaceOpenBraceOnNewLineForFunctions\";\n- public const string PlaceOpenBraceOnNewLineForControlBlocks = \"PlaceOpenBraceOnNewLineForControlBlocks\";\n-\n- public const string InsertSpaceAfterCommaDelimiter = \"InsertSpaceAfterCommaDelimiter\";\n- public const string InsertSpaceAfterSemicolonInForStatements = \"InsertSpaceAfterSemicolonInForStatements\";\n- public const string InsertSpaceBeforeAndAfterBinaryOperators = \"InsertSpaceBeforeAndAfterBinaryOperators\";\n- public const string InsertSpaceAfterKeywordsInControlFlowStatements = \"InsertSpaceAfterKeywordsInControlFlowStatements\";\n- public const string InsertSpaceAfterFunctionKeywordForAnonymousFunctions = \"InsertSpaceAfterFunctionKeywordForAnonymousFunctions\";\n- public const string InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis = \"InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis\";\n-\n- public const string ShowVirtualProjectsInSolutionExplorerWhenNoSolution = \"ShowVirtualProjectsInSolutionExplorerWhenNoSolution\";\n- public const string ShowVirtualProjectsInSolutionExplorerWhenSolutionOpen = \"ShowVirtualProjectsInSolutionExplorerWhenSolutionOpen\";\n-\n- public const string AutomaticallyCompileTypeScriptFilesWhenSavedWhenNoSolution = \"AutomaticallyCompileTypeScriptFilesWhenSavedWhenNoSolution\";\n- public const string UseAMDCodeGenerationForModulesThatAreNotPartOfAProject = \"UseAMDCodeGenerationForModulesThatAreNotPartOfAProject\";\n- public const string UseCommonJSCodeGenerationForModulesThatAreNotPartOfAProject = \"UseCommonJSCodeGenerationForModulesThatAreNotPartOfAProject\";\n- public const string UseSystemCodeGenerationForModulesThatAreNotPartOfAProject = \"UseSystemCodeGenerationForModulesThatAreNotPartOfAProject\";\n- public const string UseUMDCodeGenerationForModulesThatAreNotPartOfAProject = \"UseUMDCodeGenerationForModulesThatAreNotPartOfAProject\";\n- public const string UseES2015CodeGenerationForModulesThatAreNotPartOfAProject = \"UseES2015CodeGenerationForModulesThatAreNotPartOfAProject\";\n-\n- public const string UseTypeScriptExperimental = \"UseTypeScriptExperimental\";\n-\n- public const string UseJsxReactForFilesThatAreNotPartOfAProject = \"UseJsxReactForFilesThatAreNotPartOfAProject\";\n- public const string UseJsxPreserveForFilesThatAreNotPartOfAProject = \"UseJsxPreserveForFilesThatAreNotPartOfAProject\";\n-\n- public const string ECMAScriptForFilesThatAreNotPartOfAProject = \"ECMAScriptForFilesThatAreNotPartOfAProject\";\n- public const string ShowGruntGulpDialogForAspNet = \"ShowGruntGulpDialogForAspNet\";\n-\n- public const string CompletionChars = \"CompletionChars\";\n- }\n-}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove TypeScript registry switches
We no longer use this.
|
410,217 |
23.08.2017 17:38:06
| 25,200 |
e19b6182fafbb348412263c6e14477dad98fcb1c
|
Add icons to Wizard
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<ZipProject Include=\"ProjectTemplates\\NodejsWebApp\\Preview.png\" />\n<ZipProject Include=\"ProjectTemplates\\AzureNodejsApp\\Preview.png\" />\n<ZipProject Include=\"ProjectTemplates\\NodejsConsoleApp\\Preview.png\" />\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\JSAzureApplication.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\JSAzureApplication.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\JSConsole.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\JSConsole.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\JSWeb.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\JSWeb.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\JSWorker.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\JSWorker.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\NodeJSApplication.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\NodeJSApplication.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\NodeTSApplication.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\NodeTSApplication.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\TSAzureApplication.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\TSAzureApplication.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\TSConsole.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\TSConsole.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\TSWeb.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\TSWeb.ico</Link>\n+ </Resource>\n+ <Resource Include=\"..\\Icons\\NewProjectDialogIconsICO\\TSWorker.ico\">\n+ <Link>Resources\\Icons\\NewProjectDialogIconsICO\\TSWorker.ico</Link>\n+ </Resource>\n<Content Include=\"Credits.txt\">\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n<IncludeInVSIX>true</IncludeInVSIX>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add icons to Wizard
|
410,217 |
24.08.2017 15:25:04
| 25,200 |
01771c5158e9ffb170f46a2b8639f93bbdb0528c
|
Ensure the Create from existing works again
Code update to fix create from existing.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsTools.vsct",
"new_path": "Nodejs/Product/Nodejs/NodejsTools.vsct",
"diff": "<CommandName>Attach Node.js Debugger</CommandName>\n</Strings>\n</Button>\n+\n+ <Button guid=\"guidNodeToolsCmdSet\" id=\"cmdidImportWizard\" priority=\"0x010\" type=\"Button\">\n+ <CommandFlag>DefaultInvisible</CommandFlag>\n+ <Strings>\n+ <ButtonText>Import Existing &Project...</ButtonText>\n+ <MenuText>Import Existing &Project...</MenuText>\n+ <ToolTipText>Import Existing Project...</ToolTipText>\n+ <CommandName>Import Existing Project...</CommandName>\n+ </Strings>\n+ </Button>\n</Buttons>\n<!--The bitmaps section is used to define the bitmaps that are used for the commands.-->\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizardResources.Designer.cs",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizardResources.Designer.cs",
"diff": "@@ -19,7 +19,7 @@ namespace Microsoft.NodejsTools.ProjectWizard {\n// class via a tool like ResGen or Visual Studio.\n// To add or remove a member, edit your .ResX file then rerun ResGen\n// with the /str option, or rebuild your VS project.\n- [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"4.0.0.0\")]\n+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"15.0.0.0\")]\n[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\ninternal class ProjectWizardResources {\n@@ -137,11 +137,20 @@ namespace Microsoft.NodejsTools.ProjectWizard {\n}\n/// <summary>\n- /// Looks up a localized string similar to Unable to start wizard: no automation object available..\n+ /// Looks up a localized string similar to Unable to start wizard: failed to load Node Tools support Package (0x{0:X08}).\n+ /// </summary>\n+ internal static string ImportWizardCouldNotStartFailedToLoadPackage {\n+ get {\n+ return ResourceManager.GetString(\"ImportWizardCouldNotStartFailedToLoadPackage\", resourceCulture);\n+ }\n+ }\n+\n+ /// <summary>\n+ /// Looks up a localized string similar to Unable to start wizard: Unexpected error 0x{0:X08}.\n/// </summary>\n- internal static string ImportWizzardCouldNotStartNotAutomationObjectErrorMessage {\n+ internal static string ImportWizardCouldNotStartUnexpectedError {\nget {\n- return ResourceManager.GetString(\"ImportWizzardCouldNotStartNotAutomationObjectErrorMessage\", resourceCulture);\n+ return ResourceManager.GetString(\"ImportWizardCouldNotStartUnexpectedError\", resourceCulture);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizardResources.resx",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizardResources.resx",
"diff": "<resheader name=\"writer\">\n<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\n</resheader>\n- <data name=\"ErrorNoDte\" xml:space=\"preserve\">\n- <value>Unable to start wizard: no automation object available.</value>\n- </data>\n<data name=\"AzureToolsInstallInstructions\" xml:space=\"preserve\">\n<value>These tools are a free download for your version of Visual Studio that allow you to write, deploy and debug applications for Microsoft Azure in a range of programming languages.</value>\n</data>\n@@ -145,7 +142,13 @@ Some manual steps will be required to configure your project.</value>\n<value>&Download and install now\nYou will need to restart Visual Studio after installation.</value>\n</data>\n- <data name=\"ImportWizzardCouldNotStartNotAutomationObjectErrorMessage\" xml:space=\"preserve\">\n+ <data name=\"ImportWizardCouldNotStartFailedToLoadPackage\" xml:space=\"preserve\">\n+ <value>Unable to start wizard: failed to load Node Tools support Package (0x{0:X08})</value>\n+ </data>\n+ <data name=\"ImportWizardCouldNotStartUnexpectedError\" xml:space=\"preserve\">\n+ <value>Unable to start wizard: Unexpected error 0x{0:X08}</value>\n+ </data>\n+ <data name=\"ErrorNoDte\" xml:space=\"preserve\">\n<value>Unable to start wizard: no automation object available.</value>\n</data>\n</root>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Ensure the Create from existing works again
Code update to fix create from existing.
|
410,217 |
29.08.2017 16:44:11
| 25,200 |
b1aeba9d5a58ec5ec2b8121bd0e85e1d516e6db9
|
Remove '.' from template name
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/VSPackage.resx",
"new_path": "Nodejs/Product/Nodejs/VSPackage.resx",
"diff": "<value>Azure Cloud Service</value>\n</data>\n<data name=\"3067\" xml:space=\"preserve\">\n- <value>Basic Node.js Express 4 Application.</value>\n+ <value>Basic Node.js Express 4 Application</value>\n</data>\n<data name=\"3068\" xml:space=\"preserve\">\n<value>A basic Node.js Express 4 application.</value>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove '.' from template name
|
410,217 |
29.08.2017 17:06:21
| 25,200 |
06e9a21c935563396170901102b4c08737283032
|
Whiteline cleanup
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/SharedProject/ProjectNode.CopyPaste.cs",
"new_path": "Nodejs/Product/Nodejs/SharedProject/ProjectNode.CopyPaste.cs",
"diff": "@@ -1448,7 +1448,6 @@ namespace Microsoft.VisualStudioTools.Project\nreturn;\n}\n-\nif (this.DropEffect == DropEffect.Move && Utilities.IsSameComObject(this.Project, this.SourceHierarchy))\n{\n// we are doing a move, we need to remove the old item, and add the new.\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Whiteline cleanup
|
410,228 |
11.09.2017 22:06:31
| -28,800 |
799c469952dc738ace920d404266e1fcae07c3d6
|
Add support to Jasmine.js test framework.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<Content Include=\"TestFrameworks\\find_tests.js\">\n<CopyToOutputDirectory>Always</CopyToOutputDirectory>\n</Content>\n+ <Content Include=\"TestFrameworks\\Jasmine\\jasmine.js\">\n+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>\n+ </Content>\n<Content Include=\"TestFrameworks\\mocha\\mocha.js\">\n<CopyToOutputDirectory>Always</CopyToOutputDirectory>\n</Content>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"diff": "+\"use strict\";\n+\n+var EOL = require(\"os\").EOL;\n+var fs = require(\"fs\");\n+var path = require(\"path\");\n+\n+var defaultJasmineOptions = {};\n+\n+function logError(...args) {\n+ var errorArgs = Array.prototype.slice.call(arguments);\n+ errorArgs.unshift(\"NTVS_ERROR:\");\n+ console.error.apply(console, errorArgs);\n+}\n+\n+function getJasmineOptionsPath(projectFolder) {\n+ return path.join(projectFolder, \"test\", \"jasmine.json\");\n+}\n+\n+function detectJasmine(projectFolder) {\n+ try {\n+ var node_modulesFolder = path.join(projectFolder, \"node_modules\");\n+ var options = loadJsonOptions(getJasmineOptionsPath(projectFolder));\n+ if (options && options.path) {\n+ node_modulesFolder = path.resolve(projectFolder, options.path);\n+ }\n+ return require(path.join(node_modulesFolder, \"jasmine\"));\n+ }\n+ catch (ex) {\n+ logError('Failed to find Jasmine package. Jasmine must be installed in the project locally.' + EOL +\n+ 'Install Jasmine locally using the npm manager via solution explorer' + EOL +\n+ 'or with \".npm install jasmine --save-dev\" via the Node.js interactive window.');\n+ }\n+ return null;\n+}\n+\n+function loadJsonOptions(optionsPath) {\n+ if (fs.existsSync(optionsPath)) {\n+ return require(optionsPath);\n+ }\n+}\n+\n+function loadJasmineOptions(projectFolder) {\n+ var options = loadJsonOptions(getJasmineOptionsPath(projectFolder));\n+ if (options && options.configFile) {\n+ var optionsPath = path.join(projectFolder, \"test\", options.configFile);\n+ options = loadJsonOptions(optionsPath);\n+ }\n+ return options;\n+}\n+\n+function mergeOptions(target, source) {\n+ for (var opt in source) {\n+ target[opt] = source[opt];\n+ }\n+}\n+\n+function getJasmineOptions(projectFolder) {\n+ var jasmineOptions = defaultJasmineOptions;\n+ try {\n+ var options = loadJasmineOptions(projectFolder);\n+ options && mergeOptions(jasmineOptions, options);\n+ options && console.log(\"Found jasmine.json file.\");\n+ }\n+ catch (ex) {\n+ console.log(\"Using default Jasmine settings.\");\n+ }\n+ console.log(\"Using Jasmine settings: \", jasmineOptions);\n+ return jasmineOptions;\n+}\n+\n+function applyJasmineOptions(jasmineInstance, options) {\n+ if (options) {\n+ jasmineInstance.loadConfig(options);\n+ }\n+}\n+\n+function initializeJasmine(Jasmine, projectFolder) {\n+ var instance = new Jasmine();\n+ applyJasmineOptions(instance, getJasmineOptions(projectFolder));\n+ return instance;\n+}\n+\n+function getSuiteName(spec) {\n+ var suiteName = spec.getSpecName(spec);\n+ if (suiteName && suiteName.length > 0) {\n+ return suiteName.substr(0, suiteName.length - spec.description.length - 1);\n+ }\n+ return suiteName;\n+}\n+\n+function find_tests(testFileList, discoverResultFile, projectFolder) {\n+ var Jasmine = detectJasmine(projectFolder);\n+ if (!Jasmine) {\n+ return;\n+ }\n+ var testList = [];\n+ testFileList.split(\";\").forEach((testFile) => {\n+ try {\n+ var jasmineInstance = initializeJasmine(Jasmine, projectFolder);\n+ jasmineInstance.env.specFilter = (spec) => {\n+ testList.push({\n+ test: spec.getSpecName(spec),\n+ suite: getSuiteName(spec),\n+ file: testFile,\n+ line: 0,\n+ column: 0\n+ });\n+ return false;\n+ };\n+ jasmineInstance.specDir = \"\";\n+ jasmineInstance.specFiles = [];\n+ jasmineInstance.addSpecFiles([testFile]);\n+ jasmineInstance.loadSpecs();\n+ }\n+ catch (ex) {\n+ //we would like continue discover other files, so swallow, log and continue;\n+ logError(\"Test discovery error:\", ex, \"in\", testFile);\n+ }\n+ });\n+ var fd = fs.openSync(discoverResultFile, 'w');\n+ fs.writeSync(fd, JSON.stringify(testList));\n+ fs.closeSync(fd);\n+}\n+\n+exports.find_tests = find_tests;\n+\n+function createTestResult() {\n+ return {\n+ title: \"\",\n+ passed: false,\n+ pending: false,\n+ stdout: \"\",\n+ stderr: \"\"\n+ };\n+}\n+\n+var result = createTestResult();\n+\n+function hookStandardOutputs() {\n+ process.stdout.write = (str, encording, callback) => {\n+ result.stdout += str;\n+ return true;\n+ };\n+ process.stderr.write = (str, encording, callback) => {\n+ result.stderr += str;\n+ return true;\n+ };\n+}\n+\n+hookStandardOutputs();\n+\n+function sendTestProgress(callback, evtType, result, title) {\n+ var event = {\n+ type: evtType,\n+ result: result\n+ };\n+ title && (event.title = title);\n+ callback(event);\n+ hookStandardOutputs();\n+}\n+\n+function createCurstomReporter(callback) {\n+ return {\n+ jasmineStarted: (suiteInfo) => {\n+ sendTestProgress(callback, \"start\", result);\n+ },\n+ suiteStarted: (suiteResult) => {\n+ sendTestProgress(callback, \"suite start\", result);\n+ },\n+ specStarted: (specResult) => {\n+ result.title = specResult.fullName;\n+ sendTestProgress(callback, \"test start\", undefined, result.title);\n+ },\n+ specDone: (specResult) => {\n+ var type = \"result\";\n+ result.passed = specResult.status == \"passed\";\n+ if (specResult.status == \"disabled\" || specResult.status == \"pending\") {\n+ type = \"pending\";\n+ result.pending = true;\n+ }\n+ sendTestProgress(callback, type, result, specResult.fullName);\n+ result = createTestResult();\n+ },\n+ suiteDone: (suiteResult) => {\n+ sendTestProgress(callback, \"suite end\", result);\n+ },\n+ jasmineDone: (suiteInfo) => {\n+ sendTestProgress(callback, \"end\", result);\n+ }\n+ };\n+}\n+\n+function run_tests(testCases, callback) {\n+ var projectFolder = testCases[0].projectFolder;\n+ var Jasmine = detectJasmine(projectFolder);\n+ if (!Jasmine) {\n+ return;\n+ }\n+ var testFileList = [];\n+ var testNameList = {};\n+ testCases.forEach((testCase) => {\n+ if (testFileList.indexOf(testCase.testFile) < 0) {\n+ testFileList.push(testCase.testFile);\n+ }\n+ testNameList[testCase.testName] = true;\n+ });\n+ try {\n+ var jasmineInstance = initializeJasmine(Jasmine, projectFolder);\n+ jasmineInstance.configureDefaultReporter({ showColors: true });\n+ jasmineInstance.env.specFilter = (spec) => {\n+ return testNameList.hasOwnProperty(spec.getSpecName(spec));\n+ };\n+ jasmineInstance.addReporter(createCurstomReporter(callback));\n+ jasmineInstance.execute(testFileList);\n+ }\n+ catch (ex) {\n+ logError(\"Execute test error:\", ex);\n+ }\n+}\n+\n+exports.run_tests = run_tests;\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add support to Jasmine.js test framework.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.