diff --git a/dependencies.props b/dependencies.props
index 1e0ae67319..3959decded 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -27,6 +27,12 @@
2.2.0-preview3-35497
+
+
+ false
+ preview3
+
+
diff --git a/patches/nuget-client/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch b/patches/nuget-client/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch
deleted file mode 100644
index 6e059ef2f2..0000000000
--- a/patches/nuget-client/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From 18a85b215bacb7ca8fe0d4cdae3cd591b8899cbc Mon Sep 17 00:00:00 2001
-From: Chris Rummel
-Date: Tue, 12 Jun 2018 18:14:46 -0500
-Subject: [PATCH] Add TargetingPack and enable net46 builds for source-build.
-
-https://github.com/NuGet/NuGet.Client/pull/2287 is required to remove this patch.
----
- NuGet.Config | 1 +
- build/common.project.props | 4 ++++
- src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj | 1 -
- .../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 1 -
- src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj | 1 -
- .../NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj | 1 -
- src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj | 1 -
- src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 -
- src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj | 1 -
- .../NuGet.DependencyResolver.Core.csproj | 1 -
- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 1 -
- src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | 1 -
- .../NuGet.Packaging.Core/NuGet.Packaging.Core.csproj | 1 -
- src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | 1 -
- src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | 1 -
- src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj | 1 -
- src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj | 1 -
- src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj | 1 -
- 18 files changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/NuGet.Config b/NuGet.Config
-index 9b7d2ae0a..fc4c20dd9 100644
---- a/NuGet.Config
-+++ b/NuGet.Config
-@@ -7,6 +7,7 @@
-
-
-
-+
-
-
-
-diff --git a/build/common.project.props b/build/common.project.props
-index e77304739..fa513587a 100644
---- a/build/common.project.props
-+++ b/build/common.project.props
-@@ -271,4 +271,8 @@
-
-
-
-+
-+
-+
-+
-
-diff --git a/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj b/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj
-index be318015b..71dea6403 100644
---- a/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj
-+++ b/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
-
- true
- true
-diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-index 594a391d0..6c54f5ff2 100644
---- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
- $(NoWarn);CS1591
- NuGet.Build.Tasks.Pack
- $(AssemblyName)
-diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj
-index f2668829f..fd46961f9 100644
---- a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj
-+++ b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
-
- true
- true
-diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
-index 6391a8c27..b4fdc4d59 100644
---- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
-+++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
-@@ -5,7 +5,6 @@
-
- NuGet wrapper for dotnet.exe
- netcoreapp1.0;net46
-- netcoreapp1.0
- win7-x86
- $(NoWarn);CS1591;CS1701
- Exe
-diff --git a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
-index 82731c899..076634be5 100644
---- a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
-+++ b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
-@@ -5,7 +5,6 @@
-
- Complete commands common to command-line and GUI NuGet clients
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591;CS1574;CS1573;CS1584;CS1658
- $(NoWarn);CS1998
-diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
-index fa9f2509b..3e70cdfaf 100644
---- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
-+++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591;CS1574
- true
-diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
-index afc4c651d..b29b620bb 100644
---- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
-+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
-@@ -6,7 +6,6 @@
- NuGet's client configuration settings implementation.
- $(NoWarn);CS1591
- netstandard1.6;net46
-- netstandard1.6
-
- true
- true
-diff --git a/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj b/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj
-index 212b01511..e22711052 100644
---- a/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj
-+++ b/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591;CS1574
- true
-diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
-index 65c15d4fb..ec76820e8 100644
---- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
-+++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
-@@ -5,7 +5,6 @@
-
- The understanding of target frameworks for NuGet.Packaging
- netstandard1.6;net46;net40
-- netstandard1.6
-
- $(NoWarn);CS1591;CS1574;CS1573
- 5
-diff --git a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
-index b663de55b..430541f8c 100644
---- a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
-+++ b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591
- true
-diff --git a/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj b/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj
-index 8b737e776..126c53666 100644
---- a/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj
-+++ b/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj
-@@ -5,7 +5,6 @@
-
- The core data structures for NuGet.Packaging
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591
- true
-diff --git a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
-index 6be3f658b..7bab06e1b 100644
---- a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
-+++ b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
-@@ -5,7 +5,6 @@
-
- NuGet's implementation for reading nupkg package and nuspec package specification files.
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591;CS1574;CS1573;CS1572
- $(NoWarn);CS0414
-diff --git a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
-index b8e950897..4b28c36d0 100644
---- a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
-+++ b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591;CS1573
- true
-diff --git a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
-index 3f5eb9335..90df11544 100644
---- a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
-+++ b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591;CS1573;CS0012
- nuget protocol
-diff --git a/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj b/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj
-index 9d14c11cc..a9c88818e 100644
---- a/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj
-+++ b/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj
-@@ -5,7 +5,6 @@
-
- NuGet's dependency resolver within the NuGet.Packaging package
- netstandard1.6;net46
-- netstandard1.6
-
- $(NoWarn);CS1591;CS1573
- true
-diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
-index e39d6422a..5da35299d 100644
---- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
-+++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
-@@ -4,7 +4,6 @@
-
-
- netstandard1.6;net46
-- netstandard1.6
-
- NuGet's implementation of Semantic Versioning.
- semver;semantic versioning
---
-2.17.1.windows.2
-
diff --git a/repos/core-setup.proj b/repos/core-setup.proj
index 7aeefcf2b1..f74a41c962 100644
--- a/repos/core-setup.proj
+++ b/repos/core-setup.proj
@@ -16,7 +16,7 @@
$(BuildArguments) /p:BuildDebPackage=false
$(BuildArguments) /p:BuildAllPackages=true
$(BuildArguments) /p:OutputRid=$(OverrideTargetRid)
- $(BuildArguments) /p:PreReleaseLabel="preview"
+ $(BuildArguments) /p:PreReleaseLabel="$(VersionStamp)"
$(BuildArguments) /bl
$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)
diff --git a/repos/dir.props b/repos/dir.props
index 807f8bbfb8..641e5125c1 100644
--- a/repos/dir.props
+++ b/repos/dir.props
@@ -35,12 +35,6 @@
$(RepositoryName)
-
-
-
- false
-
-
@@ -51,9 +45,12 @@
+
+
+
diff --git a/repos/nuget-client.proj b/repos/nuget-client.proj
index 1ae31ce999..508f39fed8 100644
--- a/repos/nuget-client.proj
+++ b/repos/nuget-client.proj
@@ -6,7 +6,7 @@
$(ProjectDirectory)src/NuGet.Core/
$(ProjectDirectory)cli/
$(KeysDir)NuGet.Client.snk
- 5362
+ 5473
false