Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Microsoft.SourceIndexer.Tasks/DownloadStage1Index.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private void ExecuteCore()
}
else
{
credential = new ManagedIdentityCredential(ClientId);
credential = new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(ClientId));
}

BlobServiceClient blobServiceClient = new(
Expand All @@ -84,7 +84,7 @@ private void ExecuteCore()
Pageable<BlobItem> blobs;
try
{
blobs = containerClient.GetBlobs(prefix: RepoName + "/");
blobs = containerClient.GetBlobs(traits: BlobTraits.None, states: BlobStates.None, prefix: RepoName + "/", cancellationToken: default);
}
catch (AuthenticationFailedException e)
{
Expand Down
Binary file modified src/SourceBrowser.hash
Binary file not shown.
2 changes: 1 addition & 1 deletion src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<ItemGroup>
<PackageReference Include="Basic.CompilerLog.Util" />
<PackageReference Include="LibGit2Sharp" />
<PackageReference Include="Microsoft.CodeAnalysis" />
<PackageReference Include="Mono.Options" />
<PackageReference Include="NuGet.Frameworks" />
<PackageReference Include="System.Reflection.Metadata" />
</ItemGroup>

<ItemGroup>
Expand Down
63 changes: 28 additions & 35 deletions src/SourceBrowser/src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

<ItemGroup>
<!-- msbuild-->
<PackageVersion Include="Microsoft.Build.Framework" Version="18.7.1" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.7.1" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.7.1" />
<PackageVersion Include="Microsoft.Build" Version="18.7.1" />
<PackageVersion Include="Microsoft.Build.Framework" Version="18.8.2" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.8.2" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.8.2" />
<PackageVersion Include="Microsoft.Build" Version="18.8.2" />

<!-- roslyn -->
<PackageVersion Include="Microsoft.CodeAnalysis" Version="5.6.0" />
Expand All @@ -28,59 +28,52 @@
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.6.0" />

<!-- test dependencies -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
<PackageVersion Include="Selenium.WebDriver" Version="3.14.0" />
<PackageVersion Include="coverlet.collector" Version="1.2.0" />
<PackageVersion Include="nunit" Version="3.12.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.3.2" />
<PackageVersion Include="MSTest.TestFramework" Version="4.3.2" />
<PackageVersion Include="Selenium.WebDriver" Version="4.46.0" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="nunit" Version="4.6.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Shouldly" Version="4.3.0" />

<!-- other dependencies -->
<PackageVersion Include="Basic.CompilerLog.Util" Version="0.9.19" />
<PackageVersion Include="Basic.CompilerLog.Util" Version="0.9.47" />
<PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.3.113" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.3.213" />
<PackageVersion Include="ManagedEsent" Version="2.0.0" />
<PackageVersion Include="System.Composition" Version="10.0.7" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageVersion Include="System.Composition" Version="10.0.10" />

<PackageVersion Include="System.Buffers" Version="4.6.1" />
<PackageVersion Include="System.Memory" Version="4.6.3" />
<PackageVersion Include="System.Numerics.Vectors" Version="4.6.1" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
<PackageVersion Include="System.ValueTuple" Version="4.6.2" />

<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.2" />
<PackageVersion Include="Microsoft.NET.StringTools" Version="18.7.1" />
<PackageVersion Include="Microsoft.NET.StringTools" Version="18.8.2" />
<PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="17.14.249" />
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.301" />

<PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.93" />
<PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.119" />

<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="10.0.7" />
<PackageVersion Include="System.Resources.Extensions" Version="10.0.7" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.7" />
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.7" />
<PackageVersion Include="System.Text.Json" Version="10.0.7" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.7" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="10.0.7" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="10.0.10" />
<PackageVersion Include="System.Resources.Extensions" Version="10.0.10" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.10" />
<PackageVersion Include="System.Text.Json" Version="10.0.10" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.10" />
</ItemGroup>

<!-- dependencies for dotnet/source-browser projects -->
<ItemGroup>
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.1" />
<PackageVersion Include="Azure.Identity" Version="1.21.0" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.29.1" />
<PackageVersion Include="Mono.Options" Version="6.12.0.148" />
<PackageVersion Include="NuGet.Frameworks" Version="6.13.1" />
<PackageVersion Include="NuGet.Frameworks" Version="7.6.0" />
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.7" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.10" />
</ItemGroup>

</Project>
10 changes: 0 additions & 10 deletions src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,8 @@
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="Microsoft.NET.StringTools" ExcludeAssets="runtime" />
<PackageReference Include="System.Buffers" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.Numerics.Vectors" />
<PackageReference Include="System.Reflection.Metadata" />
<PackageReference Include="System.Resources.Extensions" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.Threading.Tasks.Dataflow" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
<PackageReference Include="System.ValueTuple" />

<PackageReference Include="Microsoft.CodeAnalysis" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -41,7 +41,7 @@ public IEnumerable<string> 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();
Expand Down
4 changes: 2 additions & 2 deletions src/UploadIndexStage1/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -142,7 +142,7 @@ void AddFolder(string path)
}

Console.WriteLine("Cleaning up old blobs");
List<BlobItem> blobs = containerClient.GetBlobs(prefix: repoName + "/").ToList();
List<BlobItem> blobs = containerClient.GetBlobs(traits: BlobTraits.None, states: BlobStates.None, prefix: repoName + "/", cancellationToken: default).ToList();
List<BlobItem> toDelete = blobs.OrderByDescending(b => b.Name).Skip(10).ToList();
foreach (BlobItem d in toDelete)
{
Expand Down
Loading