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

Merge resolution

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-02-28 22:52:08 -08:00
parent eee7c7ed32
commit 7bdd7befd8
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/redist/redist.csproj
View file

@ -161,15 +161,6 @@
DestinationFiles="@(NETCore10Assemblies)" /> DestinationFiles="@(NETCore10Assemblies)" />
</Target> </Target>
<Target Name="ChmodPublishDir"
AfterTargets="CrossgenPublishDir"
Condition=" '$(OSName)' != 'win' ">
<Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" />
<Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunCsc.sh" />
</Target>
<Target Name="RemoveVbc" <Target Name="RemoveVbc"
AfterTargets="CrossgenPublishDir"> AfterTargets="CrossgenPublishDir">
<ItemGroup> <ItemGroup>
@ -179,6 +170,15 @@
<Delete Files="@(_VbcPath)" /> <Delete Files="@(_VbcPath)" />
</Target> </Target>
<Target Name="ChmodPublishDir"
AfterTargets="RemoveVbc"
Condition=" '$(OSName)' != 'win' ">
<Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" />
<Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunCsc.sh" />
</Target>
<Target Name="CreateSymbolsDirectory" <Target Name="CreateSymbolsDirectory"
AfterTargets="RemoveVbc"> AfterTargets="RemoveVbc">
<ItemGroup> <ItemGroup>
@ -192,7 +192,7 @@
<Target Name="RemovePdbsFromPublishDir" <Target Name="RemovePdbsFromPublishDir"
AfterTargets="CreateSymbolsDirectory"> AfterTargets="CreateSymbolsDirectory">
<ItemGroup> <ItemGroup>
<PdbsToClean Include="$(PublishDir)/sdk/**/*.pdb" /> <PdbsToClean Include="$(PublishDir)/**/*.pdb" />
</ItemGroup> </ItemGroup>
<Delete Files="@(PdbsToClean)" /> <Delete Files="@(PdbsToClean)" />