|
8 | 8 | <SourceBuildTargetFrameworkFilter>netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0</SourceBuildTargetFrameworkFilter>
|
9 | 9 | </PropertyGroup>
|
10 | 10 |
|
| 11 | + <!-- Only run this target in source-build only mode. --> |
11 | 12 | <Target Name="PrepareGlobalJsonForSourceBuild"
|
12 | 13 | AfterTargets="PrepareInnerSourceBuildRepoRoot"
|
13 |
| - BeforeTargets="RunInnerSourceBuildCommand"> |
| 14 | + BeforeTargets="RunInnerSourceBuildCommand" |
| 15 | + Condition="'$(ArcadeBuildFromSource)' == 'true'"> |
14 | 16 | <Exec
|
15 | 17 | Command="./eng/scripts/prepare-sourcebuild-globaljson.sh"
|
16 | 18 | WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
|
|
28 | 30 | <Delete Files="$(InnerSourceBuildRepoRoot).globalconfig" />
|
29 | 31 | </Target>
|
30 | 32 |
|
31 |
| - <!-- |
32 |
| - Build RepoTasks - this is normally triggered via the build script but the inner ArPow source-build is run via msbuild |
33 |
| - --> |
| 33 | + <!-- Build RepoTasks - this is normally triggered via the build script but the inner ArPow source-build is run via msbuild. |
| 34 | + https://github.com/dotnet/source-build/issues/3807 --> |
34 | 35 | <Target Name="BuildRepoTasks"
|
35 | 36 | Condition="'$(ArcadeInnerBuildFromSource)' == 'true'"
|
36 | 37 | BeforeTargets="Execute">
|
37 |
| - |
38 | 38 | <!-- If the alternative runtime location and key are present, pass those through -->
|
39 | 39 | <PropertyGroup>
|
40 | 40 | <_AdditionalRepoTaskBuildArgs />
|
|
45 | 45 | <ItemGroup>
|
46 | 46 | <!-- We need to flow FullAssemblySigningSupported even when building repo tasks because they use full signing -->
|
47 | 47 | <InnerBuildEnv Condition="'$(FullAssemblySigningSupported)' != ''" Include="FullAssemblySigningSupported=$(FullAssemblySigningSupported)" />
|
48 |
| - <InnerBuildEnv Include="DotNetBuildFromSource=true" /> |
| 48 | + <InnerBuildEnv Include="DotNetBuildFromSource=$(ArcadeBuildFromSource)" /> |
| 49 | + <InnerBuildEnv Include="DotNetBuildVertical=$(ArcadeBuildVertical)" /> |
49 | 50 | </ItemGroup>
|
50 | 51 |
|
51 | 52 | <!-- Call the build.sh script to build the repo tasks. Set IgnoreStandardErrorWarningFormat
|
|
56 | 57 | Command="./eng/build.sh --only-build-repo-tasks -bl $(_AdditionalRepoTaskBuildArgs)"
|
57 | 58 | IgnoreStandardErrorWarningFormat="true"
|
58 | 59 | WorkingDirectory="$(InnerSourceBuildRepoRoot)"
|
59 |
| - EnvironmentVariables="@(InnerBuildEnv)" /> |
| 60 | + EnvironmentVariables="@(InnerBuildEnv)" |
| 61 | + Condition="'$(OS)' != 'Windows_NT'" /> |
| 62 | + |
| 63 | + <Exec |
| 64 | + Command=".\eng\build.cmd -OnlyBuildRepoTasks -bl $(_AdditionalRepoTaskBuildArgs)" |
| 65 | + IgnoreStandardErrorWarningFormat="true" |
| 66 | + WorkingDirectory="$(InnerSourceBuildRepoRoot)" |
| 67 | + EnvironmentVariables="@(InnerBuildEnv)" |
| 68 | + Condition="'$(OS)' == 'Windows_NT'" /> |
60 | 69 | </Target>
|
61 | 70 |
|
62 | 71 | <Target Name="CustomizeInnerBuildArgs"
|
|
0 commit comments