Skip to content

Merging internal commits for release/10.0.4xx - #8242

Merged
mthalman merged 37 commits into
release/10.0.4xxfrom
internal-merge-10.0.4xx-2026-08-11-1925
Aug 12, 2026
Merged

Merging internal commits for release/10.0.4xx#8242
mthalman merged 37 commits into
release/10.0.4xxfrom
internal-merge-10.0.4xx-2026-08-11-1925

Conversation

@dotnet-bot

Copy link
Copy Markdown
Collaborator

No description provided.

dnceng-build-rw-code-rw-wif and others added 30 commits July 13, 2026 20:38
…lusions

This PR was created by the `CreateBaselineUpdatePR` tool for build 3019458. 

The updated test results can be found at https://dev.azure.com/dnceng/internal/_build/results?buildId=3019458 (internal Microsoft link)
…r August servicing (10.0.3xx)

Strip user name and password from repository URLs. MSRC 117093

See https://dev.azure.com/dnceng/internal/_git/dotnet-sourcelink/pullrequest/61433 and https://dev.azure.com/dnceng/internal/_git/dotnet-sourcelink/pullrequest/62608

----
#### AI description  (iteration 1)
#### PR Classification
Security enhancement to strip user credentials from repository URLs to prevent leaking sensitive information in build artifacts.

#### PR Summary
This PR removes username and password information from repository URLs before embedding them in build outputs, addressing a security concern where credentials could be exposed. The changes primarily affect Azure Repos Git SSH URL parsing and normalization logic.

- `GitOperations.cs`: Modified `NormalizeUrl` method to strip user info from URLs and use "git" as placeholder username for SSH URLs
- `AzureDevOpsUrlParser.cs`: Updated `TryParseHostedSsh` to detect and reject v1/v2 SSH URL formats that rely on username for account identification
- `TranslateRepositoryUrls.cs`: Added error handling to throw `NotSupportedException` for unsupported SSH URL formats
- Test files updated to reflect new URL format expectations, replacing user-specific credentials with standardized "git" username in SSH URLs
- Added localized error message resource for unsupported remote URL format warnings
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…r August servicing (10.0.4xx)

Strip user name and password from repository URLs. MSRC 117093

See https://dev.azure.com/dnceng/internal/_git/dotnet-sourcelink/pullrequest/61433 and https://dev.azure.com/dnceng/internal/_git/dotnet-sourcelink/pullrequest/62608

----
#### AI description  (iteration 1)
#### PR Classification
Security enhancement to strip user credentials from repository URLs to prevent leaking sensitive information in build artifacts.

#### PR Summary
This PR removes username and password information from repository URLs before embedding them in build outputs, addressing a security concern where credentials could be exposed. The changes primarily affect Azure Repos Git SSH URL parsing and normalization logic.

- `GitOperations.cs`: Modified `NormalizeUrl` method to strip user info from URLs and use "git" as placeholder username for SSH URLs
- `AzureDevOpsUrlParser.cs`: Updated `TryParseHostedSsh` to detect and reject v1/v2 SSH URL formats that rely on username for account identification
- `TranslateRepositoryUrls.cs`: Added error handling to throw `NotSupportedException` for unsupported SSH URL formats
- Test files updated to reflect new URL format expectations, replacing user-specific credentials with standardized "git" username in SSH URLs
- Added localized error message resource for unsupported remote URL format warnings
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->


Cherry picked from !62612

Cherry-picked from commit `65e6737a`.
Fix warning

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup to remove an unreachable return statement that was causing a compiler warning.

#### PR Summary
This pull request removes a dead code line in the Azure DevOps URL parser that was unreachable and generating a warning.

- `AzureDevOpsUrlParser.cs`: Removed unreachable `return account.Length > 0;` statement in SSH URL parsing logic
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-dotnet build 20260723.16

On relative base path root
Microsoft.DotNet.Build.Manifest , Microsoft.DotNet.SignCheckTask From Version 10.0.0-beta.26329.109 -> To Version 10.0.0-beta.26373.116
Microsoft.NET.Sdk From Version 10.0.110-servicing.26326.116 -> To Version 10.0.111-servicing.26373.116
Microsoft.NETCore.App.Ref From Version 10.0.10 -> To Version 10.0.11
Microsoft.NETCore.Platforms From Version 10.0.10-servicing.26326.116 -> To Version 10.0.11-servicing.26373.116

On relative base path src/roslyn
System.CommandLine From Version 3.0.0-preview.6.26324.102 -> To Version 2.0.11

On relative base path src/scenario-tests
System.CommandLine From Version 2.0.10 -> To Version 2.0.11

