Skip to content

Commit

Permalink
Merge pull request #679 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
1.6.0 release
  • Loading branch information
peombwa authored Jun 3, 2021
2 parents 3c4c2c5 + aedaa5e commit d1fd89a
Show file tree
Hide file tree
Showing 191 changed files with 40,773 additions and 10,684 deletions.
28 changes: 28 additions & 0 deletions .azure-pipelines/generate-auth-module-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ parameters:
displayName: 'Build Number'
type: string
default: $[format('{0:yyMMddHH}', pipeline.startTime)]
- name: AZURESUBSCRIPTION
default: "Microsoft Graph Build Agents (Win+Lin)"
displayName: Azure Subscription

- name: KEYVAULT
default: "msgraph-build-keyvault"
displayName: Build Key vault


jobs:
- job: MsGraphPSSDKAuthModuleGeneration
Expand All @@ -29,6 +37,26 @@ jobs:
steps:
- template: ./install-tools-template.yml

- task: AzureKeyVault@1
inputs:
azureSubscription: $(AZURESUBSCRIPTION)
KeyVaultName: $(KEYVAULT)
SecretsFilter: '*'
RunAsPreJob: true

- task: PowerShell@2
displayName: 'Install Test Certificate'
inputs:
targetType: 'inline'
script: |
$kvSecretBytes = [System.Convert]::FromBase64String('$(MsGraphPSSDKCertificate)')
$certCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
$certCollection.Import($kvSecretBytes,$null,[System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable)
$store = New-Object System.Security.Cryptography.X509Certificates.X509Store("My", "CurrentUser")
$store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite)
$store.AddRange($certCollection)
$store.Close()
- task: PowerShell@2
displayName: 'Generate and Build Auth Module'
inputs:
Expand Down
2 changes: 2 additions & 0 deletions .azure-pipelines/integrated-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ stages:
AUTH_MODULE_PATH: $(AUTH_MODULE_PATH)
EnableSigning: true
BUILDNUMBER: $(BUILDNUMBER)
KEYVAULT: $(KEYVAULT)
AZURESUBSCRIPTION: $(AZURESUBSCRIPTION)

- stage: GenerateBetaModules
displayName: 'Generate Beta Modules (Microsoft.Graph.*)'
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @peombwa @ddyett @georgend
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MESSAGE_TITLE: Weekly OpenApiDocs Download
MESSAGE_BODY: "This pull request was automatically created by the GitHub Action,\n\n Contains OpenApiDocs Updates from Graph Explorer API"
REVIEWERS: peombwa,ddyett,darrelmiller
ASSIGNEDTO: finsharp
REVIEWERS: peombwa,ddyett,darrelmiller,georgend
ASSIGNEDTO: peombwa
LABELS: generated
BASE: dev
HEAD: ${{steps.create_branch.outputs.branch}}
Expand Down
2 changes: 1 addition & 1 deletion config/ModuleMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
],
"releaseNotes": "See https://aka.ms/GraphPowerShell-Release.",
"assemblyOriginatorKeyFile": "35MSSharedLib1024.snk",
"version": "1.5.0"
"version": "1.6.0"
}
2 changes: 1 addition & 1 deletion config/ModulesMapping.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
"Users.Actions": "^users.Actions$",
"Users.Functions": "^users.Functions$",

// "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$",
// "WorkBooks": "^workbooks\\.",// Max limit.
}
Loading

0 comments on commit d1fd89a

Please sign in to comment.