Skip to content

Commit b40cc8a

Browse files
committed
Pin .NET SDK version
Make sure the current working directory any time dotnet is spawned is set to something at or under the directory where the global.json file is found.
1 parent b668f0d commit b40cc8a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

azure-pipelines.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
projects: src/**/*.sln
5151
feedsToUse: config
5252
nugetConfigPath: src/nuget.config
53+
workingDirectory: src
5354

5455
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
5556
displayName: 'Use Yarn 1.x'
@@ -58,8 +59,9 @@ jobs:
5859
inputs:
5960
ProjectDirectory: 'src/nerdbank-gitversioning.npm'
6061

61-
- script: dotnet build src -c $(BuildConfiguration) --no-restore /t:build,pack /bl:"$(Build.ArtifactStagingDirectory)/build_logs/msbuild.binlog"
62+
- script: dotnet build -c $(BuildConfiguration) --no-restore /t:build,pack /bl:"$(Build.ArtifactStagingDirectory)/build_logs/msbuild.binlog"
6263
displayName: Build NuGet package and tests
64+
workingDirectory: src
6365

6466
- task: gulp@0
6567
displayName: Build nerdbank-gitversioning NPM package
@@ -81,8 +83,9 @@ jobs:
8183
# configuration: $(BuildConfiguration)
8284
# continueOnError: true
8385

84-
- script: dotnet test src/Nerdbank.GitVersioning.Tests --no-build -c $(BuildConfiguration) --filter "TestCategory!=FailsOnAzurePipelines" --logger "trx;LogFileName=$(Build.ArtifactStagingDirectory)\TestLogs\TestResults.trx"
86+
- script: dotnet test Nerdbank.GitVersioning.Tests --no-build -c $(BuildConfiguration) --filter "TestCategory!=FailsOnAzurePipelines" --logger "trx;LogFileName=$(Build.ArtifactStagingDirectory)\TestLogs\TestResults.trx"
8587
displayName: Run tests
88+
workingDirectory: src
8689

8790
- task: PublishTestResults@2
8891
displayName: Publish test results

src/nerdbank-gitversioning.npm/ts/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export interface IGitVersion {
4343
export async function getVersion(projectDirectory?: string): Promise<IGitVersion> {
4444
projectDirectory = projectDirectory || '.';
4545
var getVersionScriptPath = path.join(__dirname, nbgvPath, "tools", "netcoreapp2.1", "any", "nbgv.dll");
46-
var versionText = await execAsync(`dotnet "${getVersionScriptPath}" get-version --project "${projectDirectory}" --format json`)
46+
var versionText = await execAsync(`dotnet "${getVersionScriptPath}" get-version --format json`, { cwd: projectDirectory })
4747
if (versionText.stderr) {
4848
throw versionText.stderr;
4949
}

0 commit comments

Comments
 (0)