Skip to content

Commit b460f30

Browse files
chrisdachrisda
committed
Merge branch 'master' into ChrisdaCopyOfQinezh-test
2 parents 7fc2d19 + 7aa6d61 commit b460f30

File tree

475 files changed

+7577
-2634
lines changed

Some content is hidden

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

475 files changed

+7577
-2634
lines changed

‎.openpublishing.publish.config.json

Lines changed: 29 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@
1212
"Conceptual": "Content",
1313
"ManagedReference": "Content",
1414
"RestApi": "Content",
15-
"AzurePsModulePage": "Content"
15+
"PowershellModule": "Content",
16+
"PowershellCmdlet": "Content"
1617
},
1718
"build_entry_point": "docs",
1819
"template_folder": "_themes",
1920
"version": 0,
20-
"customized_template_paths": [
21-
"_dependentPackages/azurecli.plugins/azurecli"
22-
],
2321
"customized_tasks": {
2422
"docset_prebuild": [
25-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
23+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
2624
]
2725
},
2826
"monikerPath": [
@@ -41,17 +39,15 @@
4139
"Conceptual": "Content",
4240
"ManagedReference": "Content",
4341
"RestApi": "Content",
44-
"AzurePsModulePage": "Content"
42+
"PowershellModule": "Content",
43+
"PowershellCmdlet": "Content"
4544
},
4645
"build_entry_point": "docs",
4746
"template_folder": "_themes",
4847
"version": 0,
49-
"customized_template_paths": [
50-
"_dependentPackages/azurecli.plugins/azurecli"
51-
],
5248
"customized_tasks": {
5349
"docset_prebuild": [
54-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
50+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
5551
]
5652
},
5753
"monikerPath": [
@@ -70,17 +66,15 @@
7066
"Conceptual": "Content",
7167
"ManagedReference": "Content",
7268
"RestApi": "Content",
73-
"AzurePsModulePage": "Content"
69+
"PowershellModule": "Content",
70+
"PowershellCmdlet": "Content"
7471
},
7572
"build_entry_point": "docs",
7673
"template_folder": "_themes",
7774
"version": 0,
78-
"customized_template_paths": [
79-
"_dependentPackages/azurecli.plugins/azurecli"
80-
],
8175
"customized_tasks": {
8276
"docset_prebuild": [
83-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
77+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
8478
]
8579
},
8680
"monikerPath": [
@@ -99,17 +93,15 @@
9993
"Conceptual": "Content",
10094
"ManagedReference": "Content",
10195
"RestApi": "Content",
102-
"AzurePsModulePage": "Content"
96+
"PowershellModule": "Content",
97+
"PowershellCmdlet": "Content"
10398
},
10499
"build_entry_point": "docs",
105100
"template_folder": "_themes",
106101
"version": 0,
107-
"customized_template_paths": [
108-
"_dependentPackages/azurecli.plugins/azurecli"
109-
],
110102
"customized_tasks": {
111103
"docset_prebuild": [
112-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
104+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
113105
]
114106
},
115107
"monikerPath": [
@@ -128,17 +120,15 @@
128120
"Conceptual": "Content",
129121
"ManagedReference": "Content",
130122
"RestApi": "Content",
131-
"AzurePsModulePage": "Content"
123+
"PowershellModule": "Content",
124+
"PowershellCmdlet": "Content"
132125
},
133126
"build_entry_point": "docs",
134127
"template_folder": "_themes",
135128
"version": 0,
136-
"customized_template_paths": [
137-
"_dependentPackages/azurecli.plugins/azurecli"
138-
],
139129
"customized_tasks": {
140130
"docset_prebuild": [
141-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
131+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
142132
]
143133
},
144134
"monikerPath": [
@@ -157,17 +147,15 @@
157147
"Conceptual": "Content",
158148
"ManagedReference": "Content",
159149
"RestApi": "Content",
160-
"AzurePsModulePage": "Content"
150+
"PowershellModule": "Content",
151+
"PowershellCmdlet": "Content"
161152
},
162153
"build_entry_point": "docs",
163154
"template_folder": "_themes",
164155
"version": 0,
165-
"customized_template_paths": [
166-
"_dependentPackages/azurecli.plugins/azurecli"
167-
],
168156
"customized_tasks": {
169157
"docset_prebuild": [
170-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
158+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
171159
]
172160
},
173161
"monikerPath": [
@@ -186,17 +174,15 @@
186174
"Conceptual": "Content",
187175
"ManagedReference": "Content",
188176
"RestApi": "Content",
189-
"AzurePsModulePage": "Content"
177+
"PowershellModule": "Content",
178+
"PowershellCmdlet": "Content"
190179
},
191180
"build_entry_point": "docs",
192181
"template_folder": "_themes",
193182
"version": 0,
194-
"customized_template_paths": [
195-
"_dependentPackages/azurecli.plugins/azurecli"
196-
],
197183
"customized_tasks": {
198184
"docset_prebuild": [
199-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
185+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
200186
]
201187
},
202188
"monikerPath": [
@@ -215,17 +201,15 @@
215201
"Conceptual": "Content",
216202
"ManagedReference": "Content",
217203
"RestApi": "Content",
218-
"AzurePsModulePage": "Content"
204+
"PowershellModule": "Content",
205+
"PowershellCmdlet": "Content"
219206
},
220207
"build_entry_point": "docs",
221208
"template_folder": "_themes",
222209
"version": 0,
223-
"customized_template_paths": [
224-
"_dependentPackages/azurecli.plugins/azurecli"
225-
],
226210
"customized_tasks": {
227211
"docset_prebuild": [
228-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
212+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
229213
]
230214
},
231215
"monikerPath": [
@@ -263,17 +247,11 @@
263247
"need_generate_intellisense": false,
264248
"dependent_packages": [
265249
{
266-
"path_to_root": "_dependentPackages/azurecli.plugins",
267-
"id": "opbuild.templates.azurecli",
268-
"version": "latest",
269-
"nuget_feed": "https://www.myget.org/F/op/api/v2"
270-
},
271-
{
272-
"path_to_root": "_dependentPackages/CommonPlugins",
250+
"id": "Microsoft.DocAsCode.MAML2Yaml",
251+
"nuget_feed": "https://www.myget.org/F/op/api/v2",
252+
"path_to_root": "_dependentPackages/MAML2Yaml",
273253
"target_framework": "net45",
274-
"version": "latest",
275-
"id": "Microsoft.OpenPublishing.CommonPlugins",
276-
"nuget_feed": "https://www.myget.org/F/op/api/v2"
254+
"version": "latest"
277255
}
278256
]
279-
}
257+
}

