Skip to content

Add 9.0 SiteExtension, remove some 6.0 bits #58925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 3 additions & 29 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,6 @@ configuration:
- addMilestone:
milestone: 10.0-preview1
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
- if:
- payloadType: Pull_Request
- isAction:
action: Closed
- targetsBranch:
branch: release/9.0
then:
- removeMilestone
- addMilestone:
milestone: 9.0.1
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
- if:
- payloadType: Issues
- isAction:
Expand Down Expand Up @@ -487,21 +476,6 @@ configuration:

Otherwise, please add `tell-mode` label.
description: Add release/8.0 targeting PRs to the servicing project
- if:
- payloadType: Pull_Request
- isAction:
action: Opened
- targetsBranch:
branch: release/6.0
then:
- addMilestone:
milestone: 6.0.x
- addReply:
reply: >-
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.

Otherwise, please add `tell-mode` label.
description: Add release/6.0 targeting PRs to the servicing project
- if:
- payloadType: Pull_Request
- isAction:
Expand Down Expand Up @@ -561,12 +535,12 @@ configuration:
- isAction:
action: Closed
- targetsBranch:
branch: release/6.0
branch: release/9.0
then:
- removeMilestone
- addMilestone:
milestone: 6.0.36
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch'
milestone: 9.0.1
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
- if:
- payloadType: Pull_Request
- isAction:
Expand Down
2 changes: 0 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<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="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<!-- Used for the SiteExtension bits -->
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-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" />
</packageSources>
Expand Down
4 changes: 2 additions & 2 deletions eng/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ and are generated based on the last package release.

<ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x64" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x86" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x64" />
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x86" />
<LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
<LatestPackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport" />
<LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,12 @@
<SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<!-- Packages from downlevel branches used for site extension build. -->
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.25-servicing-23523-15</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version>8.0.0-rtm-23531-12</MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension80x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension80x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension80x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension80x86Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version>9.0.0-rtm-24529-3</MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension90x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension90x86Version>
<!-- 3rd party dependencies -->
<AzureIdentityVersion>1.11.4</AzureIdentityVersion>
<AngleSharpVersion>0.9.9</AngleSharpVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
$(DefaultNetCoreTargetFramework), add previous SiteExtension packages to the list below. Remove
entries when packages aren't needed in the bundle anymore.
-->
<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.8.0.x64" PrivateAssets="All" />
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x86" PrivateAssets="All" />
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x64" PrivateAssets="All" />
<Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x86" PrivateAssets="All" />
<!--
Bundle the just-built LB.csproj package content into this one the easy way. See
UpdateLatestPackageReferences for the hard way.
Expand Down
Loading