Skip to content

Commit d6a8969

Browse files
authored
changed to use git version (#417)
* changed to use git version * fixing build number * changed dotnet sdk version * 4th try for fixing the build number * 5th try at fixing build * Chnaged back to using Nerdbank.GitVersioning
1 parent 5a30ed2 commit d6a8969

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

GitVersionConfig.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
next-version: 3.10.0
2+
assembly-versioning-scheme: MajorMinorPatch
3+
mode: ContinuousDeployment
4+
tag-prefix: '[vV]'
5+
build-metadata-padding: 0
6+
legacy-semver-padding: 0
7+
continuous-delivery-fallback-tag: alpha
8+
commit-message-incrementing: Enabled

ci/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ pr:
2929

3030
steps:
3131
- task: DotNetCoreInstaller@0
32-
displayName: 'Use .NET Core sdk 2.1.500'
32+
displayName: 'Use .NET Core sdk 2.1.502'
3333
inputs:
34-
version: 2.1.500
34+
version: 2.1.502
3535

3636
- task: DotNetCoreCLI@2
3737
displayName: 'dotnet build'

src/ZendeskApi_v2/ZendeskApi_v2.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageTags>zendesk api</PackageTags>
1111
<description>A full c# wrapper for Zendesk's api v2.</description>
1212
<PackageProjectUrl>https://github.com/mozts2005/ZendeskApi_v2</PackageProjectUrl>
13-
<!--<PackageLicenseUrl>https://github.com/mozts2005/ZendeskApi_v2/blob/master/LICENSE.md</PackageLicenseUrl>-->
13+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1414
<PackageIconUrl>https://raw.githubusercontent.com/mozts2005/ZendeskApi_v2/master/tools/icon/lotus.png</PackageIconUrl>
1515
<PackageReleaseNotes>https://github.com/mozts2005/ZendeskApi_v2/releases</PackageReleaseNotes>
1616
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -27,8 +27,8 @@
2727

2828
<PropertyGroup>
2929
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
30-
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
31-
<NoWarn>1701;1702;NU5105;$(NoWarn)</NoWarn>
30+
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
31+
<NoWarn>1701;1702;NU5105;NU1605;NU1701;$(NoWarn)</NoWarn>
3232
</PropertyGroup>
3333

3434
<PropertyGroup Condition="'$(TargetFramework)'=='net452'">
@@ -40,7 +40,7 @@
4040
</PropertyGroup>
4141

4242
<ItemGroup>
43-
<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.33" PrivateAssets="all" />
43+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.0.4-beta" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
4444
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
4545
</ItemGroup>
4646

src/ZendeskApi_v2/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"publicReleaseRefSpec": [
1111
"^refs/heads/master$", // we release out of master
12-
"^refs/heads/rel/v\\d+\\.\\d+\\.\\d+" // we also release tags starting with vN.N.N
12+
"^refs/tags/v\\d+\\.\\d+\\.\\d+" // we also release tags starting with vN.N.N
1313
],
1414
"cloudBuild": {
1515
"buildNumber": {

src/global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.500"
3+
"version": "2.1.502"
44
}
5-
}
5+
}

0 commit comments

Comments
 (0)