huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix RPM generation when store folder is empty, and add restore source for dotnetfeed

This commit is contained in:
Nate McMaster 2018-03-28 13:03:52 -07:00
parent adb254f4bb
commit 5b0af04b29
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/RuntimeStoreInstaller.targets
View File

@ -223,7 +223,9 @@
<!-- Create layout: Extract archive if given --> <!-- Create layout: Extract archive if given -->
<MakeDir Directories="$(_WorkRoot)package_root\" /> <MakeDir Directories="$(_WorkRoot)package_root\" />
<Exec Command="tar -xzf $(RSArchive) -C $(_WorkRoot)package_root\" Condition="'$(RSArchive)'!=''" /> <Exec Command="tar -xzf $(RSArchive) -C $(_WorkRoot)package_root\" Condition="'$(RSArchive)'!=''" StandardOutputImportance="Normal" />
<!-- Ensure expected directories exist in the event we don't have additional files for this patch. -->
<MakeDir Directories="$(_WorkRoot)package_root\store;$(_WorkRoot)package_root\additionalDeps" />
<!-- Create layout: Place changelog --> <!-- Create layout: Place changelog -->
<Copy <Copy

1
build/sources.props
View File

@ -10,6 +10,7 @@
</RestoreSources> </RestoreSources>
<RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' "> <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
$(RestoreSources); $(RestoreSources);
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
https://api.nuget.org/v3/index.json; https://api.nuget.org/v3/index.json;
</RestoreSources> </RestoreSources>
<RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' AND '$(DisableMyGetRestoreSources)' != 'true' "> <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' AND '$(DisableMyGetRestoreSources)' != 'true' ">