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

Merge pull request #8453 from johnbeisner/Revert8443

Browse source 
Revert PR:8443
This commit is contained in:
Matt Mitchell 2018-01-23 10:58:58 -08:00 • committed by GitHub
commit f4a0d2db0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build/DownloadPackageVersions.targets
View file

@ -1,7 +1,6 @@
<Project ToolsVersion="15.0"> <Project ToolsVersion="15.0">
<Target Name="DownloadPackageVersionsProps" <Target Name="DownloadPackageVersionsProps"
Condition=" !Exists('$(OrchestratedPackageVersionsProps)') " DependsOnTargets="BuildDotnetCliBuildFramework">
DependsOnTargets="BuildDotnetCliBuildFramework">
<DownloadFile Uri="$(PB_PackageVersionPropsUrl)$(CoreSetupBlobAccessTokenParam)" <DownloadFile Uri="$(PB_PackageVersionPropsUrl)$(CoreSetupBlobAccessTokenParam)"
DestinationPath="$(OrchestratedPackageVersionsProps)" DestinationPath="$(OrchestratedPackageVersionsProps)"

17
build/NugetConfigFile.targets
View file

@ -1,11 +1,10 @@
<Project ToolsVersion="15.0"> <Project ToolsVersion="15.0">
<Target Name="WriteNugetConfigFile" <Target Name="WriteNugetConfigFile">
Condition=" !Exists('$(GeneratedNuGetConfig)') ">
<ItemGroup>
<NugetConfigPrivateFeeds Include="$(ExternalRestoreSources.Split(';'))" />
</ItemGroup>
<ItemGroup>
<NugetConfigPrivateFeeds Include="$(ExternalRestoreSources.Split(';'))" />
</ItemGroup>
<PropertyGroup> <PropertyGroup>
<NugetConfigHeader> <NugetConfigHeader>
<![CDATA[ <![CDATA[
@ -41,13 +40,13 @@
</configuration> </configuration>
]]> ]]>
</NugetConfigSuffix> </NugetConfigSuffix>
</PropertyGroup> </PropertyGroup>
<WriteLinesToFile File="$(GeneratedNuGetConfig)" <WriteLinesToFile File="$(GeneratedNuGetConfig)"
Lines="$(NugetConfigHeader)" Lines="$(NugetConfigHeader)"
Overwrite="true" /> Overwrite="true" />
<WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'" <WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'"
File="$(GeneratedNuGetConfig)" File="$(GeneratedNuGetConfig)"
Lines="&lt;add key=&quot;PrivateBlobFeed&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;" Lines="&lt;add key=&quot;PrivateBlobFeed&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;"