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

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-06-08 10:30:32 -07:00
parent 364aec9ccc cf24fb23e7
commit ca73b4aa18
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/SharedFx.targets
View File

@ -170,7 +170,7 @@
Properties="$(RestoreProps);_Target=Restore;RestoreForce=true" /> Properties="$(RestoreProps);_Target=Restore;RestoreForce=true" />
</Target> </Target>
<Target Name="PrepareForSharedFx" DependsOnTargets="DefineSharedFxPrerequisites;ResolveCommitHash"> <Target Name="PrepareForSharedFx" DependsOnTargets="DefineSharedFxPrerequisites">
<PropertyGroup> <PropertyGroup>
<AppSharedFxProps>SharedFxWorkDirectory=$(AppSharedFxWorkDirectory)</AppSharedFxProps> <AppSharedFxProps>SharedFxWorkDirectory=$(AppSharedFxWorkDirectory)</AppSharedFxProps>
<AppSharedFxProps>$(AppSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp22PackageVersion)</AppSharedFxProps> <AppSharedFxProps>$(AppSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp22PackageVersion)</AppSharedFxProps>
@ -182,11 +182,6 @@
<AllSharedFxProps>$(AllSharedFxProps);SharedFxDepVersion=$(PackageVersion)</AllSharedFxProps> <AllSharedFxProps>$(AllSharedFxProps);SharedFxDepVersion=$(PackageVersion)</AllSharedFxProps>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<VersionLines Include="$(CommitHash)" />
<VersionLines Include="$(PackageVersion)" />
</ItemGroup>
<!-- Clear working directory --> <!-- Clear working directory -->
<RemoveDir Directories="$(_WorkRoot)" /> <RemoveDir Directories="$(_WorkRoot)" />
@ -196,7 +191,12 @@
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_PrepareForSharedFx" Properties="$(AllSharedFxProps)" /> <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_PrepareForSharedFx" Properties="$(AllSharedFxProps)" />
</Target> </Target>
<Target Name="_ResolveSharedFxFiles" DependsOnTargets="DefineSharedFxPrerequisites"> <Target Name="_ResolveSharedFxFiles" DependsOnTargets="DefineSharedFxPrerequisites;ResolveCommitHash">
<ItemGroup>
<VersionLines Include="$(CommitHash)" />
<VersionLines Include="$(PackageVersion)" />
</ItemGroup>
<!-- Publish --> <!-- Publish -->
<MSBuild Projects="$(SharedFxWorkDirectory)SharedFx.csproj" <MSBuild Projects="$(SharedFxWorkDirectory)SharedFx.csproj"
Targets="Publish" Targets="Publish"

2
build/dependencies.props
View File

@ -1,5 +1,5 @@
<Project> <Project>
<!-- These package version may be overridden or updated by automation. --> <!-- These package versions may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' "> <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
<MicrosoftCSharpPackageVersion>4.6.0-preview1-26605-01</MicrosoftCSharpPackageVersion> <MicrosoftCSharpPackageVersion>4.6.0-preview1-26605-01</MicrosoftCSharpPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>2.2.0-preview1-26606-01</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>2.2.0-preview1-26606-01</MicrosoftExtensionsDependencyModelPackageVersion>