-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #45053
Open
github-actions
wants to merge
154
commits into
release/9.0.2xx
Choose a base branch
from
merge/release/9.0.1xx-to-release/9.0.2xx
base: release/9.0.2xx
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #45053
github-actions
wants to merge
154
commits into
release/9.0.2xx
from
merge/release/9.0.1xx-to-release/9.0.2xx
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…3 repositories This pull request updates the following dependencies [marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689 - **Build**: 20240812.10 - **Date Produced**: August 13, 2024 2:56:37 AM UTC - **Commit**: 4493500184d43f2d0c60001d557433e40de1663c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.34 to 6.0.34][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.34][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][3] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.34 to 6.0.34][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24406.8 to 6.0.34-servicing.24412.10][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e4bec0ab4141e6681c87e3f34317f3d670946cd&targetVersion=GC4493500184d43f2d0c60001d557433e40de1663c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: 20240813.2 - **Date Produced**: August 13, 2024 11:41:29 PM UTC - **Commit**: 526b783fc75e702512a29ede591c4335dce62d6f - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][4] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24406.5 to 6.0.34-servicing.24413.2][4] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24406.5 to 6.0.34-servicing.24413.2][4] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7748e8750e5b93731c9ebd20aae01dd5b6abaaab&targetVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81) [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20240807.6 - **Date Produced**: August 7, 2024 10:41:17 PM UTC - **Commit**: 461f5091a1b0ac7a12af350bb2a094e248cd757c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.33-servici...
…dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20240815.8 - **Date Produced**: August 15, 2024 8:11:17 PM UTC - **Commit**: 15b9e7637e51dc8495f899ebaadd7d2a76095967 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.133 to 6.0.133][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.133 to 6.0.133][2] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.133 to 6.0.133][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.133-servicing.24415.4 to 6.0.133-servicing.24415.8][2] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.133 to 6.0.133][2] - **Microsoft.TemplateEngine.Utils**: [from 6.0.133 to 6.0.133][2] - **Microsoft.TemplateSearch.Common**: [from 6.0.133 to 6.0.133][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC68f6e5bdac8569fd32be90ecf442d4f8068e967b&targetVersion=GC15b9e7637e51dc8495f899ebaadd7d2a76095967&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689)
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: 20240815.7 - **Date Produced**: August 16, 2024 1:03:31 AM UTC - **Commit**: 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&targetVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&targetVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81)
…dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689 - **Build**: 20240816.23 - **Date Produced**: August 17, 2024 4:41:32 AM UTC - **Commit**: 98588b0f0d72383aca8722755d838ae1d542ce62 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.34 to 6.0.34][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.34][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.34 to 6.0.34][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4493500184d43f2d0c60001d557433e40de1663c&targetVersion=GC98588b0f0d72383aca8722755d838ae1d542ce62&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689)
…dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20240817.2 - **Date Produced**: August 17, 2024 4:05:07 PM UTC - **Commit**: b66746dd945089102c4932375063d67616bea606 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.133 to 6.0.133][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.133 to 6.0.133][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.133 to 6.0.133][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.133-servicing.24415.8 to 6.0.133-servicing.24417.2][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.133 to 6.0.133][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.133 to 6.0.133][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.133 to 6.0.133][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC15b9e7637e51dc8495f899ebaadd7d2a76095967&targetVersion=GCb66746dd945089102c4932375063d67616bea606&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689) [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20240817.1 - **Date Produced**: August 17, 2024 4:21:43 PM UTC - **Commit**: e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **dotnet-user-secrets**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.Authorization**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.34-servicing.24415.2 to 6.0.34-servicing.24417.1][2] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.34 to 6.0.34][2] - **Microsoft.AspNetCore.Razor.Inter...
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: 20240819.1 - **Date Produced**: August 19, 2024 5:18:35 PM UTC - **Commit**: 7132545b5ef9cfe30512311811ee420b1f208971 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&targetVersion=GC7132545b5ef9cfe30512311811ee420b1f208971&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&targetVersion=GC0716b4331761db24b6c5f2f52e8bcd32b6bd065b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81)
…otnet-aspnetcore build 20240903.6 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.34-servicing.24417.1 -> To Version 6.0.35-servicing.24453.6
…otnet-aspnetcore build 20240904.6 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.35-servicing.24453.6 -> To Version 6.0.35-servicing.24454.6
…otnet-runtime build 20240905.11 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.0 -> To Version 6.0.1
…otnet-runtime build 20240909.5 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.1 -> To Version 6.0.1
…no risk of overlap
…otnet-runtime build 20240909.14 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.1 -> To Version 6.0.1
…otnet-runtime build 20240909.18 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.1 -> To Version 6.0.1
#43104 ---- #### AI description (iteration 1) #### PR Classification Code cleanup and script updates. #### PR Summary This pull request updates and cleans up various post-build scripts and configurations. - Added `nuget-verification.ps1` to verify Microsoft NuGet packages. - Removed `post-build-utils.ps1`, `trigger-subscriptions.ps1`, and `add-build-to-channel.ps1`. - Updated `publish-build-assets.yml` and `setup-maestro-vars.yml` to use `AzureCLI@2` instead of `PowerShell@2`. - Updated dependencies in `Version.Details.xml`.
…there's no risk of overlap" This reverts commit 2993393.
…irst run message." This reverts commit 13c140c.
…nvironment Try to fix an ubuntu test that has the full path rather than just partial
…hing fails but don't error our code refactor the caching code slightly for simplicity
…merge/release/8.0.3xx-to-release/8.0.4xx
…0241119.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24568.2 -> To Version 9.0.0-beta.24569.2
…ld 20241120.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24568.1 -> To Version 1.1.0-rtm.24570.1
…ld 20241120.2 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rtm.24568.1 -> To Version 1.1.0-rtm.24570.2
# Detects pre-compressed assets Detects assets that have been pre-compressed by an external tool to avoid conflicts when we compress our own assets, and they end up on the same path as the existing pre-compressed assets. ## Description We have received feedback that some customers are facing issues upgrading as they are consuming packages that contain pre-compressed assets or are using third-party tools (like webpack) that produce pre-compressed versions of those assets. Our recommendation in these cases is to let the framework handle the compression, as it further optimizes the delivery of those assets. However, this requires changes on their project to disable the compression on the third-party tools / exclude the pre compressed assets or to disable the compression that is done by the framework (a one-line MSBuild change). We, however, recognize that this cause friction during the upgrade process and want to improve the situation by following the most common convention, which is, detecting compressed versions of an asset that live side-by-side with it. (Same path with an extra .gz or .br for the compressed versions) This change detects such scenarios and starts treating the assets in the same way as if they were defined by the framework. Fixes dotnet/aspnetcore#57518 ## Customer Impact Customers with pre compressed files in their web content are forced to either remove those assets from the build or disable compression when they upgrade, as otherwise the build breaks. ## Regression? - [ ] Yes - [X] No It's not a regression because this is a new feature, but it impacts the upgrade flow in this particular scenario. ## Risk - [ ] High - [ ] Medium - [X] Low There is a flag that can be used to turn off compression on the framework, which will prevent any compression related code from running. The new added logic should no-op in most common cases and only ever execute when we detect a pre-compressed asset that was not generated by the framework. ## Verification - [ ] Manual (required) - [X] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [X] N/A ---- ## When servicing release/2.1 - [ ] Make necessary changes in eng/PatchConfig.props
…merge/release/8.0.4xx-to-release/9.0.1xx
…120.6 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24558.5 -> To Version 4.12.0-3.24570.6
…1121.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.9-preview-24524-01 -> To Version 17.12.12-preview-24571-01
Co-authored-by: Adeel Mujahid <[email protected]> Co-authored-by: Daniel Plaisted <[email protected]>
…6.12.2.1 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.12.1-rc.1 -> To Version 6.12.2-rc.1
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
Request triage from a team member
labels
Nov 22, 2024
…122.7 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.12.0-3.24570.6 -> To Version 4.12.0-3.24572.7
…0241122.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24569.2 -> To Version 9.0.0-beta.24572.2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/9.0.1xx branch which have not been merged yet to release/9.0.2xx. I'm a robot and am configured to help you automatically keep release/9.0.2xx up to date, so I've opened this PR.
This PR merges commits made on release/9.0.1xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0.1xx-to-release/9.0.2xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.