Fix DotNetCoreCLIV2 not being able to restore custom MsBuild SDKs.

Tasks/Common/packaging-common/nuget/NuGetConfigHelper2.ts

@@ -14,9 +14,12 @@ import * as ngutil from "./Utility";
 // NuGetConfigHelper2 handles authenticated scenarios where the user selects a source from the UI or from a service connection.
 // It is used by the NuGetCommand >= v2.0.0 and DotNetCoreCLI >= v2.0.0
 
+const nugetFileName: string = 'nuget.config';
+
 export class NuGetConfigHelper2 {
     public tempNugetConfigPath = undefined;
     private nugetXmlHelper: INuGetXmlHelper;
+    private rootNuGetFiles: Array<string>;
 
     constructor(
         private nugetPath: string,
@@ -158,6 +161,21 @@ export class NuGetConfigHelper2 {
         return packageSources.map((source) => this.convertToIPackageSource(source));
     }
 
+    // TODO: Remove these two methods once NuGet issue https://github.com/NuGet/Home/issues/7855 is fixed.
+    public backupExistingRootNuGetFiles(): void {
+        this.rootNuGetFiles = fs.readdirSync('.').filter((file) => file.toLowerCase() === nugetFileName);
+        if (this.shouldWriteRootNuGetFiles()) {
+            this.rootNuGetFiles.forEach((file) => fs.renameSync(file, this.temporaryRootNuGetName(file)));
+            fs.writeFileSync(nugetFileName, fs.readFileSync(this.tempNugetConfigPath));
+        }
+    }
+    public restoreBackupRootNuGetFiles(): void {
+        if (this.shouldWriteRootNuGetFiles()) {
+            fs.unlinkSync(nugetFileName);
+            this.rootNuGetFiles.forEach((file) => fs.renameSync(this.temporaryRootNuGetName(file), file));
+        }
+    }
+
     private removeSourceFromTempNugetConfig(packageSource: IPackageSource) {
         this.nugetXmlHelper.RemoveSourceFromNuGetConfig(packageSource.feedName);
     }
@@ -188,4 +206,12 @@ export class NuGetConfigHelper2 {
             isInternal
         };
     }
+
+    // TODO: Remove these two methods once NuGet issue https://github.com/NuGet/Home/issues/7855 is fixed.
+    private temporaryRootNuGetName(nugetFile: string): string {
+        return `tempRename_${tl.getVariable('build.buildId')}_${nugetFile}`;
+    }
+    private shouldWriteRootNuGetFiles(): boolean {
+        return path.relative('.', this.nugetConfigPath).toLocaleLowerCase() == nugetFileName || this.rootNuGetFiles.length == 0;
+    }
 }

Tasks/DotNetCoreCLIV2/Tests/NuGetConfigHelper-mock.ts

@@ -16,4 +16,8 @@ export class NuGetConfigHelper2 {
     static getTempNuGetConfigBasePath() {
         return tl.getVariable("Agent.HomeDirectory");
     }
+
+    backupExistingRootNuGetFiles() {}
+
+    restoreBackupRootNuGetFiles() {}
 }

Tasks/DotNetCoreCLIV2/restorecommand.ts

@@ -125,6 +125,9 @@ export async function run(): Promise<void> {
         nuGetConfigHelper.setAuthForSourcesInTempNuGetConfig();
 
         const configFile = nuGetConfigHelper.tempNugetConfigPath;
+
+        nuGetConfigHelper.backupExistingRootNuGetFiles();
+
         const dotnetPath = tl.which('dotnet', true);
 
         try {
@@ -133,6 +136,8 @@ export async function run(): Promise<void> {
             }
         } finally {
             credCleanup();
+
+            nuGetConfigHelper.restoreBackupRootNuGetFiles();
         }
 
         tl.setResult(tl.TaskResult.Succeeded, tl.loc('PackagesInstalledSuccessfully'));

Tasks/DotNetCoreCLIV2/task.loc.json

@@ -18,7 +18,7 @@
   "version": {
     "Major": 2,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "minimumAgentVersion": "2.115.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/DownloadPackageV0/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "demands": [],
   "minimumAgentVersion": "1.99.0",

Tasks/DownloadPackageV1/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 1,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "demands": [],
   "releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/NpmAuthenticateV0/task.json

@@ -10,7 +10,7 @@
     "version": {
         "Major": 0,
         "Minor": 154,
-        "Patch": 1
+        "Patch": 2
     },
     "runsOn": [
         "Agent",
@@ -66,4 +66,4 @@
             "argumentFormat": ""
         }
     }
-}
+}

Tasks/NpmAuthenticateV0/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "runsOn": [
     "Agent",
@@ -66,4 +66,4 @@
       "argumentFormat": ""
     }
   }
-}
+}

Tasks/NpmV1/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 1,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "runsOn": [
     "Agent",

Tasks/NuGetCommandV2/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 2,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "runsOn": [
     "Agent",

Tasks/NuGetPublisherV0/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "runsOn": [
     "Agent",

Tasks/NuGetToolInstallerV0/task.loc.json

@@ -15,7 +15,7 @@
   "version": {
     "Major": 0,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "preview": false,
   "satisfies": [

Tasks/NuGetToolInstallerV1/task.loc.json

@@ -15,7 +15,7 @@
   "version": {
     "Major": 1,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "preview": false,
   "satisfies": [

Tasks/NuGetV0/task.loc.json

@@ -11,7 +11,7 @@
   "version": {
     "Major": 0,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "runsOn": [
     "Agent",

Tasks/PipAuthenticateV0/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 154,
-    "Patch": 0
+    "Patch": 1
   },
   "runsOn": [
     "Agent",

Tasks/TwineAuthenticateV0/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 154,
-    "Patch": 0
+    "Patch": 1
   },
   "runsOn": [
     "Agent",

Tasks/UniversalPackagesV0/task.loc.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 153,
-    "Patch": 1
+    "Patch": 2
   },
   "runsOn": [
     "Agent",

Tasks/UseDotNetV2/task.json

@@ -15,7 +15,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 7
+        "Patch": 8
     },
     "satisfies": [
         "DotNetCore"
@@ -153,4 +153,4 @@
         "FailureWhileInstallingNuGetVersion": "Failed while installing NuGet version. Error: %s",
         "SettingUpNugetProxySettings": "Setting up proxy configuration for NuGet."
     }
-}
+}

Tasks/UseDotNetV2/task.loc.json

@@ -15,7 +15,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 7
+    "Patch": 8
   },
   "satisfies": [
     "DotNetCore"
@@ -153,4 +153,4 @@
     "FailureWhileInstallingNuGetVersion": "ms-resource:loc.messages.FailureWhileInstallingNuGetVersion",
     "SettingUpNugetProxySettings": "ms-resource:loc.messages.SettingUpNugetProxySettings"
   }
-}
+}

Tasks/UseNodeV1/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 154,
-        "Patch": 0
+        "Patch": 1
     },
     "satisfies": [
         "Node",
@@ -52,4 +52,4 @@
     "messages": {
         "ToolFailed": "Node install failed: %s"
     }
-}
+}

Tasks/UseNodeV1/task.loc.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 154,
-    "Patch": 0
+    "Patch": 1
   },
   "satisfies": [
     "Node",
@@ -52,4 +52,4 @@
   "messages": {
     "ToolFailed": "ms-resource:loc.messages.ToolFailed"
   }
-}
+}