From 4737c299f632fec0a9fe4971394fa0ac6e7e5b76 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 13 Jan 2021 00:48:49 +0000 Subject: [PATCH 1/2] Merged PR 11925: [internal/release/5.0.1xx] Feed update Feed update --- NuGet.config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4dd77ec517a7..e4c0514006dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,12 +9,10 @@ - + - - From c0ca399f8fd650b1c60a6b3057d67e58bb7eb2b5 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 28 Jan 2021 10:41:00 -0800 Subject: [PATCH 2/2] Fixup feeds --- .../SampleGlobalTool/consoledemo.csproj | 2 +- .../ConsoleDemoWithCasing.csproj | 2 +- .../SampleGlobalToolWithShim/consoledemo.csproj | 2 +- .../ToolPackageInstallerTests.cs | 4 ++-- .../EndToEnd/FolderPublish50.cs | 2 +- .../dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalTool/consoledemo.csproj b/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalTool/consoledemo.csproj index 6270b736728f..0017ee4b6eee 100644 --- a/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalTool/consoledemo.csproj +++ b/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalTool/consoledemo.csproj @@ -5,7 +5,7 @@ consoledemo $(RestoreSources); - https://api.nuget.org/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; false false diff --git a/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalToolWithDifferentCasing/ConsoleDemoWithCasing.csproj b/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalToolWithDifferentCasing/ConsoleDemoWithCasing.csproj index 2e59354b6e9e..ffe2604a4b40 100644 --- a/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalToolWithDifferentCasing/ConsoleDemoWithCasing.csproj +++ b/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalToolWithDifferentCasing/ConsoleDemoWithCasing.csproj @@ -5,7 +5,7 @@ ConsoleDemoWithCasing $(RestoreSources); - https://api.nuget.org/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; false false diff --git a/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalToolWithShim/consoledemo.csproj b/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalToolWithShim/consoledemo.csproj index 6270b736728f..0017ee4b6eee 100644 --- a/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalToolWithShim/consoledemo.csproj +++ b/src/Tests/Microsoft.DotNet.ToolPackage.Tests/SampleGlobalToolWithShim/consoledemo.csproj @@ -5,7 +5,7 @@ consoledemo $(RestoreSources); - https://api.nuget.org/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; false false diff --git a/src/Tests/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs b/src/Tests/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs index d5162369bbb7..84b6511c1b9d 100644 --- a/src/Tests/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs +++ b/src/Tests/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs @@ -941,8 +941,8 @@ public static string FormatNuGetConfig(string localFeedPath) - - + + "; return string.Format(template, localFeedPath); diff --git a/src/Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests/EndToEnd/FolderPublish50.cs b/src/Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests/EndToEnd/FolderPublish50.cs index d55381962c0d..f7f4fee736ee 100644 --- a/src/Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests/EndToEnd/FolderPublish50.cs +++ b/src/Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests/EndToEnd/FolderPublish50.cs @@ -119,7 +119,7 @@ private void Publish(string testFolder, string projectName, string configuration int? exitCode = 0; // dotnet restore - string dotnetRestoreArguments = "restore --source https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json --source https://api.nuget.org/v3/index.json"; + string dotnetRestoreArguments = "restore --source https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json"; exitCode = new ProcessWrapper().RunProcess(DotNetExeName, dotnetRestoreArguments, testFolder, out int? processId2); Assert.True(exitCode.HasValue && exitCode.Value == 0); diff --git a/src/Tests/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs b/src/Tests/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs index 63cff899fb23..db6b080c776e 100644 --- a/src/Tests/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs +++ b/src/Tests/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs @@ -102,7 +102,7 @@ public void WhenRestoreSourcesStartsWithUnixPathThenHttpsSourceIsParsedCorrectly var result = new DotnetCommand(Log) .WithWorkingDirectory(root) - .Execute("msbuild", $"{propertyFormat}:RestoreSources={somePathThatExists};https://api.nuget.org/v3/index.json", "/t:restore", "LibraryWithUnresolvablePackageReference.csproj"); + .Execute("msbuild", $"{propertyFormat}:RestoreSources={somePathThatExists};https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", "/t:restore", "LibraryWithUnresolvablePackageReference.csproj"); result.Should().Fail();