diff options
author | dotnet-bot <dotnet-bot@microsoft.com> | 2020-07-28 20:26:56 +0300 |
---|---|---|
committer | dotnet-bot <dotnet-bot@microsoft.com> | 2020-07-28 20:26:56 +0300 |
commit | adc6f4d362456fd5a4d6f35e66a10bb8b1660470 (patch) | |
tree | d24079c3d313416550f3c3a0b88b0bd2b6088a83 | |
parent | bccd1ea5e8d4dbd4f1367946b22ea60efffd7b50 (diff) | |
parent | 94076d4a093eba361f632f2c0cd5c84c3c08a083 (diff) |
Merge in 'release/2.1' changesv2.1.21
7 files changed, 9 insertions, 13 deletions
diff --git a/build/sources.props b/build/sources.props index 9567ad020c..ce630b7d49 100644 --- a/build/sources.props +++ b/build/sources.props @@ -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> diff --git a/src/AzureIntegration/build/repo.targets b/src/AzureIntegration/build/repo.targets index 856963004f..3d02fefc78 100644 --- a/src/AzureIntegration/build/repo.targets +++ b/src/AzureIntegration/build/repo.targets @@ -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"> diff --git a/src/AzureIntegration/build/sources.props b/src/AzureIntegration/build/sources.props index 9215df9751..9eb344de86 100644 --- a/src/AzureIntegration/build/sources.props +++ b/src/AzureIntegration/build/sources.props @@ -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); diff --git a/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/Assets/NuGet.latest.config b/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/Assets/NuGet.latest.config index 4a06556f1c..579b355697 100644 --- a/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/Assets/NuGet.latest.config +++ b/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/Assets/NuGet.latest.config @@ -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> diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj index eb17758d75..0ecdcd3765 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj @@ -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> diff --git a/src/Templating/build/sources.props b/src/Templating/build/sources.props index 9215df9751..9eb344de86 100644 --- a/src/Templating/build/sources.props +++ b/src/Templating/build/sources.props @@ -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); diff --git a/test/Cli.FunctionalTests/NuGetPackageSource.cs b/test/Cli.FunctionalTests/NuGetPackageSource.cs index e1bbce195a..cc155ecd10 100644 --- a/test/Cli.FunctionalTests/NuGetPackageSource.cs +++ b/test/Cli.FunctionalTests/NuGetPackageSource.cs @@ -23,7 +23,7 @@ namespace Cli.FunctionalTests 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 |