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

Moving conditional to load 'Microsoft.DotNet.Build.Tasks.Feed.targets' out of 'build.proj'

Browse source
This commit is contained in:
John Beisner 2017-11-09 09:30:11 -08:00
parent 7b593a8ec6
commit 95f30e3bec
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.proj
View file

@ -52,7 +52,7 @@
<Import Project="build/Compile.targets" /> <Import Project="build/Compile.targets" />
<Import Project="build/Package.targets" /> <Import Project="build/Package.targets" />
<Import Project="build/Test.targets" /> <Import Project="build/Test.targets" />
<Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="build/Publish.targets" /> <Import Project="build/Publish.targets" />
<Import Project="build/InitRepo.targets" /> <Import Project="build/InitRepo.targets" />
</Project> </Project>

8
build/publish/PublishNupkgToTransportFeed.targets
View file

@ -1,7 +1,11 @@
<?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="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" /> <PropertyGroup>
<BuildTasksFeedToolTargetsFileName>"$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets"</BuildTasksFeedToolTargetsFileName>
</PropertyGroup>
<Import Condition="Exists('$(BuildTasksFeedToolTargetsFileName)')" Project="$(BuildTasksFeedToolTargetsFileName)" />
<ItemGroup> <ItemGroup>
<NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" /> <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />
<NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg" /> <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg" />