Skip to content

Commit

Permalink
changed to use git version (#417)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mozts2005 authored Dec 29, 2018
1 parent 5a30ed2 commit d6a8969
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
8 changes: 8 additions & 0 deletions GitVersionConfig.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
next-version: 3.10.0
assembly-versioning-scheme: MajorMinorPatch
mode: ContinuousDeployment
tag-prefix: '[vV]'
build-metadata-padding: 0
legacy-semver-padding: 0
continuous-delivery-fallback-tag: alpha
commit-message-incrementing: Enabled
4 changes: 2 additions & 2 deletions ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ pr:

steps:
- task: DotNetCoreInstaller@0
displayName: 'Use .NET Core sdk 2.1.500'
displayName: 'Use .NET Core sdk 2.1.502'
inputs:
version: 2.1.500
version: 2.1.502

- task: DotNetCoreCLI@2
displayName: 'dotnet build'
Expand Down
8 changes: 4 additions & 4 deletions src/ZendeskApi_v2/ZendeskApi_v2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageTags>zendesk api</PackageTags>
<description>A full c# wrapper for Zendesk's api v2.</description>
<PackageProjectUrl>https://github.com/mozts2005/ZendeskApi_v2</PackageProjectUrl>
<!--<PackageLicenseUrl>https://github.com/mozts2005/ZendeskApi_v2/blob/master/LICENSE.md</PackageLicenseUrl>-->
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageIconUrl>https://raw.githubusercontent.com/mozts2005/ZendeskApi_v2/master/tools/icon/lotus.png</PackageIconUrl>
<PackageReleaseNotes>https://github.com/mozts2005/ZendeskApi_v2/releases</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand All @@ -27,8 +27,8 @@

<PropertyGroup>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<NoWarn>1701;1702;NU5105;$(NoWarn)</NoWarn>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<NoWarn>1701;1702;NU5105;NU1605;NU1701;$(NoWarn)</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net452'">
Expand All @@ -40,7 +40,7 @@
</PropertyGroup>

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

Expand Down
2 changes: 1 addition & 1 deletion src/ZendeskApi_v2/version.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"publicReleaseRefSpec": [
"^refs/heads/master$", // we release out of master
"^refs/heads/rel/v\\d+\\.\\d+\\.\\d+" // we also release tags starting with vN.N.N
"^refs/tags/v\\d+\\.\\d+\\.\\d+" // we also release tags starting with vN.N.N
],
"cloudBuild": {
"buildNumber": {
Expand Down
4 changes: 2 additions & 2 deletions src/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.500"
"version": "2.1.502"
}
}
}

0 comments on commit d6a8969

Please sign in to comment.