Skip to content

Commit 96159b2

Browse files
mmitchemmitche
authored
Update unified build controls (#98330)
Generally a straight port. Removed ArcadeBuildFromSource and ArcadeBuildVertical and replaced with DotNetBuild.
1 parent bd5f6eb commit 96159b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+85
-86
lines changed

‎Build.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</ItemGroup>
99

1010
<Import Project="$(RepositoryEngineeringDir)SubsetValidation.targets" />
11-
<Import Project="$(RepositoryEngineeringDir)restore\optimizationData.targets" Condition="'$(DotNetBuildFromSource)' != 'true'" />
11+
<Import Project="$(RepositoryEngineeringDir)restore\optimizationData.targets" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
1212

1313
<Target Name="BuildLocalTasks"
1414
BeforeTargets="Build">

‎Directory.Build.props

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
66
<!-- Used to determine if we should build some packages only once across multiple official build legs.
77
For offline builds we still set OfficialBuildId but we need to build all the packages for a single
8-
leg only, so we also take DotNetBuildFromSource into account. -->
9-
<BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' and '$(OfficialBuildId)' != '' and '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
8+
leg only, so we also take DotNetBuildSourceOnly into account. -->
9+
<BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' and '$(OfficialBuildId)' != '' and '$(DotNetBuildSourceOnly)' != 'true'">true</BuildingAnOfficialBuildLeg>
1010
<!-- When doing a source build, we want to build the various text-only manifests in
1111
all cases, rather than ordinarily where we build them during mobile or wasm
1212
build legs. This makes the manifests available on source-only builds. -->
13-
<ForceBuildMobileManifests Condition="'$(DotNetBuildFromSource)' == 'true'">true</ForceBuildMobileManifests>
13+
<ForceBuildMobileManifests Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</ForceBuildMobileManifests>
1414
</PropertyGroup>
1515

1616
<PropertyGroup Label="CalculateTargetOS">
@@ -94,7 +94,7 @@
9494

9595
<!-- The minimum supported .NET version. -->
9696
<NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
97-
<NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
97+
<NetCoreAppMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
9898

9999
<!-- when this is updated, make sure to keep $(_NetCoreAppToolCurrent)
100100
in src/mono/wasm/build/WasmApp.LocalBuild.props
@@ -110,9 +110,9 @@
110110
<NetFrameworkCurrent>net48</NetFrameworkCurrent>
111111
<NetFrameworkToolCurrent>net472</NetFrameworkToolCurrent>
112112
<!-- Don't build for NETFramework during source-build. -->
113-
<NetFrameworkMinimum Condition="'$(DotNetBuildFromSource)' == 'true'" />
114-
<NetFrameworkToolCurrent Condition="'$(DotNetBuildFromSource)' == 'true'" />
115-
<NetFrameworkCurrent Condition="'$(DotNetBuildFromSource)' == 'true'" />
113+
<NetFrameworkMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
114+
<NetFrameworkToolCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
115+
<NetFrameworkCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
116116

117117
<!-- Important: Set this to the GA version (or a close approximation) during servicing and adjust the TFM property below. -->
118118
<ApiCompatNetCoreAppBaselineVersion>8.0.0</ApiCompatNetCoreAppBaselineVersion>
@@ -176,15 +176,15 @@
176176
<MonoTargetsTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll'))</MonoTargetsTasksAssemblyPath>
177177
<TestExclusionListTasksAssemblyPath>$([MSBuild]::NormalizePath('$(TestExclusionListTasksDir)', 'TestExclusionListTasks.dll'))</TestExclusionListTasksAssemblyPath>
178178
<CoreCLRToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(RuntimeConfiguration)'))</CoreCLRToolPath>
179-
<ILAsmToolPath Condition="'$(DotNetBuildFromSource)' == 'true' or '$(BuildArchitecture)' == 's390x' or '$(BuildArchitecture)' == 'ppc64le'">$(CoreCLRToolPath)</ILAsmToolPath>
179+
<ILAsmToolPath Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(BuildArchitecture)' == 's390x' or '$(BuildArchitecture)' == 'ppc64le'">$(CoreCLRToolPath)</ILAsmToolPath>
180180
<WasmtimeDir Condition="'$(WasmtimeDir)' == '' and '$(WASMTIME_PATH)' != '' and Exists($(WASMTIME_PATH))">$(WASMTIME_PATH)</WasmtimeDir>
181181
<WasmtimeDir Condition="'$(WasmtimeDir)' == ''">$([MSBuild]::NormalizeDirectory($(ArtifactsObjDir), 'wasmtime'))</WasmtimeDir>
182182
<InstallWasmtimeForTests Condition="'$(InstallWasmtimeForTests)' == '' and !Exists($(WasmtimeDir))">true</InstallWasmtimeForTests>
183183
<WasmCommonTargetsPath>$([MSBuild]::NormalizeDirectory($(WasmProjectRoot), 'build'))</WasmCommonTargetsPath>
184184
</PropertyGroup>
185185

186186
<PropertyGroup Label="CalculatePortableBuild">
187-
<PortableBuild Condition="'$(PortableBuild)' == '' and '$(DotNetBuildFromSource)' == 'true'">false</PortableBuild>
187+
<PortableBuild Condition="'$(PortableBuild)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">false</PortableBuild>
188188
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
189189
</PropertyGroup>
190190

@@ -298,8 +298,8 @@
298298

299299
<!--Feature switches -->
300300
<PropertyGroup>
301-
<NoPgoOptimize Condition="'$(NoPgoOptimize)' == '' and '$(DotNetBuildFromSource)' == 'true'">true</NoPgoOptimize>
302-
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(DotNetBuildFromSource)' == 'true'">false</EnableNgenOptimization>
301+
<NoPgoOptimize Condition="'$(NoPgoOptimize)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</NoPgoOptimize>
302+
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">false</EnableNgenOptimization>
303303
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and ('$(Configuration)' == 'Release' or '$(Configuration)' == 'Checked')">true</EnableNgenOptimization>
304304
<!-- Enable NuGet static graph evaluation to optimize incremental restore -->
305305
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
@@ -380,7 +380,7 @@
380380
<!-- Always pass portable to override arcade sdk which uses embedded for local builds -->
381381
<DebugType>portable</DebugType>
382382
<DebugSymbols>true</DebugSymbols>
383-
<KeepNativeSymbols Condition="'$(KeepNativeSymbols)' == '' and '$(DotNetBuildFromSource)' == 'true'">true</KeepNativeSymbols>
383+
<KeepNativeSymbols Condition="'$(KeepNativeSymbols)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</KeepNativeSymbols>
384384
<KeepNativeSymbols Condition="'$(KeepNativeSymbols)' == ''">false</KeepNativeSymbols>
385385
<!-- Used for launchSettings.json and runtime config files. -->
386386
<AppDesignerFolder>Properties</AppDesignerFolder>

‎Directory.Build.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
When .NET gets built from source, make the SDK aware there are bootstrap packages
2222
for Microsoft.NETCore.App.Runtime.<rid> and Microsoft.NETCore.App.Crossgen2.<rid>.
2323
-->
24-
<ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
24+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
2525
<KnownFrameworkReference Update="Microsoft.NETCore.App">
2626
<RuntimePackRuntimeIdentifiers
2727
Condition="'%(TargetFramework)' == '$(NetCoreAppCurrent)'">%(RuntimePackRuntimeIdentifiers);$(PackageRID)</RuntimePackRuntimeIdentifiers>
@@ -88,7 +88,7 @@
8888
<PropertyGroup>
8989
<!-- when building from source we need to use the current version of MetadataLoadContext as the toolset version, but source-build imports
9090
another props file which overrides the SystemReflectionMetadataLoadContextVersion from Version.props so we can't set it there -->
91-
<SystemReflectionMetadataLoadContextToolsetVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(SystemReflectionMetadataLoadContextVersion)</SystemReflectionMetadataLoadContextToolsetVersion>
91+
<SystemReflectionMetadataLoadContextToolsetVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(SystemReflectionMetadataLoadContextVersion)</SystemReflectionMetadataLoadContextToolsetVersion>
9292
</PropertyGroup>
9393

9494
<Target Name="ValidateTargetOSLowercase"

‎eng/Analyzers.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99
<PropertyGroup>
1010
<!-- Disable analyzers in sourcebuild -->
11-
<RunAnalyzers Condition="'$(DotNetBuildFromSource)' == 'true'">false</RunAnalyzers>
11+
<RunAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</RunAnalyzers>
1212
<EnableNETAnalyzers Condition="'$(EnableNETAnalyzers)' == ''">$(RunAnalyzers)</EnableNETAnalyzers>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(RunAnalyzers)' != 'false'">

‎eng/DiaSymReaderNative.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package can't be referenced directly but rather has to have it's assets manually copied
1919
out. This logic is responsible for doing that.
2020
-->
21-
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
21+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
2222
<Content Include="$(NuGetPackageRoot)\microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.x86.dll">
2323
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2424
<Visible>false</Visible>

‎eng/DotNetBuild.props

+4-5
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<Target Name="GetRuntimeSourceBuildCommandConfiguration"
3939
BeforeTargets="GetSourceBuildCommandConfiguration">
4040
<PropertyGroup>
41-
<!-- Properties that control the source-build configuration should be added to the repository and guarded with the DotNetBuildFromSource Condition.
42-
This allows to build the repository using './build.sh <args> /p:DotNetBuildFromSource=true'.
43-
Properties that control flags from source-build, and the expected output for source-build should be added to this file. -->
41+
<!-- Properties that control source-only build configurations should be added to the repository and guarded with DotNetBuildSourceOnly conditions.
42+
This allows to build the repository using './build.sh <args> /p:DotNetBuildSourceOnly=true'.
43+
Properties that control flags from the VMR build, and the expected output for the VMR build should be added to this file. -->
4444
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)arch $(TargetArch)</InnerBuildArgs>
4545
<InnerBuildArgs Condition="'$(DotNetBuildSourceOnly)' != 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)os $(TargetOS)</InnerBuildArgs>
4646
<InnerBuildArgs Condition="'$(TargetArch)' != '$(_hostArch)' and '$(ShortStack)' != 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
@@ -63,8 +63,7 @@
6363
<InnerBuildArgs Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)s clr.nativeaotlibs+clr.nativeaotruntime+libs+packs /p:BuildNativeAOTRuntimePack=true /p:SkipLibrariesNativeRuntimePackages=true</InnerBuildArgs>
6464

