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,202 |
07.03.2019 15:02:33
| 28,800 |
100ba16b9b652d9afc721e1323e5b17775bdc5a8
|
Fix Jasmine specFilter deprecation
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"diff": "@@ -113,7 +113,7 @@ function find_tests(testFileList, discoverResultFile, projectFolder) {\nreturn;\n}\nvar jasmineInstance = initializeJasmine(Jasmine, projectFolder);\n- jasmineInstance.env.specFilter = _ => false;\n+ setSpecFilter(jasmineInstance, _ => false);\nvar testList = [];\ntestFileList.split(\";\").forEach((testFile) => {\n@@ -222,9 +222,7 @@ function run_tests(testCases, callback) {\ntry {\nvar jasmineInstance = initializeJasmine(Jasmine, projectFolder);\njasmineInstance.configureDefaultReporter({ showColors: false });\n- jasmineInstance.env.specFilter = (spec) => {\n- return testNameList.hasOwnProperty(spec.getSpecName(spec));\n- };\n+ setSpecFilter(jasmineInstance, spec => testNameList.hasOwnProperty(spec.getSpecName(spec)));\njasmineInstance.addReporter(createCustomReporter(callback));\njasmineInstance.execute(testFileList);\n}\n@@ -232,4 +230,13 @@ function run_tests(testCases, callback) {\nlogError(\"Execute test error:\", ex);\n}\n}\n+\n+function setSpecFilter(jasmineInstance, specFilter) {\n+ if (jasmineInstance.env.configure) {\n+ jasmineInstance.env.configure({ specFilter });\n+ } else {\n+ jasmineInstance.env.specFilter = specFilter;\n+ }\n+}\n+\nexports.run_tests = run_tests;\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix Jasmine specFilter deprecation
|
410,202 |
14.03.2019 18:14:16
| 25,200 |
0e8eed766f898c15139186e3b85e4efe854faeb0
|
Fix accessibility issues: shortcut on properties, warning message
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"diff": "this._testFrameworkLabel = new System.Windows.Forms.Label();\nthis._frameworkSelector = new System.Windows.Forms.ComboBox();\nthis._tooltip = new System.Windows.Forms.ToolTip(this.components);\n- this._nodeExeErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);\nstartActionTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();\nnodeHeaderTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();\nstartActionTableLayoutPanel.SuspendLayout();\nnodeHeaderTableLayoutPanel.SuspendLayout();\nthis.overallPanel.SuspendLayout();\nthis.testHeaderTableLayoutPanel.SuspendLayout();\n- ((System.ComponentModel.ISupportInitialize)(this._nodeExeErrorProvider)).BeginInit();\nthis.SuspendLayout();\n//\n// startActionTableLayoutPanel\nthis._workingDir.Name = \"_workingDir\";\nthis._workingDir.Size = new System.Drawing.Size(620, 20);\nthis._workingDir.TabIndex = 7;\n- this._workingDir.TextChanged += new System.EventHandler(this.WorkingDirChanged);\n+ this._workingDir.LostFocus += new System.EventHandler(this.WorkingDirChanged);\n//\n// _browseDirectory\n//\nthis._nodejsPort.Name = \"_nodejsPort\";\nthis._nodejsPort.Size = new System.Drawing.Size(105, 20);\nthis._nodejsPort.TabIndex = 12;\n- this._nodejsPort.TextChanged += new System.EventHandler(this.PortChanged);\n+ this._nodejsPort.LostFocus += new System.EventHandler(this.PortChanged);\n//\n// _envVars\n//\nthis._nodeExePath.Name = \"_nodeExePath\";\nthis._nodeExePath.Size = new System.Drawing.Size(620, 20);\nthis._nodeExePath.TabIndex = 17;\n- this._nodeExePath.TextChanged += new System.EventHandler(this.NodeExePathChanged);\n+ this._nodeExePath.LostFocus += new System.EventHandler(this.NodeExePathChanged);\n//\n// _browsePath\n//\nthis._debuggerPort.Name = \"_debuggerPort\";\nthis._debuggerPort.Size = new System.Drawing.Size(105, 20);\nthis._debuggerPort.TabIndex = 20;\n- this._debuggerPort.TextChanged += new System.EventHandler(this.PortChanged);\n+ this._debuggerPort.LostFocus += new System.EventHandler(this.PortChanged);\n//\n// testHeaderTableLayoutPanel\n//\nthis._frameworkSelector.TabIndex = 28;\nthis._frameworkSelector.SelectedIndexChanged += new System.EventHandler(this.Changed);\n//\n- // _nodeExeErrorProvider\n- //\n- this._nodeExeErrorProvider.ContainerControl = this;\n- //\n// NodejsGeneralPropertyPageControl\n//\nthis.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\nthis.overallPanel.PerformLayout();\nthis.testHeaderTableLayoutPanel.ResumeLayout(false);\nthis.testHeaderTableLayoutPanel.PerformLayout();\n- ((System.ComponentModel.ISupportInitialize)(this._nodeExeErrorProvider)).EndInit();\nthis.ResumeLayout(false);\nthis.PerformLayout();\nprivate System.Windows.Forms.TextBox _envVars;\nprivate System.Windows.Forms.CheckBox _startBrowserCheckBox;\nprivate System.Windows.Forms.ToolTip _tooltip;\n- private System.Windows.Forms.ErrorProvider _nodeExeErrorProvider;\nprivate System.Windows.Forms.Label _nodeArgumentsLabel;\nprivate System.Windows.Forms.Label _scriptLabel;\nprivate System.Windows.Forms.Label _scriptArgsLabel;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.cs",
"diff": "@@ -25,9 +25,6 @@ namespace Microsoft.NodejsTools.Project\nLocalizeLabels();\nAddToolTips();\n-\n- this._nodeExeErrorProvider.SetIconAlignment(this._nodeExePath, ErrorIconAlignment.MiddleLeft);\n- this._nodeExeErrorProvider.SetIconAlignment(this._workingDir, ErrorIconAlignment.MiddleLeft);\n}\npublic NodejsGeneralPropertyPageControl(NodejsGeneralPropertyPage page) : this()\n@@ -250,14 +247,11 @@ namespace Microsoft.NodejsTools.Project\nprivate void NodeExePathChanged(object sender, EventArgs e)\n{\n- if (string.IsNullOrEmpty(this._nodeExePath.Text) || this._nodeExePath.Text.Contains(\"$(\") ||\n- File.Exists(Nodejs.GetAbsoluteNodeExePath(this._propPage.Project.ProjectHome, this._nodeExePath.Text)))\n- {\n- this._nodeExeErrorProvider.SetError(this._nodeExePath, string.Empty);\n- }\n- else\n+ if (!string.IsNullOrEmpty(this._nodeExePath.Text)\n+ && !this._nodeExePath.Text.Contains(\"$(\")\n+ && !File.Exists(Nodejs.GetAbsoluteNodeExePath(this._propPage.Project.ProjectHome, this._nodeExePath.Text)))\n{\n- this._nodeExeErrorProvider.SetError(this._nodeExePath, Resources.NodeExePathNotFound);\n+ DisplayWarning(Resources.NodeExePathNotFound);\n}\nChanged(sender, e);\n}\n@@ -308,23 +302,26 @@ namespace Microsoft.NodejsTools.Project\nif (!textSender.Text.Contains(\"$(\") &&\ntextSender.Text.Any(ch => !char.IsDigit(ch)))\n{\n- this._nodeExeErrorProvider.SetError(textSender, Resources.InvalidPortNumber);\n- }\n- else\n- {\n- this._nodeExeErrorProvider.SetError(textSender, string.Empty);\n+ DisplayWarning(Resources.InvalidPortNumber);\n}\nChanged(sender, e);\n}\n+ private static void DisplayWarning(string text)\n+ {\n+ MessageBox.Show(text, Resources.WarningDialogCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning);\n+ }\n+\nprivate void WorkingDirChanged(object sender, EventArgs e)\n{\n- var errorMessage = ValidateWorkingDir(this._workingDir.Text) ? \"\" : Resources.WorkingDirInvalidOrMissing;\n- this._nodeExeErrorProvider.SetError(this._workingDir, errorMessage);\n+ if (!IsValidWorkingDir(this._workingDir.Text))\n+ {\n+ DisplayWarning(Resources.WorkingDirInvalidOrMissing);\n+ }\nChanged(sender, e);\n- bool ValidateWorkingDir(string workingDir)\n+ bool IsValidWorkingDir(string workingDir)\n{\nif (workingDir.Contains(\"$(\"))\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.resx",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.resx",
"diff": "<metadata name=\"_tooltip.TrayLocation\" type=\"System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n<value>17, 17</value>\n</metadata>\n- <metadata name=\"_nodeExeErrorProvider.TrayLocation\" type=\"System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n- <value>110, 17</value>\n- </metadata>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"diff": "@@ -1519,7 +1519,7 @@ namespace Microsoft.NodejsTools {\n}\n/// <summary>\n- /// Looks up a localized string similar to St&art web browser on launch.\n+ /// Looks up a localized string similar to Sta&rt web browser on launch.\n/// </summary>\ninternal static string PropertiesStartBrowser {\nget {\n@@ -1898,6 +1898,15 @@ namespace Microsoft.NodejsTools {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Microsoft Visual Studio.\n+ /// </summary>\n+ internal static string WarningDialogCaption {\n+ get {\n+ return ResourceManager.GetString(\"WarningDialogCaption\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The specified working directory is invalid or missing..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.resx",
"new_path": "Nodejs/Product/Nodejs/Resources.resx",
"diff": "@@ -565,7 +565,7 @@ The following error occurred trying to execute npm.cmd:\n<value>Script ar&guments:</value>\n</data>\n<data name=\"PropertiesStartBrowser\" xml:space=\"preserve\">\n- <value>St&art web browser on launch</value>\n+ <value>Sta&rt web browser on launch</value>\n</data>\n<data name=\"PropertiesWorkingDir\" xml:space=\"preserve\">\n<value>Working director&y:</value>\n@@ -748,4 +748,8 @@ The following error occurred trying to execute npm.cmd:\n<data name=\"NpmIsInstalling\" xml:space=\"preserve\">\n<value>Debugging could not be started because npm is installing packages. Please wait until npm finishes and try again.</value>\n</data>\n+ <data name=\"WarningDialogCaption\" xml:space=\"preserve\">\n+ <value>Microsoft Visual Studio</value>\n+ <comment>Caption displayed on the error dialog of the project properties.</comment>\n+ </data>\n</root>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix accessibility issues: shortcut on properties, warning message
|
410,202 |
20.03.2019 18:11:07
| 25,200 |
2fea817a05ff73f16ee927ecebfd6c84220e2844
|
Added command started message to npm UI. Fixed hyperlinks narration on npm UI.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"diff": "<ItemsControl ItemsSource=\"{Binding Path=Homepages, Mode=OneWay}\">\n<ItemsControl.ItemTemplate>\n<DataTemplate>\n- <Button Style=\"{StaticResource NavigationButton}\"\n+ <vsui:HyperlinkButton\n+ Style=\"{StaticResource HyperlinkButton}\"\nContent=\"{Binding Mode=OneWay}\"\nCommand=\"{x:Static npmUi:NpmPackageInstallViewModel.OpenHomepageCommand}\"\nCommandParameter=\"{Binding}\"\nKeyboardNavigation.TabIndex=\"8\"\nMargin=\"0\"\nPadding=\"0\" />\n+\n</DataTemplate>\n</ItemsControl.ItemTemplate>\n</ItemsControl>\nIsDefault=\"True\"\nContent=\"{x:Static resx:NpmInstallWindowResources.InstallPackageButtonLabel}\" />\n- <Button Style=\"{StaticResource NavigationButton}\" VerticalAlignment=\"Center\" Margin=\"5 0 0 0\"\n+ <Button VerticalAlignment=\"Center\" Margin=\"5 0 0 0\"\nClick=\"ResetOptionsButton_Click\" KeyboardNavigation.TabIndex=\"14\"\nContent=\"{x:Static resx:NpmInstallWindowResources.ResetOptionsButtonLabel}\" />\n</StackPanel>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmWorker.cs",
"diff": "@@ -89,7 +89,7 @@ namespace Microsoft.NodejsTools.NpmUI\ncmdr.CommandCompleted -= Cmdr_CommandCompleted;\n}\n- void Cmdr_CommandStarted(object sender, EventArgs e)\n+ void Cmdr_CommandStarted(object sender, NpmCommandStartedEventArgs e)\n{\nthis.CommandStarted?.Invoke(this, e);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"diff": "@@ -248,12 +248,15 @@ namespace Microsoft.NodejsTools.Project\nWriteNpmLogToOutputWindow(TrimLastNewline(args.LogText));\n}\n- private void NpmController_CommandStarted(object sender, EventArgs e)\n+ private void NpmController_CommandStarted(object sender, NpmCommandStartedEventArgs e)\n{\nStopNpmIdleTimer();\nlock (this._commandCountLock)\n{\n++this._npmCommandsExecuting;\n+\n+ var message = string.Format(CultureInfo.CurrentCulture, Resources.NpmCommandStarted, e.CommandText);\n+ ForceUpdateStatusBarWithNpmActivitySafe(message);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"diff": "@@ -812,6 +812,15 @@ namespace Microsoft.NodejsTools {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to {0} started..\n+ /// </summary>\n+ internal static string NpmCommandStarted {\n+ get {\n+ return ResourceManager.GetString(\"NpmCommandStarted\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to {0} completed with errors - see Output window for details.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.resx",
"new_path": "Nodejs/Product/Nodejs/Resources.resx",
"diff": "@@ -752,4 +752,8 @@ The following error occurred trying to execute npm.cmd:\n<value>Microsoft Visual Studio</value>\n<comment>Caption displayed on the error dialog of the project properties.</comment>\n</data>\n+ <data name=\"NpmCommandStarted\" xml:space=\"preserve\">\n+ <value>{0} started.</value>\n+ <comment>Parameter would be an npm command parameters.</comment>\n+ </data>\n</root>\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": "<Compile Include=\"IPackageJsonScript.cs\" />\n<Compile Include=\"NativeMethods.cs\" />\n<Compile Include=\"NpmArgumentBuilder.cs\" />\n+ <Compile Include=\"NpmCommandStartedEventArgs.cs\" />\n<Compile Include=\"NpmHelpers.cs\" />\n<Compile Include=\"SemverVersionComparer.cs\" />\n<Compile Include=\"SPI\\AbstractNpmSearchComparer.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/SPI/AbstractNpmLogSource.cs",
"new_path": "Nodejs/Product/Npm/SPI/AbstractNpmLogSource.cs",
"diff": "@@ -6,15 +6,11 @@ namespace Microsoft.NodejsTools.Npm.SPI\n{\ninternal abstract class AbstractNpmLogSource : INpmLogSource\n{\n- public event EventHandler CommandStarted;\n+ public event EventHandler<NpmCommandStartedEventArgs> CommandStarted;\n- protected void OnCommandStarted()\n+ protected void OnCommandStarted(string arguments)\n{\n- var handlers = CommandStarted;\n- if (null != handlers)\n- {\n- handlers(this, EventArgs.Empty);\n- }\n+ CommandStarted?.Invoke(this, new NpmCommandStartedEventArgs(arguments));\n}\nprotected void FireNpmLogEvent(string logText, EventHandler<NpmLogEventArgs> handlers)\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/SPI/NpmCommand.cs",
"new_path": "Nodejs/Product/Npm/SPI/NpmCommand.cs",
"diff": "@@ -74,7 +74,7 @@ namespace Microsoft.NodejsTools.Npm.SPI\npublic virtual async Task<bool> ExecuteAsync()\n{\n- this.OnCommandStarted();\n+ this.OnCommandStarted(this.Arguments);\nvar redirector = this.showConsole ? null : new NpmCommandRedirector(this);\nvar cancelled = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/SPI/NpmCommander.cs",
"new_path": "Nodejs/Product/Npm/SPI/NpmCommander.cs",
"diff": "@@ -78,9 +78,9 @@ namespace Microsoft.NodejsTools.Npm.SPI\n}\n}\n- private void command_CommandStarted(object sender, EventArgs e)\n+ private void command_CommandStarted(object sender, NpmCommandStartedEventArgs e)\n{\n- OnCommandStarted();\n+ OnCommandStarted(e.Arguments);\n}\nprivate void command_ExceptionLogged(object sender, NpmExceptionEventArgs e)\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added command started message to npm UI. Fixed hyperlinks narration on npm UI.
|
410,202 |
21.03.2019 16:05:25
| 25,200 |
5a01fcd8b02cc8c9104598bf2a329bc1f30b5c6a
|
Fixed after selecting the the list item in Test frame work while pressing Tab focus is going to general tab and combo box is expanding
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"diff": "this.overallPanel.Controls.Add(this._debuggerPortLabel, 0, 12);\nthis.overallPanel.Controls.Add(this._debuggerPort, 1, 12);\nthis.overallPanel.Controls.Add(this.testHeaderTableLayoutPanel, 0, 13);\n- this.overallPanel.Controls.Add(this._testRootLabel, 0, 14);\n- this.overallPanel.Controls.Add(this._testRoot, 1, 14);\n- this.overallPanel.Controls.Add(this._browseTestroot, 2, 14);\n- this.overallPanel.Controls.Add(this._testFrameworkLabel, 0, 15);\n- this.overallPanel.Controls.Add(this._frameworkSelector, 1, 15);\n+ this.overallPanel.Controls.Add(this._testFrameworkLabel, 0, 14);\n+ this.overallPanel.Controls.Add(this._frameworkSelector, 1, 14);\n+ this.overallPanel.Controls.Add(this._testRootLabel, 0, 15);\n+ this.overallPanel.Controls.Add(this._testRoot, 1, 15);\n+ this.overallPanel.Controls.Add(this._browseTestroot, 2, 15);\nthis.overallPanel.Location = new System.Drawing.Point(0, 0);\nthis.overallPanel.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);\nthis.overallPanel.Name = \"overallPanel\";\nthis.testHeaderLabelLine.Size = new System.Drawing.Size(730, 1);\nthis.testHeaderLabelLine.TabIndex = 1;\n//\n+ // _testFrameworkLabel\n+ //\n+ this._testFrameworkLabel.AutoSize = true;\n+ this._testFrameworkLabel.Location = new System.Drawing.Point(3, 398);\n+ this._testFrameworkLabel.Margin = new System.Windows.Forms.Padding(3);\n+ this._testFrameworkLabel.Name = \"_testFrameworkLabel\";\n+ this._testFrameworkLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n+ this._testFrameworkLabel.Size = new System.Drawing.Size(118, 13);\n+ this._testFrameworkLabel.TabIndex = 23;\n+ this._testFrameworkLabel.Text = \"_testFrameworkLabel\";\n+ //\n+ // _frameworkSelector\n+ //\n+ this._frameworkSelector.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;\n+ this._frameworkSelector.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;\n+ this._frameworkSelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\n+ this._frameworkSelector.FormattingEnabled = true;\n+ this._frameworkSelector.Location = new System.Drawing.Point(181, 398);\n+ this._frameworkSelector.Name = \"_frameworkSelector\";\n+ this._frameworkSelector.Size = new System.Drawing.Size(196, 21);\n+ this._frameworkSelector.Sorted = true;\n+ this._frameworkSelector.TabIndex = 24;\n+ this._frameworkSelector.SelectedIndexChanged += new System.EventHandler(this.Changed);\n+ //\n// _testRootLabel\n//\nthis._testRootLabel.AutoSize = true;\n- this._testRootLabel.Location = new System.Drawing.Point(3, 398);\n+ this._testRootLabel.Location = new System.Drawing.Point(3, 425);\nthis._testRootLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._testRootLabel.Name = \"_testRootLabel\";\nthis._testRootLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\nthis._testRootLabel.Size = new System.Drawing.Size(89, 13);\n- this._testRootLabel.TabIndex = 23;\n+ this._testRootLabel.TabIndex = 26;\nthis._testRootLabel.Text = \"_testRootLabel\";\n//\n// _testRoot\n//\nthis._testRoot.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n| System.Windows.Forms.AnchorStyles.Right)));\n- this._testRoot.Location = new System.Drawing.Point(181, 398);\n+ this._testRoot.Location = new System.Drawing.Point(181, 425);\nthis._testRoot.Name = \"_testRoot\";\nthis._testRoot.Size = new System.Drawing.Size(620, 20);\n- this._testRoot.TabIndex = 24;\n+ this._testRoot.TabIndex = 27;\n//\n// _browseTestroot\n//\nthis._browseTestroot.AutoSize = true;\n- this._browseTestroot.Location = new System.Drawing.Point(807, 398);\n+ this._browseTestroot.Location = new System.Drawing.Point(807, 425);\nthis._browseTestroot.Name = \"_browseTestroot\";\nthis._browseTestroot.Size = new System.Drawing.Size(26, 23);\n- this._browseTestroot.TabIndex = 25;\n+ this._browseTestroot.TabIndex = 28;\nthis._browseTestroot.Text = \"...\";\nthis._browseTestroot.UseVisualStyleBackColor = true;\nthis._browseTestroot.Click += new System.EventHandler(this.BrowseTestRootClick);\n//\n- // _testFrameworkLabel\n- //\n- this._testFrameworkLabel.AutoSize = true;\n- this._testFrameworkLabel.Location = new System.Drawing.Point(3, 427);\n- this._testFrameworkLabel.Margin = new System.Windows.Forms.Padding(3);\n- this._testFrameworkLabel.Name = \"_testFrameworkLabel\";\n- this._testFrameworkLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n- this._testFrameworkLabel.Size = new System.Drawing.Size(118, 13);\n- this._testFrameworkLabel.TabIndex = 26;\n- this._testFrameworkLabel.Text = \"_testFrameworkLabel\";\n- //\n- // _frameworkSelector\n- //\n- this._frameworkSelector.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;\n- this._frameworkSelector.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;\n- this._frameworkSelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\n- this._frameworkSelector.FormattingEnabled = true;\n- this._frameworkSelector.Location = new System.Drawing.Point(181, 427);\n- this._frameworkSelector.Name = \"_frameworkSelector\";\n- this._frameworkSelector.Size = new System.Drawing.Size(196, 21);\n- this._frameworkSelector.Sorted = true;\n- this._frameworkSelector.TabIndex = 28;\n- this._frameworkSelector.SelectedIndexChanged += new System.EventHandler(this.Changed);\n- //\n// NodejsGeneralPropertyPageControl\n//\nthis.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed after selecting the the list item in Test frame work while pressing Tab focus is going to general tab and combo box is expanding
|
410,202 |
21.03.2019 16:51:26
| 25,200 |
2ac00d1d6196603f8c946cf918646e3bbd02a933
|
Fixed Narrator/NVDA is not reading the label name for Debugger port
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"diff": "this._debuggerPortLabel.Name = \"_debuggerPortLabel\";\nthis._debuggerPortLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\nthis._debuggerPortLabel.Size = new System.Drawing.Size(113, 13);\n- this._debuggerPortLabel.TabIndex = 21;\n+ this._debuggerPortLabel.TabIndex = 20;\nthis._debuggerPortLabel.Text = \"_debuggerPortLabel\";\n//\n// _envVarsLabel\nthis._debuggerPort.Location = new System.Drawing.Point(181, 353);\nthis._debuggerPort.Name = \"_debuggerPort\";\nthis._debuggerPort.Size = new System.Drawing.Size(105, 20);\n- this._debuggerPort.TabIndex = 20;\n+ this._debuggerPort.TabIndex = 21;\nthis._debuggerPort.LostFocus += new System.EventHandler(this.PortChanged);\n//\n// testHeaderTableLayoutPanel\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed Narrator/NVDA is not reading the label name for Debugger port
|
410,202 |
22.03.2019 13:42:30
| 25,200 |
3ab54d4cf71d04b0fb91be3e00b264e4631d2ffd
|
Fixed when navigating through the edit field user is not able to see the labels
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"diff": "startActionTableLayoutPanel.Controls.Add(this.startActionHeaderLabelLine, 1, 0);\nstartActionTableLayoutPanel.Controls.Add(this._startActionHeaderLabel, 0, 0);\nstartActionTableLayoutPanel.Location = new System.Drawing.Point(0, 0);\n- startActionTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0);\n+ startActionTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0, 0, 0, 6);\nstartActionTableLayoutPanel.Name = \"startActionTableLayoutPanel\";\nstartActionTableLayoutPanel.RowCount = 1;\nstartActionTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\n- startActionTableLayoutPanel.Size = new System.Drawing.Size(843, 13);\n+ startActionTableLayoutPanel.Size = new System.Drawing.Size(493, 13);\nstartActionTableLayoutPanel.TabIndex = 0;\n//\n// startActionHeaderLabelLine\nthis.startActionHeaderLabelLine.BackColor = System.Drawing.SystemColors.ControlDark;\nthis.startActionHeaderLabelLine.Location = new System.Drawing.Point(130, 6);\nthis.startActionHeaderLabelLine.Name = \"startActionHeaderLabelLine\";\n- this.startActionHeaderLabelLine.Size = new System.Drawing.Size(710, 1);\n+ this.startActionHeaderLabelLine.Size = new System.Drawing.Size(360, 1);\nthis.startActionHeaderLabelLine.TabIndex = 1;\n//\n// _startActionHeaderLabel\nnodeHeaderTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\nnodeHeaderTableLayoutPanel.Controls.Add(this.nodeHeaderLabelLine, 1, 0);\nnodeHeaderTableLayoutPanel.Controls.Add(this._nodeHeaderLabel, 0, 0);\n- nodeHeaderTableLayoutPanel.Location = new System.Drawing.Point(0, 259);\n- nodeHeaderTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0);\n+ nodeHeaderTableLayoutPanel.Location = new System.Drawing.Point(0, 274);\n+ nodeHeaderTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0, 9, 0, 6);\nnodeHeaderTableLayoutPanel.Name = \"nodeHeaderTableLayoutPanel\";\nnodeHeaderTableLayoutPanel.RowCount = 1;\nnodeHeaderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\n- nodeHeaderTableLayoutPanel.Size = new System.Drawing.Size(843, 13);\n+ nodeHeaderTableLayoutPanel.Size = new System.Drawing.Size(493, 13);\nnodeHeaderTableLayoutPanel.TabIndex = 0;\n//\n// nodeHeaderLabelLine\nthis.nodeHeaderLabelLine.BackColor = System.Drawing.SystemColors.ControlDark;\nthis.nodeHeaderLabelLine.Location = new System.Drawing.Point(104, 6);\nthis.nodeHeaderLabelLine.Name = \"nodeHeaderLabelLine\";\n- this.nodeHeaderLabelLine.Size = new System.Drawing.Size(736, 1);\n+ this.nodeHeaderLabelLine.Size = new System.Drawing.Size(386, 1);\nthis.nodeHeaderLabelLine.TabIndex = 16;\n//\n// _nodeHeaderLabel\n// _nodeArgumentsLabel\n//\nthis._nodeArgumentsLabel.AutoSize = true;\n- this._nodeArgumentsLabel.Location = new System.Drawing.Point(3, 327);\n+ this._nodeArgumentsLabel.Location = new System.Drawing.Point(3, 348);\nthis._nodeArgumentsLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._nodeArgumentsLabel.Name = \"_nodeArgumentsLabel\";\nthis._nodeArgumentsLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n// _scriptLabel\n//\nthis._scriptLabel.AutoSize = true;\n- this._scriptLabel.Location = new System.Drawing.Point(3, 16);\n+ this._scriptLabel.Location = new System.Drawing.Point(3, 22);\nthis._scriptLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._scriptLabel.Name = \"_scriptLabel\";\nthis._scriptLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n// _scriptArgsLabel\n//\nthis._scriptArgsLabel.AutoSize = true;\n- this._scriptArgsLabel.Location = new System.Drawing.Point(3, 42);\n+ this._scriptArgsLabel.Location = new System.Drawing.Point(3, 48);\nthis._scriptArgsLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._scriptArgsLabel.Name = \"_scriptArgsLabel\";\nthis._scriptArgsLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n// _workingDirLabel\n//\nthis._workingDirLabel.AutoSize = true;\n- this._workingDirLabel.Location = new System.Drawing.Point(3, 68);\n+ this._workingDirLabel.Location = new System.Drawing.Point(3, 74);\nthis._workingDirLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._workingDirLabel.Name = \"_workingDirLabel\";\nthis._workingDirLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n// _launchUrlLabel\n//\nthis._launchUrlLabel.AutoSize = true;\n- this._launchUrlLabel.Location = new System.Drawing.Point(3, 97);\n+ this._launchUrlLabel.Location = new System.Drawing.Point(3, 103);\nthis._launchUrlLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._launchUrlLabel.Name = \"_launchUrlLabel\";\nthis._launchUrlLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n// _nodePortLabel\n//\nthis._nodePortLabel.AutoSize = true;\n- this._nodePortLabel.Location = new System.Drawing.Point(3, 123);\n+ this._nodePortLabel.Location = new System.Drawing.Point(3, 129);\nthis._nodePortLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._nodePortLabel.Name = \"_nodePortLabel\";\nthis._nodePortLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n// _debuggerPortLabel\n//\nthis._debuggerPortLabel.AutoSize = true;\n- this._debuggerPortLabel.Location = new System.Drawing.Point(3, 353);\n+ this._debuggerPortLabel.Location = new System.Drawing.Point(3, 374);\nthis._debuggerPortLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._debuggerPortLabel.Name = \"_debuggerPortLabel\";\nthis._debuggerPortLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n// _envVarsLabel\n//\nthis._envVarsLabel.AutoSize = true;\n- this._envVarsLabel.Location = new System.Drawing.Point(3, 149);\n+ this._envVarsLabel.Location = new System.Drawing.Point(3, 155);\nthis._envVarsLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._envVarsLabel.Name = \"_envVarsLabel\";\nthis._envVarsLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\nthis.overallPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\nthis.overallPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\nthis.overallPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\n- this.overallPanel.Size = new System.Drawing.Size(843, 500);\n+ this.overallPanel.Size = new System.Drawing.Size(493, 481);\nthis.overallPanel.TabIndex = 0;\n//\n// _scriptFile\n//\n- this._scriptFile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n- | System.Windows.Forms.AnchorStyles.Right)));\n- this._scriptFile.Location = new System.Drawing.Point(181, 16);\n+ this._scriptFile.Location = new System.Drawing.Point(181, 22);\nthis._scriptFile.Name = \"_scriptFile\";\n- this._scriptFile.Size = new System.Drawing.Size(620, 20);\n+ this._scriptFile.Size = new System.Drawing.Size(228, 20);\nthis._scriptFile.TabIndex = 3;\nthis._scriptFile.TextChanged += new System.EventHandler(this.Changed);\n//\n// _scriptArguments\n//\n- this._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(181, 42);\n+ this._scriptArguments.Location = new System.Drawing.Point(181, 48);\nthis._scriptArguments.Name = \"_scriptArguments\";\n- this._scriptArguments.Size = new System.Drawing.Size(620, 20);\n+ this._scriptArguments.Size = new System.Drawing.Size(228, 20);\nthis._scriptArguments.TabIndex = 5;\nthis._scriptArguments.TextChanged += new System.EventHandler(this.Changed);\n//\n// _workingDir\n//\n- this._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(181, 68);\n+ this._workingDir.Location = new System.Drawing.Point(181, 74);\nthis._workingDir.Name = \"_workingDir\";\n- this._workingDir.Size = new System.Drawing.Size(620, 20);\n+ this._workingDir.Size = new System.Drawing.Size(228, 20);\nthis._workingDir.TabIndex = 7;\nthis._workingDir.LostFocus += new System.EventHandler(this.WorkingDirChanged);\n//\n// _browseDirectory\n//\nthis._browseDirectory.AutoSize = true;\n- this._browseDirectory.Location = new System.Drawing.Point(807, 68);\n+ this._browseDirectory.Location = new System.Drawing.Point(415, 74);\nthis._browseDirectory.Name = \"_browseDirectory\";\nthis._browseDirectory.Size = new System.Drawing.Size(26, 23);\nthis._browseDirectory.TabIndex = 8;\n//\n// _launchUrl\n//\n- this._launchUrl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n- | System.Windows.Forms.AnchorStyles.Right)));\n- this._launchUrl.Location = new System.Drawing.Point(181, 97);\n+ this._launchUrl.Location = new System.Drawing.Point(181, 103);\nthis._launchUrl.Name = \"_launchUrl\";\n- this._launchUrl.Size = new System.Drawing.Size(620, 20);\n+ this._launchUrl.Size = new System.Drawing.Size(228, 20);\nthis._launchUrl.TabIndex = 10;\nthis._launchUrl.TextChanged += new System.EventHandler(this.Changed);\n//\n// _nodejsPort\n//\n- this._nodejsPort.Location = new System.Drawing.Point(181, 123);\n+ this._nodejsPort.Location = new System.Drawing.Point(181, 129);\nthis._nodejsPort.Name = \"_nodejsPort\";\nthis._nodejsPort.Size = new System.Drawing.Size(105, 20);\nthis._nodejsPort.TabIndex = 12;\n//\n// _envVars\n//\n- this._envVars.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n- | System.Windows.Forms.AnchorStyles.Right)));\n- this._envVars.Location = new System.Drawing.Point(181, 149);\n+ this._envVars.Location = new System.Drawing.Point(181, 155);\nthis._envVars.Multiline = true;\nthis._envVars.Name = \"_envVars\";\nthis._envVars.ScrollBars = System.Windows.Forms.ScrollBars.Both;\n- this._envVars.Size = new System.Drawing.Size(620, 84);\n+ this._envVars.Size = new System.Drawing.Size(228, 84);\nthis._envVars.TabIndex = 14;\nthis._envVars.TextChanged += new System.EventHandler(this.Changed);\n//\n//\nthis._startBrowserCheckBox.AutoSize = true;\nthis.overallPanel.SetColumnSpan(this._startBrowserCheckBox, 3);\n- this._startBrowserCheckBox.Location = new System.Drawing.Point(3, 239);\n+ this._startBrowserCheckBox.Location = new System.Drawing.Point(3, 245);\nthis._startBrowserCheckBox.Name = \"_startBrowserCheckBox\";\nthis._startBrowserCheckBox.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\nthis._startBrowserCheckBox.Size = new System.Drawing.Size(149, 17);\n// _saveInProjectFileCheckBox\n//\nthis._saveInProjectFileCheckBox.AutoSize = true;\n- this._saveInProjectFileCheckBox.Location = new System.Drawing.Point(3, 275);\n+ this._saveInProjectFileCheckBox.Location = new System.Drawing.Point(3, 296);\nthis._saveInProjectFileCheckBox.Name = \"_saveInProjectFileCheckBox\";\nthis._saveInProjectFileCheckBox.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\nthis._saveInProjectFileCheckBox.Size = new System.Drawing.Size(172, 17);\n// _nodeExePathLabel\n//\nthis._nodeExePathLabel.AutoSize = true;\n- this._nodeExePathLabel.Location = new System.Drawing.Point(3, 298);\n+ this._nodeExePathLabel.Location = new System.Drawing.Point(3, 319);\nthis._nodeExePathLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._nodeExePathLabel.Name = \"_nodeExePathLabel\";\nthis._nodeExePathLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n//\n// _nodeExePath\n//\n- this._nodeExePath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n- | System.Windows.Forms.AnchorStyles.Right)));\nthis._nodeExePath.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;\nthis._nodeExePath.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem;\n- this._nodeExePath.Location = new System.Drawing.Point(181, 298);\n+ this._nodeExePath.Location = new System.Drawing.Point(181, 319);\nthis._nodeExePath.Name = \"_nodeExePath\";\n- this._nodeExePath.Size = new System.Drawing.Size(620, 20);\n+ this._nodeExePath.Size = new System.Drawing.Size(228, 20);\nthis._nodeExePath.TabIndex = 17;\nthis._nodeExePath.LostFocus += new System.EventHandler(this.NodeExePathChanged);\n//\n// _browsePath\n//\nthis._browsePath.AutoSize = true;\n- this._browsePath.Location = new System.Drawing.Point(807, 298);\n+ this._browsePath.Location = new System.Drawing.Point(415, 319);\nthis._browsePath.Name = \"_browsePath\";\nthis._browsePath.Size = new System.Drawing.Size(26, 23);\nthis._browsePath.TabIndex = 18;\n//\n// _nodeExeArguments\n//\n- this._nodeExeArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n- | System.Windows.Forms.AnchorStyles.Right)));\n- this._nodeExeArguments.Location = new System.Drawing.Point(181, 327);\n+ this._nodeExeArguments.Location = new System.Drawing.Point(181, 348);\nthis._nodeExeArguments.Name = \"_nodeExeArguments\";\n- this._nodeExeArguments.Size = new System.Drawing.Size(620, 20);\n+ this._nodeExeArguments.Size = new System.Drawing.Size(228, 20);\nthis._nodeExeArguments.TabIndex = 19;\nthis._nodeExeArguments.TextChanged += new System.EventHandler(this.Changed);\n//\n// _debuggerPort\n//\n- this._debuggerPort.Location = new System.Drawing.Point(181, 353);\n+ this._debuggerPort.Location = new System.Drawing.Point(181, 374);\nthis._debuggerPort.Name = \"_debuggerPort\";\nthis._debuggerPort.Size = new System.Drawing.Size(105, 20);\nthis._debuggerPort.TabIndex = 21;\nthis.testHeaderTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\nthis.testHeaderTableLayoutPanel.Controls.Add(this._TestHeaderLabel, 0, 0);\nthis.testHeaderTableLayoutPanel.Controls.Add(this.testHeaderLabelLine, 1, 0);\n- this.testHeaderTableLayoutPanel.Location = new System.Drawing.Point(3, 379);\n+ this.testHeaderTableLayoutPanel.Location = new System.Drawing.Point(0, 406);\n+ this.testHeaderTableLayoutPanel.Margin = new System.Windows.Forms.Padding(0, 9, 0, 6);\nthis.testHeaderTableLayoutPanel.Name = \"testHeaderTableLayoutPanel\";\nthis.testHeaderTableLayoutPanel.RowCount = 1;\nthis.testHeaderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\n- this.testHeaderTableLayoutPanel.Size = new System.Drawing.Size(837, 13);\n+ this.testHeaderTableLayoutPanel.Size = new System.Drawing.Size(493, 13);\nthis.testHeaderTableLayoutPanel.TabIndex = 22;\n//\n// _TestHeaderLabel\nthis.testHeaderLabelLine.BackColor = System.Drawing.SystemColors.ControlDark;\nthis.testHeaderLabelLine.Location = new System.Drawing.Point(104, 6);\nthis.testHeaderLabelLine.Name = \"testHeaderLabelLine\";\n- this.testHeaderLabelLine.Size = new System.Drawing.Size(730, 1);\n+ this.testHeaderLabelLine.Size = new System.Drawing.Size(386, 1);\nthis.testHeaderLabelLine.TabIndex = 1;\n//\n// _testFrameworkLabel\n// _testRootLabel\n//\nthis._testRootLabel.AutoSize = true;\n- this._testRootLabel.Location = new System.Drawing.Point(3, 425);\n+ this._testRootLabel.Location = new System.Drawing.Point(3, 428);\nthis._testRootLabel.Margin = new System.Windows.Forms.Padding(3);\nthis._testRootLabel.Name = \"_testRootLabel\";\nthis._testRootLabel.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);\n//\n// _testRoot\n//\n- this._testRoot.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\n- | System.Windows.Forms.AnchorStyles.Right)));\n- this._testRoot.Location = new System.Drawing.Point(181, 425);\n+ this._testRoot.Location = new System.Drawing.Point(181, 428);\nthis._testRoot.Name = \"_testRoot\";\n- this._testRoot.Size = new System.Drawing.Size(620, 20);\n+ this._testRoot.Size = new System.Drawing.Size(228, 20);\nthis._testRoot.TabIndex = 27;\n//\n// _browseTestroot\n//\nthis._browseTestroot.AutoSize = true;\n- this._browseTestroot.Location = new System.Drawing.Point(807, 425);\n+ this._browseTestroot.Location = new System.Drawing.Point(415, 428);\nthis._browseTestroot.Name = \"_browseTestroot\";\nthis._browseTestroot.Size = new System.Drawing.Size(26, 23);\nthis._browseTestroot.TabIndex = 28;\n//\n// NodejsGeneralPropertyPageControl\n//\n- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\n- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\nthis.AutoSize = true;\nthis.Controls.Add(this.overallPanel);\n- this.MinimumSize = new System.Drawing.Size(850, 550);\nthis.Name = \"NodejsGeneralPropertyPageControl\";\n- this.Size = new System.Drawing.Size(850, 550);\n+ this.Size = new System.Drawing.Size(493, 481);\nstartActionTableLayoutPanel.ResumeLayout(false);\nstartActionTableLayoutPanel.PerformLayout();\nnodeHeaderTableLayoutPanel.ResumeLayout(false);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed when navigating through the edit field user is not able to see the labels
|
410,202 |
22.03.2019 16:48:59
| 25,200 |
1b04b478a3b3554f42f194685b59d3b5c42aef67
|
Fixed Focus order is incorrect when user is selecting the close button and pressing tab the focus is going to the hyperlink instead of the Jquery search results
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"diff": "Visibility=\"{Binding HomepagesVisibility}\"\nOrientation=\"Horizontal\">\n<TextBlock Margin=\"0\" FontWeight=\"Bold\" xml:space=\"preserve\" Text=\"{x:Static resx:NpmInstallWindowResources.HomepageLabel}\" />\n- <ItemsControl ItemsSource=\"{Binding Path=Homepages, Mode=OneWay}\">\n+ <ItemsControl ItemsSource=\"{Binding Path=Homepages, Mode=OneWay}\" IsTabStop=\"False\">\n<ItemsControl.ItemTemplate>\n<DataTemplate>\n<vsui:HyperlinkButton\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed Focus order is incorrect when user is selecting the close button and pressing tab the focus is going to the hyperlink instead of the Jquery search results
|
410,202 |
29.03.2019 15:39:22
| 25,200 |
56d9a5900de1f3153234a10b017fd82a5c0db909
|
Removed URI from CommonUtils and used as Path instead.
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/SharedProject/CommonUtils.cs",
"new_path": "Common/Product/SharedProject/CommonUtils.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.Generic;\nusing System.Diagnostics;\nusing System.IO;\nusing System.Linq;\n@@ -70,22 +71,9 @@ namespace Microsoft.VisualStudioTools\npath = path.Substring(MdhaPrefix.Length);\n}\n- var uri = MakeUri(path, false, UriKind.RelativeOrAbsolute);\n- if (uri.IsAbsoluteUri)\n- {\n- if (uri.IsFile)\n- {\n- return uri.LocalPath;\n- }\n- else\n- {\n- return uri.AbsoluteUri.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);\n- }\n- }\n- else\n- {\n- return Uri.UnescapeDataString(uri.ToString()).Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);\n- }\n+ return !HasStartSeparator(path) && Path.IsPathRooted(path)\n+ ? Path.GetFullPath(path)\n+ : path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);\n}\n/// <summary>\n@@ -94,27 +82,9 @@ namespace Microsoft.VisualStudioTools\n/// </summary>\npublic static string NormalizeDirectoryPath(string path)\n{\n- if (string.IsNullOrEmpty(path))\n- {\n- return null;\n- }\n+ var normalizedPath = NormalizePath(path);\n- var uri = MakeUri(path, true, UriKind.RelativeOrAbsolute);\n- if (uri.IsAbsoluteUri)\n- {\n- if (uri.IsFile)\n- {\n- return uri.LocalPath;\n- }\n- else\n- {\n- return uri.AbsoluteUri.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);\n- }\n- }\n- else\n- {\n- return Uri.UnescapeDataString(uri.ToString()).Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);\n- }\n+ return string.IsNullOrEmpty(normalizedPath) || HasEndSeparator(normalizedPath) ? normalizedPath : normalizedPath + Path.DirectorySeparatorChar;\n}\n/// <summary>\n@@ -195,41 +165,11 @@ namespace Microsoft.VisualStudioTools\n/// created.</exception>\npublic static string GetAbsoluteDirectoryPath(string root, string relativePath)\n{\n- string absPath;\n-\n- if (string.IsNullOrEmpty(relativePath))\n- {\n- return NormalizeDirectoryPath(root);\n- }\n-\n- var relUri = MakeUri(relativePath, true, UriKind.RelativeOrAbsolute, \"relativePath\");\n- Uri absUri;\n-\n- if (relUri.IsAbsoluteUri)\n- {\n- absUri = relUri;\n- }\n- else\n- {\n- var rootUri = MakeUri(root, true, UriKind.Absolute, \"root\");\n- try\n- {\n- absUri = new Uri(rootUri, relUri);\n- }\n- catch (UriFormatException ex)\n- {\n- throw new InvalidOperationException(\"Cannot create absolute path\", ex);\n- }\n- }\n-\n- absPath = absUri.IsFile ? absUri.LocalPath : absUri.AbsoluteUri;\n-\n- if (!string.IsNullOrEmpty(absPath) && !HasEndSeparator(absPath))\n- {\n- absPath += absUri.IsFile ? Path.DirectorySeparatorChar : Path.AltDirectorySeparatorChar;\n- }\n+ var absolutePath = GetAbsoluteFilePath(root, relativePath);\n- return absPath;\n+ return string.IsNullOrEmpty(absolutePath) || HasEndSeparator(absolutePath)\n+ ? absolutePath\n+ : absolutePath + Path.DirectorySeparatorChar;\n}\n/// <summary>\n@@ -240,28 +180,28 @@ namespace Microsoft.VisualStudioTools\n/// either path is invalid.</exception>\npublic static string GetAbsoluteFilePath(string root, string relativePath)\n{\n- var rootUri = MakeUri(root, true, UriKind.Absolute, \"root\");\n- var relUri = MakeUri(relativePath, false, UriKind.RelativeOrAbsolute, \"relativePath\");\n+ var absolutePath = HasStartSeparator(relativePath)\n+ ? Path.GetFullPath(relativePath)\n+ : Path.Combine(root, relativePath);\n- Uri absUri;\n+ var split = absolutePath.Split(DirectorySeparators);\n+ var segments = new List<string>();\n- if (relUri.IsAbsoluteUri)\n- {\n- absUri = relUri;\n- }\n- else\n+ for (var i = split.Length - 1; i >= 0; i--)\n{\n- try\n+ var segment = split[i];\n+\n+ if (segment == \"..\")\n{\n- absUri = new Uri(rootUri, relUri);\n+ i--;\n}\n- catch (UriFormatException ex)\n+ else if(segment != \".\")\n{\n- throw new InvalidOperationException(\"Cannot create absolute path\", ex);\n+ segments.Insert(0, segment);\n}\n}\n- return absUri.IsFile ? absUri.LocalPath : absUri.AbsoluteUri;\n+ return string.Join(Path.DirectorySeparatorChar.ToString(), segments);\n}\n/// <summary>\n@@ -273,44 +213,11 @@ namespace Microsoft.VisualStudioTools\n/// relative path.</exception>\npublic static string GetRelativeDirectoryPath(string fromDirectory, string toDirectory)\n{\n- var fromUri = MakeUri(fromDirectory, true, UriKind.Absolute, \"fromDirectory\");\n- var toUri = MakeUri(toDirectory, true, UriKind.Absolute, \"toDirectory\");\n-\n- string relPath;\n- var sep = toUri.IsFile ? Path.DirectorySeparatorChar : Path.AltDirectorySeparatorChar;\n-\n- try\n- {\n- var relUri = fromUri.MakeRelativeUri(toUri);\n- if (relUri.IsAbsoluteUri)\n- {\n- relPath = relUri.IsFile ? relUri.LocalPath : relUri.AbsoluteUri;\n- }\n- else\n- {\n- relPath = Uri.UnescapeDataString(relUri.ToString());\n- }\n- }\n- catch (InvalidOperationException ex)\n- {\n- Trace.WriteLine(string.Format(\"Error finding path from {0} to {1}\", fromUri, toUri));\n- Trace.WriteLine(ex);\n- relPath = toUri.IsFile ? toUri.LocalPath : toUri.AbsoluteUri;\n- }\n+ var relativePath = GetRelativeFilePath(fromDirectory, toDirectory);\n- if (!string.IsNullOrEmpty(relPath) && !HasEndSeparator(relPath))\n- {\n- relPath += Path.DirectorySeparatorChar;\n- }\n-\n- if (toUri.IsFile)\n- {\n- return relPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);\n- }\n- else\n- {\n- return relPath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);\n- }\n+ return string.IsNullOrEmpty(relativePath) || HasEndSeparator(relativePath)\n+ ? relativePath\n+ : relativePath + Path.DirectorySeparatorChar;\n}\n/// <summary>\n@@ -320,39 +227,31 @@ namespace Microsoft.VisualStudioTools\n/// </summary>\npublic static string GetRelativeFilePath(string fromDirectory, string toFile)\n{\n- var fromUri = MakeUri(fromDirectory, true, UriKind.Absolute, \"fromDirectory\");\n- var toUri = MakeUri(toFile, false, UriKind.Absolute, \"toFile\");\n+ var splitDirectory = Path.GetFullPath(TrimEndSeparator(fromDirectory)).Split(DirectorySeparators);\n+ var splitFile = Path.GetFullPath(toFile).Split(DirectorySeparators);\n- string relPath;\n- var sep = toUri.IsFile ? Path.DirectorySeparatorChar : Path.AltDirectorySeparatorChar;\n+ var relativePath = new List<string>();\n+ var dirIndex = 0;\n- try\n- {\n- var relUri = fromUri.MakeRelativeUri(toUri);\n- if (relUri.IsAbsoluteUri)\n- {\n- relPath = relUri.IsFile ? relUri.LocalPath : relUri.AbsoluteUri;\n- }\n- else\n- {\n- relPath = Uri.UnescapeDataString(relUri.ToString());\n- }\n- }\n- catch (InvalidOperationException ex)\n+ var minIndex = Math.Min(splitDirectory.Length, splitFile.Length);\n+\n+ while (dirIndex < minIndex\n+ && string.Equals(splitDirectory[dirIndex], splitFile[dirIndex], StringComparison.OrdinalIgnoreCase))\n{\n- Trace.WriteLine(string.Format(\"Error finding path from {0} to {1}\", fromUri, toUri));\n- Trace.WriteLine(ex);\n- relPath = toUri.IsFile ? toUri.LocalPath : toUri.AbsoluteUri;\n+ dirIndex++;\n}\n- if (toUri.IsFile)\n+ for (var i = splitDirectory.Length; i > dirIndex; i--)\n{\n- return relPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);\n+ relativePath.Add(\"..\");\n}\n- else\n+\n+ for (var i = dirIndex; i < splitFile.Length; i++)\n{\n- return relPath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);\n+ relativePath.Add(splitFile[i]);\n}\n+\n+ return string.Join(Path.DirectorySeparatorChar.ToString(), relativePath);\n}\n/// <summary>\n@@ -516,6 +415,11 @@ namespace Microsoft.VisualStudioTools\nreturn !string.IsNullOrEmpty(path) && DirectorySeparators.Contains(path[path.Length - 1]);\n}\n+ public static bool HasStartSeparator(string path)\n+ {\n+ return !string.IsNullOrEmpty(path) && DirectorySeparators.Contains(path[0]);\n+ }\n+\n/// <summary>\n/// Removes up to one directory separator character from the end of path.\n/// </summary>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Removed URI from CommonUtils and used as Path instead.
|
410,197 |
01.04.2019 18:06:16
| 25,200 |
ae00cd993f4b39d16e3af9556cbae9e4127d5bc3
|
Use DefaultDllImportSearchPathsAttribute
...to avoid importing DLLs from unsafe locations, esp the current
working directory.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs",
"diff": "@@ -23,3 +23,7 @@ using Microsoft.VisualStudio.Shell;\n[assembly: InternalsVisibleTo(\"NodeTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n[assembly: InternalsVisibleTo(\"Nodejs.Tests.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n[assembly: InternalsVisibleTo(\"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7\")]\n+\n+// Only import DLLs from safe directories (in particular, don't search the\n+// current working directory).\n+[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.SafeDirectories)]\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/Properties/AssemblyInfo.cs",
"new_path": "Nodejs/Product/TestAdapterImpl/Properties/AssemblyInfo.cs",
"diff": "@@ -12,3 +12,7 @@ using Microsoft.VisualStudio.Shell;\n[assembly: ProvideCodeBase(AssemblyName = \"Microsoft.NodejsTools.TestAdapter\", CodeBase = \"Microsoft.NodejsTools.TestAdapter.dll\", Version = \"1.0.0.0\")]\n[assembly: InternalsVisibleTo(\"TestAdapterTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293\")]\n+\n+// Only import DLLs from safe directories (in particular, don't search the\n+// current working directory).\n+[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.SafeDirectories)]\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Use DefaultDllImportSearchPathsAttribute
...to avoid importing DLLs from unsafe locations, esp the current
working directory.
|
410,202 |
11.04.2019 13:08:31
| 25,200 |
9bff75f92b9e3e07b853bcb4a24051030e5361b2
|
Added NotificationTextBox
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Compile Include=\"Diagnostics\\NodeJsToolsEventSource.cs\" />\n<Compile Include=\"Repl\\InteractiveWindowContentType.cs\" />\n<Compile Include=\"SharedProject\\SystemUtilities.cs\" />\n+ <Compile Include=\"SharedProject\\UiaAutomationNativeMethods.cs\" />\n+ <Compile Include=\"SharedProject\\Wpf\\NotificationTextBox.cs\" />\n<Compile Include=\"TypeScriptHelpers\\TsConfigJson.cs\" />\n<Compile Include=\"TypeScriptHelpers\\TsConfigJsonFactory.cs\" />\n<Compile Include=\"TypeScriptHelpers\\TypeScriptCompile.cs\" />\n<EmbeddedResource Include=\"NpmUI\\NpmInstallWindowResources.resx\">\n<Generator>PublicResXFileCodeGenerator</Generator>\n<LastGenOutput>NpmInstallWindowResources.Designer.cs</LastGenOutput>\n+ <SubType>Designer</SubType>\n</EmbeddedResource>\n</ItemGroup>\n<ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.Designer.cs",
"diff": "@@ -213,6 +213,15 @@ namespace Microsoft.NodejsTools.NpmUI {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to One result found.\n+ /// </summary>\n+ public static string OneResultFoundMessage {\n+ get {\n+ return ResourceManager.GetString(\"OneResultFoundMessage\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Options.\n/// </summary>\n@@ -249,6 +258,15 @@ namespace Microsoft.NodejsTools.NpmUI {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to {0} results found.\n+ /// </summary>\n+ public static string ResultsFoundMessage {\n+ get {\n+ return ResourceManager.GetString(\"ResultsFoundMessage\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Search for packages.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.resx",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.resx",
"diff": "<data name=\"LatestVersion\" xml:space=\"preserve\">\n<value>(latest)</value>\n</data>\n+ <data name=\"OneResultFoundMessage\" xml:space=\"preserve\">\n+ <value>One result found</value>\n+ </data>\n+ <data name=\"ResultsFoundMessage\" xml:space=\"preserve\">\n+ <value>{0} results found</value>\n+ <comment>Parameter is a number representing the amount of results.</comment>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallViewModel.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallViewModel.cs",
"diff": "@@ -53,12 +53,14 @@ namespace Microsoft.NodejsTools.NpmUI\nprivate readonly Timer filterTimer;\nprivate readonly Dispatcher dispatcher;\nprivate readonly NpmWorker npmWorker;\n+ private readonly Action<int> searchResultCallback;\nprivate bool disposed = false;\npublic NpmPackageInstallViewModel(\nNpmWorker npmWorker,\n- Dispatcher dispatcher\n+ Dispatcher dispatcher,\n+ Action<int> searchResultCallback\n)\n{\nthis.dispatcher = dispatcher;\n@@ -67,6 +69,7 @@ namespace Microsoft.NodejsTools.NpmUI\nthis.npmWorker.CommandStarted += this.NpmWorker_CommandStarted;\nthis.npmWorker.CommandCompleted += this.NpmWorker_CommandCompleted;\nthis.filterTimer = new Timer(this.FilterTimer_Elapsed, null, Timeout.Infinite, Timeout.Infinite);\n+ this.searchResultCallback = searchResultCallback;\n}\nprivate void NpmWorker_CommandStarted(object sender, EventArgs e)\n@@ -245,6 +248,11 @@ namespace Microsoft.NodejsTools.NpmUI\nreturn;\n}\n+ if (!string.IsNullOrWhiteSpace(filterText))\n+ {\n+ this.searchResultCallback(filtered.Count());\n+ }\n+\nvar originalSelectedPackage = this.SelectedPackage;\nthis.FilteredPackages = newItems;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"diff": "xmlns=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\"\nxmlns:x=\"http://schemas.microsoft.com/winfx/2006/xaml\"\nxmlns:npmUi=\"clr-namespace:Microsoft.NodejsTools.NpmUI\"\n- xmlns:ui=\"clr-namespace:Microsoft.VisualStudioTools\"\nxmlns:vsui=\"clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0\"\nxmlns:wpf=\"clr-namespace:Microsoft.VisualStudioTools.Wpf\"\n- xmlns:sys=\"clr-namespace:System;assembly=mscorlib\"\nxmlns:resx=\"clr-namespace:Microsoft.NodejsTools.NpmUI\"\n+ xmlns:ntvs=\"clr-namespace:Microsoft.NodejsTools.SharedProject.Wpf\"\nTitle=\"{x:Static resx:NpmInstallWindowResources.WindowTitle}\"\nHeight=\"500\"\nMinHeight=\"500\"\n<ColumnDefinition Width=\"7*\" MinWidth=\"100\"/>\n</Grid.ColumnDefinitions>\n<Grid Grid.Row=\"0\" Grid.Column=\"0\">\n- <TextBox x:Name=\"FilterTextBox\"\n+ <ntvs:NotificationTextBox x:Name=\"FilterTextBox\"\n+ Style=\"{StaticResource TextBoxStyle}\"\nIsVisibleChanged=\"FilterTextBox_IsVisibleChanged\"\nHeight=\"24\"\nText=\"{Binding FilterText,UpdateSourceTrigger=PropertyChanged}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/SharedProject/Wpf/Controls.xaml",
"new_path": "Nodejs/Product/Nodejs/SharedProject/Wpf/Controls.xaml",
"diff": "</Style.Triggers>\n</Style>\n- <Style TargetType=\"{x:Type TextBox}\" BasedOn=\"{StaticResource {x:Type Control}}\">\n+ <Style x:Key=\"TextBoxStyle\" TargetType=\"{x:Type TextBox}\" BasedOn=\"{StaticResource {x:Type Control}}\">\n<Setter Property=\"CaretBrush\" Value=\"{DynamicResource {x:Static wpf:Controls.ForegroundKey}}\" />\n<Setter Property=\"FocusVisualStyle\" Value=\"{x:Null}\" />\n<Setter Property=\"Template\">\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added NotificationTextBox
|
410,202 |
12.04.2019 15:12:16
| 25,200 |
b2da38b99f3b003e64e0ca6396e853a92cd0576e
|
Addresses RaiseNotification PR comments
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallViewModel.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallViewModel.cs",
"diff": "@@ -53,14 +53,14 @@ namespace Microsoft.NodejsTools.NpmUI\nprivate readonly Timer filterTimer;\nprivate readonly Dispatcher dispatcher;\nprivate readonly NpmWorker npmWorker;\n- private readonly Action<int> searchResultCallback;\nprivate bool disposed = false;\n+ public event EventHandler<int> OnSearchResultEnded;\n+\npublic NpmPackageInstallViewModel(\nNpmWorker npmWorker,\n- Dispatcher dispatcher,\n- Action<int> searchResultCallback\n+ Dispatcher dispatcher\n)\n{\nthis.dispatcher = dispatcher;\n@@ -69,7 +69,6 @@ namespace Microsoft.NodejsTools.NpmUI\nthis.npmWorker.CommandStarted += this.NpmWorker_CommandStarted;\nthis.npmWorker.CommandCompleted += this.NpmWorker_CommandCompleted;\nthis.filterTimer = new Timer(this.FilterTimer_Elapsed, null, Timeout.Infinite, Timeout.Infinite);\n- this.searchResultCallback = searchResultCallback;\n}\nprivate void NpmWorker_CommandStarted(object sender, EventArgs e)\n@@ -250,7 +249,7 @@ namespace Microsoft.NodejsTools.NpmUI\nif (!string.IsNullOrWhiteSpace(filterText))\n{\n- this.searchResultCallback(filtered.Count());\n+ this.OnSearchResultEnded(this, filtered.Count());\n}\nvar originalSelectedPackage = this.SelectedPackage;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml.cs",
"diff": "@@ -19,20 +19,10 @@ namespace Microsoft.NodejsTools.NpmUI\ninternal NpmPackageInstallWindow(INpmController controller, NpmWorker npmWorker, DependencyType dependencyType = DependencyType.Standard)\n{\n- this.DataContext = this.viewModel = new NpmPackageInstallViewModel(\n- npmWorker,\n- this.Dispatcher,\n- (count) =>\n- {\n- var notification = count == 0 ? NpmInstallWindowResources.NoResultsFoundMessage\n- : count == 1 ? NpmInstallWindowResources.OneResultFoundMessage\n- : string.Format(NpmInstallWindowResources.ResultsFoundMessage, count);\n-\n- this.FilterTextBox.RaiseNotificationEvent(notification, NpmResultGuid);\n- });\n-\n+ this.DataContext = this.viewModel = new NpmPackageInstallViewModel(npmWorker, this.Dispatcher);\nthis.viewModel.NpmController = controller;\n+ this.viewModel.OnSearchResultEnded += this.RaiseNotification_OnSearchResultEnded;\nInitializeComponent();\nthis.DependencyComboBox.SelectedIndex = (int)dependencyType;\n}\n@@ -46,6 +36,15 @@ namespace Microsoft.NodejsTools.NpmUI\nGC.Collect();\n}\n+ private void RaiseNotification_OnSearchResultEnded(object sender, int e)\n+ {\n+ var notification = e == 0 ? NpmInstallWindowResources.NoResultsFoundMessage\n+ : e == 1 ? NpmInstallWindowResources.OneResultFoundMessage\n+ : string.Format(NpmInstallWindowResources.ResultsFoundMessage, e);\n+\n+ this.FilterTextBox.RaiseNotificationEvent(notification, NpmResultGuid);\n+ }\n+\nprivate void Close_Executed(object sender, ExecutedRoutedEventArgs e)\n{\nClose();\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/SharedProject/Wpf/NotificationTextBox.cs",
"new_path": "Nodejs/Product/Nodejs/SharedProject/Wpf/NotificationTextBox.cs",
"diff": "@@ -12,22 +12,6 @@ namespace Microsoft.NodejsTools.SharedProject.Wpf\n// This control's AutomationPeer is the object that actually raises the UIA Notification event.\nprivate NotificationTextBoxAutomationPeer notificationTextBoxAutomationPeer;\n- // Assume the UIA Notification event is available until we learn otherwise.\n- // If we learn that the UIA Notification event is not available, no instance\n- // of the NotificationTextBox should attempt to raise it.\n- private static bool notificationEventAvailable = true;\n- public bool NotificationEventAvailable\n- {\n- get\n- {\n- return notificationEventAvailable;\n- }\n- set\n- {\n- notificationEventAvailable = value;\n- }\n- }\n-\nprotected override AutomationPeer OnCreateAutomationPeer()\n{\nthis.notificationTextBoxAutomationPeer = new NotificationTextBoxAutomationPeer(this);\n@@ -47,7 +31,12 @@ namespace Microsoft.NodejsTools.SharedProject.Wpf\ninternal class NotificationTextBoxAutomationPeer : TextBoxAutomationPeer\n{\n- private NotificationTextBox notificationTextBox;\n+ private readonly NotificationTextBox notificationTextBox;\n+\n+ // Assume the UIA Notification event is available until we learn otherwise.\n+ // If we learn that the UIA Notification event is not available, no instance\n+ // of the NotificationTextBox should attempt to raise it.\n+ public bool NotificationEventAvailable { get; set; } = true;\n// The UIA Notification event requires the IRawElementProviderSimple\n// associated with this AutomationPeer.\n@@ -62,7 +51,7 @@ namespace Microsoft.NodejsTools.SharedProject.Wpf\n{\n// If we already know that the UIA Notification event is not available, do not\n// attempt to raise it.\n- if (this.notificationTextBox.NotificationEventAvailable)\n+ if (this.NotificationEventAvailable)\n{\n// If no UIA clients are listening for events, don't bother raising one.\nif (UiaAutomationNativeMethods.UiaClientsAreListening())\n@@ -93,7 +82,7 @@ namespace Microsoft.NodejsTools.SharedProject.Wpf\n{\n// The UIA Notification event is not not available, so don't attempt\n// to raise it again.\n- this.notificationTextBox.NotificationEventAvailable = false;\n+ this.NotificationEventAvailable = false;\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Addresses RaiseNotification PR comments
|
410,202 |
23.04.2019 01:04:25
| 25,200 |
2ab7f365163d9ac2283ad404fecbcdf2677a9f30
|
Migrated references to Nuget
|
[
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.CSharp.settings",
"new_path": "Build/Common.Build.CSharp.settings",
"diff": "</PropertyGroup>\n<PropertyGroup>\n- <MicrosoftBuildAssemblyVersion>15.1.0.0</MicrosoftBuildAssemblyVersion>\n+ <MicrosoftBuildAssemblyVersion>16.0.0.0</MicrosoftBuildAssemblyVersion>\n<MicrosoftBuildAssemblyVersionSuffix>Core</MicrosoftBuildAssemblyVersionSuffix>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.settings",
"new_path": "Build/Common.Build.settings",
"diff": "<CodeCoverageEnabled Condition=\"'$(CodeCoverageEnabled)'==''\">false</CodeCoverageEnabled>\n- <VisualStudioVersion Condition=\"'$(VisualStudioVersion)' == ''\">15.0</VisualStudioVersion>\n- <VSTarget Condition=\"$(VSTarget)==''\">15.0</VSTarget>\n+ <VisualStudioVersion Condition=\"'$(VisualStudioVersion)' == ''\">16.0</VisualStudioVersion>\n+ <VSTarget Condition=\"$(VSTarget)==''\">16.0</VSTarget>\n<BuildingInsideVisualStudio Condition=\"'$(BuildingInsideVisualStudio)' == ''\">false</BuildingInsideVisualStudio>\n- <TargetFrameworkVersion Condition=\"'$(TargetFrameworkVersion)' == ''\">v4.6.1</TargetFrameworkVersion>\n+ <TargetFrameworkVersion Condition=\"'$(TargetFrameworkVersion)' == ''\">v4.7.2</TargetFrameworkVersion>\n<TargetFrameworkMoniker>.NETFramework,Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker>\n<VSToolsPath Condition=\"'$(VSToolsPath)' == ''\">$(MSBuildExtensionsPath32)\\Microsoft\\VisualStudio\\v$(VisualStudioVersion)</VSToolsPath>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Migrated references to Nuget
|
410,202 |
23.04.2019 01:33:51
| 25,200 |
d4ffeac2592ddcb55e90eda2dfa299630cd3e2f6
|
Fixed Nuget build issues
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.5.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n+ <Version>16.0.1</Version>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.AppDesigner\">\n<Version>15.3.0-rc-6162104</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/WebRole/WebRole.csproj",
"new_path": "Nodejs/Product/WebRole/WebRole.csproj",
"diff": "<PackageReference Include=\"MicroBuild.Core\">\n<Version>0.3.0</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.Build\">\n- <Version>16.0.461</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n- <Version>16.0.1</Version>\n+ <PackageReference Include=\"System.Net.Sockets\">\n+ <Version>4.3.0</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed Nuget build issues
|
410,202 |
23.04.2019 13:12:05
| 25,200 |
b32bf3634f319ec95b8922f470d696008b0246c6
|
Microbuild.Core update and fixes
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<PackageReference Include=\"EnvDTE80\">\n<Version>8.0.3</Version>\n</PackageReference>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.Build\">\n<Version>16.0.461</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Workspace.VSIntegration\">\n<Version>16.0.59</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n<Version>9.0.1</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/NodejsToolsVsix/NodejsToolsVsix.csproj",
"new_path": "Nodejs/Product/NodejsToolsVsix/NodejsToolsVsix.csproj",
"diff": "<Project ToolsVersion=\"16.0\" DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n<Import Project=\"..\\VsixProjectBefore.settings\" />\n<PropertyGroup>\n- <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>\n+ <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>\n<VSToolsPath Condition=\"'$(VSToolsPath)' == ''\">$(MSBuildExtensionsPath32)\\Microsoft\\VisualStudio\\v$(VisualStudioVersion)</VSToolsPath>\n- <NuGetPackageImportStamp>\n- </NuGetPackageImportStamp>\n</PropertyGroup>\n<Import Project=\"$(MSBuildExtensionsPath)\\$(MSBuildToolsVersion)\\Microsoft.Common.props\" Condition=\"Exists('$(MSBuildExtensionsPath)\\$(MSBuildToolsVersion)\\Microsoft.Common.props')\" />\n<PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Npm.csproj",
"new_path": "Nodejs/Product/Npm/Npm.csproj",
"diff": "</FilesToSign>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.5.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n<Version>9.0.1</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"new_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"diff": "</FilesToSign>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.5.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"System.ComponentModel\">\n<Version>4.3.0</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<PackageReference Include=\"EnvDTE\">\n<Version>8.0.2</Version>\n</PackageReference>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.5.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n<Version>16.0.28729</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n</ItemGroup>\n<Import Project=\"..\\Nodejs\\SharedResources.proj\" />\n<Import Project=\"$(BuildRoot)\\Build\\Common.Build.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TargetsVsix/TargetsVsix.csproj",
"new_path": "Nodejs/Product/TargetsVsix/TargetsVsix.csproj",
"diff": "</FilesToSign>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "</FilesToSign>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.Build\">\n<Version>16.0.461</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.5.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n<Version>9.0.1</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"new_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"diff": "<PackageReference Include=\"EnvDTE90\">\n<Version>9.0.3</Version>\n</PackageReference>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.Build\">\n<Version>16.0.461</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\">\n<Version>15.0.27</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n+ </PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n<Version>9.0.1</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterVsix/TestAdapterVsix.csproj",
"new_path": "Nodejs/Product/TestAdapterVsix/TestAdapterVsix.csproj",
"diff": "</FilesToSign>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/WebRole/WebRole.csproj",
"new_path": "Nodejs/Product/WebRole/WebRole.csproj",
"diff": "</FilesToSign>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"MicroBuild.Core\">\n- <Version>0.3.0</Version>\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n+ <Version>0.4.1</Version>\n+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n+ <PrivateAssets>all</PrivateAssets>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Microbuild.Core update and fixes
|
410,219 |
23.04.2019 15:10:55
| 25,200 |
e221457385e0c17ed0a9a3cd0f6d9d067685c8fa
|
Change tsconfig item types back to content
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptExpressApp.njsproj",
"diff": "<None Include=\"app.ts\" />\n<None Include=\"routes\\index.ts\" />\n<None Include=\"routes\\user.ts\" />\n- <None Include=\"tsconfig.json\" />\n+ <Content Include=\"tsconfig.json\" />\n<Content Include=\"package.json\" />\n<Content Include=\"public\\stylesheets\\main.css\" />\n<Content Include=\"README.md\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.njsproj",
"diff": "<Content Include=\"README.md\" />\n<Content Include=\"Web.config\" />\n<Content Include=\"Web.Debug.config\" />\n- <None Include=\"tsconfig.json\" />\n+ <Content Include=\"tsconfig.json\" />\n</ItemGroup>\n<Import Project=\"$(VSToolsPath)\\Node.js Tools\\Microsoft.NodejsToolsV2.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/NodejsConsoleApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/NodejsConsoleApp.njsproj",
"diff": "<None Include=\"app.ts\" />\n<Content Include=\"package.json\" />\n<Content Include=\"README.md\" />\n- <None Include=\"tsconfig.json\" />\n+ <Content Include=\"tsconfig.json\" />\n</ItemGroup>\n<Import Project=\"$(VSToolsPath)\\Node.js Tools\\Microsoft.NodejsToolsV2.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.njsproj",
"diff": "<None Include=\"app.ts\" />\n<None Include=\"routes\\index.ts\" />\n<None Include=\"routes\\user.ts\" />\n- <None Include=\"tsconfig.json\" />\n+ <Content Include=\"tsconfig.json\" />\n<Content Include=\"package.json\" />\n<Content Include=\"public\\stylesheets\\main.css\" />\n<Content Include=\"README.md\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptVuejsApp/TypeScriptVuejsApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptVuejsApp/TypeScriptVuejsApp.njsproj",
"diff": "<Content Include=\"public\\index.html\" />\n<Content Include=\"src\\App.vue\" />\n<Content Include=\"src\\components\\Home.vue\" />\n- <None Include=\"tsconfig.json\" />\n+ <Content Include=\"tsconfig.json\" />\n<Content Include=\"package.json\" />\n<Content Include=\"README.md\" />\n</ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/NodejsWebApp.njsproj",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/NodejsWebApp.njsproj",
"diff": "<ItemGroup>\n<None Include=\"server.ts\" />\n- <None Include=\"tsconfig.json\" />\n+ <Content Include=\"tsconfig.json\" />\n<Content Include=\"package.json\" />\n<Content Include=\"README.md\" />\n</ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Change tsconfig item types back to content
|
410,202 |
29.04.2019 17:46:05
| 25,200 |
58c555584967f837e44a4a67e4d762c434633bb3
|
Added missing System.Xml.XDocument nuget package
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<PackageReference Include=\"Newtonsoft.Json\">\n<Version>9.0.1</Version>\n</PackageReference>\n+ <PackageReference Include=\"System.Xml.XDocument\">\n+ <Version>4.3.0</Version>\n+ </PackageReference>\n</ItemGroup>\n<ItemGroup>\n<Content Include=\"TestFrameworks\\ExportRunner\\exportrunner.js\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\" Version=\"15.7.2\" />\n+ <PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\" Version=\"16.0.1\" />\n<PackageReference Include=\"Newtonsoft.Json\" Version=\"9.0.1\" />\n</ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added missing System.Xml.XDocument nuget package
|
410,202 |
01.05.2019 16:35:35
| 25,200 |
23f527fde642cb2506258cda6f07bc3144c121c7
|
Added VersionPrefix and VersionSuffix to TestAdapterNetStandard
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.UnitTest.JavaScript.nuspec",
"new_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.UnitTest.JavaScript.nuspec",
"diff": "<tags>TypeScript;JavaScript;UnitTest</tags>\n<dependencies>\n<dependency id=\"Newtonsoft.Json\" version=\"9.0.1\" />\n- <dependency id=\"Microsoft.TestPlatform.ObjectModel\" version=\"15.7.2\" />\n+ <dependency id=\"Microsoft.TestPlatform.ObjectModel\" version=\"16.0.1\" />\n</dependencies>\n</metadata>\n<files>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "</PropertyGroup>\n<Import Project=\"..\\ProjectBefore.settings\" />\n<PropertyGroup>\n+ <VersionPrefix>$(VSIXBuildVersion)</VersionPrefix>\n+ <Version>$(VersionPrefix)</Version>\n+ <Version Condition=\"'$(VersionSuffix)' != ''\">$(VersionPrefix)-$(VersionSuffix)</Version>\n<PackageOutputPath>$(BuildOutputRoot)Setup\\$(MSBuildProjectName)\\</PackageOutputPath>\n- <PackageVersion>$(VSIXBuildVersion)</PackageVersion>\n+ <PackageVersion>$(Version)</PackageVersion>\n<PackageId>Microsoft.UnitTest.JavaScript</PackageId>\n<DefineConstants>NO_WINDOWS;NOVS</DefineConstants>\n</PropertyGroup>\n<Target Name=\"SetNuspecProperties\" BeforeTargets=\"GenerateNuspec\">\n<PropertyGroup>\n- <NuspecProperties>$(NuspecProperties);version=$(VSIXBuildVersion)</NuspecProperties>\n+ <NuspecProperties>$(NuspecProperties);version=$(Version)</NuspecProperties>\n<NuspecProperties>$(NuspecProperties);outDir=$(OutDir)</NuspecProperties>\n</PropertyGroup>\n</Target>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added VersionPrefix and VersionSuffix to TestAdapterNetStandard
|
410,202 |
21.05.2019 23:01:29
| 25,200 |
53d5eb0bf1cbb4f6e7bd366bd8b3ddbda1a1b62a
|
Fixed discoverer and executor error on .net core. Added Jest to nuget package
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/SharedProject/CommonUtils.cs",
"new_path": "Common/Product/SharedProject/CommonUtils.cs",
"diff": "@@ -200,6 +200,26 @@ namespace Microsoft.VisualStudioTools\nreturn string.Join(Path.DirectorySeparatorChar.ToString(), segments);\n}\n+ /// <summary>\n+ /// Returns a normalized file path created by joining relativePath to root.\n+ /// The result is not guaranteed to end with a backslash.\n+ /// </summary>\n+ /// <returns>True, if the absolut path is returned successfully; otherwise false,\n+ /// if root is not an absolute path, or either path is invalid.</returns>\n+ public static bool TryGetAbsoluteFilePath(string root, string relativePath, out string absoluteFilePath)\n+ {\n+ try\n+ {\n+ absoluteFilePath = GetAbsoluteFilePath(root, relativePath);\n+ return true;\n+ }\n+ catch\n+ {\n+ absoluteFilePath = null;\n+ return false;\n+ }\n+ }\n+\n/// <summary>\n/// Returns a relative path from the base path to the other path. This is\n/// intended for serialization rather than UI. See CreateFriendlyDirectoryPath\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"diff": "@@ -38,11 +38,11 @@ namespace Microsoft.NodejsTools.TestFrameworks\nprivate static string GetTestframeworkFolderRoot()\n{\n- // This class is used in 2 different assemblies, installed in 2 locations:\n+ // This class is used i3 2 different assemblies, installed in 3 locations:\n//\n- // \"<VSROOT>\\Common7\\IDE\\Extensions\\Microsoft\\NodeJsTools\\NodeJsTools\\Microsoft.NodejsTools.dll\"\n- // and\n+ // \"<VSROOT>\\Common7\\IDE\\Extensions\\Microsoft\\NodeJsTools\\NodeJsTools\\Microsoft.NodejsTools.dll\",\n// \"<VSROOT>\\Common7\\IDE\\Extensions\\Microsoft\\NodeJsTools\\TestAdapter\\Microsoft.NodejsTools.TestAdapter.dll\"\n+ // and <NuGetRoot>\\microsoft.unittest.javascript\\<version>\\build\\netstandard2.0\\Microsoft.JavaScript.TestAdapter.dll\nstring testAdapterAssemblyFolder;\n@@ -73,7 +73,9 @@ namespace Microsoft.NodejsTools.TestFrameworks\n}\nelse if (currentAssembly.FullName.StartsWith(\"Microsoft.JavaScript.TestAdapter\", StringComparison.OrdinalIgnoreCase))\n{\n- throw new InvalidOperationException(\"'TestFrameworkRoot' should have been set in the targets file in the nuget package.\");\n+ // This case only happens when running tests on a .Net Core project from Visual Studio's Test Explorer.\n+ // For the dotnet cli, the setting should have already been set on Microsoft.UnitTest.Javascript.targets file.\n+ testAdapterAssemblyFolder = Path.Combine(Path.GetDirectoryName(currentAssembly.Location), \"..\", \"_common\");\n}\nelse\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -85,8 +85,10 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\ntestFrameworkName = testFramework;\nvar testRootPath = Path.GetFullPath(Path.Combine(proj.DirectoryPath, testRoot));\n- fileAbsolutePath = CommonUtils.GetAbsoluteFilePath(projectHome, item.EvaluatedInclude);\n- if (!fileAbsolutePath.StartsWith(testRootPath, StringComparison.OrdinalIgnoreCase))\n+\n+ // .Net core projects include invalid paths, ignore them and continue checking the items.\n+ if (!CommonUtils.TryGetAbsoluteFilePath(projectHome, item.EvaluatedInclude, out fileAbsolutePath)\n+ || !fileAbsolutePath.StartsWith(testRootPath, StringComparison.OrdinalIgnoreCase))\n{\ncontinue;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.UnitTest.JavaScript.nuspec",
"new_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.UnitTest.JavaScript.nuspec",
"diff": "<file src=\"$outdir$TestFrameworks\\Jasmine\\Jasmine.js\" target=\"build\\_common\\TestFrameworks\\Jasmine\\\" />\n<file src=\"$outdir$TestFrameworks\\Mocha\\Mocha.js\" target=\"build\\_common\\TestFrameworks\\Mocha\\\" />\n<file src=\"$outdir$TestFrameworks\\Tape\\Tape.js\" target=\"build\\_common\\TestFrameworks\\Tape\\\" />\n+ <file src=\"$outdir$TestFrameworks\\Jest\\jest.js\" target=\"build\\_common\\TestFrameworks\\Jest\\\" />\n+ <file src=\"$outdir$TestFrameworks\\Jest\\jestReporter.js\" target=\"build\\_common\\TestFrameworks\\Jest\\\" />\n<!--net standard library-->\n<file src=\"$outdir$Microsoft.UnitTest.JavaScript.props\" target=\"build\\netstandard2.0\\\" />\n<file src=\"$outdir$Microsoft.UnitTest.JavaScript.targets\" target=\"build\\netstandard2.0\\\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/NetCoreTestExecutor.cs",
"new_path": "Nodejs/Product/TestAdapterNetStandard/NetCoreTestExecutor.cs",
"diff": "@@ -21,7 +21,7 @@ namespace Microsoft.NodejsTools.TestAdapter\npublic void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)\n{\n- // If we have a source file specified in the runtContext we should use that, otherwise sources should've been set.\n+ // If we have a source file specified in the runContext we should use that, otherwise sources should've been set.\n// This happens in the case of .NET Core where the source is the output dll for the project,\n// so we set the projectfile for the current project in the props file we import.\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "<Content Include=\"..\\TestAdapter\\TestFrameworks\\Tape\\tape.js\" Link=\"TestFrameworks\\Tape\\tape.js\">\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n</Content>\n+ <Content Include=\"..\\TestAdapter\\TestFrameworks\\Jest\\jest.js\" Link=\"TestFrameworks\\Jest\\jest.js\">\n+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n+ </Content>\n+ <Content Include=\"..\\TestAdapter\\TestFrameworks\\Jest\\jestReporter.js\" Link=\"TestFrameworks\\Jest\\jestReporter.js\">\n+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n+ </Content>\n</ItemGroup>\n<ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed discoverer and executor error on .net core. Added Jest to nuget package
|
410,202 |
23.05.2019 17:03:42
| 25,200 |
73640481e5e56d027d676b9aa1c673ad9868f871
|
Removed TryGetAbsolutePath and add logic inline
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/SharedProject/CommonUtils.cs",
"new_path": "Common/Product/SharedProject/CommonUtils.cs",
"diff": "@@ -200,26 +200,6 @@ namespace Microsoft.VisualStudioTools\nreturn Path.Combine(segments.ToArray());\n}\n- /// <summary>\n- /// Returns a normalized file path created by joining relativePath to root.\n- /// The result is not guaranteed to end with a backslash.\n- /// </summary>\n- /// <returns>True, if the absolute path is returned successfully; otherwise false,\n- /// if root is not an absolute path, or either path is invalid.</returns>\n- public static bool TryGetAbsoluteFilePath(string root, string relativePath, out string absoluteFilePath)\n- {\n- try\n- {\n- absoluteFilePath = GetAbsoluteFilePath(root, relativePath);\n- return true;\n- }\n- catch\n- {\n- absoluteFilePath = null;\n- return false;\n- }\n- }\n-\n/// <summary>\n/// Returns a relative path from the base path to the other path. This is\n/// intended for serialization rather than UI. See CreateFriendlyDirectoryPath\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -86,9 +86,17 @@ namespace Microsoft.NodejsTools.TestAdapter\ntestFrameworkName = testFramework;\nvar testRootPath = Path.GetFullPath(Path.Combine(proj.DirectoryPath, testRoot));\n+ try\n+ {\n+ fileAbsolutePath = CommonUtils.GetAbsoluteFilePath(projectHome, item.EvaluatedInclude);\n+ }\n+ catch (ArgumentException)\n+ {\n// .Net core projects include invalid paths, ignore them and continue checking the items.\n- if (!CommonUtils.TryGetAbsoluteFilePath(projectHome, item.EvaluatedInclude, out fileAbsolutePath)\n- || !fileAbsolutePath.StartsWith(testRootPath, StringComparison.OrdinalIgnoreCase))\n+ continue;\n+ }\n+\n+ if (!fileAbsolutePath.StartsWith(testRootPath, StringComparison.OrdinalIgnoreCase))\n{\ncontinue;\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Removed TryGetAbsolutePath and add logic inline
|
410,197 |
24.05.2019 16:43:55
| 25,200 |
e1d42ad3b7bebfb2baa14b64b166786924871220
|
Update null check to handle null receiver
`TsConfigJsonFactory.CreateAsync` can return null (wrapped in a task)
and the consumer appears to intend to handle that.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Workspace/TsConfigScannerFactory.cs",
"new_path": "Nodejs/Product/Nodejs/Workspace/TsConfigScannerFactory.cs",
"diff": "@@ -42,7 +42,7 @@ namespace Microsoft.NodejsTools.Workspace\nvar tsconfig = await TsConfigJsonFactory.CreateAsync(filePath);\n- if (string.IsNullOrEmpty(tsconfig.OutFile))\n+ if (string.IsNullOrEmpty(tsconfig?.OutFile))\n{\nreturn new List<FileReferenceInfo>();\n}\n@@ -69,7 +69,7 @@ namespace Microsoft.NodejsTools.Workspace\n// Only use the tsconfig.json determine the debug target when there is an outfile specified,\n// otherwise each .ts file can (in theory) be the entry point.\n- if (string.IsNullOrEmpty(tsconfig.OutFile))\n+ if (string.IsNullOrEmpty(tsconfig?.OutFile))\n{\nreturn new List<FileDataValue> {\nnew FileDataValue(BuildConfigurationContext.ContextTypeGuid, filePath, null,\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update null check to handle null receiver
`TsConfigJsonFactory.CreateAsync` can return null (wrapped in a task)
and the consumer appears to intend to handle that.
|
410,202 |
31.05.2019 14:48:52
| 25,200 |
bca4399bb6785e00e98312f62b634bf8ed95b903
|
Rollback change on GetAbsoluteFilePath
|
[
{
"change_type": "MODIFY",
"old_path": "Common/Product/SharedProject/CommonUtils.cs",
"new_path": "Common/Product/SharedProject/CommonUtils.cs",
"diff": "@@ -197,7 +197,9 @@ namespace Microsoft.VisualStudioTools\n}\n}\n- return Path.Combine(segments.ToArray());\n+ // Cannot use Path.Combine because the result will not return an absolute path.\n+ // This happens because the root has missing the trailing slash.\n+ return string.Join(Path.DirectorySeparatorChar.ToString(), segments);\n}\n/// <summary>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Rollback change on GetAbsoluteFilePath
|
410,202 |
04.06.2019 16:41:05
| 25,200 |
d8a38d3e51117a49292da6a14aa5178047e558d9
|
Changed nuget prefix
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"diff": "@@ -42,7 +42,7 @@ namespace Microsoft.NodejsTools.TestFrameworks\n//\n// \"<VSROOT>\\Common7\\IDE\\Extensions\\Microsoft\\NodeJsTools\\NodeJsTools\\Microsoft.NodejsTools.dll\",\n// \"<VSROOT>\\Common7\\IDE\\Extensions\\Microsoft\\NodeJsTools\\TestAdapter\\Microsoft.NodejsTools.TestAdapter.dll\"\n- // and <NuGetRoot>\\microsoft.unittest.javascript\\<version>\\build\\netstandard2.0\\Microsoft.JavaScript.TestAdapter.dll\n+ // and <NuGetRoot>\\microsoft.javascript.unittest\\<version>\\build\\netstandard2.0\\Microsoft.JavaScript.TestAdapter.dll\nstring testAdapterAssemblyFolder;\n@@ -74,7 +74,7 @@ namespace Microsoft.NodejsTools.TestFrameworks\nelse if (currentAssembly.FullName.StartsWith(\"Microsoft.JavaScript.TestAdapter\", StringComparison.OrdinalIgnoreCase))\n{\n// This case only happens when running tests on a .Net Core project from Visual Studio's Test Explorer.\n- // For the dotnet cli, the setting should have already been set on Microsoft.UnitTest.Javascript.targets file.\n+ // For the dotnet cli, the setting should have already been set on Microsoft.Javascript.UnitTest.targets file.\ntestAdapterAssemblyFolder = Path.Combine(Path.GetDirectoryName(currentAssembly.Location), \"..\", \"_common\");\n}\nelse\n"
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.UnitTest.JavaScript.props",
"new_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.JavaScript.UnitTest.props",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.UnitTest.JavaScript.targets",
"new_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.JavaScript.UnitTest.targets",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "<AssemblyName>Microsoft.JavaScript.TestAdapter</AssemblyName>\n<RootNamespace>Microsoft.NodejsTools.TestAdapter</RootNamespace>\n<GeneratePackageOnBuild>true</GeneratePackageOnBuild>\n- <NuspecFile>Microsoft.UnitTest.JavaScript.nuspec</NuspecFile>\n+ <NuspecFile>Microsoft.JavaScript.UnitTest.nuspec</NuspecFile>\n<!--\nDisable default assemblyinfo generation and replace with custom from\nfileversion.targets imported below\n<Version Condition=\"'$(VersionSuffix)' != ''\">$(VersionPrefix)-$(VersionSuffix)</Version>\n<PackageOutputPath>$(BuildOutputRoot)Setup\\$(MSBuildProjectName)\\</PackageOutputPath>\n<PackageVersion>$(Version)</PackageVersion>\n- <PackageId>Microsoft.UnitTest.JavaScript</PackageId>\n+ <PackageId>Microsoft.JavaScript.UnitTest</PackageId>\n<DefineConstants>NO_WINDOWS;NOVS</DefineConstants>\n</PropertyGroup>\n</ItemGroup>\n<ItemGroup>\n- <Content Include=\"Microsoft.UnitTest.JavaScript.targets\">\n+ <Content Include=\"Microsoft.JavaScript.UnitTest.targets\">\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n</Content>\n- <Content Include=\"Microsoft.UnitTest.JavaScript.props\">\n+ <Content Include=\"Microsoft.JavaScript.UnitTest.props\">\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n</Content>\n<Content Include=\"..\\TestAdapter\\TestFrameworks\\find_tests.js\" Link=\"TestFrameworks\\find_tests.js\">\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Changed nuget prefix
|
410,202 |
05.06.2019 16:40:24
| 25,200 |
54e03cf465460ea6081e3204c0c9be26f7bacb1a
|
Updated Newtonsoft.Json and JavaScript.UnitTests dependencies
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n- <Version>9.0.1</Version>\n+ <Version>12.0.2</Version>\n</PackageReference>\n<PackageReference Include=\"System.ValueTuple\">\n<Version>4.5.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Npm.csproj",
"new_path": "Nodejs/Product/Npm/Npm.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n- <Version>9.0.1</Version>\n+ <Version>12.0.2</Version>\n</PackageReference>\n<PackageReference Include=\"System.CodeDom\">\n<Version>4.5.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n- <Version>9.0.1</Version>\n+ <Version>12.0.2</Version>\n</PackageReference>\n<PackageReference Include=\"System.Xml.XDocument\">\n<Version>4.3.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"new_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Newtonsoft.Json\">\n- <Version>9.0.1</Version>\n+ <Version>12.0.2</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.JavaScript.UnitTest.nuspec",
"new_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.JavaScript.UnitTest.nuspec",
"diff": "<language>en-US</language>\n<tags>TypeScript;JavaScript;UnitTest</tags>\n<dependencies>\n- <dependency id=\"Newtonsoft.Json\" version=\"9.0.1\" />\n- <dependency id=\"Microsoft.TestPlatform.ObjectModel\" version=\"16.0.1\" />\n+ <dependency id=\"Newtonsoft.Json\" version=\"12.0.2\" />\n+ <dependency id=\"Microsoft.TestPlatform.ObjectModel\" version=\"16.1.1\" />\n+ <dependency id=\"Microsoft.NET.Test.Sdk\" version=\"16.1.1\" />\n</dependencies>\n</metadata>\n<files>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\" Version=\"16.0.1\" />\n- <PackageReference Include=\"Newtonsoft.Json\" Version=\"9.0.1\" />\n+ <PackageReference Include=\"Newtonsoft.Json\" Version=\"12.0.2\" />\n</ItemGroup>\n<ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Updated Newtonsoft.Json and JavaScript.UnitTests dependencies
|
410,219 |
10.07.2019 20:29:26
| 25,200 |
e8f445e59a659c3cc583fd07ae336db5266514a0
|
Update to SHA2 certs
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<InProject>false</InProject>\n</SignFilesDependsOn>\n<FilesToSign Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n<InProject>false</InProject>\n</FilesToSign>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Npm/Npm.csproj",
"new_path": "Nodejs/Product/Npm/Npm.csproj",
"diff": "<InProject>false</InProject>\n</SignFilesDependsOn>\n<FilesToSign Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n<InProject>false</InProject>\n</FilesToSign>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"new_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToSign Include=\"$(OutDir)\\$(AssemblyName).exe\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n<InProject>false</InProject>\n</FilesToSign>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectAfter.targets",
"new_path": "Nodejs/Product/ProjectAfter.targets",
"diff": "<Target Name=\"GatherLocalizedOutputsForSigning\" Condition=\"'$(LocalizationEnabled)' == 'true'\">\n<ItemGroup>\n<FilesToSign Include=\"$(OutDir)\\localize\\**\\$(AssemblyName).resources.dll\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n</FilesToSign>\n</ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<InProject>false</InProject>\n</SignFilesDependsOn>\n<FilesToSign Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n<InProject>false</InProject>\n</FilesToSign>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToSign Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n<InProject>false</InProject>\n</FilesToSign>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"new_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToSign Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n<InProject>false</InProject>\n</FilesToSign>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "<ItemGroup>\n<FilesToSign Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n<InProject>false</InProject>\n</FilesToSign>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/WebRole/WebRole.csproj",
"new_path": "Nodejs/Product/WebRole/WebRole.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<FilesToSign Include=\"$(OutDir)\\$(AssemblyName).dll\">\n- <Authenticode>Microsoft</Authenticode>\n+ <Authenticode>Microsoft400</Authenticode>\n<StrongName>StrongName</StrongName>\n<InProject>false</InProject>\n</FilesToSign>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update to SHA2 certs
|
410,212 |
18.07.2019 14:23:19
| 25,200 |
6dd935b2baa689362ef75cbc439eed529ebde5ee
|
Do not disable the Install npm package menu option
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsTools.vsct",
"new_path": "Nodejs/Product/Nodejs/NodejsTools.vsct",
"diff": "<CommandFlag>DynamicVisibility</CommandFlag>\n<Strings>\n<CommandName>cmdidNpmInstallModules</CommandName>\n- <ButtonText>&Install Missing npm Packages</ButtonText>\n+ <ButtonText>&Install npm Packages</ButtonText>\n</Strings>\n</Button>\n<CommandFlag>DynamicVisibility</CommandFlag>\n<Strings>\n<CommandName>cmdidNpmInstallSingleMissingModule</CommandName>\n- <ButtonText>&Install Missing npm Package(s)</ButtonText>\n+ <ButtonText>&Install npm Package(s)</ButtonText>\n</Strings>\n</Button>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"diff": "@@ -411,16 +411,9 @@ namespace Microsoft.NodejsTools.Project\nresult = QueryStatusResult.SUPPORTED;\n}\nelse\n- {\n- if (this.HasMissingModules)\n{\nresult = QueryStatusResult.ENABLED | QueryStatusResult.SUPPORTED;\n}\n- else\n- {\n- result = QueryStatusResult.SUPPORTED;\n- }\n- }\nreturn VSConstants.S_OK;\ncase PkgCmdId.cmdidNpmUpdateModules:\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Do not disable the Install npm package menu option
|
410,197 |
19.07.2019 16:51:08
| 25,200 |
daf110bac889ef60ee207367294dd61bf9d8561e
|
Eliminate redundant flags on ProjectNode build methods
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/SharedProject/ProjectNode.cs",
"new_path": "Nodejs/Product/Nodejs/SharedProject/ProjectNode.cs",
"diff": "@@ -2619,9 +2619,8 @@ namespace Microsoft.VisualStudioTools.Project\nif (this.buildProject != null)\n{\nconst bool designTime = true;\n- const bool requiresUIThread = true;\n- if (!TryBeginBuild(designTime, requiresUIThread))\n+ if (!TryBeginBuild(designTime))\n{\nthrow new InvalidOperationException(\"A build is already in progress.\");\n}\n@@ -2650,7 +2649,7 @@ namespace Microsoft.VisualStudioTools.Project\n}\nfinally\n{\n- EndBuild(submission, designTime, requiresUIThread);\n+ EndBuild(submission, designTime);\n}\n}\n@@ -2667,9 +2666,8 @@ namespace Microsoft.VisualStudioTools.Project\nprotected virtual BuildSubmission DoAsyncMSBuildSubmission(string target, Action<MSBuildResult, string> uiThreadCallback)\n{\nconst bool designTime = false;\n- const bool requiresUIThread = false;\n- if (!TryBeginBuild(designTime, requiresUIThread))\n+ if (!TryBeginBuild(designTime))\n{\nif (uiThreadCallback != null)\n{\n@@ -2710,7 +2708,7 @@ namespace Microsoft.VisualStudioTools.Project\n{\nideLogger.FlushBuildOutput();\n}\n- EndBuild(sub, designTime, requiresUIThread);\n+ EndBuild(sub, designTime);\nuiThreadCallback((sub.BuildResult.OverallResult == BuildResultCode.Success) ? MSBuildResult.Successful : MSBuildResult.Failed, target);\n});\n}, null);\n@@ -2718,7 +2716,7 @@ namespace Microsoft.VisualStudioTools.Project\ncatch (Exception e)\n{\nDebug.Fail(e.ToString());\n- EndBuild(submission, designTime, requiresUIThread);\n+ EndBuild(submission, designTime);\nif (uiThreadCallback != null)\n{\nuiThreadCallback(MSBuildResult.Failed, target);\n@@ -6011,23 +6009,23 @@ If the files in the existing folder have the same names as files in the folder y\n/// Attempts to lock in the privilege of running a build in Visual Studio.\n/// </summary>\n/// <param name=\"designTime\"><c>false</c> if this build was called for by the Solution Build Manager; <c>true</c> otherwise.</param>\n- /// <param name=\"requiresUIThread\">\n- /// Need to claim the UI thread for build under the following conditions:\n- /// 1. The build must use a resource that uses the UI thread, such as\n- /// - you set HostServices and you have a host object which requires (even indirectly) the UI thread (VB and C# compilers do this for instance.)\n- /// or,\n- /// 2. The build requires the in-proc node AND waits on the UI thread for the build to complete, such as:\n- /// - you use a ProjectInstance to build, or\n- /// - you have specified a host object, whether or not it requires the UI thread, or\n- /// - you set HostServices and you have specified a node affinity.\n- /// - In addition to the above you also call submission.Execute(), or you call submission.ExecuteAsync() and then also submission.WaitHandle.Wait*().\n- /// </param>\n/// <returns>A value indicating whether a build may proceed.</returns>\n/// <remarks>\n/// This method must be called on the UI thread.\n/// </remarks>\n- private bool TryBeginBuild(bool designTime, bool requiresUIThread = false)\n- {\n+ private bool TryBeginBuild(bool designTime)\n+ {\n+ // Need to claim the UI thread for build under the following conditions:\n+ // 1. The build must use a resource that uses the UI thread, such as\n+ // - you set HostServices and you have a host object which requires (even indirectly) the UI thread (VB and C# compilers do this for instance.)\n+ // or,\n+ // 2. The build requires the in-proc node AND waits on the UI thread for the build to complete, such as:\n+ // - you use a ProjectInstance to build, or\n+ // - you have specified a host object, whether or not it requires the UI thread, or\n+ // - you set HostServices and you have specified a node affinity.\n+ // - In addition to the above you also call submission.Execute(), or you call submission.ExecuteAsync() and then also submission.WaitHandle.Wait*().\n+ bool requiresUIThread = designTime;\n+\n// If the SVsBuildManagerAccessor service is absent, we're not running within Visual Studio.\nif (this.buildManagerAccessor != null)\n{\n@@ -6073,14 +6071,15 @@ If the files in the existing folder have the same names as files in the folder y\n/// </summary>\n/// <param name=\"submission\">The build submission that built, if any.</param>\n/// <param name=\"designTime\">This must be the same value as the one passed to <see cref=\"TryBeginBuild\"/>.</param>\n- /// <param name=\"requiresUIThread\">This must be the same value as the one passed to <see cref=\"TryBeginBuild\"/>.</param>\n/// <remarks>\n/// This method must be called on the UI thread.\n/// </remarks>\n- private void EndBuild(BuildSubmission submission, bool designTime, bool requiresUIThread = false)\n+ private void EndBuild(BuildSubmission submission, bool designTime)\n{\nDebug.Assert(this.buildInProcess);\n+ bool requiresUIThread = designTime;\n+\nif (this.buildManagerAccessor != null)\n{\n// It's very important that we try executing all three end-build steps, even if errors occur partway through.\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Eliminate redundant flags on ProjectNode build methods
|
410,202 |
29.07.2019 17:55:25
| 25,200 |
b3ea5884cbb805a0fcaf993ea848dd4f0ccef5ec
|
Fixed ordinal case when renaming
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/SharedProject/FileNode.cs",
"new_path": "Nodejs/Product/Nodejs/SharedProject/FileNode.cs",
"diff": "@@ -291,16 +291,12 @@ namespace Microsoft.VisualStudioTools.Project\nstrSavePath = CommonUtils.GetAbsoluteDirectoryPath(this.ProjectMgr.ProjectHome, strSavePath);\nvar newName = Path.Combine(strSavePath, label);\n- if (StringComparer.OrdinalIgnoreCase.Equals(newName, this.Url))\n+ if (StringComparer.Ordinal.Equals(newName, this.Url))\n{\n// This is really a no-op (including changing case), so there is nothing to do\nreturn VSConstants.S_FALSE;\n}\n- else if (StringComparer.OrdinalIgnoreCase.Equals(newName, this.Url))\n- {\n- // This is a change of file casing only.\n- }\n- else\n+ else if (!StringComparer.OrdinalIgnoreCase.Equals(newName, this.Url)) // This is not a change of file casing only.\n{\n// If the renamed file already exists then quit (unless it is the result of the parent having done the move).\nif (IsFileOnDisk(newName)\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed ordinal case when renaming
|
410,202 |
02.08.2019 15:44:04
| 25,200 |
f1b1848d628b2bff52145845c2231301bc600f4f
|
Added tags for Vue templates
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptVuejsApp/TypeScriptVuejsApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptVuejsApp/TypeScriptVuejsApp.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<TemplateGroupID>Node.js</TemplateGroupID>\n+ <LanguageTag>Typescript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <ProjectTypeTag>Web</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"TypeScriptVuejsApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/VuejsApp/VuejsApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/VuejsApp/VuejsApp.vstemplate",
"diff": "<ProvideDefaultName>true</ProvideDefaultName>\n<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n+ <LanguageTag>Javascript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <ProjectTypeTag>Web</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"VuejsApp.njsproj\" ReplaceParameters=\"true\">\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added tags for Vue templates
|
410,202 |
02.08.2019 18:14:10
| 25,200 |
7f28b1a9415e5176e4a7310e42c0a2ed01cf060e
|
Updated template tags
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/AzureExpress4App.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/AzureExpress4App/AzureExpress4App.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n+ <LanguageTag>Javascript</LanguageTag>\n+ <PlatformTag>Azure</PlatformTag>\n+ <ProjectTypeTag>Cloud</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"ExpressApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/AzureNodejsApp/AzureNodejsApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/AzureNodejsApp/AzureNodejsApp.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n+ <LanguageTag>Javascript</LanguageTag>\n+ <PlatformTag>Azure</PlatformTag>\n+ <ProjectTypeTag>Cloud</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"AzureNodejsApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/CloudService/CloudService.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/CloudService/CloudService.vstemplate",
"diff": "<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<LocationField>Enabled</LocationField>\n<EnableLocationBrowseButton>true</EnableLocationBrowseButton>\n+ <LanguageTag>Javascript</LanguageTag>\n+ <LanguageTag>Typescript</LanguageTag>\n+ <PlatformTag>Azure</PlatformTag>\n+ <ProjectTypeTag>Cloud</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"CloudService.ccproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/Express4App/ExpressApp.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n+ <LanguageTag>Javascript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n+ <ProjectTypeTag>Web</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"ExpressApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/FromExistingCode/FromExistingCode.vstemplate",
"diff": "<ProvideDefaultName>true</ProvideDefaultName>\n<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n+ <LanguageTag>Javascript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n+ <ProjectTypeTag>Web</ProjectTypeTag>\n+ <ProjectTypeTag>Console</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"FromExistingCode.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/NodejsConsoleApp/NodejsConsoleApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/NodejsConsoleApp/NodejsConsoleApp.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n+ <LanguageTag>Javascript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n+ <ProjectTypeTag>Console</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"NodejsConsoleApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/NodejsWebApp/NodejsWebApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/NodejsWebApp/NodejsWebApp.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n+ <LanguageTag>Javascript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n+ <ProjectTypeTag>Web</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"NodejsWebApp.njsproj\" ReplaceParameters=\"true\">\n<FullClassName>Microsoft.NodejsTools.ProjectWizard.NodejsPackageParametersExtension</FullClassName>\n</WizardExtension>\n</VSTemplate>\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptAzureExpressApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/TypeScriptAzureExpressApp.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n+ <LanguageTag>Typescript</LanguageTag>\n+ <PlatformTag>Azure</PlatformTag>\n+ <ProjectTypeTag>Cloud</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"TypeScriptExpressApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/TypeScriptWebApp.vstemplate",
"diff": "<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n<TemplateGroupID>Node.js</TemplateGroupID>\n+ <LanguageTag>Typescript</LanguageTag>\n+ <PlatformTag>Azure</PlatformTag>\n+ <ProjectTypeTag>Cloud</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"TypeScriptWebApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/NodejsConsoleApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptConsoleApp/NodejsConsoleApp.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n+ <LanguageTag>Typescript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n+ <ProjectTypeTag>Console</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"NodejsConsoleApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/ExpressApp.vstemplate",
"diff": "<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n+ <LanguageTag>Typescript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n+ <ProjectTypeTag>Web</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"ExpressApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptFromExistingCode/FromExistingCode.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptFromExistingCode/FromExistingCode.vstemplate",
"diff": "<ProvideDefaultName>true</ProvideDefaultName>\n<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>\n<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n+ <LanguageTag>Typescript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n+ <ProjectTypeTag>Web</ProjectTypeTag>\n+ <ProjectTypeTag>Console</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"FromExistingCode.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptVuejsApp/TypeScriptVuejsApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptVuejsApp/TypeScriptVuejsApp.vstemplate",
"diff": "<TemplateGroupID>Node.js</TemplateGroupID>\n<LanguageTag>Typescript</LanguageTag>\n<PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n<ProjectTypeTag>Web</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/NodejsWebApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/NodejsWebApp.vstemplate",
"diff": "<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<PreviewImage>Preview.png</PreviewImage>\n<TemplateGroupID>Node.js</TemplateGroupID>\n+ <LanguageTag>Typescript</LanguageTag>\n+ <PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n+ <ProjectTypeTag>Web</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n<Project File=\"NodejsWebApp.njsproj\" ReplaceParameters=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/VuejsApp/VuejsApp.vstemplate",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/VuejsApp/VuejsApp.vstemplate",
"diff": "<PromptForSaveOnCreation>true</PromptForSaveOnCreation>\n<LanguageTag>Javascript</LanguageTag>\n<PlatformTag>Windows</PlatformTag>\n+ <PlatformTag>Linux</PlatformTag>\n+ <PlatformTag>macOS</PlatformTag>\n<ProjectTypeTag>Web</ProjectTypeTag>\n</TemplateData>\n<TemplateContent>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Updated template tags
|
410,202 |
22.08.2019 14:38:23
| 25,200 |
96d8f9b80154a051464fe0e99f56421a24bb0fb7
|
Changed how unit tests shows on the Test Explorer
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/SerializationHelpers.cs",
"new_path": "Nodejs/Product/TestAdapter/SerializationHelpers.cs",
"diff": "@@ -27,7 +27,7 @@ internal sealed class ResultObject\ninternal sealed class TestEvent\n{\npublic string type { get; set; }\n- public string title { get; set; }\n+ public string fullyQualifiedName { get; set; }\npublic ResultObject result { get; set; }\n}\n@@ -36,22 +36,22 @@ internal sealed class TestCaseObject\npublic TestCaseObject()\n{\nthis.framework = string.Empty;\n- this.testName = string.Empty;\n+ this.fullyQualifiedName = string.Empty;\nthis.testFile = string.Empty;\nthis.workingFolder = string.Empty;\nthis.projectFolder = string.Empty;\n}\n- public TestCaseObject(string framework, string testName, string testFile, string workingFolder, string projectFolder)\n+ public TestCaseObject(string framework, string fullyQualifiedName, string testFile, string workingFolder, string projectFolder)\n{\nthis.framework = framework;\n- this.testName = testName;\n+ this.fullyQualifiedName = fullyQualifiedName;\nthis.testFile = testFile;\nthis.workingFolder = workingFolder;\nthis.projectFolder = projectFolder;\n}\npublic string framework { get; set; }\n- public string testName { get; set; }\n+ public string fullyQualifiedName { get; set; }\npublic string testFile { get; set; }\npublic string workingFolder { get; set; }\npublic string projectFolder { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"diff": "@@ -159,7 +159,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nnodeArgs.Add(args.RunTestsScriptFile);\n}\n- testObjects.Add(new TestCaseObject(framework: args.TestFramework, testName: args.TestName, testFile: args.TestFile, workingFolder: args.WorkingDirectory, projectFolder: args.ProjectRootDir));\n+ testObjects.Add(new TestCaseObject(framework: args.TestFramework, fullyQualifiedName: args.fullyQualifiedName, testFile: args.TestFile, workingFolder: args.WorkingDirectory, projectFolder: args.ProjectRootDir));\n}\nvar port = 0;\n@@ -224,7 +224,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nvar testEvent = JsonConvert.DeserializeObject<TestEvent>(line);\n// Extract test from list of tests\nvar test = this.currentTests\n- .Where(n => n.TestCase.DisplayName == testEvent.title)\n+ .Where(n => n.TestCase.FullyQualifiedName == testEvent.fullyQualifiedName)\n.FirstOrDefault();\nif (test != null)\n@@ -353,7 +353,7 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\nvar testFile = test.GetPropertyValue(JavaScriptTestCaseProperties.TestFile, defaultValue: test.CodeFilePath);\nvar testFramework = test.GetPropertyValue<string>(JavaScriptTestCaseProperties.TestFramework, defaultValue: null);\n- return this.frameworkDiscoverer.GetFramework(testFramework).GetArgumentsToRunTests(test.DisplayName, testFile, workingDir, projectRootDir);\n+ return this.frameworkDiscoverer.GetFramework(testFramework).GetArgumentsToRunTests(test.FullyQualifiedName, testFile, workingDir, projectRootDir);\n}\nprivate static string GetDebugArgs(Version nodeVersion, out int port)\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"diff": "+//@ts-check\nvar fs = require('fs');\nvar path = require('path');\nvar vm = require('vm');\nvar result = {\n- 'title': '',\n+ 'fullyQualifiedName': '',\n'passed': false,\n'stdOut': '',\n'stdErr': ''\n@@ -45,7 +46,7 @@ var find_tests = function (testFileList, discoverResultFile) {\nif (debug !== undefined) {\ntry {\nvar funcDetails = debug.findFunctionSourceLocation(testCases[test]);\n- if (funcDetails != undefined) {\n+ if (funcDetails !== undefined) {\nline = funcDetails.line; // 0 based\ncolumn = funcDetails.column; // 0 based\n}\n@@ -54,9 +55,9 @@ var find_tests = function (testFileList, discoverResultFile) {\n}\n}\ntestList.push({\n- test: test,\n+ name: test,\nsuite: '',\n- file: testFile,\n+ filepath: testFile,\nline: line,\ncolumn: column\n});\n@@ -69,7 +70,7 @@ var find_tests = function (testFileList, discoverResultFile) {\n};\nmodule.exports.find_tests = find_tests;\n-var run_tests = function (testCases, callback) {\n+var run_tests = function (context, callback) {\nfunction post(event) {\ncallback(event);\nhook_outputs();\n@@ -77,15 +78,15 @@ var run_tests = function (testCases, callback) {\nhook_outputs();\n- for (var test of testCases) {\n+ for (var test of context.testCases) {\npost({\ntype: 'test start',\n- title: test.testName\n+ fullyQualifiedName: test.fullyQualifiedName\n});\ntry {\nvar testCase = require(test.testFile);\n- result.title = test.testName;\n- testCase[test.testName]();\n+ result.fullyQualifiedName = test.fullyQualifiedName;\n+ testCase[test.fullTitle]();\nresult.passed = true;\nresult.stdOut += \"Test passed.\\n\";\n} catch (err) {\n@@ -95,11 +96,11 @@ var run_tests = function (testCases, callback) {\n}\npost({\ntype: 'result',\n- title: test.testName,\n+ fullyQualifiedName: test.fullyQualifiedName,\nresult: result\n});\nresult = {\n- 'title': '',\n+ 'fullyQualifiedName': '',\n'passed': false,\n'stdOut': '',\n'stdErr': ''\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"diff": "@@ -92,9 +92,9 @@ function enumerateSpecs(suite, testList, testFile) {\nenumerateSpecs(child, testList, testFile);\n} else {\ntestList.push({\n- test: child.getFullName(),\n- suite: suite.description,\n- file: testFile,\n+ name: child.description,\n+ suite: suite.description === \"Jasmine__TopLevel__Suite\" ? null : suite.getFullName(),\n+ filepath: testFile,\nline: 0,\ncolumn: 0\n});\n@@ -141,7 +141,7 @@ exports.find_tests = find_tests;\nfunction createTestResult() {\nreturn {\n- title: \"\",\n+ fullyQualifiedName: \"\",\npassed: false,\npending: false,\nstdout: \"\",\n@@ -162,17 +162,17 @@ function hookStandardOutputs() {\n};\n}\n-function sendTestProgress(callback, evtType, result, title) {\n+function sendTestProgress(callback, evtType, result, fullyQualifiedName) {\nvar event = {\ntype: evtType,\nresult: result\n};\n- title && (event.title = title);\n+ fullyQualifiedName && (event.fullyQualifiedName = fullyQualifiedName);\ncallback(event);\nhookStandardOutputs();\n}\n-function createCustomReporter(callback) {\n+function createCustomReporter(context, callback) {\nreturn {\njasmineStarted: (suiteInfo) => {\nsendTestProgress(callback, \"start\", result);\n@@ -181,17 +181,18 @@ function createCustomReporter(callback) {\nsendTestProgress(callback, \"suite start\", result);\n},\nspecStarted: (specResult) => {\n- result.title = specResult.fullName;\n- sendTestProgress(callback, \"test start\", undefined, result.title);\n+ result.fullyQualifiedName = context.getFullyQualifiedName(specResult.fullName);\n+ sendTestProgress(callback, \"test start\", undefined, result.fullyQualifiedName);\n},\nspecDone: (specResult) => {\n+ // TODO: Report the output of the test. Currently is only showing \"F\" for a regression.\nvar type = \"result\";\n- result.passed = specResult.status == \"passed\";\n- if (specResult.status == \"disabled\" || specResult.status == \"pending\") {\n+ result.passed = specResult.status === \"passed\";\n+ if (specResult.status === \"disabled\" || specResult.status === \"pending\") {\ntype = \"pending\";\nresult.pending = true;\n}\n- sendTestProgress(callback, type, result, specResult.fullName);\n+ sendTestProgress(callback, type, result, context.getFullyQualifiedName(specResult.fullName));\nresult = createTestResult();\n},\nsuiteDone: (suiteResult) => {\n@@ -203,27 +204,28 @@ function createCustomReporter(callback) {\n};\n}\n-function run_tests(testCases, callback) {\n+function run_tests(context, callback) {\nhookStandardOutputs();\n- var projectFolder = testCases[0].projectFolder;\n+ var projectFolder = context.testCases[0].projectFolder;\nvar Jasmine = detectJasmine(projectFolder);\nif (!Jasmine) {\nreturn;\n}\nvar testFileList = [];\nvar testNameList = {};\n- testCases.forEach((testCase) => {\n+\n+ context.testCases.forEach((testCase) => {\nif (testFileList.indexOf(testCase.testFile) < 0) {\ntestFileList.push(testCase.testFile);\n}\n- testNameList[testCase.testName] = true;\n+ testNameList[testCase.fullTitle] = true;\n});\ntry {\nvar jasmineInstance = initializeJasmine(Jasmine, projectFolder);\njasmineInstance.configureDefaultReporter({ showColors: false });\nsetSpecFilter(jasmineInstance, spec => testNameList.hasOwnProperty(spec.getSpecName(spec)));\n- jasmineInstance.addReporter(createCustomReporter(callback));\n+ jasmineInstance.addReporter(createCustomReporter(context, callback));\njasmineInstance.execute(testFileList);\n}\ncatch (ex) {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jest.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jest.js",
"diff": "@@ -19,14 +19,7 @@ const find_tests = function (testFileList, discoverResultFile, projectFolder) {\ntry {\nconst parseResult = jestEditorSupport.parse(testFile);\n- for (let test of parseResult.itBlocks) {\n- testList.push({\n- column: test.start.column,\n- file: test.file,\n- line: test.start.line,\n- test: test.name\n- });\n- }\n+ visitNodes(parseResult.root.children, [], testList);\n}\ncatch (e) {\n// We would like continue discover other files, so swallow, log and continue;\n@@ -39,30 +32,55 @@ const find_tests = function (testFileList, discoverResultFile, projectFolder) {\nfs.closeSync(fd);\n};\n-const run_tests = function (testCases, post) {\n- const jest = detectPackage(testCases[0].projectFolder, 'jest');\n+const run_tests = function (context, post) {\n+ const jest = detectPackage(context.testCases[0].projectFolder, 'jest');\nif (!jest) {\nreturn;\n}\n// Start all test cases, as jest is unable to filter out independently\n- for (const testCase of testCases) {\n+ for (const testCase of context.testCases) {\npost({\ntype: 'test start',\n- title: testCase.testName\n+ fullyQualifiedName: testCase.fullyQualifiedName\n});\n}\nconst config = {\njson: true,\n- reporters: [[__dirname + '/jestReporter.js', { post: post }]],\n- testMatch: [testCases[0].testFile]\n+ reporters: [[__dirname + '/jestReporter.js', { context, post }]],\n+ testMatch: [context.testCases[0].testFile]\n};\n- jest.runCLI(config, [testCases[0].projectFolder])\n+ jest.runCLI(config, [context.testCases[0].projectFolder])\n.catch((error) => logError(error));\n};\n+function visitNodes(nodes, suites, tests) {\n+ if (!nodes || nodes.length === 0) {\n+ return;\n+ }\n+\n+ for (let node of nodes) {\n+ switch (node.type) {\n+ case \"describe\":\n+ suites.push(node.name);\n+ visitNodes(node.children, suites, tests);\n+ suites.pop();\n+ break;\n+ case \"it\":\n+ tests.push({\n+ column: node.start.column,\n+ filepath: node.file,\n+ line: node.start.line,\n+ suite: suites.length === 0 ? null : suites.join(\" \"),\n+ name: node.name\n+ });\n+ break;\n+ }\n+ }\n+}\n+\nfunction detectPackage(projectFolder, packageName) {\ntry {\nconst packagePath = path.join(projectFolder, 'node_modules', packageName);\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/NodejsTestInfo.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/NodejsTestInfo.cs",
"diff": "@@ -8,7 +8,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\n{\npublic sealed class NodejsTestInfo\n{\n- public NodejsTestInfo(string testPath, string testName, string testFramework, int line, int column, string projectRootDir)\n+ public NodejsTestInfo(string testPath, string suite, string testName, string testFramework, int line, int column, string projectRootDir)\n{\nDebug.Assert(testPath.EndsWith(\".js\", StringComparison.OrdinalIgnoreCase) || testPath.EndsWith(\".jsx\", StringComparison.OrdinalIgnoreCase));\n@@ -20,9 +20,20 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\nthis.TestFramework = testFramework;\nthis.SourceLine = line;\nthis.SourceColumn = column;\n+ this.Suite = suite;\n}\n- public string FullyQualifiedName => $\"{this.TestFile}::{this.TestName}::{this.TestFramework}\";\n+ public string FullyQualifiedName\n+ {\n+ get\n+ {\n+ // If no suite is defined, it on the \"global\" space.\n+ var suite = string.IsNullOrWhiteSpace(this.Suite) ? \"global\" : this.Suite;\n+\n+ // Only three levels are allowed on vstest.\n+ return $\"{this.TestFile}::{suite}::{this.TestName}\";\n+ }\n+ }\n/// <summary>\n/// Project root relative path to the test file.\n@@ -41,5 +52,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\npublic int SourceLine { get; }\npublic int SourceColumn { get; }\n+\n+ public string Suite { get; }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Tape/tape.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Tape/tape.js",
"diff": "+//@ts-check\n\"use strict\";\nvar EOL = require('os').EOL;\nvar fs = require('fs');\n@@ -30,9 +31,9 @@ function find_tests(testFileList, discoverResultFile, projectFolder) {\nvar t = tests[count];\nt._skip = true; // don't run tests\ntestList.push({\n- test: t.name,\n+ name: t.name,\nsuite: '',\n- file: testFile,\n+ filepath: testFile,\nline: 0,\ncolumn: 0\n});\n@@ -42,11 +43,12 @@ function find_tests(testFileList, discoverResultFile, projectFolder) {\nvar fd = fs.openSync(discoverResultFile, 'w');\nfs.writeSync(fd, JSON.stringify(testList));\nfs.closeSync(fd);\n-};\n+}\nmodule.exports.find_tests = find_tests;\n-function run_tests(testInfo, callback) {\n- var tape = findTape(testInfo[0].projectFolder);\n+function run_tests(context, callback) {\n+\n+ var tape = findTape(context.testCases[0].projectFolder);\nif (tape === null) {\nreturn;\n}\n@@ -57,11 +59,12 @@ function run_tests(testInfo, callback) {\nvar harness = tape.getHarness({ objectMode: true });\nharness.createStream({ objectMode: true }).on('data', function (evt) {\n+ var result;\n+\nswitch (evt.type) {\ncase 'test':\n-\n- var result = {\n- 'title': evt.name,\n+ result = {\n+ 'fullyQualifiedName': context.getFullyQualifiedName(evt.name),\n'passed': undefined,\n'stdOut': '',\n'stdErr': ''\n@@ -72,12 +75,12 @@ function run_tests(testInfo, callback) {\n// Test is starting. Reset the result object. Send a \"test start\" event.\ncallback({\n'type': 'test start',\n- 'title': result.title,\n+ 'fullyQualifiedName': result.fullyQualifiedName,\n'result': result\n});\nbreak;\ncase 'assert':\n- var result = testState[evt.test];\n+ result = testState[evt.test];\nif (!result) { break; }\n// Correlate the success/failure asserts for this test. There may be multiple per test\n@@ -91,12 +94,12 @@ function run_tests(testInfo, callback) {\n}\nbreak;\ncase 'end':\n- var result = testState[evt.test];\n+ result = testState[evt.test];\nif (!result) { break; }\n// Test is done. Send a \"result\" event.\ncallback({\n'type': 'result',\n- 'title': result.title,\n+ 'fullyQualifiedName': result.fullyQualifiedName,\n'result': result\n});\ntestState[evt.test] = undefined;\n@@ -106,11 +109,11 @@ function run_tests(testInfo, callback) {\n}\n});\n- loadTestCases(testInfo[0].testFile);\n+ loadTestCases(context.testCases[0].testFile);\n// Skip those not selected to run. The rest will start running on the next tick.\nharness['_tests'].forEach(function (test) {\n- if (!testInfo.some(function (ti) { return ti.testName == test.name; })) {\n+ if (!context.testCases.some(function (ti) { return ti.fullyQualifiedName === context.getFullyQualifiedName(test.name); })) {\ntest._skip = true;\n}\n});\n@@ -123,7 +126,7 @@ function run_tests(testInfo, callback) {\nif (!result.passed) { result.passed = false; }\ncallback({\n'type': 'result',\n- 'title': result.title,\n+ 'fullyQualifiedName': result.fullyQualifiedName,\n'result': result\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/TestFramework.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/TestFramework.cs",
"diff": "@@ -96,21 +96,21 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\n{\nvar line = discoveredTest.Line + 1;\nvar column = discoveredTest.Column + 1;\n- var test = new NodejsTestInfo(discoveredTest.File, discoveredTest.Test, this.Name, line, column, projectRoot);\n+ var test = new NodejsTestInfo(discoveredTest.Filepath, discoveredTest.Suite, discoveredTest.Name, this.Name, line, column, projectRoot);\ntestCases.Add(test);\n}\n}\nreturn testCases;\n}\n- public ArgumentsToRunTests GetArgumentsToRunTests(string testName, string testFile, string workingDirectory, string projectRootDir)\n+ public ArgumentsToRunTests GetArgumentsToRunTests(string fullyQualifiedName, string testFile, string workingDirectory, string projectRootDir)\n{\nworkingDirectory = workingDirectory.TrimEnd('\\\\');\nprojectRootDir = projectRootDir.TrimEnd('\\\\');\nreturn new ArgumentsToRunTests(\nthis.runTestsScriptFile,\nthis.Name,\n- testName,\n+ fullyQualifiedName,\ntestFile,\nworkingDirectory,\nprojectRootDir);\n@@ -167,9 +167,9 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\n{\n// fields are set using serializer\n#pragma warning disable CS0649\n- public string Test;\n+ public string Name;\npublic string Suite;\n- public string File;\n+ public string Filepath;\npublic int Line;\npublic int Column;\n#pragma warning restore CS0649\n@@ -206,11 +206,11 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\npublic sealed class ArgumentsToRunTests\n{\n- public ArgumentsToRunTests(string runTestsScriptFile, string testFramework, string testName, string testFile, string workingDirectory, string projectRootDir)\n+ public ArgumentsToRunTests(string runTestsScriptFile, string testFramework, string fullyQualifiedName, string testFile, string workingDirectory, string projectRootDir)\n{\nthis.RunTestsScriptFile = WrapWithQuotes(runTestsScriptFile);\nthis.TestFramework = testFramework;\n- this.TestName = WrapTestNameWithQuotes(testName);\n+ this.fullyQualifiedName = WrapTestNameWithQuotes(fullyQualifiedName);\nthis.TestFile = WrapWithQuotes(testFile);\nthis.WorkingDirectory = WrapWithQuotes(workingDirectory);\nthis.ProjectRootDir = WrapWithQuotes(projectRootDir);\n@@ -218,7 +218,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\npublic readonly string RunTestsScriptFile;\npublic readonly string TestFramework;\n- public readonly string TestName;\n+ public readonly string fullyQualifiedName;\npublic readonly string TestFile;\npublic readonly string WorkingDirectory;\npublic readonly string ProjectRootDir;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/mocha/mocha.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/mocha/mocha.js",
"diff": "@@ -10,7 +10,7 @@ var defaultMochaOptions = { ui: 'tdd', reporter: 'tap', timeout: 2000 };\nfunction reset_result() {\nreturn {\n- 'title': '',\n+ 'fullyQualifiedName': '',\n'passed': false,\n'pending': false,\n'stdOut': '',\n@@ -31,9 +31,9 @@ var find_tests = function (testFileList, discoverResultFile, projectFolder) {\nif (suite.tests && suite.tests.length !== 0) {\nsuite.tests.forEach(function (t, i, testArray) {\ntestList.push({\n- test: t.fullTitle(),\n+ name: t.title,\nsuite: suite.fullTitle(),\n- file: testFile,\n+ filepath: testFile,\nline: 0,\ncolumn: 0\n});\n@@ -47,6 +47,7 @@ var find_tests = function (testFileList, discoverResultFile, projectFolder) {\n}\n}\n}\n+\nvar testList = [];\ntestFileList.split(';').forEach(function (testFile) {\nvar mocha = initializeMocha(Mocha, projectFolder);\n@@ -66,9 +67,10 @@ var find_tests = function (testFileList, discoverResultFile, projectFolder) {\nfs.writeSync(fd, JSON.stringify(testList));\nfs.closeSync(fd);\n};\n+\nmodule.exports.find_tests = find_tests;\n-var run_tests = function (testCases, callback) {\n+var run_tests = function (context, callback) {\nfunction post(event) {\ncallback(event);\nhook_outputs();\n@@ -94,21 +96,21 @@ var run_tests = function (testCases, callback) {\nhook_outputs();\nvar testResults = [];\n- var Mocha = detectMocha(testCases[0].projectFolder);\n+ var Mocha = detectMocha(context.testCases[0].projectFolder);\nif (!Mocha) {\nreturn;\n}\n- var mocha = initializeMocha(Mocha, testCases[0].projectFolder);\n+ var mocha = initializeMocha(Mocha, context.testCases[0].projectFolder);\n- var testGrepString = '^(' + testCases.map(function (testCase) {\n- return escapeRegExp(testCase.testName);\n+ var testGrepString = '^(' + context.testCases.map(function (testCase) {\n+ return escapeRegExp(testCase.fullTitle);\n}).join('|') + ')$';\nif (testGrepString) {\nmocha.grep(new RegExp(testGrepString));\n}\n- mocha.addFile(testCases[0].testFile);\n+ mocha.addFile(context.testCases[0].testFile);\nvar runner = mocha.run(function (code) {\nprocess.exitCode = code ? code : 0;\n@@ -154,20 +156,20 @@ var run_tests = function (testCases, callback) {\nrunner.on('pending', function (test) {\nresult.pending = true;\n- result.title = test.fullTitle();\n+ result.fullyQualifiedName = context.getFullyQualifiedName(test.fullTitle());\npost({\ntype: 'pending',\n- title: result.title,\n+ fullyQualifiedName: result.fullyQualifiedName,\nresult: result\n});\nresult = reset_result();\n});\nrunner.on('test', function (test) {\n- result.title = test.fullTitle();\n+ result.fullyQualifiedName = context.getFullyQualifiedName(test.fullTitle());\npost({\ntype: 'test start',\n- title: result.title\n+ fullyQualifiedName: result.fullyQualifiedName\n});\n});\n@@ -182,7 +184,7 @@ var run_tests = function (testCases, callback) {\nresult.passed = true;\npost({\ntype: 'result',\n- title: result.title,\n+ fullyQualifiedName: result.fullyQualifiedName,\nresult: result\n});\nresult = reset_result();\n@@ -192,7 +194,7 @@ var run_tests = function (testCases, callback) {\nresult.passed = false;\npost({\ntype: 'result',\n- title: result.title,\n+ fullyQualifiedName: result.fullyQualifiedName,\nresult: result\n});\nresult = reset_result();\n@@ -217,7 +219,7 @@ function detectMocha(projectFolder) {\n}\nvar mochaPath = path.join(node_modulesFolder, 'node_modules', 'mocha');\n- var Mocha = new require(mochaPath);\n+ var Mocha = require(mochaPath);\nreturn Mocha;\n} catch (ex) {\nlogError(\n@@ -265,7 +267,7 @@ function getMochaOptions(projectFolder) {\n}\n// set timeout to 10 minutes, because the default of 2 sec is too short for debugging scenarios\n- if (typeof (v8debug) === 'object') {\n+ if (typeof v8debug === 'object') {\nmochaOptions['timeout'] = 600000;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"diff": "+//@ts-check\nvar framework;\nvar readline = require('readline');\nvar old_stdout = process.stdout.write;\n@@ -15,18 +16,19 @@ rl.on('line', function (line) {\nline = line.slice(1);\n}\n- var testCases = JSON.parse(line);\n+ const context = createContext(line);\n+\n// get rid of leftover quotations from C# (necessary?)\n- for (var test in testCases) {\n- for (var value in testCases[test]) {\n- testCases[test][value] = testCases[test][value].replace(/[\"]+/g, '');\n+ for (var test in context.testCases) {\n+ for (var value in context.testCases[test]) {\n+ context.testCases[test][value] = context.testCases[test][value].replace(/[\"]+/g, '');\n}\n}\ntry {\n- framework = require('./' + testCases[0].framework + '/' + testCases[0].framework + '.js');\n+ framework = require('./' + context.testCases[0].framework + '/' + context.testCases[0].framework + '.js');\n} catch (exception) {\n- console.log(\"NTVS_ERROR:Failed to load TestFramework (\" + testCases[0].framework + \"), \" + exception);\n+ console.log(\"NTVS_ERROR:Failed to load TestFramework (\" + context.testCases[0].framework + \"), \" + exception);\nprocess.exit(1);\n}\n@@ -39,5 +41,34 @@ rl.on('line', function (line) {\n}\n}\n// run the test\n- framework.run_tests(testCases, postResult);\n+ framework.run_tests(context, postResult);\n});\n+\n+\n+function createContext(line) {\n+ function setFullTitle(testCases) {\n+ // FullyQualifiedName looks like `<filepath>::<suite><subSuite>::<testName>`.\n+ // <suite> will be `global` for all tests on the \"global\" scope.\n+ const cleanRegex = /.*?::(global::)?/;\n+\n+ for (let testCase of testCases) {\n+ testCase.fullTitle = testCase.fullyQualifiedName.replace(cleanRegex, \"\").replace(\"::\", \" \");\n+ }\n+ }\n+\n+ function getFullyQualifiedName(testCases, fullTitle) {\n+ for (let testCase of testCases) {\n+ if (testCase.fullTitle === fullTitle) {\n+ return testCase.fullyQualifiedName;\n+ }\n+ }\n+ }\n+\n+ let testCases = JSON.parse(line);\n+ setFullTitle(testCases);\n+\n+ return {\n+ testCases: testCases,\n+ getFullyQualifiedName: (fullTitle) => getFullyQualifiedName(testCases, fullTitle)\n+ };\n+}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Changed how unit tests shows on the Test Explorer
|
410,202 |
22.08.2019 18:25:30
| 25,200 |
e9a15c3f418aef7c3cc3bd073cbd76273c1ce2b7
|
Refactored post events on unit tests and fixed tests not running
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"diff": "@@ -247,7 +247,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nbreak;\n}\n}\n- else if (testEvent.type == \"suite end\")\n+ else if (testEvent.type == \"end\")\n{\nthis.currentResultObject = testEvent.result;\nthis.testsCompleted.Set();\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"diff": "@@ -3,23 +3,10 @@ var fs = require('fs');\nvar path = require('path');\nvar vm = require('vm');\nvar result = {\n- 'fullyQualifiedName': '',\n- 'passed': false,\n- 'stdOut': '',\n- 'stdErr': ''\n+ fullyQualifiedName: '',\n+ passed: false\n};\n-function append_stdout(string, encoding, fd) {\n- result.stdOut += string;\n-}\n-function append_stderr(string, encoding, fd) {\n- result.stdErr += string;\n-}\n-function hook_outputs() {\n- process.stdout.write = append_stdout;\n- process.stderr.write = append_stderr;\n-}\n-\nvar find_tests = function (testFileList, discoverResultFile) {\nvar debug;\ntry {\n@@ -70,16 +57,9 @@ var find_tests = function (testFileList, discoverResultFile) {\n};\nmodule.exports.find_tests = find_tests;\n-var run_tests = function (context, callback) {\n- function post(event) {\n- callback(event);\n- hook_outputs();\n- }\n-\n- hook_outputs();\n-\n+var run_tests = function (context) {\nfor (var test of context.testCases) {\n- post({\n+ context.post({\ntype: 'test start',\nfullyQualifiedName: test.fullyQualifiedName\n});\n@@ -88,27 +68,21 @@ var run_tests = function (context, callback) {\nresult.fullyQualifiedName = test.fullyQualifiedName;\ntestCase[test.fullTitle]();\nresult.passed = true;\n- result.stdOut += \"Test passed.\\n\";\n+ console.log(\"Test passed.\\n\");\n} catch (err) {\nresult.passed = false;\nconsole.error(err.name);\nconsole.error(err.message);\n}\n- post({\n+ context.post({\ntype: 'result',\nfullyQualifiedName: test.fullyQualifiedName,\nresult: result\n});\n- result = {\n- 'fullyQualifiedName': '',\n- 'passed': false,\n- 'stdOut': '',\n- 'stdErr': ''\n- };\n+ context.clearOutputs();\n}\n- callback({\n- type: 'suite end',\n- result: result\n+ context.callback({\n+ type: 'end'\n});\nprocess.exit();\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"diff": "@@ -139,74 +139,42 @@ function find_tests(testFileList, discoverResultFile, projectFolder) {\nexports.find_tests = find_tests;\n-function createTestResult() {\n+function createCustomReporter(context) {\nreturn {\n- fullyQualifiedName: \"\",\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-function sendTestProgress(callback, evtType, result, fullyQualifiedName) {\n- var event = {\n- type: evtType,\n- result: result\n- };\n- fullyQualifiedName && (event.fullyQualifiedName = fullyQualifiedName);\n- callback(event);\n- hookStandardOutputs();\n-}\n-\n-function createCustomReporter(context, callback) {\n- return {\n- jasmineStarted: (suiteInfo) => {\n- sendTestProgress(callback, \"start\", result);\n- },\n- suiteStarted: (suiteResult) => {\n- sendTestProgress(callback, \"suite start\", result);\n- },\nspecStarted: (specResult) => {\n- result.fullyQualifiedName = context.getFullyQualifiedName(specResult.fullName);\n- sendTestProgress(callback, \"test start\", undefined, result.fullyQualifiedName);\n+ context.post({\n+ type: \"test start\",\n+ fullyQualifiedName: context.getFullyQualifiedName(specResult.fullName)\n+ });\n},\nspecDone: (specResult) => {\n// TODO: Report the output of the test. Currently is only showing \"F\" for a regression.\nvar type = \"result\";\n- result.passed = specResult.status === \"passed\";\n+ var result = {\n+ passed: specResult.status === \"passed\",\n+ pending: false\n+ };\n+\nif (specResult.status === \"disabled\" || specResult.status === \"pending\") {\ntype = \"pending\";\nresult.pending = true;\n}\n- sendTestProgress(callback, type, result, context.getFullyQualifiedName(specResult.fullName));\n- result = createTestResult();\n- },\n- suiteDone: (suiteResult) => {\n- sendTestProgress(callback, \"suite end\", result);\n+ context.post({\n+ type,\n+ result,\n+ fullyQualifiedName: context.getFullyQualifiedName(specResult.fullName)\n+ });\n+ context.clearOutputs();\n},\njasmineDone: (suiteInfo) => {\n- sendTestProgress(callback, \"end\", result);\n+ context.post({\n+ type: \"end\"\n+ });\n}\n};\n}\n-function run_tests(context, callback) {\n- hookStandardOutputs();\n-\n+function run_tests(context) {\nvar projectFolder = context.testCases[0].projectFolder;\nvar Jasmine = detectJasmine(projectFolder);\nif (!Jasmine) {\n@@ -225,7 +193,7 @@ function run_tests(context, callback) {\nvar jasmineInstance = initializeJasmine(Jasmine, projectFolder);\njasmineInstance.configureDefaultReporter({ showColors: false });\nsetSpecFilter(jasmineInstance, spec => testNameList.hasOwnProperty(spec.getSpecName(spec)));\n- jasmineInstance.addReporter(createCustomReporter(context, callback));\n+ jasmineInstance.addReporter(createCustomReporter(context));\njasmineInstance.execute(testFileList);\n}\ncatch (ex) {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jest.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jest.js",
"diff": "@@ -32,7 +32,7 @@ const find_tests = function (testFileList, discoverResultFile, projectFolder) {\nfs.closeSync(fd);\n};\n-const run_tests = function (context, post) {\n+const run_tests = function (context) {\nconst jest = detectPackage(context.testCases[0].projectFolder, 'jest');\nif (!jest) {\nreturn;\n@@ -40,7 +40,7 @@ const run_tests = function (context, post) {\n// Start all test cases, as jest is unable to filter out independently\nfor (const testCase of context.testCases) {\n- post({\n+ context.post({\ntype: 'test start',\nfullyQualifiedName: testCase.fullyQualifiedName\n});\n@@ -48,7 +48,7 @@ const run_tests = function (context, post) {\nconst config = {\njson: true,\n- reporters: [[__dirname + '/jestReporter.js', { context, post }]],\n+ reporters: [[__dirname + '/jestReporter.js', { context }]],\ntestMatch: [context.testCases[0].testFile]\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jestReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jestReporter.js",
"diff": "@@ -15,16 +15,15 @@ class jestReporter {\nfullyQualifiedName: this._options.context.getFullyQualifiedName(assertionResult.fullName)\n};\n- this._options.post({\n+ this._options.context.post({\ntype: result.pending ? 'pending' : 'result',\nfullyQualifiedName: result.fullyQualifiedName,\n- result: result\n+ result\n});\n}\n- this._options.post({\n- type: 'suite end',\n- result: {}\n+ this._options.context.post({\n+ type: 'end'\n});\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Tape/tape.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Tape/tape.js",
"diff": "@@ -4,14 +4,6 @@ var EOL = require('os').EOL;\nvar fs = require('fs');\nvar path = require('path');\n-function append_stdout(string, encoding, fd) {\n- result.stdOut += string;\n-}\n-\n-function append_stderr(string, encoding, fd) {\n- result.stdErr += string;\n-}\n-\nfunction find_tests(testFileList, discoverResultFile, projectFolder) {\nvar test = findTape(projectFolder);\nif (test === null) {\n@@ -46,7 +38,7 @@ function find_tests(testFileList, discoverResultFile, projectFolder) {\n}\nmodule.exports.find_tests = find_tests;\n-function run_tests(context, callback) {\n+function run_tests(context) {\nvar tape = findTape(context.testCases[0].projectFolder);\nif (tape === null) {\n@@ -64,19 +56,18 @@ function run_tests(context, callback) {\nswitch (evt.type) {\ncase 'test':\nresult = {\n- 'fullyQualifiedName': context.getFullyQualifiedName(evt.name),\n- 'passed': undefined,\n- 'stdOut': '',\n- 'stdErr': ''\n+ fullyQualifiedName: context.getFullyQualifiedName(evt.name),\n+ passed: undefined,\n+ stdout: '',\n+ stderr: ''\n};\ntestState[evt.id] = result;\n// Test is starting. Reset the result object. Send a \"test start\" event.\n- callback({\n- 'type': 'test start',\n- 'fullyQualifiedName': result.fullyQualifiedName,\n- 'result': result\n+ context.post({\n+ type: 'test start',\n+ fullyQualifiedName: result.fullyQualifiedName\n});\nbreak;\ncase 'assert':\n@@ -86,10 +77,10 @@ function run_tests(context, callback) {\n// Correlate the success/failure asserts for this test. There may be multiple per test\nvar msg = \"Operator: \" + evt.operator + \". Expected: \" + evt.expected + \". Actual: \" + evt.actual + \". evt: \" + JSON.stringify(evt) + \"\\n\";\nif (evt.ok) {\n- result.stdOut += msg;\n+ result.stdout += msg;\nresult.passed = result.passed === undefined ? true : result.passed;\n} else {\n- result.stdErr += msg + (evt.error.stack || evt.error.message) + \"\\n\";\n+ result.stderr += msg + (evt.error.stack || evt.error.message) + \"\\n\";\nresult.passed = false;\n}\nbreak;\n@@ -97,11 +88,12 @@ function run_tests(context, callback) {\nresult = testState[evt.test];\nif (!result) { break; }\n// Test is done. Send a \"result\" event.\n- callback({\n- 'type': 'result',\n- 'fullyQualifiedName': result.fullyQualifiedName,\n- 'result': result\n+ context.post({\n+ type: 'result',\n+ fullyQualifiedName: result.fullyQualifiedName,\n+ result\n});\n+ context.clearOutputs();\ntestState[evt.test] = undefined;\nbreak;\ndefault:\n@@ -119,16 +111,17 @@ function run_tests(context, callback) {\n});\nharness.onFinish(function () {\n+ // TODO: Not used?\n// loop through items in testState\nfor (var i = 0; i < testState.length; i++) {\nif (testState[i]) {\nvar result = testState[i];\nif (!result.passed) { result.passed = false; }\n- callback({\n- 'type': 'result',\n- 'fullyQualifiedName': result.fullyQualifiedName,\n- 'result': result\n- });\n+ //callback({\n+ // 'type': 'result',\n+ // 'fullyQualifiedName': result.fullyQualifiedName,\n+ // 'result': result\n+ //});\n}\n}\nprocess.exit(0);\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/mocha/mocha.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/mocha/mocha.js",
"diff": "@@ -8,18 +8,6 @@ var path = require('path');\n// and 'xunit' does not print the stack trace from the test.\nvar defaultMochaOptions = { ui: 'tdd', reporter: 'tap', timeout: 2000 };\n-function reset_result() {\n- return {\n- 'fullyQualifiedName': '',\n- 'passed': false,\n- 'pending': false,\n- 'stdOut': '',\n- 'stdErr': ''\n- };\n-}\n-\n-var result = reset_result();\n-\nvar find_tests = function (testFileList, discoverResultFile, projectFolder) {\nvar Mocha = detectMocha(projectFolder);\nif (!Mocha) {\n@@ -70,32 +58,11 @@ var find_tests = function (testFileList, discoverResultFile, projectFolder) {\nmodule.exports.find_tests = find_tests;\n-var run_tests = function (context, callback) {\n- function post(event) {\n- callback(event);\n- hook_outputs();\n- }\n-\n+var run_tests = function (context) {\nfunction escapeRegExp(string) {\nreturn string.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&'); // $& means the whole matched string\n}\n- function append_stdout(string, encoding, fd) {\n- result.stdOut += string;\n- return true;\n- }\n- function append_stderr(string, encoding, fd) {\n- result.stdErr += string;\n- return true;\n- }\n- function hook_outputs() {\n- process.stdout.write = append_stdout;\n- process.stderr.write = append_stderr;\n- }\n-\n- hook_outputs();\n-\n- var testResults = [];\nvar Mocha = detectMocha(context.testCases[0].projectFolder);\nif (!Mocha) {\nreturn;\n@@ -117,87 +84,58 @@ var run_tests = function (context, callback) {\n});\n// See events available at https://github.com/mochajs/mocha/blob/8cae7a34f0b6eafeb16567beb8852b827cc5956b/lib/runner.js#L47-L57\n- runner.on('suite', function (suite) {\n- post({\n- type: 'suite start',\n- result: result\n- });\n- });\n-\n- runner.on('suite end', function (suite) {\n- post({\n- type: 'suite end',\n- result: result\n- });\n- });\n-\n- runner.on('hook', function (hook) {\n- post({\n- type: 'hook start',\n- title: hook.title,\n- result: result\n- });\n- });\n-\n- runner.on('hook end', function (hook) {\n- post({\n- type: 'hook end',\n- title: hook.title,\n- result: result\n- });\n- });\n-\n- runner.on('start', function () {\n- post({\n- type: 'start',\n- result: result\n- });\n- });\n-\nrunner.on('pending', function (test) {\n- result.pending = true;\n- result.fullyQualifiedName = context.getFullyQualifiedName(test.fullTitle());\n- post({\n+ const fullyQualifiedName = context.getFullyQualifiedName(test.fullTitle());\n+ context.post({\ntype: 'pending',\n- fullyQualifiedName: result.fullyQualifiedName,\n- result: result\n+ fullyQualifiedName,\n+ result: {\n+ fullyQualifiedName,\n+ pending: true\n+ }\n});\n- result = reset_result();\n+ context.clearOutputs();\n});\nrunner.on('test', function (test) {\n- result.fullyQualifiedName = context.getFullyQualifiedName(test.fullTitle());\n- post({\n+ context.post({\ntype: 'test start',\n- fullyQualifiedName: result.fullyQualifiedName\n+ fullyQualifiedName: context.getFullyQualifiedName(test.fullTitle())\n});\n});\nrunner.on('end', function () {\n- post({\n- type: 'end',\n- result: result\n+ context.post({\n+ type: 'end'\n});\n});\nrunner.on('pass', function (test) {\n- result.passed = true;\n- post({\n+ const fullyQualifiedName = context.getFullyQualifiedName(test.fullTitle());\n+\n+ context.post({\ntype: 'result',\n- fullyQualifiedName: result.fullyQualifiedName,\n- result: result\n+ fullyQualifiedName,\n+ result: {\n+ fullyQualifiedName,\n+ passed: true\n+ }\n});\n- result = reset_result();\n+ context.clearOutputs();\n});\nrunner.on('fail', function (test, err) {\n- result.passed = false;\n- post({\n+ const fullyQualifiedName = context.getFullyQualifiedName(test.fullTitle());\n+\n+ context.post({\ntype: 'result',\n- fullyQualifiedName: result.fullyQualifiedName,\n- result: result\n+ fullyQualifiedName,\n+ result: {\n+ fullyQualifiedName,\n+ passed: false\n+ }\n});\n- result = reset_result();\n+ context.clearOutputs();\n});\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"diff": "//@ts-check\nvar framework;\nvar readline = require('readline');\n-var old_stdout = process.stdout.write;\n-var old_stderr = process.stderr.write;\nvar rl = readline.createInterface({\ninput: process.stdin,\noutput: process.stdout\n@@ -32,19 +30,10 @@ rl.on('line', function (line) {\nprocess.exit(1);\n}\n- function postResult(result) {\n- // unhook stdout and stderr\n- process.stdout.write = old_stdout;\n- process.stderr.write = old_stderr;\n- if (result) {\n- console.log(JSON.stringify(result));\n- }\n- }\n// run the test\n- framework.run_tests(context, postResult);\n+ framework.run_tests(context);\n});\n-\nfunction createContext(line) {\nfunction setFullTitle(testCases) {\n// FullyQualifiedName looks like `<filepath>::<suite><subSuite>::<testName>`.\n@@ -64,11 +53,65 @@ function createContext(line) {\n}\n}\n+ function post(event) {\n+ unhookOutputs();\n+\n+ if (event) {\n+ if (event.result) {\n+ // Set only stdout and stderr if they are empty.\n+ event.result.stdout = event.result.stdout || newOutputs.stdout;\n+ event.result.stderr = event.result.stderr || newOutputs.stderr;\n+ }\n+\n+ console.log(JSON.stringify(event));\n+ }\n+\n+ hookOutputs();\n+ }\n+\n+ function clearOutputs() {\n+ newOutputs = {\n+ stdout: '',\n+ stderr: ''\n+ };\n+ }\n+\nlet testCases = JSON.parse(line);\nsetFullTitle(testCases);\nreturn {\ntestCases: testCases,\n- getFullyQualifiedName: (fullTitle) => getFullyQualifiedName(testCases, fullTitle)\n+ getFullyQualifiedName: (fullTitle) => getFullyQualifiedName(testCases, fullTitle),\n+ post,\n+ clearOutputs\n+ };\n+}\n+\n+function hookOutputs() {\n+ oldOutputs = {\n+ stdout: process.stdout.write,\n+ stderr: process.stderr.write\n+ };\n+\n+ process.stdout.write = (str, encording, callback) => {\n+ newOutputs.stdout += str;\n+ return true;\n};\n+ process.stderr.write = (str, encording, callback) => {\n+ newOutputs.stderr += str;\n+ return true;\n+ };\n+}\n+\n+function unhookOutputs() {\n+ process.stdout.write = oldOutputs.stdout;\n+ process.stderr.write = oldOutputs.stderr;\n}\n+\n+let oldOutputs = {};\n+let newOutputs = {\n+ stdout: '',\n+ stderr: ''\n+};\n+\n+hookOutputs();\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Refactored post events on unit tests and fixed tests not running
|
410,202 |
28.08.2019 18:18:07
| 25,200 |
ac8d2af18a82658a857ee17a97a87b1b4f0fec0a
|
Address PR commnts
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jest.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jest.js",
"diff": "@@ -64,8 +64,11 @@ function visitNodes(nodes, suites, tests) {\nfor (let node of nodes) {\nswitch (node.type) {\ncase \"describe\":\n- suites.push(node.name);\n+ const parent = suites.length > 0 ? `${suites[suites.length - 1]} ` : '';\n+ suites.push(`${parent}${node.name}`);\n+\nvisitNodes(node.children, suites, tests);\n+\nsuites.pop();\nbreak;\ncase \"it\":\n@@ -73,7 +76,7 @@ function visitNodes(nodes, suites, tests) {\ncolumn: node.start.column,\nfilepath: node.file,\nline: node.start.line,\n- suite: suites.length === 0 ? null : suites.join(\" \"),\n+ suite: suites.length === 0 ? null : suites[suites.length - 1],\nname: node.name\n});\nbreak;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/NodejsTestInfo.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/NodejsTestInfo.cs",
"diff": "@@ -27,7 +27,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\n{\nget\n{\n- // If no suite is defined, it on the \"global\" space.\n+ // If no suite is defined, it's on the \"global\" space.\nvar suite = string.IsNullOrWhiteSpace(this.Suite) ? \"global\" : this.Suite;\n// Only three levels are allowed on vstest.\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"diff": "@@ -38,6 +38,7 @@ function createContext(line) {\nfunction setFullTitle(testCases) {\n// FullyQualifiedName looks like `<filepath>::<suite><subSuite>::<testName>`.\n// <suite> will be `global` for all tests on the \"global\" scope.\n+ // The result would be something like `<suite> <subSuite> <testName>`. Removes `global` as well.\nconst cleanRegex = /.*?::(global::)?/;\nfor (let testCase of testCases) {\n@@ -54,20 +55,20 @@ function createContext(line) {\n}\nfunction post(event) {\n- unhookOutputs();\n-\nif (event) {\nif (event.result) {\n- // Set only stdout and stderr if they are empty.\n+ // Some test frameworks report the result on the stdout/stderr so the event will be empty. Set only stdout and stderr if that's the case.\nevent.result.stdout = event.result.stdout || newOutputs.stdout;\nevent.result.stderr = event.result.stderr || newOutputs.stderr;\n}\n+ // We need to unhook the outputs as we want to post the event to the test explorer.\n+ // Then hook again to continue capturing the stdout\n+ unhookOutputs();\nconsole.log(JSON.stringify(event));\n- }\n-\nhookOutputs();\n}\n+ }\nfunction clearOutputs() {\nnewOutputs = {\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Address PR commnts
|
410,202 |
28.08.2019 18:30:44
| 25,200 |
8adfdbc0392e45dbf3aff1e3d42d1db663db09ca
|
Added comment for getFullyQualifiedName
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"diff": "@@ -47,6 +47,7 @@ function createContext(line) {\n}\nfunction getFullyQualifiedName(testCases, fullTitle) {\n+ // TODO: Don't do linear search, instead use a property or cache the fullTitle, fullyQualifiedName.\nfor (let testCase of testCases) {\nif (testCase.fullTitle === fullTitle) {\nreturn testCase.fullyQualifiedName;\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added comment for getFullyQualifiedName
|
410,202 |
04.09.2019 14:04:56
| 25,200 |
db514b8a04625a8617dc506a4b172b2e6361ce2d
|
Updated VsSDK Preview Nuget feed
|
[
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<add key=\"dotnet myget\" value=\"https://dotnet.myget.org/f/dotnet-core/api/v3/index.json\" />\n<add key=\"roslyn myget\" value=\"https://dotnet.myget.org/f/roslyn/api/v3/index.json\" />\n<add key=\"Interactive Window\" value=\"https://dotnet.myget.org/f/interactive-window/api/v3/index.json\" />\n- <add key=\"VSSDK Preview\" value=\"https://vside.myget.org/F/vssdk/api/v3/index.json\" />\n+ <add key=\"VSSDK Preview\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Updated VsSDK Preview Nuget feed
|
410,201 |
20.09.2019 16:24:51
| 25,200 |
5253977cb44fadb179f6cd0daf6e6238b22fa4ce
|
Added option to add NTVS to those who already have VS
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,10 +19,13 @@ and Enterprise.\nTo install, run the [normal VS installer](https://visualstudio.com/vs/downloads?wt.mc_id=github_microsoft_com)\nand select the **Node.js development workload**.\n+If you have VS and need to add the **Node.js development workload** follow this [documentation](https://docs.microsoft.com/en-us/visualstudio/install/modify-visual-studio?view=vs-2019)\n+\n## Visual Studio 2017 installation\nFor Visual Studio 2017 Community, Professional and Enterprise, run the [2017 VS installer](https://visualstudio.microsoft.com/vs/older-downloads/) and choose the Node.js development workload. Please note you will need a Visual Studio Subscription to access this.\n+If you have VS and need to add the **Node.js development workload** follow this [documentation](https://docs.microsoft.com/en-us/visualstudio/install/modify-visual-studio?view=vs-2017)\n## Visual Studio 2015 and earlier\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added option to add NTVS to those who already have VS
|
410,202 |
03.10.2019 15:41:02
| 25,200 |
4f3ba6e1edbe0df07a4aba1eb0fc43b51f8adf1c
|
Fixed project properties that are not marked as dirty when edited
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPageControl.Designer.cs",
"diff": "this._workingDir.Name = \"_workingDir\";\nthis._workingDir.Size = new System.Drawing.Size(228, 20);\nthis._workingDir.TabIndex = 7;\n+ this._workingDir.TextChanged += new System.EventHandler(this.Changed);\nthis._workingDir.LostFocus += new System.EventHandler(this.WorkingDirChanged);\n//\n// _browseDirectory\nthis._nodejsPort.Name = \"_nodejsPort\";\nthis._nodejsPort.Size = new System.Drawing.Size(105, 20);\nthis._nodejsPort.TabIndex = 12;\n+ this._nodejsPort.TextChanged += new System.EventHandler(this.Changed);\nthis._nodejsPort.LostFocus += new System.EventHandler(this.PortChanged);\n//\n// _envVars\nthis._nodeExePath.Name = \"_nodeExePath\";\nthis._nodeExePath.Size = new System.Drawing.Size(228, 20);\nthis._nodeExePath.TabIndex = 17;\n+ this._nodeExePath.TextChanged += new System.EventHandler(this.Changed);\nthis._nodeExePath.LostFocus += new System.EventHandler(this.NodeExePathChanged);\n//\n// _browsePath\nthis._debuggerPort.Name = \"_debuggerPort\";\nthis._debuggerPort.Size = new System.Drawing.Size(105, 20);\nthis._debuggerPort.TabIndex = 21;\n+ this._debuggerPort.TextChanged += new System.EventHandler(this.Changed);\nthis._debuggerPort.LostFocus += new System.EventHandler(this.PortChanged);\n//\n// testHeaderTableLayoutPanel\nthis._testRoot.Name = \"_testRoot\";\nthis._testRoot.Size = new System.Drawing.Size(228, 20);\nthis._testRoot.TabIndex = 27;\n+ this._testRoot.TextChanged += new System.EventHandler(this.Changed);\n//\n// _browseTestroot\n//\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed project properties that are not marked as dirty when edited
|
410,220 |
05.11.2019 12:19:53
| 28,800 |
d959cae71585eec2410b7f1aebe42dbe5b8d3267
|
Update templates to be lint-clean under new default config
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/AzureNodejsWorker/worker.js",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/AzureNodejsWorker/worker.js",
"diff": "*/\n'use strict';\n-while (true) {\n+while (true) { // eslint-disable-line no-constant-condition\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts",
"diff": "@@ -5,7 +5,7 @@ import path = require('path');\nimport routes from './routes/index';\nimport users from './routes/user';\n-var app = express();\n+const app = express();\n// view engine setup\napp.set('views', path.join(__dirname, 'views'));\n@@ -17,8 +17,8 @@ app.use('/', routes);\napp.use('/users', users);\n// catch 404 and forward to error handler\n-app.use(function (req, res, next) {\n- var err = new Error('Not Found');\n+app.use((req, res, next) => {\n+ const err = new Error('Not Found');\nerr['status'] = 404;\nnext(err);\n});\n@@ -28,7 +28,7 @@ app.use(function (req, res, next) {\n// development error handler\n// will print stacktrace\nif (app.get('env') === 'development') {\n- app.use((err: any, req, res, next) => {\n+ app.use((err, req, res, next) => { // eslint-disable-line @typescript-eslint/no-unused-vars\nres.status(err['status'] || 500);\nres.render('error', {\nmessage: err.message,\n@@ -39,7 +39,7 @@ if (app.get('env') === 'development') {\n// production error handler\n// no stacktraces leaked to user\n-app.use((err: any, req, res, next) => {\n+app.use((err, req, res, next) => { // eslint-disable-line @typescript-eslint/no-unused-vars\nres.status(err.status || 500);\nres.render('error', {\nmessage: err.message,\n@@ -49,6 +49,6 @@ app.use((err: any, req, res, next) => {\napp.set('port', process.env.PORT || 3000);\n-var server = app.listen(app.get('port'), function () {\n+const server = app.listen(app.get('port'), function () {\ndebug('Express server listening on port ' + server.address().port);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorker/server.ts",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorker/server.ts",
"diff": "* Worker roles run asynchronous, long-running, or perpetual\n* tasks independent of user interaction or input.\n*/\n-while (true) {\n+while (true) { // eslint-disable-line no-constant-condition\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/server.ts",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/server.ts",
"diff": "import http = require('http');\n-var port = process.env.port || 1337\n+const port = process.env.port || 1337\nhttp.createServer(function (req, res) {\nres.writeHead(200, { 'Content-Type': 'text/plain' });\nres.end('Hello World\\n');\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebRole/server.ts",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebRole/server.ts",
"diff": "import http = require('http');\n-var port = process.env.port || 1337\n+const port = process.env.port || 1337\nhttp.createServer(function (req, res) {\nres.writeHead(200, { 'Content-Type': 'text/plain' });\nres.end('Hello World\\n');\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts",
"diff": "@@ -5,7 +5,7 @@ import path = require('path');\nimport routes from './routes/index';\nimport users from './routes/user';\n-var app = express();\n+const app = express();\n// view engine setup\napp.set('views', path.join(__dirname, 'views'));\n@@ -17,8 +17,8 @@ app.use('/', routes);\napp.use('/users', users);\n// catch 404 and forward to error handler\n-app.use(function (req, res, next) {\n- var err = new Error('Not Found');\n+app.use((req, res, next) => {\n+ const err = new Error('Not Found');\nerr['status'] = 404;\nnext(err);\n});\n@@ -28,7 +28,7 @@ app.use(function (req, res, next) {\n// development error handler\n// will print stacktrace\nif (app.get('env') === 'development') {\n- app.use((err: any, req, res, next) => {\n+ app.use((err, req, res, next) => { // eslint-disable-line @typescript-eslint/no-unused-vars\nres.status(err['status'] || 500);\nres.render('error', {\nmessage: err.message,\n@@ -39,7 +39,7 @@ if (app.get('env') === 'development') {\n// production error handler\n// no stacktraces leaked to user\n-app.use((err: any, req, res, next) => {\n+app.use((err, req, res, next) => { // eslint-disable-line @typescript-eslint/no-unused-vars\nres.status(err.status || 500);\nres.render('error', {\nmessage: err.message,\n@@ -49,6 +49,6 @@ app.use((err: any, req, res, next) => {\napp.set('port', process.env.PORT || 3000);\n-var server = app.listen(app.get('port'), function () {\n+const server = app.listen(app.get('port'), function () {\ndebug('Express server listening on port ' + server.address().port);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/server.ts",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/server.ts",
"diff": "import http = require('http');\n-var port = process.env.port || 1337\n+const port = process.env.port || 1337\nhttp.createServer(function (req, res) {\nres.writeHead(200, { 'Content-Type': 'text/plain' });\nres.end('Hello World\\n');\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update templates to be lint-clean under new default config
|
410,220 |
06.12.2019 09:31:08
| 28,800 |
ebc0d7723715902484464175245e2c7193c0100f
|
add jsx and tsx extensions
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/main.yml",
"new_path": ".github/workflows/main.yml",
"diff": "@@ -10,4 +10,4 @@ jobs:\n- name: Lint template files\nuses: \"stefanoeb/eslint-action@master\"\nwith:\n- args: \"Nodejs/Product/Nodejs/ProjectTemplates/**/*.js Nodejs/Product/Nodejs/ProjectTemplates/**/*.ts Nodejs/Product/Nodejs/Templates/**/*.js Nodejs/Product/Nodejs/Templates/**/*.ts\"\n+ args: \"Nodejs/Product/Nodejs/ProjectTemplates/**/*.js Nodejs/Product/Nodejs/ProjectTemplates/**/*.jsx Nodejs/Product/Nodejs/ProjectTemplates/**/*.ts Nodejs/Product/Nodejs/ProjectTemplates/**/*.tsx Nodejs/Product/Nodejs/Templates/**/*.js Nodejs/Product/Nodejs/Templates/**/*.jsx Nodejs/Product/Nodejs/Templates/**/*.ts Nodejs/Product/Nodejs/Templates/**/*.tsx\"\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
add jsx and tsx extensions
|
410,220 |
11.12.2019 15:02:55
| 28,800 |
fc283c3381bae3527d15347e0779685cdeab08c1
|
remove github workflow file
|
[
{
"change_type": "DELETE",
"old_path": ".github/workflows/main.yml",
"new_path": null,
"diff": "-name: CI\n-\n-on: [push]\n-\n-jobs:\n- build:\n- runs-on: ubuntu-latest\n- steps:\n- - uses: actions/checkout@v1\n- - name: Lint template files\n- uses: \"stefanoeb/eslint-action@master\"\n- with:\n- args: \"Nodejs/Product/Nodejs/ProjectTemplates/**/*.js Nodejs/Product/Nodejs/ProjectTemplates/**/*.ts Nodejs/Product/Nodejs/Templates/**/*.js Nodejs/Product/Nodejs/Templates/**/*.jsx Nodejs/Product/Nodejs/Templates/**/*.ts Nodejs/Product/Nodejs/Templates/**/*.tsx\"\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
remove github workflow file
|
410,220 |
11.12.2019 15:40:37
| 28,800 |
7f6e271cf1c709c051e8e470c7035efa5c6150f8
|
add react as dev dependency
|
[
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "\"integrity\": \"sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==\",\n\"dev\": true\n},\n+ \"react\": {\n+ \"version\": \"16.12.0\",\n+ \"resolved\": \"https://registry.npmjs.org/react/-/react-16.12.0.tgz\",\n+ \"integrity\": \"sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"loose-envify\": \"^1.1.0\",\n+ \"object-assign\": \"^4.1.1\",\n+ \"prop-types\": \"^15.6.2\"\n+ }\n+ },\n\"react-is\": {\n\"version\": \"16.12.0\",\n\"resolved\": \"https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"eslint-plugin-promise\": \"4.2.1\",\n\"eslint-plugin-react\": \"7.16.0\",\n\"eslint-plugin-vue\": \"^6.0.1\",\n+ \"react\": \"^16.12.0\",\n\"typescript\": \"3.6.4\"\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
add react as dev dependency
|
410,212 |
14.01.2020 11:37:53
| 28,800 |
4737ef9f2249d8b9e0b7ce409bad25344b6c1551
|
Fixing the LiveShare null reference exception
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Workspace/PackageJsonTestContainerDiscoverer.cs",
"new_path": "Nodejs/Product/Nodejs/Workspace/PackageJsonTestContainerDiscoverer.cs",
"diff": "@@ -66,6 +66,11 @@ namespace Microsoft.NodejsTools.Workspace\nif (workspace != null)\n{\nvar indexService = workspace.GetIndexWorkspaceService();\n+ // This returns null for LiveShare workspace so adding a check.\n+ // TestExplorer support with LiveShare is currently only enabled for LiveShare insiders and is still a little buggy for C#.\n+ // We should revisit this to light it up when it becomes stable.\n+ if (indexService != null)\n+ {\nvar filesDataValues = await indexService.GetFilesDataValuesAsync<string>(NodejsConstants.TestRootDataValueGuid);\nlock (this.containerLock)\n@@ -84,6 +89,7 @@ namespace Microsoft.NodejsTools.Workspace\n}\n}\n}\n+ }\nthis.TestContainersUpdated?.Invoke(this, EventArgs.Empty);\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixing the LiveShare null reference exception
|
410,211 |
13.02.2020 17:09:04
| 28,800 |
7413d46248c080ee28a8a881171fc9bf38485ffa
|
launching v3 debugger under a feature flag
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.5.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime\">\n+ <Version>14.0.25023-setup</Version>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n<Version>16.0.1</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -25,6 +25,7 @@ using Microsoft.VisualStudio;\nusing Microsoft.VisualStudio.Shell;\nusing Microsoft.VisualStudio.Shell.Interop;\nusing Microsoft.VisualStudioTools.Project;\n+using Microsoft.Internal.VisualStudio.Shell.Interop;\nusing Newtonsoft.Json.Linq;\nnamespace Microsoft.NodejsTools.Project\n@@ -35,6 +36,7 @@ namespace Microsoft.NodejsTools.Project\nprivate int? _testServerPort;\ninternal static readonly Guid WebKitDebuggerV2Guid = Guid.Parse(\"30d423cc-6d0b-4713-b92d-6b2a374c3d89\");\n+ internal static readonly Guid JsCdpDebuggerV3Guid = Guid.Parse(\"394120B6-2FF9-4D0D-8953-913EF5CD0BCD\");\npublic NodejsProjectLauncher(NodejsProjectNode project)\n{\n@@ -215,6 +217,12 @@ namespace Microsoft.NodejsTools.Project\nreturn builder.ToString();\n}\n+ internal static bool ShouldUseV3CdpDebugger()\n+ {\n+ var featureFlagsService = (IVsFeatureFlags)ServiceProvider.GlobalProvider.GetService(typeof(SVsFeatureFlags));\n+ return featureFlagsService != null && featureFlagsService.IsFeatureEnabled(\"JavaScript.Debugger.V3CdpDebugAdapter\", false);\n+ }\n+\nprivate int TestServerPort\n{\nget\n@@ -280,7 +288,7 @@ namespace Microsoft.NodejsTools.Project\nvar debugTargets = new[] {\nnew VsDebugTargetInfo4() {\ndlo = (uint)DEBUG_LAUNCH_OPERATION.DLO_CreateProcess,\n- guidLaunchDebugEngine = WebKitDebuggerV2Guid,\n+ guidLaunchDebugEngine = ShouldUseV3CdpDebugger() ? JsCdpDebuggerV3Guid : WebKitDebuggerV2Guid,\nbstrExe = file,\nbstrOptions = jsonContent\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Workspace/JsFileDebugLaunchTargetProvider.cs",
"new_path": "Nodejs/Product/Nodejs/Workspace/JsFileDebugLaunchTargetProvider.cs",
"diff": "@@ -86,7 +86,7 @@ namespace Microsoft.NodejsTools.Workspace\nvar jsonContent = GetJsonConfigurationForInspectProtocol(target, cwd, nodeExe, debugLaunchContext);\nvsDebugTargetInfo.dlo = DEBUG_LAUNCH_OPERATION.DLO_CreateProcess;\n- vsDebugTargetInfo.clsidCustom = NodejsProjectLauncher.WebKitDebuggerV2Guid;\n+ vsDebugTargetInfo.clsidCustom = NodejsProjectLauncher.ShouldUseV3CdpDebugger() ? NodejsProjectLauncher.JsCdpDebuggerV3Guid : NodejsProjectLauncher.WebKitDebuggerV2Guid;\nvsDebugTargetInfo.bstrOptions = jsonContent;\nvsDebugTargetInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Workspace/NodeJsDebugLaunchTargetProvider.cs",
"new_path": "Nodejs/Product/Nodejs/Workspace/NodeJsDebugLaunchTargetProvider.cs",
"diff": "@@ -91,7 +91,7 @@ namespace Microsoft.NodejsTools.Workspace\nvar jsonContent = GetJsonConfigurationForInspectProtocol(target, cwd, nodeExe, debugLaunchContext);\nvsDebugTargetInfo.dlo = (uint)DEBUG_LAUNCH_OPERATION.DLO_CreateProcess;\n- vsDebugTargetInfo.guidLaunchDebugEngine = NodejsProjectLauncher.WebKitDebuggerV2Guid;\n+ vsDebugTargetInfo.guidLaunchDebugEngine = NodejsProjectLauncher.ShouldUseV3CdpDebugger() ? NodejsProjectLauncher.JsCdpDebuggerV3Guid : NodejsProjectLauncher.WebKitDebuggerV2Guid;\nvsDebugTargetInfo.bstrOptions = jsonContent;\nvsDebugTargetInfo.LaunchFlags = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<add key=\"roslyn myget\" value=\"https://dotnet.myget.org/f/roslyn/api/v3/index.json\" />\n<add key=\"Interactive Window\" value=\"https://dotnet.myget.org/f/interactive-window/api/v3/index.json\" />\n<add key=\"VSSDK Preview\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n+ <add key=\"vs-impl\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
launching v3 debugger under a feature flag
|
410,211 |
27.02.2020 17:40:35
| 28,800 |
ea53b0b9698f7f836823e4431dd17d1a47c63ec7
|
launching node using tools option
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -24,6 +24,7 @@ using Microsoft.NodejsTools.TypeScript;\nusing Microsoft.VisualStudio;\nusing Microsoft.VisualStudio.Shell;\nusing Microsoft.VisualStudio.Shell.Interop;\n+using Microsoft.VisualStudio.Settings;\nusing Microsoft.VisualStudioTools.Project;\nusing Microsoft.Internal.VisualStudio.Shell.Interop;\nusing Newtonsoft.Json.Linq;\n@@ -223,10 +224,23 @@ namespace Microsoft.NodejsTools.Project\nGuid WebKitDebuggerV2Guid = Guid.Parse(\"30d423cc-6d0b-4713-b92d-6b2a374c3d89\");\nGuid JsCdpDebuggerV3Guid = Guid.Parse(\"394120B6-2FF9-4D0D-8953-913EF5CD0BCD\");\n- var featureFlagsService = (IVsFeatureFlags)ServiceProvider.GlobalProvider.GetService(typeof(SVsFeatureFlags));\n- return (featureFlagsService != null && featureFlagsService.IsFeatureEnabled(\"JavaScript.Debugger.V3CdpDebugAdapter\", false)) ?\n- JsCdpDebuggerV3Guid :\n- WebKitDebuggerV2Guid;\n+ var userRegistryRoot = VSRegistry.RegistryRoot(__VsLocalRegistryType.RegType_UserSettings, writable: false);\n+ try\n+ {\n+ object userDebuggerOption = userRegistryRoot.OpenSubKey(\"Debugger\")?.GetValue(\"EnableJavaScriptMultitargetDebugging\");\n+ if (userDebuggerOption == null)\n+ {\n+ return WebKitDebuggerV2Guid;\n+ }\n+ else\n+ {\n+ return ((int) userDebuggerOption != 0) ? JsCdpDebuggerV3Guid : WebKitDebuggerV2Guid;\n+ }\n+ }\n+ catch (Exception e)\n+ {\n+ return WebKitDebuggerV2Guid;\n+ }\n}\nprivate int TestServerPort\n@@ -287,7 +301,9 @@ namespace Microsoft.NodejsTools.Project\nnew JProperty(\"env\", JObject.FromObject(envVars)),\nnew JProperty(\"trace\", CheckEnableDiagnosticLoggingOption()),\nnew JProperty(\"sourceMaps\", true),\n- new JProperty(\"stopOnEntry\", true));\n+ new JProperty(\"stopOnEntry\", true),\n+ new JProperty(\"url\", webBrowserUrl));\n+\nvar jsonContent = configuration.ToString();\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
launching node using tools option
|
410,211 |
27.02.2020 17:50:58
| 28,800 |
ab24a7f503c75e67c2a096f435668776fa1422d4
|
Update Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -237,7 +237,7 @@ namespace Microsoft.NodejsTools.Project\nreturn ((int) userDebuggerOption != 0) ? JsCdpDebuggerV3Guid : WebKitDebuggerV2Guid;\n}\n}\n- catch (Exception e)\n+ catch (Exception)\n{\nreturn WebKitDebuggerV2Guid;\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs
Co-Authored-By: Armando Aguirre <armanio123@gmail.com>
|
410,211 |
05.03.2020 10:26:04
| 28,800 |
7dc4f8e27baa37d867fe68277db07d35b44aee1e
|
moving launching of browser to v3 debug debug adapter
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -28,6 +28,7 @@ using Microsoft.VisualStudio.Settings;\nusing Microsoft.VisualStudioTools.Project;\nusing Microsoft.Internal.VisualStudio.Shell.Interop;\nusing Newtonsoft.Json.Linq;\n+using Newtonsoft.Json;\nnamespace Microsoft.NodejsTools.Project\n{\n@@ -36,7 +37,8 @@ namespace Microsoft.NodejsTools.Project\nprivate readonly NodejsProjectNode _project;\nprivate int? _testServerPort;\n- private static Guid debuggerGuid = Guid.Empty;\n+ internal static readonly Guid WebKitDebuggerV2Guid = Guid.Parse(\"30d423cc-6d0b-4713-b92d-6b2a374c3d89\");\n+ internal static readonly Guid JsCdpDebuggerV3Guid = Guid.Parse(\"394120B6-2FF9-4D0D-8953-913EF5CD0BCD\");\npublic NodejsProjectLauncher(NodejsProjectNode project)\n{\n@@ -217,29 +219,24 @@ namespace Microsoft.NodejsTools.Project\nreturn builder.ToString();\n}\n- internal static Guid GetDebuggerGuid()\n+ internal static bool ShouldUseV3CdpDebugger()\n{\n- ThreadHelper.ThrowIfNotOnUIThread();\n-\n- Guid WebKitDebuggerV2Guid = Guid.Parse(\"30d423cc-6d0b-4713-b92d-6b2a374c3d89\");\n- Guid JsCdpDebuggerV3Guid = Guid.Parse(\"394120B6-2FF9-4D0D-8953-913EF5CD0BCD\");\n-\nvar userRegistryRoot = VSRegistry.RegistryRoot(__VsLocalRegistryType.RegType_UserSettings, writable: false);\ntry\n{\nobject userDebuggerOption = userRegistryRoot.OpenSubKey(\"Debugger\")?.GetValue(\"EnableJavaScriptMultitargetDebugging\");\nif (userDebuggerOption == null)\n{\n- return WebKitDebuggerV2Guid;\n+ return false;\n}\nelse\n{\n- return ((int) userDebuggerOption != 0) ? JsCdpDebuggerV3Guid : WebKitDebuggerV2Guid;\n+ return (int)userDebuggerOption != 0;\n}\n}\ncatch (Exception)\n{\n- return WebKitDebuggerV2Guid;\n+ return false;\n}\n}\n@@ -287,30 +284,40 @@ namespace Microsoft.NodejsTools.Project\nvar scriptArguments = ConvertArguments(this._project.GetProjectProperty(NodeProjectProperty.ScriptArguments));\nvar cwd = _project.GetWorkingDirectory(); // Current working directory\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\", file),\n- new JProperty(\"args\", scriptArguments),\n- new JProperty(\"runtimeExecutable\", nodePath),\n- new JProperty(\"runtimeArgs\", runtimeArguments),\n- new JProperty(\"port\", debuggerPort),\n- new JProperty(\"cwd\", cwd),\n- new JProperty(\"console\", \"externalTerminal\"),\n- new JProperty(\"env\", JObject.FromObject(envVars)),\n- new JProperty(\"trace\", CheckEnableDiagnosticLoggingOption()),\n- new JProperty(\"sourceMaps\", true),\n- new JProperty(\"stopOnEntry\", true),\n- new JProperty(\"url\", webBrowserUrl));\n-\n-\n- var jsonContent = configuration.ToString();\n+\n+ NodePinezorroDebugLaunchConfig config = new NodePinezorroDebugLaunchConfig(file,\n+ scriptArguments,\n+ nodePath,\n+ runtimeArguments,\n+ debuggerPort,\n+ cwd,\n+ CheckEnableDiagnosticLoggingOption(),\n+ JObject.FromObject(envVars));\n+\n+ bool usingV3Debugger = ShouldUseV3CdpDebugger();\n+\n+ if (usingV3Debugger && shouldStartBrowser && (browserPath.EndsWith(\"chrome.exe\") || browserPath.EndsWith(\"msedge.exe\")))\n+ {\n+ NodePinezorroDebugLaunchConfig newConfig = new NodePinezorroDebugLaunchConfig();\n+ newConfig.ConfigName = \"Debug Node program and browser from Visual Studio\";\n+ newConfig.Request = \"launch\";\n+ newConfig.DebugType = browserPath.EndsWith(\"chrome.exe\") ? \"chrome\" : \"edge\";\n+ newConfig.RuntimeExecutable = browserPath;\n+ newConfig.BrowserUrl = webBrowserUrl;\n+ newConfig.BrowserUserDataDir = true;\n+ newConfig.Environment = config.Environment;\n+ newConfig.Server = config.toPwaChromeServerConfig();\n+ shouldStartBrowser = false; // the v3 cdp debug adapter will launch the browser as part of debugging so no need to launch it here anymore\n+\n+ config = newConfig;\n+ }\n+\n+ var jsonContent = JObject.FromObject(config).ToString();\nvar debugTargets = new[] {\nnew VsDebugTargetInfo4() {\ndlo = (uint)DEBUG_LAUNCH_OPERATION.DLO_CreateProcess,\n- guidLaunchDebugEngine = GetDebuggerGuid(),\n+ guidLaunchDebugEngine = usingV3Debugger ? JsCdpDebuggerV3Guid : WebKitDebuggerV2Guid,\nbstrExe = file,\nbstrOptions = jsonContent\n}\n@@ -562,6 +569,99 @@ namespace Microsoft.NodejsTools.Project\n}\n}\n+ [JsonObject(ItemNullValueHandling = NullValueHandling.Ignore)]\n+ internal class NodePinezorroDebugLaunchConfig\n+ {\n+ public NodePinezorroDebugLaunchConfig() { }\n+\n+ public NodePinezorroDebugLaunchConfig (string program,\n+ string[] programArgs,\n+ string runtimeExecutable,\n+ string[] runtimeArgs,\n+ string port,\n+ string currWorkingDir,\n+ bool trace,\n+ object environmentSettings = null)\n+ {\n+ this.ConfigName = \"Debug Node.js program from Visual Studio\";\n+ this.Request = \"launch\";\n+ this.DebugType = \"node2\";\n+ this.Console = \"externalTerminal\";\n+ this.Program = program;\n+ this.ProgramArgs = programArgs;\n+ this.RuntimeExecutable = runtimeExecutable;\n+ this.RuntimeArgs = runtimeArgs;\n+ this.Port = port;\n+ this.WorkingDir = currWorkingDir;\n+ this.Environment = environmentSettings;\n+ this.Trace = trace;\n+ }\n+\n+ [JsonProperty(\"name\")]\n+ public string ConfigName { get; set; }\n+\n+ [JsonProperty(\"type\")]\n+ public string DebugType { get; set; }\n+\n+ [JsonProperty(\"request\")]\n+ public string Request { get; set; }\n+\n+ [JsonProperty(\"program\")]\n+ public string Program { get; set; }\n+\n+ [JsonProperty(\"args\")]\n+ public string[] ProgramArgs { get; set; }\n+\n+ [JsonProperty(\"runtimeExecutable\")]\n+ public string RuntimeExecutable { get; set; }\n+\n+ [JsonProperty(\"runtimeArgs\")]\n+ public string[] RuntimeArgs { get; set; }\n+\n+ [JsonProperty(\"port\")]\n+ public string Port { get; set; }\n+\n+ [JsonProperty(\"cwd\")]\n+ public string WorkingDir { get; set; }\n+\n+ [JsonProperty(\"console\")]\n+ public string Console { get; set; }\n+\n+ [JsonProperty(\"env\")]\n+ public object Environment { get; set; }\n+\n+ [JsonProperty(\"trace\")]\n+ public bool Trace { get; set; }\n+\n+ [JsonProperty(\"sourceMaps\")]\n+ public bool SourceMaps { get; set; } = true;\n+\n+ [JsonProperty(\"stopOnEntry\")]\n+ public bool StopOnEntry { get; set; } = true;\n+\n+ [JsonProperty(\"url\")]\n+ public string BrowserUrl { get; set; }\n+\n+ [JsonProperty(\"server\")]\n+ public object Server { get; set; }\n+\n+ [JsonProperty(\"sourceMapPathOverrides\")]\n+ public string[] SourceMapPathOverrides { get; set; }\n+\n+ [JsonProperty(\"restart\")]\n+ public bool RestartPolicy { get; set; }\n+\n+ [JsonProperty(\"userDataDir\")]\n+ public object BrowserUserDataDir { get; set; } = null;\n+\n+ public object toPwaChromeServerConfig()\n+ {\n+ this.Console = \"internalConsole\";\n+ this.SourceMapPathOverrides = new string[0];\n+ return this;\n+ }\n+ }\n+\ninternal class OnPortOpenedHandler\n{\nprivate class OnPortOpenedInfo\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Workspace/JsFileDebugLaunchTargetProvider.cs",
"new_path": "Nodejs/Product/Nodejs/Workspace/JsFileDebugLaunchTargetProvider.cs",
"diff": "@@ -86,7 +86,7 @@ namespace Microsoft.NodejsTools.Workspace\nvar jsonContent = GetJsonConfigurationForInspectProtocol(target, cwd, nodeExe, debugLaunchContext);\nvsDebugTargetInfo.dlo = DEBUG_LAUNCH_OPERATION.DLO_CreateProcess;\n- vsDebugTargetInfo.clsidCustom = NodejsProjectLauncher.GetDebuggerGuid();\n+ vsDebugTargetInfo.clsidCustom = NodejsProjectLauncher.ShouldUseV3CdpDebugger() ? NodejsProjectLauncher.JsCdpDebuggerV3Guid : NodejsProjectLauncher.WebKitDebuggerV2Guid;\nvsDebugTargetInfo.bstrOptions = jsonContent;\nvsDebugTargetInfo.grfLaunch = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Workspace/LaunchDebugTargetProvider.cs",
"new_path": "Nodejs/Product/Nodejs/Workspace/LaunchDebugTargetProvider.cs",
"diff": "@@ -67,22 +67,16 @@ namespace Microsoft.NodejsTools.Workspace\nruntimeArguments = runtimeArguments.Append($\"--inspect-brk={debuggerPort}\");\nvar scriptArguments = ConvertArguments(debugLaunchContext.LaunchConfiguration.GetValue<string>(ScriptArgsKey, defaultValue: null));\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(\"args\", scriptArguments),\n- new JProperty(\"runtimeExecutable\", nodeExe),\n- new JProperty(\"runtimeArgs\", runtimeArguments),\n- new JProperty(\"port\", debuggerPort),\n- new JProperty(\"cwd\", workingDir),\n- new JProperty(\"console\", \"externalTerminal\"),\n- new JProperty(\"trace\", NodejsProjectLauncher.CheckEnableDiagnosticLoggingOption()),\n- new JProperty(\"sourceMaps\", true),\n- new JProperty(\"stopOnEntry\", true));\n+ NodePinezorroDebugLaunchConfig launchConfig = new NodePinezorroDebugLaunchConfig(target,\n+ scriptArguments,\n+ nodeExe,\n+ runtimeArguments,\n+ debuggerPort.ToString(),\n+ workingDir,\n+ NodejsProjectLauncher.CheckEnableDiagnosticLoggingOption());\n- return configuration.ToString();\n+\n+ return JObject.FromObject(launchConfig).ToString();\n}\nprotected static string[] ConvertArguments(string argumentString)\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Workspace/NodeJsDebugLaunchTargetProvider.cs",
"new_path": "Nodejs/Product/Nodejs/Workspace/NodeJsDebugLaunchTargetProvider.cs",
"diff": "@@ -91,7 +91,7 @@ namespace Microsoft.NodejsTools.Workspace\nvar jsonContent = GetJsonConfigurationForInspectProtocol(target, cwd, nodeExe, debugLaunchContext);\nvsDebugTargetInfo.dlo = (uint)DEBUG_LAUNCH_OPERATION.DLO_CreateProcess;\n- vsDebugTargetInfo.guidLaunchDebugEngine = NodejsProjectLauncher.GetDebuggerGuid();\n+ vsDebugTargetInfo.guidLaunchDebugEngine = NodejsProjectLauncher.ShouldUseV3CdpDebugger() ? NodejsProjectLauncher.JsCdpDebuggerV3Guid : NodejsProjectLauncher.WebKitDebuggerV2Guid;\nvsDebugTargetInfo.bstrOptions = jsonContent;\nvsDebugTargetInfo.LaunchFlags = (uint)__VSDBGLAUNCHFLAGS.DBGLAUNCH_StopDebuggingOnEnd;\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
moving launching of browser to v3 debug debug adapter
|
410,211 |
09.03.2020 14:43:35
| 25,200 |
bce12b79d59053ff89163bafd5bfffd8b2e2b092
|
removing unnecessary library
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.5.0</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime\">\n- <Version>14.0.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n<Version>16.0.1</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<add key=\"roslyn myget\" value=\"https://dotnet.myget.org/f/roslyn/api/v3/index.json\" />\n<add key=\"Interactive Window\" value=\"https://dotnet.myget.org/f/interactive-window/api/v3/index.json\" />\n<add key=\"VSSDK Preview\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n- <add key=\"vs-impl\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
removing unnecessary library
|
410,202 |
30.04.2020 17:50:16
| 25,200 |
4ebcbad068c4deffedf89c90785275d3b3a39312
|
Added discovery test adapter
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"diff": "+//@ts-check\n+\n+function itReplacement(it) {\n+ return (description, testFunction, timeout) => {\n+ const spec = it(description, testFunction, timeout);\n+ spec.result.fileLocation = getFileLocation();\n+\n+ return spec;\n+ };\n+}\n+\n+function getFileLocation() {\n+ const stackLineRegex = /at.*\\(.*_karma_webpack_(.*\\.spec\\.ts):(\\d*):(\\d*)/;\n+ const match = (new Error()).stack.match(stackLineRegex);\n+\n+ return match\n+ ? {\n+ relativeFilePath: match[1], // Relative to root. This is due to webpack.\n+ line: match[2],\n+ column: match[3]\n+ }\n+ : null;\n+}\n+\n+var myReporter = {\n+ specDone: function (result) {\n+ console.log(JSON.stringify(result));\n+ }\n+};\n+\n+jasmine.getEnv().addReporter(myReporter);\n+jasmine.getEnv().it = itReplacement(jasmine.getEnv().it);\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/find_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/find_tests.js",
"diff": "-var fs = require(\"fs\");\n-var framework;\n+const fs = require(\"fs\");\n+\n+let framework;\ntry {\nframework = require('./' + process.argv[2] + '/' + process.argv[2] + '.js');\n} catch (exception) {\nconsole.log(\"NTVS_ERROR:Failed to load TestFramework (\" + process.argv[2] + \"), \" + exception);\nprocess.exit(1);\n}\n+\ntry {\nvar testFilesListInputFile = process.argv[3];\nif (!fs.existsSync(testFilesListInputFile)) {\n@@ -24,4 +26,3 @@ try {\nconsole.log(\"NTVS_ERROR:TestFramework (\" + process.argv[2] + \") threw an exception processing (\" + process.argv[3] + \"), \" + exception);\nprocess.exit(1);\n}\n\\ No newline at end of file\n-process.exit(0);\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added discovery test adapter
|
410,202 |
06.05.2020 15:30:44
| 25,200 |
749aa668a2e5f796a71d8e83cc2e5ddc9e00cf77
|
Added execution adapter
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"diff": "@@ -20,7 +20,6 @@ const find_tests = function (configFiles, discoverResultFile, projectFolder) {\nconst projectPath = path.dirname(configFile);\nconst karmaConfigPath = path.resolve(projectPath, `./${karmaConfigName}`);\n- // process.chdir(configPath);\nif (!fs.existsSync(karmaConfigPath)) {\nlogError(`Failed to find \"${karmaConfigName}\" file. The \"${karmaConfigName}\" file must exists in the same path as the \"angular.json\" file.`);\ncontinue;\n@@ -28,6 +27,8 @@ const find_tests = function (configFiles, discoverResultFile, projectFolder) {\n// Set the environment variable to share it across processes.\nprocess.env.PROJECTPATH = projectPath;\n+ process.env.TESTCASES = JSON.stringify([{ fullTitle: \"NTVS_Discovery_ThisStringShouldExcludeAllTestCases\" }]);\n+ process.env.ISDISCOVERY = 'true';\n// TODO: Handle npx or some other way to run ng not using the node_modules path.\nconst ngTest = spawn(\n@@ -40,6 +41,7 @@ const find_tests = function (configFiles, discoverResultFile, projectFolder) {\n{\ncwd: projectPath,\nshell: true,\n+ stdio: ['pipe', 'ipc', 'pipe']\n});\n// TODO: Handle multiple projects. aka. multiple spawns running.\n@@ -51,25 +53,93 @@ const find_tests = function (configFiles, discoverResultFile, projectFolder) {\n// shell: true,\n// });\n- let data = \"\";\n- ngTest.stdout.on('data', (chunk) => {\n- data += chunk\n+ const testsDiscovered = [];\n+\n+ ngTest.on('message', message => {\n+ testsDiscovered.push(message);\n});\n- ngTest.stdout.on('end', () => {\n+ ngTest.on('exit', () => {\nconst fd = fs.openSync(discoverResultFile, 'w');\n- fs.writeSync(fd, data);\n+ fs.writeSync(fd, JSON.stringify(testsDiscovered));\nfs.closeSync(fd);\nresolve();\n});\n};\n});\n-\n}\nconst run_tests = function (context) {\n- throw new Error('Not implemented');\n+ const projectFolder = context.testCases[0].projectFolder;\n+\n+ // TODO: Send the configuration path along with the test cases.\n+ const configFile = \"C:/Users/araguir/source/repos/AngularNTVSSample/AngularNTVSSample/angular.json\";\n+\n+ for (const testCase of context.testCases) {\n+ context.post({\n+ type: 'test start',\n+ fullyQualifiedName: testCase.fullyQualifiedName\n+ });\n+ }\n+\n+ return new Promise(async resolve => {\n+ const angular = detectPackage(projectFolder, '@angular/cli');\n+ if (!angular) {\n+ return;\n+ }\n+\n+ const projectPath = path.dirname(configFile);\n+ const karmaConfigPath = path.resolve(projectPath, `./${karmaConfigName}`);\n+\n+ if (!fs.existsSync(karmaConfigPath)) {\n+ logError(`Failed to find \"${karmaConfigName}\" file. The \"${karmaConfigName}\" file must exists in the same path as the \"angular.json\" file.`);\n+ return;\n+ }\n+\n+ // Set the environment variable to share it across processes.\n+ process.env.PROJECTPATH = projectPath;\n+ process.env.TESTCASES = JSON.stringify(context.testCases);\n+\n+ // TODO: Handle npx or some other way to run ng not using the node_modules path.\n+ const ngTest = spawn(\n+ 'E:/NodeJS/node-v13.11.0-win-x64/node.exe',\n+ [\n+ path.resolve(projectPath, \"./node_modules/@angular/cli/bin/ng\"),\n+ 'test',\n+ `--karmaConfig=\"${vsKarmaConfigPath}\"`\n+ ],\n+ {\n+ cwd: projectPath,\n+ shell: true,\n+ stdio: ['pipe', 'ipc', 'pipe']\n+ });\n+\n+ // TODO: Handle multiple projects. aka. multiple spawns running.\n+ // const ngTest = spawn(\n+ // 'npx',\n+ // ['ng', 'test', `--karmaConfig=\"${vsKarmaConfigPath}\"`],\n+ // {\n+ // cwd: projectPath,\n+ // shell: true,\n+ // });\n+\n+ ngTest.on(\"message\", message => {\n+ context.post({\n+ type: message.pending ? 'pending' : 'result',\n+ fullyQualifiedName: context.getFullyQualifiedName(message.fullName),\n+ result: message\n+ });\n+ });\n+\n+ ngTest.on('exit', () => {\n+ context.post({\n+ type: 'end'\n+ });\n+\n+ resolve();\n+ });\n+ });\n}\nfunction detectPackage(projectFolder, packageName) {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"diff": "@@ -23,7 +23,7 @@ function getFileLocation() {\n}\nvar myReporter = {\n- specDone: function (result) {\n+ specDone: result => {\nconsole.log(JSON.stringify(result));\n}\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"diff": "@@ -4,6 +4,8 @@ const http = require('http');\nconst path = require('path');\nconst jasmineReporterPath = path.resolve(process.env.VSTESTADAPTERPATH, 'jasmineReporter.js');\n+const testCases = JSON.parse(process.env.TESTCASES);\n+const isDiscovery = process.env.ISDISCOVERY === 'true';\nconst vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter) {\nbaseReporterDecorator(this);\n@@ -16,14 +18,16 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nwatched: false\n});\n- const testList = [];\n-\n// TODO: Is there a better option than onBrowserLog?\nthis.onBrowserLog = (browser, browserLog, type) => {\n- // TODO: handle status \"Excluded\";\nconst cleaned = browserLog.substring(1, browserLog.length - 1); // Remove extra quote at start and end\nconst result = JSON.parse(cleaned);\n+ // If not discovering, ignore all excluded tests. Jasmine reports the test as excluded if it was not marked for execution.\n+ if (!isDiscovery && result.status === \"excluded\") {\n+ return;\n+ }\n+\nconst fullFilePath = `${process.env.PROJECTPATH}${result.fileLocation.relativeFilePath}`;\nconst suite = result.fullName.substring(0, result.fullName.length - result.description.length - 1);\n@@ -33,7 +37,7 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n}\n// Handles both scenarios, discovery and execution.\n- testList.push({\n+ process.send({\n// Discovery properties\nname: result.description,\nsuite,\n@@ -44,7 +48,7 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n// Execution properties\npassed: result.status === \"passed\",\npending: result.status === \"disabled\" || result.status === \"pending\",\n- fullyQualifiedName: `${result.fileLocation.relativeFilePath}::${suite}::${result.description}`,\n+ fullName: result.fullName,\nstderr: errorLog\n});\n@@ -52,16 +56,32 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n}\nthis.onRunComplete = (browsers, results) => {\n- console.log(JSON.stringify(testList));\n-\nlog.debug(`onRunComplete: ${JSON.stringify(results)}`);\n- // We need to exit the process as angular keeps listening, so it never emits an 'end' event.\n+ const testCase = testCases.pop();\n+ if (testCase) {\n+ runTestCase(testCase);\n+ } else {\n+ // We need to exit the process as angular keeps it running and to emit the 'exit' event.\nprocess.exit();\n}\n+ }\n+\n+ let hasStarted = false;\n// Check when browser is ready to request a run.\nemitter.on(\"browsers_ready\", () => {\n+ // There's Scenario that I'm not sure how to repro where the browser do something (refresh? crashes?)\n+ // and we get the event again. We only want to executed it once.\n+ if (!hasStarted) {\n+ hasStarted = true;\n+\n+ // At least one test case should exists.\n+ runTestCase(testCases.pop());\n+ }\n+ });\n+\n+ function runTestCase(testCase) {\nconst options = {\nhostname: 'localhost',\npath: '/run',\n@@ -74,9 +94,9 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nconst request = http.request(options);\nrequest.end(\n- JSON.stringify({ args: ['--grep=\"NTVS_AStringThatShouldNeverExists\"'] })\n+ JSON.stringify({ args: [`--grep=${testCase.fullTitle}`] })\n);\n- });\n+ }\n}\nvsKarmaReporter.$inject = ['baseReporterDecorator', 'config', 'logger', 'emitter'];\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added execution adapter
|
410,202 |
06.05.2020 21:37:01
| 25,200 |
adc129260141cda3cdfeb292cd2aacdf73bf2f91
|
Added Angular discovery on managed side
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"diff": "@@ -7,6 +7,10 @@ using System.Linq;\nnamespace Microsoft.NodejsTools.TestFrameworks\n{\n+ // TODO: Remove Angular form the test framworks.\n+ // The Angular property appears on the file and project settings, nonetheless, this is configured differently\n+ // than the rest of the frameworks due to the config file. We need to remove the Angular text as it not\n+ // supported like that.\ninternal static class TestFrameworkDirectories\n{\npublic const string ExportRunnerFrameworkName = \"ExportRunner\";\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -4,11 +4,11 @@ using System;\nusing System.Collections.Generic;\nusing System.IO;\nusing System.Linq;\n+using Microsoft.Build.Framework.XamlTypes;\nusing Microsoft.NodejsTools.TestAdapter.TestFrameworks;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;\n-using Microsoft.VisualStudioTools;\nusing MSBuild = Microsoft.Build.Evaluation;\nnamespace Microsoft.NodejsTools.TestAdapter\n@@ -61,74 +61,13 @@ namespace Microsoft.NodejsTools.TestAdapter\n}\nFrameworkDiscoverer frameworkDiscoverer = null;\n+ var testItems = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);\nforeach (var proj in buildEngine.LoadedProjects)\n{\nvar projectHome = Path.GetFullPath(Path.Combine(proj.DirectoryPath, \".\"));\n- var testItems = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);\n-\n- var testRoot = proj.GetProperty(NodeProjectProperty.TestRoot)?.EvaluatedValue;\n- var testFramework = proj.GetProperty(NodeProjectProperty.TestFramework)?.EvaluatedValue;\n-\n- if (!string.IsNullOrEmpty(testRoot) && string.IsNullOrEmpty(testFramework))\n- {\n- logger.SendMessage(TestMessageLevel.Warning, $\"TestRoot specified for '{Path.GetFileName(proj.FullPath)}' but no TestFramework.\");\n- }\n-\n- // Provide all files to the test analyzer\n- foreach (var item in proj.Items)\n- {\n- string testFrameworkName;\n- string fileAbsolutePath;\n- if (!string.IsNullOrEmpty(testRoot) && !string.IsNullOrEmpty(testFramework))\n- {\n- testFrameworkName = testFramework;\n- var testRootPath = Path.GetFullPath(Path.Combine(proj.DirectoryPath, testRoot));\n-\n- try\n- {\n- fileAbsolutePath = CommonUtils.GetAbsoluteFilePath(projectHome, item.EvaluatedInclude);\n- }\n- catch (ArgumentException)\n- {\n- // .Net core projects include invalid paths, ignore them and continue checking the items.\n- continue;\n- }\n-\n- if (!fileAbsolutePath.StartsWith(testRootPath, StringComparison.OrdinalIgnoreCase))\n- {\n- continue;\n- }\n- }\n- else\n- {\n- //Check to see if this is a TestCase\n- testFrameworkName = item.GetMetadataValue(\"TestFramework\");\n- if (!TestFramework.IsValidTestFramework(testFrameworkName))\n- {\n- continue;\n- }\n- fileAbsolutePath = CommonUtils.GetAbsoluteFilePath(projectHome, item.EvaluatedInclude);\n- }\n-\n- var typeScriptTest = TypeScript.TypeScriptHelpers.IsTypeScriptFile(fileAbsolutePath);\n- if (typeScriptTest)\n- {\n- fileAbsolutePath = TypeScript.TypeScriptHelpers.GetTypeScriptBackedJavaScriptFile(proj, fileAbsolutePath);\n- }\n- else if (!StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(fileAbsolutePath), \".js\"))\n- {\n- continue;\n- }\n-\n- if (!testItems.TryGetValue(testFrameworkName, out var fileList))\n- {\n- fileList = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\n- testItems.Add(testFrameworkName, fileList);\n- }\n- fileList.Add(fileAbsolutePath);\n- }\n+ testItems = TestFrameworkFactory.GetTestItems(projectHome, proj);\nif (testItems.Any())\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<Compile Include=\"ProjectTestDiscoverer.cs\" />\n<Compile Include=\"TestDiscovererWorker.cs\" />\n<Compile Include=\"TestExecutorWorker.cs\" />\n+ <Compile Include=\"TestFrameworkFactory.cs\" />\n<Compile Include=\"TestFrameworks\\FrameworkDiscoverer.cs\" />\n<Compile Include=\"JavaScriptTestCaseProperties.cs\" />\n<Compile Include=\"TestFrameworks\\NodejsTestInfo.cs\" />\n</PackageReference>\n</ItemGroup>\n<ItemGroup>\n+ <Content Include=\"TestFrameworks\\Angular\\Angular.js\">\n+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>\n+ </Content>\n+ <Content Include=\"TestFrameworks\\Angular\\jasmineReporter.js\">\n+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>\n+ </Content>\n+ <Content Include=\"TestFrameworks\\Angular\\karmaConfig.js\">\n+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>\n+ </Content>\n+ <Content Include=\"TestFrameworks\\Angular\\vsKarmaReporter.js\">\n+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>\n+ </Content>\n<Content Include=\"TestFrameworks\\ExportRunner\\exportrunner.js\">\n<CopyToOutputDirectory>Always</CopyToOutputDirectory>\n</Content>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"diff": "@@ -30,7 +30,7 @@ namespace Microsoft.NodejsTools.TestAdapter\npublic void DiscoverTests(string testFolderPath, TestFramework testFx, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)\n{\n- var fileList = Directory.GetFiles(testFolderPath, \"*.js\", SearchOption.AllDirectories);\n+ var fileList = Directory.EnumerateFiles(testFolderPath, \"*.js\", SearchOption.AllDirectories).Where(x => !x.Contains(NodejsConstants.NodeModulesFolder));\nthis.DiscoverTests(fileList, testFx, logger, discoverySink);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"diff": "@@ -109,6 +109,8 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\nthis.currentTests = testCaseList;\n+ // TODO: Don't run each test file. Instead run all of the test at once.\n+ // This generates a problem for Angular as it creates all instances again for the servers.\n// Run all test cases in a given file\nthis.RunTestCases(testCaseList);\n}\n@@ -131,9 +133,12 @@ namespace Microsoft.NodejsTools.TestAdapter\n// All tests being run are for the same test file, so just use the first test listed to get the working dir\nvar firstTest = tests.First().TestCase;\n+ // TODO: Get the test framework using the configuration file logic.\nvar testFramework = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.TestFramework, defaultValue: TestFrameworkDirectories.ExportRunnerFrameworkName);\n+ // TODO: Is this necessary if using a configuration file?.\nvar workingDir = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.WorkingDir, defaultValue: Path.GetDirectoryName(firstTest.CodeFilePath));\nvar nodeExePath = firstTest.GetPropertyValue<string>(JavaScriptTestCaseProperties.NodeExePath, defaultValue: null);\n+ // TODO: Is this necessary if using a configuration file?.\nvar projectRootDir = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.ProjectRootDir, defaultValue: Path.GetDirectoryName(firstTest.CodeFilePath));\nif (string.IsNullOrEmpty(nodeExePath) || !File.Exists(nodeExePath))\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/NodejsTestInfo.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/NodejsTestInfo.cs",
"diff": "@@ -10,8 +10,6 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\n{\npublic NodejsTestInfo(string testPath, string suite, string testName, string testFramework, int line, int column, string projectRootDir)\n{\n- Debug.Assert(testPath.EndsWith(\".js\", StringComparison.OrdinalIgnoreCase) || testPath.EndsWith(\".jsx\", StringComparison.OrdinalIgnoreCase));\n-\nvar testFileRelative = CommonUtils.GetRelativeFilePath(projectRootDir, testPath);\nthis.TestFile = testFileRelative;\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added Angular discovery on managed side
|
410,211 |
03.06.2020 12:31:42
| 25,200 |
34747856980b0a3dc49c991d9b4730b4ef4d045e
|
adding feature flag to determine launch in the case of when tools option has not been set
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.12.0\">\n<Version>12.0.30111</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime\">\n+ <Version>14.0.0</Version>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime\">\n<Version>14.3.26929</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -230,19 +230,15 @@ namespace Microsoft.NodejsTools.Project\ntry\n{\nobject userDebuggerOption = userRegistryRoot.OpenSubKey(\"Debugger\")?.GetValue(\"EnableJavaScriptMultitargetDebugging\");\n- if (userDebuggerOption == null)\n+ if (userDebuggerOption is int optionVal)\n{\n- return false;\n- }\n- else\n- {\n- return (int)userDebuggerOption != 0;\n+ return optionVal != 0;\n}\n}\n- catch (Exception)\n- {\n- return false;\n- }\n+ catch (Exception) { } // do nothing. proceed to trying the feature flag below.\n+\n+ var featureFlagsService = (IVsFeatureFlags)ServiceProvider.GlobalProvider.GetService(typeof(SVsFeatureFlags));\n+ return featureFlagsService is IVsFeatureFlags && featureFlagsService.IsFeatureEnabled(\"JavaScript.Debugger.V3CdpDebugAdapter\", false);\n}\nprivate int TestServerPort\n@@ -311,7 +307,6 @@ namespace Microsoft.NodejsTools.Project\nRuntimeExecutable = browserPath,\nBrowserUrl = webBrowserUrl,\nBrowserUserDataDir = true,\n- Environment = config.Environment,\nServer = config.toPwaChromeServerConfig()\n};\nshouldStartBrowser = false; // the v3 cdp debug adapter will launch the browser as part of debugging so no need to launch it here anymore\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
adding feature flag to determine launch in the case of when tools option has not been set
|
410,211 |
05.06.2020 10:08:34
| 25,200 |
490a52bb075c827a3bb46ac94ec47927c6887240
|
embedding types instead of using internal dll
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Compile Include=\"Diagnostics\\HierarchyItem.cs\" />\n<Compile Include=\"Diagnostics\\NodeJsToolsEventSource.cs\" />\n<Compile Include=\"Repl\\InteractiveWindowContentType.cs\" />\n+ <Compile Include=\"SharedProject\\IVsFeatureFlags.cs\" />\n<Compile Include=\"SharedProject\\SystemUtilities.cs\" />\n<Compile Include=\"SharedProject\\UiaAutomationNativeMethods.cs\" />\n<Compile Include=\"SharedProject\\Wpf\\NotificationTextBox.cs\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.12.0\">\n<Version>12.0.30111</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime\">\n- <Version>14.0.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime\">\n<Version>14.3.26929</Version>\n</PackageReference>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
embedding types instead of using internal dll
|
410,204 |
16.06.2020 15:50:57
| 25,200 |
08048c1f45fe13a02f937fb3a13b6e95269d6ce4
|
Fix WebApp debugging for v3
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -293,6 +293,7 @@ namespace Microsoft.NodejsTools.Project\ndebuggerPort,\ncwd,\nCheckEnableDiagnosticLoggingOption(),\n+ _project.ProjectGuid.ToString(),\nJObject.FromObject(envVars));\nbool usingV3Debugger = ShouldUseV3CdpDebugger();\n@@ -307,7 +308,10 @@ namespace Microsoft.NodejsTools.Project\nRuntimeExecutable = browserPath,\nBrowserUrl = webBrowserUrl,\nBrowserUserDataDir = true,\n- Server = config.toPwaChromeServerConfig()\n+ Server = config.toPwaChromeServerConfig(),\n+ WorkingDir = cwd,\n+ WebRoot = cwd,\n+ ProjectGuid = _project.ProjectGuid.ToString()\n};\nshouldStartBrowser = false; // the v3 cdp debug adapter will launch the browser as part of debugging so no need to launch it here anymore\n}\n@@ -581,6 +585,7 @@ namespace Microsoft.NodejsTools.Project\nstring port,\nstring currWorkingDir,\nbool trace,\n+ string projectGuid,\nobject environmentSettings = null)\n{\nthis.ConfigName = \"Debug Node.js program from Visual Studio\";\n@@ -595,6 +600,7 @@ namespace Microsoft.NodejsTools.Project\nthis.WorkingDir = currWorkingDir;\nthis.Environment = environmentSettings;\nthis.Trace = trace;\n+ this.ProjectGuid = projectGuid;\n}\n[JsonProperty(\"name\")]\n@@ -654,6 +660,12 @@ namespace Microsoft.NodejsTools.Project\n[JsonProperty(\"userDataDir\")]\npublic object BrowserUserDataDir { get; set; } = null;\n+ [JsonProperty(\"webRoot\")]\n+ public string WebRoot { get; set; }\n+\n+ [JsonProperty(\"projectGuid\")]\n+ public string ProjectGuid { get; set; }\n+\npublic object toPwaChromeServerConfig()\n{\nthis.Console = \"internalConsole\";\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Workspace/LaunchDebugTargetProvider.cs",
"new_path": "Nodejs/Product/Nodejs/Workspace/LaunchDebugTargetProvider.cs",
"diff": "@@ -73,7 +73,8 @@ namespace Microsoft.NodejsTools.Workspace\nruntimeArguments,\ndebuggerPort.ToString(),\nworkingDir,\n- NodejsProjectLauncher.CheckEnableDiagnosticLoggingOption());\n+ NodejsProjectLauncher.CheckEnableDiagnosticLoggingOption(),\n+ null);\nreturn JObject.FromObject(launchConfig).ToString();\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fix WebApp debugging for v3
|
410,211 |
25.06.2020 13:08:19
| 25,200 |
6eb4d18e01e79d824366abf657b2bd535bdba0d1
|
using separate tools option and feature flag for Node
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -229,7 +229,7 @@ namespace Microsoft.NodejsTools.Project\nvar userRegistryRoot = VSRegistry.RegistryRoot(__VsLocalRegistryType.RegType_UserSettings, writable: false);\ntry\n{\n- object userDebuggerOption = userRegistryRoot.OpenSubKey(\"Debugger\")?.GetValue(\"EnableJavaScriptMultitargetDebugging\");\n+ object userDebuggerOption = userRegistryRoot.OpenSubKey(\"Debugger\")?.GetValue(\"EnableJavaScriptMultitargetNodeDebug\");\nif (userDebuggerOption is int optionVal)\n{\nreturn optionVal != 0;\n@@ -238,7 +238,7 @@ namespace Microsoft.NodejsTools.Project\ncatch (Exception) { } // do nothing. proceed to trying the feature flag below.\nvar featureFlagsService = (IVsFeatureFlags)ServiceProvider.GlobalProvider.GetService(typeof(SVsFeatureFlags));\n- return featureFlagsService is IVsFeatureFlags && featureFlagsService.IsFeatureEnabled(\"JavaScript.Debugger.V3CdpDebugAdapter\", false);\n+ return featureFlagsService is IVsFeatureFlags && featureFlagsService.IsFeatureEnabled(\"JavaScript.Debugger.V3CdpNodeDebugAdapter\", false);\n}\nprivate int TestServerPort\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
using separate tools option and feature flag for Node
|
410,202 |
15.07.2020 20:25:38
| 25,200 |
b789db1123b91c65551aab5ac7963f57709dcd46
|
Added operation progress support. Upgraded nuget packages.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Compile Include=\"Debugger\\DebugEngine\\AD7EvalErrorProperty.cs\" />\n<Compile Include=\"Diagnostics\\HierarchyItem.cs\" />\n<Compile Include=\"Diagnostics\\NodeJsToolsEventSource.cs\" />\n+ <Compile Include=\"Project\\OperationProgressService.cs\" />\n<Compile Include=\"Repl\\InteractiveWindowContentType.cs\" />\n<Compile Include=\"SharedProject\\IVsFeatureFlags.cs\" />\n<Compile Include=\"SharedProject\\SystemUtilities.cs\" />\n<Version>8.0.3</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.Build\">\n- <Version>16.0.461</Version>\n+ <Version>16.6.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.Build.Framework\">\n- <Version>16.0.461</Version>\n+ <Version>16.6.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.Build.Utilities.Core\">\n- <Version>16.0.461</Version>\n+ <Version>16.6.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n- <Version>4.5.0</Version>\n+ <Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n<Version>16.0.1</Version>\n<Version>15.3.0-rc-6162104</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ComponentModelHost\">\n- <Version>16.0.467</Version>\n+ <Version>16.6.255</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Debugger.Interop.10.0\">\n<Version>10.0.30320</Version>\n<Version>9.0.21023</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Editor\">\n- <Version>16.0.467</Version>\n+ <Version>16.6.255</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ImageCatalog\">\n- <Version>16.0.28727</Version>\n+ <Version>16.6.30107.105</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Imaging\">\n- <Version>16.0.28729</Version>\n+ <Version>16.6.30107.105</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ProjectAggregator\">\n<Version>8.0.50728</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\">\n- <Version>15.0.27</Version>\n+ <Version>15.0.34</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>16.0.28729</Version>\n+ <Version>16.6.30107.105</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Framework\">\n- <Version>16.0.28729</Version>\n+ <Version>16.6.30107.105</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop\">\n<Version>7.10.6072</Version>\n<Version>9.0.30730</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Telemetry\">\n- <Version>16.0.117-master</Version>\n+ <Version>16.3.59</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Text.UI\">\n- <Version>16.0.467</Version>\n+ <Version>16.6.255</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Text.UI.Wpf\">\n- <Version>16.0.467</Version>\n+ <Version>16.6.255</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Threading\">\n- <Version>16.0.102</Version>\n+ <Version>16.6.13</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Utilities\">\n- <Version>16.0.28729</Version>\n+ <Version>16.6.30107.105</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.VsInteractiveWindow\">\n<Version>2.8.0</Version>\n<Version>16.0.59</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Workspace.VSIntegration\">\n- <Version>16.0.59</Version>\n+ <Version>16.3.43</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"diff": "@@ -5,7 +5,6 @@ using System.Collections.Generic;\nusing System.Globalization;\nusing System.IO;\nusing System.Linq;\n-using System.Threading;\nusing System.Windows;\nusing Microsoft.NodejsTools.Npm;\nusing Microsoft.NodejsTools.NpmUI;\n@@ -39,13 +38,13 @@ namespace Microsoft.NodejsTools.Project\nprivate readonly LocalModulesNode _devModulesNode;\nprivate readonly LocalModulesNode _optionalModulesNode;\n+ private readonly OperationProgressService _operationProgressService;\nprivate Timer _npmIdleTimer;\n- private int _npmCommandsExecuting;\nprivate bool _suppressCommands;\nprivate bool _firstHierarchyLoad = true;\n- private readonly object _commandCountLock = new object();\n+ private readonly object _commandLock = new object();\nprivate bool _isDisposed;\n@@ -64,6 +63,8 @@ namespace Microsoft.NodejsTools.Project\nthis._optionalModulesNode = new LocalModulesNode(root, this, \"optional\", \"OptionalModules\", DependencyType.Optional);\nAddChild(this._optionalModulesNode);\n+\n+ this._operationProgressService = new OperationProgressService();\n}\nprivate void CheckNotDisposed()\n@@ -180,45 +181,6 @@ namespace Microsoft.NodejsTools.Project\nprivate OutputWindowRedirector NpmOutputPane => this.projectNode.NpmOutputPane;\n- private void ForceUpdateStatusBarWithNpmActivity(string activity)\n- {\n- if (string.IsNullOrEmpty(activity) || string.IsNullOrEmpty(activity.Trim()))\n- {\n- return;\n- }\n-\n- if (!activity.Contains(\"npm\"))\n- {\n- activity = string.Format(CultureInfo.CurrentCulture, \"npm: {0}\", activity);\n- }\n-\n- var statusBar = (IVsStatusbar)this.projectNode.GetService(typeof(SVsStatusbar));\n- if (null != statusBar)\n- {\n- statusBar.SetText(activity);\n- }\n- }\n-\n- private void ForceUpdateStatusBarWithNpmActivitySafe(string activity)\n- {\n- this.ProjectMgr.Site.GetUIThread().InvokeAsync(() => ForceUpdateStatusBarWithNpmActivity(activity))\n- .HandleAllExceptions(SR.ProductName)\n- .DoNotWait();\n- }\n-\n- private void UpdateStatusBarWithNpmActivity(string activity)\n- {\n- lock (this._commandCountLock)\n- {\n- if (this._npmCommandsExecuting == 0)\n- {\n- return;\n- }\n- }\n-\n- ForceUpdateStatusBarWithNpmActivitySafe(activity);\n- }\n-\nprivate static string TrimLastNewline(string text)\n{\nif (string.IsNullOrEmpty(text))\n@@ -251,12 +213,11 @@ namespace Microsoft.NodejsTools.Project\nprivate void NpmController_CommandStarted(object sender, NpmCommandStartedEventArgs e)\n{\nStopNpmIdleTimer();\n- lock (this._commandCountLock)\n+ lock (this._commandLock)\n{\n- ++this._npmCommandsExecuting;\n+ var message = string.Format(CultureInfo.CurrentCulture, Resources.NpmStatusExecuting, e.CommandText);\n- var message = string.Format(CultureInfo.CurrentCulture, Resources.NpmCommandStarted, e.CommandText);\n- ForceUpdateStatusBarWithNpmActivitySafe(message);\n+ this._operationProgressService.RegisterAndStartStage(e.CommandText, message);\n}\n}\n@@ -277,32 +238,7 @@ namespace Microsoft.NodejsTools.Project\nprivate void NpmController_CommandCompleted(object sender, NpmCommandCompletedEventArgs e)\n{\n- lock (this._commandCountLock)\n- {\n- --this._npmCommandsExecuting;\n- if (this._npmCommandsExecuting < 0)\n- {\n- this._npmCommandsExecuting = 0;\n- }\n- }\n-\n- var message = GetStatusBarMessage(e);\n- ForceUpdateStatusBarWithNpmActivitySafe(message);\n- }\n-\n- private static string GetStatusBarMessage(NpmCommandCompletedEventArgs e)\n- {\n- if (e.WithErrors)\n- {\n- return string.Format(CultureInfo.CurrentCulture,\n- e.Cancelled ? Resources.NpmCancelledWithErrors : Resources.NpmCompletedWithErrors,\n- e.CommandText);\n- }\n- else if (e.Cancelled)\n- {\n- return string.Format(CultureInfo.CurrentCulture, Resources.NpmCancelled, e.CommandText);\n- }\n- return string.Format(CultureInfo.CurrentCulture, Resources.NpmSuccessfullyCompleted, e.CommandText);\n+ this._operationProgressService.CompleteAndCleanupStage(e.CommandText);\n}\nprivate void StopNpmIdleTimer()\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"diff": "@@ -19,7 +19,7 @@ namespace Microsoft.NodejsTools {\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\", \"15.0.0.0\")]\n+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"16.0.0.0\")]\n[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\ninternal class Resources {\n@@ -794,42 +794,6 @@ namespace Microsoft.NodejsTools {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to {0} canceled.\n- /// </summary>\n- internal static string NpmCancelled {\n- get {\n- return ResourceManager.GetString(\"NpmCancelled\", resourceCulture);\n- }\n- }\n-\n- /// <summary>\n- /// Looks up a localized string similar to {0} canceled with errors - see Output window for details.\n- /// </summary>\n- internal static string NpmCancelledWithErrors {\n- get {\n- return ResourceManager.GetString(\"NpmCancelledWithErrors\", resourceCulture);\n- }\n- }\n-\n- /// <summary>\n- /// Looks up a localized string similar to {0} started..\n- /// </summary>\n- internal static string NpmCommandStarted {\n- get {\n- return ResourceManager.GetString(\"NpmCommandStarted\", resourceCulture);\n- }\n- }\n-\n- /// <summary>\n- /// Looks up a localized string similar to {0} completed with errors - see Output window for details.\n- /// </summary>\n- internal static string NpmCompletedWithErrors {\n- get {\n- return ResourceManager.GetString(\"NpmCompletedWithErrors\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to Executes npm command. If solution contains multiple projects, specify target project using .npm [ProjectName] <npm arguments>.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.resx",
"new_path": "Nodejs/Product/Nodejs/Resources.resx",
"diff": "<data name=\"PackageCatalogRefresh3Months\" xml:space=\"preserve\">\n<value>More than 3 months ago</value>\n</data>\n- <data name=\"NpmCancelledWithErrors\" xml:space=\"preserve\">\n- <value>{0} canceled with errors - see Output window for details</value>\n- </data>\n- <data name=\"NpmCompletedWithErrors\" xml:space=\"preserve\">\n- <value>{0} completed with errors - see Output window for details</value>\n- </data>\n- <data name=\"NpmCancelled\" xml:space=\"preserve\">\n- <value>{0} canceled</value>\n- </data>\n<data name=\"NpmSuccessfullyCompleted\" xml:space=\"preserve\">\n<value>{0} successfully completed</value>\n</data>\n@@ -752,8 +743,4 @@ The following error occurred trying to execute npm.cmd:\n<value>Microsoft Visual Studio</value>\n<comment>Caption displayed on the error dialog of the project properties.</comment>\n</data>\n- <data name=\"NpmCommandStarted\" xml:space=\"preserve\">\n- <value>{0} started.</value>\n- <comment>Parameter would be an npm command parameters.</comment>\n- </data>\n</root>\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": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"Microsoft.CSharp\">\n- <Version>4.5.0</Version>\n+ <Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n<Version>12.0.2</Version>\n</PackageReference>\n<PackageReference Include=\"System.CodeDom\">\n- <Version>4.5.0</Version>\n+ <Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"System.ComponentModel\">\n<Version>4.3.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"new_path": "Nodejs/Product/PressAnyKey/PressAnyKey.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"Microsoft.CSharp\">\n- <Version>4.5.0</Version>\n+ <Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<Version>8.0.2</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n- <Version>4.5.0</Version>\n+ <Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Settings.15.0\">\n- <Version>16.0.28729</Version>\n+ <Version>16.6.30114.105</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>16.0.28729</Version>\n+ <Version>16.6.30107.105</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n<PackageReference Include=\"Microsoft.Build\">\n- <Version>16.0.461</Version>\n+ <Version>16.6.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n- <Version>4.5.0</Version>\n+ <Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"new_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"diff": "<Version>9.0.3</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.Build\">\n- <Version>16.0.461</Version>\n+ <Version>16.6.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n- <Version>4.5.0</Version>\n+ <Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n<Version>16.0.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>16.0.28729</Version>\n+ <Version>16.6.30107.105</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.7.DesignTime\">\n<Version>15.7.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\">\n- <Version>15.0.27</Version>\n+ <Version>15.0.34</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added operation progress support. Upgraded nuget packages.
|
410,202 |
15.07.2020 20:27:20
| 25,200 |
151414106979528d0ea0a20e5d153624e17a3a30
|
Removed implentation comment
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/OperationProgressService.cs",
"new_path": "Nodejs/Product/Nodejs/Project/OperationProgressService.cs",
"diff": "@@ -7,7 +7,6 @@ using Task = System.Threading.Tasks.Task;\nnamespace Microsoft.NodejsTools.Project\n{\n- // Based on typescript implementation: https://devdiv.visualstudio.com/DevDiv/_git/TypeScript-VS?path=%2FVS%2FLanguageService%2FTypeScriptVisualStudio%2FUtilities%2FOperationProgressService.cs&version=GBmaster&_a=contents\ninternal class OperationProgressService\n{\nprivate readonly Dictionary<string, TaskCompletionSource<bool>> loadCompletionMap = new Dictionary<string, TaskCompletionSource<bool>>();\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Removed implentation comment
|
410,202 |
21.07.2020 16:33:11
| 25,200 |
3f66529140bf1fb3b5ac8c1c5daa759ec17bff89
|
Changed progress message
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodeModulesNode.cs",
"diff": "@@ -39,6 +39,7 @@ namespace Microsoft.NodejsTools.Project\nprivate readonly LocalModulesNode _devModulesNode;\nprivate readonly LocalModulesNode _optionalModulesNode;\nprivate readonly OperationProgressService _operationProgressService;\n+ private readonly string _npmCommandStageId = \"NtvsNpmCommand\";\nprivate Timer _npmIdleTimer;\nprivate bool _suppressCommands;\n@@ -215,9 +216,7 @@ namespace Microsoft.NodejsTools.Project\nStopNpmIdleTimer();\nlock (this._commandLock)\n{\n- var message = string.Format(CultureInfo.CurrentCulture, Resources.NpmStatusExecuting, e.CommandText);\n-\n- this._operationProgressService.RegisterAndStartStage(e.CommandText, message);\n+ this._operationProgressService.RegisterAndStartStage(this._npmCommandStageId, Resources.ExecutingNpmCommandMessage);\n}\n}\n@@ -238,7 +237,7 @@ namespace Microsoft.NodejsTools.Project\nprivate void NpmController_CommandCompleted(object sender, NpmCommandCompletedEventArgs e)\n{\n- this._operationProgressService.CompleteAndCleanupStage(e.CommandText);\n+ this._operationProgressService.CompleteAndCleanupStage(this._npmCommandStageId);\n}\nprivate void StopNpmIdleTimer()\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/Resources.Designer.cs",
"diff": "@@ -416,6 +416,15 @@ namespace Microsoft.NodejsTools {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Executing npm command..\n+ /// </summary>\n+ internal static string ExecutingNpmCommandMessage {\n+ get {\n+ return ResourceManager.GetString(\"ExecutingNpmCommandMessage\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Some file paths could not be accessed.{0}Try moving your source code to a location where you can read and write files..\n/// </summary>\n@@ -1167,15 +1176,6 @@ namespace Microsoft.NodejsTools {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to Executing: {0}.\n- /// </summary>\n- internal static string NpmStatusExecuting {\n- get {\n- return ResourceManager.GetString(\"NpmStatusExecuting\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to Errors Encountered ({1}) - Executing: {0}.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Resources.resx",
"new_path": "Nodejs/Product/Nodejs/Resources.resx",
"diff": "<data name=\"NpmStatusReadyWithErrors\" xml:space=\"preserve\">\n<value>Ready - Command(s) completed with errors ({0})</value>\n</data>\n- <data name=\"NpmStatusExecuting\" xml:space=\"preserve\">\n- <value>Executing: {0}</value>\n- </data>\n<data name=\"NpmStatusExecutingQueued\" xml:space=\"preserve\">\n<value>Executing: {0} ({1} command(s) queued)</value>\n</data>\n@@ -743,4 +740,7 @@ The following error occurred trying to execute npm.cmd:\n<value>Microsoft Visual Studio</value>\n<comment>Caption displayed on the error dialog of the project properties.</comment>\n</data>\n+ <data name=\"ExecutingNpmCommandMessage\" xml:space=\"preserve\">\n+ <value>Executing npm command</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Changed progress message
|
410,212 |
29.07.2020 17:06:00
| 25,200 |
dd7b2c17b87f2d61845a4c2beb6fea9ef132a836
|
Marking packages as Nexus compliant
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/NodejsToolsVsix/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/NodejsToolsVsix/source.extension.vsixmanifest",
"diff": "<Icon>NodeJS.ico</Icon>\n<PreviewImage>NodeJS_200x.png</PreviewImage>\n<PackageId>Microsoft.VisualStudio.NodejsTools.NodejsTools</PackageId>\n+ <AllowClientRole>true</AllowClientRole>\n</Metadata>\n<!-- Version=\"11.0\" specifies the minimum (not the maximum) version, and the\nId specifications are minimums; any SKU equal or 'higher' will accept\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TargetsVsix/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/TargetsVsix/source.extension.vsixmanifest",
"diff": "<Icon>NodeJS.ico</Icon>\n<PreviewImage>NodeJS_200x.png</PreviewImage>\n<PackageId>Microsoft.VisualStudio.NodejsTools.Targets</PackageId>\n+ <AllowClientRole>true</AllowClientRole>\n</Metadata>\n<Installation SystemComponent=\"true\" AllUsers=\"true\">\n<InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterVsix/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/TestAdapterVsix/source.extension.vsixmanifest",
"diff": "<Icon>NodeJS.ico</Icon>\n<PreviewImage>NodeJS_200x.png</PreviewImage>\n<PackageId>Microsoft.VisualStudio.NodejsTools.TestAdapter</PackageId>\n+ <AllowClientRole>true</AllowClientRole>\n</Metadata>\n<Installation SystemComponent=\"true\">\n<InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Marking packages as Nexus compliant
|
410,202 |
21.09.2020 14:38:18
| 25,200 |
a1db272f01769e155e6682180f788acffb3afeb6
|
Updated TemplateWizard reference
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<SccProvider>SAK</SccProvider>\n</PropertyGroup>\n<ItemGroup>\n- <Reference Include=\"Microsoft.VisualStudio.TemplateWizardInterface, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n+ <Reference Include=\"Microsoft.VisualStudio.TemplateWizardInterface, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"System.Windows.Forms\" />\n</ItemGroup>\n<ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Updated TemplateWizard reference
|
410,202 |
22.09.2020 19:02:24
| 25,200 |
fafef3c581c9caa9c4b6061c06325764fcbd3843
|
Removed version from templatewizard
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<SccProvider>SAK</SccProvider>\n</PropertyGroup>\n<ItemGroup>\n- <Reference Include=\"Microsoft.VisualStudio.TemplateWizardInterface, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n+ <Reference Include=\"Microsoft.VisualStudio.TemplateWizardInterface, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n<Reference Include=\"System.Windows.Forms\" />\n</ItemGroup>\n<ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Removed version from templatewizard
|
410,219 |
25.09.2020 17:00:23
| 25,200 |
7cf69b3819305bd2263647158708fb1ce1ca35f3
|
Add property for Azure Cloud Services packaging
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TargetsVsix/Microsoft.NodejsTools.targets",
"new_path": "Nodejs/Product/TargetsVsix/Microsoft.NodejsTools.targets",
"diff": "<AssignTargetPath Files=\"@(_TempBuiltProjectOutputGroup)\" RootFolder=\"$(MSBuildProjectDirectory)\">\n<Output TaskParameter=\"AssignedFiles\" ItemName=\"BuiltProjectOutputGroupOutput\" />\n</AssignTargetPath>\n+\n+ <!-- Add FinalOutputPath property to support Azure Cloud Service role packaging -->\n+ <ItemGroup>\n+ <BuiltProjectOutputGroupOutput Include=\"@(BuiltProjectOutputGroupOutput)\">\n+ <FinalOutputPath>%(FullPath)</FinalOutputPath>\n+ </BuiltProjectOutputGroupOutput>\n+ </ItemGroup>\n</Target>\n<Target\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TargetsVsix/Microsoft.NodejsToolsV2.targets",
"new_path": "Nodejs/Product/TargetsVsix/Microsoft.NodejsToolsV2.targets",
"diff": "<AssignTargetPath Files=\"@(_TempBuiltProjectOutputGroup)\" RootFolder=\"$(MSBuildProjectDirectory)\">\n<Output TaskParameter=\"AssignedFiles\" ItemName=\"BuiltProjectOutputGroupOutput\" />\n</AssignTargetPath>\n+\n+ <!-- Add FinalOutputPath property to support Azure Cloud Service role packaging -->\n+ <ItemGroup>\n+ <BuiltProjectOutputGroupOutput Include=\"@(BuiltProjectOutputGroupOutput)\">\n+ <FinalOutputPath>%(FullPath)</FinalOutputPath>\n+ </BuiltProjectOutputGroupOutput>\n+ </ItemGroup>\n</Target>\n<Target\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add property for Azure Cloud Services packaging
|
410,212 |
09.10.2020 12:11:17
| 25,200 |
ce982e50fa5619908c19f315fd8da929a70bcbd8
|
Adding support for the new project type test discovery
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsConstants.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsConstants.cs",
"diff": "@@ -17,6 +17,7 @@ namespace Microsoft.NodejsTools\npublic const string NodejsProjectExtension = \".njsproj\";\npublic const string CSharpProjectExtension = \".csproj\";\npublic const string VisualBasicProjectExtension = \".vbproj\";\n+ public const string AngularProjectExtension = \".esproj\";\npublic const string JavaScript = \"JavaScript\";\npublic const string CSS = \"CSS\";\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -14,7 +14,7 @@ using MSBuild = Microsoft.Build.Evaluation;\nnamespace Microsoft.NodejsTools.TestAdapter\n{\n// Keep in sync the method TypeScriptHelpers.IsSupportedTestProjectFile if there's a change on the supported projects.\n- [FileExtension(NodejsConstants.NodejsProjectExtension), FileExtension(NodejsConstants.CSharpProjectExtension), FileExtension(NodejsConstants.VisualBasicProjectExtension)]\n+ [FileExtension(NodejsConstants.NodejsProjectExtension), FileExtension(NodejsConstants.CSharpProjectExtension), FileExtension(NodejsConstants.VisualBasicProjectExtension), FileExtension(NodejsConstants.AngularProjectExtension)]\n[DefaultExecutorUri(NodejsConstants.ExecutorUriString)]\npublic partial class ProjectTestDiscoverer : ITestDiscoverer\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TypeScript/TypeScriptHelpers.cs",
"new_path": "Nodejs/Product/TypeScript/TypeScriptHelpers.cs",
"diff": "@@ -44,7 +44,8 @@ namespace Microsoft.NodejsTools.TypeScript\nreturn StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.NodejsProjectExtension)\n|| StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.CSharpProjectExtension)\n- || StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.VisualBasicProjectExtension);\n+ || StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.VisualBasicProjectExtension)\n+ || StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.AngularProjectExtension);\n}\n#if !NETSTANDARD2_0\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Adding support for the new project type test discovery
|
410,202 |
09.10.2020 17:46:16
| 25,200 |
87c86f567e8e3f330b480c2b59f80dfe53dce5fb
|
Added run capability
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"diff": "@@ -11,7 +11,7 @@ const karmaConfigName = \"karma.conf.js\";\nconst vsKarmaConfigPath = path.resolve(__dirname, \"./karmaConfig.js\");\nconst find_tests = function (configFiles, discoverResultFile, projectFolder) {\n- return new Promise(async resolve => {\n+ return new Promise(resolve => {\nconst angular = detectPackage(projectFolder, '@angular/cli');\nif (!angular) {\nreturn;\n@@ -74,7 +74,7 @@ const run_tests = function (context) {\nconst projectFolder = context.testCases[0].projectFolder;\n// TODO: Send the configuration path along with the test cases.\n- const configFile = \"C:/Users/araguir/source/repos/AngularNTVSSample/AngularNTVSSample/angular.json\";\n+ const configFile = `${projectFolder}/angular.json`;\nfor (const testCase of context.testCases) {\ncontext.post({\n@@ -83,7 +83,7 @@ const run_tests = function (context) {\n});\n}\n- return new Promise(async resolve => {\n+ return new Promise(resolve => {\nconst angular = detectPackage(projectFolder, '@angular/cli');\nif (!angular) {\nreturn;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"diff": "//@ts-check\n+// Function used to add fileLocation to the result. Includes filepath, line and column of the test.\nfunction itReplacement(it) {\nreturn (description, testFunction, timeout) => {\nconst spec = it(description, testFunction, timeout);\n@@ -22,11 +23,39 @@ function getFileLocation() {\n: null;\n}\n+// Example provided by MDN. Caused data loss by removing the circular reference.\n+const getCircularReplacer = () => {\n+ const seen = new WeakSet();\n+\n+ return (key, value) => {\n+ if (isObject(value)) {\n+ if (seen.has(value)) {\n+ return;\n+ }\n+ seen.add(value);\n+ }\n+\n+ return value;\n+ };\n+};\n+\n+function isObject(value) {\n+ return typeof value === \"object\"\n+ && value !== null\n+ && !(value instanceof Boolean)\n+ && !(value instanceof Date)\n+ && !(value instanceof Number)\n+ && !(value instanceof RegExp)\n+ && !(value instanceof String)\n+}\n+\nvar myReporter = {\nspecDone: result => {\n- console.log(JSON.stringify(result));\n+ // Communicate results through the console.\n+ console.log(JSON.stringify(result, getCircularReplacer()));\n}\n};\njasmine.getEnv().addReporter(myReporter);\njasmine.getEnv().it = itReplacement(jasmine.getEnv().it);\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/karmaConfig.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/karmaConfig.js",
"diff": "@@ -4,19 +4,46 @@ const path = require('path');\nconst karmaConfigPath = path.resolve(process.env.PROJECTPATH, 'karma.conf.js');\nconst reporterPath = path.resolve(process.env.VSTESTADAPTERPATH, 'vsKarmaReporter.js');\n+const testCases = JSON.parse(process.env.TESTCASES);\nconst karmaConfig = require(karmaConfigPath);\nmodule.exports = function (config) {\nkarmaConfig(config);\n+ config.autoWatch = false;\n// config.browsers = ['ChromeHeadless'];\nconfig.browsers = ['Chrome'];\n- config.autoWatch = false;\nconfig.logLevel = config.LOG_DISABLE;\n// Keep the original plugins\nconfig.plugins = config.plugins || [];\nconfig.plugins.push(require(reporterPath));\n- // Replace all reportrs.\n+ // Replace all reporters\nconfig.reporters = ['vsKarmaReporter'];\n+\n+ setGrep(config);\n};\n+\n+function setGrep(config) {\n+ // Search for an existing grep on clientArgs.\n+ const clientArgs = [];\n+ let hasGrep = false;\n+ for (let arg of config.client.args) {\n+ if (arg.substring(0, 6) === '--grep=') {\n+ hasGrep = true;\n+ }\n+ clientArgs.push(arg);\n+ }\n+\n+ // If grep is not configured already, use VS configuration\n+ if (!hasGrep) {\n+ const testCasesRegex = testCases\n+ .reduce((previous, current) => {\n+ // TODO: Escape all of regex reserved characters.\n+ previous.push(current.fullTitle);\n+ return previous;\n+ }, [])\n+ .join('|');\n+ config.client.args.push(`--grep=${testCasesRegex}`);\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"diff": "@@ -18,6 +18,10 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nwatched: false\n});\n+ this.onBrowserError = (browser, error) => {\n+ log.debug(`onBrowserError: ${JSON.stringify(error)}`);\n+ }\n+\n// TODO: Is there a better option than onBrowserLog?\nthis.onBrowserLog = (browser, browserLog, type) => {\nconst cleaned = browserLog.substring(1, browserLog.length - 1); // Remove extra quote at start and end\n@@ -33,7 +37,7 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nlet errorLog = \"\";\nfor (const failedExpectation of result.failedExpectations) {\n- errorLog += `\\n\\nMessage: ${failedExpectation.message}\\nStack:\\n${failedExpectation.stack}`;\n+ errorLog += `${failedExpectation.stack}\\n`;\n}\n// Handles both scenarios, discovery and execution.\n@@ -67,11 +71,14 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n}\n}\n+ // Override specFailure to avoid crashing the process as Karma sends a string output that cannot be parsed as JSON.\n+ this.specFailure = () => { }\n+\nlet hasStarted = false;\n// Check when browser is ready to request a run.\nemitter.on(\"browsers_ready\", () => {\n- // There's Scenario that I'm not sure how to repro where the browser do something (refresh? crashes?)\n+ // There's a scenario that I'm not sure how to repro where the browser do something (refresh? crashes?)\n// and we get the event again. We only want to executed it once.\nif (!hasStarted) {\nhasStarted = true;\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added run capability
|
410,202 |
13.10.2020 14:47:25
| 25,200 |
c3b8a72f0c8a745decac4eff9dea81726ffd13f1
|
Run all angular tests instead of by file. Fix some todos.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"diff": "@@ -7,10 +7,6 @@ using System.Linq;\nnamespace Microsoft.NodejsTools.TestFrameworks\n{\n- // TODO: Remove Angular form the test framworks.\n- // The Angular property appears on the file and project settings, nonetheless, this is configured differently\n- // than the rest of the frameworks due to the config file. We need to remove the Angular text as it not\n- // supported like that.\ninternal static class TestFrameworkDirectories\n{\npublic const string ExportRunnerFrameworkName = \"ExportRunner\";\n@@ -25,7 +21,8 @@ namespace Microsoft.NodejsTools.TestFrameworks\nthrow new InvalidOperationException($\"Unable to find test framework folder. Tried: \\\"{testFrameworkRoot}\\\"\");\n}\n- return Directory.EnumerateDirectories(testFrameworkRoot).Select(Path.GetFileName).ToArray();\n+ // Enumarte all directories to appear on the properties bar. Angular is removed as it is configured by config file instead.\n+ return Directory.EnumerateDirectories(testFrameworkRoot).Select(Path.GetFileName).Where(x => x != \"Angular\").ToArray();\n}\npublic static string[] GetFrameworkDirectories(string testFrameworkRoot = null)\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"diff": "@@ -91,6 +91,30 @@ namespace Microsoft.NodejsTools.TestAdapter\nValidateArg.NotNull(tests, nameof(tests));\nthis.cancelRequested.Reset();\n+ var testFramework = tests.First().GetPropertyValue(JavaScriptTestCaseProperties.TestFramework, defaultValue: TestFrameworkDirectories.ExportRunnerFrameworkName);\n+ if (testFramework == \"Angular\")\n+ {\n+ RunAllTests(tests);\n+ }\n+ else\n+ {\n+ RunTestsByFile(tests);\n+ }\n+ }\n+\n+ private void RunAllTests(IEnumerable<TestCase> tests)\n+ {\n+ var testCaseResults = tests.Select(x => new TestCaseResult { TestCase = x });\n+ this.currentTests = testCaseResults.ToList();\n+\n+ this.RunTestCases(testCaseResults);\n+ }\n+\n+ /// <summary>\n+ /// Runs all of the test cases by executing each one of the files sequentially.\n+ /// </summary>\n+ private void RunTestsByFile(IEnumerable<TestCase> tests)\n+ {\n// .ts file path -> project settings\nvar fileToTests = new Dictionary<string, List<TestCaseResult>>();\n@@ -109,8 +133,6 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\nthis.currentTests = testCaseList;\n- // TODO: Don't run each test file. Instead run all of the test at once.\n- // This generates a problem for Angular as it creates all instances again for the servers.\n// Run all test cases in a given file\nthis.RunTestCases(testCaseList);\n}\n@@ -133,12 +155,9 @@ namespace Microsoft.NodejsTools.TestAdapter\n// All tests being run are for the same test file, so just use the first test listed to get the working dir\nvar firstTest = tests.First().TestCase;\n- // TODO: Get the test framework using the configuration file logic.\nvar testFramework = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.TestFramework, defaultValue: TestFrameworkDirectories.ExportRunnerFrameworkName);\n- // TODO: Is this necessary if using a configuration file?.\nvar workingDir = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.WorkingDir, defaultValue: Path.GetDirectoryName(firstTest.CodeFilePath));\nvar nodeExePath = firstTest.GetPropertyValue<string>(JavaScriptTestCaseProperties.NodeExePath, defaultValue: null);\n- // TODO: Is this necessary if using a configuration file?.\nvar projectRootDir = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.ProjectRootDir, defaultValue: Path.GetDirectoryName(firstTest.CodeFilePath));\nif (string.IsNullOrEmpty(nodeExePath) || !File.Exists(nodeExePath))\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworkFactory.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworkFactory.cs",
"diff": "@@ -42,7 +42,7 @@ namespace Microsoft.NodejsTools.TestAdapter\n}\nelse if (!configItems.Any()) // Legacy behavior. If we have found a test configuration file is safe to ignore the rest of the files.\n{\n- // TODO: Deprecate. Is configured by projecft file or is configured per file.\n+ // TODO: Deprecate. Is configured by project file or is configured per file.\nvar testFrameworkAndFilePath = GetTestFrameworkAndFilePath(project, projectItem, projectRoot);\nif (testFrameworkAndFilePath.HasValue)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"diff": "@@ -30,9 +30,8 @@ const find_tests = function (configFiles, discoverResultFile, projectFolder) {\nprocess.env.TESTCASES = JSON.stringify([{ fullTitle: \"NTVS_Discovery_ThisStringShouldExcludeAllTestCases\" }]);\nprocess.env.ISDISCOVERY = 'true';\n- // TODO: Handle npx or some other way to run ng not using the node_modules path.\nconst ngTest = spawn(\n- 'E:/NodeJS/node-v13.11.0-win-x64/node.exe',\n+ process.argv0, // Node executable path\n[\npath.resolve(projectPath, \"./node_modules/@angular/cli/bin/ng\"),\n'test',\n@@ -44,15 +43,6 @@ const find_tests = function (configFiles, discoverResultFile, projectFolder) {\nstdio: ['pipe', 'ipc', 'pipe']\n});\n- // TODO: Handle multiple projects. aka. multiple spawns running.\n- // const ngTest = spawn(\n- // 'npx',\n- // ['ng', 'test', `--karmaConfig=\"${vsKarmaConfigPath}\"`],\n- // {\n- // cwd: projectPath,\n- // shell: true,\n- // });\n-\nconst testsDiscovered = [];\nngTest.on('message', message => {\n@@ -73,7 +63,8 @@ const find_tests = function (configFiles, discoverResultFile, projectFolder) {\nconst run_tests = function (context) {\nconst projectFolder = context.testCases[0].projectFolder;\n- // TODO: Send the configuration path along with the test cases.\n+ // TODO: Handle the scenario where Angular.json may not exists on a child folder instead of root.\n+ // One way would be to send the location of angular.json instead of assuming it's on root.\nconst configFile = `${projectFolder}/angular.json`;\nfor (const testCase of context.testCases) {\n@@ -101,9 +92,8 @@ const run_tests = function (context) {\nprocess.env.PROJECTPATH = projectPath;\nprocess.env.TESTCASES = JSON.stringify(context.testCases);\n- // TODO: Handle npx or some other way to run ng not using the node_modules path.\nconst ngTest = spawn(\n- 'E:/NodeJS/node-v13.11.0-win-x64/node.exe',\n+ process.argv0, //Node executable path\n[\npath.resolve(projectPath, \"./node_modules/@angular/cli/bin/ng\"),\n'test',\n@@ -115,15 +105,6 @@ const run_tests = function (context) {\nstdio: ['pipe', 'ipc', 'pipe']\n});\n- // TODO: Handle multiple projects. aka. multiple spawns running.\n- // const ngTest = spawn(\n- // 'npx',\n- // ['ng', 'test', `--karmaConfig=\"${vsKarmaConfigPath}\"`],\n- // {\n- // cwd: projectPath,\n- // shell: true,\n- // });\n-\nngTest.on(\"message\", message => {\ncontext.post({\ntype: message.pending ? 'pending' : 'result',\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/karmaConfig.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/karmaConfig.js",
"diff": "@@ -12,8 +12,7 @@ module.exports = function (config) {\nkarmaConfig(config);\nconfig.autoWatch = false;\n- // config.browsers = ['ChromeHeadless'];\n- config.browsers = ['Chrome'];\n+ config.browsers = ['ChromeHeadless'];\nconfig.logLevel = config.LOG_DISABLE;\n// Keep the original plugins\nconfig.plugins = config.plugins || [];\n@@ -25,25 +24,19 @@ module.exports = function (config) {\n};\nfunction setGrep(config) {\n- // Search for an existing grep on clientArgs.\n- const clientArgs = [];\n- let hasGrep = false;\n- for (let arg of config.client.args) {\n- if (arg.substring(0, 6) === '--grep=') {\n- hasGrep = true;\n- }\n- clientArgs.push(arg);\n- }\n+ // Remove any existing --grep argument\n+ config.client.args = config.client.args.filter(x => x.substring(0, 7) !== '--grep=');\n- // If grep is not configured already, use VS configuration\n- if (!hasGrep) {\n+ // Push custom grep.\nconst testCasesRegex = testCases\n.reduce((previous, current) => {\n- // TODO: Escape all of regex reserved characters.\n- previous.push(current.fullTitle);\n+ previous.push(escapeRegExp(current.fullTitle));\nreturn previous;\n}, [])\n.join('|');\nconfig.client.args.push(`--grep=${testCasesRegex}`);\n}\n+\n+function escapeRegExp(string) {\n+ return string.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&'); // $& means the whole matched string\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"diff": "@@ -23,6 +23,9 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n}\n// TODO: Is there a better option than onBrowserLog?\n+ // So far, since this is runned by multiple out of proc, the only way I have found to communicate\n+ // is through the console, thus, the need for capturing the browser log. JasmineReporter uses\n+ // console.log for this purpose.\nthis.onBrowserLog = (browser, browserLog, type) => {\nconst cleaned = browserLog.substring(1, browserLog.length - 1); // Remove extra quote at start and end\nconst result = JSON.parse(cleaned);\n@@ -41,6 +44,7 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n}\n// Handles both scenarios, discovery and execution.\n+ try {\nprocess.send({\n// Discovery properties\nname: result.description,\n@@ -55,6 +59,9 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nfullName: result.fullName,\nstderr: errorLog\n});\n+ } catch (e) {\n+ log.debug(`error: ${JSON.stringify(e)}`);\n+ }\nlog.debug(`onBrowserLog: ${JSON.stringify(result)}`);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"diff": "@@ -6,9 +6,31 @@ var rl = readline.createInterface({\noutput: process.stdout\n});\n-rl.on('line', function (line) {\n+rl.on('line', function (line2) {\nrl.close();\n+ var line = line2 || JSON.stringify(\n+ [{\n+ \"framework\": \"Angular\",\n+ \"fullyQualifiedName\": \"\\\"src\\\\app\\\\app.component2.spec.ts::CustomTest::Should fail\\\"\",\n+ \"testFile\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\\src\\\\app\\\\app.component2.spec.ts\\\"\",\n+ \"workingFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\",\n+ \"projectFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\"\n+ }, {\n+ \"framework\": \"Angular\",\n+ \"fullyQualifiedName\": \"\\\"src\\\\app\\\\app.component2.spec.ts::CustomTest::Should fail as well\\\"\",\n+ \"testFile\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\\src\\\\app\\\\app.component2.spec.ts\\\"\",\n+ \"workingFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\",\n+ \"projectFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\"\n+ }, {\n+ \"framework\": \"Angular\",\n+ \"fullyQualifiedName\": \"\\\"src\\\\app\\\\app.component2.spec.ts::CustomTest::Should not fail\\\"\",\n+ \"testFile\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\\src\\\\app\\\\app.component2.spec.ts\\\"\",\n+ \"workingFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\",\n+ \"projectFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\"\n+ }]\n+ );\n+\n// strip the BOM in case of UTF-8\nif (line.charCodeAt(0) === 0xFEFF) {\nline = line.slice(1);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Run all angular tests instead of by file. Fix some todos.
|
410,202 |
13.10.2020 15:18:17
| 25,200 |
e5d137a5a922c5e31cf327fadf02ed4abfb366f9
|
Removed hardcoded tests
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"diff": "@@ -6,31 +6,9 @@ var rl = readline.createInterface({\noutput: process.stdout\n});\n-rl.on('line', function (line2) {\n+rl.on('line', function (line) {\nrl.close();\n- var line = line2 || JSON.stringify(\n- [{\n- \"framework\": \"Angular\",\n- \"fullyQualifiedName\": \"\\\"src\\\\app\\\\app.component2.spec.ts::CustomTest::Should fail\\\"\",\n- \"testFile\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\\src\\\\app\\\\app.component2.spec.ts\\\"\",\n- \"workingFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\",\n- \"projectFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\"\n- }, {\n- \"framework\": \"Angular\",\n- \"fullyQualifiedName\": \"\\\"src\\\\app\\\\app.component2.spec.ts::CustomTest::Should fail as well\\\"\",\n- \"testFile\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\\src\\\\app\\\\app.component2.spec.ts\\\"\",\n- \"workingFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\",\n- \"projectFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\"\n- }, {\n- \"framework\": \"Angular\",\n- \"fullyQualifiedName\": \"\\\"src\\\\app\\\\app.component2.spec.ts::CustomTest::Should not fail\\\"\",\n- \"testFile\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\\src\\\\app\\\\app.component2.spec.ts\\\"\",\n- \"workingFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\",\n- \"projectFolder\": \"\\\"C:\\\\Users\\\\araguir\\\\source\\\\repos\\\\NodeJsAngularUnitTestSample\\\\NodeJsAngularUnitTestSample\\\"\"\n- }]\n- );\n-\n// strip the BOM in case of UTF-8\nif (line.charCodeAt(0) === 0xFEFF) {\nline = line.slice(1);\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Removed hardcoded tests
|
410,202 |
13.10.2020 15:19:34
| 25,200 |
4b9808207ecf0913a14a8492e7bc737b3e805d7f
|
Removed todos, small fixes
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"diff": "@@ -21,7 +21,7 @@ namespace Microsoft.NodejsTools.TestFrameworks\nthrow new InvalidOperationException($\"Unable to find test framework folder. Tried: \\\"{testFrameworkRoot}\\\"\");\n}\n- // Enumarte all directories to appear on the properties bar. Angular is removed as it is configured by config file instead.\n+ // Enumerate all directories to appear on the properties bar. Angular is removed as it is configured by config file instead.\nreturn Directory.EnumerateDirectories(testFrameworkRoot).Select(Path.GetFileName).Where(x => x != \"Angular\").ToArray();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -4,7 +4,6 @@ using System;\nusing System.Collections.Generic;\nusing System.IO;\nusing System.Linq;\n-using Microsoft.Build.Framework.XamlTypes;\nusing Microsoft.NodejsTools.TestAdapter.TestFrameworks;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworkFactory.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworkFactory.cs",
"diff": "@@ -21,16 +21,14 @@ namespace Microsoft.NodejsTools.TestAdapter\nforeach (var projectItem in projectItems)\n{\nstring testFrameworkName = null;\n- // TODO: Should it validate karma.conf.js?\n- // consider it can also be inside a <root>/.config/ folder and will configure the <root> folder.\n+ // TODO: Consider it can also be inside a <root>/.config/ folder and will configure the <root> folder.\nif (projectItem.EvaluatedInclude.Contains(\"angular.json\"))\n{\ntestFrameworkName = \"angular\";\n}\n- // TODO: Add configuration files for jest, mocha , jasmine. Consider some frameworks can be configured using package.json\n+ // TODO: Add configuration files for jest, mocha , jasmine. Consider that some frameworks can be configured using package.json\n// Also some frameworks have more than one filename to define a configuration.\n// Tape is the only framework we support that doesn't have a configuration file. Decide what to do about that.\n-\nif (testFrameworkName != null)\n{\nif (!configItems.ContainsKey(testFrameworkName))\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"diff": "@@ -44,7 +44,6 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n}\n// Handles both scenarios, discovery and execution.\n- try {\nprocess.send({\n// Discovery properties\nname: result.description,\n@@ -59,9 +58,6 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nfullName: result.fullName,\nstderr: errorLog\n});\n- } catch (e) {\n- log.debug(`error: ${JSON.stringify(e)}`);\n- }\nlog.debug(`onBrowserLog: ${JSON.stringify(result)}`);\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Removed todos, small fixes
|
410,202 |
27.10.2020 16:46:52
| 25,200 |
13d08ce0d49f3932c6845866b39ee9f2e1130430
|
Address PR comments. Make test adapteres async. Fix angular, IPC communication. Fix grep regex
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NodejsConstants.cs",
"new_path": "Nodejs/Product/Nodejs/NodejsConstants.cs",
"diff": "@@ -17,7 +17,7 @@ namespace Microsoft.NodejsTools\npublic const string NodejsProjectExtension = \".njsproj\";\npublic const string CSharpProjectExtension = \".csproj\";\npublic const string VisualBasicProjectExtension = \".vbproj\";\n- public const string AngularProjectExtension = \".esproj\";\n+ public const string JavaScriptProjectExtension = \".esproj\";\npublic const string JavaScript = \"JavaScript\";\npublic const string CSS = \"CSS\";\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"new_path": "Nodejs/Product/Nodejs/TestFrameworks/TestFrameworkDirectories.cs",
"diff": "@@ -9,6 +9,7 @@ namespace Microsoft.NodejsTools.TestFrameworks\n{\ninternal static class TestFrameworkDirectories\n{\n+ public const string AngularFrameworkName = \"Angular\";\npublic const string ExportRunnerFrameworkName = \"ExportRunner\";\nprivate const string TestFrameworksFolderName = \"TestFrameworks\";\nprivate const string TestAdapterFolderName = \"TestAdapter\";\n@@ -22,7 +23,10 @@ namespace Microsoft.NodejsTools.TestFrameworks\n}\n// Enumerate all directories to appear on the properties bar. Angular is removed as it is configured by config file instead.\n- return Directory.EnumerateDirectories(testFrameworkRoot).Select(Path.GetFileName).Where(x => x != \"Angular\").ToArray();\n+ return Directory.EnumerateDirectories(testFrameworkRoot)\n+ .Select(Path.GetFileName)\n+ .Where(x => !string.Equals(x, TestFrameworkDirectories.AngularFrameworkName, StringComparison.OrdinalIgnoreCase))\n+ .ToArray();\n}\npublic static string[] GetFrameworkDirectories(string testFrameworkRoot = null)\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -13,7 +13,7 @@ using MSBuild = Microsoft.Build.Evaluation;\nnamespace Microsoft.NodejsTools.TestAdapter\n{\n// Keep in sync the method TypeScriptHelpers.IsSupportedTestProjectFile if there's a change on the supported projects.\n- [FileExtension(NodejsConstants.NodejsProjectExtension), FileExtension(NodejsConstants.CSharpProjectExtension), FileExtension(NodejsConstants.VisualBasicProjectExtension), FileExtension(NodejsConstants.AngularProjectExtension)]\n+ [FileExtension(NodejsConstants.NodejsProjectExtension), FileExtension(NodejsConstants.CSharpProjectExtension), FileExtension(NodejsConstants.VisualBasicProjectExtension), FileExtension(NodejsConstants.JavaScriptProjectExtension)]\n[DefaultExecutorUri(NodejsConstants.ExecutorUriString)]\npublic partial class ProjectTestDiscoverer : ITestDiscoverer\n{\n@@ -60,13 +60,11 @@ namespace Microsoft.NodejsTools.TestAdapter\n}\nFrameworkDiscoverer frameworkDiscoverer = null;\n- var testItems = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);\n-\nforeach (var proj in buildEngine.LoadedProjects)\n{\nvar projectHome = Path.GetFullPath(Path.Combine(proj.DirectoryPath, \".\"));\n- testItems = TestFrameworkFactory.GetTestItems(projectHome, proj);\n+ var testItems = TestFrameworkFactory.GetTestItems(projectHome, proj);\nif (testItems.Any())\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"diff": "@@ -92,8 +92,10 @@ namespace Microsoft.NodejsTools.TestAdapter\nthis.cancelRequested.Reset();\nvar testFramework = tests.First().GetPropertyValue(JavaScriptTestCaseProperties.TestFramework, defaultValue: TestFrameworkDirectories.ExportRunnerFrameworkName);\n- if (testFramework == \"Angular\")\n+ if (string.Equals(testFramework, TestFrameworkDirectories.AngularFrameworkName, StringComparison.OrdinalIgnoreCase))\n{\n+ // Every angular run initializes karma, browser, caching, etc,\n+ // so is preferable to let the test adapter handle any optimization.\nRunAllTests(tests);\n}\nelse\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworkFactory.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworkFactory.cs",
"diff": "@@ -4,6 +4,7 @@ using System.IO;\nusing System.Linq;\nusing Microsoft.Build.Evaluation;\nusing Microsoft.NodejsTools.TestAdapter.TestFrameworks;\n+using Microsoft.NodejsTools.TestFrameworks;\nusing Microsoft.NodejsTools.TypeScript;\nusing Microsoft.VisualStudioTools;\n@@ -20,17 +21,14 @@ namespace Microsoft.NodejsTools.TestAdapter\nforeach (var projectItem in projectItems)\n{\n- string testFrameworkName = null;\n// TODO: Consider it can also be inside a <root>/.config/ folder and will configure the <root> folder.\n- if (projectItem.EvaluatedInclude.Contains(\"angular.json\"))\n- {\n- testFrameworkName = \"angular\";\n- }\n// TODO: Add configuration files for jest, mocha , jasmine. Consider that some frameworks can be configured using package.json\n// Also some frameworks have more than one filename to define a configuration.\n// Tape is the only framework we support that doesn't have a configuration file. Decide what to do about that.\n- if (testFrameworkName != null)\n+ if (projectItem.EvaluatedInclude.Contains(\"angular.json\"))\n{\n+ var testFrameworkName = TestFrameworkDirectories.AngularFrameworkName;\n+\nif (!configItems.ContainsKey(testFrameworkName))\n{\nconfigItems.Add(testFrameworkName, new HashSet<string>(StringComparer.OrdinalIgnoreCase));\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"diff": "const fs = require('fs');\nconst os = require('os');\nconst path = require('path');\n-const { spawn } = require(\"child_process\");\n+const { fork } = require(\"child_process\");\nprocess.env.VSTESTADAPTERPATH = __dirname;\n-const karmaConfigName = \"karma.conf.js\";\nconst vsKarmaConfigPath = path.resolve(__dirname, \"./karmaConfig.js\");\n-const find_tests = function (configFiles, discoverResultFile, projectFolder) {\n- return new Promise(resolve => {\n- const angular = detectPackage(projectFolder, '@angular/cli');\n- if (!angular) {\n- return;\n+function getKarmaConfigPath(configFile, configPath) {\n+ let karmaConfigPath = '';\n+ const angularConfig = require(configFile);\n+ for (const projectName of Object.keys(angularConfig.projects)) {\n+ const project = angularConfig.projects[projectName];\n+\n+ karmaConfigPath = project.architect.test\n+ && project.architect.test.options\n+ && project.architect.test.options.karmaConfig\n+ && path.resolve(configPath, project.architect.test.options.karmaConfig);\n+\n+ // TODO: For now, only return the first one found. We need to support multi-project workspaces.\n+ if (karmaConfigPath) {\n+ return karmaConfigPath;\n+ }\n}\n+}\n+\n+const find_tests = function (configFiles, discoverResultFile) {\n+ return new Promise(resolve => {\nfor (let configFile of configFiles.split(';')) {\n- const projectPath = path.dirname(configFile);\n- const karmaConfigPath = path.resolve(projectPath, `./${karmaConfigName}`);\n+ const configPath = path.dirname(configFile);\n- if (!fs.existsSync(karmaConfigPath)) {\n- logError(`Failed to find \"${karmaConfigName}\" file. The \"${karmaConfigName}\" file must exists in the same path as the \"angular.json\" file.`);\n+ if (!detectPackage(configPath, '@angular/cli')) {\ncontinue;\n}\n+ const karmaConfigPath = getKarmaConfigPath(configFile, configPath);\n+\n// Set the environment variable to share it across processes.\n- process.env.PROJECTPATH = projectPath;\n+ process.env.KARMACONFIGPATH = karmaConfigPath;\n+ process.env.PROJECTPATH = configPath;\nprocess.env.TESTCASES = JSON.stringify([{ fullTitle: \"NTVS_Discovery_ThisStringShouldExcludeAllTestCases\" }]);\nprocess.env.ISDISCOVERY = 'true';\n- const ngTest = spawn(\n- process.argv0, // Node executable path\n+ const testsDiscovered = [];\n+\n+ const ngTest = fork(\n+ path.resolve(configPath, \"./node_modules/@angular/cli/bin/ng\"),\n[\n- path.resolve(projectPath, \"./node_modules/@angular/cli/bin/ng\"),\n'test',\n- `--karmaConfig=\"${vsKarmaConfigPath}\"`\n+ `--karmaConfig=${vsKarmaConfigPath}`\n],\n{\n- cwd: projectPath,\n- shell: true,\n- stdio: ['pipe', 'ipc', 'pipe']\n- });\n-\n- const testsDiscovered = [];\n-\n- ngTest.on('message', message => {\n+ cwd: configPath,\n+ }).on('message', message => {\ntestsDiscovered.push(message);\n- });\n- ngTest.on('exit', () => {\n+ // We need to keep track and communicate when we have received a testcase because the IPC channel\n+ // does not guarantees that we'll receive the event on the order it has been emitted.\n+ // Send to the child process as simple signal that we have parsed the testcase.\n+ ngTest.send({});\n+ }).on('exit', () => {\nconst fd = fs.openSync(discoverResultFile, 'w');\nfs.writeSync(fd, JSON.stringify(testsDiscovered));\nfs.closeSync(fd);\n@@ -77,48 +89,41 @@ const run_tests = function (context) {\nreturn new Promise(resolve => {\nconst angular = detectPackage(projectFolder, '@angular/cli');\nif (!angular) {\n- return;\n+ return resolve();\n}\n- const projectPath = path.dirname(configFile);\n- const karmaConfigPath = path.resolve(projectPath, `./${karmaConfigName}`);\n-\n- if (!fs.existsSync(karmaConfigPath)) {\n- logError(`Failed to find \"${karmaConfigName}\" file. The \"${karmaConfigName}\" file must exists in the same path as the \"angular.json\" file.`);\n- return;\n- }\n+ const configPath = path.dirname(configFile);\n// Set the environment variable to share it across processes.\n- process.env.PROJECTPATH = projectPath;\n+ process.env.KARMACONFIGPATH = getKarmaConfigPath(configFile, configPath);\n+ process.env.PROJECTPATH = configPath;\nprocess.env.TESTCASES = JSON.stringify(context.testCases);\n- const ngTest = spawn(\n- process.argv0, //Node executable path\n+ const ngTest = fork(\n+ path.resolve(configPath, \"./node_modules/@angular/cli/bin/ng\"),\n[\n- path.resolve(projectPath, \"./node_modules/@angular/cli/bin/ng\"),\n'test',\n- `--karmaConfig=\"${vsKarmaConfigPath}\"`\n+ `--karmaConfig=${vsKarmaConfigPath}`\n],\n{\n- cwd: projectPath,\n- shell: true,\n- stdio: ['pipe', 'ipc', 'pipe']\n- });\n-\n- ngTest.on(\"message\", message => {\n+ cwd: configPath,\n+ stdio: ['ignore', 1, 2, 'ipc'] // We need to ignore the stdin as NTVS keeps it open and causes the process to wait indefinitely.\n+ }).on(\"message\", message => {\ncontext.post({\ntype: message.pending ? 'pending' : 'result',\nfullyQualifiedName: context.getFullyQualifiedName(message.fullName),\nresult: message\n});\n- });\n- ngTest.on('exit', () => {\n+ ngTest.send({});\n+ }).on('exit', () => {\ncontext.post({\ntype: 'end'\n});\nresolve();\n+ }).on('error', err => {\n+ console.log(err);\n});\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"diff": "@@ -4,12 +4,17 @@ const http = require('http');\nconst path = require('path');\nconst jasmineReporterPath = path.resolve(process.env.VSTESTADAPTERPATH, 'jasmineReporter.js');\n-const testCases = JSON.parse(process.env.TESTCASES);\nconst isDiscovery = process.env.ISDISCOVERY === 'true';\nconst vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter) {\nbaseReporterDecorator(this);\nconst log = logger.create('vsKarmaReporter');\n+ let testCaseCount = 0;\n+\n+ process.on('message', () => {\n+ // We have recieved an indication that the test case has been processed. Decrement the amount\n+ testCaseCount--;\n+ });\nconfig.files.push({\nincluded: true,\n@@ -19,11 +24,15 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n});\nthis.onBrowserError = (browser, error) => {\n+ // TODO: Report error to user\nlog.debug(`onBrowserError: ${JSON.stringify(error)}`);\n+\n+ // If there's an error we want to clear the test cases so that we can finish the process.\n+ testCaseCount = 0;\n}\n// TODO: Is there a better option than onBrowserLog?\n- // So far, since this is runned by multiple out of proc, the only way I have found to communicate\n+ // So far, since this is run by multiple out of proc, the only way I have found to communicate\n// is through the console, thus, the need for capturing the browser log. JasmineReporter uses\n// console.log for this purpose.\nthis.onBrowserLog = (browser, browserLog, type) => {\n@@ -35,6 +44,9 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nreturn;\n}\n+ // Increment the amount of test cases found.\n+ testCaseCount++;\n+\nconst fullFilePath = `${process.env.PROJECTPATH}${result.fileLocation.relativeFilePath}`;\nconst suite = result.fullName.substring(0, result.fullName.length - result.description.length - 1);\n@@ -62,20 +74,22 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nlog.debug(`onBrowserLog: ${JSON.stringify(result)}`);\n}\n- this.onRunComplete = (browsers, results) => {\n+ this.onRunComplete = async (browsers, results) => {\nlog.debug(`onRunComplete: ${JSON.stringify(results)}`);\n- const testCase = testCases.pop();\n- if (testCase) {\n- runTestCase(testCase);\n- } else {\n+ // Wait until we have processed all of the test cases.\n+ while (testCaseCount > 0) {\n+ await sleep(1000);\n+ }\n+\n// We need to exit the process as angular keeps it running and to emit the 'exit' event.\nprocess.exit();\n}\n- }\n// Override specFailure to avoid crashing the process as Karma sends a string output that cannot be parsed as JSON.\n- this.specFailure = () => { }\n+ this.specFailure = () => {\n+ // no-op\n+ }\nlet hasStarted = false;\n@@ -87,7 +101,7 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nhasStarted = true;\n// At least one test case should exists.\n- runTestCase(testCases.pop());\n+ runTestCase();\n}\n});\n@@ -103,9 +117,13 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n};\nconst request = http.request(options);\n- request.end(\n- JSON.stringify({ args: [`--grep=${testCase.fullTitle}`] })\n- );\n+ request.end();\n+ }\n+\n+ async function sleep(ms) {\n+ return new Promise(resolve => {\n+ setTimeout(resolve, ms);\n+ });\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js",
"diff": "@@ -8,6 +8,7 @@ var result = {\n};\nvar find_tests = function (testFileList, discoverResultFile) {\n+ return new Promise(resolve => {\nvar debug;\ntry {\nif (vm.runInDebugContext) {\n@@ -54,10 +55,14 @@ var find_tests = function (testFileList, discoverResultFile) {\nvar fd = fs.openSync(discoverResultFile, 'w');\nfs.writeSync(fd, JSON.stringify(testList));\nfs.closeSync(fd);\n+\n+ resolve();\n+ });\n};\nmodule.exports.find_tests = find_tests;\nvar run_tests = function (context) {\n+ return new Promise(resolve => {\nfor (var test of context.testCases) {\ncontext.post({\ntype: 'test start',\n@@ -81,9 +86,12 @@ var run_tests = function (context) {\n});\ncontext.clearOutputs();\n}\n+\ncontext.callback({\ntype: 'end'\n});\n- process.exit();\n+\n+ resolve();\n+ });\n};\nmodule.exports.run_tests = run_tests;\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jasmine/jasmine.js",
"diff": "@@ -108,9 +108,10 @@ function enumerateSpecs(suite, testList, testFile) {\n* @param {string} projectFolder\n*/\nfunction find_tests(testFileList, discoverResultFile, projectFolder) {\n+ return new Promise(resolve => {\nvar Jasmine = detectJasmine(projectFolder);\nif (!Jasmine) {\n- return;\n+ return resolve();\n}\nvar jasmineInstance = initializeJasmine(Jasmine, projectFolder);\nsetSpecFilter(jasmineInstance, _ => false);\n@@ -135,6 +136,9 @@ function find_tests(testFileList, discoverResultFile, projectFolder) {\nvar fd = fs.openSync(discoverResultFile, 'w');\nfs.writeSync(fd, JSON.stringify(testList));\nfs.closeSync(fd);\n+\n+ resolve();\n+ });\n}\nexports.find_tests = find_tests;\n@@ -175,10 +179,11 @@ function createCustomReporter(context) {\n}\nfunction run_tests(context) {\n+ return new Promise(resolve => {\nvar projectFolder = context.testCases[0].projectFolder;\nvar Jasmine = detectJasmine(projectFolder);\nif (!Jasmine) {\n- return;\n+ return resolve();\n}\nvar testFileList = [];\nvar testNameList = {};\n@@ -199,6 +204,9 @@ function run_tests(context) {\ncatch (ex) {\nlogError(\"Execute test error:\", ex);\n}\n+\n+ resolve();\n+ });\n}\nfunction setSpecFilter(jasmineInstance, specFilter) {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jest.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Jest/jest.js",
"diff": "@@ -5,11 +5,12 @@ const os = require('os');\nconst path = require('path');\nconst find_tests = function (testFileList, discoverResultFile, projectFolder) {\n+ return new Promise(resolve => {\nconst jest = detectPackage(projectFolder, 'jest');\nconst jestEditorSupport = detectPackage(projectFolder, 'jest-editor-support');\nif (!jest || !jestEditorSupport) {\n- return;\n+ return resolve();\n}\nlet testList = [];\n@@ -30,12 +31,16 @@ const find_tests = function (testFileList, discoverResultFile, projectFolder) {\nconst fd = fs.openSync(discoverResultFile, 'w');\nfs.writeSync(fd, JSON.stringify(testList));\nfs.closeSync(fd);\n+\n+ resolve();\n+ });\n};\nconst run_tests = function (context) {\n+ return new Promise(async resolve => {\nconst jest = detectPackage(context.testCases[0].projectFolder, 'jest');\nif (!jest) {\n- return;\n+ return resolve();\n}\n// Start all test cases, as jest is unable to filter out independently\n@@ -52,8 +57,14 @@ const run_tests = function (context) {\ntestMatch: [context.testCases[0].testFile]\n};\n- jest.runCLI(config, [context.testCases[0].projectFolder])\n- .catch((error) => logError(error));\n+ try {\n+ await jest.runCLI(config, [context.testCases[0].projectFolder]);\n+ } catch (error) {\n+ logError(error);\n+ }\n+\n+ resolve();\n+ });\n};\nfunction visitNodes(nodes, suites, tests) {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Tape/tape.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Tape/tape.js",
"diff": "@@ -5,9 +5,10 @@ var fs = require('fs');\nvar path = require('path');\nfunction find_tests(testFileList, discoverResultFile, projectFolder) {\n+ return new Promise(resolve => {\nvar test = findTape(projectFolder);\nif (test === null) {\n- return;\n+ return resolve();\n}\nvar harness = test.getHarness({ exit: false });\n@@ -35,14 +36,17 @@ function find_tests(testFileList, discoverResultFile, projectFolder) {\nvar fd = fs.openSync(discoverResultFile, 'w');\nfs.writeSync(fd, JSON.stringify(testList));\nfs.closeSync(fd);\n+\n+ resolve();\n+ });\n}\nmodule.exports.find_tests = find_tests;\nfunction run_tests(context) {\n-\n+ return new Promise(resolve => {\nvar tape = findTape(context.testCases[0].projectFolder);\nif (tape === null) {\n- return;\n+ return resolve();\n}\n// Since the test events don't come in order we store all of them in this array\n@@ -111,7 +115,6 @@ function run_tests(context) {\n});\nharness.onFinish(function () {\n- // TODO: Not used?\n// loop through items in testState\nfor (var i = 0; i < testState.length; i++) {\nif (testState[i]) {\n@@ -124,7 +127,13 @@ function run_tests(context) {\n//});\n}\n}\n- process.exit(0);\n+\n+ context.post({\n+ type: 'end'\n+ });\n+\n+ return resolve();\n+ });\n});\n}\nmodule.exports.run_tests = run_tests;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/find_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/find_tests.js",
"diff": "//@ts-check\nconst fs = require(\"fs\");\n+async function findTests() {\nlet framework;\ntry {\nframework = require('./' + process.argv[2] + '/' + process.argv[2] + '.js');\n} catch (exception) {\n- console.log(\"NTVS_ERROR:Failed to load TestFramework (\" + process.argv[2] + \"), \" + exception);\n- process.exit(1);\n+ throw new Error(\"NTVS_ERROR:Failed to load TestFramework (\" + process.argv[2] + \"), \" + exception);\n}\ntry {\n@@ -22,8 +22,13 @@ try {\ntestFilesList = testFilesList.slice(1);\n}\n- framework.find_tests(testFilesList, process.argv[4], process.argv[5]);\n+ await framework.find_tests(testFilesList, process.argv[4], process.argv[5]);\n} catch (exception) {\n- console.log(\"NTVS_ERROR:TestFramework (\" + process.argv[2] + \") threw an exception processing (\" + process.argv[3] + \"), \" + exception);\n- process.exit(1);\n+ throw new Error(\"NTVS_ERROR:TestFramework (\" + process.argv[2] + \") threw an exception processing (\" + process.argv[3] + \"), \" + exception);\n+ }\n}\n+\n+findTests().catch(e => {\n+ console.log(e);\n+ process.exit(1);\n+});\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/mocha/mocha.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/mocha/mocha.js",
"diff": "@@ -9,9 +9,10 @@ var path = require('path');\nvar defaultMochaOptions = { ui: 'tdd', reporter: 'tap', timeout: 2000 };\nvar find_tests = function (testFileList, discoverResultFile, projectFolder) {\n+ return new Promise(resolve => {\nvar Mocha = detectMocha(projectFolder);\nif (!Mocha) {\n- return;\n+ return resolve();\n}\nfunction getTestList(suite, testFile) {\n@@ -54,6 +55,9 @@ var find_tests = function (testFileList, discoverResultFile, projectFolder) {\nvar fd = fs.openSync(discoverResultFile, 'w');\nfs.writeSync(fd, JSON.stringify(testList));\nfs.closeSync(fd);\n+\n+ resolve();\n+ });\n};\nmodule.exports.find_tests = find_tests;\n@@ -63,9 +67,10 @@ var run_tests = function (context) {\nreturn string.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&'); // $& means the whole matched string\n}\n+ return new Promise(resolve => {\nvar Mocha = detectMocha(context.testCases[0].projectFolder);\nif (!Mocha) {\n- return;\n+ return resolve();\n}\nvar mocha = initializeMocha(Mocha, context.testCases[0].projectFolder);\n@@ -108,6 +113,8 @@ var run_tests = function (context) {\ncontext.post({\ntype: 'end'\n});\n+\n+ resolve();\n});\nrunner.on('pass', function (test) {\n@@ -137,6 +144,7 @@ var run_tests = function (context) {\n});\ncontext.clearOutputs();\n});\n+ });\n};\nfunction logError() {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js",
"diff": "@@ -6,7 +6,7 @@ var rl = readline.createInterface({\noutput: process.stdout\n});\n-rl.on('line', function (line) {\n+rl.on('line', async function (line) {\nrl.close();\n// strip the BOM in case of UTF-8\n@@ -25,13 +25,11 @@ rl.on('line', function (line) {\ntry {\nframework = require('./' + context.testCases[0].framework + '/' + context.testCases[0].framework + '.js');\n+ await framework.run_tests(context);\n} catch (exception) {\nconsole.log(\"NTVS_ERROR:Failed to load TestFramework (\" + context.testCases[0].framework + \"), \" + exception);\nprocess.exit(1);\n}\n-\n- // run the test\n- framework.run_tests(context);\n});\nfunction createContext(line) {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TypeScript/TypeScriptHelpers.cs",
"new_path": "Nodejs/Product/TypeScript/TypeScriptHelpers.cs",
"diff": "@@ -45,7 +45,7 @@ namespace Microsoft.NodejsTools.TypeScript\nreturn StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.NodejsProjectExtension)\n|| StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.CSharpProjectExtension)\n|| StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.VisualBasicProjectExtension)\n- || StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.AngularProjectExtension);\n+ || StringComparer.OrdinalIgnoreCase.Equals(extension, NodejsConstants.JavaScriptProjectExtension);\n}\n#if !NETSTANDARD2_0\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Address PR comments. Make test adapteres async. Fix angular, IPC communication. Fix grep regex
|
410,221 |
29.10.2020 11:15:05
| 25,200 |
7f895aad7d501da24ecf9a5eee3599a589aa186b
|
fix: source map overrides changed to dictionary
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -652,7 +652,7 @@ namespace Microsoft.NodejsTools.Project\npublic object Server { get; set; }\n[JsonProperty(\"sourceMapPathOverrides\")]\n- public string[] SourceMapPathOverrides { get; set; }\n+ public Dictionary<string, string> SourceMapPathOverrides { get; set; }\n[JsonProperty(\"restart\")]\npublic bool RestartPolicy { get; set; }\n@@ -669,7 +669,6 @@ namespace Microsoft.NodejsTools.Project\npublic object toPwaChromeServerConfig()\n{\nthis.Console = \"internalConsole\";\n- this.SourceMapPathOverrides = new string[0];\nreturn this;\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
fix: source map overrides changed to dictionary
|
410,221 |
29.10.2020 13:40:17
| 25,200 |
dcc98f0f878c36bbbdf665c8a24c31485fab70c8
|
adding back the blank sourceMapPathOverrides param
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs",
"diff": "@@ -669,6 +669,7 @@ namespace Microsoft.NodejsTools.Project\npublic object toPwaChromeServerConfig()\n{\nthis.Console = \"internalConsole\";\n+ this.SourceMapPathOverrides = new Dictionary<string, string>();\nreturn this;\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
adding back the blank sourceMapPathOverrides param
|
410,202 |
02.11.2020 12:05:16
| 28,800 |
a475e8977d9e67a2aca6a4b561682833d03af1f6
|
Added multiproject support
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"diff": "@@ -185,7 +185,12 @@ namespace Microsoft.NodejsTools.TestAdapter\nnodeArgs.Add(args.RunTestsScriptFile);\n}\n- testObjects.Add(new TestCaseObject(framework: args.TestFramework, fullyQualifiedName: args.fullyQualifiedName, testFile: args.TestFile, workingFolder: args.WorkingDirectory, projectFolder: args.ProjectRootDir));\n+ testObjects.Add(new TestCaseObject(\n+ framework: args.TestFramework,\n+ fullyQualifiedName: args.fullyQualifiedName,\n+ testFile: args.TestFile,\n+ workingFolder: args.WorkingDirectory,\n+ projectFolder: args.ProjectRootDir));\n}\nvar port = 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"diff": "@@ -9,51 +9,66 @@ process.env.VSTESTADAPTERPATH = __dirname;\nconst vsKarmaConfigPath = path.resolve(__dirname, \"./karmaConfig.js\");\n-function getKarmaConfigPath(configFile, configPath) {\n- let karmaConfigPath = '';\n+function getTestProjects(configFile) {\n+ const configPath = path.dirname(configFile);\n+\n+ const angularProjects = [];\nconst angularConfig = require(configFile);\nfor (const projectName of Object.keys(angularConfig.projects)) {\nconst project = angularConfig.projects[projectName];\n- karmaConfigPath = project.architect.test\n+ const karmaConfigPath = project.architect.test\n&& project.architect.test.options\n&& project.architect.test.options.karmaConfig\n&& path.resolve(configPath, project.architect.test.options.karmaConfig);\n- // TODO: For now, only return the first one found. We need to support multi-project workspaces.\nif (karmaConfigPath) {\n- return karmaConfigPath;\n+ angularProjects.push({\n+ angularConfigPath: configPath,\n+ karmaConfigPath,\n+ name: projectName,\n+ });\n}\n}\n+\n+ return angularProjects;\n}\n-const find_tests = function (configFiles, discoverResultFile) {\n- return new Promise(resolve => {\n- for (let configFile of configFiles.split(';')) {\n+const find_tests = async function (configFiles, discoverResultFile) {\n+ const projects = [];\n+\n+ for (const configFile of configFiles.split(';')) {\nconst configPath = path.dirname(configFile);\nif (!detectPackage(configPath, '@angular/cli')) {\ncontinue;\n}\n- const karmaConfigPath = getKarmaConfigPath(configFile, configPath);\n+ projects.push(...getTestProjects(configFile));\n+ }\n- // Set the environment variable to share it across processes.\n- process.env.KARMACONFIGPATH = karmaConfigPath;\n- process.env.PROJECTPATH = configPath;\nprocess.env.TESTCASES = JSON.stringify([{ fullTitle: \"NTVS_Discovery_ThisStringShouldExcludeAllTestCases\" }]);\nprocess.env.ISDISCOVERY = 'true';\nconst testsDiscovered = [];\n+ for (const project of projects) {\n+ // Loop each project one by one. I'm not sure why multiple instances gets locked. We do receive an Angular warning\n+ // on a lock file for building the project, that might be the reason.\n+ await new Promise((resolve, reject) => {\nconst ngTest = fork(\n- path.resolve(configPath, \"./node_modules/@angular/cli/bin/ng\"),\n+ path.resolve(project.angularConfigPath, \"./node_modules/@angular/cli/bin/ng\"),\n[\n'test',\n+ project.name,\n`--karmaConfig=${vsKarmaConfigPath}`\n],\n{\n- cwd: configPath,\n+ env: {\n+ ...process.env,\n+ PROJECT: JSON.stringify(project)\n+ },\n+ cwd: project.angularConfigPath,\n}).on('message', message => {\ntestsDiscovered.push(message);\n@@ -61,24 +76,21 @@ const find_tests = function (configFiles, discoverResultFile) {\n// does not guarantees that we'll receive the event on the order it has been emitted.\n// Send to the child process as simple signal that we have parsed the testcase.\nngTest.send({});\n- }).on('exit', () => {\n- const fd = fs.openSync(discoverResultFile, 'w');\n- fs.writeSync(fd, JSON.stringify(testsDiscovered));\n- fs.closeSync(fd);\n-\n- resolve();\n+ }).on('error', err => {\n+ reject(err);\n+ }).on('exit', (code) => {\n+ resolve(code);\n});\n- };\n});\n}\n-const run_tests = function (context) {\n- const projectFolder = context.testCases[0].projectFolder;\n-\n- // TODO: Handle the scenario where Angular.json may not exists on a child folder instead of root.\n- // One way would be to send the location of angular.json instead of assuming it's on root.\n- const configFile = `${projectFolder}/angular.json`;\n+ // Save tests to file.\n+ const fd = fs.openSync(discoverResultFile, 'w');\n+ fs.writeSync(fd, JSON.stringify(testsDiscovered));\n+ fs.closeSync(fd);\n+}\n+const run_tests = async function (context) {\nfor (const testCase of context.testCases) {\ncontext.post({\ntype: 'test start',\n@@ -86,29 +98,43 @@ const run_tests = function (context) {\n});\n}\n- return new Promise(resolve => {\n- const angular = detectPackage(projectFolder, '@angular/cli');\n- if (!angular) {\n- return resolve();\n+ // Get all the projects\n+ const projects = [];\n+ const angularConfigPaths = new Set();\n+ for (let testCase of context.testCases) {\n+ if (!angularConfigPaths.has(testCase.projectFolder)) {\n+ angularConfigPaths.add(testCase.projectFolder);\n+\n+ if (!detectPackage(testCase.projectFolder, '@angular/cli')) {\n+ continue;\n}\n- const configPath = path.dirname(configFile);\n+ projects.push(...getTestProjects(`${testCase.projectFolder}/angular.json`));\n+ }\n+ }\n// Set the environment variable to share it across processes.\n- process.env.KARMACONFIGPATH = getKarmaConfigPath(configFile, configPath);\n- process.env.PROJECTPATH = configPath;\nprocess.env.TESTCASES = JSON.stringify(context.testCases);\n+ for (const project of projects) {\n+ // Loop each project one by one. I'm not sure why multiple instances gets locked. We do receive an Angular warning\n+ // on a lock file for building the project, that might be the reason.\n+ await new Promise((resolve, reject) => {\nconst ngTest = fork(\n- path.resolve(configPath, \"./node_modules/@angular/cli/bin/ng\"),\n+ path.resolve(project.angularConfigPath, \"./node_modules/@angular/cli/bin/ng\"),\n[\n'test',\n+ project.name,\n`--karmaConfig=${vsKarmaConfigPath}`\n],\n{\n- cwd: configPath,\n+ env: {\n+ ...process.env,\n+ PROJECT: JSON.stringify(project)\n+ },\n+ cwd: project.angularConfigPath,\nstdio: ['ignore', 1, 2, 'ipc'] // We need to ignore the stdin as NTVS keeps it open and causes the process to wait indefinitely.\n- }).on(\"message\", message => {\n+ }).on('message', message => {\ncontext.post({\ntype: message.pending ? 'pending' : 'result',\nfullyQualifiedName: context.getFullyQualifiedName(message.fullName),\n@@ -117,14 +143,15 @@ const run_tests = function (context) {\nngTest.send({});\n}).on('exit', () => {\n- context.post({\n- type: 'end'\n- });\n-\nresolve();\n}).on('error', err => {\n- console.log(err);\n+ reject(err);\n+ });\n});\n+ }\n+\n+ context.post({\n+ type: 'end'\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"diff": "@@ -16,7 +16,7 @@ function getFileLocation() {\nreturn match\n? {\n- relativeFilePath: match[1], // Relative to root. This is due to webpack.\n+ relativeFilePath: match[1], // Relative to karma config. This is due to webpack.\nline: match[2],\ncolumn: match[3]\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/karmaConfig.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/karmaConfig.js",
"diff": "@@ -3,15 +3,15 @@ const path = require('path');\nconst reporterPath = path.resolve(process.env.VSTESTADAPTERPATH, 'vsKarmaReporter.js');\nconst testCases = JSON.parse(process.env.TESTCASES);\n-const karmaConfigPath = process.env.KARMACONFIGPATH;\n+const project = JSON.parse(process.env.PROJECT);\nmodule.exports = function (config) {\n- const karmaConfig = require(karmaConfigPath);\n+ const karmaConfig = require(project.karmaConfigPath);\nkarmaConfig(config);\nconfig.autoWatch = false;\n- config.browsers = ['ChromeHeadless'];\n+ config.browsers = ['Chrome'];\nconfig.logLevel = config.LOG_DISABLE;\n// Keep the original plugins\nconfig.plugins = config.plugins || [];\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"diff": "@@ -5,6 +5,7 @@ const path = require('path');\nconst jasmineReporterPath = path.resolve(process.env.VSTESTADAPTERPATH, 'jasmineReporter.js');\nconst isDiscovery = process.env.ISDISCOVERY === 'true';\n+const project = JSON.parse(process.env.PROJECT);\nconst vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter) {\nbaseReporterDecorator(this);\n@@ -47,7 +48,7 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n// Increment the amount of test cases found.\ntestCaseCount++;\n- const fullFilePath = `${process.env.PROJECTPATH}${result.fileLocation.relativeFilePath}`;\n+ const fullFilePath = path.join(path.dirname(project.karmaConfigPath), result.fileLocation.relativeFilePath);\nconst suite = result.fullName.substring(0, result.fullName.length - result.description.length - 1);\nlet errorLog = \"\";\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added multiproject support
|
410,202 |
02.11.2020 22:20:41
| 28,800 |
e1579a8d318e1a11789a209b9a7f4baa9960d0c9
|
Fixed bug with rootpath on angular unit tests
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"diff": "@@ -7,7 +7,7 @@ const { fork } = require(\"child_process\");\nprocess.env.VSTESTADAPTERPATH = __dirname;\n-const vsKarmaConfigPath = path.resolve(__dirname, \"./karmaConfig.js\");\n+const vsKarmaConfigFilePath = path.resolve(__dirname, \"./karmaConfig.js\");\nfunction getTestProjects(configFile) {\nconst configPath = path.dirname(configFile);\n@@ -17,16 +17,17 @@ function getTestProjects(configFile) {\nfor (const projectName of Object.keys(angularConfig.projects)) {\nconst project = angularConfig.projects[projectName];\n- const karmaConfigPath = project.architect.test\n+ const karmaConfigFilePath = project.architect.test\n&& project.architect.test.options\n&& project.architect.test.options.karmaConfig\n&& path.resolve(configPath, project.architect.test.options.karmaConfig);\n- if (karmaConfigPath) {\n+ if (karmaConfigFilePath) {\nangularProjects.push({\nangularConfigPath: configPath,\n- karmaConfigPath,\n+ karmaConfigFilePath,\nname: projectName,\n+ rootPath: path.join(configPath, project.root),\n});\n}\n}\n@@ -61,7 +62,7 @@ const find_tests = async function (configFiles, discoverResultFile) {\n[\n'test',\nproject.name,\n- `--karmaConfig=${vsKarmaConfigPath}`\n+ `--karmaConfig=${vsKarmaConfigFilePath}`\n],\n{\nenv: {\n@@ -78,7 +79,7 @@ const find_tests = async function (configFiles, discoverResultFile) {\nngTest.send({});\n}).on('error', err => {\nreject(err);\n- }).on('exit', (code) => {\n+ }).on('exit', code => {\nresolve(code);\n});\n});\n@@ -125,7 +126,7 @@ const run_tests = async function (context) {\n[\n'test',\nproject.name,\n- `--karmaConfig=${vsKarmaConfigPath}`\n+ `--karmaConfig=${vsKarmaConfigFilePath}`\n],\n{\nenv: {\n@@ -142,8 +143,8 @@ const run_tests = async function (context) {\n});\nngTest.send({});\n- }).on('exit', () => {\n- resolve();\n+ }).on('exit', code => {\n+ resolve(code);\n}).on('error', err => {\nreject(err);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/jasmineReporter.js",
"diff": "@@ -16,7 +16,7 @@ function getFileLocation() {\nreturn match\n? {\n- relativeFilePath: match[1], // Relative to karma config. This is due to webpack.\n+ relativeFilePath: match[1], // Relative to project root defined on angular.json.\nline: match[2],\ncolumn: match[3]\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/karmaConfig.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/karmaConfig.js",
"diff": "@@ -6,7 +6,7 @@ const testCases = JSON.parse(process.env.TESTCASES);\nconst project = JSON.parse(process.env.PROJECT);\nmodule.exports = function (config) {\n- const karmaConfig = require(project.karmaConfigPath);\n+ const karmaConfig = require(project.karmaConfigFilePath);\nkarmaConfig(config);\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"diff": "@@ -48,7 +48,7 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\n// Increment the amount of test cases found.\ntestCaseCount++;\n- const fullFilePath = path.join(path.dirname(project.karmaConfigPath), result.fileLocation.relativeFilePath);\n+ const fullFilePath = path.join(project.rootPath, result.fileLocation.relativeFilePath);\nconst suite = result.fullName.substring(0, result.fullName.length - result.description.length - 1);\nlet errorLog = \"\";\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed bug with rootpath on angular unit tests
|
410,202 |
04.11.2020 17:36:34
| 28,800 |
ff70d1add6bbaf6fc393f41542a34e53474cc792
|
Added configPath to test adapter
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/JavaScriptTestCaseProperties.cs",
"new_path": "Nodejs/Product/TestAdapter/JavaScriptTestCaseProperties.cs",
"diff": "@@ -11,5 +11,6 @@ namespace Microsoft.NodejsTools.TestAdapter\npublic static readonly TestProperty NodeExePath = TestProperty.Register(id: $\"NodeTools.{nameof(NodeExePath)}\", label: nameof(NodeExePath), valueType: typeof(string), owner: typeof(TestCase));\npublic static readonly TestProperty ProjectRootDir = TestProperty.Register(id: $\"NodeTools.{nameof(ProjectRootDir)}\", label: nameof(ProjectRootDir), valueType: typeof(string), owner: typeof(TestCase));\npublic static readonly TestProperty TestFile = TestProperty.Register(id: $\"NodeTools.{nameof(TestFile)}\", label: nameof(TestFile), valueType: typeof(string), owner: typeof(TestCase));\n+ public static readonly TestProperty ConfigPath = TestProperty.Register(id: $\"NodeTools.{nameof(ConfigPath)}\", label: nameof(ConfigPath), valueType: typeof(string), owner: typeof(TestCase));\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/SerializationHelpers.cs",
"new_path": "Nodejs/Product/TestAdapter/SerializationHelpers.cs",
"diff": "@@ -40,19 +40,22 @@ internal sealed class TestCaseObject\nthis.testFile = string.Empty;\nthis.workingFolder = string.Empty;\nthis.projectFolder = string.Empty;\n+ this.configPath = string.Empty;\n}\n- public TestCaseObject(string framework, string fullyQualifiedName, string testFile, string workingFolder, string projectFolder)\n+ public TestCaseObject(string framework, string fullyQualifiedName, string testFile, string workingFolder, string projectFolder, string configPath)\n{\nthis.framework = framework;\nthis.fullyQualifiedName = fullyQualifiedName;\nthis.testFile = testFile;\nthis.workingFolder = workingFolder;\nthis.projectFolder = projectFolder;\n+ this.configPath = configPath;\n}\npublic string framework { get; set; }\npublic string fullyQualifiedName { get; set; }\npublic string testFile { get; set; }\npublic string workingFolder { get; set; }\npublic string projectFolder { get; set; }\n+ public string configPath { get; set; }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"diff": "@@ -78,6 +78,7 @@ namespace Microsoft.NodejsTools.TestAdapter\ntestCase.SetPropertyValue(JavaScriptTestCaseProperties.ProjectRootDir, this.workingDir);\ntestCase.SetPropertyValue(JavaScriptTestCaseProperties.NodeExePath, this.nodeExePath);\ntestCase.SetPropertyValue(JavaScriptTestCaseProperties.TestFile, filePath);\n+ testCase.SetPropertyValue(JavaScriptTestCaseProperties.ConfigPath, discoveredTest.ConfigPath);\ndiscoverySink.SendTestCase(testCase);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestExecutorWorker.cs",
"diff": "@@ -157,7 +157,6 @@ namespace Microsoft.NodejsTools.TestAdapter\n// All tests being run are for the same test file, so just use the first test listed to get the working dir\nvar firstTest = tests.First().TestCase;\n- var testFramework = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.TestFramework, defaultValue: TestFrameworkDirectories.ExportRunnerFrameworkName);\nvar workingDir = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.WorkingDir, defaultValue: Path.GetDirectoryName(firstTest.CodeFilePath));\nvar nodeExePath = firstTest.GetPropertyValue<string>(JavaScriptTestCaseProperties.NodeExePath, defaultValue: null);\nvar projectRootDir = firstTest.GetPropertyValue(JavaScriptTestCaseProperties.ProjectRootDir, defaultValue: Path.GetDirectoryName(firstTest.CodeFilePath));\n@@ -190,7 +189,8 @@ namespace Microsoft.NodejsTools.TestAdapter\nfullyQualifiedName: args.fullyQualifiedName,\ntestFile: args.TestFile,\nworkingFolder: args.WorkingDirectory,\n- projectFolder: args.ProjectRootDir));\n+ projectFolder: args.ProjectRootDir,\n+ configPath: args.ConfigPath));\n}\nvar port = 0;\n@@ -384,7 +384,8 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\nvar testFile = test.GetPropertyValue(JavaScriptTestCaseProperties.TestFile, defaultValue: test.CodeFilePath);\nvar testFramework = test.GetPropertyValue<string>(JavaScriptTestCaseProperties.TestFramework, defaultValue: null);\n- return this.frameworkDiscoverer.GetFramework(testFramework).GetArgumentsToRunTests(test.FullyQualifiedName, testFile, workingDir, projectRootDir);\n+ var configPath = test.GetPropertyValue<string>(JavaScriptTestCaseProperties.ConfigPath, defaultValue: null);\n+ return this.frameworkDiscoverer.GetFramework(testFramework).GetArgumentsToRunTests(test.FullyQualifiedName, testFile, workingDir, projectRootDir, configPath);\n}\nprivate static string GetDebugArgs(Version nodeVersion, out int port)\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/vsKarmaReporter.js",
"diff": "@@ -64,6 +64,7 @@ const vsKarmaReporter = function (baseReporterDecorator, config, logger, emitter\nfilepath: fullFilePath,\nline: result.fileLocation.line,\ncolumn: result.fileLocation.column,\n+ configPath: project.angularConfigPath,\n// Execution properties\npassed: result.status === \"passed\",\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/NodejsTestInfo.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/NodejsTestInfo.cs",
"diff": "@@ -8,7 +8,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\n{\npublic sealed class NodejsTestInfo\n{\n- public NodejsTestInfo(string testPath, string suite, string testName, string testFramework, int line, int column, string projectRootDir)\n+ public NodejsTestInfo(string testPath, string suite, string testName, string testFramework, int line, int column, string projectRootDir, string configPath)\n{\nvar testFileRelative = CommonUtils.GetRelativeFilePath(projectRootDir, testPath);\n@@ -19,6 +19,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\nthis.SourceLine = line;\nthis.SourceColumn = column;\nthis.Suite = suite;\n+ this.ConfigPath = configPath;\n}\npublic string FullyQualifiedName\n@@ -52,5 +53,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\npublic int SourceColumn { get; }\npublic string Suite { get; }\n+\n+ public string ConfigPath { get; }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/TestFramework.cs",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/TestFramework.cs",
"diff": "@@ -96,14 +96,14 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\n{\nvar line = discoveredTest.Line + 1;\nvar column = discoveredTest.Column + 1;\n- var test = new NodejsTestInfo(discoveredTest.Filepath, discoveredTest.Suite, discoveredTest.Name, this.Name, line, column, projectRoot);\n+ var test = new NodejsTestInfo(discoveredTest.Filepath, discoveredTest.Suite, discoveredTest.Name, this.Name, line, column, projectRoot, discoveredTest.ConfigPath);\ntestCases.Add(test);\n}\n}\nreturn testCases;\n}\n- public ArgumentsToRunTests GetArgumentsToRunTests(string fullyQualifiedName, string testFile, string workingDirectory, string projectRootDir)\n+ public ArgumentsToRunTests GetArgumentsToRunTests(string fullyQualifiedName, string testFile, string workingDirectory, string projectRootDir, string configPath)\n{\nworkingDirectory = workingDirectory.TrimEnd('\\\\');\nprojectRootDir = projectRootDir.TrimEnd('\\\\');\n@@ -113,7 +113,8 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\nfullyQualifiedName,\ntestFile,\nworkingDirectory,\n- projectRootDir);\n+ projectRootDir,\n+ configPath);\n}\nprivate static string WrapWithQuotes(string path)\n@@ -172,6 +173,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\npublic string Filepath;\npublic int Line;\npublic int Column;\n+ public string ConfigPath;\n#pragma warning restore CS0649\n}\n@@ -206,7 +208,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\npublic sealed class ArgumentsToRunTests\n{\n- public ArgumentsToRunTests(string runTestsScriptFile, string testFramework, string fullyQualifiedName, string testFile, string workingDirectory, string projectRootDir)\n+ public ArgumentsToRunTests(string runTestsScriptFile, string testFramework, string fullyQualifiedName, string testFile, string workingDirectory, string projectRootDir, string configPath)\n{\nthis.RunTestsScriptFile = WrapWithQuotes(runTestsScriptFile);\nthis.TestFramework = testFramework;\n@@ -214,6 +216,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\nthis.TestFile = WrapWithQuotes(testFile);\nthis.WorkingDirectory = WrapWithQuotes(workingDirectory);\nthis.ProjectRootDir = WrapWithQuotes(projectRootDir);\n+ this.ConfigPath = WrapWithQuotes(configPath);\n}\npublic readonly string RunTestsScriptFile;\n@@ -222,6 +225,7 @@ namespace Microsoft.NodejsTools.TestAdapter.TestFrameworks\npublic readonly string TestFile;\npublic readonly string WorkingDirectory;\npublic readonly string ProjectRootDir;\n+ public readonly string ConfigPath;\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added configPath to test adapter
|
410,202 |
05.11.2020 16:31:58
| 28,800 |
ef7ad4623c9375863292b59da9b5fb0a7c48ca05
|
Added .NET Core support. Project and cli.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"new_path": "Nodejs/Product/TestAdapter/TestFrameworks/Angular/Angular.js",
"diff": "@@ -103,14 +103,14 @@ const run_tests = async function (context) {\nconst projects = [];\nconst angularConfigPaths = new Set();\nfor (let testCase of context.testCases) {\n- if (!angularConfigPaths.has(testCase.projectFolder)) {\n- angularConfigPaths.add(testCase.projectFolder);\n+ if (!angularConfigPaths.has(testCase.configPath)) {\n+ angularConfigPaths.add(testCase.configPath);\n- if (!detectPackage(testCase.projectFolder, '@angular/cli')) {\n+ if (!detectPackage(testCase.configPath, '@angular/cli')) {\ncontinue;\n}\n- projects.push(...getTestProjects(`${testCase.projectFolder}/angular.json`));\n+ projects.push(...getTestProjects(`${testCase.configPath}/angular.json`));\n}\n}\n@@ -157,18 +157,18 @@ const run_tests = async function (context) {\n}\nfunction detectPackage(projectFolder, packageName) {\n- try {\nconst packagePath = path.join(projectFolder, 'node_modules', packageName);\n- const pkg = require(packagePath);\n- return pkg;\n- } catch (ex) {\n+ if (!fs.existsSync(packagePath)) {\nlogError(\n`Failed to find \"${packageName}\" package. \"${packageName}\" must be installed in the project locally.` + os.EOL +\n`Install \"${packageName}\" locally using the npm manager via solution explorer` + os.EOL +\n`or with \".npm install ${packageName} --save-dev\" via the Node.js interactive window.`);\n- return null;\n+\n+ return false;\n}\n+\n+ return true;\n}\nfunction logError() {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.JavaScript.UnitTest.nuspec",
"new_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.JavaScript.UnitTest.nuspec",
"diff": "<file src=\"$outdir$TestFrameworks\\Tape\\Tape.js\" target=\"build\\_common\\TestFrameworks\\Tape\\\" />\n<file src=\"$outdir$TestFrameworks\\Jest\\jest.js\" target=\"build\\_common\\TestFrameworks\\Jest\\\" />\n<file src=\"$outdir$TestFrameworks\\Jest\\jestReporter.js\" target=\"build\\_common\\TestFrameworks\\Jest\\\" />\n+ <file src=\"$outdir$TestFrameworks\\Angular\\*.js\" target=\"build\\_common\\TestFrameworks\\Angular\\\" />\n<!--net standard library-->\n<file src=\"$outdir$Microsoft.JavaScript.UnitTest.props\" target=\"build\\netstandard2.0\\\" />\n<file src=\"$outdir$Microsoft.JavaScript.UnitTest.targets\" target=\"build\\netstandard2.0\\\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/NetCoreTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapterNetStandard/NetCoreTestDiscoverer.cs",
"diff": "@@ -6,6 +6,8 @@ using System.IO;\nusing System.Linq;\nusing System.Xml.Linq;\nusing Microsoft.NodejsTools.TestAdapter.TestFrameworks;\n+using Microsoft.NodejsTools.TestFrameworks;\n+using Microsoft.NodejsTools.TypeScript;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;\n@@ -69,6 +71,12 @@ namespace Microsoft.NodejsTools.TestAdapter\n}\nforeach (var (projectFile, propertyGroup) in projects)\n+ {\n+ var projectHome = Path.GetDirectoryName(projectFile);\n+\n+ // Prioritize configuration files over manually setup tests files.\n+ var testItems = this.GetConfigItems(projectHome);\n+ if (!testItems.Any())\n{\nvar testFramework = propertyGroup.Descendants(NodeProjectProperty.TestFramework).FirstOrDefault()?.Value;\nvar testRoot = propertyGroup.Descendants(NodeProjectProperty.TestRoot).FirstOrDefault()?.Value;\n@@ -80,8 +88,6 @@ namespace Microsoft.NodejsTools.TestAdapter\ncontinue;\n}\n- var projectHome = Path.GetDirectoryName(projectFile);\n- var testItems = new HashSet<string>(StringComparer.OrdinalIgnoreCase);\nvar testFolder = Path.Combine(projectHome, testRoot);\nif (!Directory.Exists(testFolder))\n@@ -90,30 +96,11 @@ namespace Microsoft.NodejsTools.TestAdapter\ncontinue;\n}\n- // grab all files, we try for .ts files first, and only parse the .js files if we don't find any\n- foreach (var file in Directory.EnumerateFiles(testFolder, \"*.ts\", SearchOption.AllDirectories))\n- {\n- ProcessFiles(file);\n- }\n-\n- if (!testItems.Any())\n- {\n- foreach (var file in Directory.EnumerateFiles(testFolder, \"*.js\", SearchOption.AllDirectories))\n- {\n- ProcessFiles(file);\n- }\n+ testItems = this.GetTestItems(testFolder, testFramework, outDir);\n}\nif (testItems.Any())\n{\n-\n- var testFx = frameworkDiscoverer.GetFramework(testFramework);\n- if (testFx == null)\n- {\n- logger.SendMessage(TestMessageLevel.Warning, $\"Ignoring unsupported test framework '{testFramework}'.\");\n- return;\n- }\n-\nvar nodeExePath = Nodejs.GetAbsoluteNodeExePath(projectHome, propertyGroup.Descendants(NodeProjectProperty.NodeExePath).FirstOrDefault()?.Value);\nif (string.IsNullOrEmpty(nodeExePath))\n{\n@@ -121,36 +108,87 @@ namespace Microsoft.NodejsTools.TestAdapter\nnodeExePath = Nodejs.GetPathToNodeExecutableFromEnvironment();\n}\n- this.DiscoverTests(testItems, testFx, discoverySink, logger, nodeExePath, projectFile);\n+ this.DiscoverTests(testItems, frameworkDiscoverer, discoverySink, logger, nodeExePath, projectFile);\n+ }\n+ }\n+ }\n+ catch (Exception ex)\n+ {\n+ logger.SendMessage(TestMessageLevel.Error, ex.Message);\n+ throw;\n+ }\n}\n- void ProcessFiles(string fileAbsolutePath)\n+ private void DiscoverTests(Dictionary<string, HashSet<string>> testItems, FrameworkDiscoverer frameworkDiscoverer, ITestCaseDiscoverySink discoverySink, IMessageLogger logger, string nodeExePath, string projectFullPath)\n{\n- var typeScriptTest = TypeScript.TypeScriptHelpers.IsTypeScriptFile(fileAbsolutePath);\n- if (typeScriptTest)\n+ foreach (var testFx in testItems.Keys)\n{\n- fileAbsolutePath = TypeScript.TypeScriptHelpers.GetTypeScriptBackedJavaScriptFile(projectHome, outDir, fileAbsolutePath);\n- }\n- else if (!StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(fileAbsolutePath), \".js\"))\n+ var testFramework = frameworkDiscoverer.GetFramework(testFx);\n+ if (testFramework == null)\n{\n- return;\n+ logger.SendMessage(TestMessageLevel.Warning, $\"Ignoring unsupported test framework '{testFx}'.\");\n+ continue;\n+ }\n+\n+ var fileList = testItems[testFx];\n+\n+ var discoverWorker = new TestDiscovererWorker(projectFullPath, NodejsConstants.ExecutorUri, nodeExePath);\n+ discoverWorker.DiscoverTests(fileList, testFramework, logger, discoverySink);\n+ }\n}\n- testItems.Add(fileAbsolutePath);\n+ private Dictionary<string, HashSet<string>> GetConfigItems(string projectRoot)\n+ {\n+ var files = Directory.EnumerateFiles(projectRoot, \"angular.json\", SearchOption.AllDirectories)\n+ .Where(x => !x.Contains(\"\\\\node_modules\\\\\"));\n+ if (files.Any())\n+ {\n+ return new Dictionary<string, HashSet<string>>()\n+ {\n+ {\n+ TestFrameworkDirectories.AngularFrameworkName,\n+ new HashSet<string>(files)\n}\n+ };\n}\n+\n+ return default;\n}\n- catch (Exception ex)\n+\n+ private Dictionary<string, HashSet<string>> GetTestItems(string projectRoot, string testFramework, string outDir)\n{\n- logger.SendMessage(TestMessageLevel.Error, ex.Message);\n- throw;\n+ // If we find ts or tsx files, get the JS file and return.\n+ var files = Directory.EnumerateFiles(projectRoot, \"*.ts?\", SearchOption.AllDirectories)\n+ .Where(x => !x.Contains(\"\\\\node_modules\\\\\"));\n+ if (files.Any())\n+ {\n+ var testFilePaths = files\n+ .Where(x => TypeScriptHelpers.IsTypeScriptFile(x))\n+ .Select(x => TypeScriptHelpers.GetTypeScriptBackedJavaScriptFile(x, projectRoot, outDir));\n+\n+ return new Dictionary<string, HashSet<string>>()\n+ {\n+ {\n+ testFramework,\n+ new HashSet<string>(testFilePaths)\n}\n+ };\n}\n- private void DiscoverTests(HashSet<string> fileList, TestFramework testFramework, ITestCaseDiscoverySink discoverySink, IMessageLogger logger, string nodeExePath, string projectFullPath)\n+ files = Directory.EnumerateFiles(projectRoot, \"*.js\", SearchOption.AllDirectories)\n+ .Where(x => !x.Contains(\"\\\\node_modules\\\\\"));\n+ if (files.Any())\n{\n- var discoverWorker = new TestDiscovererWorker(projectFullPath, NodejsConstants.ExecutorUri, nodeExePath);\n- discoverWorker.DiscoverTests(fileList, testFramework, logger, discoverySink);\n+ return new Dictionary<string, HashSet<string>>()\n+ {\n+ {\n+ testFramework,\n+ new HashSet<string>(files)\n+ }\n+ };\n+ }\n+\n+ return default;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "<Content Include=\"..\\TestAdapter\\TestFrameworks\\Jest\\jestReporter.js\" Link=\"TestFrameworks\\Jest\\jestReporter.js\">\n<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n</Content>\n+ <Content Include=\"..\\TestAdapter\\TestFrameworks\\Angular\\Angular.js\" Link=\"TestFrameworks\\Angular\\Angular.js\">\n+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n+ </Content>\n+ <Content Include=\"..\\TestAdapter\\TestFrameworks\\Angular\\jasmineReporter.js\" Link=\"TestFrameworks\\Angular\\jasmineReporter.js\">\n+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n+ </Content>\n+ <Content Include=\"..\\TestAdapter\\TestFrameworks\\Angular\\karmaConfig.js\" Link=\"TestFrameworks\\Angular\\karmaConfig.js\">\n+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n+ </Content>\n+ <Content Include=\"..\\TestAdapter\\TestFrameworks\\Angular\\vsKarmaReporter.js\" Link=\"TestFrameworks\\Angular\\vsKarmaReporter.js\">\n+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\n+ </Content>\n</ItemGroup>\n<ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added .NET Core support. Project and cli.
|
410,202 |
09.11.2020 19:13:27
| 28,800 |
b791a52d5c812572e39fb04e1b7606bb54508727
|
Fixed incorrect focus on non-actionable items.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"diff": "Content=\"{Binding Path=SelectedPackage}\"\nContentTemplate=\"{StaticResource PackageInfoTemplate}\"\nIsTabStop=\"True\" AutomationProperties.Name=\"{Binding Path=SelectedPackage.Name}\"\n- TabIndex=\"3\" />\n+ Focusable=\"False\"/>\n<StackPanel Grid.Row=\"1\"\nOrientation=\"Vertical\"\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed incorrect focus on non-actionable items.
|
410,202 |
09.11.2020 19:32:41
| 28,800 |
a863603c9a38d43fac136605b08539f4c39df257
|
Fixed NPM UI automation name in package list
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.Designer.cs",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.Designer.cs",
"diff": "@@ -19,7 +19,7 @@ namespace Microsoft.NodejsTools.NpmUI {\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\", \"15.0.0.0\")]\n+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"16.0.0.0\")]\n[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\npublic class NpmInstallWindowResources {\n@@ -240,6 +240,15 @@ namespace Microsoft.NodejsTools.NpmUI {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Package list.\n+ /// </summary>\n+ public static string PackageListName {\n+ get {\n+ return ResourceManager.GetString(\"PackageListName\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to Refresh.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.resx",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.resx",
"diff": "<value>{0} results found</value>\n<comment>Parameter is a number representing the amount of results.</comment>\n</data>\n+ <data name=\"PackageListName\" xml:space=\"preserve\">\n+ <value>Package list</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"new_path": "Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml",
"diff": "<ContentControl Style=\"{StaticResource SearchStyle}\" HorizontalAlignment=\"Stretch\" VerticalAlignment=\"Stretch\" IsTabStop=\"False\" Focusable=\"False\" />\n<Grid Grid.Row=\"1\" Background=\"{Binding ElementName=packageList, Path=Background}\">\n<ListView x:Name=\"packageList\"\n+ AutomationProperties.Name=\"{x:Static resx:NpmInstallWindowResources.PackageListName}\"\nItemsSource=\"{Binding FilteredPackages}\"\nSelectedItem=\"{Binding SelectedPackage}\"\nSelectionChanged=\"packageList_SelectionChanged\"\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Fixed NPM UI automation name in package list
|
410,202 |
11.11.2020 18:04:08
| 28,800 |
98aa85d8d0e77d15d778078f1801c406138d0d5a
|
Added telemetry event to TestDiscovery
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryEvents.cs",
"diff": "@@ -40,6 +40,11 @@ namespace Microsoft.NodejsTools.Telemetry\npublic const string UsedRepl = Prefix + \"UsedRepl\";\npublic const string OperationRegistrationFaulted = Prefix + \"OperationRegistrationFaulted\";\n+\n+ /// <summary>\n+ /// User started discovery on the test adapters.\n+ /// </summary>\n+ public const string TestDiscoveryStarted = Prefix + \"TestDiscoveryStarted\";\n}\ninternal static class TelemetryProperties\n@@ -64,5 +69,15 @@ 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 test adapter the user is using when test discovery launched.\n+ /// </summary>\n+ public const string TestAdapterName = Prefix + \"TestAdapterName\";\n+\n+ /// <summary>\n+ /// The type of test adapter that launched discovery.\n+ /// </summary>\n+ public const string TestDiscovererName = Prefix + \"TestDiscovererName\";\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"new_path": "Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs",
"diff": "@@ -41,6 +41,11 @@ namespace Microsoft.NodejsTools.Telemetry\nTelemetryService.DefaultSession?.PostUserTask(UsedRepl, TelemetryResult.Success);\n}\n+ public static void LogTestDiscoveryStarted(string testAdapterName, string testDiscovererName)\n+ {\n+ LogUserTaskEvent(TestDiscoveryStarted, (TestAdapterName, testAdapterName), (TestDiscovererName, testDiscovererName));\n+ }\n+\nprivate static void LogUserTaskEvent(string eventName, bool isProject)\n{\nLogUserTaskEvent(eventName, (IsProject, isProject));\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/PackageJsonTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/PackageJsonTestDiscoverer.cs",
"diff": "@@ -69,7 +69,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nvar nodeExePath = Nodejs.GetPathToNodeExecutableFromEnvironment();\nvar worker = new TestDiscovererWorker(packageJsonPath, nodeExePath);\n- worker.DiscoverTests(testFolderPath, testFx, logger, discoverySink);\n+ worker.DiscoverTests(testFolderPath, testFx, logger, discoverySink, nameof(PackageJsonTestDiscoverer));\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -110,7 +110,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nvar fileList = testItems[testFx];\n- discoverWorker.DiscoverTests(fileList, testFramework, logger, discoverySink);\n+ discoverWorker.DiscoverTests(fileList, testFramework, logger, discoverySink, nameof(ProjectTestDiscoverer));\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<Compile Include=\"..\\TypeScript\\TypeScriptHelpers.cs\">\n<Link>TypeScriptHelpers.cs</Link>\n</Compile>\n+ <Compile Include=\"..\\Nodejs\\Telemetry\\TelemetryEvents.cs\" Link=\"Telemetry\\TelemetryEvents.cs\" />\n+ <Compile Include=\"..\\Nodejs\\Telemetry\\TelemetryHelper.cs\" Link=\"Telemetry\\TelemetryHelper.cs\" />\n<Compile Include=\"AssemblyResolver.cs\" />\n<Compile Include=\"PackageJsonTestDiscoverer.cs\" />\n<Compile Include=\"PackageJsonTestExecutor.cs\" />\n<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.7.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Telemetry\">\n+ <Version>16.3.59</Version>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"diff": "@@ -5,6 +5,7 @@ using System.Collections.Generic;\nusing System.IO;\nusing System.Linq;\nusing Microsoft.NodejsTools.SourceMapping;\n+using Microsoft.NodejsTools.Telemetry;\nusing Microsoft.NodejsTools.TestAdapter.TestFrameworks;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\n@@ -26,14 +27,16 @@ namespace Microsoft.NodejsTools.TestAdapter\nthis.nodeExePath = nodeExePath;\n}\n- public void DiscoverTests(string testFolderPath, TestFramework testFx, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)\n+ public void DiscoverTests(string testFolderPath, TestFramework testFx, IMessageLogger logger, ITestCaseDiscoverySink discoverySink, string testDiscovererName)\n{\nvar fileList = Directory.EnumerateFiles(testFolderPath, \"*.js\", SearchOption.AllDirectories).Where(x => !x.Contains(NodejsConstants.NodeModulesFolder));\n- this.DiscoverTests(fileList, testFx, logger, discoverySink);\n+ this.DiscoverTests(fileList, testFx, logger, discoverySink, testDiscovererName);\n}\n- public void DiscoverTests(IEnumerable<string> fileList, TestFramework testFx, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)\n+ public void DiscoverTests(IEnumerable<string> fileList, TestFramework testFx, IMessageLogger logger, ITestCaseDiscoverySink discoverySink, string testDiscovererName)\n{\n+ TelemetryHelper.LogTestDiscoveryStarted(testFx.Name, testDiscovererName);\n+\nif (!File.Exists(this.nodeExePath))\n{\nlogger.SendMessage(TestMessageLevel.Error, \"Node.exe was not found. Please install Node.js before running tests.\");\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.JavaScript.UnitTest.nuspec",
"new_path": "Nodejs/Product/TestAdapterNetStandard/Microsoft.JavaScript.UnitTest.nuspec",
"diff": "<dependency id=\"Newtonsoft.Json\" version=\"12.0.2\" />\n<dependency id=\"Microsoft.TestPlatform.ObjectModel\" version=\"16.1.1\" />\n<dependency id=\"Microsoft.NET.Test.Sdk\" version=\"16.1.1\" />\n+ <dependency id=\"Microsoft.VisualStudio.Telemetry\" version=\"16.3.59\" />\n</dependencies>\n</metadata>\n<files>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/NetCoreTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapterNetStandard/NetCoreTestDiscoverer.cs",
"diff": "@@ -130,7 +130,7 @@ namespace Microsoft.NodejsTools.TestAdapter\n}\nvar discoverWorker = new TestDiscovererWorker(projectFullPath, nodeExePath);\n- discoverWorker.DiscoverTests(testItems, testFramework, logger, discoverySink);\n+ discoverWorker.DiscoverTests(testItems, testFramework, logger, discoverySink, nameof(NetCoreTestDiscoverer));\n}\nprivate IEnumerable<string> GetConfigItems(string projectRoot)\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "<Compile Include=\"..\\Nodejs\\SourceMapping\\SourceMap.cs\" Link=\"SourceMapping\\SourceMap.cs\" />\n<Compile Include=\"..\\Nodejs\\SourceMapping\\SourceMapper.cs\" Link=\"SourceMapping\\SourceMapper.cs\" />\n<Compile Include=\"..\\Nodejs\\TestFrameworks\\TestFrameworkDirectories.cs\" Link=\"TestFrameworks\\TestFrameworkDirectories.cs\" />\n+ <Compile Include=\"..\\Nodejs\\Telemetry\\TelemetryEvents.cs\" Link=\"Telemetry\\TelemetryEvents.cs\" />\n+ <Compile Include=\"..\\Nodejs\\Telemetry\\TelemetryHelper.cs\" Link=\"Telemetry\\TelemetryHelper.cs\" />\n<Compile Include=\"..\\TestAdapter\\JavaScriptTestCaseProperties.cs\" Link=\"JavaScriptTestCaseProperties.cs\" />\n<Compile Include=\"..\\TestAdapter\\SerializationHelpers.cs\" Link=\"SerializationHelpers.cs\" />\n<Compile Include=\"..\\TestAdapter\\TestDiscovererWorker.cs\" Link=\"TestDiscovererWorker.cs\" />\n<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\" Version=\"16.0.1\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Telemetry\" Version=\"16.3.59\" />\n<PackageReference Include=\"Newtonsoft.Json\" Version=\"12.0.2\" />\n</ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added telemetry event to TestDiscovery
|
410,202 |
11.11.2020 19:13:40
| 28,800 |
01359f09ba526c96df8d2462bd949c55f51ff1c7
|
Corrected names of test discoverers
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -12,11 +12,12 @@ using MSBuild = Microsoft.Build.Evaluation;\nnamespace Microsoft.NodejsTools.TestAdapter\n{\n- // Keep in sync the method TypeScriptHelpers.IsSupportedTestProjectFile if there's a change on the supported projects.\n- [FileExtension(NodejsConstants.NodejsProjectExtension), FileExtension(NodejsConstants.CSharpProjectExtension), FileExtension(NodejsConstants.VisualBasicProjectExtension), FileExtension(NodejsConstants.JavaScriptProjectExtension)]\n- [DefaultExecutorUri(NodejsConstants.ExecutorUriString)]\n- public partial class ProjectTestDiscoverer : ITestDiscoverer\n+ // We require to put a non-existent file extension to avoid duplicate discovery executions.\n+ [FileExtension(\"NTVS_NonExistentFileExtension\")]\n+ public class ProjectTestDiscoverer : ITestDiscoverer\n{\n+ public virtual string TestDiscovererName => nameof(ProjectTestDiscoverer);\n+\npublic void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)\n{\nAssemblyResolver.SetupHandler();\n@@ -110,7 +111,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nvar fileList = testItems[testFx];\n- discoverWorker.DiscoverTests(fileList, testFramework, logger, discoverySink, nameof(ProjectTestDiscoverer));\n+ discoverWorker.DiscoverTests(fileList, testFramework, logger, discoverySink, this.TestDiscovererName);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<Compile Include=\"..\\Nodejs\\Telemetry\\TelemetryEvents.cs\" Link=\"Telemetry\\TelemetryEvents.cs\" />\n<Compile Include=\"..\\Nodejs\\Telemetry\\TelemetryHelper.cs\" Link=\"Telemetry\\TelemetryHelper.cs\" />\n<Compile Include=\"AssemblyResolver.cs\" />\n+ <Compile Include=\"DotNetTestDiscoverer.cs\" />\n+ <Compile Include=\"JavascriptProjectTestDiscoverer.cs\" />\n+ <Compile Include=\"NodejsToolsTestDiscoverer.cs\" />\n<Compile Include=\"PackageJsonTestDiscoverer.cs\" />\n<Compile Include=\"PackageJsonTestExecutor.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Corrected names of test discoverers
|
410,202 |
12.11.2020 11:43:46
| 28,800 |
8e6704933aa29e8c879241d71d34a8867acdf48e
|
Added cref to discoverer comments
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/DotNetTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/DotNetTestDiscoverer.cs",
"diff": "@@ -5,7 +5,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\nnamespace Microsoft.NodejsTools.TestAdapter\n{\n- // Keep in sync the method TypeScriptHelpers.IsSupportedTestProjectFile if there's a change on the supported projects.\n+ /// Keep in sync the method <see cref=\"TypeScript.TypeScriptHelpers.IsSupportedTestProjectFile(string)\" /> if there's a change on the supported projects.\n[FileExtension(NodejsConstants.CSharpProjectExtension), FileExtension(NodejsConstants.VisualBasicProjectExtension)]\n[DefaultExecutorUri(NodejsConstants.ExecutorUriString)]\npublic sealed class DotNetTestDiscoverer : ProjectTestDiscoverer, ITestDiscoverer\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/JavascriptProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/JavascriptProjectTestDiscoverer.cs",
"diff": "@@ -5,7 +5,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\nnamespace Microsoft.NodejsTools.TestAdapter\n{\n- // Keep in sync the method TypeScriptHelpers.IsSupportedTestProjectFile if there's a change on the supported projects.\n+ /// Keep in sync the method <see cref=\"TypeScript.TypeScriptHelpers.IsSupportedTestProjectFile(string)\" /> if there's a change on the supported projects.\n[FileExtension(NodejsConstants.JavaScriptProjectExtension)]\n[DefaultExecutorUri(NodejsConstants.ExecutorUriString)]\npublic sealed class JavascriptProjectTestDiscoverer : ProjectTestDiscoverer, ITestDiscoverer\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/NodejsToolsTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/NodejsToolsTestDiscoverer.cs",
"diff": "@@ -5,7 +5,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;\nnamespace Microsoft.NodejsTools.TestAdapter\n{\n- // Keep in sync the method TypeScriptHelpers.IsSupportedTestProjectFile if there's a change on the supported projects.\n+ /// Keep in sync the method <see cref=\"TypeScript.TypeScriptHelpers.IsSupportedTestProjectFile(string)\" /> if there's a change on the supported projects.\n[FileExtension(NodejsConstants.NodejsProjectExtension)]\n[DefaultExecutorUri(NodejsConstants.ExecutorUriString)]\npublic sealed class NodejsToolsTestDiscoverer : ProjectTestDiscoverer, ITestDiscoverer\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added cref to discoverer comments
|
410,202 |
12.11.2020 15:58:46
| 28,800 |
afc7dbe245606fb238539d14a0fc389954d4d00b
|
Added DefaultTestDiscoverer
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestDiscoverer.cs",
"diff": "@@ -12,11 +12,9 @@ using MSBuild = Microsoft.Build.Evaluation;\nnamespace Microsoft.NodejsTools.TestAdapter\n{\n- // We require to put a non-existent file extension to avoid duplicate discovery executions.\n- [FileExtension(\"NTVS_NonExistentFileExtension\")]\n- public class ProjectTestDiscoverer : ITestDiscoverer\n+ public abstract class ProjectTestDiscoverer\n{\n- public virtual string TestDiscovererName => nameof(ProjectTestDiscoverer);\n+ public abstract string TestDiscovererName { get; }\npublic void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/ProjectTestExecutor.cs",
"new_path": "Nodejs/Product/TestAdapter/ProjectTestExecutor.cs",
"diff": "@@ -27,7 +27,7 @@ namespace Microsoft.NodejsTools.TestAdapter\nthis.Cancel();\nthis.worker = new TestExecutorWorker(runContext, frameworkHandle);\n- this.worker.RunTests(sources, new ProjectTestDiscoverer());\n+ this.worker.RunTests(sources, new DefaultTestDiscoverer());\n}\npublic void Cancel()\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<Compile Include=\"..\\Nodejs\\Telemetry\\TelemetryEvents.cs\" Link=\"Telemetry\\TelemetryEvents.cs\" />\n<Compile Include=\"..\\Nodejs\\Telemetry\\TelemetryHelper.cs\" Link=\"Telemetry\\TelemetryHelper.cs\" />\n<Compile Include=\"AssemblyResolver.cs\" />\n+ <Compile Include=\"DefaultTestDiscoverer.cs\" />\n<Compile Include=\"DotNetTestDiscoverer.cs\" />\n<Compile Include=\"JavascriptProjectTestDiscoverer.cs\" />\n<Compile Include=\"NodejsToolsTestDiscoverer.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added DefaultTestDiscoverer
|
410,202 |
12.11.2020 16:21:51
| 28,800 |
ef22de24fb3f038095ff35182eebc6aabd166ccd
|
Added supportedFrameworks whitelist
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"diff": "@@ -16,6 +16,17 @@ namespace Microsoft.NodejsTools.TestAdapter\n{\npublic sealed class TestDiscovererWorker\n{\n+ // Keep in sync with the folder names of ./Product/TestAdapter/TestFrameworks.\n+ private readonly HashSet<string> supportedFrameworks = new HashSet<string>(StringComparer.OrdinalIgnoreCase)\n+ {\n+ \"Angular\",\n+ \"ExportRunner\",\n+ \"Jasmine\",\n+ \"Jest\",\n+ \"mocha\",\n+ \"Tape\",\n+ };\n+\nprivate readonly string testSource;\nprivate readonly string workingDir;\nprivate readonly string nodeExePath;\n@@ -34,8 +45,12 @@ namespace Microsoft.NodejsTools.TestAdapter\n}\npublic void DiscoverTests(IEnumerable<string> fileList, TestFramework testFx, IMessageLogger logger, ITestCaseDiscoverySink discoverySink, string testDiscovererName)\n+ {\n+ // If it's a framework name we support, is safe to submit the string to telemetry.\n+ if (supportedFrameworks.Contains(testFx.Name))\n{\nTelemetryHelper.LogTestDiscoveryStarted(testFx.Name, testDiscovererName);\n+ }\nif (!File.Exists(this.nodeExePath))\n{\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added supportedFrameworks whitelist
|
410,222 |
13.11.2020 10:16:00
| 28,800 |
cfdf3f75e73d22b785a232e35facaaf67e2e56d6
|
update TS template versions
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/package.json",
"diff": "\"@types/express-serve-static-core\": \"^4.0.50\",\n\"@types/mime\": \"^1.3.1\",\n\"@types/serve-static\": \"^1.7.32\",\n- \"@types/node\": \"^8.0.14\",\n- \"typescript\": \"^3.2.2\"\n+ \"@types/node\": \"^14.14.7\",\n+ \"typescript\": \"^4.0.5\"\n},\n\"engines\": {\n\"node\": \"^8.0.0\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorker/package.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureNodejsWorker/package.json",
"diff": "\"name\": \"\"\n},\n\"devDependencies\": {\n- \"@types/node\": \"^8.0.14\",\n- \"typescript\": \"^3.2.2\"\n+ \"@types/node\": \"^14.14.7\",\n+ \"typescript\": \"^4.0.5\"\n},\n\"engines\": {\n\"node\": \"^8.0.x\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/package.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebApp/package.json",
"diff": "\"name\": \"\"\n},\n\"devDependencies\": {\n- \"@types/node\": \"^8.0.14\",\n- \"typescript\": \"^3.2.2\"\n+ \"@types/node\": \"^14.14.7\",\n+ \"typescript\": \"^4.0.5\"\n},\n\"engines\": {\n\"node\": \"^8.0.0\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebRole/package.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureWebRole/package.json",
"diff": "\"name\": \"\"\n},\n\"devDependencies\": {\n- \"@types/node\": \"^8.0.14\",\n- \"typescript\": \"^3.2.2\"\n+ \"@types/node\": \"^14.14.7\",\n+ \"typescript\": \"^4.0.5\"\n},\n\"engines\": {\n\"node\": \"^8.0.0\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/package.json",
"diff": "\"@types/express-serve-static-core\": \"^4.0.50\",\n\"@types/mime\": \"^1.3.1\",\n\"@types/serve-static\": \"^1.7.32\",\n- \"@types/node\": \"^8.0.14\",\n- \"typescript\": \"^3.2.2\"\n+ \"@types/node\": \"^14.14.7\",\n+ \"typescript\": \"^4.0.5\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptVuejsApp/package.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptVuejsApp/package.json",
"diff": "\"@vue/cli-plugin-babel\": \"3.0.4\",\n\"@vue/cli-plugin-typescript\": \"3.0.4\",\n\"@vue/cli-service\": \"3.0.4\",\n- \"typescript\": \"3.1.1\",\n+ \"typescript\": \"^4.0.5\",\n\"vue-template-compiler\": \"2.5.17\"\n},\n\"postcss\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/package.json",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptWebApp/package.json",
"diff": "\"clean\": \"tsc --build --clean\"\n},\n\"devDependencies\": {\n- \"@types/node\": \"^8.0.14\",\n- \"typescript\": \"^3.2.2\"\n+ \"@types/node\": \"^14.14.7\",\n+ \"typescript\": \"^4.0.5\"\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
update TS template versions
|
410,202 |
13.11.2020 13:48:49
| 28,800 |
ad42177b89cc309a8af3d0be005161cf81e1f58f
|
Added Other to testAdapterName
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"new_path": "Nodejs/Product/TestAdapter/TestDiscovererWorker.cs",
"diff": "@@ -47,10 +47,8 @@ namespace Microsoft.NodejsTools.TestAdapter\npublic void DiscoverTests(IEnumerable<string> fileList, TestFramework testFx, IMessageLogger logger, ITestCaseDiscoverySink discoverySink, string testDiscovererName)\n{\n// If it's a framework name we support, is safe to submit the string to telemetry.\n- if (supportedFrameworks.Contains(testFx.Name))\n- {\n- TelemetryHelper.LogTestDiscoveryStarted(testFx.Name, testDiscovererName);\n- }\n+ var testAdapterName = supportedFrameworks.Contains(testFx.Name) ? testFx.Name : \"Other\";\n+ TelemetryHelper.LogTestDiscoveryStarted(testAdapterName, testDiscovererName);\nif (!File.Exists(this.nodeExePath))\n{\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Added Other to testAdapterName
|
410,202 |
19.11.2020 17:34:34
| 28,800 |
0a6e405e3d9982b14da0f3eb70cfaca4830c18ce
|
Make TestProjectFactory static. PR comments.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/TestAdapter.Tests/DefaultTestDiscovererTests.cs",
"new_path": "Nodejs/Tests/TestAdapter.Tests/DefaultTestDiscovererTests.cs",
"diff": "@@ -11,7 +11,6 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;\nusing Microsoft.VisualStudio.TestTools.UnitTesting;\nusing Moq;\nusing Newtonsoft.Json;\n-using static TestAdapter.Tests.TestProjectFactory;\nnamespace TestAdapter.Tests\n{\n@@ -74,13 +73,11 @@ namespace TestAdapter.Tests\n}\n}\n- private void AssertProject(ProjectName projectName, int expectedTests)\n+ private void AssertProject(TestProjectFactory.ProjectName projectName, int expectedTests)\n{\n// Arrange\n- var testProjectFactory = new TestProjectFactory(projectName);\n-\nvar actual = new List<TestCase>();\n- var expected = testProjectFactory.GetTestCases();\n+ var expected = TestProjectFactory.GetTestCases(projectName);\nvar discoverContext = new Mock<IDiscoveryContext>();\nvar messageLogger = new Mock<IMessageLogger>();\n@@ -89,10 +86,10 @@ namespace TestAdapter.Tests\ntestCaseDiscoverySink.Setup(x => x.SendTestCase(It.IsAny<TestCase>()))\n.Callback<TestCase>(x => actual.Add(x));\n- var testSource = testProjectFactory.GetProjectFilePath();\n+ var testSource = TestProjectFactory.GetProjectFilePath(projectName);\nvar sources = new List<string>() { testSource };\n- AssureNodeModules(testProjectFactory.GetProjectDirPath());\n+ AssureNodeModules(TestProjectFactory.GetProjectDirPath(projectName));\nvar testDiscoverer = new DefaultTestDiscoverer();\n@@ -115,19 +112,19 @@ namespace TestAdapter.Tests\n[TestMethod]\npublic void DiscoversTests_ConfiguredPerFile()\n{\n- this.AssertProject(ProjectName.NodeAppWithTestsConfiguredPerFile, 10);\n+ this.AssertProject(TestProjectFactory.ProjectName.NodeAppWithTestsConfiguredPerFile, 10);\n}\n[TestMethod]\npublic void DiscoversTests_Node_ConfiguredOnProject()\n{\n- this.AssertProject(ProjectName.NodeAppWithTestsConfiguredOnProject, 2);\n+ this.AssertProject(TestProjectFactory.ProjectName.NodeAppWithTestsConfiguredOnProject, 2);\n}\n[TestMethod]\npublic void DiscoversTests_NodeAppWithAngularTests()\n{\n- this.AssertProject(ProjectName.NodeAppWithAngularTests, 5);\n+ this.AssertProject(TestProjectFactory.ProjectName.NodeAppWithAngularTests, 5);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/TestAdapter.Tests/TestAdapter.Tests.csproj",
"new_path": "Nodejs/Tests/TestAdapter.Tests/TestAdapter.Tests.csproj",
"diff": "<Project Sdk=\"Microsoft.NET.Sdk\">\n<PropertyGroup>\n- <TargetFramework>netcoreapp3.1</TargetFramework>\n+ <TargetFramework>net5.0</TargetFramework>\n<IsPackable>false</IsPackable>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/TestAdapter.Tests/TestProjectFactory.cs",
"new_path": "Nodejs/Tests/TestAdapter.Tests/TestProjectFactory.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.IO;\n+using Microsoft.NodejsTools;\n+using Microsoft.NodejsTools.TestAdapter;\nusing Microsoft.VisualStudio.TestPlatform.ObjectModel;\nusing static Microsoft.NodejsTools.TestAdapter.TestFrameworks.TestFramework;\nnamespace TestAdapter.Tests\n{\n- public class TestProjectFactory\n+ public static class TestProjectFactory\n{\npublic enum ProjectName\n{\n@@ -17,113 +19,134 @@ namespace TestAdapter.Tests\nNodeAppWithAngularTests,\n}\n- private readonly ProjectName projectName;\n- private string projectNameString => Enum.GetName(typeof(ProjectName), this.projectName);\n-\n- public TestProjectFactory(ProjectName projectName)\n+ private struct TestCaseOptions\n{\n- this.projectName = projectName;\n+ public SupportedFramework TestFramework;\n+ public string Source;\n+ public string WorkingDir;\n+ public string ConfigDirPath;\n}\n- public string GetProjectDirPath()\n+ public static string GetProjectDirPath(ProjectName projectName)\n{\n- return Path.Combine(Directory.GetCurrentDirectory(), $@\"..\\..\\..\\..\\MockProjects\\{projectNameString}\");\n+ return Path.Combine(Directory.GetCurrentDirectory(), $@\"..\\..\\..\\..\\MockProjects\\{projectName}\");\n}\n- public string GetProjectFilePath()\n+ public static string GetProjectFilePath(ProjectName projectName)\n{\n- switch (this.projectName)\n+ switch (projectName)\n{\ncase ProjectName.NodeAppWithTestsConfiguredOnProject:\ncase ProjectName.NodeAppWithTestsConfiguredPerFile:\ncase ProjectName.NodeAppWithAngularTests:\n- return Path.Combine(this.GetProjectDirPath(), $\"{projectNameString}.njsproj\");\n+ return Path.Combine(GetProjectDirPath(projectName), $\"{projectName}.njsproj\");\n}\n- throw new ArgumentException();\n+ throw new NotImplementedException($\"ProjectName {projectName} has not been implemented.\");\n}\n- public List<TestCase> GetTestCases()\n+ public static List<TestCase> GetTestCases(ProjectName projectName)\n{\n- switch (this.projectName)\n+ switch (projectName)\n{\ncase ProjectName.NodeAppWithTestsConfiguredOnProject:\n- return new List<TestCase>(this.GetTestCases(SupportedFramework.Mocha));\n+ return new List<TestCase>(GetTestCases(projectName, SupportedFramework.Mocha));\ncase ProjectName.NodeAppWithTestsConfiguredPerFile:\nvar result = new List<TestCase>();\n- result.AddRange(this.GetTestCases(SupportedFramework.Jasmine));\n- result.AddRange(this.GetTestCases(SupportedFramework.ExportRunner));\n- result.AddRange(this.GetTestCases(SupportedFramework.Jest));\n- result.AddRange(this.GetTestCases(SupportedFramework.Mocha));\n- result.AddRange(this.GetTestCases(SupportedFramework.Tape));\n+ result.AddRange(GetTestCases(projectName, SupportedFramework.Jasmine));\n+ result.AddRange(GetTestCases(projectName, SupportedFramework.ExportRunner));\n+ result.AddRange(GetTestCases(projectName, SupportedFramework.Jest));\n+ result.AddRange(GetTestCases(projectName, SupportedFramework.Mocha));\n+ result.AddRange(GetTestCases(projectName, SupportedFramework.Tape));\nreturn result;\ncase ProjectName.NodeAppWithAngularTests:\n- return new List<TestCase>(this.GetTestCases(SupportedFramework.Angular));\n+ return new List<TestCase>(GetTestCases(projectName, SupportedFramework.Angular));\n};\n- throw new InvalidOperationException();\n+ throw new NotImplementedException($\"ProjectName {projectName} has not been implemented.\");\n}\n- private List<TestCase> GetTestCases(SupportedFramework testFramework)\n+ private static List<TestCase> GetTestCases(ProjectName projectName, SupportedFramework testFramework)\n{\n- var configPath = this.projectName == ProjectName.NodeAppWithAngularTests\n- ? this.GetProjectDirPath()\n- : null;\n-\n- var testCaseFactory = new TestCaseFactory(\n- testFramework,\n- this.GetProjectDirPath(),\n- this.GetProjectFilePath(),\n- configPath);\n+ var testCaseOptions = new TestCaseOptions()\n+ {\n+ TestFramework = testFramework,\n+ WorkingDir = GetProjectDirPath(projectName),\n+ Source = GetProjectFilePath(projectName),\n+ ConfigDirPath = projectName == ProjectName.NodeAppWithAngularTests ? GetProjectDirPath(projectName) : null\n+ };\nswitch (testFramework)\n{\ncase SupportedFramework.Jasmine:\nreturn new List<TestCase>()\n{\n- testCaseFactory.GetTestCase(\"JasmineUnitTest.js::Test Suite 1::Test 1\", \"Test 1\", 1, Path.Combine(this.GetProjectDirPath(), \"JasmineUnitTest.js\")),\n- testCaseFactory.GetTestCase(\"JasmineUnitTest.js::Test Suite 1::Test 2\", \"Test 2\", 1, Path.Combine(this.GetProjectDirPath(), \"JasmineUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"JasmineUnitTest.js::Test Suite 1::Test 1\", \"Test 1\", 1, Path.Combine(GetProjectDirPath(projectName), \"JasmineUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"JasmineUnitTest.js::Test Suite 1::Test 2\", \"Test 2\", 1, Path.Combine(GetProjectDirPath(projectName), \"JasmineUnitTest.js\")),\n};\ncase SupportedFramework.ExportRunner:\nreturn new List<TestCase>()\n{\n- testCaseFactory.GetTestCase(\"ExportRunnerUnitTest.js::global::Test 1\", \"Test 1\", 1, Path.Combine(this.GetProjectDirPath(), \"ExportRunnerUnitTest.js\")),\n- testCaseFactory.GetTestCase(\"ExportRunnerUnitTest.js::global::Test 2\", \"Test 2\", 1, Path.Combine(this.GetProjectDirPath(), \"ExportRunnerUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"ExportRunnerUnitTest.js::global::Test 1\", \"Test 1\", 1, Path.Combine(GetProjectDirPath(projectName), \"ExportRunnerUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"ExportRunnerUnitTest.js::global::Test 2\", \"Test 2\", 1, Path.Combine(GetProjectDirPath(projectName), \"ExportRunnerUnitTest.js\")),\n};\ncase SupportedFramework.Jest:\nreturn new List<TestCase>()\n{\n- testCaseFactory.GetTestCase(\"JestUnitTest.js::Test Suite 1::Test 1 - This shouldn't fail\", \"Test 1 - This shouldn't fail\", 3, Path.Combine(this.GetProjectDirPath(), \"JestUnitTest.js\")),\n- testCaseFactory.GetTestCase(\"JestUnitTest.js::Test Suite 1::Test 2 - This should fail\", \"Test 2 - This should fail\", 7, Path.Combine(this.GetProjectDirPath(), \"JestUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"JestUnitTest.js::Test Suite 1::Test 1 - This shouldn't fail\", \"Test 1 - This shouldn't fail\", 3, Path.Combine(GetProjectDirPath(projectName), \"JestUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"JestUnitTest.js::Test Suite 1::Test 2 - This should fail\", \"Test 2 - This should fail\", 7, Path.Combine(GetProjectDirPath(projectName), \"JestUnitTest.js\")),\n};\ncase SupportedFramework.Mocha:\nreturn new List<TestCase>()\n{\n- testCaseFactory.GetTestCase(\"MochaUnitTest.js::Test Suite 1::Test 1\", \"Test 1\", 1, Path.Combine(this.GetProjectDirPath(), \"MochaUnitTest.js\")),\n- testCaseFactory.GetTestCase(\"MochaUnitTest.js::Test Suite 1::Test 2\", \"Test 2\", 1, Path.Combine(this.GetProjectDirPath(), \"MochaUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"MochaUnitTest.js::Test Suite 1::Test 1\", \"Test 1\", 1, Path.Combine(GetProjectDirPath(projectName), \"MochaUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"MochaUnitTest.js::Test Suite 1::Test 2\", \"Test 2\", 1, Path.Combine(GetProjectDirPath(projectName), \"MochaUnitTest.js\")),\n};\ncase SupportedFramework.Tape:\nreturn new List<TestCase>()\n{\n- testCaseFactory.GetTestCase(\"TapeUnitTest.js::global::Test A\", \"Test A\", 1, Path.Combine(this.GetProjectDirPath(), \"TapeUnitTest.js\")),\n- testCaseFactory.GetTestCase(\"TapeUnitTest.js::global::Test B\", \"Test B\", 1, Path.Combine(this.GetProjectDirPath(), \"TapeUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"TapeUnitTest.js::global::Test A\", \"Test A\", 1, Path.Combine(GetProjectDirPath(projectName), \"TapeUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"TapeUnitTest.js::global::Test B\", \"Test B\", 1, Path.Combine(GetProjectDirPath(projectName), \"TapeUnitTest.js\")),\n};\ncase SupportedFramework.Angular:\nreturn new List<TestCase>()\n{\n- testCaseFactory.GetTestCase(@\"src\\app\\app.component.spec.ts::AppComponent::should create the app\",\"should create the app\", 14, Path.Combine(this.GetProjectDirPath(), @\"src\\app\\app.component.spec.ts\")),\n- testCaseFactory.GetTestCase(@\"src\\app\\app.component.spec.ts::AppComponent::should have as title 'my-app'\",\"should have as title 'my-app'\", 20, Path.Combine(this.GetProjectDirPath(), @\"src\\app\\app.component.spec.ts\")),\n- testCaseFactory.GetTestCase(@\"src\\app\\app.component.spec.ts::AppComponent::should render title\",\"should render title\", 26, Path.Combine(this.GetProjectDirPath(), @\"src\\app\\app.component.spec.ts\")),\n- testCaseFactory.GetTestCase(@\"src\\app\\customTest.spec.ts::CustomTest::should succeed\",\"should succeed\", 4, Path.Combine(this.GetProjectDirPath(), @\"src\\app\\customTest.spec.ts\")),\n- testCaseFactory.GetTestCase(@\"src\\app\\customTest.spec.ts::CustomTest::should fail\",\"should fail\", 8, Path.Combine(this.GetProjectDirPath(), @\"src\\app\\customTest.spec.ts\")),\n+ GetTestCase(testCaseOptions, @\"src\\app\\app.component.spec.ts::AppComponent::should create the app\",\"should create the app\", 14, Path.Combine(GetProjectDirPath(projectName), @\"src\\app\\app.component.spec.ts\")),\n+ GetTestCase(testCaseOptions, @\"src\\app\\app.component.spec.ts::AppComponent::should have as title 'my-app'\",\"should have as title 'my-app'\", 20, Path.Combine(GetProjectDirPath(projectName), @\"src\\app\\app.component.spec.ts\")),\n+ GetTestCase(testCaseOptions, @\"src\\app\\app.component.spec.ts::AppComponent::should render title\",\"should render title\", 26, Path.Combine(GetProjectDirPath(projectName), @\"src\\app\\app.component.spec.ts\")),\n+ GetTestCase(testCaseOptions, @\"src\\app\\customTest.spec.ts::CustomTest::should succeed\",\"should succeed\", 4, Path.Combine(GetProjectDirPath(projectName), @\"src\\app\\customTest.spec.ts\")),\n+ GetTestCase(testCaseOptions, @\"src\\app\\customTest.spec.ts::CustomTest::should fail\",\"should fail\", 8, Path.Combine(GetProjectDirPath(projectName), @\"src\\app\\customTest.spec.ts\")),\n};\n}\n- throw new ArgumentException();\n+ throw new NotImplementedException($\"ProjectName {projectName} has not been implemented.\");\n+ }\n+\n+ private static TestCase GetTestCase(TestCaseOptions testCaseOptions, string fullyQualifiedName, string displayName, int lineNumber, string filePath)\n+ {\n+ var testCase = new TestCase()\n+ {\n+ FullyQualifiedName = fullyQualifiedName,\n+ DisplayName = displayName,\n+ LineNumber = lineNumber,\n+ ExecutorUri = NodejsConstants.ExecutorUri,\n+ Source = testCaseOptions.Source,\n+ CodeFilePath = filePath,\n+ };\n+\n+ testCase.SetPropertyValue(JavaScriptTestCaseProperties.TestFramework, testCaseOptions.TestFramework.ToString());\n+ testCase.SetPropertyValue(JavaScriptTestCaseProperties.WorkingDir, testCaseOptions.WorkingDir);\n+ testCase.SetPropertyValue(JavaScriptTestCaseProperties.ProjectRootDir, testCaseOptions.WorkingDir);\n+ // TODO: We might only want to check that this is not empty. The value changes depending on the environment.\n+ //testCase.SetPropertyValue(JavaScriptTestCaseProperties.NodeExePath, nodeExePath);\n+ testCase.SetPropertyValue(JavaScriptTestCaseProperties.TestFile, filePath);\n+ testCase.SetPropertyValue(JavaScriptTestCaseProperties.ConfigDirPath, testCaseOptions.ConfigDirPath);\n+\n+ return testCase;\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Make TestProjectFactory static. PR comments.
|
410,202 |
19.11.2020 18:56:16
| 28,800 |
f63375ed867086762310e4aa789516161cb1d0cd
|
Refactor switch case with local scope
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Tests/TestAdapter.Tests/TestProjectFactory.cs",
"new_path": "Nodejs/Tests/TestAdapter.Tests/TestProjectFactory.cs",
"diff": "@@ -83,35 +83,50 @@ namespace TestAdapter.Tests\nswitch (testFramework)\n{\ncase SupportedFramework.Jasmine:\n+ {\n+ var filePath = Path.Combine(GetProjectDirPath(projectName), \"JasmineUnitTest.js\");\nreturn new List<TestCase>()\n{\n- GetTestCase(testCaseOptions, \"JasmineUnitTest.js::Test Suite 1::Test 1\", \"Test 1\", 1, Path.Combine(GetProjectDirPath(projectName), \"JasmineUnitTest.js\")),\n- GetTestCase(testCaseOptions, \"JasmineUnitTest.js::Test Suite 1::Test 2\", \"Test 2\", 1, Path.Combine(GetProjectDirPath(projectName), \"JasmineUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"JasmineUnitTest.js::Test Suite 1::Test 1\", \"Test 1\", 1, filePath),\n+ GetTestCase(testCaseOptions, \"JasmineUnitTest.js::Test Suite 1::Test 2\", \"Test 2\", 1, filePath),\n};\n+ }\ncase SupportedFramework.ExportRunner:\n+ {\n+ var filePath = Path.Combine(GetProjectDirPath(projectName), \"ExportRunnerUnitTest.js\");\nreturn new List<TestCase>()\n{\n- GetTestCase(testCaseOptions, \"ExportRunnerUnitTest.js::global::Test 1\", \"Test 1\", 1, Path.Combine(GetProjectDirPath(projectName), \"ExportRunnerUnitTest.js\")),\n- GetTestCase(testCaseOptions, \"ExportRunnerUnitTest.js::global::Test 2\", \"Test 2\", 1, Path.Combine(GetProjectDirPath(projectName), \"ExportRunnerUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"ExportRunnerUnitTest.js::global::Test 1\", \"Test 1\", 1, filePath),\n+ GetTestCase(testCaseOptions, \"ExportRunnerUnitTest.js::global::Test 2\", \"Test 2\", 1, filePath),\n};\n+ }\ncase SupportedFramework.Jest:\n+ {\n+ var filePath = Path.Combine(GetProjectDirPath(projectName), \"JestUnitTest.js\");\nreturn new List<TestCase>()\n{\n- GetTestCase(testCaseOptions, \"JestUnitTest.js::Test Suite 1::Test 1 - This shouldn't fail\", \"Test 1 - This shouldn't fail\", 3, Path.Combine(GetProjectDirPath(projectName), \"JestUnitTest.js\")),\n- GetTestCase(testCaseOptions, \"JestUnitTest.js::Test Suite 1::Test 2 - This should fail\", \"Test 2 - This should fail\", 7, Path.Combine(GetProjectDirPath(projectName), \"JestUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"JestUnitTest.js::Test Suite 1::Test 1 - This shouldn't fail\", \"Test 1 - This shouldn't fail\", 3, filePath),\n+ GetTestCase(testCaseOptions, \"JestUnitTest.js::Test Suite 1::Test 2 - This should fail\", \"Test 2 - This should fail\", 7, filePath),\n};\n+ }\ncase SupportedFramework.Mocha:\n+ {\n+ var filePath = Path.Combine(GetProjectDirPath(projectName), \"MochaUnitTest.js\");\nreturn new List<TestCase>()\n{\n- GetTestCase(testCaseOptions, \"MochaUnitTest.js::Test Suite 1::Test 1\", \"Test 1\", 1, Path.Combine(GetProjectDirPath(projectName), \"MochaUnitTest.js\")),\n- GetTestCase(testCaseOptions, \"MochaUnitTest.js::Test Suite 1::Test 2\", \"Test 2\", 1, Path.Combine(GetProjectDirPath(projectName), \"MochaUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"MochaUnitTest.js::Test Suite 1::Test 1\", \"Test 1\", 1, filePath),\n+ GetTestCase(testCaseOptions, \"MochaUnitTest.js::Test Suite 1::Test 2\", \"Test 2\", 1, filePath),\n};\n+ }\ncase SupportedFramework.Tape:\n+ {\n+ var filePath = Path.Combine(GetProjectDirPath(projectName), \"TapeUnitTest.js\");\nreturn new List<TestCase>()\n{\n- GetTestCase(testCaseOptions, \"TapeUnitTest.js::global::Test A\", \"Test A\", 1, Path.Combine(GetProjectDirPath(projectName), \"TapeUnitTest.js\")),\n- GetTestCase(testCaseOptions, \"TapeUnitTest.js::global::Test B\", \"Test B\", 1, Path.Combine(GetProjectDirPath(projectName), \"TapeUnitTest.js\")),\n+ GetTestCase(testCaseOptions, \"TapeUnitTest.js::global::Test A\", \"Test A\", 1, filePath),\n+ GetTestCase(testCaseOptions, \"TapeUnitTest.js::global::Test B\", \"Test B\", 1, filePath),\n};\n+ }\ncase SupportedFramework.Angular:\nreturn new List<TestCase>()\n{\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Refactor switch case with local scope
|
410,221 |
23.11.2020 17:08:34
| 28,800 |
94901e65c66ea9a76bcf6e37827df0442e8e7fe3
|
fix: updated typings causing build errors in templates
The latest node types have the result of server.address() as a string | AddressInfo, which was causing a build error on the default template. Updated the templates to fix this, and also standardized the imports.
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptAzureExpressApp/app.ts",
"diff": "-import debug = require('debug');\n-import express = require('express');\n-import path = require('path');\n+import * as debug from 'debug';\n+import * as express from 'express';\n+import { AddressInfo } from \"net\";\n+import * as path from 'path';\nimport routes from './routes/index';\nimport users from './routes/user';\n@@ -50,5 +51,5 @@ app.use((err, req, res, next) => { // eslint-disable-line @typescript-eslint/no-\napp.set('port', process.env.PORT || 3000);\nconst server = app.listen(app.get('port'), function () {\n- debug('Express server listening on port ' + server.address().port);\n+ debug('Express server listening on port ' + (server.address() as AddressInfo).port);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/TypeScriptExpressApp/app.ts",
"diff": "-import debug = require('debug');\n-import express = require('express');\n-import path = require('path');\n+import * as debug from 'debug';\n+import * as express from 'express';\n+import { AddressInfo } from \"net\";\n+import * as path from 'path';\nimport routes from './routes/index';\nimport users from './routes/user';\n@@ -50,5 +51,5 @@ app.use((err, req, res, next) => { // eslint-disable-line @typescript-eslint/no-\napp.set('port', process.env.PORT || 3000);\nconst server = app.listen(app.get('port'), function () {\n- debug('Express server listening on port ' + server.address().port);\n+ debug('Express server listening on port ' + (server.address() as AddressInfo).port);\n});\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
fix: updated typings causing build errors in templates
The latest node types have the result of server.address() as a string | AddressInfo, which was causing a build error on the default template. Updated the templates to fix this, and also standardized the imports.
|
410,221 |
24.11.2020 12:16:17
| 28,800 |
c0a4e0833273dd7f9750afd8b68187244e4e2686
|
using debug properly in express js template
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/ProjectTemplates/Express4App/app.js",
"new_path": "Nodejs/Product/Nodejs/ProjectTemplates/Express4App/app.js",
"diff": "'use strict';\n-var debug = require('debug');\n+var debug = require('debug')('my express app');\nvar express = require('express');\nvar path = require('path');\nvar favicon = require('serve-favicon');\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
using debug properly in express js template
|
410,226 |
24.02.2021 16:50:51
| 28,800 |
ffc47270fa67eec45701388e69bc0d9e5c531955
|
Remove private dependency Microsoft.VisualStudio.AppDesigner (causes build break)
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n<Version>16.0.1</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.AppDesigner\">\n- <Version>15.3.0-rc-6162104</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ComponentModelHost\">\n<Version>16.6.255</Version>\n</PackageReference>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove private dependency Microsoft.VisualStudio.AppDesigner (causes build break)
|
410,219 |
26.02.2021 10:45:27
| 28,800 |
691821b042f0ab1b7f0deb3f57ac3e6ee84eab2a
|
Update MicroBuild reference
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"MicroBuild.Core\" Version=\"0.3.0\">\n+ <PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\" Version=\"0.3.0\">\n<PrivateAssets>all</PrivateAssets>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n</PackageReference>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update MicroBuild reference
|
410,212 |
29.03.2021 16:32:46
| 25,200 |
4f3679eab86355148f38d7a8953624b478050b75
|
Updating references for dev17
|
[
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.settings",
"new_path": "Build/Common.Build.settings",
"diff": "<CodeCoverageEnabled Condition=\"'$(CodeCoverageEnabled)'==''\">false</CodeCoverageEnabled>\n- <VisualStudioVersion Condition=\"'$(VisualStudioVersion)' == ''\">16.0</VisualStudioVersion>\n- <VSTarget Condition=\"$(VSTarget)==''\">16.0</VSTarget>\n+ <VisualStudioVersion Condition=\"'$(VisualStudioVersion)' == ''\">17.0</VisualStudioVersion>\n+ <VSTarget Condition=\"$(VSTarget)==''\">17.0</VSTarget>\n<BuildingInsideVisualStudio Condition=\"'$(BuildingInsideVisualStudio)' == ''\">false</BuildingInsideVisualStudio>\n<VSToolsPath Condition=\"'$(VSToolsPath)' == ''\">$(MSBuildExtensionsPath32)\\Microsoft\\VisualStudio\\v$(VisualStudioVersion)</VSToolsPath>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs",
"new_path": "Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs",
"diff": "@@ -394,7 +394,7 @@ $@\"{{\nwriter.WriteStartElement(\"VisualStudioVersion\");\nwriter.WriteAttributeString(\"Condition\", \"'$(VisualStudioVersion)' == ''\");\n- writer.WriteString(\"16.0\");\n+ writer.WriteString(\"17.0\");\nwriter.WriteEndElement();\nwriter.WriteStartElement(\"VSToolsPath\");\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Theme/make_theme_pkgdef.py",
"new_path": "Nodejs/Product/Nodejs/Theme/make_theme_pkgdef.py",
"diff": "@@ -8,7 +8,7 @@ import xml.etree.ElementTree\nfrom pathlib import WindowsPath\nfrom uuid import UUID\n-for VS_VERSION in (11, 12, 14, 15, 16):\n+for VS_VERSION in (11, 12, 14, 15, 16, 17):\nprint('Writing to {}'.format(THEME_PKGDEF.format(VS_VERSION)))\noutput = open(THEME_PKGDEF.format(VS_VERSION), 'w', encoding='ascii')\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/Nodejs/source.extension.vsixmanifest",
"diff": "<PackageId>Microsoft.VisualStudio.NodejsTools.NodejsTools</PackageId>\n</Metadata>\n<Installation SystemComponent=\"true\">\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n</Installation>\n<Dependencies>\n<Dependency Id=\"Microsoft.Framework.NDP\" DisplayName=\"Microsoft .NET Framework\" Version=\"4.5\" />\n</Dependencies>\n<Prerequisites>\n- <Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[16.0,17.0)\" DisplayName=\"Visual Studio core editor\" />\n- <Prerequisite Id=\"Microsoft.VisualStudio.Component.JavaScript.TypeScript\" Version=\"[16.0,17.0)\" DisplayName=\"JavaScript and TypeScript language support\" />\n+ <Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[17.0,18.0)\" DisplayName=\"Visual Studio core editor\" />\n+ <Prerequisite Id=\"Microsoft.VisualStudio.Component.JavaScript.TypeScript\" Version=\"[17.0,18.0)\" DisplayName=\"JavaScript and TypeScript language support\" />\n</Prerequisites>\n<Assets>\n<Asset Type=\"Microsoft.VisualStudio.Package\" Path=\"|%CurrentProject%|\" d:Source=\"Project\" d:ProjectName=\"%CurrentProject%\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/NodejsToolsVsix/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/NodejsToolsVsix/source.extension.vsixmanifest",
"diff": "Id specifications are minimums; any SKU equal or 'higher' will accept\nthem. -->\n<Installation SystemComponent=\"true\">\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n</Installation>\n<Assets>\n<Asset Type=\"Microsoft.VisualStudio.VsPackage\" d:Source=\"Project\" d:ProjectName=\"Nodejs\" Path=\"|Nodejs;PkgdefProjectOutputGroup|\" />\n<Asset Type=\"Microsoft.VisualStudio.ItemTemplate\" d:Source=\"Project\" d:ProjectName=\"Nodejs\" d:TargetPath=\"|Nodejs;TemplateProjectOutputGroup|\" Path=\"ItemTemplates\" d:VsixSubPath=\"ItemTemplates\" />\n</Assets>\n<Prerequisites>\n- <Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[16.0,17.0)\" DisplayName=\"Visual Studio core editor\" />\n+ <Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[17.0,18.0)\" DisplayName=\"Visual Studio core editor\" />\n</Prerequisites>\n</PackageManifest>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/SettingsManagerCreator.cs",
"new_path": "Nodejs/Product/ProjectWizard/SettingsManagerCreator.cs",
"diff": "@@ -14,7 +14,7 @@ namespace Microsoft.VisualStudioTools\n{\ninternal static class SettingsManagerCreator\n{\n- private const string VSVersion = \"16.0\";\n+ private const string VSVersion = \"17.0\";\npublic static SettingsManager GetSettingsManager(DTE dte)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TargetsVsix/Microsoft.NodejsTools.targets",
"new_path": "Nodejs/Product/TargetsVsix/Microsoft.NodejsTools.targets",
"diff": "<Target Name=\"CopyFilesToOutputDirectory\"/>\n<Target Name=\"CoreCompile\">\n- <Error Condition=\"!Exists('$(VSToolsPath)\\TypeScript\\Microsoft.TypeScript.targets') And '$(EnableTypeScript)' == 'true' And '$(VisualStudioVersion)' != '16.0'\" Text=\"TypeScript is not installed but TypeScript support is enabled in this project. Please download and install TypeScript http://go.microsoft.com/fwlink/?LinkID=393159&clcid=0x409.\"></Error>\n+ <Error Condition=\"!Exists('$(VSToolsPath)\\TypeScript\\Microsoft.TypeScript.targets') And '$(EnableTypeScript)' == 'true' And '$(VisualStudioVersion)' != '17.0'\" Text=\"TypeScript is not installed but TypeScript support is enabled in this project. Please download and install TypeScript http://go.microsoft.com/fwlink/?LinkID=393159&clcid=0x409.\"></Error>\n<PropertyGroup>\n<_NodeModulesContentProperty>@(NodeModulesContent)</_NodeModulesContentProperty>\n</PropertyGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TargetsVsix/TargetsVsix.csproj",
"new_path": "Nodejs/Product/TargetsVsix/TargetsVsix.csproj",
"diff": "<CopyToOutputDirectory>Always</CopyToOutputDirectory>\n<IncludeInVSIX>true</IncludeInVSIX>\n<InstallRoot>MSBuild</InstallRoot>\n- <VSIXSubPath>Microsoft\\VisualStudio\\v16.0\\Node.js Tools</VSIXSubPath>\n+ <VSIXSubPath>Microsoft\\VisualStudio\\v17.0\\Node.js Tools</VSIXSubPath>\n</Content>\n<Content Include=\"Microsoft.NodejsToolsV2.targets\">\n<CopyToOutputDirectory>Always</CopyToOutputDirectory>\n<IncludeInVSIX>true</IncludeInVSIX>\n<InstallRoot>MSBuild</InstallRoot>\n- <VSIXSubPath>Microsoft\\VisualStudio\\v16.0\\Node.js Tools</VSIXSubPath>\n+ <VSIXSubPath>Microsoft\\VisualStudio\\v17.0\\Node.js Tools</VSIXSubPath>\n</Content>\n<None Include=\"source.extension.vsixmanifest\">\n<SubType>Designer</SubType>\n<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>\n<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>\n<InstallRoot>MSBuild</InstallRoot>\n- <VSIXSubPath>Microsoft\\VisualStudio\\v16.0\\Node.js Tools</VSIXSubPath>\n+ <VSIXSubPath>Microsoft\\VisualStudio\\v17.0\\Node.js Tools</VSIXSubPath>\n<Private>True</Private>\n</ProjectReference>\n</ItemGroup>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TargetsVsix/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/TargetsVsix/source.extension.vsixmanifest",
"diff": "<AllowClientRole>true</AllowClientRole>\n</Metadata>\n<Installation SystemComponent=\"true\" AllUsers=\"true\">\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n+ <InstallationTarget Version=\"[17.0.0,18.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<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=\"[16.0,17.0)\" DisplayName=\"Visual Studio core editor\" />\n+ <Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[17.0,18.0)\" DisplayName=\"Visual Studio core editor\" />\n</Prerequisites>\n</PackageManifest>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/VisualStudioApp.cs",
"new_path": "Nodejs/Product/TestAdapterImpl/VisualStudioApp.cs",
"diff": "@@ -103,7 +103,7 @@ namespace Microsoft.VisualStudioTools\nprefix = \"VisualStudio\";\n}\n- var progId = $\"!{prefix}.DTE.16.0:{processId}\";\n+ var progId = $\"!{prefix}.DTE.17.0:{processId}\";\nobject runningObject = null;\nIBindCtx bindCtx = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterVsix/source.extension.vsixmanifest",
"new_path": "Nodejs/Product/TestAdapterVsix/source.extension.vsixmanifest",
"diff": "<AllowClientRole>true</AllowClientRole>\n</Metadata>\n<Installation SystemComponent=\"true\">\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n- <InstallationTarget Version=\"[16.0.0,17.0)\" Id=\"Microsoft.VisualStudio.Enterprise\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Community\" />\n+ <InstallationTarget Version=\"[17.0.0,18.0)\" Id=\"Microsoft.VisualStudio.Pro\" />\n+ <InstallationTarget Version=\"[17.0.0,18.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<Prerequisites>\n- <Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[16.0,17.0)\" DisplayName=\"Visual Studio core editor\" />\n+ <Prerequisite Id=\"Microsoft.VisualStudio.Component.CoreEditor\" Version=\"[17.0,18.0)\" DisplayName=\"Visual Studio core editor\" />\n</Prerequisites>\n<Assets>\n<Asset Type=\"Microsoft.VisualStudio.MefComponent\" d:Source=\"Project\" d:ProjectName=\"TestAdapter\" Path=\"|TestAdapter|\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Updating references for dev17
|
410,212 |
29.03.2021 16:55:29
| 25,200 |
30f78b44850af39cd4947d7c1175efa4051762e0
|
Changing target back to 16.0 to facilitate pipeline build
|
[
{
"change_type": "MODIFY",
"old_path": "Build/Common.Build.settings",
"new_path": "Build/Common.Build.settings",
"diff": "<CodeCoverageEnabled Condition=\"'$(CodeCoverageEnabled)'==''\">false</CodeCoverageEnabled>\n<VisualStudioVersion Condition=\"'$(VisualStudioVersion)' == ''\">17.0</VisualStudioVersion>\n- <VSTarget Condition=\"$(VSTarget)==''\">17.0</VSTarget>\n+ <VSTarget Condition=\"$(VSTarget)==''\">16.0</VSTarget>\n<BuildingInsideVisualStudio Condition=\"'$(BuildingInsideVisualStudio)' == ''\">false</BuildingInsideVisualStudio>\n<VSToolsPath Condition=\"'$(VSToolsPath)' == ''\">$(MSBuildExtensionsPath32)\\Microsoft\\VisualStudio\\v$(VisualStudioVersion)</VSToolsPath>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Changing target back to 16.0 to facilitate pipeline build
|
410,219 |
14.04.2021 17:44:07
| 25,200 |
b038a44884af41414331f9db4bb4f2ff0678db0d
|
[WIP] Start moving to merged interops
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<OutputSubPath>Node.js</OutputSubPath>\n</VSTemplate>-->\n</ItemDefinitionGroup>\n- <ItemGroup>\n- <Reference Include=\"Microsoft.VisualStudio.TestWindow.Interfaces\">\n- <HintPath>$(DevEnvDir)CommonExtensions\\Microsoft\\TestWindow\\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>\n- <Private>False</Private>\n- </Reference>\n- <Reference Include=\"System.Design\" />\n- <Reference Include=\"VsWebSite.Interop, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\">\n- <EmbedInteropTypes>True</EmbedInteropTypes>\n- </Reference>\n- </ItemGroup>\n<ItemGroup>\n<Compile Include=\"..\\..\\..\\Common\\Product\\SharedProject\\CommonConstants.cs\">\n<Link>SharedProject\\CommonConstants.cs</Link>\n</T4ParameterValues>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"EnvDTE80\">\n- <Version>8.0.3</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.Build\">\n<Version>16.6.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n<Version>16.0.1</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.ComponentModelHost\">\n- <Version>16.6.255</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Debugger.Interop.10.0\">\n- <Version>10.0.30320</Version>\n+ <Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Debugger.InteropA\">\n- <Version>9.0.21023</Version>\n+ <Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Editor\">\n<Version>16.6.255</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ImageCatalog\">\n- <Version>16.6.30107.105</Version>\n+ <Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Imaging\">\n- <Version>16.6.30107.105</Version>\n+ <Version>17.0.0-preview-1-31212-1111</Version>\n+ </PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Interop\">\n+ <Version>17.0.0-preview-1-31214-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ProjectAggregator\">\n- <Version>8.0.50728</Version>\n+ <Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\">\n<Version>15.0.34</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>16.6.30107.105</Version>\n+ <Version>17.0.0-preview-1-31212-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Framework\">\n- <Version>16.6.30107.105</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop\">\n- <Version>7.10.6072</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.10.0\">\n- <Version>10.0.30320</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.12.0\">\n- <Version>12.0.30111</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime\">\n- <Version>14.3.26929</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime\">\n- <Version>15.0.26932</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime\">\n- <Version>15.0.26929</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.7.DesignTime\">\n- <Version>15.7.1</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.8.0\">\n- <Version>8.0.50728</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.9.0\">\n- <Version>9.0.30730</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Telemetry\">\n- <Version>16.3.59</Version>\n+ <Version>17.0.0-preview-1-31212-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Text.UI\">\n<Version>16.6.255</Version>\n<PackageReference Include=\"Microsoft.VisualStudio.Text.UI.Wpf\">\n<Version>16.6.255</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Threading\">\n- <Version>16.6.13</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Utilities\">\n- <Version>16.6.30107.105</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.VsInteractiveWindow\">\n<Version>2.8.0</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Workspace\">\n- <Version>16.0.59</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Workspace.VSIntegration\">\n<Version>16.3.43</Version>\n</PackageReference>\n<PackageReference Include=\"System.ValueTuple\">\n<Version>4.5.0</Version>\n</PackageReference>\n- <PackageReference Include=\"VSLangProj\">\n- <Version>7.0.3301</Version>\n- </PackageReference>\n- <PackageReference Include=\"VSLangProj80\">\n- <Version>8.0.50728</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.SourceLink.GitHub\">\n<Version>1.0.0</Version>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n+ <!--Temporary exclusions for interop transition-->\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.OLE.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.8.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.10.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.11.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.TextManager.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n</ItemGroup>\n<ItemGroup>\n<ZipItem Include=\"Templates\\Files\\TypeScriptJasmineUnitTest\\UnitTest.ts\" />\n<ItemGroup>\n<WCFMetadata Include=\"Connected Services\\\" />\n</ItemGroup>\n- <ItemGroup>\n- <Reference Include=\"System.Web\" />\n- <Reference Include=\"System.Windows.Forms\" />\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/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<SccAuxPath>SAK</SccAuxPath>\n<SccProvider>SAK</SccProvider>\n</PropertyGroup>\n- <ItemGroup>\n- <Reference Include=\"Microsoft.VisualStudio.TemplateWizardInterface, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL\" />\n- <Reference Include=\"System.Windows.Forms\" />\n- </ItemGroup>\n<ItemGroup>\n<Compile Include=\"..\\Nodejs\\Guids.cs\">\n<Link>Guids.cs</Link>\n</FilesToSign>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"EnvDTE\">\n- <Version>8.0.2</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.7.0</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Settings.15.0\">\n- <Version>16.6.30114.105</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>16.6.30107.105</Version>\n+ <PackageReference Include=\"Microsoft.SourceLink.GitHub\">\n+ <Version>1.0.0</Version>\n+ <PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.SourceLink.GitHub\">\n- <Version>1.0.0</Version>\n- <PrivateAssets>all</PrivateAssets>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Interop\">\n+ <Version>17.0.0-preview-1-31214-1111</Version>\n+ </PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Settings.15.0\">\n+ <Version>16.6.30114.105</Version>\n+ </PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n+ <Version>17.0.0-preview-1-31212-1111</Version>\n+ </PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudio.TemplateWizardInterface\" >\n+ <Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"..\\Nodejs\\SharedResources.proj\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"new_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"diff": "</FilesToSign>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"EnvDTE\">\n- <Version>8.0.2</Version>\n- </PackageReference>\n- <PackageReference Include=\"EnvDTE80\">\n- <Version>8.0.3</Version>\n- </PackageReference>\n- <PackageReference Include=\"EnvDTE90\">\n- <Version>9.0.3</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.Build\">\n<Version>16.6.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n<Version>16.0.1</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>16.6.30107.105</Version>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Interop\">\n+ <Version>17.0.0-preview-1-31214-1111</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.7.DesignTime\">\n- <Version>15.7.1</Version>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n+ <Version>17.0.0-preview-1-31212-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\">\n<Version>15.0.34</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/WebRole/WebRole.csproj",
"new_path": "Nodejs/Product/WebRole/WebRole.csproj",
"diff": "<PropertyGroup>\n<StartupObject />\n</PropertyGroup>\n- <ItemGroup>\n- <Reference Include=\"System\" />\n- <Reference Include=\"System.Data\" />\n- <Reference Include=\"System.Data.DataSetExtensions\" />\n- <Reference Include=\"System.Web.ApplicationServices\" />\n- <Reference Include=\"System.Xml\" />\n- <Reference Include=\"System.Xml.Linq\" />\n- <Reference Include=\"System.Web\" />\n- <Reference Include=\"System.Web.Services\" />\n- <Reference Include=\"System.EnterpriseServices\" />\n- <Reference Include=\"System.Web.DynamicData\" />\n- <Reference Include=\"System.Web.Entity\" />\n- <Reference Include=\"System.Web.ApplicationServices\" />\n- </ItemGroup>\n<ItemGroup>\n<Compile Include=\"WebSocketProxy.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n</ItemGroup>\n+ <ItemGroup>\n+ <Reference Include=\"System\" />\n+ <Reference Include=\"System.Web\" />\n+ </ItemGroup>\n<Import Project=\"$(MSBuildToolsPath)\\Microsoft.CSharp.targets\" />\n<Import Project=\"$(MSBuildExtensionsPath32)\\Microsoft\\VisualStudio\\v$(VSTarget)\\WebApplications\\Microsoft.WebApplication.targets\" />\n<Import Project=\"..\\ProjectAfter.targets\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<configuration>\n<packageSources>\n<clear />\n+ <add key=\"vssdk-unifiedPIAs\" value=\"https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/vssdk-unifiedPIAs/nuget/v3/index.json\" />\n+ <add key=\"vssdk\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n<add key=\"nuget.org\" value=\"https://api.nuget.org/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
[WIP] Start moving to merged interops
|
410,219 |
15.04.2021 12:43:37
| 25,200 |
1d40cc5534966a9d3386d9f53027173140ed03eb
|
Finish updating to merged interops
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "</T4ParameterValues>\n</ItemGroup>\n<ItemGroup>\n- <PackageReference Include=\"Microsoft.Build\">\n- <Version>16.6.0</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.Build.Framework\">\n- <Version>16.6.0</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.Build.Utilities.Core\">\n<Version>16.6.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.7.0</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n- <Version>16.0.1</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Debugger.Interop.10.0\">\n<Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Debugger.InteropA\">\n<Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Editor\">\n- <Version>16.6.255</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ImageCatalog\">\n<Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ProjectAggregator\">\n<Version>17.0.0-preview-1-31209-1111</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\">\n- <Version>15.0.34</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n<Version>17.0.0-preview-1-31212-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Framework\">\n<Version>17.0.0-preview-1-31212-1111</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Text.UI\">\n- <Version>16.6.255</Version>\n- </PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Text.UI.Wpf\">\n- <Version>16.6.255</Version>\n+ <PackageReference Include=\"Microsoft.VisualStudio.TestWindow.Interfaces\">\n+ <Version>17.0.0-beta.21213.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.VsInteractiveWindow\">\n- <Version>2.8.0</Version>\n+ <Version>4.0.0-beta.21176.3</Version>\n+ </PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Workspace.Extensions.VS\">\n+ <Version>17.0.12-preview-0001-g930963cc5f</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Workspace.VSIntegration\">\n<Version>16.3.43</Version>\n<PackageReference Include=\"System.ValueTuple\">\n<Version>4.5.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"VsWebSite.Interop\">\n+ <Version>17.0.0-preview-1-31209-1111</Version>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.SourceLink.GitHub\">\n<Version>1.0.0</Version>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<!--Temporary exclusions for interop transition-->\n+ <PackageReference Include=\"Microsoft.VisualStudio.Designer.Interfaces\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.OLE.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.8.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.9.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.10.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.11.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.12.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.TextManager.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n</ItemGroup>\n<ItemGroup>\n<ItemGroup>\n<WCFMetadata Include=\"Connected Services\\\" />\n</ItemGroup>\n+ <ItemGroup>\n+ <Reference Include=\"System.Web\" />\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/Project/NodejsProjectNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs",
"diff": "@@ -21,7 +21,7 @@ using VsCommands = Microsoft.VisualStudio.VSConstants.VSStd97CmdID;\nnamespace Microsoft.NodejsTools.Project\n{\n- internal class NodejsProjectNode : CommonProjectNode, VsWebSite.VSWebSite, INodePackageModulesCommands, IVsBuildPropertyStorage\n+ internal class NodejsProjectNode : CommonProjectNode, /*VsWebSite.VSWebSite,*/ INodePackageModulesCommands, IVsBuildPropertyStorage\n{\nprivate readonly HashSet<string> _warningFiles = new HashSet<string>();\nprivate readonly HashSet<string> _errorFiles = new HashSet<string>();\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/SharedProject/ProjectFactory.cs",
"new_path": "Nodejs/Product/Nodejs/SharedProject/ProjectFactory.cs",
"diff": "@@ -15,7 +15,7 @@ namespace Microsoft.VisualStudioTools.Project\n/// Creates projects within the solution\n/// </summary>\n- public abstract class ProjectFactory : FlavoredProjectFactoryBase, IVsAsynchronousProjectCreate, IVsProjectUpgradeViaFactory4, IVsProjectUpgradeViaFactory\n+ public abstract class ProjectFactory : FlavoredProjectFactoryBase, /*IVsAsynchronousProjectCreate,*/ IVsProjectUpgradeViaFactory4, IVsProjectUpgradeViaFactory\n{\n#region fields\nprivate System.IServiceProvider site;\n@@ -157,29 +157,29 @@ namespace Microsoft.VisualStudioTools.Project\n}\n#endregion\n- public virtual bool CanCreateProjectAsynchronously(ref Guid rguidProjectID, string filename, uint flags)\n- {\n- return true;\n- }\n+ //public virtual bool CanCreateProjectAsynchronously(ref Guid rguidProjectID, string filename, uint flags)\n+ //{\n+ // return true;\n+ //}\n- public void OnBeforeCreateProjectAsync(ref Guid rguidProjectID, string filename, string location, string pszName, uint flags)\n- {\n- }\n+ //public void OnBeforeCreateProjectAsync(ref Guid rguidProjectID, string filename, string location, string pszName, uint flags)\n+ //{\n+ //}\n- public IVsTask CreateProjectAsync(ref Guid rguidProjectID, string filename, string location, string pszName, uint flags)\n- {\n- var iid = typeof(IVsHierarchy).GUID;\n- return VsTaskLibraryHelper.CreateAndStartTask(this.taskSchedulerService.Value, VsTaskRunContext.UIThreadBackgroundPriority, VsTaskLibraryHelper.CreateTaskBody(() =>\n- {\n- CreateProject(filename, location, pszName, flags, ref iid, out var project, out var cancelled);\n- if (cancelled != 0)\n- {\n- throw new OperationCanceledException();\n- }\n+ //public IVsTask CreateProjectAsync(ref Guid rguidProjectID, string filename, string location, string pszName, uint flags)\n+ //{\n+ // var iid = typeof(IVsHierarchy).GUID;\n+ // return VsTaskLibraryHelper.CreateAndStartTask(this.taskSchedulerService.Value, VsTaskRunContext.UIThreadBackgroundPriority, VsTaskLibraryHelper.CreateTaskBody(() =>\n+ // {\n+ // CreateProject(filename, location, pszName, flags, ref iid, out var project, out var cancelled);\n+ // if (cancelled != 0)\n+ // {\n+ // throw new OperationCanceledException();\n+ // }\n- return Marshal.GetObjectForIUnknown(project);\n- }));\n- }\n+ // return Marshal.GetObjectForIUnknown(project);\n+ // }));\n+ //}\n#region Project Upgrades\n"
},
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<clear />\n<add key=\"vssdk-unifiedPIAs\" value=\"https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/vssdk-unifiedPIAs/nuget/v3/index.json\" />\n<add key=\"vssdk\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n+ <add key=\"VS\" value=\"https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json\" />\n+ <add key=\"dotnet-tools@Local\" value=\"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools%40Local/nuget/v3/index.json\" />\n<add key=\"nuget.org\" value=\"https://api.nuget.org/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Finish updating to merged interops
|
410,219 |
15.04.2021 13:26:37
| 25,200 |
e42cd2c5239eb44cbf0e4f46aeca75cf55c6daba
|
Add additional excludes to have zero dependency analyzer warnings
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Version>17.0.12-preview-0001-g930963cc5f</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Workspace.VSIntegration\">\n- <Version>16.3.43</Version>\n+ <Version>17.0.12-preview-0001-g930963cc5f</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<!--Temporary exclusions for interop transition-->\n+ <PackageReference Include=\"EnvDTE\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.Internal.VisualStudio.Shell.Interop.10.0.DesignTime\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Designer.Interfaces\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.OLE.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.10.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.11.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.12.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n<PackageReference Include=\"Microsoft.VisualStudio.TextManager.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.TextManager.Interop.8.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\" ExcludeAssets=\"all\" PrivateAssets=\"all\" />\n</ItemGroup>\n<ItemGroup>\n<ZipItem Include=\"Templates\\Files\\TypeScriptJasmineUnitTest\\UnitTest.ts\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<Version>17.0.0-preview-1-31214-1111</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Settings.15.0\">\n- <Version>16.6.30114.105</Version>\n+ <Version>17.0.0-preview-1-31214-244</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n<Version>17.0.0-preview-1-31212-1111</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"new_path": "Nodejs/Product/TestAdapter/TestAdapter.csproj",
"diff": "<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.7.0</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.Telemetry\">\n- <Version>16.3.59</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"new_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"diff": "<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n<Version>17.0.0-preview-1-31212-1111</Version>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\">\n- <Version>15.0.34</Version>\n- </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Add additional excludes to have zero dependency analyzer warnings
|
410,219 |
15.04.2021 13:38:58
| 25,200 |
0ece107181fec6c2da9153bb72f1a75310968385
|
Delete implementation of deprecated project load interface
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/SharedProject/ProjectFactory.cs",
"new_path": "Nodejs/Product/Nodejs/SharedProject/ProjectFactory.cs",
"diff": "@@ -15,7 +15,7 @@ namespace Microsoft.VisualStudioTools.Project\n/// Creates projects within the solution\n/// </summary>\n- public abstract class ProjectFactory : FlavoredProjectFactoryBase, /*IVsAsynchronousProjectCreate,*/ IVsProjectUpgradeViaFactory4, IVsProjectUpgradeViaFactory\n+ public abstract class ProjectFactory : FlavoredProjectFactoryBase, IVsProjectUpgradeViaFactory4, IVsProjectUpgradeViaFactory\n{\n#region fields\nprivate System.IServiceProvider site;\n@@ -157,30 +157,6 @@ namespace Microsoft.VisualStudioTools.Project\n}\n#endregion\n- //public virtual bool CanCreateProjectAsynchronously(ref Guid rguidProjectID, string filename, uint flags)\n- //{\n- // return true;\n- //}\n-\n- //public void OnBeforeCreateProjectAsync(ref Guid rguidProjectID, string filename, string location, string pszName, uint flags)\n- //{\n- //}\n-\n- //public IVsTask CreateProjectAsync(ref Guid rguidProjectID, string filename, string location, string pszName, uint flags)\n- //{\n- // var iid = typeof(IVsHierarchy).GUID;\n- // return VsTaskLibraryHelper.CreateAndStartTask(this.taskSchedulerService.Value, VsTaskRunContext.UIThreadBackgroundPriority, VsTaskLibraryHelper.CreateTaskBody(() =>\n- // {\n- // CreateProject(filename, location, pszName, flags, ref iid, out var project, out var cancelled);\n- // if (cancelled != 0)\n- // {\n- // throw new OperationCanceledException();\n- // }\n-\n- // return Marshal.GetObjectForIUnknown(project);\n- // }));\n- //}\n-\n#region Project Upgrades\n/// <summary>\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Delete implementation of deprecated project load interface
|
410,219 |
16.04.2021 09:36:17
| 25,200 |
0327de9a647d1105441fb9df0fc1cf2a2b374012
|
Switch to single internal feed
|
[
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<configuration>\n<packageSources>\n<clear />\n- <add key=\"vssdk-unifiedPIAs\" value=\"https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/vssdk-unifiedPIAs/nuget/v3/index.json\" />\n- <add key=\"vssdk\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n- <add key=\"VS\" value=\"https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json\" />\n- <add key=\"dotnet-tools@Local\" value=\"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools%40Local/nuget/v3/index.json\" />\n- <add key=\"nuget.org\" value=\"https://api.nuget.org/v3/index.json\" />\n+ <add key=\"TS-Dependencies\" value=\"https://pkgs.dev.azure.com/devdiv/_packaging/TS-Dependencies/nuget/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Switch to single internal feed
|
410,219 |
19.04.2021 10:14:03
| 25,200 |
90f6a23f65ff3d75e754675db5bd0b632a03206f
|
Update VSWebSite.Interop reference
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Version>4.5.0</Version>\n</PackageReference>\n<PackageReference Include=\"VsWebSite.Interop\">\n- <Version>17.0.0-preview-1-31209-1111</Version>\n+ <Version>17.0.0-preview-1-31216-1112</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.SourceLink.GitHub\">\n<Version>1.0.0</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs",
"new_path": "Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs",
"diff": "@@ -21,7 +21,7 @@ using VsCommands = Microsoft.VisualStudio.VSConstants.VSStd97CmdID;\nnamespace Microsoft.NodejsTools.Project\n{\n- internal class NodejsProjectNode : CommonProjectNode, /*VsWebSite.VSWebSite,*/ INodePackageModulesCommands, IVsBuildPropertyStorage\n+ internal class NodejsProjectNode : CommonProjectNode, VsWebSite.VSWebSite, INodePackageModulesCommands, IVsBuildPropertyStorage\n{\nprivate readonly HashSet<string> _warningFiles = new HashSet<string>();\nprivate readonly HashSet<string> _errorFiles = new HashSet<string>();\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update VSWebSite.Interop reference
|
410,219 |
22.04.2021 15:33:44
| 25,200 |
ff6853b2105e51c5e52a6e165d95881e2eb7c217
|
Update package versions to signed versions
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Debugger.Interop.10.0\">\n- <Version>17.0.0-preview-1-31209-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Debugger.InteropA\">\n- <Version>17.0.0-preview-1-31209-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ImageCatalog\">\n- <Version>17.0.0-preview-1-31209-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Imaging\">\n- <Version>17.0.0-preview-1-31212-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Interop\">\n- <Version>17.0.0-preview-1-31214-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ProjectAggregator\">\n- <Version>17.0.0-preview-1-31209-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>17.0.0-preview-1-31212-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.Framework\">\n- <Version>17.0.0-preview-1-31212-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.TestWindow.Interfaces\">\n<Version>17.0.0-beta.21213.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.VsInteractiveWindow\">\n- <Version>4.0.0-beta.21176.3</Version>\n+ <Version>4.0.0-beta.21220.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Workspace.Extensions.VS\">\n<Version>17.0.12-preview-0001-g930963cc5f</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"new_path": "Nodejs/Product/ProjectWizard/ProjectWizard.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Interop\">\n- <Version>17.0.0-preview-1-31214-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Settings.15.0\">\n- <Version>17.0.0-preview-1-31214-244</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>17.0.0-preview-1-31212-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.TemplateWizardInterface\" >\n- <Version>17.0.0-preview-1-31209-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n</ItemGroup>\n<Import Project=\"..\\Nodejs\\SharedResources.proj\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"new_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"diff": "<Version>16.0.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Interop\">\n- <Version>17.0.0-preview-1-31214-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Shell.15.0\">\n- <Version>17.0.0-preview-1-31212-1111</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<configuration>\n<packageSources>\n<clear />\n- <add key=\"TS-Dependencies\" value=\"https://pkgs.dev.azure.com/devdiv/_packaging/TS-Dependencies/nuget/v3/index.json\" />\n+ <add key=\"vssdk\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Update package versions to signed versions
|
410,219 |
22.04.2021 15:47:44
| 25,200 |
b8cdf4267d44801eb2dc36d6adddff563ab9477a
|
Move back to private feed for now
|
[
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<configuration>\n<packageSources>\n<clear />\n- <add key=\"vssdk\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n+ <add key=\"TS-Dependencies\" value=\"https://devdiv.pkgs.visualstudio.com/_packaging/TS-Dependencies/nuget/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Move back to private feed for now
|
410,219 |
22.04.2021 16:18:01
| 25,200 |
1c7e060fef1410c56abff7fdf55c5e73199830b5
|
Adjust more dep versions
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.TestWindow.Interfaces\">\n- <Version>17.0.0-beta.21213.1</Version>\n+ <Version>17.0.0-beta.21222.4</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.VsInteractiveWindow\">\n<Version>4.0.0-beta.21220.1</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Workspace.Extensions.VS\">\n- <Version>17.0.12-preview-0001-g930963cc5f</Version>\n+ <Version>17.0.18-preview-0001-g64bd43440b</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Workspace.VSIntegration\">\n- <Version>17.0.12-preview-0001-g930963cc5f</Version>\n+ <Version>17.0.18-preview-0001-g64bd43440b</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudioEng.MicroBuild.Core\">\n<Version>0.4.1</Version>\n<Version>4.5.0</Version>\n</PackageReference>\n<PackageReference Include=\"VsWebSite.Interop\">\n- <Version>17.0.0-preview-1-31216-1112</Version>\n+ <Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.SourceLink.GitHub\">\n<Version>1.0.0</Version>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n<!--Temporary exclusions for interop transition-->\n- <PackageReference Include=\"EnvDTE\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.Internal.VisualStudio.Shell.Interop.10.0.DesignTime\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Designer.Interfaces\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.OLE.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.8.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.9.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.10.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.11.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.12.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.TextManager.Interop\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.TextManager.Interop.8.0\" ExcludeAssets=\"compile\" PrivateAssets=\"compile\" />\n- <PackageReference Include=\"Microsoft.VisualStudio.SDK.EmbedInteropTypes\" ExcludeAssets=\"all\" PrivateAssets=\"all\" />\n+ <PackageReference Include=\"Microsoft.VisualStudio.Designer.Interfaces\" ExcludeAssets=\"all\" PrivateAssets=\"all\" />\n</ItemGroup>\n<ItemGroup>\n<ZipItem Include=\"Templates\\Files\\TypeScriptJasmineUnitTest\\UnitTest.ts\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"new_path": "Nodejs/Product/TestAdapterImpl/TestAdapterImpl.csproj",
"diff": "<Version>4.7.0</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\">\n- <Version>16.0.1</Version>\n+ <Version>17.0.0-release-20210407-01</Version>\n</PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Interop\">\n<Version>17.0.0-preview-2-31221-277</Version>\n"
},
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"new_path": "Nodejs/Product/TestAdapterNetStandard/TestAdapterNetStandard.csproj",
"diff": "<PrivateAssets>all</PrivateAssets>\n<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>\n</PackageReference>\n- <PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\" Version=\"16.0.1\" />\n+ <PackageReference Include=\"Microsoft.TestPlatform.ObjectModel\" Version=\"17.0.0-release-20210407-01\" />\n<PackageReference Include=\"Microsoft.VisualStudio.Telemetry\" Version=\"16.3.59\" />\n<PackageReference Include=\"Newtonsoft.Json\" Version=\"12.0.2\" />\n<PackageReference Include=\"Microsoft.SourceLink.GitHub\" Version=\"1.0.0\" PrivateAssets=\"all\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Adjust more dep versions
|
410,219 |
23.04.2021 10:07:04
| 25,200 |
e25f914e8ba7d81f9e528d7c6162f74a034aeddb
|
Remove final workaround
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<PackageReference Include=\"Microsoft.VisualStudio.Debugger.InteropA\">\n<Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.VisualStudio.Editor\">\n+ <!--Required until MS.VS.VSInteractiveWindow updates its editor dependency to a merged interop version-->\n+ <Version>17.0.32-g9d6b2c6f26</Version>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.ImageCatalog\">\n<Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n<Version>1.0.0</Version>\n<PrivateAssets>all</PrivateAssets>\n</PackageReference>\n- <!--Temporary exclusions for interop transition-->\n- <PackageReference Include=\"Microsoft.VisualStudio.Designer.Interfaces\" ExcludeAssets=\"all\" PrivateAssets=\"all\" />\n</ItemGroup>\n<ItemGroup>\n<ZipItem Include=\"Templates\\Files\\TypeScriptJasmineUnitTest\\UnitTest.ts\" />\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Remove final workaround
|
410,219 |
04.05.2021 11:37:46
| 25,200 |
a5b376a6eac0d7545b041484fe574e2d30c7aedb
|
Consume feature flags interop types from package
|
[
{
"change_type": "MODIFY",
"old_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"new_path": "Nodejs/Product/Nodejs/Nodejs.csproj",
"diff": "<Compile Include=\"Diagnostics\\NodeJsToolsEventSource.cs\" />\n<Compile Include=\"Project\\OperationProgressService.cs\" />\n<Compile Include=\"Repl\\InteractiveWindowContentType.cs\" />\n- <Compile Include=\"SharedProject\\IVsFeatureFlags.cs\" />\n<Compile Include=\"SharedProject\\SystemUtilities.cs\" />\n<Compile Include=\"SharedProject\\UiaAutomationNativeMethods.cs\" />\n<Compile Include=\"SharedProject\\Wpf\\NotificationTextBox.cs\" />\n<PackageReference Include=\"Microsoft.CSharp\">\n<Version>4.7.0</Version>\n</PackageReference>\n+ <PackageReference Include=\"Microsoft.Internal.VisualStudio.Interop\">\n+ <Version>17.0.0-preview-2-31221-277</Version>\n+ </PackageReference>\n<PackageReference Include=\"Microsoft.VisualStudio.Debugger.Interop.10.0\">\n<Version>17.0.0-preview-2-31221-277</Version>\n</PackageReference>\n"
},
{
"change_type": "MODIFY",
"old_path": "nuget.config",
"new_path": "nuget.config",
"diff": "<configuration>\n<packageSources>\n<clear />\n- <add key=\"TS-Dependencies\" value=\"https://devdiv.pkgs.visualstudio.com/_packaging/TS-Dependencies/nuget/v3/index.json\" />\n+ <add key=\"vssdk\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json\" />\n+ <add key=\"vs-impl\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json\" />\n+ <add key=\"nuget.org\" value=\"https://api.nuget.org/v3/index.json\" />\n</packageSources>\n</configuration>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
microsoft/nodejstools
|
Consume feature flags interop types from package
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.