On relative base path src/sdk
dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.HostModel , Microsoft.NET.Sdk.WindowsDesktop , Microsoft.NETCore.Platforms , Microsoft.WindowsDesktop.App.Internal From Version 10.0.10-servicing.26326.116 -> To Version 10.0.11-servicing.26373.116
Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Authentication.Facebook , Microsoft.AspNetCore.Authentication.Google , Microsoft.AspNetCore.Authentication.MicrosoftAccount , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Forms , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.Components.WebAssembly , Microsoft.AspNetCore.Components.WebAssembly.Server , Microsoft.AspNetCore.Components.WebView , Microsoft.AspNetCore.Metadata , Microsoft.AspNetCore.TestHost , Microsoft.Bcl.AsyncInterfaces , Microsoft.DotNet.Web.ItemTemplates.10.0 , Microsoft.DotNet.Web.ProjectTemplates.10.0 , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , Microsoft.NET.ILLink.Tasks , Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.Win32.SystemEvents , Microsoft.WindowsDesktop.App.Ref , System.CodeDom , System.ComponentModel.Composition , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Formats.Asn1 , System.IO.Hashing , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions From Version 10.0.10 -> To Version 10.0.11
Microsoft.DiaSymReader From Version 2.2.10 -> To Version 2.2.11
Microsoft.McpServer.ProjectTemplates.10.0 From Version 10.0.9 -> To Version 10.0.11
Microsoft.Web.Xdt From Version 3.2.10 -> To Version 3.2.11
System.CommandLine From Version 2.0.10 -> To Version 2.0.11

On relative base path src/sourcelink
System.CommandLine From Version 2.0.10 -> To Version 2.0.11
System.IO.Hashing , System.Security.Cryptography.Xml , System.Text.Json From Version 10.0.10 -> To Version 10.0.11

On relative base path src/templating
System.CommandLine From Version 2.0.10 -> To Version 2.0.11
… dnceng/internal/dotnet-dotnet

This pull request updates the following dependencies

[marker]: <> (Begin:3c7ef185-47c7-4a87-a19e-e54d41205a14)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet
- **Subscription**: [3c7ef185-47c7-4a87-a19e-e54d41205a14](https://maestro.dot.net/subscriptions?search=3c7ef185-47c7-4a87-a19e-e54d41205a14)
- **Build**: [20260723.16](https://dev.azure.com/dnceng/internal/_build/results?buildId=3030163) ([324376](https://maestro.dot.net/channel/5178/azdo:dnceng:internal:dotnet-dotnet/build/324376))
- **Date Produced**: July 24, 2026 8:26:10 PM UTC
- **Commit**: [e2f47b0](https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet?_a=history&version=GCe2f47b0110ed922f21a1522da67279133ce28f32)
- **Branch**: [refs/heads/internal/release/10.0.1xx](https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet?version=GBrefs/heads/internal/release/10.0.1xx)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - 📂 `root`
    - From [10.0.0-beta.26329.109 to 10.0.0-beta.26373.116][1]
       - Microsoft.DotNet.Build.Manifest
       - Microsoft.DotNet.SignCheckTask
    - From [10.0.110-servicing.26326.116 to 10.0.111-servicing.26373.116][2]
       - Microsoft.NET.Sdk
    - From [10.0.10 to 10.0.11][2]
       - Microsoft.NETCore.App.Ref
    - From [10.0.10-servicing.26326.116 to 10.0.11-servicing.26373.116][2]
       - Microsoft.NETCore.Platforms
  - 📂 `src/roslyn`
    - From [3.0.0-preview.6.26324.102 to 2.0.11][3]
       - System.CommandLine
  - 📂 `src/scenario-tests`
    - From [2.0.10 to 2.0.11][2]
       - System.CommandLine
  - 📂 `src/sdk`
    - From [10.0.10-servicing.26326.116 to 10.0.11-servicing.26373.116][2]
       - dotnet-dev-certs
       - dotnet-user-jwts
       - dotnet-user-secrets
       - Microsoft.AspNetCore.Analyzers
       - Microsoft.AspNetCore.App.Ref.Internal
       - Microsoft.AspNetCore.Components.SdkAnalyzers
       - Microsoft.AspNetCore.DeveloperCertificates.XPlat
       - Microsoft.AspNetCore.Mvc.Analyzers
       - Microsoft.AspNetCore.Mvc.Api.Analyzers
       - Microsoft.Dotnet.WinForms.ProjectTemplates
       - Microsoft.DotNet.Wpf.ProjectTemplates
       - Microsoft.NET.HostModel
       - Microsoft.NET.Sdk.WindowsDesktop
       - Microsoft.NETCore.Platforms
       - Microsoft.WindowsDesktop.App.Internal
    - From [10.0.10 to 10.0.11][2]
       - Microsoft.AspNetCore.App.Ref
       - Microsoft.AspNetCore.Authentication.Facebook
       - Microsoft.AspNetCore.Authentication.Google
       - Microsoft.AspNetCore.Authentication.MicrosoftAccount
       - Microsoft.AspNetCore.Authorization
       - Microsoft.AspNetCore.Components
       - Microsoft.AspNetCore.Components.Analyzers
       - Microsoft.AspNetCore.Components.Forms
       - Microsoft.AspNetCore.Components.Web
       - Microsoft.AspNetCore.Components.WebAssembly
       - Microsoft.AspNetCore.Components.WebAssembly.Server
       - Microsoft.AspNetCore.Components.WebView
       - Microsoft.AspNetCore.Metadata
       - Microsoft...
This was referenced Sep 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants