Skip to content

Commit 51cbfc6

Browse files
authored
Merge pull request #3145 from microsoftgraph/merge-to-main-19-02-2025
Merge to main
2 parents 980929d + 9adefff commit 51cbfc6

File tree

431 files changed

+896176
-1111818
lines changed

Some content is hidden

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

431 files changed

+896176
-1111818
lines changed

.azure-pipelines/common-templates/install-tools.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,11 @@
22
# Licensed under the MIT License.
33

44
steps:
5-
- task: UseDotNet@2
6-
displayName: "Use .NET 6" # needed for ESRP signing
7-
inputs:
8-
version: 6.x
9-
10-
- task: UseDotNet@2
11-
displayName: Use .NET SDK
12-
inputs:
13-
debugMode: false
14-
version: 7.x
15-
165
- task: UseDotNet@2
176
displayName: Use .NET SDK
187
inputs:
19-
debugMode: false
20-
version: 8.x
21-
8+
version: 8.x
9+
2210
- task: NuGetToolInstaller@1
2311
displayName: Install Nuget
2412

.azure-pipelines/generation-templates/authentication-module.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ steps:
3030
script: |
3131
. $(System.DefaultWorkingDirectory)/tools/GenerateAuthenticationModule.ps1 -Test
3232
33+
- ${{ if eq(parameters.Test, true) }}:
34+
- task: PowerShell@2
35+
displayName: Test Json Utilities
36+
inputs:
37+
pwsh: true
38+
targetType: inline
39+
script: dotnet test
40+
workingDirectory: "$(System.DefaultWorkingDirectory)/tools/Tests/JsonUtilitiesTest"
41+
3342
- ${{ if eq(parameters.Sign, true) }}:
3443
- template: ../common-templates/esrp/strongname.yml
3544
parameters:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The best way to get started with a contribution is to start a dialog with us. So
1313
- Clone the repo - <https://github.com/microsoftgraph/msgraph-sdk-powershell.git>.
1414
- Identify the module(s) that you want add the custom cmdlets to. E.g. [Groups](https://github.com/microsoftgraph/msgraph-sdk-powershell/tree/dev/src/Groups/Groups).
1515
- Navigate to the module’s custom folder. E.g. [Groups/custom](https://github.com/microsoftgraph/msgraph-sdk-powershell/tree/dev/src/Groups/Groups/custom). In here, you will find a readme.md that has basic instructions on how to add custom cmdlets. A full guide can be found [here](https://github.com/Azure/autorest/blob/master/docs/powershell/customization.md#creating-a-new-cmdlet).
16-
- In the custom directory, add your custom cmdlet naming the file as `{Verb}Mg{Subject}_{Variant}.(cs|ps)`. This file will contain the implementation of your custom cmdlet. You can refer to [NewMgGroupMember_Create.cs](https://github.com/microsoftgraph/msgraph-sdk-powershell/blob/dev/src/Groups/Groups/custom/NewMgGroupMember_Create.cs) as an example.
16+
- In the custom directory, add your custom cmdlet naming the file as `{Verb}Mg{Subject}_{Variant}.(cs|ps)`. This file will contain the implementation of your custom cmdlet. You can refer to [NewMgGroupMember_Create.cs](https://github.com/microsoftgraph/msgraph-sdk-powershell/blob/dev/src/Groups/v1.0/custom/NewMgGroupMember_Create.cs) as an example.
1717
- Once done, bump up the module version number in the module’s root [readme.md](https://github.com/microsoftgraph/msgraph-sdk-powershell/blob/dev/src/Groups/Groups/readme.md#versioning) then run `.\msgraph-sdk-powershell\tools\GenerateModules.ps1 -Build` to create, build and export the cmdlets to `..\exports` folder.
1818

1919
## Modifying Existing Cmdlets

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ RUN pwsh -c "if ('${VERSION}' -eq 'latest') { Install-Module Microsoft.Graph -Sc
66
RUN pwsh -c "if ('${VERSION}' -eq 'latest') { Install-Module Microsoft.Graph.Beta -Scope CurrentUser -AllowClobber -Force} else { Install-Module Microsoft.Graph.Beta -Scope CurrentUser -AllowClobber -Force -RequiredVersion ${VERSION} }"
77
RUN pwsh -c "if (!(Test-Path -Path \$PROFILE)) { New-Item -ItemType File -Path \$PROFILE -Force } echo 'Import-Module Microsoft.Graph.Authentication' >> \$PROFILE"
88

9-
LABEL description="# Welcome to Microsoft Graph PowrShell \
10-
To start learning about the module checkout the [getting started documentation](https://docs.microsoft.com/en-us/powershell/microsoftgraph/get-started)"
9+
LABEL description="# Welcome to Microsoft Graph PowerShell \
10+
To start learning about the module checkout the [getting started documentation](https://docs.microsoft.com/en-us/powershell/microsoftgraph/get-started)"

config/ModuleMetadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
"versions": {
2828
"authentication": {
2929
"prerelease": "",
30-
"version": "2.25.0"
30+
"version": "2.26.0"
3131
},
3232
"beta": {
3333
"prerelease": "",
34-
"version": "2.25.0"
34+
"version": "2.26.0"
3535
},
3636
"v1.0": {
3737
"prerelease": "",
38-
"version": "2.25.0"
38+
"version": "2.26.0"
3939
}
4040
}
4141
}

0 commit comments

Comments
 (0)