From e7c5788a68dec972d2abab62862657ba300475ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Aug 2025 02:03:13 +0000 Subject: [PATCH 1/4] Backflow from https://github.com/dotnet/dotnet / 619d563 build 280198 [[ commit created by automation ]] --- src/Layout/Directory.Build.props | 4 ++-- src/Layout/redist/tools/tool_fsc.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Layout/Directory.Build.props b/src/Layout/Directory.Build.props index 1edffddb84d9..479a7c0a421e 100644 --- a/src/Layout/Directory.Build.props +++ b/src/Layout/Directory.Build.props @@ -55,8 +55,8 @@ - <_IsCommunityPlatform Condition="'$(OSName)' != 'win' and '$(OSName)' != 'osx' - and !('$(OSName)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'))">true + <_IsCommunityPlatform Condition="'$(OSName)' != 'win' and '$(OSName)' != 'osx' + and !(('$(OSName)' == 'linux' or '$(OSName)' == 'linux-musl') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'))">true true diff --git a/src/Layout/redist/tools/tool_fsc.csproj b/src/Layout/redist/tools/tool_fsc.csproj index 498d26947f18..d648856e2188 100644 --- a/src/Layout/redist/tools/tool_fsc.csproj +++ b/src/Layout/redist/tools/tool_fsc.csproj @@ -34,7 +34,7 @@ Shipping PreRelease Release - net9.0 + net10.0 $(NetCurrent) From 9ad89d475785e519fa2e2fcb152c3e643f87b45b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Aug 2025 02:03:14 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/dotnet build 280198 Updated Dependencies: dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.AspNetCore.TestHost, Microsoft.Bcl.AsyncInterfaces, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Embedded, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.ObjectPool, Microsoft.JSInterop, Microsoft.NET.HostModel, Microsoft.NET.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Win32.SystemEvents, Microsoft.WindowsDesktop.App.Internal, Microsoft.WindowsDesktop.App.Ref, System.CodeDom, System.ComponentModel.Composition, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Asn1, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encoding.CodePages, System.Text.Json, System.Windows.Extensions (Version 10.0.0-rc.2.25416.109 -> 10.0.0-rc.2.25420.109) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25416.109 -> 10.0.0-preview.25420.109) Microsoft.Build, Microsoft.Build.Localization (Version 17.15.0-preview-25416-109 -> 17.15.0-preview-25420-109) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-preview.1.41709 -> 7.0.0-preview.1.42109) Microsoft.Build.Tasks.Git, Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25416.109 -> 10.0.0-beta.25420.109) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.0.0-2.25416.109 -> 5.0.0-2.25420.109) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25416.109 -> 2.0.0-preview.1.25420.109) Microsoft.DiaSymReader (Version 2.2.0-beta.25416.109 -> 2.2.0-beta.25420.109) Microsoft.FSharp.Compiler (Version 14.0.100-rc2.25416.109 -> 14.0.100-rc2.25420.109) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.0-preview-25416-109 -> 18.0.0-preview-25420-109) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rc.2.25416.109 -> 10.0.100-rc.2.25420.109) Microsoft.Web.Xdt (Version 3.2.0-preview.25416.109 -> 3.2.0-preview.25420.109) System.CommandLine (Version 2.0.0-rc.2.25416.109 -> 2.0.0-rc.2.25420.109) --- eng/Version.Details.props | 260 ++++----- eng/Version.Details.xml | 522 +++++++++--------- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 6 +- eng/common/core-templates/job/onelocbuild.yml | 6 +- .../job/publish-build-assets.yml | 10 +- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 + .../core-templates/post-build/post-build.yml | 8 +- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +- .../core-templates/steps/generate-sbom.yml | 2 +- .../steps/install-microbuild.yml | 41 +- .../core-templates/steps/publish-logs.yml | 14 +- .../steps/source-index-stage1-publish.yml | 2 +- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- global.json | 4 +- 21 files changed, 464 insertions(+), 447 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6847e90b9e13..057914686688 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,137 +7,137 @@ This file should be imported by eng/Versions.props - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-preview.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 17.15.0-preview-25416-109 - 17.15.0-preview-25416-109 - 7.0.0-preview.1.41709 - 10.0.0-beta.25416.109 - 5.0.0-2.25416.109 - 5.0.0-2.25416.109 - 5.0.0-2.25416.109 - 5.0.0-2.25416.109 - 5.0.0-2.25416.109 - 5.0.0-2.25416.109 - 5.0.0-2.25416.109 - 10.0.0-preview.25416.109 - 5.0.0-2.25416.109 - 5.0.0-2.25416.109 - 2.0.0-preview.1.25416.109 - 2.2.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 14.0.100-rc2.25416.109 - 10.0.0-rc.2.25416.109 - 5.0.0-2.25416.109 - 5.0.0-2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-preview.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 17.15.0-preview-25420-109 + 17.15.0-preview-25420-109 + 7.0.0-preview.1.42109 + 10.0.0-beta.25420.109 + 5.0.0-2.25420.109 + 5.0.0-2.25420.109 + 5.0.0-2.25420.109 + 5.0.0-2.25420.109 + 5.0.0-2.25420.109 + 5.0.0-2.25420.109 + 5.0.0-2.25420.109 + 10.0.0-preview.25420.109 + 5.0.0-2.25420.109 + 5.0.0-2.25420.109 + 2.0.0-preview.1.25420.109 + 2.2.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 14.0.100-rc2.25420.109 + 10.0.0-rc.2.25420.109 + 5.0.0-2.25420.109 + 5.0.0-2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 10.0.0-preview.7.25377.103 - 10.0.0-preview.25416.109 - 10.0.0-rc.2.25416.109 - 18.0.0-preview-25416-109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.100-rc.2.25416.109 - 10.0.100-rc.2.25416.109 - 10.0.100-rc.2.25416.109 - 10.0.100-rc.2.25416.109 - 10.0.100-rc.2.25416.109 - 10.0.100-rc.2.25416.109 - 10.0.100-rc.2.25416.109 - 10.0.100-rc.2.25416.109 - 10.0.100-rc.2.25416.109 - 18.0.0-preview-25416-109 - 18.0.0-preview-25416-109 - 3.2.0-preview.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 7.0.0-preview.1.41709 - 10.0.0-rc.2.25416.109 - 2.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 + 10.0.0-preview.25420.109 + 10.0.0-rc.2.25420.109 + 18.0.0-preview-25420-109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.100-rc.2.25420.109 + 10.0.100-rc.2.25420.109 + 10.0.100-rc.2.25420.109 + 10.0.100-rc.2.25420.109 + 10.0.100-rc.2.25420.109 + 10.0.100-rc.2.25420.109 + 10.0.100-rc.2.25420.109 + 10.0.100-rc.2.25420.109 + 10.0.100-rc.2.25420.109 + 18.0.0-preview-25420-109 + 18.0.0-preview-25420-109 + 3.2.0-preview.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 7.0.0-preview.1.42109 + 10.0.0-rc.2.25420.109 + 2.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 2.1.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9cfbf7b73f1..4a1253485b7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 https://github.com/microsoft/testfx @@ -561,9 +561,9 @@ https://github.com/microsoft/testfx 4fff5964ffc55cda6384546c29a1c44fb0b37a8a - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2f..792b60b49d42 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b0323..facb415ca6ff 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index d9013251542c..5ce518406198 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -163,7 +163,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -174,7 +174,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -218,7 +218,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8bf7d23355bc..c5788829a872 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -103,7 +103,7 @@ jobs: - task: CopyFiles@2 displayName: Copy LocProject.json inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/' Contents: 'LocProject.json' TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index d5303229c97e..348cd16376f1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -38,6 +38,8 @@ parameters: # Optional: A minimatch pattern for the asset manifests to publish to BAR assetManifestsPattern: '*/manifests/**/*.xml' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -78,7 +80,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -117,7 +119,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} @@ -137,7 +139,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -177,7 +179,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index 693b00b37044..dbc14ac580a2 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -24,7 +24,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 2f992b2c6ecc..b637cb6e9480 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -114,3 +115,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a151fd811e3e..f6f87fe5c675 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -154,7 +154,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -208,7 +208,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -258,7 +258,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -313,7 +313,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe7..a7abd58c4bb6 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3c..4085512b6909 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 44a9636cdff9..c05f65027979 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 10.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f614d1440edb..d6b9878f54db 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -12,6 +12,7 @@ parameters: # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true # Location of the MicroBuild output folder + # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. microBuildOutputFolder: '$(Build.SourcesDirectory)' continueOnError: false @@ -46,8 +47,12 @@ steps: displayName: 'Validate ESRP usage (Non-Windows)' condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + # Two different MB install steps. This is due to not being able to use the agent OS during + # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, + # we can avoid including the MB install step if not enabled at all. This avoids a bunch of + # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin + displayName: Install MicroBuild plugin (Windows) inputs: signType: $(_SignType) zipSources: false @@ -63,16 +68,24 @@ steps: MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and( - succeeded(), - or( - and( - eq(variables['Agent.Os'], 'Windows_NT'), - in(variables['_SignType'], 'real', 'test') - ), - and( - ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, - ne(variables['Agent.Os'], 'Windows_NT'), - eq(variables['_SignType'], 'real') - ) - )) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (non-Windows) + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index de24d0087c58..10f825e270a0 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -44,7 +44,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' condition: always() diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index c2917c1efc1c..75600735f175 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -20,7 +20,7 @@ steps: # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) -- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output +- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: "Source Index: Process Binlog into indexable sln" - ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0ba..4bf4cf41bd7c 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a8a943287458..92a0664f5647 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b3..f1311bbb1b33 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7cbf668c22bc..238fa0818f7b 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -77,7 +77,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index 470afc052c83..acfef0b7ef52 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.109", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From f6e9db8f5e97aec8259a616c3e0b1260b4136886 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Tue, 26 Aug 2025 11:10:03 -0700 Subject: [PATCH 3/4] Clear out DOTNET_ROOT_ in test expecting failure to find .NET --- .../GivenThatWeWantToPublishAHelloWorldProject.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs index fd980814d9de..b4de97ac65ba 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs @@ -1161,13 +1161,14 @@ public static void Main() CopyDirectory(Path.Combine(TestContext.Current.ToolsetUnderTest.DotNetRoot, "shared", "Microsoft.NETCore.App"), Path.Combine(expectedRoot, "shared", "Microsoft.NETCore.App")); break; case "EnvironmentVariable": - // Set DOTNET_ROOT environment variable to the expected .NET root + // Set DOTNET_ROOT_ environment variable to the expected .NET root expectedRoot = TestContext.Current.ToolsetUnderTest.DotNetRoot; - runCommand = runCommand.WithEnvironmentVariable("DOTNET_ROOT", expectedRoot); + runCommand = runCommand.WithEnvironmentVariable($"DOTNET_ROOT_{RuntimeInformation.OSArchitecture.ToString().ToUpperInvariant()}", expectedRoot); break; default: - // Should fail - make sure DOTNET_ROOT is not set - runCommand = runCommand.WithEnvironmentVariable("DOTNET_ROOT", string.Empty); + // Should fail - make sure DOTNET_ROOT_ and DOTNET_ROOT are not set + runCommand = runCommand.WithEnvironmentVariable($"DOTNET_ROOT", string.Empty); + runCommand = runCommand.WithEnvironmentVariable($"DOTNET_ROOT_{RuntimeInformation.OSArchitecture.ToString().ToUpperInvariant()}", string.Empty); break; } From b910144e32e432c2a2904dccdfd92f94829d5ecf Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Wed, 27 Aug 2025 14:44:13 +0200 Subject: [PATCH 4/4] Fix DOTNET_ROOT setting for `dotnet run` --- src/Cli/dotnet/Commands/Run/RunCommand.cs | 2 +- test/dotnet.Tests/CommandTests/Run/RunFileTests.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/Run/RunCommand.cs b/src/Cli/dotnet/Commands/Run/RunCommand.cs index d0991769c546..d09070f7ec5a 100644 --- a/src/Cli/dotnet/Commands/Run/RunCommand.cs +++ b/src/Cli/dotnet/Commands/Run/RunCommand.cs @@ -454,7 +454,7 @@ static void SetRootVariableName(ICommand command, string runtimeIdentifier, stri runtimeIdentifier, defaultAppHostRuntimeIdentifier, targetFrameworkVersion); - if (rootVariableName != null && Environment.GetEnvironmentVariable(rootVariableName) == null) + if (rootVariableName != null && string.IsNullOrEmpty(Environment.GetEnvironmentVariable(rootVariableName))) { command.EnvironmentVariable(rootVariableName, Path.GetDirectoryName(new Muxer().MuxerPath)); } diff --git a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs index adb5ef3b6ded..9757e2245c95 100644 --- a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs +++ b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs @@ -3044,6 +3044,10 @@ public void Api_RunCommand() string artifactsPath = OperatingSystem.IsWindows() ? @"C:\artifacts" : "/artifacts"; string executablePath = OperatingSystem.IsWindows() ? @"C:\artifacts\bin\debug\Program.exe" : "/artifacts/bin/debug/Program"; new DotnetCommand(Log, "run-api") + // The command outputs only _custom_ environment variables (not inherited ones), + // so make sure we don't pass DOTNET_ROOT_* so we can assert that it is set by the run command. + .WithEnvironmentVariable("DOTNET_ROOT", string.Empty) + .WithEnvironmentVariable($"DOTNET_ROOT_{RuntimeInformation.OSArchitecture.ToString().ToUpperInvariant()}", string.Empty) .WithStandardInput($$""" {"$type":"GetRunCommand","EntryPointFileFullPath":{{ToJson(programPath)}},"ArtifactsPath":{{ToJson(artifactsPath)}}} """)