diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 9b765de6b1ae..9ee76e96a12c 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -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: @@ -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: @@ -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: diff --git a/NuGet.config b/NuGet.config index b719dd5ce9a8..20e5a3a40005 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,8 +11,6 @@ - - diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 8ecb0eb6bf65..ea0a7c089272 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -141,10 +141,10 @@ and are generated based on the last package release. - - + + diff --git a/eng/Versions.props b/eng/Versions.props index c8baddec071f..2a29a95963a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -274,12 +274,12 @@ 5.0.0-alpha.20560.6 5.0.0 - 6.0.25-servicing-23523-15 - $(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version) - $(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version) 8.0.0-rtm-23531-12 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version) + 9.0.0-rtm-24529-3 + $(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version) + $(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version) 1.11.4 0.9.9 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 b0624cf9f9ca..f3b42389f2cb 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 @@ -29,10 +29,10 @@ $(DefaultNetCoreTargetFramework), add previous SiteExtension packages to the list below. Remove entries when packages aren't needed in the bundle anymore. --> - - + +