aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-08-07 12:26:30 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-08-07 12:26:30 -0700
commitcebc7acf025e888f70e84f56941d267b2fbda70a (patch)
tree7f2184399c378c0e785b1913742a21b37df4fc8a
parent39de485b324fad8497db6e25bb7be2e6cf972f67 (diff)
downloadvcpkg-cebc7acf025e888f70e84f56941d267b2fbda70a.tar.gz
vcpkg-cebc7acf025e888f70e84f56941d267b2fbda70a.zip
Updated version of nuget to 4.1.0
-rw-r--r--scripts/fetchDependency.ps110
-rw-r--r--toolsrc/src/VcpkgPaths.cpp4
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index eecd7fe5a..13799cc73 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -162,11 +162,11 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
}
elseif($Dependency -eq "nuget")
{
- $requiredVersion = "3.3.0"
- $downloadVersion = "3.5.0"
- $url = "https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe"
- $downloadPath = "$downloadsDir\nuget-3.5.0\nuget.exe"
- $expectedDownloadedFileHash = "399ec24c26ed54d6887cde61994bb3d1cada7956c1b19ff880f06f060c039918"
+ $requiredVersion = "4.1.0"
+ $downloadVersion = "4.1.0"
+ $url = "https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe"
+ $downloadPath = "$downloadsDir\nuget-4.1.0\nuget.exe"
+ $expectedDownloadedFileHash = "4c1de9b026e0c4ab087302ff75240885742c0faa62bd2554f913bbe1f6cb63a0"
$executableFromDownload = $downloadPath
$extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED
}
diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp
index bc1152b9d..f3501e162 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/VcpkgPaths.cpp
@@ -122,10 +122,10 @@ namespace vcpkg
fs::path get_nuget_path(const fs::path& downloads_folder, const fs::path scripts_folder)
{
- static constexpr std::array<int, 3> expected_version = {3, 3, 0};
+ static constexpr std::array<int, 3> expected_version = {4, 1, 0};
static const std::wstring version_check_arguments = L"";
- const fs::path downloaded_copy = downloads_folder / "nuget-3.5.0" / "nuget.exe";
+ const fs::path downloaded_copy = downloads_folder / "nuget-4.1.0" / "nuget.exe";
const std::vector<fs::path> from_path = find_from_PATH(L"nuget");
std::vector<fs::path> candidate_paths;