Skip to content

Commit 6e2fb59

Browse files
committed
Fix GitVersion
1 parent 5457443 commit 6e2fb59

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed

GitVersion.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
next-version: 1.0.0
2+
mode: Mainline
3+
branches: {}
4+
major-version-bump-message: '\+semver:\s?(breaking|major)'
5+
minor-version-bump-message: '\+semver:\s?(feature|minor)'
6+
patch-version-bump-message: '\+semver:\s?(fix|patch)'
7+
no-bump-message: '\+semver:\s?(none|skip)'
8+
commit-message-incrementing: Enabled
9+
ignore:
10+
sha: []

pipelines/EasyConfig.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ steps:
3131
inputs:
3232
targetType: "filePath"
3333
filePath: "pipelines/tools/Run-GitVersion.ps1"
34+
arguments: '-Verbose'
3435
workingDirectory: "$(ProjectFolder)"
3536

3637
- task: DotNetCoreCLI@2
@@ -72,7 +73,7 @@ steps:
7273
configuration: '$(BuildConfiguration)'
7374
nobuild: true
7475
versioningScheme: 'byEnvVar'
75-
versionEnvVar: 'GitVersion.NuGetVersion'
76+
versionEnvVar: 'GitVersion_NuGetVersion'
7677
buildProperties: ''
7778
verbosityPack: 'Normal'
7879

pipelines/tools/Run-GitVersion.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Process {
1414

1515
Write-Verbose "Writing variables ..."
1616
foreach ($property in $jsonObj.PSObject.Properties) {
17-
Write-Verbose " GitVersion.$($property.Name): $($property.Value)"
18-
Write-Output "##vso[task.setvariable variable=GitVersion.$($property.Name);]$($property.Value)"
17+
Write-Verbose " GitVersion_$($property.Name): $($property.Value)"
18+
Write-Output "##vso[task.setvariable variable=GitVersion_$($property.Name);]$($property.Value)"
1919
}
2020
Write-Verbose " Done"
2121
}

publish.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $nugetfolder = $dir + "/" + "src/EasyConfig.SiteExtension.NuGet"
66
dotnet publish "$extensionfolder/EasyConfig.SiteExtension.csproj" --output "$nugetfolder/content/" -f netcoreapp3.0 -c Release
77
Copy-Item "$nugetfolder/applicationHost.xdt" "$nugetfolder/content/"
88

9-
dotnet pack "$extensionfolder/EasyConfig.SiteExtension.csproj" -o ./output -c Release --no-build
9+
dotnet pack "$extensionfolder/EasyConfig.SiteExtension.csproj" /p:PackageVersion=1.1.1 -o ./output -c Release --no-build
1010
# $nupkgfilename = @(Get-Childitem -path ./output/*.nupkg)[0].Name
1111

1212
#dotnet nuget push $nupkgfilename -k $env:NugetKey -s https://api.nuget.org/v3/index.json

src/EasyConfig.SiteExtension.NuGet/EasyConfig.SiteExtension.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>EasyConfig.SiteExtension</id>
55
<title>Easy Config</title>
6-
<version>1.0.0</version>
6+
<version>$version$</version>
77
<authors>Kirsten Kluge</authors>
88
<license type="expression">MIT</license>
99
<projectUrl>https://github.com/codez-one/EasyConfig</projectUrl>

src/EasyConfig.SiteExtension/EasyConfig.SiteExtension.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
88
<NuspecFile>../EasyConfig.SiteExtension.NuGet/EasyConfig.SiteExtension.nuspec</NuspecFile>
99
<NuspecBasePath>../EasyConfig.SiteExtension.NuGet/</NuspecBasePath>
10+
<NuspecProperties>version=$(PackageVersion)</NuspecProperties>
1011
<NoPackageAnalysis>true</NoPackageAnalysis>
1112
</PropertyGroup>
1213

0 commit comments

Comments
 (0)