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

Merge pull request #3975 from dotnet/piotrpMSFT/removenugethacks

Browse source 
Remove temporary hacks from new NuGet
This commit is contained in:
Piotr Puszkiewicz 2016-08-01 22:59:15 -04:00 committed by GitHub
commit 997797b01a
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,9 +70,6 @@
<BinObj Include="$(SrcDirectory)/**/bin/**/*" />
<BinObj Include="$(SrcDirectory)/**/obj/**/*" />
<FilesToRemoveFromStageDirectory Remove="*" />
<FilesToRemoveFromStageDirectory Include="$(StageDirectory)/**/*" />
<SharedFramework Remove="*" />
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
@ -83,7 +80,6 @@
<Delete Files="@(BinObj)" />
<Delete Files="@(FilesToRemoveFromStageDirectory)" />
<RemoveDir Directories="$(StageDirectory)" />
<MakeDir Directories="$(StageDirectory)"/>
@ -91,14 +87,6 @@
<Copy SourceFiles="@(SharedFramework)"
DestinationFiles="@(SharedFramework->'$(StageDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
<!-- TEMP HACK: need to restore with the current stage, until we get a Stage0 with the new NuGet build -->
<ItemGroup>
<SrcLockFiles Include="$(SrcDirectory)/**/project.lock.json" />
</ItemGroup>
<Delete Files="@(SrcLockFiles)" />
<DotNetRestore ToolPath="%(Stage.DotnetDir)"
WorkingDirectory="$(SrcDirectory)" />
<!-- Publish DotNet -->
<DotNetPublish ToolPath="%(Stage.DotnetDir)"
NativeSubdirectory="True"

5
build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
View file

@ -23,11 +23,6 @@
<Message Text="Publishing Archiver" />
<!-- TEMP HACK: need to restore with the current stage, until we get a Stage0 with the new NuGet build -->
<Delete Files="$(RepoRoot)/tools/Archiver/project.lock.json" />
<DotNetRestore ToolPath="$(Stage2Directory)"
WorkingDirectory="$(RepoRoot)/tools/Archiver" />
<DotNetPublish ToolPath="$(Stage2Directory)"
WorkingDirectory="$(RepoRoot)/tools/Archiver"
Output="$(ToolsOutputDirectory)"