Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/dnceng-shared (#3333)
Browse files Browse the repository at this point in the history
### Update dependencies from https://github.com/dotnet/dnceng-shared build 20240222.2

CoreHealthMonitor , Microsoft.AspNetCore.ApiPagination , Microsoft.AspNetCore.ApiVersioning , Microsoft.AspNetCore.ApiVersioning.Analyzers , Microsoft.AspNetCore.ApiVersioning.Swashbuckle , Microsoft.DncEng.CommandLineLib , Microsoft.DncEng.Configuration.Extensions , Microsoft.DotNet.Authentication.Algorithms , Microsoft.DotNet.GitHub.Authentication , Microsoft.DotNet.Internal.DependencyInjection , Microsoft.DotNet.Internal.DependencyInjection.Testing , Microsoft.DotNet.Internal.Health , Microsoft.DotNet.Internal.Logging , Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions , Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen , Microsoft.DotNet.Internal.Testing.Utility , Microsoft.DotNet.Kusto , Microsoft.DotNet.Metrics , Microsoft.DotNet.ServiceFabric.ServiceHost , Microsoft.DotNet.Services.Utility , Microsoft.DotNet.Web.Authentication , ServiceFabricMocks
 From Version 1.1.0-beta.24115.1 -> To Version 1.1.0-beta.24122.2

### [main] Bump us to Octokit v10.0.0
- see dotnet/dnceng#2065
- comment about Octokit.dll not being signed is no longer true (since v4.0.0)
  - still need to avoid signing Microsoft.DotNet.Maestro.Tasks.dll for other reasons

### Credits

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Doug Bunting <[email protected]>
  • Loading branch information
3 people authored Feb 23, 2024
1 parent d0a1879 commit ad1622f
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 74 deletions.
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<PackageVersion Include="NuGet.Protocol" Version="6.7.1" />
<PackageVersion Include="NUnit" Version="4.0.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="Octokit" Version="0.49.0" />
<PackageVersion Include="Octokit" Version="10.0.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
Expand All @@ -138,4 +138,4 @@
<PackageVersion Include="Verify.NUnit" Version="19.6" />
<PackageVersion Include="YamlDotNet" Version="13.7.1" />
</ItemGroup>
</Project>
</Project>
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.DotNet.Internal.Logging" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Internal.Logging" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.ApiPagination" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.AspNetCore.ApiPagination" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.ApiVersioning" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.AspNetCore.ApiVersioning" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Analyzers" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Analyzers" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DncEng.CommandLineLib" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DncEng.CommandLineLib" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Authentication.Algorithms" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Authentication.Algorithms" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.Health" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Internal.Health" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Metrics" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Metrics" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ServiceFabric.ServiceHost" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.ServiceFabric.ServiceHost" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Web.Authentication" Version="1.1.0-beta.24115.1">
<Dependency Name="Microsoft.DotNet.Web.Authentication" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="ServiceFabricMocks" Version="1.1.0-beta.24115.1">
<Dependency Name="ServiceFabricMocks" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
<Dependency Name="CoreHealthMonitor" Version="1.1.0-beta.24115.1">
<Dependency Name="CoreHealthMonitor" Version="1.1.0-beta.24122.2">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>df30e41e199097ea3a95191ce592e53cc2b62a1a</Sha>
<Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
44 changes: 22 additions & 22 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@
<MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.24113.2</MicrosoftDotNetGitIssueManagerVersion>
<MicrosoftDotNetVersionToolsVersion>8.0.0-beta.24113.2</MicrosoftDotNetVersionToolsVersion>
<MicrosoftNetTestSdkVersion>17.4.1</MicrosoftNetTestSdkVersion>
<MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.24115.1</MicrosoftDotNetInternalLoggingVersion>
<MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.24115.1</MicrosoftAspNetCoreApiPaginationVersion>
<MicrosoftAspNetCoreApiVersioningVersion>1.1.0-beta.24115.1</MicrosoftAspNetCoreApiVersioningVersion>
<MicrosoftAspNetCoreApiVersioningAnalyzersVersion>1.1.0-beta.24115.1</MicrosoftAspNetCoreApiVersioningAnalyzersVersion>
<MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>1.1.0-beta.24115.1</MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>
<MicrosoftDncEngCommandLineLibVersion>1.1.0-beta.24115.1</MicrosoftDncEngCommandLineLibVersion>
<MicrosoftDncEngConfigurationExtensionsVersion>1.1.0-beta.24115.1</MicrosoftDncEngConfigurationExtensionsVersion>
<MicrosoftDotNetAuthenticationAlgorithmsVersion>1.1.0-beta.24115.1</MicrosoftDotNetAuthenticationAlgorithmsVersion>
<MicrosoftDotNetGitHubAuthenticationVersion>1.1.0-beta.24115.1</MicrosoftDotNetGitHubAuthenticationVersion>
<MicrosoftDotNetInternalDependencyInjectionTestingVersion>1.1.0-beta.24115.1</MicrosoftDotNetInternalDependencyInjectionTestingVersion>
<MicrosoftDotNetInternalDependencyInjectionVersion>1.1.0-beta.24115.1</MicrosoftDotNetInternalDependencyInjectionVersion>
<MicrosoftDotNetInternalHealthVersion>1.1.0-beta.24115.1</MicrosoftDotNetInternalHealthVersion>
<MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>1.1.0-beta.24115.1</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>
<MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>1.1.0-beta.24115.1</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>
<MicrosoftDotNetInternalTestingUtilityVersion>1.1.0-beta.24115.1</MicrosoftDotNetInternalTestingUtilityVersion>
<MicrosoftDotNetKustoVersion>1.1.0-beta.24115.1</MicrosoftDotNetKustoVersion>
<MicrosoftDotNetMetricsVersion>1.1.0-beta.24115.1</MicrosoftDotNetMetricsVersion>
<MicrosoftDotNetServiceFabricServiceHostVersion>1.1.0-beta.24115.1</MicrosoftDotNetServiceFabricServiceHostVersion>
<MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.24115.1</MicrosoftDotNetServicesUtilityVersion>
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24115.1</MicrosoftDotNetWebAuthenticationVersion>
<ServiceFabricMocksVersion>1.1.0-beta.24115.1</ServiceFabricMocksVersion>
<CoreHealthMonitorVersion>1.1.0-beta.24115.1</CoreHealthMonitorVersion>
<MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalLoggingVersion>
<MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.24122.2</MicrosoftAspNetCoreApiPaginationVersion>
<MicrosoftAspNetCoreApiVersioningVersion>1.1.0-beta.24122.2</MicrosoftAspNetCoreApiVersioningVersion>
<MicrosoftAspNetCoreApiVersioningAnalyzersVersion>1.1.0-beta.24122.2</MicrosoftAspNetCoreApiVersioningAnalyzersVersion>
<MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>1.1.0-beta.24122.2</MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>
<MicrosoftDncEngCommandLineLibVersion>1.1.0-beta.24122.2</MicrosoftDncEngCommandLineLibVersion>
<MicrosoftDncEngConfigurationExtensionsVersion>1.1.0-beta.24122.2</MicrosoftDncEngConfigurationExtensionsVersion>
<MicrosoftDotNetAuthenticationAlgorithmsVersion>1.1.0-beta.24122.2</MicrosoftDotNetAuthenticationAlgorithmsVersion>
<MicrosoftDotNetGitHubAuthenticationVersion>1.1.0-beta.24122.2</MicrosoftDotNetGitHubAuthenticationVersion>
<MicrosoftDotNetInternalDependencyInjectionTestingVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalDependencyInjectionTestingVersion>
<MicrosoftDotNetInternalDependencyInjectionVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalDependencyInjectionVersion>
<MicrosoftDotNetInternalHealthVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalHealthVersion>
<MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>
<MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>
<MicrosoftDotNetInternalTestingUtilityVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalTestingUtilityVersion>
<MicrosoftDotNetKustoVersion>1.1.0-beta.24122.2</MicrosoftDotNetKustoVersion>
<MicrosoftDotNetMetricsVersion>1.1.0-beta.24122.2</MicrosoftDotNetMetricsVersion>
<MicrosoftDotNetServiceFabricServiceHostVersion>1.1.0-beta.24122.2</MicrosoftDotNetServiceFabricServiceHostVersion>
<MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.24122.2</MicrosoftDotNetServicesUtilityVersion>
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24122.2</MicrosoftDotNetWebAuthenticationVersion>
<ServiceFabricMocksVersion>1.1.0-beta.24122.2</ServiceFabricMocksVersion>
<CoreHealthMonitorVersion>1.1.0-beta.24122.2</CoreHealthMonitorVersion>
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24115.1</MicrosoftDncEngSecretManagerVersion>
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24115.1</MicrosoftDncEngConfigurationBootstrapVersion>
</PropertyGroup>
Expand Down
7 changes: 2 additions & 5 deletions src/Maestro/Maestro.Web/Controllers/WebHooksController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,10 @@ private static Task<IReadOnlyList<Repository>> GetAllInstallationRepositories(st
var pagination = new ApiPagination();
var uri = new Uri("installation/repositories", UriKind.Relative);

async Task<IApiResponse<List<Repository>>> GetInstallationRepositories(Uri u)
async Task<IApiResponse<List<Repository>>> GetInstallationRepositories(Uri requestUri)
{
IApiResponse<InstallationRepositoriesResponse> response =
await client.Connection.Get<InstallationRepositoriesResponse>(
u,
null,
AcceptHeaders.GitHubAppsPreview);
await client.Connection.Get<InstallationRepositoriesResponse>(requestUri, parameters: null);
return new ApiResponse<List<Repository>>(response.HttpResponse, response.Body.Repositories);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Description>This package include tasks involving Maestro++ and the Build Asset Registry.</Description>
<DevelopmentDependency>true</DevelopmentDependency>
<PackageType>MSBuildSdk</PackageType>
<!-- Octokit is not strong named yet (https://github.com/octokit/octokit.net/blob/master/docs/strong-naming.md) -->
<!-- Octokit used to be not strong named. It is now, we should remove this -->
<SignAssembly>false</SignAssembly>
<!-- Build Tasks should not include any dependencies -->
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
Expand Down

0 comments on commit ad1622f

Please sign in to comment.