mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Ensure redist publishes Roslyn

Browse source 
Also fix issue found in PR
This commit is contained in:
Piotr Puszkiewicz 2017-02-28 01:39:45 -08:00
parent 9bdd38cc19
commit 01ca1b1208
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/Compile.targets
View file

@ -22,11 +22,6 @@
Configuration="$(Configuration)" Configuration="$(Configuration)"
ProjectPath="$(RootProject)" /> ProjectPath="$(RootProject)" />
<!-- Publish Roslyn -->
<DotNetPublish ToolPath="$(Stage0Directory)"
Configuration="$(Configuration)"
ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
<!-- Corehostify Binaries --> <!-- Corehostify Binaries -->
<ItemGroup Condition=" '$(OSName)' != 'win' "> <ItemGroup Condition=" '$(OSName)' != 'win' ">
<SdkOutputChmodTargets Remove="*" /> <SdkOutputChmodTargets Remove="*" />

2
dir.props
View file

@ -31,7 +31,7 @@
<Import Project="build/OutputDirectories.props" /> <Import Project="build/OutputDirectories.props" />
<Import Project="build/BuildDefaults.props" /> <Import Project="build/BuildDefaults.props" />
<Import Project="build/Stage0.props" /> <Import Project="build/Stage0.props" />
<Import Project="build/Crossgen.props" /> <Import Project="build/CrossGen.props" />
<Import Project="build/VersionBadge.props" /> <Import Project="build/VersionBadge.props" />
<Import Project="build/BundledRuntimes.props" /> <Import Project="build/BundledRuntimes.props" />

8
src/redist/redist.csproj
View file

@ -53,6 +53,14 @@
Overwrite="true" /> Overwrite="true" />
</Target> </Target>
<Target Name="PublishRoslyn"
BeforeTargets="Publish">
<DotNetPublish ToolPath="$(Stage0Directory)"
Configuration="$(Configuration)"
ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
</Target>
<Target Name="GenerateCliRuntimeConfigurationFiles" <Target Name="GenerateCliRuntimeConfigurationFiles"
AfterTargets="Publish"> AfterTargets="Publish">
<RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json" <RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"