Do not force .NET4.5 in case legacy test settings are provided #2545
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hello @nohwnd! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
Haplois
approved these changes
Sep 4, 2020
ghost
merged commit 
cvpoienaru
reviewed
Sep 4, 2020
|
|
||
| var finalSettingsXml = finalxPath.CreateNavigator().OuterXml; | ||
|
|
||
| var expectedSettingsXml = | ||
| "<RunSettings>\r\n <MSTest>\r\n <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>\r\n <ForcedLegacyMode>true</ForcedLegacyMode>\r\n </MSTest>\r\n <RunConfiguration></RunConfiguration>\r\n</RunSettings>"; | ||
| "<RunSettings>\r\n" + |
There was a problem hiding this comment.
nit: In order to make the string as a whole more readable it would be nice to remove \r\n and instead do string.Join with Environment.NewLine. Also using verbatim strings (@"") should help with readability.
There was a problem hiding this comment.
You are right, I just used regex to split it. It's merged already, next time :)
There was a problem hiding this comment.
Will definitely face it when fixing tests to run on linux.
|
|
||
| var finalSettingsXml = finalxPath.CreateNavigator().OuterXml; | ||
|
|
||
| var expectedSettingsXml = | ||
| "<RunSettings>\r\n <RunConfiguration>\r\n <TargetPlatform>X86</TargetPlatform>\r\n <TargetFrameworkVersion>Framework45</TargetFrameworkVersion>\r\n </RunConfiguration>\r\n <MSTest>\r\n <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>\r\n <ForcedLegacyMode>true</ForcedLegacyMode>\r\n </MSTest>\r\n</RunSettings>"; | ||
| "<RunSettings>\r\n" + |
| StringAssert.Contains(this.settingsProvider.ActiveRunSettings.SettingsXml, $"<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n <RunConfiguration>\r\n <TargetPlatform>{Constants.DefaultPlatform}</TargetPlatform>\r\n <TargetFrameworkVersion>{Framework.FromString(FrameworkVersion.Framework45.ToString()).Name}</TargetFrameworkVersion>\r\n <ResultsDirectory>{Constants.DefaultResultsDirectory}</ResultsDirectory>\r\n </RunConfiguration>\r\n <MSTest>\r\n <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>\r\n <ForcedLegacyMode>true</ForcedLegacyMode>\r\n </MSTest>\r\n <DataCollectionRunSettings>\r\n <DataCollectors />\r\n </DataCollectionRunSettings>\r\n</RunSettings>"); | ||
|
|
||
| var expected = | ||
| $"<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n" + |
nohwnd
added a commit
to nohwnd/vstest
that referenced
this pull request
Sep 24, 2020
…soft#2545) * Do not force .NET4.5 in case legacy test settings are provided * Net core app * Fix runconfig * Default platform
nohwnd
added a commit
that referenced
this pull request
Sep 24, 2020
* Avoid logging >Task returned false but did not log an error.< (#2557) * Avoid logging >Task returned false but did not log an error.< on test failure * Add VSTEST_BUILD_DEBUG env var * Using namespaces * Invert the switch because it will be still backwards in the final release * Use bitness from process or OS (#2571) * Do not force .NET4.5 in case legacy test settings are provided (#2545) * Do not force .NET4.5 in case legacy test settings are provided * Net core app * Fix runconfig * Default platform
nohwnd
added a commit
that referenced
this pull request
Oct 6, 2020
* Hide -release in console * Add param block * Match on whole branch name * Set var * Change assertion * Trim version * Update dependencies from https://github.com/dotnet/arcade build 20200602.3 (#2456) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 5.0.0-beta.20052.1 -> To Version 1.0.0-beta.20302.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update feeds * Revert to previous dotnet version * Added new exception handling (#2461) * Test space added * Exception handler was added to catch AccessDeniedException while trying to create TestResults folder * Remove unnecessary space * Deleted unnecessary test. Changed console message and corrected folder path in that message * Remove unnecessary dot * Removed unnecessary lines and usings and coreccted exception message * Removed unnecessary line * Updating resource files * New exception handling was added * Formatted exception message * Adding test run attachments processing (#2463) * v1 * Merging v1 * Rename to MultiTestRunsFinalization * New version * More changes * More changes * Next changes * Fix * test * More changes * Dmc chagnes * next * small changes * compiled * More changes * acceptance tests green * Review comments #1 * Resolving more comments * Tests for design mode client * Tests for events handler * revert not related changes * More changes * Compiling OK, tests OK * Unit tests for manager * More changes * More tests * tests for reqeust sender * more tests * Tests for cancelling * Acceptance tests done * Remove not used stuff * Fix comments * Fix race condition in test * Fix another race condition * Fix converting to xml * fix next test * fix test * Next changes * Review changes #1 * Fixing multi test finalization manager tests * Fixes * Fix last unit test * Fix acceptance tests * Progress feature, compiling + unit tests * acceptance tests changes * More changes * Fixing resources accesability * Fix test * Fix race conditions in acceptance tests * RFC changes merged * Log warning in case of unexpected message id * Fix spelling * Additional comment * Restore some stuff in interfaces * Big renaming * Added processingSettings * Fix naming * Move explanation to <remarks> * Add environment variables to enable MacOS dump * Fixed code coverage compatibility issue (#2527) Fixed code coverage compatibility issue * Print version of the product in log (#2535) * Trigger dumps asynchronously (#2533) * Run each dump in a task in netclient dumper * More reasonable timeout * Revert "Trigger dumps asynchronously (#2533)" (#2541) This reverts commit 3454261. * Remove env variables * Remove sleeps and extra process dumps from blame * Fix blame parameter, warning, and add all testhosts to be ngend (#2579) * Forward merge fixes from master to rc2 (#2581) * Avoid logging >Task returned false but did not log an error.< (#2557) * Avoid logging >Task returned false but did not log an error.< on test failure * Add VSTEST_BUILD_DEBUG env var * Using namespaces * Invert the switch because it will be still backwards in the final release * Use bitness from process or OS (#2571) * Do not force .NET4.5 in case legacy test settings are provided (#2545) * Do not force .NET4.5 in case legacy test settings are provided * Net core app * Fix runconfig * Default platform * Generate release notes in pipeline * Fix release-notes-script Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Sanan Yuzbashiyev <Sanan07@users.noreply.github.com> Co-authored-by: Jakub Chocholowicz <59966772+jakubch1@users.noreply.github.com> Co-authored-by: Codrin-Victor Poienaru <cvpoienaru@gmail.com>
ghost
pushed a commit
that referenced
this pull request
Nov 20, 2020
* Hide -release in console * Add param block * Match on whole branch name * Set var * Change assertion * Trim version * Update dependencies from https://github.com/dotnet/arcade build 20200602.3 (#2456) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 5.0.0-beta.20052.1 -> To Version 1.0.0-beta.20302.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update feeds * Revert to previous dotnet version * Added new exception handling (#2461) * Test space added * Exception handler was added to catch AccessDeniedException while trying to create TestResults folder * Remove unnecessary space * Deleted unnecessary test. Changed console message and corrected folder path in that message * Remove unnecessary dot * Removed unnecessary lines and usings and coreccted exception message * Removed unnecessary line * Updating resource files * New exception handling was added * Formatted exception message * Adding test run attachments processing (#2463) * v1 * Merging v1 * Rename to MultiTestRunsFinalization * New version * More changes * More changes * Next changes * Fix * test * More changes * Dmc chagnes * next * small changes * compiled * More changes * acceptance tests green * Review comments #1 * Resolving more comments * Tests for design mode client * Tests for events handler * revert not related changes * More changes * Compiling OK, tests OK * Unit tests for manager * More changes * More tests * tests for reqeust sender * more tests * Tests for cancelling * Acceptance tests done * Remove not used stuff * Fix comments * Fix race condition in test * Fix another race condition * Fix converting to xml * fix next test * fix test * Next changes * Review changes #1 * Fixing multi test finalization manager tests * Fixes * Fix last unit test * Fix acceptance tests * Progress feature, compiling + unit tests * acceptance tests changes * More changes * Fixing resources accesability * Fix test * Fix race conditions in acceptance tests * RFC changes merged * Log warning in case of unexpected message id * Fix spelling * Additional comment * Restore some stuff in interfaces * Big renaming * Added processingSettings * Fix naming * Move explanation to <remarks> * Add environment variables to enable MacOS dump * Fixed code coverage compatibility issue (#2527) Fixed code coverage compatibility issue * Print version of the product in log (#2535) * Trigger dumps asynchronously (#2533) * Run each dump in a task in netclient dumper * More reasonable timeout * Revert "Trigger dumps asynchronously (#2533)" (#2541) This reverts commit 3454261. * Remove env variables * Remove sleeps and extra process dumps from blame * Fix blame parameter, warning, and add all testhosts to be ngend (#2579) * Forward merge fixes from master to rc2 (#2581) * Avoid logging >Task returned false but did not log an error.< (#2557) * Avoid logging >Task returned false but did not log an error.< on test failure * Add VSTEST_BUILD_DEBUG env var * Using namespaces * Invert the switch because it will be still backwards in the final release * Use bitness from process or OS (#2571) * Do not force .NET4.5 in case legacy test settings are provided (#2545) * Do not force .NET4.5 in case legacy test settings are provided * Net core app * Fix runconfig * Default platform * Generate release notes in pipeline * Fix the initial assets location of VSTest assets (#2589) They are being manually pushed to the dotnet-tools feed, not dotnet-core. * Signing instructions for Newtonsoft.Json.dll added (#2601) (#2603) * Signing instructions for Newtonsoft.Json.dll added * Added 3rdParty signature thumbprint to the accept list. * Cherry-picked signing fixes from `master` (#2619) * Fix collect dump always * Fix acceptance tests * botched merge * Add regular expressions dependency * Remove regex Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Sanan Yuzbashiyev <Sanan07@users.noreply.github.com> Co-authored-by: Jakub Chocholowicz <59966772+jakubch1@users.noreply.github.com> Co-authored-by: Codrin-Victor Poienaru <cvpoienaru@gmail.com> Co-authored-by: Matt Mitchell <mmitche@microsoft.com> Co-authored-by: Medeni Baykal <433724+Haplois@users.noreply.github.com>
This was referenced Mar 6, 2021
This was referenced Mar 13, 2021
This was referenced Mar 17, 2021
mburumaxwell
pushed a commit
to faluapp/falu-dotnet
that referenced
this pull request
Jun 12, 2021
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.3 to 16.9.1. #Release notes *Sourced from [Microsoft.NET.Test.Sdk's releases](https://github.com/microsoft/vstest/releases).* > ## v16.9.1 > See the release notes [here](https://github.com/microsoft/vstest-docs/blob/master/docs/releases.md#1691). > > ## v16.9.0-preview-20210127-04 > See the release notes [here](https://github.com/microsoft/vstest-docs/blob/master/docs/releases.md#1690-preview-20210127-04). > > ## v16.9.0-preview-20210106-01 > See the release notes [here](https://github.com/microsoft/vstest-docs/blob/master/docs/releases.md#1690-preview-20210106-01). > > ## v16.9.0-preview-20201123-03 > See the release notes [here](https://github.com/microsoft/vstest-docs/blob/master/docs/releases.md#1690-preview-20201123-03). > > ------------------------------- > > ## v16.9.0-preview-20201020-06 > See the release notes [here](https://github.com/microsoft/vstest-docs/blob/master/docs/releases.md#1690-preview-20201020-06). > > ------------------------------- > > ## 16.9.0-preview-20201020-06 > > ### Issue Fixed > * Enable Fakes Datacollector settings to be added in design mode [#2586](microsoft/vstest#2586) > * Fix blame parameter, warning, and add all testhosts to be ngend [#2579](microsoft/vstest#2579) > * Add netcoreapp1.0 support to `Microsoft.TestPlatform.TestHost` NuGet [#2569](microsoft/vstest#2569) > * Use bitness from process or OS [#2571](microsoft/vstest#2571) > * Restore netcoreapp1.0 support for testhost [#2554](microsoft/vstest#2554) > * Get symbols of DiaSymReader from externals [#2560](microsoft/vstest#2560) > * Do not force .NET4.5 in case legacy test settings are provided [#2545](microsoft/vstest#2545) > * Simplify package references [#2559](microsoft/vstest#2559) > * Enable default compile items for Microsoft.TestPlatform.PlatformAbstractions [#2556](microsoft/vstest#2556) > * Avoid logging >Task returned false but did not log an error.< [#2557](microsoft/vstest#2557) > * Fixed code coverage compatibility issue [#2527](microsoft/vstest#2527) > * Add environment variables to enable MacOS dump > * Adding test run attachments processing [#2463](microsoft/vstest#2463) > > See full log [here](microsoft/vstest@v16.8.0-release-20200921-02...v16.9.0-preview-20201020-06) > > ### Drops > > * TestPlatform vsix: [16.9.0-preview-20201020-06](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20201020-06;/TestPlatform.vsix) > * Microsoft.TestPlatform.ObjectModel : [16.9.0-preview-20201020-06](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.9.0-preview-20201020-06) ...
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Legacy settings were forcing .NET4.5 when used, which prevents projects targetting other TFMs from running tests.