Skip to content

Commit

Permalink
Merge pull request #2240 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
2.3.0 Release
  • Loading branch information
peombwa authored Aug 10, 2023
2 parents 91976e5 + a847fd5 commit 27e1f1a
Show file tree
Hide file tree
Showing 883 changed files with 158,970 additions and 145,800 deletions.
6 changes: 5 additions & 1 deletion .azure-pipelines/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ trigger:
include:
- main
- dev
pr: none
pr:
branches:
include:
- main
- dev

jobs:
- job: MsGraphPsSdkCiBuild
Expand Down
19 changes: 19 additions & 0 deletions .azure-pipelines/common-templates/install-sdk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
steps:
- task: PowerShell@2
displayName: Install PowerShell SDK
inputs:
targetType: 'inline'
pwsh: true
script: |
try{
# Installing Beta module.
Install-Module Microsoft.Graph.Beta -Repository PSGallery -Scope AllUsers -AcceptLicense -SkipPublisherCheck -Force -AllowClobber
}catch{
echo "Error when installing Beta"
}
try{
# Installing V1 module.
Install-Module Microsoft.Graph -Repository PSGallery -Scope AllUsers -AcceptLicense -SkipPublisherCheck -Force -AllowClobber
}catch{
echo "Error when installing V1"
}
16 changes: 11 additions & 5 deletions .azure-pipelines/generation-templates/workload-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,17 @@ steps:
$ModuleMapping.Keys | ForEach-Object {
$ModuleName = $_
$ModulePath = "$(System.DefaultWorkingDirectory)/src/$ModuleName/$ApiVersion"
if (Test-Path $ModulePath) {
$ModulePsd1 = Join-Path $ModulePath "Microsoft.Graph*.$ModuleName.psd1" -Resolve
$ModulePsm1 = Join-Path $ModulePath "Microsoft.Graph*.$ModuleName.psm1" -Resolve
($ModulePsd1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
($ModulePsm1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
$ModulePsd1 = Join-Path $ModulePath "Microsoft.Graph*.$ModuleName.psd1"
$ModulePsm1 = Join-Path $ModulePath "Microsoft.Graph*.$ModuleName.psm1"
Write-Host "Validating Authenticode Signature for $ModulePsd1"
Write-Host "Validating Authenticode Signature for $ModulePsm1"
if ((Test-Path $ModulePsd1) -and (Test-Path $ModulePsm1)) {
$ModulePsd1AuthCodeSignature = $ModulePsd1 | Get-AuthenticodeSignature
$ModulePsm1AuthCodeSignature = $ModulePsm1 | Get-AuthenticodeSignature
Write-Host "Authenticode Signature for $ModulePsd1 is $($ModulePsd1AuthCodeSignature.Status)"
Write-Host "Authenticode Signature for $ModulePsm1 is $($ModulePsm1AuthCodeSignature.Status)"
$ModulePsd1AuthCodeSignature.Status | Should -Be "Valid"
$ModulePsm1AuthCodeSignature.Status | Should -Be "Valid"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/weekly-examples-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
name: ${{ parameters.BuildAgent }}
timeoutInMinutes: ${{ parameters.PipelineTimeout }}
steps:

- template: ./common-templates/install-sdk.yml
- task: PowerShell@2
name: "ComputeBranch"
displayName: "Compute weekly examples update branch name"
Expand Down
35 changes: 20 additions & 15 deletions .github/workflows/projectsbot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This workflow is used to add new issues to GitHub Projects (Beta)
# This workflow is used to add new issues to GitHub Projects

name: Add PR to project
on:
Expand All @@ -11,7 +11,7 @@ jobs:
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
with:
app_id: ${{ secrets.GRAPHBOT_APP_ID }}
private_key: ${{ secrets.GRAPHBOT_APP_PEM }}
Expand All @@ -25,22 +25,27 @@ jobs:
gh api graphql -f query='
query($org: String!, $number: Int!) {
organization(login: $org){
projectNext(number: $number) {
projectV2(number: $number) {
id
fields(first:20) {
nodes {
id
name
settings
... on ProjectV2SingleSelectField {
id
name
options {
id
name
}
}
}
}
}
}
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
echo 'TRIAGE_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Needs Triage 🔍") |.id' project_data.json) >> $GITHUB_ENV
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
echo 'TRIAGE_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Needs Triage 🔍") |.id' project_data.json) >> $GITHUB_ENV
- name: Add Issue to project
env:
Expand All @@ -49,12 +54,12 @@ jobs:
run: |
item_id="$( gh api graphql -f query='
mutation($project:ID!, $issue:ID!) {
addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
projectNextItem {
addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
item {
id
}
}
}' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
}' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
echo 'ITEM_ID='$item_id >> $GITHUB_ENV
Expand All @@ -69,13 +74,13 @@ jobs:
$status_field: ID!
$status_value: String!
) {
set_status: updateProjectNextItemField(input: {
set_status: updateProjectV2ItemFieldValue(input: {
projectId: $project
itemId: $item
fieldId: $status_field
value: $status_value
value: {singleSelectOptionId: $status_value}
}) {
projectNextItem {
projectV2Item {
id
}
}
Expand Down
6 changes: 3 additions & 3 deletions config/ModuleMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
"versions": {
"authentication": {
"prerelease": "",
"version": "2.2.0"
"version": "2.3.0"
},
"beta": {
"prerelease": "",
"version": "2.2.0"
"version": "2.3.0"
},
"v1.0": {
"prerelease": "",
"version": "2.2.0"
"version": "2.3.0"
}
}
}
Loading

0 comments on commit 27e1f1a

Please sign in to comment.