Skip to content

Commit 0eb1fd7

Browse files
authored
Remove unnecessary restore feeds and update yarn.lock file (#9845)
1 parent 3797bff commit 0eb1fd7

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

NuGet.config

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
<clear />
55
<!--
66
Restore sources should be defined in build/sources.props.
7-
The only allowed feed here is myget.org/aspnet-tools which is required to work around
7+
The only allowed feed here is dotnet-core which is required to work around
88
https://github.com/Microsoft/msbuild/issues/2914
99
-->
1010
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
11-
<add key="myget.org aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
12-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1311
</packageSources>
1412
</configuration>

build/sources.props

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,21 @@
1515
https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json;
1616
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
1717
https://api.nuget.org/v3/index.json;
18-
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
19-
https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json;
18+
</RestoreSources>
19+
<!-- TODO remove this once we remove usages of Internal.AspNetCore.Sdk. -->
20+
<RestoreSources>
21+
$(RestoreSources);
2022
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
21-
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
22-
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
23-
https://dotnet.myget.org/F/nuget-build/api/v3/index.json;
23+
</RestoreSources>
24+
<!-- TODO remove this once we move Microsoft.Internal.AspNetCore.H2Spec.All to a non-myget feed -->
25+
<RestoreSources>
26+
$(RestoreSources);
27+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
28+
</RestoreSources>
29+
<!-- Only used to fetch Microsoft.NETFramework.ReferenceAssemblies for x-plat netfx builds. -->
30+
<RestoreSources Condition=" '$(OS)' != 'Windows_NT' ">
31+
$(RestoreSources);
2432
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
25-
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
26-
https://vside.myget.org/F/devcore/api/v3/index.json;
27-
https://vside.myget.org/F/vsmac/api/v3/index.json;
28-
https://vside.myget.org/F/vssdk/api/v3/index.json;
2933
</RestoreSources>
3034

3135
<!-- In an orchestrated build, this may be overriden to other Azure feeds. -->

src/Middleware/CORS/test/FunctionalTests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"devDependencies": {
44
"jest": "^23.6.0",
55
"merge": "^1.2.1",
6-
"puppeteer": "^1.14.0"
6+
"puppeteer": "^1.15.0"
77
},
88
"dependencies": {},
99
"scripts": {

src/Middleware/CORS/test/FunctionalTests/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2826,10 +2826,10 @@ punycode@^2.1.0:
28262826
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
28272827
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
28282828

2829-
puppeteer@^1.14.0:
2830-
version "1.14.0"
2831-
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.14.0.tgz#828c1926b307200d5fc8289b99df4e13e962d339"
2832-
integrity sha512-SayS2wUX/8LF8Yo2Rkpc5nkAu4Jg3qu+OLTDSOZtisVQMB2Z5vjlY2TdPi/5CgZKiZroYIiyUN3sRX63El9iaw==
2829+
puppeteer@^1.15.0:
2830+
version "1.15.0"
2831+
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.15.0.tgz#1680fac13e51f609143149a5b7fa99eec392b34f"
2832+
integrity sha512-D2y5kwA9SsYkNUmcBzu9WZ4V1SGHiQTmgvDZSx6sRYFsgV25IebL4V6FaHjF6MbwLK9C6f3G3pmck9qmwM8H3w==
28332833
dependencies:
28342834
debug "^4.1.0"
28352835
extract-zip "^1.6.6"

0 commit comments

Comments
 (0)