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

Merge branch 'release/2.0'

This commit is contained in:
Nate McMaster 2018-01-19 11:14:38 -08:00
parent 523ee741f9 df31235288
commit 0447754f4f
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/repo.props
View File

@ -6,6 +6,13 @@
<SkipBillOfMaterials>true</SkipBillOfMaterials> <SkipBillOfMaterials>true</SkipBillOfMaterials>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<!-- Explicitly require the 2.0.x version of shared runtime used by universe -->
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)"
Feed="$(DotNetAssetRootUrl)"
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
</ItemGroup>
<Import Project="artifacts.props" /> <Import Project="artifacts.props" />
<Import Project="submodules.props" /> <Import Project="submodules.props" />
</Project> </Project>

2
build/repo.targets
View File

@ -22,7 +22,7 @@
<PrepareDependsOn>$(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPath</PrepareDependsOn> <PrepareDependsOn>$(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPath</PrepareDependsOn>
<CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn> <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
<RestoreDependsOn>$(RestoreDependsOn);RestoreExternalDependencies</RestoreDependsOn> <RestoreDependsOn>$(RestoreDependsOn);InstallDotNet;RestoreExternalDependencies</RestoreDependsOn>
<CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn> <CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn>
<PackageDependsOn>$(PackageDependsOn);BuildTemplates;SplitPackages</PackageDependsOn> <PackageDependsOn>$(PackageDependsOn);BuildTemplates;SplitPackages</PackageDependsOn>
<VerifyDependsOn>$(VerifyDependsOn);VerifyCoherentVersions</VerifyDependsOn> <VerifyDependsOn>$(VerifyDependsOn);VerifyCoherentVersions</VerifyDependsOn>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.0.5-rtm-10016 version:2.0.5-rtm-10018
commithash:02bda79ac9c564229da734a836f258d6c1321eb7 commithash:bfff3b742331a70e257ac29391abdb36dc59dd06

2
modules/FileSystem

@ -1 +1 @@
Subproject commit 3d57b55d72399fddeb8eadca118b44a8c979c912 Subproject commit 4f95e44f03cd9922e6bdc9180db370b7ada368c7