File tree Expand file tree Collapse file tree 1 file changed +5
-29
lines changed
src/GitVersionCore.Tests/VersionCalculation Expand file tree Collapse file tree 1 file changed +5
-29
lines changed Original file line number Diff line number Diff line change @@ -118,33 +118,20 @@ public void PreReleaseTagCanUseBranchName()
118
118
}
119
119
120
120
[ Test ]
121
- public void PreReleaseTagCanUseBranchNameMainline ( )
121
+ public void PreReleaseVersionMainline ( )
122
122
{
123
123
var config = new Config
124
124
{
125
125
VersioningMode = VersioningMode . Mainline ,
126
- NextVersion = "1.0.0" ,
127
- Branches = new Dictionary < string , BranchConfig >
128
- {
129
- {
130
- "custom" , new BranchConfig
131
- {
132
- Regex = "custom/" ,
133
- Tag = "useBranchName" ,
134
- SourceBranches = new HashSet < string > ( )
135
- }
136
- }
137
- }
126
+ NextVersion = "1.0.0"
138
127
} ;
139
128
140
129
using var fixture = new EmptyRepositoryFixture ( ) ;
141
130
fixture . MakeACommit ( ) ;
142
- fixture . BranchTo ( "develop" ) ;
143
- fixture . MakeACommit ( ) ;
144
- fixture . BranchTo ( "custom/foo" ) ;
131
+ fixture . BranchTo ( "foo" ) ;
145
132
fixture . MakeACommit ( ) ;
146
133
147
- fixture . AssertFullSemver ( "1.0.0-foo.2 " , config ) ;
134
+ fixture . AssertFullSemver ( "1.0.0-foo.1 " , config ) ;
148
135
}
149
136
150
137
[ Test ]
@@ -153,18 +140,7 @@ public void MergeIntoMainline()
153
140
var config = new Config
154
141
{
155
142
VersioningMode = VersioningMode . Mainline ,
156
- NextVersion = "1.0.0" ,
157
- Branches = new Dictionary < string , BranchConfig >
158
- {
159
- {
160
- "custom" , new BranchConfig
161
- {
162
- Regex = "custom/" ,
163
- Tag = "useBranchName" ,
164
- SourceBranches = new HashSet < string > ( )
165
- }
166
- }
167
- }
143
+ NextVersion = "1.0.0"
168
144
} ;
169
145
170
146
using var fixture = new EmptyRepositoryFixture ( ) ;
You can’t perform that action at this time.
0 commit comments