diff --git a/.vscode/settings.json b/.vscode/settings.json
index f381ae666e..89a3c7cca0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,6 +3,7 @@
"files.associations": {
"*.*proj": "xml",
"*.props": "xml",
- "*.targets": "xml"
+ "*.targets": "xml",
+ "*.tasks": "xml"
}
-}
\ No newline at end of file
+}
diff --git a/build/Publish.targets b/build/Publish.targets
index 34d9649dd1..6b35b0ccb5 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -10,6 +10,7 @@
$(IntermediateDir)$(LatestRuntimeVersionFileName)
+ ResolveCommitHash;
PrepareOutputPaths;
GetFilesToPublish;
CopyToPublishArtifacts;
@@ -178,11 +179,11 @@
@@ -200,7 +201,8 @@
AccountKey="$(PublishBlobFeedKey)"
ItemsToPush="@(PackagesToPublishToTransport)"
Overwrite="$(PushToBlobFeed_Overwrite)"
- ManifestBuildId="$(BuildNumber)"
+ ManifestBuildId="$(Version)"
+ ManifestBuildData="ProductVersion=$(PackageVersion);UniverseCommitHash=$(CommitHash)"
ManifestCommit="$(CommitHash)"
ManifestName="aspnet"
MaxClients="$(PushToBlobFeed_MaxClients)"
@@ -211,7 +213,8 @@
ItemsToPush="@(FilesToPublishToTransport)"
PublishFlatContainer="true"
Overwrite="$(PushToBlobFeed_Overwrite)"
- ManifestBuildId="$(BuildNumber)"
+ ManifestBuildId="$(Version)"
+ ManifestBuildData="ProductVersion=$(PackageVersion);UniverseCommitHash=$(CommitHash)"
ManifestCommit="$(CommitHash)"
ManifestName="aspnet"
MaxClients="$(PushToBlobFeed_MaxClients)" />
diff --git a/build/dependencies.props b/build/dependencies.props
index 181e4352f0..f8f55a2a7a 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,5 +1,8 @@
+ 2.1.0-prerelease-02430-04
+ 2.0.0
+ 8.7.0
0.10.11
4.3.1
2.4.337
diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj
index 4c4e3556e8..aeff655cbf 100644
--- a/build/tasks/RepoTasks.csproj
+++ b/build/tasks/RepoTasks.csproj
@@ -1,14 +1,17 @@
-
+
+
netstandard2.0
+ https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
-
-
+
+
+
diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks
index d579d64845..51d38ac01d 100644
--- a/build/tasks/RepoTasks.tasks
+++ b/build/tasks/RepoTasks.tasks
@@ -20,4 +20,15 @@
+
+
+
+ $(NUGET_PACKAGES)
+ $(USERPROFILE)\.nuget\packages\
+ $(HOME)\.nuget\packages\
+ $([MSBuild]::NormalizeDirectory($(NuGetPackagesPath)))
+ <_MicrosoftDotNetBuildTasksFeedTaskDir>$(NuGetPackagesPath)microsoft.dotnet.build.tasks.feed\$(DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion.ToLowerInvariant())\build\netstandard1.5\
+
+
+
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 207e91b0f9..bd8de72dd2 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-1008
-commithash:e82dffbe8cf67ad9c07b4385cb6a1a1fc8be9fb1
+version:2.1.0-preview1-1009
+commithash:75ca924dfbd673c38841025b04c4dcd93b84f56d