Skip to content

Commit b9726c8

Browse files
author
Dan Seefeldt
committed
Update based on review comments
1 parent d6e810a commit b9726c8

File tree

2 files changed

+51
-34
lines changed

2 files changed

+51
-34
lines changed

‎repos/Directory.Build.targets

Lines changed: 48 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -142,38 +142,54 @@
142142

143143
<!-- Update NuGet.Config files that have deprecated myget feeds -->
144144
<ItemGroup>
145-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/nuget-build/api/v3/index.json"
146-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
147-
<LegacyFeedMapping Include="https://www.myget.org/F/nugetbuild/api/v3/index.json"
148-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
149-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json"
150-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" />
151-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"
152-
NewFeed="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
153-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/vstest/api/v3/index.json"
154-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
155-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/mstestv2/auth/1e768268-8c95-4e7e-9fd2-0eb1b1b69b18/api/v3/index.json"
156-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
157-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/roslyn/api/v3/index.json"
158-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
159-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json"
160-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
161-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json"
162-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
163-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json"
164-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
165-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json"
166-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
167-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/interactive-window/api/v3/index.json"
168-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
169-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/mstestv2/api/v3/index.json"
170-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
171-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/vsunittesting/api/v3/index.json"
172-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
173-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/msbuild/api/v3/index.json"
174-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
175-
<LegacyFeedMapping Include="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json"
176-
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
145+
<LegacyFeedMapping
146+
Include="https://dotnet.myget.org/F/nuget-build/api/v3/index.json"
147+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
148+
<LegacyFeedMapping
149+
Include="https://www.myget.org/F/nugetbuild/api/v3/index.json"
150+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
151+
<LegacyFeedMapping
152+
Include="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json"
153+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" />
154+
<LegacyFeedMapping
155+
Include="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"
156+
NewFeed="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
157+
<LegacyFeedMapping
158+
Include="https://dotnet.myget.org/F/vstest/api/v3/index.json"
159+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
160+
<LegacyFeedMapping
161+
Include="https://dotnet.myget.org/F/mstestv2/auth/1e768268-8c95-4e7e-9fd2-0eb1b1b69b18/api/v3/index.json"
162+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
163+
<LegacyFeedMapping
164+
Include="https://dotnet.myget.org/F/roslyn/api/v3/index.json"
165+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
166+
<LegacyFeedMapping
167+
Include="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json"
168+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
169+
<LegacyFeedMapping
170+
Include="https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json"
171+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
172+
<LegacyFeedMapping
173+
Include="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json"
174+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
175+
<LegacyFeedMapping
176+
Include="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json"
177+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
178+
<LegacyFeedMapping
179+
Include="https://dotnet.myget.org/F/interactive-window/api/v3/index.json"
180+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
181+
<LegacyFeedMapping
182+
Include="https://dotnet.myget.org/F/mstestv2/api/v3/index.json"
183+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
184+
<LegacyFeedMapping
185+
Include="https://dotnet.myget.org/F/vsunittesting/api/v3/index.json"
186+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
187+
<LegacyFeedMapping
188+
Include="https://dotnet.myget.org/F/msbuild/api/v3/index.json"
189+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
190+
<LegacyFeedMapping
191+
Include="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json"
192+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
177193
</ItemGroup>
178194

179195
<ReplaceFeedsInNugetConfig InputFile="%(NuGetConfigFiles.Identity)"

‎tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceFeedsInNuGetConfig.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ public class ReplaceFeedsInNuGetConfig : Task
2222
public string InputFile { get; set; }
2323

2424
/// <summary>
25-
/// An item group of feeds to update. Each item must have metadata NewFeed
26-
/// that specifies the replacement feed.
25+
/// An item group of feeds to update.
26+
/// %(Identity): The feed URL to find in the NuGet.Config.
27+
/// %(NewFeed): The feed URL to replace %(Identity) with.
2728
/// </summary>
2829
[Required]
2930
public ITaskItem[] FeedMapping { get; set; }

0 commit comments

Comments
 (0)