Bump OctoKit to 10.0.0

This is a special rollout to address dotnet/dnceng#2065
premun · Feb 23, 2024 · d2fb299 · d2fb299
1 parent f05b409
commit d2fb299
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 76 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -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" />
@@ -138,4 +138,4 @@
     <PackageVersion Include="Verify.NUnit" Version="19.6" />
     <PackageVersion Include="YamlDotNet" Version="13.7.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -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>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,30 +15,30 @@
     <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>
-    <MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24105.2</MicrosoftDncEngSecretManagerVersion>
-    <MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24105.2</MicrosoftDncEngConfigurationBootstrapVersion>
+    <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>
   <!--Package names-->
   <PropertyGroup>

diff --git a/src/Maestro/Maestro.Web/Controllers/WebHooksController.cs b/src/Maestro/Maestro.Web/Controllers/WebHooksController.cs
@@ -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);
         }
 

diff --git a/src/Maestro/Microsoft.DotNet.Maestro.Tasks/Microsoft.DotNet.Maestro.Tasks.csproj b/src/Maestro/Microsoft.DotNet.Maestro.Tasks/Microsoft.DotNet.Maestro.Tasks.csproj
@@ -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>