Merge commit 'c6c1747abb0538456e691831430d2cca397d79a4'
This commit is contained in:
commit
1099e8d094
3 changed files with 1 additions and 15 deletions
|
@ -213,13 +213,6 @@ extends:
|
||||||
_RuntimeIdentifier: ''
|
_RuntimeIdentifier: ''
|
||||||
_BuildArchitecture: 'x64'
|
_BuildArchitecture: 'x64'
|
||||||
_TestArg: $(_NonWindowsTestArg)
|
_TestArg: $(_NonWindowsTestArg)
|
||||||
Build_CentOS_7_1_Debug_x64:
|
|
||||||
_BuildConfig: Debug
|
|
||||||
_DockerParameter: '--docker centos'
|
|
||||||
_LinuxPortable: ''
|
|
||||||
_RuntimeIdentifier: ''
|
|
||||||
_BuildArchitecture: 'x64'
|
|
||||||
_TestArg: $(_NonWindowsTestArg)
|
|
||||||
Build_Debian_11_Debug_x64:
|
Build_Debian_11_Debug_x64:
|
||||||
_BuildConfig: Debug
|
_BuildConfig: Debug
|
||||||
_DockerParameter: '--docker debian'
|
_DockerParameter: '--docker debian'
|
||||||
|
|
|
@ -169,13 +169,6 @@ stages:
|
||||||
_RuntimeIdentifier: ''
|
_RuntimeIdentifier: ''
|
||||||
_BuildArchitecture: 'x64'
|
_BuildArchitecture: 'x64'
|
||||||
_TestArg: $(_NonWindowsTestArg)
|
_TestArg: $(_NonWindowsTestArg)
|
||||||
Build_CentOS_7_1_Debug_x64:
|
|
||||||
_BuildConfig: Debug
|
|
||||||
_DockerParameter: '--docker centos'
|
|
||||||
_LinuxPortable: ''
|
|
||||||
_RuntimeIdentifier: ''
|
|
||||||
_BuildArchitecture: 'x64'
|
|
||||||
_TestArg: $(_NonWindowsTestArg)
|
|
||||||
Build_Debian_11_Debug_x64:
|
Build_Debian_11_Debug_x64:
|
||||||
_BuildConfig: Debug
|
_BuildConfig: Debug
|
||||||
_DockerParameter: '--docker debian'
|
_DockerParameter: '--docker debian'
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<VersionMajor>6</VersionMajor>
|
<VersionMajor>6</VersionMajor>
|
||||||
<VersionMinor>0</VersionMinor>
|
<VersionMinor>0</VersionMinor>
|
||||||
<VersionSDKMinor>4</VersionSDKMinor>
|
<VersionSDKMinor>4</VersionSDKMinor>
|
||||||
<VersionFeature>24</VersionFeature>
|
<VersionFeature>25</VersionFeature>
|
||||||
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
|
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
|
||||||
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
|
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
|
||||||
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
|
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
|
||||||
|
|
Loading…
Reference in a new issue