Skip to content

Commit f5e4813

Browse files
committed
Update ADO scripts to use script variables.
1 parent 7f1f7ba commit f5e4813

6 files changed

+11
-11
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ jobs:
4141
- task: PowerShell@2
4242
displayName: 'Build Auth Modules'
4343
inputs:
44-
filePath: '$(System.DefaultWorkingDirectory)/tools/BuildModule.ps1'
45-
arguments: '-Module "Authentication" -ModulePrefix $(MODULE_PREFIX) -EnableSigning'
44+
filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateAuthenticationModule.ps1'
45+
arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory) -Build -EnableSigning'
4646
pwsh: true
4747

4848
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

.azure-pipelines/generate-beta-rollup-module.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
displayName: 'Generate and Build Roll-Up Module'
3030
inputs:
3131
filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateRollUpModule.ps1'
32-
arguments: '-RepositoryName $(Repository_Name) -RepositoryApiKey $(Api_Key) -ModuleVersion $(Module_Version) -ArtifactsLocation $(Build.ArtifactStagingDirectory)/$(GRAPH_VERSION)/ -BetaGraphVersion'
32+
arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory)/$(GRAPH_VERSION)/ -BetaGraphVersion'
3333
pwsh: true
3434

3535
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

.azure-pipelines/generate-v1.0-modules.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
displayName: 'Install AutoRest'
3838
inputs:
3939
command: 'custom'
40-
customCommand: 'install -g @autorest/autorest@3.0.6114'
40+
customCommand: 'install -g @autorest/autorest'
4141

4242
- task: PowerShell@2
4343
displayName: 'Build Auth Modules'
4444
inputs:
45-
filePath: '$(System.DefaultWorkingDirectory)/tools/BuildModule.ps1'
46-
arguments: '-Module "Authentication" -ModulePrefix $(MODULE_PREFIX) -ModuleVersion $(Module_Version) -EnableSigning'
45+
filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateAuthenticationModule.ps1'
46+
arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory) -Build -EnableSigning'
4747
pwsh: true
4848

4949
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -123,7 +123,7 @@ jobs:
123123
displayName: 'Generate and Build Graph Resource Modules'
124124
inputs:
125125
filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateModules.ps1'
126-
arguments: '-RepositoryName $(Repository_Name) -RepositoryApiKey $(Api_Key) -ModuleVersion $(Module_Version) -ArtifactsLocation $(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\ -UseLocalDoc -Build -EnableSigning'
126+
arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\ -UseLocalDoc -Build -EnableSigning'
127127
pwsh: true
128128

129129
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

.azure-pipelines/generate-v1.0-rollup-module.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
displayName: 'Generate and Build Roll-Up Module'
3030
inputs:
3131
filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateRollUpModule.ps1'
32-
arguments: '-RepositoryName $(Repository_Name) -RepositoryApiKey $(Api_Key) -ModuleVersion $(Module_Version) -ArtifactsLocation $(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\'
32+
arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\'
3333
pwsh: true
3434

3535
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

.azure-pipelines/validate-pr-v1.0-modules.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
displayName: 'Install AutoRest'
3636
inputs:
3737
command: 'custom'
38-
customCommand: 'install -g @autorest/autorest@3.0.6114'
38+
customCommand: 'install -g @autorest/autorest'
3939

4040
- task: PowerShell@2
4141
displayName: 'Generate and Build Graph Resource Modules'
4242
inputs:
4343
filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateModules.ps1'
44-
arguments: '-RepositoryName $(Repository_Name) -RepositoryApiKey $(Api_Key) -ModuleVersion $(Module_Version) -ArtifactsLocation $(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\ -UseLocalDoc -Build'
44+
arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\ -UseLocalDoc -Build'
4545
pwsh: true
4646

4747
- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0

src/Authentication/Authentication/Microsoft.Graph.Authentication.psd1

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ DotNetFrameworkVersion = '4.7.2'
6363
# TypesToProcess = @()
6464

6565
# Format files (.ps1xml) to be loaded when importing this module
66-
FormatsToProcess = './Microsoft.Graph.Authentication.Format.ps1xml'
66+
FormatsToProcess = './Microsoft.Graph.Authentication.format.ps1xml'
6767

6868
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
6969
# NestedModules = @()

0 commit comments

Comments
 (0)