Migrate to .NET 6 #68

maraf · 2022-11-09T16:20:59Z

Migrate all projects to .NET 6
Update all nuget references
Unify common properties in Directory.Build.props

TODO

Update GitExtensions.Extensibility version
Update Neptuo.* to .NET

Fixes #67

src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj

src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec

src/GitExtensions.PluginManager/Plugin.cs

src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj

dfev77 · 2022-11-11T09:39:50Z

I believe you also need to update appveyor.yaml to list "Visual Studio 2022" for .net 6 support

maraf · 2022-11-13T08:38:13Z

The current error is error NU1102: Unable to find package GitExtensions.Extensibility with version (>= 0.3.0)

Waiting for gitextensions/gitextensions.extensibility#26

gerhardol

+1
Obviously needed.
I do not have the knowledge to say that this is the only needed changes (there are later steps though...)

RussKie · 2022-11-13T10:21:52Z

I'm seeing this warning locally:

D:\Development\gitextensions.pluginmanager\src\PackageManager.UI\PackageManager.UI.csproj : error NU1701: Package 'Neptuo.Exceptions 1.2.1' was restored using '.NETFramework,Version=v4.6.1, .NETFramework,Version=v4.6.2, .NETFramework,Version=v4.7 
, .NETFramework,Version=v4.7.1, .NETFramework,Version=v4.7.2, .NETFramework,Version=v4.8, .NETFramework,Version=v4.8.1' instead of the project target framework 'net6.0-windows7.0'. This package may not be fully compatible with your project. [D:\D 
evelopment\gitextensions.pluginmanager\GitExtensions.PluginManager.sln]

RussKie · 2022-11-13T10:22:42Z

https://www.nuget.org/packages/GitExtensions.Extensibility/0.3.0.57 is published, but it may be a little while before it becomes available.

…sions

maraf · 2022-11-14T08:58:52Z

I'm seeing this warning locally:

Me too, but I don't have capacity at the moment to update these packages.
Is it blocker from your point of view for this release?
All the scenarios work.

Packages.props

RussKie · 2022-11-22T00:09:28Z

Me too, but I don't have capacity at the moment to update these packages.
Is it blocker from your point of view for this release?
All the scenarios work.

May be someone could help. Are these packages public?
This is a blocker for the release of 4.0.1, which is addressing few very public issues.

maraf · 2022-11-22T10:08:29Z

This is a blocker for the release of 4.0.1, which is addressing few very public issues.

What I meant is whether the warnings are blocker for merging this PR?
If not, I can do it later. As the app works.

RussKie · 2022-11-22T11:37:47Z

Yes, it's a blocker, we can't build it.

…

On Tue, 22 Nov 2022 at 21:08, Marek Fišera ***@***.***> wrote: This is a blocker for the release of 4.0.1, which is addressing few very public issues. What I meant is whether the warnings are blocker for merging this PR? If not, I can do it later. — Reply to this email directly, view it on GitHub <#68 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABBTEXS5V5QTHIAZLRXEWMDWJSLSPANCNFSM6AAAAAAR3TQIXI> . You are receiving this because your review was requested.Message ID: ***@***.***>

maraf · 2022-11-22T13:33:46Z

Ok, I'll work on it.
Btw. How did you build the .NET 5 version? Because the packages didn't change to quite some time.

RussKie · 2022-11-23T06:45:00Z

How did you build the .NET 5 version? Because the packages didn't change to quite some time.

I have no idea :D

maraf · 2022-12-01T22:21:06Z

@RussKie I have updated Neptuo packages and applied nullable annotations as you required in your commit.
Please, go through the changes, if I missed something. Btw. the build was broken by one of the changes that treated warnings as errors.

gerhardol · 2022-12-01T23:42:29Z

Build fails:

C:\projects\gitextensions-pluginmanager\src\GitExtensions.PluginManager\GitExtensions.PluginManager.csproj(58,5): error MSB3030: Could not copy the file "..\PackageManager.UI\bin\Release\net6.0-windows\publish\PackageManager.UI.exe" because it was not found.

RussKie · 2022-12-02T00:43:58Z

...and applied nullable annotations as you required in your commit.

I think <nullable>enable</nullable> slipped through as I copied the lot from another place. It'd be great to remove nullable annotations to another PR so we can review it independently.

- error NU5103: The folder 'lib\ PackageManager\PackageManager.UI.exe' under 'lib' is not recognized as a valid framework name or a supported culture identifier. Rename itto a valid framework name or culture identifier. - error NU5101: The assembly 'li b\GitExtensions.PluginManager.dll' is placed directly under 'lib' folder. It is recommended that assemblies be placed inside a framework-specific folder. Move it into a framework-specific folder. - error NU5128: Some target fram eworks declared in the dependencies group of the nuspec and the lib/ref folder do not have exact matches in the other location. Consult the list of actions below: - Add a dependency group for PackageManager0.0 to the nuspec

GitExtensions.PluginManager shouldn't reference custom nuget packages to avoid version conflicts. It least I think that was the original idea for ArgsFix.cs.

RussKie · 2022-12-05T10:44:03Z

EDIT: probably figured it out..

👍

maraf · 2022-12-05T11:01:57Z

Hopefully last thing, versioning on AppVeyor is broken.

maraf · 2022-12-05T11:53:47Z

@RussKie Do you know why appveyor produces versions 0.0.0.* althou the yaml descriptor contains 2.0.0.*?

gitextensions.pluginmanager/appveyor.yml

Line 6 in d54783a

version: 2.0.0.{build}

RussKie · 2022-12-06T11:12:43Z

Do you know why appveyor produces versions 0.0.0.* althou the yaml descriptor contains 2.0.0.*?

