From 6b2a4efe490eee3027b5ef9ce5a1c179b047b66d Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Thu, 9 Feb 2023 16:25:10 -0800 Subject: [PATCH] Test performMultiLevelLookup --- eng/pipelines/templates/steps/install-dotnet.yml | 11 ----------- .../Azure.Sdk.Tools.CodeOwnersParser.Tests.csproj | 2 +- .../Azure.Sdk.Tools.RetrieveCodeOwners.Tests.csproj | 2 +- .../Azure.Sdk.Tools.RetrieveCodeOwners.csproj | 2 +- .../Azure.Sdk.Tools.CodeOwnersParser.csproj | 2 +- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/templates/steps/install-dotnet.yml b/eng/pipelines/templates/steps/install-dotnet.yml index c2d0a9774e08..ac9703cf134d 100644 --- a/eng/pipelines/templates/steps/install-dotnet.yml +++ b/eng/pipelines/templates/steps/install-dotnet.yml @@ -8,17 +8,6 @@ steps: retryCountOnTaskFailure: 3 inputs: useGlobalJson: true - - # We install .NET 6.0.x runtime in addition to .NET coming from global.json because most of our tools target 6.0.x. - # Once we migrate all tools to a newer .NET version, we should update this to install that version instead. - - task: UseDotNet@2 - displayName: "Use .NET runtime 6.0.x" - retryCountOnTaskFailure: 3 - inputs: - packageType: runtime - version: 6.0.x - # performMultiLevelLookup comes into play when given .NET executable target runtime is different - # than the installed .NET SDK. Without this, such runtime would not be found. performMultiLevelLookup: true # Future work: add NuGet packages caching. See: diff --git a/tools/code-owners-parser/Azure.Sdk.Tools.CodeOwnersParser.Tests/Azure.Sdk.Tools.CodeOwnersParser.Tests.csproj b/tools/code-owners-parser/Azure.Sdk.Tools.CodeOwnersParser.Tests/Azure.Sdk.Tools.CodeOwnersParser.Tests.csproj index 5054e5ad2854..b0827d761c69 100644 --- a/tools/code-owners-parser/Azure.Sdk.Tools.CodeOwnersParser.Tests/Azure.Sdk.Tools.CodeOwnersParser.Tests.csproj +++ b/tools/code-owners-parser/Azure.Sdk.Tools.CodeOwnersParser.Tests/Azure.Sdk.Tools.CodeOwnersParser.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable Nullable false diff --git a/tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners.Tests/Azure.Sdk.Tools.RetrieveCodeOwners.Tests.csproj b/tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners.Tests/Azure.Sdk.Tools.RetrieveCodeOwners.Tests.csproj index 8dbda797776a..73ceb21c9328 100644 --- a/tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners.Tests/Azure.Sdk.Tools.RetrieveCodeOwners.Tests.csproj +++ b/tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners.Tests/Azure.Sdk.Tools.RetrieveCodeOwners.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable Nullable false diff --git a/tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners/Azure.Sdk.Tools.RetrieveCodeOwners.csproj b/tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners/Azure.Sdk.Tools.RetrieveCodeOwners.csproj index 6ac4695ec593..514ba09fb3e3 100644 --- a/tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners/Azure.Sdk.Tools.RetrieveCodeOwners.csproj +++ b/tools/code-owners-parser/Azure.Sdk.Tools.RetrieveCodeOwners/Azure.Sdk.Tools.RetrieveCodeOwners.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable Nullable true diff --git a/tools/code-owners-parser/CodeOwnersParser/Azure.Sdk.Tools.CodeOwnersParser.csproj b/tools/code-owners-parser/CodeOwnersParser/Azure.Sdk.Tools.CodeOwnersParser.csproj index dc90d68b1c66..648c1766bbcf 100644 --- a/tools/code-owners-parser/CodeOwnersParser/Azure.Sdk.Tools.CodeOwnersParser.csproj +++ b/tools/code-owners-parser/CodeOwnersParser/Azure.Sdk.Tools.CodeOwnersParser.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable Nullable false