From 2a72abaea8360840f73a7872827da1ca5f702c74 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Sat, 18 Jul 2026 23:49:33 -0700 Subject: [PATCH 1/4] Sync SourceBrowser package version bumps Pull the version updates from tannergooding/SourceBrowser (through ed359a6): bump Basic.CompilerLog.Util, MSBuild.StructuredLogger, NuGet.Frameworks, and System.Reflection.Metadata, and swap BinLogToSln's System.Reflection.Metadata reference for Microsoft.CodeAnalysis. StructuredLogger has to move in lockstep since Basic.CompilerLog.Util 0.9.47 requires >= 2.3.204, and System.Collections.Immutable likewise moves to 10.0.9 to satisfy System.Reflection.Metadata 10.0.9 under transitive pinning. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/SourceBrowser.hash | Bin 86 -> 86 bytes .../src/BinLogToSln/BinLogToSln.csproj | 2 +- src/SourceBrowser/src/Directory.Packages.props | 10 +++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBrowser.hash b/src/SourceBrowser.hash index 5c0036ed175c40e30e135c5e2f6fc0a1287f69aa..12e3de4f07bec6f6d9afe621045f1fd06e589090 100644 GIT binary patch literal 86 zcmW-Y!3}^g377r9qw& Q)wb)zDtC>~&J<=Qeu!8MdH?_b literal 86 zcmW;ETMB?M3KK8!?b&x=EE(v*`$;KesGo8S$lRmg9TvnsH$(-iE S)alpI$rPQ{yW*eD%EAYZZVgBP diff --git a/src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj b/src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj index 9266e02..5320d9c 100644 --- a/src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj +++ b/src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj @@ -12,9 +12,9 @@ + - diff --git a/src/SourceBrowser/src/Directory.Packages.props b/src/SourceBrowser/src/Directory.Packages.props index 3f0123a..578149f 100644 --- a/src/SourceBrowser/src/Directory.Packages.props +++ b/src/SourceBrowser/src/Directory.Packages.props @@ -41,9 +41,9 @@ - + - + @@ -66,7 +66,7 @@ - + @@ -78,9 +78,9 @@ - + - + From 7c6afc131f640823fca68e2d0352796d96773af5 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Sun, 19 Jul 2026 00:29:38 -0700 Subject: [PATCH 2/4] Update remaining SourceBrowser dependencies to latest Bump every outstanding PackageVersion entry under src/SourceBrowser to its latest stable (Roslyn 5.6.0 and StructuredLogger 2.3.213 were already current). Azure.Storage.Blobs 12.29.1 dropped the default-valued GetBlobs/GetBlobsByHierarchy overloads, so pass traits/states (and the remaining args) explicitly at the three call sites. Validated: full SourceBrowser build + 227 tests and the root solution build all pass. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../DownloadStage1Index.cs | 2 +- .../src/Directory.Packages.props | 54 +++++++++---------- .../Models/AzureBlobFileSystem.cs | 2 +- src/UploadIndexStage1/Program.cs | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs b/src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs index 6336c37..842f962 100644 --- a/src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs +++ b/src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs @@ -84,7 +84,7 @@ private void ExecuteCore() Pageable blobs; try { - blobs = containerClient.GetBlobs(prefix: RepoName + "/"); + blobs = containerClient.GetBlobs(traits: BlobTraits.None, states: BlobStates.None, prefix: RepoName + "/", cancellationToken: default); } catch (AuthenticationFailedException e) { diff --git a/src/SourceBrowser/src/Directory.Packages.props b/src/SourceBrowser/src/Directory.Packages.props index 578149f..5a9589f 100644 --- a/src/SourceBrowser/src/Directory.Packages.props +++ b/src/SourceBrowser/src/Directory.Packages.props @@ -7,10 +7,10 @@ - - - - + + + + @@ -28,13 +28,13 @@ - - - - - - - + + + + + + + @@ -45,7 +45,7 @@ - + @@ -55,32 +55,32 @@ - + - + - + - - - - - - - - - + + + + + + + + + - - + + - + diff --git a/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs b/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs index 9e10b4b..4c6714a 100644 --- a/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs +++ b/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs @@ -41,7 +41,7 @@ public IEnumerable ListFiles(string dirName) dirName += "/"; } - return container.GetBlobsByHierarchy(prefix: dirName) + return container.GetBlobsByHierarchy(traits: BlobTraits.None, states: BlobStates.None, delimiter: null, prefix: dirName) .Where(item => item.IsBlob) .Select(item => item.Blob.Name) .ToList(); diff --git a/src/UploadIndexStage1/Program.cs b/src/UploadIndexStage1/Program.cs index 3b3d82a..e658dc3 100644 --- a/src/UploadIndexStage1/Program.cs +++ b/src/UploadIndexStage1/Program.cs @@ -142,7 +142,7 @@ void AddFolder(string path) } Console.WriteLine("Cleaning up old blobs"); - List blobs = containerClient.GetBlobs(prefix: repoName + "/").ToList(); + List blobs = containerClient.GetBlobs(traits: BlobTraits.None, states: BlobStates.None, prefix: repoName + "/", cancellationToken: default).ToList(); List toDelete = blobs.OrderByDescending(b => b.Name).Skip(10).ToList(); foreach (BlobItem d in toDelete) { From e0a443854d895a9c3c8e6e016e3efaf5c56dcf0a Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Sun, 19 Jul 2026 00:40:50 -0700 Subject: [PATCH 3/4] Prune redundant compat-shim package references HtmlGenerator (net10.0) directly referenced a set of framework-provided compat shims that NuGet flags with NU1510. Drop those references, and remove the seven PackageVersion entries no other project uses. System.Collections.Immutable, System.Reflection.Metadata, and System.Text.Json keep their PackageVersion entries: the net472 Microsoft.SourceIndexer.Tasks project pins them (directly or transitively) through the imported props. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/SourceBrowser/src/Directory.Packages.props | 7 ------- .../src/HtmlGenerator/HtmlGenerator.csproj | 10 ---------- 2 files changed, 17 deletions(-) diff --git a/src/SourceBrowser/src/Directory.Packages.props b/src/SourceBrowser/src/Directory.Packages.props index 5a9589f..b641170 100644 --- a/src/SourceBrowser/src/Directory.Packages.props +++ b/src/SourceBrowser/src/Directory.Packages.props @@ -46,12 +46,7 @@ - - - - - @@ -67,10 +62,8 @@ - - diff --git a/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj b/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj index 70aa8f6..7bafcba 100644 --- a/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj +++ b/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj @@ -43,18 +43,8 @@ - - - - - - - - - - From b66bc0ffca84b53c76421073dbbcee89a885a443 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Sun, 19 Jul 2026 06:50:26 -0700 Subject: [PATCH 4/4] Use ManagedIdentityId over the obsolete string constructor Azure.Identity 1.21.0 deprecates ManagedIdentityCredential(string); pass ManagedIdentityId.FromUserAssignedClientId(clientId) at the three call sites instead. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs | 2 +- .../src/SourceIndexServer/Models/AzureBlobFileSystem.cs | 2 +- src/UploadIndexStage1/Program.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs b/src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs index 842f962..81df9c6 100644 --- a/src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs +++ b/src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs @@ -73,7 +73,7 @@ private void ExecuteCore() } else { - credential = new ManagedIdentityCredential(ClientId); + credential = new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(ClientId)); } BlobServiceClient blobServiceClient = new( diff --git a/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs b/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs index 4c6714a..b4107bc 100644 --- a/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs +++ b/src/SourceBrowser/src/SourceIndexServer/Models/AzureBlobFileSystem.cs @@ -21,7 +21,7 @@ public AzureBlobFileSystem(string uri) var clientId = Environment.GetEnvironmentVariable("AZURE_CLIENT_ID"); credential = string.IsNullOrEmpty(clientId) ? new AzureCliCredential() - : new ManagedIdentityCredential(clientId); + : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(clientId)); container = new BlobContainerClient(new Uri(uri), credential); diff --git a/src/UploadIndexStage1/Program.cs b/src/UploadIndexStage1/Program.cs index e658dc3..f091284 100644 --- a/src/UploadIndexStage1/Program.cs +++ b/src/UploadIndexStage1/Program.cs @@ -84,7 +84,7 @@ static async Task Main(string[] args) else { System.Console.WriteLine("Trying to use ManagedIdentityCredential with ClientID"); - credential = new ManagedIdentityCredential(clientId); + credential = new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(clientId)); } BlobServiceClient blobServiceClient = new(