Merge pull request #869 from microsoftgraph/dev

Merges dev into master
microsoftgraph · Oct 13, 2022 · 776074b · 776074b
2 parents 1878dd1 + a48faee
commit 776074b
Show file tree

Hide file tree

Showing 10 changed files with 16,886 additions and 27,872 deletions.
diff --git a/SamplesDashboard/SamplesDashboard/ClientApp/package-lock.json b/SamplesDashboard/SamplesDashboard/ClientApp/package-lock.json
diff --git a/SamplesDashboard/SamplesDashboard/ClientApp/package.json b/SamplesDashboard/SamplesDashboard/ClientApp/package.json
@@ -3,30 +3,30 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@azure/msal-browser": "^2.22.1",
-    "@azure/msal-react": "^1.3.1",
-    "@fluentui/react": "^8.63.1",
-    "@microsoft/microsoft-graph-client": "^3.0.2",
-    "bootstrap": "^5.1.3",
-    "react": "^17.0.2",
-    "react-bootstrap": "^2.2.2",
-    "react-dom": "^17.0.2",
-    "react-router-dom": "^5.3.0",
-    "typescript": "^4.6.3",
-    "web-vitals": "^2.1.4"
+    "@azure/msal-browser": "2.30.0",
+    "@azure/msal-react": "1.4.9",
+    "@fluentui/react": "8.98.0",
+    "@microsoft/microsoft-graph-client": "3.0.2",
+    "bootstrap": "5.2.2",
+    "react": "17.0.2",
+    "react-bootstrap": "2.5.0",
+    "react-dom": "17.0.2",
+    "react-router-dom": "5.3.4",
+    "typescript": "4.8.4",
+    "web-vitals": "3.0.3"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.3",
-    "@testing-library/react": "^12.1.4",
-    "@testing-library/user-event": "^14.0.4",
-    "@types/jest": "^27.4.1",
-    "@types/microsoft-graph": "^2.13.0",
-    "@types/node": "^17.0.23",
-    "@types/react": "^17.0.43",
-    "@types/react-dom": "^17.0.14",
-    "@types/react-router-dom": "^5.3.3",
-    "prettier": "^2.6.2",
-    "react-scripts": "4.0.3"
+    "@testing-library/jest-dom": "5.16.5",
+    "@testing-library/react": "12.1.5",
+    "@testing-library/user-event": "14.4.3",
+    "@types/jest": "29.1.2",
+    "@types/microsoft-graph": "2.24.0",
+    "@types/node": "18.8.4",
+    "@types/react": "17.0.50",
+    "@types/react-dom": "17.0.14",
+    "@types/react-router-dom": "5.3.3",
+    "prettier": "2.7.1",
+    "react-scripts": "5.0.1"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/SamplesDashboard/SamplesDashboard/ClientApp/src/App.tsx b/SamplesDashboard/SamplesDashboard/ClientApp/src/App.tsx
@@ -45,7 +45,7 @@ const darkTheme = createTheme({
 });
 
 type AppProps = {
-  pca: IPublicClientApplication;
+  pca?: IPublicClientApplication;
 };
 
 interface ThemedAppProps {
@@ -66,7 +66,7 @@ function ThemedApp({ children }: ThemedAppProps) {
 
 function App({ pca }: AppProps) {
   return (
-    <MsalProvider instance={pca}>
+    <MsalProvider instance={pca!}>
       <ProvideAppContext>
         <ThemedApp>
           <Router>

diff --git a/SamplesDashboard/SamplesDashboard/MessageHandlers/GitHubAuthHandler.cs b/SamplesDashboard/SamplesDashboard/MessageHandlers/GitHubAuthHandler.cs
@@ -34,6 +34,7 @@ CancellationToken cancellationToken
         {
             var token = await _gitHubAuthService.GetGitHubAppToken();
             requestMessage.Headers.Authorization = new AuthenticationHeaderValue("bearer", token);
+            requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github.hawkgirl-preview+json"));            
             return await base.SendAsync(requestMessage, cancellationToken);
         }
     }

diff --git a/SamplesDashboard/SamplesDashboard/SamplesDashboard.csproj b/SamplesDashboard/SamplesDashboard/SamplesDashboard.csproj
@@ -10,22 +10,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.16.1" />
-    <PackageReference Include="Azure.Identity" Version="1.5.0" />
-    <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.3.0" />
-    <PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.3.0" />
-    <PackageReference Include="GraphQL.Client" Version="4.0.2" />
-    <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="4.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.15" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.3" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="1.23.1" />
-    <PackageReference Include="Microsoft.IdentityModel.KeyVaultExtensions" Version="6.16.0" />
-    <PackageReference Include="NuGet.Protocol" Version="6.1.0" />
-    <PackageReference Include="Octokit" Version="0.50.0" />
-    <PackageReference Include="Semver" Version="2.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0" />
-    <PackageReference Include="YamlDotNet" Version="11.2.1" />
+    <PackageReference Include="AngleSharp" Version="0.17.1" />
+    <PackageReference Include="Azure.Identity" Version="1.7.0" />
+    <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.4.0" />
+    <PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.4.0" />
+    <PackageReference Include="GraphQL.Client" Version="5.1.0" />
+    <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="5.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.17" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.9" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="1.25.3" />
+    <PackageReference Include="Microsoft.IdentityModel.KeyVaultExtensions" Version="6.23.1" />
+    <PackageReference Include="NuGet.Protocol" Version="6.3.1" />
+    <PackageReference Include="Octokit" Version="3.0.1" />
+    <PackageReference Include="Semver" Version="2.2.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.23.1" />
+    <PackageReference Include="YamlDotNet" Version="12.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/SamplesDashboard/SamplesDashboard/Services/RepositoriesService.cs b/SamplesDashboard/SamplesDashboard/Services/RepositoriesService.cs
@@ -402,7 +402,10 @@ internal async Task GetDependencyDataAsync(
                     .BuildDependencyManifestFromFile(
                         repository.Name, repository.DefaultBranch, yamlHeader.DependencyFile);
 
-                data.DependencyManifests.Values.Add(manifest);
+                if (manifest != null)
+                {
+                    data.DependencyManifests.Values.Add(manifest);
+                }
             }
 
             var dependencyList = new List<Dependency>();

diff --git a/SamplesDashboard/SamplesDashboard/Startup.cs b/SamplesDashboard/SamplesDashboard/Startup.cs
@@ -49,11 +49,6 @@ public void ConfigureServices(IServiceCollection services)
             // Add a GraphQL client
             services
                 .AddHttpClient<GraphQLHttpClient>(cli => {
-                    // Enable dependency graph info in GraphQL queries
-                    // https://docs.github.com/en/graphql/overview/schema-previews#access-to-a-repositories-dependency-graph-preview
-                    cli.DefaultRequestHeaders.Accept.Add(
-                        new MediaTypeWithQualityHeaderValue("application/vnd.github.hawkgirl-preview+json")
-                    );
                     // Include user agent info
                     cli.DefaultRequestHeaders.UserAgent.Add(
                         new ProductInfoHeaderValue(Configuration.GetValue<string>("Product"),

diff --git a/SamplesDashboard/SamplesDashboardTests/RepositoriesServiceTests.cs b/SamplesDashboard/SamplesDashboardTests/RepositoriesServiceTests.cs
@@ -307,7 +307,7 @@ public async Task ShouldGetGradleDependencies()
 
             var yamlHeader = new YamlHeader
             {
-                DependencyFile = "/demo/graphtutorial/build.gradle"
+                DependencyFile = "/demo/graphtutorial/app/build.gradle"
             };
 
             var data = new GitHubGraphQLRepoData

diff --git a/pipelines/release.yml b/pipelines/release.yml
@@ -25,9 +25,10 @@ steps:
     packageType: sdk
     version: 5.x
 
-- task: UseNode@1
+- task: NodeTool@0
   inputs:
-    checkLatest: true
+    versionSpec: '16.x'
+  displayName: 'Setup Node'
 
 - task: DotNetCoreCLI@2
   displayName: "Restore Packages"
@@ -73,7 +74,8 @@ steps:
   env:
     AZURECLIENTID: $(AzureClientId)
     AZURECLIENTSECRET: $(AzureClientSecret)
-    KEYIDENTIFIER: $(KeyIdentifier)
+    GITHUBAPPKEYIDENTIFIER: $(GitHubAppKeyIdentifier)
+    GITHUBAPPID: $(GitHubAppId)
     TENANTID: $(TenantId)
     MSOSCLIENTSECRET: $(MSOClientSecret_Value)
     KEYVAULTSECRET: $(KeyVaultSecret_Value)
@@ -100,14 +102,4 @@ steps:
     REACT_APP_CLIENT_ID: $(REACT_APP_CLIENT_ID)
     REACT_APP_TENANT_ID: $(REACT_APP_TENANT_ID)
 
-- task: PublishBuildArtifacts@1
-
-- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
-  displayName: 'Graph Client Tooling pipeline fail notification'
-  inputs:
-    addressType: serviceEndpoint
-    serviceEndpointName: 'microsoftgraph pipeline status'
-    title: '$(Build.DefinitionName) failure notification'
-    text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
-  condition: failed()
-  enabled: false
+- task: PublishBuildArtifacts@1
diff --git a/pipelines/validatePR.yml b/pipelines/validatePR.yml
@@ -22,9 +22,10 @@ steps:
     packageType: sdk
     version: 5.x
 
-- task: UseNode@1
+- task: NodeTool@0
   inputs:
-    checkLatest: true
+    versionSpec: '16.x'
+  displayName: 'Setup Node'
 
 - task: DotNetCoreCLI@2
   displayName: "Restore Packages"
@@ -70,7 +71,8 @@ steps:
   env:
     AZURECLIENTID: $(AzureClientId)
     AZURECLIENTSECRET: $(AzureClientSecret)
-    KEYIDENTIFIER: $(KeyIdentifier)
+    GITHUBAPPKEYIDENTIFIER: $(GitHubAppKeyIdentifier)
+    GITHUBAPPID: $(GitHubAppId)
     TENANTID: $(TenantId)
     MSOSCLIENTSECRET: $(MSOClientSecret_Value)
     KEYVAULTSECRET: $(KeyVaultSecret_Value)
@@ -83,14 +85,4 @@ steps:
   condition: succeededOrFailed()
   inputs:
     testRunner: VSTest
-    testResultsFiles: '**/*.trx'
-
-- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
-  displayName: 'Graph Client Tooling pipeline fail notification'
-  inputs:
-    addressType: serviceEndpoint
-    serviceEndpointName: 'microsoftgraph pipeline status'
-    title: '$(Build.DefinitionName) failure notification'
-    text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
-  condition: failed()
-  enabled: false
+    testResultsFiles: '**/*.trx'