Commit fd5b1cbb authored by Jesse McGrew's avatar Jesse McGrew
Browse files

Change build scripts to use Publish target.

This ensures the correct .json files are included, fixing ZILF-217.
parent 3757bc977119
......@@ -135,7 +135,7 @@ dotnet msbuild Build.proj -t:PackageAllRids -p:Configuration=Release
<Target Name="_PlatformStage" DependsOnTargets="RestoreReferences;_MakeStageDir">
<MSBuild
Projects="@(StageProjects)"
Targets="Build"
Targets="Stage"
Properties="$(BuildProperties);Configuration=$(Configuration);Staging=true" />
</Target>
......
......@@ -58,15 +58,16 @@
</Target>-->
<Target Name="_StagePublishFiles"
DependsOnTargets="ComputeFilesToPublish"
DependsOnTargets="PublishItemsOutputGroup"
Condition=" '$(Staging)' == 'true' ">
<ItemGroup>
<StageItem Include="@(ResolvedFileToPublish)" />
<StageItem Include="@(PublishItemsOutputGroupOutputs)" />
</ItemGroup>
</Target>
<PropertyGroup>
<_StageDependsOn>
Publish;
_StagePublishFiles;
_LateStage;
_MainStage
......
......@@ -61,7 +61,7 @@
<PropertyGroup>
<AfterTargetFiles>$(BuildSysDir)\After.targets</AfterTargetFiles>
<AfterTargets>Stage</AfterTargets>
<!-- <AfterTargets>Stage</AfterTargets> -->
</PropertyGroup>
<PropertyGroup>
......
......@@ -28,7 +28,6 @@
</PackageReference>
<PackageReference Include="MSBuildTasks" Version="1.5.0.235" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Packaging.Targets" Version="0.1.189" />
<PackageReference Include="ReadLine" Version="2.0.1" />
</ItemGroup>
<ItemGroup>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment