Skip to content

Commit a4c581a

Browse files
ctaggartAArnott
authored andcommitted
nbgv for dotnetcore3.0 (#326)
1 parent aa87d97 commit a4c581a

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

azure-pipelines.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,20 @@ jobs:
2929
git config --global user.name ci
3030
git config --global user.email [email protected]
3131
displayName: Configure git commit author for testing
32-
- script: |
33-
dotnet tool install --tool-path . nbgv
34-
.\nbgv cloud -p src -a
35-
displayName: Set build number
3632
3733
- task: DotNetCoreInstaller@0
38-
displayName: Install .NET Core SDK 2.1.500
34+
displayName: Install .NET Core SDK
3935
inputs:
4036
packageType: sdk
4137
version: 2.1.500
4238
- script: dotnet --info
4339
displayName: Show dotnet SDK info
4440

41+
- script: |
42+
dotnet tool install --tool-path . nbgv
43+
.\nbgv cloud -p src -a
44+
displayName: Set build number
45+
4546
- task: DotNetCoreCLI@2
4647
displayName: Restore NuGet packages
4748
inputs:

build.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Param(
1515
[string]$MsBuildVerbosity = 'minimal'
1616
)
1717

18-
$msbuildCommandLine = "msbuild `"$PSScriptRoot\src\Nerdbank.GitVersioning.sln`" /m /verbosity:$MsBuildVerbosity /nologo /p:Platform=`"Any CPU`" /t:build,pack"
18+
$msbuildCommandLine = "dotnet build `"$PSScriptRoot\src\Nerdbank.GitVersioning.sln`" /m /verbosity:$MsBuildVerbosity /nologo /p:Platform=`"Any CPU`" /t:build,pack"
1919

2020
if (Test-Path "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll") {
2121
$msbuildCommandLine += " /logger:`"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll`""
@@ -30,12 +30,13 @@ try {
3030
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\Nerdbank.GitVersioning.sln", "msbuild")) {
3131
Invoke-Expression $msbuildCommandLine
3232
if ($LASTEXITCODE -ne 0) {
33-
throw "MSBuild failed"
33+
throw "dotnet build failed"
3434
}
3535
}
3636

3737
if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "gulp")) {
3838
cd "$PSScriptRoot\src\nerdbank-gitversioning.npm"
39+
yarn install
3940
yarn run build
4041
if ($LASTEXITCODE -ne 0) {
4142
throw "Node build failed"
File renamed without changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"rollForwardOnNoCandidateFx": 2
3+
}

0 commit comments

Comments
 (0)