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

Fix runtime store build

This commit is contained in:
John Luo 2017-10-13 11:22:14 -07:00
parent 91d4be47b9
commit 77c846201d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/RuntimeStore.targets
View File

@ -80,12 +80,12 @@
<!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. --> <!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. -->
<MSBuild Projects="$(RSReferencesWorkDirectory)RS.References.csproj" <MSBuild Projects="$(RSReferencesWorkDirectory)RS.References.csproj"
Targets="Restore" Targets="Restore"
Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true;_Target=Restore" /> Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);_Target=Restore" />
<!-- Pack --> <!-- Pack -->
<MSBuild Projects="$(RSReferencesWorkDirectory)RS.References.csproj" <MSBuild Projects="$(RSReferencesWorkDirectory)RS.References.csproj"
Targets="Pack" Targets="Pack"
Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true" /> Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)" />
<!-- Copy to output directory --> <!-- Copy to output directory -->
<ItemGroup> <ItemGroup>
@ -96,9 +96,6 @@
</Target> </Target>
<Target Name="_PrepareRuntimeStoreBuildAssets"> <Target Name="_PrepareRuntimeStoreBuildAssets">
<!-- Copy and update build assets -->
<Copy SourceFiles="$(_TemplatesDirectory)RS.Manifest\RS.Manifest.csproj" DestinationFiles="$(_WorkRoot)RS.Manifest.csproj" />
<ItemGroup> <ItemGroup>
<_RuntimeStoreRestoreSources Include="$(_DependencyBuildDirectory)" Condition="Exists($(_DependencyBuildDirectory))" /> <_RuntimeStoreRestoreSources Include="$(_DependencyBuildDirectory)" Condition="Exists($(_DependencyBuildDirectory))" />
<_RuntimeStoreRestoreSources Include="$(_DependencyMirrorDirectory)" Condition="Exists($(_DependencyMirrorDirectory))" /> <_RuntimeStoreRestoreSources Include="$(_DependencyMirrorDirectory)" Condition="Exists($(_DependencyMirrorDirectory))" />
@ -125,7 +122,10 @@
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<Target Name="BuildRuntimeStore" DependsOnTargets="BuildRSReferencesPackage;_ResolveRuntimeStoreRID;_PrepareRuntimeStoreBuildAssets;_ResolveCurrentSharedFrameworkVersion"> <Target Name="BuildRuntimeStore" DependsOnTargets="_ResolveCurrentSharedFrameworkVersion;_ResolveRuntimeStoreRID;_PrepareRuntimeStoreBuildAssets;BuildRSReferencesPackage">
<!-- Copy and update build assets -->
<Copy SourceFiles="$(_TemplatesDirectory)RS.Manifest\RS.Manifest.csproj" DestinationFiles="$(_WorkRoot)RS.Manifest.csproj" />
<PropertyGroup> <PropertyGroup>
<__ComposeStoreProps /> <__ComposeStoreProps />
<_ComposeStoreProps>$(_ComposeStoreProps);$(_RsManifestProps)</_ComposeStoreProps> <_ComposeStoreProps>$(_ComposeStoreProps);$(_RsManifestProps)</_ComposeStoreProps>