Skip to content

Commit 9098bcc

Browse files
wtgodbecaptainsafia
authored andcommitted
Add 9.0 SiteExtension, remove some 6.0 bits (#58925)
1 parent b335346 commit 9098bcc

File tree

5 files changed

+10
-38
lines changed

5 files changed

+10
-38
lines changed

.github/policies/resourceManagement.yml

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -379,17 +379,6 @@ configuration:
379379
- addMilestone:
380380
milestone: 10.0-preview1
381381
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
382-
- if:
383-
- payloadType: Pull_Request
384-
- isAction:
385-
action: Closed
386-
- targetsBranch:
387-
branch: release/9.0
388-
then:
389-
- removeMilestone
390-
- addMilestone:
391-
milestone: 9.0.1
392-
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
393382
- if:
394383
- payloadType: Issues
395384
- isAction:
@@ -487,21 +476,6 @@ configuration:
487476
488477
Otherwise, please add `tell-mode` label.
489478
description: Add release/8.0 targeting PRs to the servicing project
490-
- if:
491-
- payloadType: Pull_Request
492-
- isAction:
493-
action: Opened
494-
- targetsBranch:
495-
branch: release/6.0
496-
then:
497-
- addMilestone:
498-
milestone: 6.0.x
499-
- addReply:
500-
reply: >-
501-
Hi @${issueAuthor}. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the [servicing process](https://aka.ms/aspnet/servicing) document.
502-
503-
Otherwise, please add `tell-mode` label.
504-
description: Add release/6.0 targeting PRs to the servicing project
505479
- if:
506480
- payloadType: Pull_Request
507481
- isAction:
@@ -561,12 +535,12 @@ configuration:
561535
- isAction:
562536
action: Closed
563537
- targetsBranch:
564-
branch: release/6.0
538+
branch: release/9.0
565539
then:
566540
- removeMilestone
567541
- addMilestone:
568-
milestone: 6.0.36
569-
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch'
542+
milestone: 9.0.1
543+
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
570544
- if:
571545
- payloadType: Pull_Request
572546
- isAction:

NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
1212
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1313
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
14-
<!-- Used for the SiteExtension bits -->
15-
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
1614
<!-- Used for the Rich Navigation indexing task -->
1715
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1816
</packageSources>

eng/Dependencies.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ and are generated based on the last package release.
141141

142142
<ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
143143
<LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" />
144-
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" />
145-
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" />
146144
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x64" />
147145
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x86" />
146+
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x64" />
147+
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x86" />
148148
<LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
149149
<LatestPackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport" />
150150
<LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" />

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,12 +274,12 @@
274274
<SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion>
275275
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
276276
<!-- Packages from downlevel branches used for site extension build. -->
277-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.25-servicing-23523-15</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
278-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>
279-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>
280277
<MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version>8.0.0-rtm-23531-12</MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version>
281278
<MicrosoftAspNetCoreAzureAppServicesSiteExtension80x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension80x64Version>
282279
<MicrosoftAspNetCoreAzureAppServicesSiteExtension80x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension80x86Version>
280+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version>9.0.0-rtm-24529-3</MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version>
281+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension90x64Version>
282+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension90x86Version>
283283
<!-- 3rd party dependencies -->
284284
<AzureIdentityVersion>1.11.4</AzureIdentityVersion>
285285
<AngleSharpVersion>0.9.9</AngleSharpVersion>

src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
$(DefaultNetCoreTargetFramework), add previous SiteExtension packages to the list below. Remove
3030
entries when packages aren't needed in the bundle anymore.
3131
-->
32-
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" PrivateAssets="All" />
33-
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" PrivateAssets="All" />
3432
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x64" PrivateAssets="All" />
3533
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x86" PrivateAssets="All" />
34+
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x64" PrivateAssets="All" />
35+
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x86" PrivateAssets="All" />
3636
<!--
3737
Bundle the just-built LB.csproj package content into this one the easy way. See
3838
UpdateLatestPackageReferences for the hard way.

0 commit comments

Comments
 (0)