Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 6 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ variables:
value: .NETCore
- name: VisualStudioDropName
value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
- name: DotNetSdkVersion
value: '6.0.100-preview.6.21355.2'
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
- name: RunningAsPullRequest
value: true
Expand Down Expand Up @@ -387,7 +385,8 @@ stages:
# displayName: install SDK
# inputs:
# packageType: sdk
# version: $(DotNetSdkVersion)
# useGlobalJson: true
# includePreviewVersions: true
# workingDirectory: $(Build.SourcesDirectory)
# installationPath: $(Agent.ToolsDirectory)/dotnet
# - script: dotnet build .\FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
Expand All @@ -411,9 +410,8 @@ stages:
displayName: install SDK
inputs:
packageType: sdk
# We cannot use .NET version from global.json, since it tries to install all SDK version from all global.json files in the tree, and we use some fake versions for testing.
useGlobalJson: false
version: $(DotNetSdkVersion)
useGlobalJson: true
includePreviewVersions: true
workingDirectory: $(Build.SourcesDirectory)
installationPath: $(Agent.ToolsDirectory)/dotnet
- script: dotnet build ./FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
Expand All @@ -437,10 +435,8 @@ stages:
displayName: install SDK
inputs:
packageType: sdk
# We cannot use .NET version from global.json, since it tries to install all SDK version from all global.json files in the tree, and we use some fake versions for testing.
useGlobalJson: false
version: $(DotNetSdkVersion)
performMultiLevelLookup: false
useGlobalJson: true
includePreviewVersions: true
workingDirectory: $(Build.SourcesDirectory)
installationPath: $(Agent.ToolsDirectory)/dotnet
- script: dotnet build ./FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
Expand Down
3 changes: 2 additions & 1 deletion tests/walkthroughs/sdk-script-manual-tests/README.md.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

### NOTE
Before running tests, `.global.json` files should be renamed to `global.json`, this is needed to not confuse UseDotNet task of Azure Pipelies when installing SDK.


#### no warnings
Expand Down