‎.openpublishing.redirection.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6512,8 +6512,8 @@
65126512
},
65136513
{
65146514
"source_path": "exchange/docs-conceptual/office-365-scc/connect-to-scc-powershell/mfa-connect-to-scc-powershell.md",
6515-
"redirect_url": "https://docs.microsoft.com/powershell/exchange/mfa-connect-to-scc-powershell",
6516-
"redirect_document_id": true
6515+
"redirect_url": "https://docs.microsoft.com/powershell/exchange/connect-to-scc-powershell",
6516+
"redirect_document_id": false
65176517
},
65186518
{
65196519
"source_path": "exchange/docs-conceptual/exchange-server/connect-to-exchange-servers-using-remote-powershell.md",
@@ -6582,8 +6582,8 @@
65826582
},
65836583
{
65846584
"source_path": "exchange/docs-conceptual/exchange-online/connect-to-exchange-online-powershell/mfa-connect-to-exchange-online-powershell.md",
6585-
"redirect_url": "https://docs.microsoft.com/powershell/exchange/mfa-connect-to-exchange-online-powershell",
6586-
"redirect_document_id": true
6585+
"redirect_url": "https://docs.microsoft.com/powershell/exchange/connect-to-exchange-online-powershell",
6586+
"redirect_document_id": false
65876587
},
65886588
{
65896589
"source_path": "exchange/docs-conceptual/exchange-online/exchange-online-powershell-v2/app-only-auth-powershell-v2.md",
@@ -6614,6 +6614,16 @@
66146614
"source_path": "exchange/docs-conceptual/exchange-eop/exchange-online-protection-powershell.md",
66156615
"redirect_url": "https://docs.microsoft.com/powershell/exchange/exchange-online-protection-powershell",
66166616
"redirect_document_id": true
6617+
},
6618+
{
6619+
"source_path": "exchange/docs-conceptual/mfa-connect-to-exchange-online-powershell.md",
6620+
"redirect_url": "https://docs.microsoft.com/powershell/exchange/connect-to-exchange-online-powershell",
6621+
"redirect_document_id": false
6622+
},
6623+
{
6624+
"source_path": "exchange/docs-conceptual/mfa-connect-to-scc-powershell.md",
6625+
"redirect_url": "https://docs.microsoft.com/powershell/exchange/connect-to-scc-powershell",
6626+
"redirect_document_id": false
66176627
}
66186628
]
66196629
}

