Skip to content

Commit 63e4cfc

Browse files
authored
[release/6.0] Remove experimental and dotnet5 feeds (#44877)
- [release/6.0] Remove experimental and dotnet5 feeds - Change two other versions - bump SiteExtension.3.1 package to 3.1.30 version - downgrade Microsoft.Extensions.DiagnosticAdapter to avoid needing the dotnet5 feed
1 parent 93aed39 commit 63e4cfc

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

NuGet.config

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1111
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1212
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
13-
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
14-
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
1513
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
1614
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
17-
<add key="dotnet-experimental" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" />
1815
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
19-
<!-- Used for the SiteExtension 3.1 bits that are included in the 5.0 build -->
16+
<!-- Used for the SiteExtension bits that are included in the 6.0 build -->
2017
<add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
18+
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
2119
<!-- Used for the Rich Navigation indexing task -->
2220
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
2321
</packageSources>

eng/Versions.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,9 @@
151151
<MicrosoftNETCoreAppRuntimeVersion>$(MicrosoftNETCoreAppRuntimewinx64Version)</MicrosoftNETCoreAppRuntimeVersion>
152152
</PropertyGroup>
153153
<PropertyGroup Label="Manual">
154-
<!-- DiagnosticAdapter package pinned temporarily until migrated/deprecated -->
155-
<MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.4.20180.4</MicrosoftExtensionsDiagnosticAdapterVersion>
154+
<!-- DiagnosticAdapter package pinned temporarily (??) until migrated/deprecated -->
155+
<!-- This is the latest version found in dotnet-public. -->
156+
<MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.3.20215.2</MicrosoftExtensionsDiagnosticAdapterVersion>
156157
<!-- Build tool dependencies -->
157158
<MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
158159
<!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
@@ -214,7 +215,7 @@
214215
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
215216
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
216217
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>
217-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.29-servicing-22418-8</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
218+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.30-servicing-22476-24</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
218219
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>
219220
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>
220221
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>

0 commit comments

Comments
 (0)