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

Fixing some paths, moving the compile.targets to the end of build.proj.

Browse source
This commit is contained in:
Livar Cunha 2016-06-29 14:01:16 -07:00
parent 76728be4cb
commit b91160ef06
4 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build.proj
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="build/Microsoft.DotNet.Cli.Monikers.props" /> <Import Project="build/Microsoft.DotNet.Cli.Monikers.props" />
<PropertyGroup> <PropertyGroup>
<!-- <!--
$(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix. $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.

24
build/Microsoft.DotNet.Cli.Compile.targets
View file

@ -14,7 +14,8 @@
</Target> </Target>
<Target Name="CompileStage1" <Target Name="CompileStage1"
DependsOnTargets="Init; DependsOnTargets="BuildDotnetCliBuildFramework;
Init;
SetupStage1; SetupStage1;
CompileStage; CompileStage;
AfterCompileStage"> AfterCompileStage">
@ -29,7 +30,8 @@
</Target> </Target>
<Target Name="CompileStage2" <Target Name="CompileStage2"
DependsOnTargets="Init; DependsOnTargets="BuildDotnetCliBuildFramework;
Init;
SetupStage2; SetupStage2;
CompileStage; CompileStage;
AfterCompileStage; AfterCompileStage;
@ -103,7 +105,7 @@
DepsFile="$(SdkOutputDirectory)/csc.deps.json" DepsFile="$(SdkOutputDirectory)/csc.deps.json"
NewName="csc.deps.json" /> NewName="csc.deps.json" />
<RemoveAssetFromDepsPackages DepsFile="$(BinaryToCorehostifyRelDir)/csc.deps.json" <RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/csc.deps.json"
SectionName="runtimeTargets" SectionName="runtimeTargets"
AssetPath="$(BinaryToCorehostifyRelDir)/%(BinariesToRemove.Identity).exe" /> AssetPath="$(BinaryToCorehostifyRelDir)/%(BinariesToRemove.Identity).exe" />
<RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/dotnet.deps.json" <RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/dotnet.deps.json"
@ -160,6 +162,7 @@
<ItemGroup> <ItemGroup>
<BinObj Include="$(SrcDirectory)/**/bin/**/*" /> <BinObj Include="$(SrcDirectory)/**/bin/**/*" />
<BinObj Include="$(SrcDirectory)/**/obj/**/*" /> <BinObj Include="$(SrcDirectory)/**/obj/**/*" />
<FilesToRemoveFromStageDirectory Include="$(StageDirectory)/**/*" />
</ItemGroup> </ItemGroup>
<SharedFrameworkNameVersionPath RootOutputDirectory="$(StageDirectory)"> <SharedFrameworkNameVersionPath RootOutputDirectory="$(StageDirectory)">
@ -168,22 +171,29 @@
<Delete Files="@(BinObj)" /> <Delete Files="@(BinObj)" />
<Delete Files="@(FilesToRemoveFromStageDirectory)" />
<RemoveDir Directories="$(StageDirectory)" /> <RemoveDir Directories="$(StageDirectory)" />
<MakeDir Directories="$(StageDirectory)"/> <MakeDir Directories="$(StageDirectory)"/>
</Target> </Target>
<Target Name="AfterCompileStage"> <Target Name="AfterCompileStage"
DependsOnTargets="RemoveUnnecessaryFiles">
<ItemGroup> <ItemGroup>
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
<FilesToCopy Include="$(StageDirectory)/**/*.*" /> <FilesToCopy Include="$(StageDirectory)/**/*.*" />
<PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" /> <PdbsToClean Include="$(StageDirectory)/sdk/**/*.pdb" />
</ItemGroup> </ItemGroup>
<Delete Files="@(FilesToClean)" />
<Copy SourceFiles="@(FilesToCopy)" <Copy SourceFiles="@(FilesToCopy)"
DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" /> DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
<Delete Files="@(PdbsToClean)" /> <Delete Files="@(PdbsToClean)" />
</Target> </Target>
<Target Name="RemoveUnnecessaryFiles">
<ItemGroup>
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
</ItemGroup>
<Delete Files="@(FilesToClean)" />
</Target>
</Project> </Project>

6
build/compile/Microsoft.DotNet.Cli.Archive.targets
View file

@ -9,6 +9,12 @@
<Target Name="RestoreNuGetPackagesArchive" <Target Name="RestoreNuGetPackagesArchive"
DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs"> DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs">
<ItemGroup>
<FilesToClean Include="$(NuGetPackagesArchiveProject)/**/*" />
<FilesToClean Include="$(NuGetPackagesArchiveFolder)/**/*" />
</ItemGroup>
<Delete Files="@(FilesToClean)" />
<RemoveDir Directories="$(NuGetPackagesArchiveProject);$(NuGetPackagesArchiveFolder)" /> <RemoveDir Directories="$(NuGetPackagesArchiveProject);$(NuGetPackagesArchiveFolder)" />
<MakeDir Directories="$(NuGetPackagesArchiveProject);$(NuGetPackagesArchiveFolder)"/> <MakeDir Directories="$(NuGetPackagesArchiveProject);$(NuGetPackagesArchiveFolder)"/>

3
build/package/Microsoft.DotNet.Cli.Nupkg.targets
View file

@ -68,7 +68,8 @@
</Target> </Target>
<Target Name="BuildProjectsForNuGetPackages" <Target Name="BuildProjectsForNuGetPackages"
DependsOnTargets="Init" DependsOnTargets="Init;
SetupGenerateNugetPackagesInputsOutputs"
Condition=" '$(OS)' == 'Windows_NT' "> Condition=" '$(OS)' == 'Windows_NT' ">
<MakeDir Directories="$(PackagingBuildBasePath)" /> <MakeDir Directories="$(PackagingBuildBasePath)" />