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

Add net5 and net6 as TargetFrameworks #479

Closed
wants to merge 3 commits into from
Closed

Conversation

oformaniuk
Copy link
Member

No description provided.

@oformaniuk oformaniuk linked an issue Dec 20, 2021 that may be closed by this pull request
@oformaniuk oformaniuk added this to the v3 milestone Dec 22, 2021
@sonarcloud
Copy link

sonarcloud bot commented Dec 24, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

Comment on lines +69 to +76
<ItemGroup Condition="'$(TargetFramework)'=='net5'">
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6'">
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>

Copy link
Contributor

Choose a reason for hiding this comment

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

Microsoft.CSharp is a polyfill package hence this dependency should be able to be removed on the newer frameworks.

@thompson-tomo
Copy link
Contributor

Closes #573

@thompson-tomo
Copy link
Contributor

thompson-tomo commented Apr 1, 2024

@oformaniuk & @StefH I see that this has been sitting around for a while, any chance the conflicts could be resolved and then this merge progressed. :)

@oformaniuk
Copy link
Member Author

@oformaniuk & @StefH I see that this has been sitting around for a while, any chance could the conflicts be resolved and then this merge progressed. :)

I'd be happy to handle merging part if you can handle conflicts :)

Comment on lines -65 to +73
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' or '$(TargetFramework)'=='netcoreapp2.1'">
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' or '$(TargetFramework)'=='netcoreapp2.1' or '$(TargetFramework)'=='net5' or '$(TargetFramework)'=='net6'">
Copy link
Contributor

Choose a reason for hiding this comment

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

Condition should be simplified to improve maintenance going forward.

Comment on lines +80 to +86

<ItemGroup Condition="'$(ContinuousIntegrationBuild)' != 'true'">
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.33.0.40503">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be bundled in existing item group

Comment on lines +39 to +46
<PropertyGroup Condition="'$(TargetFramework)'=='net5'">
<DefineConstants>$(DefineConstants);netcoreapp;netstandard;net</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net6'">
<DefineConstants>$(DefineConstants);netcoreapp;netstandard;net</DefineConstants>
</PropertyGroup>

Copy link
Contributor

Choose a reason for hiding this comment

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

Should be checked if this is really needed.

@thompson-tomo
Copy link
Contributor

@oformaniuk I will take a look later today to see if I can push changes to this branch.

@oformaniuk
Copy link
Member Author

@oformaniuk I will take a look later today to see if I can push changes to this branch.

If not, it can be done by forking and merging back to this branch via PR 🙂

@thompson-tomo
Copy link
Contributor

@oformaniuk pr #577 has been created to resolve the conflicts and implements the feedback i have above.

@StefH
Copy link
Collaborator

StefH commented Apr 1, 2024

@thompson-tomo and @oformaniuk
I think it's more clear that this PR is just closed and a new PR is created which only adds the new frameworks.

Side note: do we actually want to add .NET 5 because that one is out of support for some time? And instead just add .NET 6 and .NET 8 because .NET 7 is also almost out of official support?

@thompson-tomo
Copy link
Contributor

thompson-tomo commented Apr 1, 2024

@StefH i agree. What I will do tomorrow morning my time is cherry pick the commits on to a new branch from master & then submit that as a fresh pr & close my other pr.

Also no issue on my side with only doing net 6

@oformaniuk
Copy link
Member Author

As agreed, change will be handled in a new PR.

@oformaniuk oformaniuk closed this Apr 1, 2024
@thompson-tomo
Copy link
Contributor

New PR is #578 which is a nice and clean PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Any porting available for .net core 5.0
4 participants