diff options
author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2022-11-09 02:10:29 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-09 02:10:29 +0300 |
commit | 38db0918d6afc594f9afc711feca61274dce8123 (patch) | |
tree | 51f6b085e1a439af89d6a1b870c01d1df3e0b2d9 | |
parent | 97e9592a60b3bafcc6091d54d8faba4e57dd6200 (diff) |
[main] Remove feeds, add to SiteExtension bundle (#44882)
- [main] Remove feeds, add to SiteExtension bundle
- should no longer need experimental, downlevel non-transport, or VS feeds
- add 7.0 bits to the SiteExtension bundle
- use latest SiteExtension.7.0 RTM version available in dotnet7-transport for now
- Change additional versions
- bump SiteExtension.3.1 and SiteExtension.6.0 package versions
- downgrade Microsoft.Extensions.DiagnosticAdapter to avoid needing the dotnet5 feed
- Bump the Microsoft.TemplateEngine.Tasks version
- avoid unreleased version Arcade defaults to
4 files changed, 24 insertions, 16 deletions
diff --git a/NuGet.config b/NuGet.config index 30350b2a2a..50e58d6470 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,21 +6,14 @@ <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" /> <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" /> - <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" /> - <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" /> - <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> - <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" /> - <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" /> - <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" /> - <add key="dotnet-experimental" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" /> <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" /> - <!-- Used for the SiteExtension 3.1 bits that are included in the 5.0 build --> + <!-- Used for the SiteExtension bits that are included in the 8.0 build --> <add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" /> + <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" /> + <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" /> + <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" /> <!-- Used for the Rich Navigation indexing task --> <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" /> - <!-- Preview VS bits for route tooling. Will be removed in future when packages referenced by Roslyn move out of preview. --> - <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" /> - <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" /> </packageSources> <disabledPackageSources> <clear /> diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 6c44830a06..84b88d8fbb 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -135,6 +135,8 @@ and are generated based on the last package release. <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" /> <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" /> <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" /> + <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.7.0.x64" /> + <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.7.0.x86" /> <LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" /> <LatestPackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport" /> <LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" /> diff --git a/eng/Versions.props b/eng/Versions.props index bbce75915a..edfc2e7a10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,8 +162,9 @@ <!-- Bumping the Roslyn version used in order to ingest the new runtime source generators --> <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers> <MicrosoftNetCompilersToolsetVersion>4.5.0-1.22517.9</MicrosoftNetCompilersToolsetVersion> - <!-- DiagnosticAdapter package pinned temporarily until migrated/deprecated --> - <MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.4.20180.4</MicrosoftExtensionsDiagnosticAdapterVersion> + <!-- DiagnosticAdapter package pinned temporarily (??) until migrated/deprecated --> + <!-- This is the latest version found in dotnet-public. --> + <MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.3.20215.2</MicrosoftExtensionsDiagnosticAdapterVersion> <!-- Build tool dependencies --> <MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion> <!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 --> @@ -202,6 +203,12 @@ --> <MicrosoftNETTestSdkVersion>17.1.0-preview-20211109-03</MicrosoftNETTestSdkVersion> <!-- + Also use a newer, publicly-released version of the templating engine than the Arcade default. + https://github.com/dotnet/templating/blob/main/docs/Localization.md recommends updating the version when + preview or stable versions are released to NuGet.org. + --> + <MicrosoftTemplateEngineTasksVersion>7.0.100-rc.2.22473.1</MicrosoftTemplateEngineTasksVersion> + <!-- Versions of Microsoft.CodeAnalysis packages referenced by analyzers shipped in the SDK. This need to be pinned since they're used in 3.1 apps and need to be loadable in VS 2019. --> @@ -230,18 +237,22 @@ <SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion> <SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion> <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion> - <!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. --> + <!-- Packages from downlevel branches used for site extension build. --> <MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version> - <MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.28-servicing-22364-2</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version> + <MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.30-servicing-22476-24</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version> - <MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.8-servicing-22363-16</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version> + <MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.10-servicing-22476-17</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version> + <!-- Should be 7.0.0-rtm-22518-19 soon. --> + <MicrosoftAspNetCoreAzureAppServicesSiteExtension70Version>7.0.0-rtm-22517-17</MicrosoftAspNetCoreAzureAppServicesSiteExtension70Version> + <MicrosoftAspNetCoreAzureAppServicesSiteExtension70x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension70x64Version> + <MicrosoftAspNetCoreAzureAppServicesSiteExtension70x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension70x86Version> <!-- 3rd party dependencies --> <AngleSharpVersion>0.9.9</AngleSharpVersion> <BenchmarkDotNetVersion>0.13.0</BenchmarkDotNetVersion> diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index e601201af0..0d5def2b2b 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -36,6 +36,8 @@ <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" PrivateAssets="All" /> <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" PrivateAssets="All" /> <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" PrivateAssets="All" /> + <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.7.0.x64" PrivateAssets="All" /> + <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.7.0.x86" PrivateAssets="All" /> <!-- Bundle the just-built LB.csproj package content into this one the easy way. See UpdateLatestPackageReferences for the hard way. |