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

Flow DotNetRestoreSourcePropsPath and DotNetPackageVersionPropsPath into the shared framework build steps

This commit is contained in:
Nate McMaster 2018-10-26 09:57:45 -07:00
parent 99f2ecd02f
commit b78ee81a1e
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/SharedFx.targets
View File

@ -14,29 +14,34 @@
<ProjectToBuild Include="$(RepositoryRoot)src\Installers\Archive.Redist\*.*proj" /> <ProjectToBuild Include="$(RepositoryRoot)src\Installers\Archive.Redist\*.*proj" />
</ItemGroup> </ItemGroup>
<Target Name="_BuildSharedFxProjects" DependsOnTargets="ResolveCommitHash"> <Target Name="BuildSharedFx" DependsOnTargets="_BuildSharedFxProjects;TestSharedFx"/>
<Target Name="_BuildSharedFxProjects" DependsOnTargets="GeneratePropsFiles;ResolveCommitHash">
<PropertyGroup> <PropertyGroup>
<_RestoreGraphProjectInput>@(ProjectToBuild)</_RestoreGraphProjectInput> <_RestoreGraphProjectInput>@(ProjectToBuild)</_RestoreGraphProjectInput>
<SharedFxBuildProperties>
$(SolutionProperties);
DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath)
</SharedFxBuildProperties>
</PropertyGroup> </PropertyGroup>
<MSBuild Projects="$(MSBuildToolsPath)\NuGet.targets" <MSBuild Projects="$(MSBuildToolsPath)\NuGet.targets"
Targets="Restore" Targets="Restore"
Properties="$(SolutionProperties);RestoreGraphProjectInput=$(_RestoreGraphProjectInput);_DummyTarget=Restore" /> Properties="$(SharedFxBuildProperties);RestoreGraphProjectInput=$(_RestoreGraphProjectInput);_DummyTarget=Restore" />
<MSBuild Projects="@(ProjectToBuild)" <MSBuild Projects="@(ProjectToBuild)"
Properties="$(SolutionProperties)" Properties="$(SharedFxBuildProperties)"
BuildInParallel="true" /> BuildInParallel="true" />
<MSBuild Projects="@(ProjectToBuild)" <MSBuild Projects="@(ProjectToBuild)"
Targets="Pack" Targets="Pack"
Properties="$(SolutionProperties);NoBuild=true" Properties="$(SharedFxBuildProperties);NoBuild=true"
BuildInParallel="true" BuildInParallel="true"
SkipNonexistentTargets="true" /> SkipNonexistentTargets="true" />
</Target> </Target>
<Target Name="BuildSharedFx" DependsOnTargets="GeneratePropsFiles;_BuildSharedFxProjects;TestSharedFx"/>
<Target Name="TestSharedFx" DependsOnTargets="GeneratePropsFiles;InstallDotNet"> <Target Name="TestSharedFx" DependsOnTargets="GeneratePropsFiles;InstallDotNet">
<PropertyGroup> <PropertyGroup>

4
build/sources.props
View File

@ -7,10 +7,6 @@
$(DotNetAdditionalRestoreSources); $(DotNetAdditionalRestoreSources);
$(DotNetRestoreSources); $(DotNetRestoreSources);
</RestoreSources> </RestoreSources>
<RestoreSources Condition="Exists('$(RepositoryRoot)artifacts/build/')">
$(RepositoryRoot)artifacts/build/;
$(DotNetRestoreSources);
</RestoreSources>
<RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' "> <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
$(RestoreSources); $(RestoreSources);
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;