Skip to content

Commit 1fd2d1e

Browse files
committed
Work CD-CI
- Update Azure Pipelines yaml. - Fix version config. - Update nbgv NuGet. ***NO_CI***
1 parent a7f6425 commit 1fd2d1e

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

azure-pipelines.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
trigger:
22
branches:
3-
include:
4-
- master
5-
- develop
6-
- release/*
3+
include: [master, develop, "release-*" ]
74
paths:
8-
exclude:
9-
- /*.md
10-
- .gitignore
5+
exclude: ["*.md", .gitignore]
6+
tags:
7+
include: ["v*"]
118

12-
pr:
13-
branches:
14-
include:
15-
- master
16-
- develop
17-
- release/*
18-
autoCancel: true
9+
# PR always trigger build
1910

2011
# add nf-tools repo to resources (for Azure Pipelines templates)
2112
resources:
@@ -36,6 +27,7 @@ jobs:
3627
vmImage: 'VS2017-Win2016'
3728

3829
variables:
30+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
3931
buildPlatform: 'Any CPU'
4032
buildConfiguration: 'Release'
4133
solution: 'source\nanoFramework.Tools.MetadataProcessor.sln'
@@ -54,7 +46,7 @@ jobs:
5446
5547
- task: NuGetToolInstaller@0
5648
inputs:
57-
versionSpec: '4.9.3'
49+
versionSpec: '5.4.0'
5850
condition: not(variables['StartReleaseCandidate'])
5951
displayName: 'Install specific version of NuGet'
6052

@@ -123,7 +115,7 @@ jobs:
123115
nuGetFeedType: external
124116
packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
125117
publishFeedCredentials: 'AzureArtifacts'
126-
continueOnError: true
118+
allowPackageConflicts: true
127119
condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest') )
128120
displayName: Push NuGet packages to Azure Artifacts
129121

source/MetadataProcessor.Core/MetadataProcessor.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@
132132
</ItemGroup>
133133
<ItemGroup />
134134
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
135-
<Import Project="..\packages\Nerdbank.GitVersioning.3.0.50\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.0.50\build\Nerdbank.GitVersioning.targets')" />
135+
<Import Project="..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" />
136136
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
137137
<PropertyGroup>
138138
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
139139
</PropertyGroup>
140-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.0.50\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.0.50\build\Nerdbank.GitVersioning.targets'))" />
140+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" />
141141
</Target>
142142
</Project>

source/MetadataProcessor.Core/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Mono.Cecil" version="0.11.1" targetFramework="net461" />
44
<package id="mustache-sharp" version="1.0.0" targetFramework="net461" />
5-
<package id="Nerdbank.GitVersioning" version="3.0.50" targetFramework="net461" developmentDependency="true" />
5+
<package id="Nerdbank.GitVersioning" version="3.1.91" targetFramework="net461" developmentDependency="true" />
66
</packages>

source/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "2.23",
44
"release": {
55
"branchName" : "release-v{version}",
6-
"versionIncrement" : "minor",
6+
"versionIncrement" : "build",
77
"firstUnstableTag" : "preview"
88
},
99
"assemblyVersion": {

0 commit comments

Comments
 (0)