Skip to content

Commit 036ec9e

Browse files
authored
Fix remote asset url condition and look for the PGO'd archive when in a PGO vertical (#58873)
1 parent afb0588 commit 036ec9e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253

254254
<!-- Try various places to find the runtime. It's either released (use official version),
255255
public but un-released (use dotnetbuilds/public), or internal and unreleased (use dotnetbuilds/internal) -->
256-
<ItemGroup Condition="'$(DotNetBuild) ' != 'true'">
256+
<ItemGroup Condition="'$(DotNetBuild)' != 'true'">
257257
<RemoteAssetBaseURL Include="$(OfficialBaseURL)" />
258258
<RemoteAssetBaseURL Include="$(PublicBaseURL)" />
259259
<!-- Include the token here as we'll generate the URLs to download based on this item group. -->

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
3030
<!-- Target framework is not appended to this because native assets do not have a target framework. -->
3131
<NativeAssetsPackagePath>runtimes/$(RuntimeIdentifier)/native/</NativeAssetsPackagePath>
3232

33-
<!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for .NETCoreApp -->
33+
<!-- Use the Runtime.AspNetCore.Transport package as a sentinel for the nonshipping version for .NETCoreApp -->
3434
<DotNetRuntimeArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</DotNetRuntimeArchiveFileName>
35+
<DotNetRuntimeArchiveFileName Condition="'$(PgoInstrument)' == 'true'">dotnet-runtime-pgo-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</DotNetRuntimeArchiveFileName>
3536
<DotNetRuntimeDownloadPath>Runtime/$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadPath>
3637
<DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
3738

0 commit comments

Comments
 (0)