diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2018-12-07 01:08:33 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2018-12-07 01:08:33 +0300 |
| commit | 28cf04843f3456a72f1816e83a1f4aa59f49a049 (patch) | |
| tree | e45b267d34321126a501ec2c9d1a1e2094b3ce53 | |
| parent | d09ff4d30b875b5eca4dcd82477345a16c9a2de6 (diff) | |
| parent | 5d777b2c662b1641c78022f500b7ba6e30ac7630 (diff) | |
Merge in 'release/2.1' changesv2.1.7
| -rw-r--r-- | build/Publish.targets | 8 | ||||
| -rw-r--r-- | korebuild-lock.txt | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/build/Publish.targets b/build/Publish.targets index 54e74b3107..9c73f75d15 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -81,12 +81,16 @@ <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData> </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> <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData> </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> <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData> </FilesToPublish> diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a3f63230bd..6f42fdc9d8 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15848 -commithash:2f914eafadb434837324c4b5b30f6fdbe9b70ab6 +version:2.1.3-rtm-15849 +commithash:9a772472eb5184f4fd609f6208102d3a716d5bed |