Skip to content

Conversation

@v-wuzhai
Copy link
Contributor

No description provided.

@v-wuzhai v-wuzhai requested a review from dsplaisted April 21, 2022 07:14
@ghost
Copy link

ghost commented Apr 21, 2022

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@v-wuzhai v-wuzhai requested a review from marcpopMSFT April 21, 2022 07:14
var outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks);
outputDirectory.Should().HaveFiles(new[] {
runtimeConfigName,
$"{testProject.Name}.runtimeconfig.dev.json"
Copy link
Member

Choose a reason for hiding this comment

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

was this file renamed from 3.0 to now?

Copy link
Member

Choose a reason for hiding this comment

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

No, we stopped generating it: #17014

TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}",
RuntimeConfigPath = _runtimeConfigPath,
RuntimeConfigDevPath = _runtimeConfigDevPath,
RuntimeFrameworks = new[]
Copy link
Member

Choose a reason for hiding this comment

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

The mock items below this are all 3.1.0 frameworks. I believe those should get updated too.

TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}",
RuntimeConfigPath = _runtimeConfigPath,
RuntimeConfigDevPath = _runtimeConfigDevPath,
RuntimeFrameworks = new[]
Copy link
Member

Choose a reason for hiding this comment

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

Same comment as above with the below mocktaskitems.

[InlineData("latestMinor", "netcoreapp3.0", true)]
[InlineData("Invalid", "netcoreapp3.0", false)]
[InlineData("latestMinor", ToolsetInfo.CurrentTargetFramework, true)]
[InlineData("Invalid", ToolsetInfo.CurrentTargetFramework, false)]
Copy link
Member

Choose a reason for hiding this comment

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

Reading this test, I think it's trying to rollforward to the latest minor. Since 5.0 and 6.0 don't have minors, it probably makes sense to keep this on 3.0.

TargetFrameworkMoniker = $".NETCoreApp,Version=v{ToolsetInfo.CurrentTargetFrameworkVersion}",
RuntimeConfigPath = _runtimeConfigPath,
RuntimeConfigDevPath = _runtimeConfigDevPath,
RuntimeFrameworks = new[]
Copy link
Member

Choose a reason for hiding this comment

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

I think the 3.0.0-preview1.100 should be a 6.0 version since it appears to be trying to roll forward on the latest minor if I'm reading this right.

new Dictionary<string, string>
{
{"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "3.1.0"}
{"FrameworkName", "Microsoft.NETCore.App"}, {"Version", "6.0.5"}
Copy link
Member

Choose a reason for hiding this comment

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

It probably makers sense to make all of these 6.0.0 versions. See how before it was 3.1.0. I think it's simpler if we're specifying a specific version of 6.0 to go with the first one as otherwise, different tests might end up doing different ones and anyone reading the code might wonder why we picked .5.

@v-wuzhai
Copy link
Contributor Author

v-wuzhai commented Jul 4, 2022

Done

@marcpopMSFT marcpopMSFT merged commit e551812 into release/6.0.4xx Jul 5, 2022
@marcpopMSFT marcpopMSFT deleted the Jason/UpdateHardcodedNET30 branch July 5, 2022 23:11
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.

5 participants