Просмотр исходного кода

Fix remote asset url condition and look for the PGO'd archive when in a PGO vertical (#58873)

Jeremy Koritzinsky 1 год назад
Родитель
Сommit
036ec9ec2f

+ 1 - 1
Directory.Build.props

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

+ 2 - 1
src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

@@ -30,8 +30,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <!-- Target framework is not appended to this because native assets do not have a target framework. -->
     <NativeAssetsPackagePath>runtimes/$(RuntimeIdentifier)/native/</NativeAssetsPackagePath>
 
-    <!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for .NETCoreApp -->
+    <!-- Use the Runtime.AspNetCore.Transport package as a sentinel for the nonshipping version for .NETCoreApp -->
     <DotNetRuntimeArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</DotNetRuntimeArchiveFileName>
+    <DotNetRuntimeArchiveFileName Condition="'$(PgoInstrument)' == 'true'">dotnet-runtime-pgo-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</DotNetRuntimeArchiveFileName>
     <DotNetRuntimeDownloadPath>Runtime/$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadPath>
     <DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>