Ensure authentication via pat works in onprem for internal package fe…

…ed (#9917) * Ensure authentication via pat works in onprem for internal package feed * used constants * Fixed failing tests * Fixed versioning scheme to reflect sprints
microsoft · Mar 25, 2019 · ab84caf · ab84caf
1 parent fd7a95c
commit ab84caf
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/Tasks/VsTestPlatformToolInstallerV1/Tests/TestSetup.ts b/Tasks/VsTestPlatformToolInstallerV1/Tests/TestSetup.ts
@@ -97,6 +97,8 @@ writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, constants.
 writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, process.env[testConstants.feedId]);
 writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, constants.source);
 writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, process.env[constants.customFeed]);
+writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, constants.validAuthenticationTypes);
+writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, constants.basic);
 writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, constants.usernameParam);
 writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, process.env[constants.username]);
 writeNugetConfigCommand = testHelpers.addArg(writeNugetConfigCommand, constants.passwordParam);

diff --git a/Tasks/VsTestPlatformToolInstallerV1/constants.ts b/Tasks/VsTestPlatformToolInstallerV1/constants.ts
@@ -14,6 +14,7 @@ export const defaultPackageSource = 'https://api.nuget.org/v3/index.json';
 
 // nuget exe parameters
 export const list = 'list';
+export const basic = 'basic';
 export const install = 'install';
 export const sources = 'sources';
 export const add = 'Add';
@@ -28,6 +29,7 @@ export const configFile = '-ConfigFile';
 export const preRelease = '-PreRelease';
 export const directDownload = '-DirectDownload';
 export const outputDirectory = '-OutputDirectory';
+export const validAuthenticationTypes = '-ValidAuthenticationTypes';
 
 // input fields
 export const netShare = 'netShare';

diff --git a/Tasks/VsTestPlatformToolInstallerV1/make.json b/Tasks/VsTestPlatformToolInstallerV1/make.json
@@ -2,7 +2,7 @@
     "externals": {
         "files": [
             {
-                "url": "https://dist.nuget.org/win-x86-commandline/v4.7.0/nuget.exe",
+                "url": "https://dist.nuget.org/win-x86-commandline/v5.0.0-preview4/nuget.exe",
                 "dest": "nuget.exe"
             }
         ]

diff --git a/Tasks/VsTestPlatformToolInstallerV1/nugetfeedinstaller.ts b/Tasks/VsTestPlatformToolInstallerV1/nugetfeedinstaller.ts
@@ -162,6 +162,7 @@ export class NugetFeedInstaller {
 
         nugetTool.arg(constants.sources).arg(constants.add).arg(constants.noninteractive)
             .arg(constants.name).arg(feedId).arg(constants.source).arg(feedUrl)
+            .arg(constants.validAuthenticationTypes).arg(constants.basic)
             .argIf(password, constants.usernameParam).argIf(password, username)
             .argIf(password, constants.passwordParam).argIf(password, password)
             .argIf(configFilePath, constants.configFile).argIf(configFilePath, configFilePath);

diff --git a/Tasks/VsTestPlatformToolInstallerV1/package-lock.json b/Tasks/VsTestPlatformToolInstallerV1/package-lock.json
diff --git a/Tasks/VsTestPlatformToolInstallerV1/task.json b/Tasks/VsTestPlatformToolInstallerV1/task.json
@@ -14,8 +14,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 1,
-        "Patch": 6
+        "Minor": 150,
+        "Patch": 0
     },
     "satisfies": [
         "VsTest"

diff --git a/Tasks/VsTestPlatformToolInstallerV1/task.loc.json b/Tasks/VsTestPlatformToolInstallerV1/task.loc.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 1,
-    "Patch": 6
+    "Minor": 150,
+    "Patch": 0
   },
   "satisfies": [
     "VsTest"