8000 Follow-up on feedback from VMR inner/outer removal (#397) · dotnet/dotnet@025e4e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 025e4e5

Browse files
ViktorHoferViktorHofer
authored
Follow-up on feedback from VMR inner/outer removal (#397)
1 parent 2774010 commit 025e4e5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

‎repo-projects/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<CommonArgs Condition="'$(OfficialBuildId)' != ''">$(CommonArgs) /p:OfficialBuildId=$(OfficialBuildId)</CommonArgs>
125125
<CommonArgs Condition="'$(OfficialBuilder)' != ''">$(CommonArgs) /p:OfficialBuilder=$(OfficialBuilder)</CommonArgs>
126126
<CommonArgs Condition="'$(ForceDryRunSigning)' != ''">$(CommonArgs) /p:ForceDryRunSigning=$(ForceDryRunSigning)</CommonArgs>
127-
<!-- TODO: Remove when the bootstrap Arcade SDK removed the ArPow build infra. -->
127+
<!-- TODO: Remove when the bootstrap Arcade SDK removed the ArPow build infra: https://github.com/dotnet/source-build/issues/5138 -->
128128
<CommonArgs>$(CommonArgs) /p:UseArPowBuildInfra=false</CommonArgs>
129129

130130
<!-- Pass locations for assets -->

‎repo-projects/runtime.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<!-- TODO: This parameter is only available on the Unix script. Intentional? -->
3030
<BuildArgs Condition="'$(BuildOS)' != 'windows'">$(BuildArgs) --outputrid $(TargetRid)</BuildArgs>
3131

32-
<!-- Source-build will use non-portable RIDs. To build for these non-portable RID scenarios, we must do a boostrapped build. -->
32+
<!-- Source-build will use non-portable RIDs. To build for these non-portable RID scenarios, we must do a bootstrapped build. -->
3333
<BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true'">$(BuildArgs) --bootstrap</BuildArgs>
3434

3535
<!-- If this build is not a "special flavor" build, build everything that can be built for this target. -->
@@ -39,8 +39,8 @@
3939
<BuildArgs Condition="'$(Sign)' == 'true' and '$(ForceDryRunSigning)' != 'true' and '$(DotNetEsrpToolPath)' != ''">$(BuildArgs) /p:DotNetEsrpToolPath=$(DotNetEsrpToolPath)</BuildArgs>
4040

4141
<!-- Pass through special build modes controlled by properties -->
42-
<BuildArgs Condition="'$(WasmEnableThreads)' == 'true'">$(BuildArgs) /p:WasmEnableThreads=true</BuildArgs>
43-
<BuildArgs Condition="'$(MonoEnableLLVM)' == 'true'">$(BuildArgs) /p:MonoEnableLLVM=true</BuildArgs>
42+
<BuildArgs Condition="'$(WasmEnableThreads)' != ''">$(BuildArgs) /p:WasmEnableThreads=$(WasmEnableThreads)</BuildArgs>
43+
<BuildArgs Condition="'$(MonoEnableLLVM)' != ''">$(BuildArgs) /p:MonoEnableLLVM=$(MonoEnableLLVM)</BuildArgs>
4444
<BuildArgs Condition="'$(MonoAOTEnableLLVM)' != ''">$(BuildArgs) /p:MonoAOTEnableLLVM=$(MonoAOTEnableLLVM)</BuildArgs>
4545
<BuildArgs Condition="'$(MonoBundleLLVMOptimizer)' != ''">$(BuildArgs) /p:MonoBundleLLVMOptimizer=$(MonoBundleLLVMOptimizer)</BuildArgs>
4646
<BuildArgs Condition="'$(PgoInstrument)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)pgoinstrument</BuildArgs>

‎src/arcade/Documentation/UnifiedBuild/Unified-Build-Controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ The following context controls will be implemented. These controls should be use
117117

118118
| **Name** | **Values** | **Default** | **Description** |
119119
| -------- | -------- | -------- | -------- |
120-
| DotNetBuildOrchestrator | "true", "false", "" | "" | When "true", indicates that the infrastructure is executing within the orchestrator, outer repo build, and inner repo build.<br/>This is roughly equivalent to `DotNetBuildFromSourceFlavor` as `Product`` in the current control set. |
120+
| DotNetBuildOrchestrator | "true", "false", "" | "" | When "true", indicates that the infrastructure is executing within the orchestrator and repo build.<br/>This is roughly equivalent to `DotNetBuildFromSourceFlavor` as `Product`` in the current control set. |
121121
| DotNetBuildRepo | "true", "false", "" | "" | When "true", indicates that the infrastructure is executing within repo build. |
122122

123123
### Resource Controls

‎src/arcade/eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ steps:
7171
is1ESPipeline: ${{ parameters.is1ESPipeline }}
7272
args:
7373
displayName: Publish BuildLogs
74-
targetPath: artifacts/log/$[ coalesce(variables._BuildConfig, 'Release') ]/**
74+
targetPath: artifacts/log/$[ coalesce(variables._BuildConfig, 'Release') ]/
7575
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
7676
continueOnError: true
7777
condition: succeededOrFailed()

0 commit comments

Comments
 (0)
0