Skip to content

Commit 5c9dd04

Browse files
authored
Reduce nuget feeds (#3813)
1 parent 2163fbc commit 5c9dd04

File tree

3 files changed

+6
-72
lines changed

3 files changed

+6
-72
lines changed

NuGet.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<!-- Only specify feed for RepoToolset SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->
43
<packageSources>
54
<clear />
65
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->

eng/Versions.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,4 @@
3737
<MicrosoftDotNetCliUtilsVersion>2.0.0</MicrosoftDotNetCliUtilsVersion>
3838
<MicrosoftNETTestSdkVersion>15.0.0</MicrosoftNETTestSdkVersion>
3939
</PropertyGroup>
40-
<PropertyGroup>
41-
<RestoreSources>
42-
$(RestoreSources);
43-
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
44-
https://dotnet.myget.org/F/nuget-build/api/v3/index.json
45-
</RestoreSources>
46-
</PropertyGroup>
4740
</Project>

src/Tests/Microsoft.NET.TestFramework/SetupTestRoot.targets

Lines changed: 6 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -15,70 +15,12 @@
1515
<Copy SourceFiles="@(_CopyDirectoryBuildTestDependenciesInput)" DestinationFiles="@(_CopyDirectoryBuildTestDependenciesOutput)" />
1616
</Target>
1717

18-
<Target Name="WriteNugetConfigFile" AfterTargets="Build">
19-
20-
<ItemGroup>
21-
<NugetConfigPrivateFeeds Include="$(ExternalRestoreSources.Split(';'))" />
22-
</ItemGroup>
23-
24-
<PropertyGroup>
25-
<GeneratedNuGetConfig>$(ArtifactsTmpDir)NuGet.config</GeneratedNuGetConfig>
26-
<NugetConfigHeader>
27-
<![CDATA[
28-
<?xml version="1.0" encoding="utf-8"?>
29-
<configuration>
30-
<packageSources>
31-
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
32-
<clear />
33-
]]>
34-
</NugetConfigHeader>
35-
36-
<NugetConfigFeeds>
37-
<![CDATA[
38-
<add key="darc-pub-dotnet-core-setup-f8bfa42" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-f8bfa424/nuget/v3/index.json" />
39-
<add key="BlobFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
40-
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
41-
<add key="aspnetcore-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
42-
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
43-
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
44-
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
45-
<add key="container-tools" value="https://www.myget.org/F/container-tools-for-visual-studio/api/v3/index.json" />
46-
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
47-
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
48-
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
49-
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
50-
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
51-
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
52-
]]>
53-
</NugetConfigFeeds>
54-
55-
<NugetConfigSuffix>
56-
<![CDATA[
57-
</packageSources>
58-
</configuration>
59-
]]>
60-
</NugetConfigSuffix>
61-
62-
</PropertyGroup>
63-
64-
<WriteLinesToFile File="$(GeneratedNuGetConfig)"
65-
Lines="$(NugetConfigHeader)"
66-
Overwrite="true" />
67-
68-
<WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'"
69-
File="$(GeneratedNuGetConfig)"
70-
Lines="&lt;add key=&quot;PrivateBlobFeed%(NugetConfigPrivateFeeds.Filename)&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;"
71-
Overwrite="false" />
72-
73-
<WriteLinesToFile Condition="'$(DotNetBuildOffline)' != 'true'"
74-
File="$(GeneratedNuGetConfig)"
75-
Lines="$(NugetConfigFeeds)"
76-
Overwrite="false" />
77-
78-
<WriteLinesToFile File="$(GeneratedNuGetConfig)"
79-
Lines="$(NugetConfigSuffix)"
80-
Overwrite="false" />
81-
18+
<Target Name="WriteNugetConfigFile"
19+
AfterTargets="Build"
20+
Inputs="$(RepoRoot)NuGet.config"
21+
Outputs="$(ArtifactsTmpDir)NuGet.config"
22+
>
23+
<Copy SourceFiles="$(RepoRoot)NuGet.config" DestinationFiles="$(ArtifactsTmpDir)NuGet.config" />
8224
</Target>
8325

8426
</Project>

0 commit comments

Comments
 (0)