‎exchange/docfx.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
},
2929
{
3030
"files": [
31-
"**/*.md"
31+
"**/*.yml"
32+
],
33+
"exclude": [
34+
"toc.yml"
3235
],
3336
"src": "exchange-ps",
3437
"version": "exchange-ps",
@@ -125,7 +128,7 @@
125128
},
126129
"fileMetadata": {
127130
"apiPlatform": {
128-
"exchange-ps/exchange/**/*.md": [
131+
"exchange-ps/exchange/**/*.yml": [
129132
"powershell"
130133
]
131134
}

‎exchange/docs-conceptual/app-only-auth-powershell-v2.md

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,7 @@ description: "Learn about using the Exchange Online V2 module in scripts and oth
2020
# App-only authentication for unattended scripts in the EXO V2 module
2121

2222
> [!NOTE]
23-
> This feature is currently in Public Preview, and is available in the Preview release of Exchange Online PowerShell V2 Module.
24-
25-
To install the Preview release of the EXO V2 module, run the same [steps to install the stable version](exchange-online-powershell-v2.md#install-and-maintain-the-exchange-online-powershell-v2-module) but instead step 4 run the following command:
26-
27-
```powershell
28-
Install-Module -Name ExchangeOnlineManagement -RequiredVersion 2.0.3-Preview -AllowPrerelease
29-
```
30-
31-
To update from an earlier version of the of the EXO V2 module, run the following command:
32-
33-
```powershell
34-
Update-Module -Name ExchangeOnlineManagement -RequiredVersion 2.0.3-Preview -AllowPrerelease
35-
```
23+
> This feature is currently in Public Preview, and is available in the `2.0.3-Preview` release of Exchange Online PowerShell V2 Module. For instructions on how to install or update to this version of the module, see [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
3624
3725
Auditing and reporting scenarios in Exchange Online often involve scripts that run unattended. In most cases, these unattended scripts access Exchange Online PowerShell using Basic authentication (a username and password). Even when the connection to Exchange Online PowerShell uses modern authentication, the credentials are stored in a local file or a secret vault that's accessed at run-time.
3826

@@ -54,22 +42,6 @@ The following examples show how to use the Exchange Online PowerShell V2 module
5442

5543
When you use the _CertificateThumbPrint_ parameter, the certificate needs to be installed on the computer where you are running the command. The certificate should be installed in the user certificate store.
5644

57-
- Connect using an existing service principal and client-secret:
58-
59-
1. Get an OAuth access token using Active Directory Authentication Library (ADAL) PowerShell.
60-
61-
2. Use the access token and username to create a PSCredential object:
62-
63-
```powershell
64-
$AppCredential = New-Object System.Management.Automation.PSCredential(<UPN>,<Token>)
65-
```
66-
67-
3. Silently pass the PSCredential object to the EXO V2 module:
68-
69-
```powershell
70-
Connect-ExchangeOnline -Credential $AppCredential
71-
```
72-
7345
## How does it work?
7446

7547
The EXO V2 module uses the Active Directory Authentication Library to fetch an app-only token using the application Id, tenant Id (organization), and certificate thumbprint. The application object provisioned inside Azure AD has a Directory Role assigned to it, which is returned in the access token. Exchange Online configures the session RBAC using the directory role information that's available in the token.
@@ -165,14 +137,14 @@ You need to assign the API permission `Exchange.ManageAsApp` so the application
165137

166138
Create a self-signed x.509 certificate using one of the following methods:
167139

168-
- Use the [Create-SelfSignedCertificate script](https://github.com/SharePoint/PnP-Partner-Pack/blob/master/scripts/Create-SelfSignedCertificate.ps1):
140+
- (Recommended) Use the [New-SelfSignedCertificate](https://docs.microsoft.com/powershell/module/pkiclient/new-selfsignedcertificate) and [Export-PfxCertificate](https://docs.microsoft.com/powershell/module/pkiclient/export-pfxcertificate) cmdlets to request a self-signed certificate and export it to PFX.
141+
142+
- Use the [Create-SelfSignedCertificate script](https://github.com/SharePoint/PnP-Partner-Pack/blob/master/scripts/Create-SelfSignedCertificate.ps1). Note that this script generates SHA1 certificates.
169143

170144
```powershell
171145
.\Create-SelfSignedCertificate.ps1 -CommonName "MyCompanyName" -StartDate 2020-04-01 -EndDate 2022-04-01
172146
```
173147

174-
- Use the **makecert.exe** tool from the Windows SDK.
175-
176148
## Step 4: Attach the certificate to the Azure AD application
177149

178150
After you register the certificate with your application, you can use the public key (.pfx file) or the thumbprint for authentication.

0 commit comments

Comments
 (0)