Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nbgv for dotnetcore3.0 #326

Merged
merged 8 commits into from
May 9, 2019
Merged

nbgv for dotnetcore3.0 #326

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
11b51ea
nbgv for dotnetcore3.0
ctaggart Apr 23, 2019
60cfe6b
install 3.0.100-preview4-011223 first, then nbgv
ctaggart Apr 23, 2019
68e1675
add BuildConfiguration
ctaggart Apr 23, 2019
2292b92
set rollForwardOnNoCandidateFx
ctaggart Apr 24, 2019
02b843d
back to 2.1.500
ctaggart Apr 24, 2019
6f7f758
solved missing 'native' folder issue with newer sdks
ctaggart Apr 24, 2019
63a4e4a
keep AfterTargets
ctaggart Apr 24, 2019
8ff65f2
let's fix that in a different PR
ctaggart Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,20 @@ jobs:
git config --global user.name ci
git config --global user.email me@ci.com
displayName: Configure git commit author for testing
- script: |
dotnet tool install --tool-path . nbgv
.\nbgv cloud -p src -a
displayName: Set build number

- task: DotNetCoreInstaller@0
displayName: Install .NET Core SDK 2.1.500
displayName: Install .NET Core SDK
inputs:
packageType: sdk
version: 2.1.500
- script: dotnet --info
displayName: Show dotnet SDK info

- script: |
dotnet tool install --tool-path . nbgv
.\nbgv cloud -p src -a
displayName: Set build number

- task: DotNetCoreCLI@2
displayName: Restore NuGet packages
inputs:
Expand Down
5 changes: 3 additions & 2 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Param(
[string]$MsBuildVerbosity = 'minimal'
)

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

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

if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "gulp")) {
cd "$PSScriptRoot\src\nerdbank-gitversioning.npm"
yarn install
yarn run build
if ($LASTEXITCODE -ne 0) {
throw "Node build failed"
Expand Down
0 src/global.json → global.json
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions src/nbgv/runtimeconfig.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"rollForwardOnNoCandidateFx": 2
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does the trick!

}