Skip to content

Commit 16ce638

Browse files
committed
Merge branch 'dev' into enhancements/expandModuleMapping
2 parents 2492d4c + 444ef52 commit 16ce638

File tree

280 files changed

+989863
-517959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+989863
-517959
lines changed

.azure-pipelines/generate-modules-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
pwsh: true
143143
script: |
144144
Write-Host $(BUILDNUMBER)
145-
. $(System.DefaultWorkingDirectory)/tools/GenerateModules.ps1 -ArtifactsLocation $(Build.ArtifactStagingDirectory)\ -Build -EnableSigning -ModulePreviewNumber $(BUILDNUMBER) -RepositoryName "LocalNugetFeed" -ExcludeExampleTemplates -ExcludeNotesSection
145+
. $(System.DefaultWorkingDirectory)/tools/GenerateModules.ps1 -ArtifactsLocation $(Build.ArtifactStagingDirectory)\ -Build -Test -EnableSigning -ModulePreviewNumber $(BUILDNUMBER) -RepositoryName "LocalNugetFeed" -ExcludeExampleTemplates -ExcludeNotesSection
146146
147147
- template: ./generation-templates/generate-helpdocs-template.yml
148148

.azure-pipelines/generation-templates/generate-helpdocs-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
type: string
1010
default: ""
1111
- name: BUILDAGENT
12-
default: MsGraphBuildAgentsWindowsPsSDK
12+
default: 1es-windows-ps-compute
1313
displayName: Build Agent
1414

1515
steps:

.azure-pipelines/integrated-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ stages:
101101
KEYVAULT: $(KEYVAULT)
102102
AZURESUBSCRIPTION: $(AZURESUBSCRIPTION)
103103

104-
- stage: GenerateBetaModules
105-
displayName: 'Generate Beta Modules (Microsoft.Graph.*)'
104+
- stage: GenerateModules
105+
displayName: 'Generate Modules (Microsoft.Graph.*)'
106106
jobs:
107107
- template: ./generate-modules-template.yml
108108
parameters:

.azure-pipelines/weekly-generation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
55

66
parameters:
77
- name: BuildAgent
8-
default: MsGraphBuildAgentsWindowsPsSDK
8+
default: 1es-windows-ps-compute
99
displayName: Build Agent
1010

1111
variables:

Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM mcr.microsoft.com/powershell
2+
3+
ARG MODULE_VERSION=latest
4+
5+
RUN pwsh -c "if ('${MODULE_VERSION}' -eq 'latest') { Install-Module Microsoft.Graph -Scope CurrentUser -AllowClobber -Force} else { Install-Module Microsoft.Graph -Scope CurrentUser -AllowClobber -Force -Version ${MODULE_VERSION} }"
6+
7+
LABEL description="# Welcome to Microsoft Graph PowrShell \
8+
To start learning about the module checkout the [getting started documentation](https://docs.microsoft.com/en-us/powershell/microsoftgraph/get-started)"

0 commit comments

Comments
 (0)