Use Exec instead of MsBuild task
This commit is contained in:
parent
90922646bf
commit
df66022ff8
|
|
@ -22,10 +22,6 @@ Global
|
||||||
{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Release|Any CPU.Build.0 = Release|Any CPU
|
{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{0DC180DF-D87B-448A-BCDE-2A648F41103E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{0DC180DF-D87B-448A-BCDE-2A648F41103E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{0DC180DF-D87B-448A-BCDE-2A648F41103E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{0DC180DF-D87B-448A-BCDE-2A648F41103E}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
|
|
||||||
|
|
@ -26,37 +26,19 @@
|
||||||
|
|
||||||
<Target Name="_BuildRepository" DependsOnTargets="_PinVersions">
|
<Target Name="_BuildRepository" DependsOnTargets="_PinVersions">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RepositoryKoreBuildDirectory>$(BuildRepositoryRoot).build\</RepositoryKoreBuildDirectory>
|
<BuildArguments>$(_RepositoryBuildTargets) /p:BuildNumber=$(BuildNumber) /p:Configuration=$(Configuration)</BuildArguments>
|
||||||
<RepositoryArtifactsDirectory>$(BuildRepositoryRoot)artifacts\build\</RepositoryArtifactsDirectory>
|
<RepositoryArtifactsDirectory>$(BuildRepositoryRoot)artifacts\build\</RepositoryArtifactsDirectory>
|
||||||
|
|
||||||
|
<_BuildScriptToExecute Condition="'$(OS)'!='Windows_NT'">build.sh</_BuildScriptToExecute>
|
||||||
|
<_BuildScriptToExecute Condition="'$(OS)'=='Windows_NT'">build.cmd</_BuildScriptToExecute>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<KoreBuildFiles Include="$(KoreBuildDirectory)**\*" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Message Text="============ Building $(RepositoryToBuild) ============" Importance="High" />
|
<Message Text="============ Building $(RepositoryToBuild) ============" Importance="High" />
|
||||||
<Copy SourceFiles="@(KoreBuildFiles)" DestinationFolder="$(RepositoryKoreBuildDirectory)%(RecursiveDir)" />
|
|
||||||
|
|
||||||
<ItemGroup>
|
<Exec
|
||||||
<RepositoryKoreBuildProject Include="$(RepositoryKoreBuildDirectory)$(KoreBuildProject)">
|
Command="./$(_BuildScriptToExecute) $(BuildArguments)"
|
||||||
<AdditionalProperties>
|
EnvironmentVariables="KOREBUILD_SKIP_RUNTIME_INSTALL=1"
|
||||||
RepositoryRoot=$(BuildRepositoryRoot);
|
WorkingDirectory="$(BuildRepositoryRoot)" />
|
||||||
BuildNumber=$(BuildNumber);
|
|
||||||
Configuration=$(Configuration)
|
|
||||||
</AdditionalProperties>
|
|
||||||
</RepositoryKoreBuildProject>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<MSBuild
|
|
||||||
Projects="@(RepositoryKoreBuildProject)"
|
|
||||||
Targets="Restore"
|
|
||||||
Properties="PreflightRestore=true"
|
|
||||||
UnloadProjectsOnCompletion="true" />
|
|
||||||
|
|
||||||
<MSBuild
|
|
||||||
Projects="@(RepositoryKoreBuildProject)"
|
|
||||||
Targets="$(_RepositoryBuildTargets)"
|
|
||||||
UnloadProjectsOnCompletion="true" />
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryArtifacts Include="$(RepositoryArtifactsDirectory)*" />
|
<RepositoryArtifacts Include="$(RepositoryArtifactsDirectory)*" />
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,8 @@
|
||||||
<_DependencyRepositoryList>$(_DependencyBuildDirectory)$(_RepositoryListFileName)</_DependencyRepositoryList>
|
<_DependencyRepositoryList>$(_DependencyBuildDirectory)$(_RepositoryListFileName)</_DependencyRepositoryList>
|
||||||
<_RestoreGraphSpecsDirectory>$(RepositoryRoot)obj\package-specs\</_RestoreGraphSpecsDirectory>
|
<_RestoreGraphSpecsDirectory>$(RepositoryRoot)obj\package-specs\</_RestoreGraphSpecsDirectory>
|
||||||
|
|
||||||
<_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'=='' AND '$(CompileOnly)'=='true'">Package;VerifyPackages</_RepositoryBuildTargets>
|
<_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'=='' AND '$(CompileOnly)'=='true'">/t:Package /t:VerifyPackages</_RepositoryBuildTargets>
|
||||||
<_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'==''">Verify</_RepositoryBuildTargets>
|
<_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'==''">/t:Verify</_RepositoryBuildTargets>
|
||||||
|
|
||||||
<PrepareDependsOn>$(PrepareDependsOn);CleanUniverseArtifacts</PrepareDependsOn>
|
<PrepareDependsOn>$(PrepareDependsOn);CleanUniverseArtifacts</PrepareDependsOn>
|
||||||
<CleanDependsOn>$(CleanDependsOn);CleanUniverseArtifacts</CleanDependsOn>
|
<CleanDependsOn>$(CleanDependsOn);CleanUniverseArtifacts</CleanDependsOn>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue