Merging internal commits for release/8.0.4xx #49700
Merged
Conversation
This file contains hidden or 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
…otnet-runtime build 20250611.17 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.17-servicing.25266.2 -> To Version 8.0.18-servicing.25311.17 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.17 -> To Version 8.0.18 (parent: Microsoft.NETCore.App.Runtime.win-x64
…otnet-aspnetcore build 20250611.13 dotnet-dev-certs , dotnet-user-jwts , 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.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.17-servicing.25266.9 -> To Version 8.0.18-servicing.25311.13
…otnet-windowsdesktop build 20250611.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.17 -> To Version 8.0.18
…3 repositories 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.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.17 to 8.0.18 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [82bc8158-ef88-4a27-3f7b-08dca299e604](https://maestro.dot.net/subscriptions?search=82bc8158-ef88-4a27-3f7b-08dca299e604) - **Build**: [20250611.17](https://dev.azure.com/dnceng/internal/_build/results?buildId=2728343) - **Date Produced**: June 12, 2025 10:51:57 AM UTC - **Commit**: [ef853a71052646a42abf17e888ec6d9a69614ad9](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCef853a71052646a42abf17e888ec6d9a69614ad9) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 8.0.17-servicing.25266.2 to 8.0.18-servicing.25311.17][1] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.17 to 8.0.18][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.17 to 8.0.18][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.17 to 8.0.18][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.17 to 8.0.18][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.17 to 8.0.18][1] - **Microsoft.NETCore.Platforms**: [from 8.0.17-servicing.25266.2 to 8.0.18-servicing.25311.17][1] - **System.Text.Json**: [from 8.0.5 to 8.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.17-servicing.25266.2 to 8.0.18-servicing.25311.17][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.17-servicing.25266.2 to 8.0.18-servicing.25311.17][1] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.17 to 8.0.18][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC77545d6fd5ca79bc08198fd6d8037c14843f14ad&targetVersion=GCef853a71052646a42abf17e888ec6d9a69614ad9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&targetVersion=GCef853a71052646a42abf17e888ec6d9a69614ad9&_a=files [3]: dotnet/emsdk@2b0cca8...976b101 [DependencyUpdate]: <> (End) [marker]: <> (End:82bc8158-ef88-4a27-3f7b-08dca299e604) [marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subs...
…otnet-windowsdesktop build 20250613.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.17-servicing.25266.9 -> To Version 8.0.18-servicing.25313.2 (parent: Microsoft.WindowsDesktop.App.Ref
…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 8.0.17-servicing.25266.9 to 8.0.18-servicing.25313.2 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:11ffd28b-eb51-469a-d3fb-08dca292067e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: [11ffd28b-eb51-469a-d3fb-08dca292067e](https://maestro.dot.net/subscriptions?search=11ffd28b-eb51-469a-d3fb-08dca292067e) - **Build**: [20250613.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2729588) - **Date Produced**: June 13, 2025 1:26:11 PM UTC - **Commit**: [0bec0d55c9b799a612a838e8887d710bbeed487b](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GC0bec0d55c9b799a612a838e8887d710bbeed487b) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.18 to 8.0.18][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.18 to 8.0.18][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.18-servicing.25311.3 to 8.0.18-servicing.25313.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.18-servicing.25311.3 to 8.0.18-servicing.25313.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25313.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCa6f159eb263aa0b45be92800081f53cac9684dd2&targetVersion=GC0bec0d55c9b799a612a838e8887d710bbeed487b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC3385cf1d42f4e488140452369a247a4a16183ce4&targetVersion=GCc8ef90c1fc2ee2778b82b40148c04cd4880e0c35&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:11ffd28b-eb51-469a-d3fb-08dca292067e)
#### AI description (iteration 1) #### PR Classification This pull request is a branch merge incorporating release/8.0.4xx changes into the internal release branch, focusing on code cleanup and dependency updates. #### PR Summary The merge deprecates numerous obsolete build scripts and configuration files while updating dependency versions and related tooling configurations. - `src/arcade/eng/common`: Removed various PowerShell, shell, and configuration scripts no longer in use. - `Layout/redist/trustedroots/timestampctl.pem`: Added a new certificate block. - `eng/Version.Details.xml` and `eng/Versions.props`: Bumped dependency versions for Arcade, Helix, SignTool, dotnet-format, and templating assets. - `global.json` and `NuGet.config`: Updated MSBuild-SDKs, .NET tool versions, and added new package sources. - `Tests/trustedroots.Tests`: Updated inline certificate fingerprint entries for code signing and timestamping tests. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-windowsdesktop build 20250617.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.18-servicing.25313.2 -> To Version 8.0.18-servicing.25317.3 (parent: Microsoft.WindowsDesktop.App.Ref
…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 8.0.18-servicing.25313.2 to 8.0.18-servicing.25317.3 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:11ffd28b-eb51-469a-d3fb-08dca292067e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: [11ffd28b-eb51-469a-d3fb-08dca292067e](https://maestro.dot.net/subscriptions?search=11ffd28b-eb51-469a-d3fb-08dca292067e) - **Build**: [20250617.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2732253) - **Date Produced**: June 17, 2025 6:54:17 PM UTC - **Commit**: [c4a3ad74410330b2a4004886916f56253d88fd1d](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GCc4a3ad74410330b2a4004886916f56253d88fd1d) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.18 to 8.0.18][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.18 to 8.0.18][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.18-servicing.25313.2 to 8.0.18-servicing.25317.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.18-servicing.25313.2 to 8.0.18-servicing.25317.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.18-servicing.25313.2 to 8.0.18-servicing.25317.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0bec0d55c9b799a612a838e8887d710bbeed487b&targetVersion=GCc4a3ad74410330b2a4004886916f56253d88fd1d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCc8ef90c1fc2ee2778b82b40148c04cd4880e0c35&targetVersion=GC480ddbb714f16a09b74e75cff57e1da769e9d82d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:11ffd28b-eb51-469a-d3fb-08dca292067e)
…otnet-aspnetcore build 20250617.6 dotnet-dev-certs , dotnet-user-jwts , 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.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.18-servicing.25311.13 -> To Version 8.0.18-servicing.25317.6
…marcpop/merge804xx
#### AI description (iteration 1) #### PR Classification This pull request merges public changes into the internal branch by updating dependency references and version information. #### PR Summary The changes update project configuration and dependency versions for consistency across internal builds. - `src/Layout/tool_fsharp/tool_fsc.csproj`: Updated Microsoft.Build packages to include explicit version overrides and added a new reference for Microsoft.NET.StringTools. - `eng/Version.Details.xml`: Bumped the version and updated the SHA for the Microsoft.SourceBuild.Intermediate.source-build-reference-packages dependency. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: [1ab2aba6-b648-40a9-9fe8-08dca2920c50](https://maestro.dot.net/subscriptions?search=1ab2aba6-b648-40a9-9fe8-08dca2920c50) - **Build**: [20250617.6](https://dev.azure.com/dnceng/internal/_build/results?buildId=2732261) - **Date Produced**: June 17, 2025 8:38:34 PM UTC - **Commit**: [cea5fa610dba4e0c024727f4c528a66018b820a3](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GCcea5fa610dba4e0c024727f4c528a66018b820a3) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **dotnet-user-jwts**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **dotnet-user-secrets**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.18 to 8.0.18][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.18 to 8.0.18][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.18 to 8.0.18][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.18 to 8.0.18][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.18 to 8.0.18][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.18 to 8.0.18][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.18 to 8.0.18][1] - **Microsoft.JSInterop**: [from 8.0.18 to 8.0.18][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1988c37e68bc83b1a0d3d230276a1ae8f89da38b&targetVersion=GCcea5fa610dba4e0c024727f4c528a66018b820a3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1ab2aba6-b648-40a9-9fe8-08dca2920c50)
…0.6 dependency which will... Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will break in VS tasks ---- #### AI description (iteration 1) #### PR Classification This pull request reintroduces dependency version pinning for System.Text.Json to ensure compatibility with ComponentModel's 8.0.6 dependency. #### PR Summary The changes add a new pinned version property and update multiple project files to explicitly reference the pinned System.Text.Json version. This ensures consistency with Microsoft.Extensions.DependencyModel and avoids conflicts with the version unified by MSBuild in VS 17.10. - `eng/Versions.props`: Added `<PinnedSystemTextJsonPackageVersion>` with value 8.0.5 and an explanatory comment. - `src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj`: Updated the System.Text.Json PackageReference to use the pinned version. - `src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj`: Modified the System.Text.Json PackageReference with the VersionOverride attribute. - `src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj`: Updated the System.Text.Json PackageReference to include the VersionOverride. - `src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj`: Applied the VersionOverride to the System.Text.Json PackageReference. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…-merge-8.0.4xx-2025-07-08-1431
nagilson
approved these changes
Jul 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.