Clean up branching

[mmnosek]

What is a current branching/release model for this repository? It have a hard time to figure out how we publish this and why some changes are not visible in the actual extension. It looks weird. Some things are

• merged to develop only
• merged to master and then to develop
• merged only to master but not released, etc.

We lose code and it's never released. Example: #4

It was merged in April but I cannot find it in any version 😢 Maybe some branching like 2.3, 2.4 would help?
@per-samuelsson @iqbalskd ?

[per-samuelsson]

What is a current branching/release model for this repository?

When I first created it, moving our VS bits out of Level1, the idea I had was to have master always reflect latest stable of Starcounter (i.e. 2.3 at this point) and develop to confirm to the same branch in Level1.

After that, there's been quite a few contributions, and I'm no longer sure.

I vote someone (preferably from apps- or front-end teams) take some kind of ownership and decide what's best. The repository is mostly about what templates (project- and item templates) should be maintained, and what should be a reasonable default for each Starcounter version. Hence, it's very much about the UX we want to give developers as a starting point. And to me, that would be best dictated by those of us concerned with "getting-started" and "front-end" development.

[ubbeK]

This action will taken soon by @iqbalskd #28 (comment)

Decided on last ReleasePlanning meeting:

• Current extension will still be called Starcounter for Visual Studio and will target https://www.nuget.org/packages/Starcounter.VisualStudio/1.0.4
• New extension will be called Starcounter 2.4 for Visual Studio and will target https://www.nuget.org/packages/Starcounter.VisualStudio/2.1.0

I am not 100% sure if this is the case but I think:

• master branch => 1.X.Y nuget packages (current 1.0.4)
• develop branch => 2,X.Y nuget packages (current 2.1.0)

@chrhol You made some changes a few days ago, is develop branch the source for nuget package 2.1.0?

[ubbeK]

I am not 100% sure if this is the case but I think:

• master branch => 1.X.Y nuget packages (current 1.0.4)
• develop branch => 2,X.Y nuget packages (current 2.1.0)
  @chrhol You made some changes a few days ago, is develop branch the source for nuget package 2.1.0?

It seems like it if we take a look at the version numbers:

• develop branch: https://github.com/Starcounter/Starcounter.VisualStudio/blob/develop/build/version.txt
• master branch: https://github.com/Starcounter/Starcounter.VisualStudio/blob/master/build/version.txt

[ubbeK]

I just created a new tag for version 2.1.0, https://github.com/Starcounter/Starcounter.VisualStudio/tree/v2.1.0

Release mastar version (Starcounter version 2.3.X compliant) does not have a tag for 1.0.4 and there has been more commits since that was published, so I will make sure that @iqbalskd releases a 1.0.4 version and creates a tag of that. From there on we should be able to create a clear workflow for this repository.

@mmnosek Any repositories workflow you think we should copy/reuse?

[ubbeK]

Issue to create a new nuget package from latest master branch: #35

[mmnosek]

Thanks, @per-samuelsson, and @ubbeK for the explanation!

@ubbeK , I think we are not going to have two version of the extension, according to this: https://github.com/Starcounter/AdminTrack/issues/440#issuecomment-363099779 am I right?

@mmnosek Any repositories workflow you think we should copy/reuse?

With comment above in mind, it's not a case anymore, right?

[per-samuelsson]

@ubbeK , I think we are not going to have two version of the extension, according to this: Starcounter/AdminTrack#440 (comment) am I right?

That is right.

[mmnosek]

Then I'm fine with any workflow as long as it is going to be possible to determine what is in which version. Especially, that I'm not contributing as a developer here 😃