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

Stop downloading and add the lzma archive to the SDK output.

Browse source
This commit is contained in:
Livar Cunha 2018-11-16 17:02:14 -08:00
parent 4e29d9d96f
commit 60aadab0a8
4 changed files with 0 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Microsoft.DotNet.Cli.sln
View file

@ -75,11 +75,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D
build\package\Nupkg.targets = build\package\Nupkg.targets build\package\Nupkg.targets = build\package\Nupkg.targets
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "compile", "compile", "{8E3354BD-827F-41B7-9EE6-6BE1F1EDD8E9}"
ProjectSection(SolutionItems) = preProject
build\compile\LzmaArchive.targets = build\compile\LzmaArchive.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF498306-2DE2-47F6-8C35-3CF0589CF2B8}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF498306-2DE2-47F6-8C35-3CF0589CF2B8}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
build\test\RunTest.proj = build\test\RunTest.proj build\test\RunTest.proj = build\test\RunTest.proj

1
build/ComposeSdk.targets
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(RepoRoot)/build/compile/LzmaArchive.targets" />
<Import Project="$(RepoRoot)/build/MSBuildExtensions.targets" /> <Import Project="$(RepoRoot)/build/MSBuildExtensions.targets" />
<PropertyGroup> <PropertyGroup>

23
build/compile/LzmaArchive.targets
View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FinalArchive>$(SdkOutputDirectory)/nuGetPackagesArchive.lzma</FinalArchive>
<PackagesArchive>$(PackagesDirectory)/nuGetPackagesArchive.lzma</PackagesArchive>
<NugetPackagesArchiveName>nuGetPackagesArchive-$(AspNetCoreVersion).lzma</NugetPackagesArchiveName>
<IntermediateArchive>$(IntermediateDirectory)/$(NugetPackagesArchiveName)</IntermediateArchive>
<NugetPackagesArchiveBlobUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(NugetPackagesArchiveName)</NugetPackagesArchiveBlobUrl>
</PropertyGroup>
<Target Name="GetNuGetPackagesArchive"
Inputs="$(IntermediateArchive)"
Outputs="$(FinalArchive)"
Condition=" '$(IncludeNuGetPackageArchive)' == 'true' ">
<DownloadFile Uri="$(NugetPackagesArchiveBlobUrl)$(CoreSetupBlobAccessTokenParam)"
DestinationPath="$(IntermediateArchive)"
ContinueOnError="WarnAndContinue" />
<Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(FinalArchive)" />
<Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(PackagesArchive)" />
</Target>
</Project>

7
src/redist/redist.csproj
View file

@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
<Import Project="$(RepoRoot)/build/compile/LzmaArchive.targets" />
<Import Project="$(RepoRoot)/build/MSBuildExtensions.targets" /> <Import Project="$(RepoRoot)/build/MSBuildExtensions.targets" />
<PropertyGroup> <PropertyGroup>
@ -20,7 +19,6 @@
PublishRuntimes; PublishRuntimes;
PublishToolset; PublishToolset;
PublishTemplates; PublishTemplates;
PublishLzmaArchive;
CrossgenPublishDir; CrossgenPublishDir;
PublishDotnetTools; PublishDotnetTools;
PublishVersionFile; PublishVersionFile;
@ -253,11 +251,6 @@
</MSBuild> </MSBuild>
</Target> </Target>
<Target Name="PublishLzmaArchive"
Condition="'$(CLIBUILD_SKIP_LZMA)' != 'true'"
DependsOnTargets="GetNuGetPackagesArchive">
</Target>
<Target Name="RetargetTools"> <Target Name="RetargetTools">
<PropertyGroup> <PropertyGroup>
<ReplacementPattern>"version": ".*"</ReplacementPattern> <ReplacementPattern>"version": ".*"</ReplacementPattern>