It appears $(PackageVersion) isn't set correctly:

gitextensions.pluginmanager/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj

Lines 87 to 89 in 4e3ba18

    
           <Target Name="Zip" AfterTargets="Pack"> 
        
             <Exec Command="powershell -ExecutionPolicy Unrestricted $(MSBuildProjectDirectory)\..\..\tools\Zip-GitExtensionsPlugin.ps1 -Version $(PackageVersion) -Configuration $(Configuration)" /> 
        
           </Target>

RussKie · 2022-12-13T10:29:46Z

I've pulled it locally, and the tests wouldn't build. This had me scratching head for quite some time, and I'm surprised it was working on the CI... The order of imports of package references was incorrect, those need to be defined in the props file instead of the targets file.

The local dev is also something that needs improving - I was unable to build the solution by dotnet build as it would also try to generate a nuspec and package the app. But I'll leave it for another day.

https://www.appveyor.com/docs/build-configuration/#net-core-csproj-files-patching

RussKie · 2022-12-13T10:40:46Z

Do you know why appveyor produces versions 0.0.0.* althou the yaml descriptor contains 2.0.0.*?

It appears $(PackageVersion) isn't set correctly:

This

RussKie · 2022-12-13T10:41:47Z

Looks like we're in business!

maraf · 2022-12-13T12:39:50Z

v2.0.0 was never published...
Git Extensions v3.5.x was using v1.1

RussKie · 2022-12-14T08:19:30Z

v2.0.0 was never published...

🤦
Reverted to 2.0. We haven't published anything, so no harm done.

maraf added 2 commits November 9, 2022 17:04

Update target framework to .net6.0

87fc51d

Update nuget packages

c5bb331

maraf requested a review from RussKie November 9, 2022 16:21

maraf self-assigned this Nov 9, 2022

RussKie reviewed Nov 10, 2022

View reviewed changes

dfev77 approved these changes Nov 11, 2022

View reviewed changes

src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj Outdated Show resolved Hide resolved

maraf added 3 commits November 11, 2022 11:53

Feedback from @RussKie and @dfev77

67a3cc3

Update GitExtensions.Extensibility required version

4ab6d75

Update GitExtensions.Extensibility referenced version

d54bb0f

maraf requested a review from RussKie November 13, 2022 08:38

gerhardol reviewed Nov 13, 2022

View reviewed changes

RussKie added 2 commits November 13, 2022 21:37

Centralise version management using Microsoft.Build.CentralPackageVer…

c4cefa7

…sions

Opps

a2cd32b

maraf commented Nov 14, 2022

View reviewed changes

Packages.props Outdated Show resolved Hide resolved

maraf added 2 commits December 1, 2022 13:44

Update Neptuo references.

938519e

Apply C# nullable annotations.

b9d9e4b

maraf mentioned this pull request Dec 1, 2022

Wrong dependencies in metadata (GitExtensions.Extensibility => Version="0.3.*" missing) maraf/GitExtensions.SolutionRunner#31

Closed

maraf requested a review from RussKie December 5, 2022 10:18

Revert "Revert the revert of ArgsFix.cs"

d54783a

GitExtensions.PluginManager shouldn't reference custom nuget packages to avoid version conflicts. It least I think that was the original idea for ArgsFix.cs.

maraf added this to the 2.0.0 milestone Dec 5, 2022

This comment was marked as resolved.

Sign in to view

fix versioning

9190bc3

Make AppVeyor patch props files

c57e777

https://www.appveyor.com/docs/build-configuration/#net-core-csproj-files-patching

RussKie approved these changes Dec 13, 2022

View reviewed changes

RussKie merged commit 3b53e6e into gitextensions:master Dec 13, 2022

RussKie modified the milestones: 2.0.0, 3.0.0 Dec 13, 2022

maraf deleted the Net6 branch December 13, 2022 12:39

RussKie modified the milestones: 3.0.0, 2.1.0, 2.0.0 Dec 14, 2022

RussKie modified the milestones: 2.0.0, 2.1.0 Dec 14, 2022

Uh oh!

Migrate to .NET 6 #68

Migrate to .NET 6 #68

Uh oh!

Conversation

maraf commented Nov 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dfev77 commented Nov 11, 2022

Uh oh!

maraf commented Nov 13, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gerhardol left a comment

Choose a reason for hiding this comment

Uh oh!

RussKie commented Nov 13, 2022

Uh oh!

RussKie commented Nov 13, 2022

Uh oh!

maraf commented Nov 14, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

RussKie commented Nov 22, 2022

Uh oh!

maraf commented Nov 22, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RussKie commented Nov 22, 2022 via email

Uh oh!

maraf commented Nov 22, 2022

Uh oh!

RussKie commented Nov 23, 2022

Uh oh!

maraf commented Dec 1, 2022

Uh oh!

gerhardol commented Dec 1, 2022

Uh oh!

RussKie commented Dec 2, 2022

Uh oh!

RussKie commented Dec 5, 2022

Uh oh!

maraf commented Dec 5, 2022

Uh oh!

maraf commented Dec 5, 2022

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

RussKie commented Dec 6, 2022

Uh oh!

RussKie commented Dec 13, 2022

Uh oh!

RussKie commented Dec 13, 2022

Uh oh!

RussKie commented Dec 13, 2022

Uh oh!

maraf commented Dec 13, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RussKie commented Dec 14, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

maraf commented Nov 9, 2022 •

edited

Loading

maraf commented Nov 13, 2022 •

edited

Loading

maraf commented Nov 14, 2022 •

edited

Loading

maraf commented Nov 22, 2022 •

edited

Loading

maraf commented Dec 13, 2022 •

edited

Loading