6565
<!-- This prop needs to be passed to the inner build manually as the BaseInnerSourceBuildCommand gets overriden above -->
66-
<InnerBuildArgs Condition="'$(ArcadeBuildFromSource)' == 'true'">$(InnerBuildArgs) /p:ArcadeBuildFromSource=true</InnerBuildArgs>
67-
<InnerBuildArgs Condition="'$(ArcadeBuildVertical)' == 'true'">$(InnerBuildArgs) /p:ArcadeBuildVertical=true</InnerBuildArgs>
66+
<InnerBuildArgs Condition="'$(DotNetBuildRepo)' == 'true'">$(InnerBuildArgs) /p:DotNetBuildRepo=true</InnerBuildArgs>
6867
<InnerBuildArgs Condition="'$(OfficialBuildId)' != ''">$(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</InnerBuildArgs>
6968
<InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' != ''">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)</InnerBuildArgs>
7069
<InnerBuildArgs Condition="'$(PortableBuild)' != ''">$(InnerBuildArgs) /p:PortableBuild=$(PortableBuild)</InnerBuildArgs>

‎eng/Subsets.props

+9-9
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<DefaultSubsets Condition="'$(TargetsMobile)' == 'true'">mono+libs+packs</DefaultSubsets>
4141
<DefaultSubsets Condition="'$(TargetsLinuxBionic)' == 'true'">mono+libs+host+packs</DefaultSubsets>
4242
<!-- In source build, mono is only supported as primary runtime flavor. On Windows mono is supported for x86/x64 only. -->
43-
<DefaultSubsets Condition="('$(DotNetBuildFromSource)' == 'true' and '$(PrimaryRuntimeFlavor)' != 'Mono') or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' != 'x86' and '$(TargetArchitecture)' != 'x64')">clr+libs+tools+host+packs</DefaultSubsets>
43+
<DefaultSubsets Condition="('$(DotNetBuildSourceOnly)' == 'true' and '$(PrimaryRuntimeFlavor)' != 'Mono') or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' != 'x86' and '$(TargetArchitecture)' != 'x64')">clr+libs+tools+host+packs</DefaultSubsets>
4444
</PropertyGroup>
4545

4646
<!-- Init _subset here to allow RuntimeFlavor to be set as early as possible -->
@@ -85,13 +85,13 @@
8585
<DefaultToolsSubsets>tools.illink</DefaultToolsSubsets>
8686

8787
<DefaultHostSubsets>host.native+host.tools+host.pkg</DefaultHostSubsets>
88-
<DefaultHostSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultHostSubsets)+host.pretest+host.tests</DefaultHostSubsets>
88+
<DefaultHostSubsets Condition="'$(DotNetBuildSourceOnly)' != 'true'">$(DefaultHostSubsets)+host.pretest+host.tests</DefaultHostSubsets>
8989
<DefaultHostSubsets Condition="'$(RuntimeFlavor)' != '$(PrimaryRuntimeFlavor)' or '$(TargetsMobile)' == 'true'"></DefaultHostSubsets>
9090
<DefaultHostSubsets Condition="'$(RuntimeFlavor)' != '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">host.native</DefaultHostSubsets>
9191

