Skip to content

Commit

Permalink
Use legacy MyGet feeds (#23929)
Browse files Browse the repository at this point in the history
  • Loading branch information
garath authored Jul 28, 2020
1 parent cb4e0ce commit 94076d4
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 13 deletions.
4 changes: 1 addition & 3 deletions build/sources.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
</RestoreSources>
<RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' AND '$(DisableMyGetRestoreSources)' != 'true' ">
$(RestoreSources);
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json;
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json;
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json;
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
</RestoreSources>
Expand Down
2 changes: 1 addition & 1 deletion src/AzureIntegration/build/repo.targets
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<SiteExtensionWorkingDirectory>$(TestDotNetPath)extension\$(SiteExtensionArch)\</SiteExtensionWorkingDirectory>
<SiteExtensionOutputDirectory>$(RepositoryRoot)artifacts\build</SiteExtensionOutputDirectory>
<TestProjectDirectory>$(RepositoryRoot)\test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\</TestProjectDirectory>
<SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://dotnet.myget.org/F/aspnetcore-dev/</SiteExtensionFeed>
<SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json</SiteExtensionFeed>
</PropertyGroup>

<Target Name="_AddTestRuntimes">
Expand Down
5 changes: 2 additions & 3 deletions src/AzureIntegration/build/sources.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
$(RestoreSources);
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json;
</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
$(RestoreSources);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
<add key="AspNetCore" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
$(RestoreSources);
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
https://api.nuget.org/v3/index.json;
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
</RestoreSources>
</PropertyGroup>

Expand Down
5 changes: 2 additions & 3 deletions src/Templating/build/sources.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
$(RestoreSources);
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json;
</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
$(RestoreSources);
Expand Down
2 changes: 1 addition & 1 deletion test/Cli.FunctionalTests/NuGetPackageSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class NuGetPackageSource
public static NuGetPackageSource DotNetCore { get; } = new NuGetPackageSource
{
Name = nameof(DotNetCore),
SourceArgumentLazy = new Lazy<string>("--source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"),
SourceArgumentLazy = new Lazy<string>("--source https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json"),
};

public static NuGetPackageSource EnvironmentVariable { get; } = new NuGetPackageSource
Expand Down

0 comments on commit 94076d4

Please sign in to comment.