Skip to content

Commit 7aaa4c5

Browse files
committed
bump version number and change versioning scheme
1 parent d35de0f commit 7aaa4c5

File tree

4 files changed

+62
-30
lines changed

4 files changed

+62
-30
lines changed

appveyor.yml

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,65 @@
1-
version: '{build}'
1+
#---------------------------------#
2+
# general configuration #
3+
#---------------------------------#
24

3-
image: Visual Studio 2017
5+
# version format
6+
version: 1.0.0.{build}
7+
8+
# version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
9+
environment:
10+
version_suffix: '-RC1'
11+
12+
# Do not build on tags (GitHub and BitBucket)
13+
skip_tags: true
14+
15+
# Maximum number of concurrent jobs for the project
16+
max_jobs: 1
17+
18+
#---------------------------------#
19+
# environment configuration #
20+
#---------------------------------#
21+
22+
# Build worker image (VM template)
23+
image:
24+
- Visual Studio 2017
25+
- Visual Studio 2019
26+
27+
# enable patching of Directory.Build.props
28+
dotnet_csproj:
29+
patch: true
30+
file: '**\*.props'
31+
version: '{version}'
32+
assembly_version: '{version}'
33+
file_version: '{version}'
34+
informational_version: '{version}$(version_suffix)'
35+
package_version: '{version}$(version_suffix)'
36+
37+
#---------------------------------#
38+
# build configuration #
39+
#---------------------------------#
440

541
build_script:
642
- ps: .\tools\Prepare-Release.ps1
743

44+
#---------------------------------#
45+
# tests configuration #
46+
#---------------------------------#
47+
848
test_script:
949
- ps: .\tools\Run-Tests.ps1
1050

51+
#---------------------------------#
52+
# artifacts configuration #
53+
#---------------------------------#
54+
1155
artifacts:
1256
- path: .\*.zip
1357
- path: .\*.nupkg
1458

59+
#---------------------------------#
60+
# deployment configuration #
61+
#---------------------------------#
62+
1563
# Commented out as we need to create a new signing policy.
1664
# deploy:
1765
# - provider: Webhook
@@ -23,4 +71,4 @@ artifacts:
2371
# on_build_status_changed: false
2472
# method: POST
2573
# authorization:
26-
# secure: RdmJQ3LAsGIbtqbxlcn7wF8ESTbPSDiR0Fmyt11mDl+avSDd0HKexHA+sWQA3cN1K8aVnKTzvjGTQS8DSDmLzQ==
74+
# secure: RdmJQ3LAsGIbtqbxlcn7wF8ESTbPSDiR0Fmyt11mDl+avSDd0HKexHA+sWQA3cN1K8aVnKTzvjGTQS8DSDmLzQ==

src/Directory.Build.props

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
1+
<!-- Do not use XML namespaces here (<Project xmlns="...">), because it would break patching of version numbers during builds on AppVeyor (https://github.com/appveyor/website/pull/409) -->
2+
<Project>
33
<PropertyGroup>
44
<Authors>Git Extensions</Authors>
55
<Company>Git Extensions</Company>
66
<RepositoryUrl>https://github.com/gitextensions/gitextensions.pluginmanager</RepositoryUrl>
77
<LangVersion>latest</LangVersion>
8-
9-
<VersionPrefix>0.9.0</VersionPrefix>
10-
<VersionSuffix></VersionSuffix>
8+
<Version>0.0.0</Version>
9+
<AssemblyVersion>0.0.0.1</AssemblyVersion>
10+
<FileVersion>0.0.0.1</FileVersion>
11+
<InformationalVersion>0.0.0.1</InformationalVersion>
12+
<PackageVersion>0.0.0.1</PackageVersion>
1113
</PropertyGroup>
12-
13-
</Project>
14+
</Project>

src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<GitExtensionsDebugPluginsPath>..\..\references\GitExtensions\UserPlugins\</GitExtensionsDebugPluginsPath>
1717
<GitExtensionsReferenceSource>appveyor</GitExtensionsReferenceSource>
1818
<GitExtensionsReferenceVersion>v3.2.0.5938</GitExtensionsReferenceVersion>
19+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1920
</PropertyGroup>
2021

2122
<ItemGroup>

tools/Prepare-Release.ps1

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,24 @@ Push-Location $PSScriptRoot;
33
$targetPath = '..\';
44

55
$isAppveyor = $True -eq $env:APPVEYOR;
6-
$isTag = 'true' -eq $env:APPVEYOR_REPO_TAG;
76

87
If (!$isAppveyor)
98
{
109
Write-Host "Running a local build";
1110

1211
$targetPath = Join-Path $targetPath 'artifacts';
13-
$versionSuffix = $Null;
14-
}
15-
Elseif (!$isTag)
16-
{
17-
Write-Host "Running an Appveyor commit build";
18-
19-
$buildNumber = "build{0:D4}" -f [convert]::ToInt32($env:APPVEYOR_BUILD_NUMBER, 10);
20-
$commitHash = ($env:APPVEYOR_REPO_COMMIT).Substring(0, 10);
21-
$versionSuffix = $buildNumber + "+" + $commitHash;
22-
23-
Write-Host ("Version suffix: " + $versionSuffix);
24-
}
25-
Else
26-
{
27-
Write-Host ("Running an Appveyor release (tag '" + $env:APPVEYOR_REPO_TAG_NAME + "') build");
28-
29-
$versionSuffix = $null;
3012
}
3113

3214
dotnet restore ..\GitExtensions.PluginManager.sln
3315

34-
msbuild ..\GitExtensions.PluginManager.sln /p:Configuration=Release -property:VersionSuffix=$versionSuffix -verbosity:minimal
16+
msbuild ..\GitExtensions.PluginManager.sln /p:Configuration=Release -verbosity:minimal
3517
if (!($LastExitCode -eq 0))
3618
{
3719
Write-Error -Message "MSBuild failed with $LastExitCode" -ErrorAction Stop
3820
}
3921

4022
$packPath = Join-Path ".." $targetPath;
41-
dotnet pack ..\src\GitExtensions.PluginManager -c Release -o $packPath --no-build /p:VersionSuffix=$versionSuffix
23+
dotnet pack ..\src\GitExtensions.PluginManager -c Release -o $packPath --no-build
4224

4325
Copy-Item ..\src\GitExtensions.PluginManager\bin\Release\*.zip $targetPath
4426

0 commit comments

Comments
 (0)