Merge pull request #352 from microsoftgraph/dev

Merges dev to master

Author: andrueastman

SamplesDashboard/SamplesDashboard/ClientApp/package-lock.json

@@ -3,8 +3,8 @@
   "version": "0.2.0",
   "private": true,
   "dependencies": {
-    "@babel/runtime": "7.14.0",
-    "@fluentui/react": "8.14.11",
+    "@babel/runtime": "7.14.6",
+    "@fluentui/react": "8.23.10",
     "@types/query-string": "6.3.0",
     "bootstrap": "4.6.0",
     "connected-react-router": "6.9.1",
@@ -23,25 +23,25 @@
     "reactstrap": "7.0.2",
     "redux": "4.1.0",
     "redux-thunk": "2.3.0",
-    "typescript": "4.2.4"
+    "typescript": "4.3.5"
   },
   "devDependencies": {
-    "@types/history": "4.7.8",
+    "@types/history": "4.7.9",
     "@types/jest": "24.9.1",
     "@types/node": "10.12.18",
     "@types/react": "16.14.6",
     "@types/react-dom": "16.9.12",
-    "@types/react-redux": "7.1.16",
-    "@types/react-router": "5.1.4",
+    "@types/react-redux": "7.1.18",
+    "@types/react-router": "5.1.16",
     "@types/react-router-dom": "5.1.7",
     "@types/reactstrap": "8.4.1",
-    "@typescript-eslint/parser": "4.24.0",
+    "@typescript-eslint/parser": "4.28.2",
     "cross-env": "5.2.0",
-    "eslint": "7.26.0",
-    "eslint-plugin-flowtype": "5.7.2",
-    "eslint-plugin-import": "2.23.2",
+    "eslint": "7.30.0",
+    "eslint-plugin-flowtype": "5.8.0",
+    "eslint-plugin-import": "2.23.4",
     "eslint-plugin-jsx-a11y": "6.4.1",
-    "eslint-plugin-react": "7.23.2"
+    "eslint-plugin-react": "7.24.0"
   },
   "scripts": {
     "start": "react-scripts start",

SamplesDashboard/SamplesDashboard/ClientApp/package.json

@@ -469,7 +469,7 @@ function renderItemColumn(item: IRepositoryItem, index: number | undefined, colu
 
         case 'Security Alerts':
             if (vulnerabilityAlertsCount > 0) {
-                return <a href={`${url}/network/alerts`} target='_blank' rel='noopener noreferrer'>
+                return <a href={`${url}/security/dependabot`} target='_blank' rel='noopener noreferrer'>
                     <FontIcon iconName='WarningSolid' className={classNames.yellow} />
                     <span>{vulnerabilityAlertsCount} </span></a>;
             }

SamplesDashboard/SamplesDashboard/ClientApp/src/views/repositories/Repositories.tsx

@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.15.0" />
+    <PackageReference Include="AngleSharp" Version="0.16.0" />
     <PackageReference Include="GitHubJwt" Version="0.0.4" />
     <PackageReference Include="GraphQL.Client" Version="2.0.0" />
     <PackageReference Include="IdentityServer4.EntityFramework.Storage" Version="3.0.0" />
@@ -31,11 +31,11 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.31.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.33.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
-    <PackageReference Include="NuGet.Protocol" Version="5.9.1" />
+    <PackageReference Include="NuGet.Protocol" Version="5.10.0" />
     <PackageReference Include="Octokit" Version="0.47.0" />
     <PackageReference Include="OfficeUIFabric" Version="2.6.3" />
     <PackageReference Include="Polly" Version="7.2.2" />

SamplesDashboard/SamplesDashboard/SamplesDashboard.csproj

@@ -72,6 +72,11 @@ steps:
       !**/*TestAdapter.dll
       !**/obj/**
     diagnosticsEnabled: true
+  env:
+    AZURECLIENTID: $(AzureClientId)
+    AZURECLIENTSECRET: $(AzureClientSecret)
+    KEYIDENTIFIER: $(KeyIdentifier)
+    TENANTID: $(TenantId)
 
 - task: PublishTestResults@2
   displayName: "Publish Test Results"

pipelines/release.yml

@@ -66,6 +66,11 @@ steps:
     command: test
     projects: '**/*Tests/*.csproj'
     arguments: '--configuration $(buildConfiguration) --logger trx'
+  env:
+    AZURECLIENTID: $(AzureClientId)
+    AZURECLIENTSECRET: $(AzureClientSecret)
+    KEYIDENTIFIER: $(KeyIdentifier)
+    TENANTID: $(TenantId)
 
 - task: PublishTestResults@2
   displayName: "Publish Test Results"