Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build more assets in the VMR PGO builds #98950

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Build more assets in the VMR PGO builds #98950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/installer/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<InstallerName Condition="'$(PgoInstrument)' != ''">$(InstallerName)-pgo</InstallerName>
<InstallerName>$(InstallerName)</InstallerName>
<ArchiveName Condition="'$(PgoInstrument)' != ''">$(ArchiveName)-pgo</ArchiveName>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Abstractions for modifying .NET host binaries</Description>
<IsShipping>false</IsShipping>
<IsPackable Condition="'$(PgoInstrument)' == ''">true</IsPackable>
<IsPackable Condition="'$(BuildOnlyPgoInstrumentedAssets)' != 'true'">true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IncludeSymbols>true</IncludeSymbols>
<Serviceable>true</Serviceable>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<UseRuntimePackageDisclaimer>true</UseRuntimePackageDisclaimer>
</PropertyGroup>
<PropertyGroup Condition="'$(PgoInstrument)' != 'true'">
<PropertyGroup Condition="'$(BuildOnlyPgoInstrumentedAssets)' != 'true'">
<GenerateInstallers>true</GenerateInstallers>
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
</PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
<SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono'">true</SkipBuild>
<PlatformPackageType>ToolPack</PlatformPackageType>
<SharedFrameworkName>$(SharedFrameworkName).Crossgen2</SharedFrameworkName>
<PgoSuffix Condition="'$(PgoInstrument)' != ''">.PGO</PgoSuffix>
<OverridePackageId>$(SharedFrameworkName)$(PgoSuffix).$(RuntimeIdentifier)</OverridePackageId>
<ArchiveName>dotnet-crossgen2</ArchiveName>
<SharedFrameworkHostFileNameOverride>crossgen2</SharedFrameworkHostFileNameOverride>
<!-- Build this pack for any RID if building from source. Otherwise, only build select RIDs. -->
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ArchiveName>dotnet-apphost-pack</ArchiveName>
<InstallerName>dotnet-apphost-pack</InstallerName>
<VSInsertionShortComponentName>NetCore.AppHostPack</VSInsertionShortComponentName>
<IsPackable Condition="'$(PgoInstrument)' != ''">false</IsPackable>
<IsPackable Condition="'$(BuildOnlyPgoInstrumentedAssets)' != ''">false</IsPackable>
</PropertyGroup>

<!--
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PlatformPackageType>TargetingPack</PlatformPackageType>
<UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
<InstallerName>dotnet-targeting-pack</InstallerName>
<IsPackable Condition="'$(PgoInstrument)' != ''">false</IsPackable>
<IsPackable Condition="'$(BuildOnlyPgoInstrumentedAssets)' != ''">false</IsPackable>
<VSInsertionShortComponentName>NetCore.TargetingPack</VSInsertionShortComponentName>
<PackageDescription>A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.</PackageDescription>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<InstallerName Condition="'$(TargetOS)' != 'osx'">dotnet-runtime</InstallerName>
<InstallerName Condition="'$(TargetOS)' == 'osx'">dotnet-runtime-internal</InstallerName>
<CreateSymbolsArchive Condition="'$(PgoInstrument)' == ''">true</CreateSymbolsArchive>
<IsPackable Condition="'$(PgoInstrument)' != ''">false</IsPackable>
<IsPackable Condition="'$(BuildOnlyPgoInstrumentedAssets)' != ''">false</IsPackable>
<SymbolsArchiveName>dotnet-runtime-symbols</SymbolsArchiveName>
<VSInsertionShortComponentName>NetCore.SharedFramework</VSInsertionShortComponentName>
<UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Condition="'$(PgoInstrument)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
<PackageReference Condition="'$(BuildOnlyPgoInstrumentedAssets)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
</ItemGroup>

Expand Down