Move codebase to netcoreapp3.1 #3861
Merged
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
nohwnd
reviewed
Jul 18, 2022
src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
Show resolved
Hide resolved
...crosoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
Outdated
Show resolved
Hide resolved
src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
Show resolved
Hide resolved
test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs
Outdated
Show resolved
Hide resolved
...icrosoft.TestPlatform.AcceptanceTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs
Outdated
Show resolved
Hide resolved
...icrosoft.TestPlatform.AcceptanceTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs
Outdated
Show resolved
Hide resolved
Evangelink
force-pushed
the
netcoreapp3.1
branch
from
4543d7d to
fccf42d
Compare
Evangelink
commented
Jul 18, 2022
| @@ -87,6 +87,10 @@ internal sealed class DoesNotReturnIfAttribute : Attribute | |||
| public bool ParameterValue { get; } | |||
| } | |||
|
|
|||
| #endif | |||
|
|
|||
| #if NETFRAMEWORK || WINDOWS_UWP || NETSTANDARD && !NETSTANDARD2_1 || NETCOREAPP && !NET5_0_OR_GREATER | |||
There was a problem hiding this comment.
These 2 attributes are only available in .NET 5.0+ so I moved them to a different section.
Evangelink
commented
Jul 18, 2022
| @@ -39,7 +39,6 @@ public void Run(Action? action, PlatformApartmentState apartmentState, bool wait | |||
| } | |||
| }); | |||
|
|
|||
| // ApartmentState is not supported in netcoreapp1.0. | |||
There was a problem hiding this comment.
Comment wasn't specific enough to understand if we were supposed to make a change for other TFMs.
Evangelink
commented
Jul 18, 2022
Evangelink
commented
Jul 18, 2022
| @@ -1218,8 +1218,7 @@ private static void AddConsoleLogger(XmlDocument document, LoggerRunSettings log | |||
| navigator, | |||
| out var platformXml); | |||
|
|
|||
| bool runSettingsHaveValidPlatform = isValidPlatformXml && !platformXml.IsNullOrWhiteSpace(); | |||
| if (runSettingsHaveValidPlatform) | |||
| if (isValidPlatformXml && !platformXml.IsNullOrWhiteSpace()) | |||
There was a problem hiding this comment.
Merging the bool condition in the if otherwise null engine is confused and says platformXml can be null.
Evangelink
commented
Jul 18, 2022
| @@ -1178,8 +1143,9 @@ function Build-SpecificProjects { | |||
| ("net462", "net462\win7-x64"), | |||
| ("netstandard1.0", "netstandard1.0"), | |||
| ("netstandard1.3", "netstandard1.3"), | |||
| # REVIEW ME: Why do we copy netstandard2.0 into netcorecorapp2.1? | |||
There was a problem hiding this comment.
I think this relates to #2458
Evangelink
force-pushed
the
netcoreapp3.1
branch
4 times, most recently
from
4a6a32d to
ecaaee1
Compare
Evangelink
commented
Jul 22, 2022
| Publish-PackageWithRuntimeInternal $testHostProject $TPB_TargetFrameworkCore20 $TPB_X64_Runtime false $testhostCore20PackageTempX64Dir | ||
| Publish-PackageWithRuntimeInternal $testHostProject $TPB_TargetFrameworkCore10 $TPB_X64_Runtime true $testhostCore10PackageTempX64Dir | ||
| Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore31 $testhostCore31PackageDir | ||
| Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore31 $testhostUapPackageDir |
There was a problem hiding this comment.
@Haplois We were publishing netcoreapp2.0 as UAP, is it ok to bump that to netcoreapp3.1?
Evangelink
force-pushed
the
netcoreapp3.1
branch
2 times, most recently
from
43cb509 to
ef7b4ab
Compare
Haplois
reviewed
Jul 22, 2022
| @@ -2,5 +2,6 @@ | |||
| <Project> | |||
| <PropertyGroup> | |||
| <TargetNetFxVersion>net462</TargetNetFxVersion> | |||
| <TargetNetCoreVersion>netcoreapp3.1</TargetNetCoreVersion> | |||
There was a problem hiding this comment.
This cannot be true for source build. We need to build with net6.0 or preferably net7.0
There was a problem hiding this comment.
Maybe naming is poor, it's actually "min supported version". In case of source build this isn't used.
Evangelink
force-pushed
the
netcoreapp3.1
branch
2 times, most recently
from
3567101 to
fb0660d
Compare
nohwnd
approved these changes
Jul 25, 2022
src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
Show resolved
Hide resolved
test/Microsoft.TestPlatform.AcceptanceTests/DataCollectionTests.cs
Outdated
Show resolved
Hide resolved
test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs
Outdated
Show resolved
Hide resolved
nohwnd
approved these changes
Jul 25, 2022
…argetFrameworkDataSourceAttribute.cs Co-authored-by: Jakub Jareš <me@jakubjares.com>
Evangelink
force-pushed
the
netcoreapp3.1
branch
from
cb169c1 to
a4b328c
Compare
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.
Related issue
Fixes AB#1577617