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

Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2018-12-06 22:08:33 +00:00
parent d09ff4d30b 5d777b2c66
commit 28cf04843f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/Publish.targets
View File

@ -81,12 +81,16 @@
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData> <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
</FilesToPublish> </FilesToPublish>
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip" > <!-- This file is conditionally included because it may not exist in servicing builds -->
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip"
Condition="Exists('$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip')" >
<RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip</RelativeBlobPath> <RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip</RelativeBlobPath>
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData> <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
</FilesToPublish> </FilesToPublish>
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip" > <!-- This file is conditionally included because it may not exist in servicing builds -->
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip"
Condition="Exists('$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip')">
<RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip</RelativeBlobPath> <RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip</RelativeBlobPath>
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData> <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
</FilesToPublish> </FilesToPublish>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.1.3-rtm-15848 version:2.1.3-rtm-15849
commithash:2f914eafadb434837324c4b5b30f6fdbe9b70ab6 commithash:9a772472eb5184f4fd609f6208102d3a716d5bed