Skip to content

Ability to merge release back to develop (OBSOLETE PULL REQUEST) #290

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.

Sign up for GitHub

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

Closed
wants to merge 132 commits into from
Closed

Ability to merge release back to develop (OBSOLETE PULL REQUEST) #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
9485b2f
also include GetVersion to build output
SimonCropp Jun 29, 2014
ddc0c0f
cleanup
SimonCropp Jun 29, 2014
a6c15d6
remove un-used tests
SimonCropp Jun 29, 2014
d6e6120
refs
SimonCropp Jun 29, 2014
c278d4f
fix file names
SimonCropp Jun 29, 2014
98edcf4
fix file names in tests
SimonCropp Jun 29, 2014
6edef7d
also output the get version props to build output
SimonCropp Jun 30, 2014
b2482c9
redundant file
SimonCropp Jun 30, 2014
d3947f1
create beta version
SimonCropp Jun 30, 2014
c0e6e02
Added skipIfNotDefined for upcoming Continua CI v1.5
GeertvanHorrik Jul 2, 2014
54f6d0d
cleanup
SimonCropp Jul 3, 2014
712b2fe
Merge pull request #200 from GeertvanHorrik/master
SimonCropp Jul 5, 2014
e1d76da
fix error message for GitVersionTask
SimonCropp Jul 6, 2014
7ef98d4
introduce the concept of Authentication
SimonCropp Jul 6, 2014
4dee207
move arguments to the exe
SimonCropp Jul 6, 2014
1d523b2
collapse test namespace
SimonCropp Jul 6, 2014
d2a6f7e
add missing test attribute
SimonCropp Jul 6, 2014
e72520f
only perform PerformPreProcessingSteps once per solution instance
SimonCropp Jul 6, 2014
e900398
should actually verify test output
SimonCropp Jul 6, 2014
fbda0a8
remove redundant nuget
SimonCropp Jul 6, 2014
6f9987a
remove redundant nuget
SimonCropp Jul 6, 2014
f2c985e
Added support for NextVersion.txt in GitFlow and dynamic repositories
GeertvanHorrik Jul 8, 2014
105eeeb
Improvements after code review for #208
GeertvanHorrik Jul 8, 2014
1023b0a
Merge pull request #208 from GeertvanHorrik/master
JakeGinnivan Jul 8, 2014
f36f6ea
fix typo
SimonCropp Jul 6, 2014
b2d676e
add failing unit test
SimonCropp Jul 14, 2014
1293562
dont bump PreReleaseTag on specific commit
SimonCropp Jul 15, 2014
58d7af2
Merge pull request #211 from Particular/exactTagOnRelease
JakeGinnivan Jul 16, 2014
05381af
Potential fix for #173
gep13 Jul 4, 2014
83dd8a8
Corrected ReSharper Inspection Issue
gep13 Jul 7, 2014
f423868
Corrected addition ReSharper Code Inspections
gep13 Jul 8, 2014
d456fc2
Merge branch 'Issue173'
JakeGinnivan Jul 16, 2014
4974298
Adding support for Syntevo SmartGit/Hg's GitFlow merge commit message…
Jun 18, 2014
abedac0
Added additional variables for NuGet (see #201)
GeertvanHorrik Jul 8, 2014
ede8551
Removed "Version" variable (users should pick one of the existing ones)
GeertvanHorrik Jul 8, 2014
c2e60b8
Merge branch 'GeertvanHorrik-master'
JakeGinnivan Jul 16, 2014
2e7991a
Merge pull request #221 from JakeGinnivan/martavermaster
JakeGinnivan Jul 16, 2014
6184cb1
Quick fix to dump log to console when an error occurs
JakeGinnivan Jul 16, 2014
c6cc915
Adding nuget.exe so that build.bat works out of the box.
hmemcpy Jul 20, 2014
5ba76d3
Merge pull request #225 from hmemcpy/master
JakeGinnivan Jul 20, 2014
73a91e3
Merge pull request #222 from JakeGinnivan/DumpLogOnError
andreasohlund Jul 23, 2014
232ef26
Bump version to 1.1
JakeGinnivan Jul 26, 2014
5907b0f
Added release notes
JakeGinnivan Jul 26, 2014
2552573
Ignore xml comment build warnings, fixed assembly info generation for…
JakeGinnivan Jul 27, 2014
28a7c9e
Pass version to pepita explicitly
JakeGinnivan Jul 27, 2014
a813c97
Update ReleaseNotes.md
JakeGinnivan Jul 27, 2014
2ee6da2
Tag comparison was treating stable as higher than pre-release causing…
JakeGinnivan Jul 27, 2014
a4b40aa
Merge pull request #231 from JakeGinnivan/TagComparisons
JakeGinnivan Jul 27, 2014
4974f2e
Adding support for UpdateAssemblyInfo taking a specific filename
hmemcpy Jul 20, 2014
6e1e9f3
Adding support for patching a single file (given a relative and absol…
hmemcpy Jul 21, 2014
a78ef71
Merge pull request #227 from hmemcpy/master
JakeGinnivan Aug 8, 2014
9b1eafb
Bumped version to 1.2.0 and fixed issue with duplicate command line N…
JakeGinnivan Aug 8, 2014
0faf048
Updated with missing release information
gep13 Aug 15, 2014
00b4dd7
Merge pull request #243 from gep13/patch-1
andreasohlund Aug 15, 2014
2bd4963
Added link to ReleaseNotes.md for Choco Package
gep13 Aug 15, 2014
c91f304
Merge pull request #244 from gep13/patch-2
JakeGinnivan Aug 19, 2014
10009ef
(#173) Fix up merge message for Stash
gep13 Aug 20, 2014
2320dce
Merge pull request #247 from gep13/Issue173-Take2
andreasohlund Aug 20, 2014
1743f68
Adding in new version of LibGit2Sharp, 0.19.0.
Aug 28, 2014
dff80ea
Merge pull request #248 from gep13/LibGit2Sharp0.19.0
SimonCropp Sep 3, 2014
fabd6b7
Update ReleaseNotes.md
gep13 Sep 3, 2014
5acf275
Merge pull request #249 from gep13/patch-3
andreasohlund Sep 3, 2014
b9288ec
update to newest pepita
SimonCropp Sep 22, 2014
9fa552d
bump test refs
SimonCropp Sep 22, 2014
1764ad1
fix typo
SimonCropp Sep 22, 2014
a4abfe3
make versioning scheme configurable
SimonCropp Sep 24, 2014
7d27524
simplify assembly versioing
SimonCropp Sep 24, 2014
e9f649d
simplify tests
SimonCropp Sep 24, 2014
49b33c5
split out exe test
SimonCropp Sep 24, 2014
a155126
remove redundant module init
SimonCropp Sep 24, 2014
b3ea567
remove redundant code
SimonCropp Sep 24, 2014
2fe94bd
rename acceptance tests to GitVersionCore.Tests
SimonCropp Sep 24, 2014
d79a582
rename test project
SimonCropp Sep 24, 2014
38deb59
move VariableProviderTests
SimonCropp Sep 24, 2014
4311761
move version tests
SimonCropp Sep 24, 2014
9829ee7
move git dir tests
SimonCropp Sep 24, 2014
b99dd7f
move argument parser
SimonCropp Sep 24, 2014
d7f09ec
move InformationalVersionBuilderTests
SimonCropp Sep 24, 2014
9b58b34
fix GitVersion.CommandLine nuget name
SimonCropp Sep 24, 2014
5d2f324
update next version
SimonCropp Sep 24, 2014
746d3bd
update release notes
SimonCropp Sep 24, 2014
5706e41
also output NuGetVersion
SimonCropp Sep 25, 2014
483928d
Update ReleaseNotes.md
Sep 26, 2014
683590c
(#260) Correcing AppVeyor Support for Pull Requests
Sep 26, 2014
d1fafa1
(#260) Adding output for GenerateSetParameterMessage
Sep 26, 2014
8b9aef9
(#260) Favour local branches over remote ones
gep13 Sep 27, 2014
5f2cbbd
simplify MergeMessageParser
SimonCropp Sep 30, 2014
75b0872
add concept of short version
SimonCropp Sep 30, 2014
8367064
fix merge message parser
SimonCropp Sep 30, 2014
7472ceb
Merge pull request #258 from henning-me/patch-1
JakeGinnivan Oct 1, 2014
b5c0ae5
Merge pull request #262 from gep13/AppVeyorFixes
nulltoken Oct 2, 2014
8738dc3
add semver tostring tests
SimonCropp Oct 4, 2014
154fe46
move releasedate finding code
SimonCropp Oct 4, 2014
c899ce3
remove need to lookup sha
SimonCropp Oct 4, 2014
de4469e
simplify ReleaseDateFinder
SimonCropp Oct 4, 2014
43c2849
split out LastVersionOnMasterFinder
SimonCropp Oct 4, 2014
68fc846
push sha and date up
SimonCropp Oct 4, 2014
2415f2b
remove OriginalRelease
SimonCropp Oct 4, 2014
012a659
move cache to task
SimonCropp Oct 4, 2014
f32a3cc
use LastVersionOnMasterFinder in task
SimonCropp Oct 4, 2014
5135afc
make LastVersionOnMasterFinder return a date
SimonCropp Oct 4, 2014
2d5f9ff
remove concept of releasedate from the core
SimonCropp Oct 4, 2014
f58a509
add githubflow todo
SimonCropp Oct 4, 2014
c2a7981
better use of when
SimonCropp Oct 4, 2014
7db87ef
fix some error
SimonCropp Oct 4, 2014
62204f7
simplify OptionallyTaggedBranchVersionFinderBase
SimonCropp Oct 4, 2014
e884547
remove OptionallyTaggedBranchVersionFinderBase
SimonCropp Oct 4, 2014
2d602c3
remove redundant code
SimonCropp Oct 4, 2014
f5ebe41
remove need for empty
SimonCropp Oct 4, 2014
3fad05e
remove redundant dot checks
SimonCropp Oct 4, 2014
c13c113
move beta bumping code
SimonCropp Oct 4, 2014
affb7fb
remove redundant method
SimonCropp Oct 5, 2014
0ed4a77
equals is more readable
SimonCropp Oct 5, 2014
dd231ff
clean up NextSemverCalculator
SimonCropp Oct 5, 2014
2805e26
Remove OriginalRelease from task
distantcam Oct 6, 2014
9bff8f6
add missing package lines
SimonCropp Oct 7, 2014
fe947ad
ShortVersionParser should ignore start 'V'
SimonCropp Oct 7, 2014
f0c1981
(Correction) Changed to using REST API
Oct 8, 2014
f548840
bump version
SimonCropp Oct 8, 2014
6ea71e1
fix last minor version finding
SimonCropp Oct 8, 2014
01f8704
Merge pull request #273 from gep13/AppVeyorCorrection
SimonCropp Oct 8, 2014
751a68e
fix inspection
SimonCropp Oct 8, 2014
e6a6fb0
add test for #253
SimonCropp Oct 8, 2014
8754796
fix support naming with slash
SimonCropp Oct 8, 2014
ac60b85
fix Incorrect Semantic version written from task
SimonCropp Oct 9, 2014
332480f
bump version
SimonCropp Oct 9, 2014
0bc9155
(#284) Skip creation of HEAD branch
Oct 27, 2014
c67f155
Merge pull request #286 from gep13/FurtherAppVeyorFox
SimonCropp Oct 27, 2014
0827448
remove redundant release notes
SimonCropp Oct 27, 2014
9ca5b6c
include nuspec in project
SimonCropp Oct 27, 2014
963a024
bump version
SimonCropp Nov 2, 2014
1dc79b7
Ability to merge release back to develop
dtabuenc Nov 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .nuget/NuGet.exe
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions .nuget/packages.config
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions AcceptanceTests/CommitCountingRepoFixture.cs
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions AcceptanceTests/EmptyRepositoryFixture.cs
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions AcceptanceTests/ExecCmdLineArgumentTest.cs
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions AcceptanceTests/GitFlow/BaseGitFlowRepositoryFixture.cs
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions AcceptanceTests/GitFlow/DevelopScenarios.cs
View file
Open in desktop

This file was deleted.

229 changes: 0 additions & 229 deletions AcceptanceTests/GitFlow/MetaDataByCommitFixture.cs
View file
Open in desktop

This file was deleted.

Loading