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

Update properties fore restore on CI

This commit is contained in:
John Luo 2017-10-11 17:43:59 -07:00
parent a48a3be6d7
commit 84157041bc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/PackageArchive.targets
View File

@ -4,7 +4,7 @@
<_WorkRoot>$(RepositoryRoot).w\</_WorkRoot> <_WorkRoot>$(RepositoryRoot).w\</_WorkRoot>
</PropertyGroup> </PropertyGroup>
<Target Name="_BuildFallbackArchive" DependsOnTargets="ResolveRepoInfo"> <Target Name="_BuildFallbackArchive" DependsOnTargets="ResolveRepoInfo;_ResolveCurrentSharedFrameworkVersion">
<Error Text="DotNetRestoreSources must be specified" Condition=" '$(DotNetRestoreSources)' == '' " /> <Error Text="DotNetRestoreSources must be specified" Condition=" '$(DotNetRestoreSources)' == '' " />
<Error Text="OutputPackageName must be specified" Condition=" '$(OutputPackageName)' == '' " /> <Error Text="OutputPackageName must be specified" Condition=" '$(OutputPackageName)' == '' " />
<Error Text="ArchiverPath must be specified" Condition=" '$(ArchiverPath)' == '' " /> <Error Text="ArchiverPath must be specified" Condition=" '$(ArchiverPath)' == '' " />
@ -37,7 +37,7 @@
<MSBuild <MSBuild
Projects="$(_WorkRoot)Archive.csproj" Projects="$(_WorkRoot)Archive.csproj"
Targets="Restore" Targets="Restore"
Properties="RestorePackagesPath=$(FallbackStagingDir);DotNetRestoreSources=$(DotNetRestoreSources);AspNetUniverseBuildOffline=true" /> Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(SharedFrameworkVersion);DotNetRestoreSources=$(DotNetRestoreSources);AspNetUniverseBuildOffline=true" />
<!-- Create the archive --> <!-- Create the archive -->
<Exec Command="$(ArchiverPath) -a $(FallbackOutputArchive) $(FallbackStagingDir)" /> <Exec Command="$(ArchiverPath) -a $(FallbackOutputArchive) $(FallbackStagingDir)" />

1
build/tools/templates/Archive/Archive.csproj
View File

@ -5,6 +5,7 @@
<EnableApiCheck>false</EnableApiCheck> <EnableApiCheck>false</EnableApiCheck>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework> <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
<RestoreSources>$(DotNetRestoreSources)</RestoreSources> <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
<RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' "> <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
$(RestoreSources); $(RestoreSources);
https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json; https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json;