9292
<DefaultPacksSubsets>packs.product</DefaultPacksSubsets>
93-
<DefaultPacksSubsets Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true' and '$(DotNetBuildFromSource)' != 'true'">$(DefaultPacksSubsets)+packs.tests</DefaultPacksSubsets>
94-
<DefaultPacksSubsets Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultPacksSubsets)+packs.installers</DefaultPacksSubsets>
93+
<DefaultPacksSubsets Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'">$(DefaultPacksSubsets)+packs.tests</DefaultPacksSubsets>
94+
<DefaultPacksSubsets Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DefaultPacksSubsets)+packs.installers</DefaultPacksSubsets>
9595
<DefaultPacksSubsets Condition="'$(RuntimeFlavor)' != 'Mono' and '$(ForceBuildMobileManifests)' == 'true'">$(DefaultPacksSubsets)+mono.manifests</DefaultPacksSubsets>
9696
</PropertyGroup>
9797

@@ -341,7 +341,7 @@
341341
$(CoreClrProjectRoot)tools\aot\ILCompiler\repro\repro.csproj;
342342
$(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj;
343343
$(CoreClrProjectRoot)tools\PdbChecker\PdbChecker.csproj;
344-
$(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
344+
$(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/>
345345
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
346346
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.Build.Tasks\ILCompiler.Build.Tasks.csproj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />
347347
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />
@@ -355,11 +355,11 @@
355355

356356
<ItemGroup Condition="$(_subset.Contains('+clr.toolstests+'))">
357357
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.TypeSystem.Tests\ILCompiler.TypeSystem.Tests.csproj"
358-
Test="true" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
358+
Test="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/>
359359
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.Compiler.Tests\ILCompiler.Compiler.Tests.csproj"
360-
Test="true" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(NativeAotSupported)' == 'true'"/>
360+
Test="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(NativeAotSupported)' == 'true'"/>
361361
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.Trimming.Tests\ILCompiler.Trimming.Tests.csproj"
362-
Test="true" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(NativeAotSupported)' == 'true'"/>
362+
Test="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(NativeAotSupported)' == 'true'"/>
363363
</ItemGroup>
364364

365365
<ItemGroup Condition="$(_subset.Contains('+tools.illink+'))">
@@ -393,7 +393,7 @@
393393

394394
<ItemGroup Condition="$(_subset.Contains('+clr.packages+')) and '$(PgoInstrument)' != 'true'">
395395
<ProjectToBuild Include="$(CoreClrProjectRoot).nuget\coreclr-packages.proj" Pack="true" Category="clr" />
396-
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\dotnet-pgo\dotnet-pgo-pack.proj" Pack="true" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(RuntimeFlavor)' != 'Mono'"/>
396+
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\dotnet-pgo\dotnet-pgo-pack.proj" Pack="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(RuntimeFlavor)' != 'Mono'"/>
397397
</ItemGroup>
398398

399399
<ItemGroup Condition="$(_subset.Contains('+clr.nativeaotlibs+')) and '$(NativeAotSupported)' == 'true'">

‎eng/Tools.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<!-- excluded from source build -->
14-
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
14+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
1515
<PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />
1616
</ItemGroup>
1717

‎eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<FlagNetStandard1XDependencies Condition="'$(FlagNetStandard1XDependencies)' == ''">true</FlagNetStandard1XDependencies>
2727
<!-- Runtime controls its dependency graph via Traversal projects and doesn't want or need Arcade's ExcludeFrom infrastructure. -->
2828
<DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
29-
<!-- Use SDK compilers in full source-build. -->
30-
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildFromSourceFlavor)' != 'Product'">true</UsingToolMicrosoftNetCompilers>
29+
<!-- Use SDK compilers in full VMR builds. -->
30+
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildOrchestrator)' != 'true'">true</UsingToolMicrosoftNetCompilers>
3131
</PropertyGroup>
3232
<ItemGroup>
3333
<WorkloadSdkBandVersions Include="$(SdkBandVersion)" SupportsMachineArch="true" />

‎eng/codeOptimization.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Target Name="AddReadyToRunPgoOptions" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" BeforeTargets="ResolveReadyToRunCompilers" Condition="'$(PublishReadyToRun)' == 'true'">
3131
<PropertyGroup>
3232
<!-- Only use mibc files if UsingToolIbcOptimization is false. Allows enabling/disabling using ibc instead of mibc data -->
33-
<IncludeMibcFilesInReadyToRun Condition="'$(UsingToolIbcOptimization)' != 'true' and '$(EnableNgenOptimization)' == 'true' and '$(DotNetBuildFromSource)' != 'true'">true</IncludeMibcFilesInReadyToRun>
33+
<IncludeMibcFilesInReadyToRun Condition="'$(UsingToolIbcOptimization)' != 'true' and '$(EnableNgenOptimization)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'">true</IncludeMibcFilesInReadyToRun>
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<PublishReadyToRunPgoFiles Condition="'$(IncludeMibcFilesInReadyToRun)' == 'true'" Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"/>

‎eng/nativepgo.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<_NativeOptimizationDataPackageTarget Condition="'$(TargetOS)' == 'windows'">windows_nt-$(TargetArchitecture.ToLower())</_NativeOptimizationDataPackageTarget>
1010

1111
</PropertyGroup>
12-
<ItemGroup Condition="'$(optimizationPGOCoreCLRVersion)'!='' and '$(DotNetBuildFromSource)' != 'true'">
12+
<ItemGroup Condition="'$(optimizationPGOCoreCLRVersion)'!='' and '$(DotNetBuildSourceOnly)' != 'true'">
1313
<PackageReference Include="optimization.windows_nt-x64.PGO.CoreCLR"
1414
Version="$(optimizationPGOCoreCLRVersion)"
1515
GeneratePathProperty="true" />

0 commit comments

Comments
 (0)