Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for changes in XPathNavigator for netcoreapp2.0 #1226

Merged
merged 11 commits into from
Oct 27, 2017

Conversation

harshjain2
Copy link
Contributor

@harshjain2 harshjain2 commented Oct 25, 2017

@@ -20,6 +20,11 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not ideal :-/ This will require all the nuget packages to declare an extra dependency.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove it.

return doc;
#else
return doc.ToXPathNavigable();
var ret = doc as IXPathNavigable;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this fix applies only to !NET451, could we move the fix accordingly. E.g.

#if NET451
    return doc;
#else
   var ret = doc as IXPathNavigable;
   if ...
#endif

Please add a comment on why line 212 works for netcoreapp2.0. Can we link to the bug also?

@@ -236,38 +236,37 @@ public void UpdateRunSettingsShouldThrowIfArchitectureSetIsIncompatibleWithCurre
[DataTestMethod]
[DataRow("DesignMode")]
[DataRow("CollectSourceInformation")]
public void UpdateRunSettingsShouldNotModifyXmlIfNavigatorIsNotAtRootNode(string settingName)
[Ignore]
public void UpdateRunSettingsShouldNotModifyXmlIfxmlDocumentIsNotAtRootNode(string settingName)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this is ignored?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is no more required.
We are using xmldoc and therefore, there is no concept of positioning as it used to be in xpathnavigatoor

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, Please remove this test.

@@ -236,38 +236,37 @@ public void UpdateRunSettingsShouldThrowIfArchitectureSetIsIncompatibleWithCurre
[DataTestMethod]
[DataRow("DesignMode")]
[DataRow("CollectSourceInformation")]
public void UpdateRunSettingsShouldNotModifyXmlIfNavigatorIsNotAtRootNode(string settingName)
[Ignore]
public void UpdateRunSettingsShouldNotModifyXmlIfxmlDocumentIsNotAtRootNode(string settingName)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, Please remove this test.

@navin22 navin22 merged commit 8e56f0b into microsoft:master Oct 27, 2017
codito pushed a commit to codito/vstest that referenced this pull request Oct 27, 2017
* Fix for changes in XPathNavigator in netcoreapp2.0
* Removed IXPathNavigable.
@codito codito mentioned this pull request Oct 27, 2017
smadala pushed a commit that referenced this pull request Oct 30, 2017
* Object Model Api fix (#1231)

* Adding the missing property LocalExtensionData in TestCase

* Fixed the test.

* Do not crash data collector if a extension initialize fails. (#1230)

* Do not crash data collector if a extension initialize fails.

* Add unit tests for the scenario.

* Fix for changes in XPathNavigator for netcoreapp2.0 (#1226)

* Fix for changes in XPathNavigator in netcoreapp2.0
* Removed IXPathNavigable.

* Use TPv2 as default for .NET 3.5. (#1232)

* Loading native dll's correctly for UWP release mode (#1234)

* Loading native dll's correctly for UWP release mode

* nit's

* decouple process bitness with OS Architecture

* HardCoded version of CLI to 2.1.0-preview1-007372 (#1238)

HardCoded version of CLI to 2.1.0-preview1-007372 as the latest version has some issues.

Reverted to old version of CLI because of dotnet/cli#7921

* Added null check for parent node.

* Added conditional statements to support building against netcoreapp1.0

* Get OSArchitecture from Platform Abstraction to check for ARM Processor (#1242)

* GetOsArchitecture from Platform Abstraction to check for ARM

* making sure path is always small
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants