Skip to content

Commit f2124d7

Browse files
committed
Removed need for powershell file, using inbuilt branch normalisation
1 parent f00c23c commit f2124d7

File tree

3 files changed

+7
-74
lines changed

3 files changed

+7
-74
lines changed

src/GitVersionExe/GitVersionExe.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@
152152
<Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(BuildDir)GitVersionVsoTaskBuild" />
153153
<Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(BuildDir)GitVersionVsoTaskBuild" />
154154
<Copy SourceFiles="$(ProjectDir)..\GitVersionVsoTask\icon.png" DestinationFolder="$(BuildDir)GitVersionVsoTaskBuild" />
155-
<Copy SourceFiles="$(ProjectDir)..\GitVersionVsoTask\Run-GitVersion.ps1" DestinationFolder="$(BuildDir)GitVersionVsoTaskBuild" />
156155
<Copy SourceFiles="$(ProjectDir)..\GitVersionVsoTask\task.json" DestinationFolder="$(BuildDir)GitVersionVsoTaskBuild" />
157-
156+
<Exec Command="$(BuildDir)\Update-GitVersionVsoTaskVersion.ps1 $(BuildDir)GitVersionVsoTaskBuild\task.json $(GitVersion_Major) $(GitVersion_Minor) $(GitVersion_Patch)" ContinueOnError="True" WorkingDirectory="$(BuildDir)" Condition="'$(GitVersion_SemVer)' != ''" />
157+
158158
<!-- Gem -->
159159
<Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(BuildDir)GemBuild\bin" />
160160
<Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(BuildDir)GemBuild\bin" />

src/GitVersionVsoTask/Run-GitVersion.ps1

Lines changed: 0 additions & 66 deletions
This file was deleted.

src/GitVersionVsoTask/task.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"demands": [],
1414
"version": {
1515
"Major": "0",
16-
"Minor": "1",
17-
"Patch": "29"
16+
"Minor": "0",
17+
"Patch": "0"
1818
},
1919
"minimumAgentVersion": "1.83.0",
2020
"groups": [
@@ -26,7 +26,6 @@
2626
],
2727
"instanceNameFormat": "GitVersion for $(BUILD_SOURCEBRANCHNAME)",
2828
"inputs": [
29-
3029
{
3130
"name": "updateAssemblyInfo",
3231
"type": "boolean",
@@ -46,9 +45,9 @@
4645
}
4746
],
4847
"execution": {
49-
"PowerShell": {
50-
"target": "$(currentDirectory)\\Run-GitVersion.ps1",
51-
"argumentFormat": "",
48+
"CmdLine": {
49+
"target": "$(currentDirectory)\\GitVersion.exe",
50+
"argumentFormat": "/output buildserver /updateAssemblyInfo $(updateAssemblyInfo) /nofetch $(additionalArguments)",
5251
"workingDirectory": "$(currentDirectory)"
5352
}
5453
}

0 commit comments

Comments
 (0)