From a633a8e4a44c42479e6c89c52fd8e56843c5cee8 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 9 Aug 2021 12:55:16 +0200 Subject: [PATCH] Renamed global.json in manual tests, as it messes up with AzDO Pipelies' UseDotNet task, when installing from global.json --- azure-pipelines.yml | 16 ++++++---------- .../sdk-script-manual-tests/README.md.txt | 3 ++- .../with-sdk-3.1.0/{global.json => .global.json} | 0 .../{global.json => .global.json} | 0 .../{global.json => .global.json} | 0 .../{global.json => .global.json} | 0 6 files changed, 8 insertions(+), 11 deletions(-) rename tests/walkthroughs/sdk-script-manual-tests/with-sdk-3.1.0/{global.json => .global.json} (100%) rename tests/walkthroughs/sdk-script-manual-tests/with-sdk-5.0.101/{global.json => .global.json} (100%) rename tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.666/{global.json => .global.json} (100%) rename tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.667/{global.json => .global.json} (100%) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3a01f6419b8..edb8db5e830 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 @@ -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\" @@ -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\" @@ -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\" diff --git a/tests/walkthroughs/sdk-script-manual-tests/README.md.txt b/tests/walkthroughs/sdk-script-manual-tests/README.md.txt index 7d0428ddc0c..643fece6fe5 100644 --- a/tests/walkthroughs/sdk-script-manual-tests/README.md.txt +++ b/tests/walkthroughs/sdk-script-manual-tests/README.md.txt @@ -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 diff --git a/tests/walkthroughs/sdk-script-manual-tests/with-sdk-3.1.0/global.json b/tests/walkthroughs/sdk-script-manual-tests/with-sdk-3.1.0/.global.json similarity index 100% rename from tests/walkthroughs/sdk-script-manual-tests/with-sdk-3.1.0/global.json rename to tests/walkthroughs/sdk-script-manual-tests/with-sdk-3.1.0/.global.json diff --git a/tests/walkthroughs/sdk-script-manual-tests/with-sdk-5.0.101/global.json b/tests/walkthroughs/sdk-script-manual-tests/with-sdk-5.0.101/.global.json similarity index 100% rename from tests/walkthroughs/sdk-script-manual-tests/with-sdk-5.0.101/global.json rename to tests/walkthroughs/sdk-script-manual-tests/with-sdk-5.0.101/.global.json diff --git a/tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.666/global.json b/tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.666/.global.json similarity index 100% rename from tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.666/global.json rename to tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.666/.global.json diff --git a/tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.667/global.json b/tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.667/.global.json similarity index 100% rename from tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.667/global.json rename to tests/walkthroughs/sdk-script-manual-tests/with-sdk-666.666.667/.global.json