Skip to content

Commit 9ddec26

Browse files
cormacpaynecormacpayne
authored
Merge branch 'release-6.0.0' into context-default
2 parents 65eb980 + 5919291 commit 9ddec26

File tree

958 files changed

+555335
-281486
lines changed

Some content is hidden

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

958 files changed

+555335
-281486
lines changed

‎.gitignore

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,10 @@ groupMapping*.json
222222
*.wixpdb
223223

224224
.vscode/
225-
/tools/AutomationTestFramework/RunBooks
226-
/tools/AutomationTestFramework/TestHelpers/TestHelpers.zip
225+
/tools/AutomationTestFramework/Runbooks
227226
Results
228227
Package
229228
.DS_Store
230229
.idea
231-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Logger/bin
232-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/bin
233-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/bin
234-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/bin
235-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/bin
230+
/src/ResourceManager/RecoveryServices.Backup/**/bin
231+
launchSettings.json

‎appveyor.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,27 @@
11
clone_folder: c:\ps
2+
clone_depth: 1
23
branches:
34
only:
45
- master
56
environment:
6-
nodejs_version: "6"
77
github_access_token:
88
secure: VMFbecLLHzDq/09YDPbcM0VDDSwwgY57vr5GXK6cZZ4Ti/Xs5RZoylzV8MMr1350
99

1010
before_build:
11-
- ps: Get-ChildItem -Path ("$env:programfiles" + "\WindowsPowerShell\Modules") | Where-Object { $_.FullName -match 'azure' } | foreach { Remove-Item $_.FullName -Recurse -Force }
12-
- ps: Install-Module -Name PowerShellGet -Force
13-
- ps: Install-Module -Name SplitPipeline -Force
14-
- ps: Install-Module -Name platyPS -Force
15-
- ps: Install-Module -Name Azure -Force
16-
- ps: Install-Module -Name AzureRM -Force -AllowClobber
17-
- ps: Install-Module -Name AzureStack -Force -AllowClobber
18-
- ps: Install-Product node $env:nodejs_version
1911
- git config --global credential.helper store
2012
- ps: ac "$env:USERPROFILE\.git-credentials" "https://$($env:github_access_token):[email protected]`n"
2113
- git config --global user.email %email%
2214
- git config --global user.name %name%
23-
- git clone -q https://github.com/MicrosoftDocs/azure-psdocs-ciscripts azpsci
24-
- cd azpsci
25-
- npm install
26-
- npm install typescript
27-
- node ./node_modules/typescript/bin/tsc
2815
- cd ..
16+
- git clone -q https://github.com/MicrosoftDocs/azure-psdocs-ciscripts azpsci
17+
- dotnet publish azpsci -c Release -o ../ci
2918
build_script:
30-
- node azpsci/out/ci0.js src c:\projects\_output
19+
- dotnet ./ci/azpsci.dll docs
3120

3221
test: off
3322
on_success:
3423
- git clone -q --branch=%target_branch% %content_repo% %TEMP%\Azure
3524
- cd %TEMP%\Azure
36-
- ps: ls c:\projects\_output -dir | % { copy $_.FullName . -Recurse -Force }
25+
- ps: ls C:\docs -dir | % { copy $_.FullName . -Recurse -Force }
3726
- git add -A
3827
- git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %target_branch% && appveyor AddMessage "Content Updated"

‎src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
9999
BatchEndpointResourceId = AzureEnvironmentConstants.USGovernmentBatchEndpointResourceId,
100100
AdTenant = "Common"
101101
};
102+
azureUSGovernment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, AzureEnvironmentConstants.USGovernmentOperationalInsightsEndpoint);
103+
azureUSGovernment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, AzureEnvironmentConstants.USGovernmentOperationalInsightsEndpointResourceId);
102104
var azureGermany = new AzureEnvironment
103105
{
104106
Name = EnvironmentName.AzureGermanCloud,

‎src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironmentConstants.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,13 @@ public static class AzureEnvironmentConstants
119119
/// The token audience for Log Analytics Queries
120120
/// </summary>
121121
public const string AzureOperationalInsightsEndpointResourceId = "https://api.loganalytics.io";
122+
public const string USGovernmentOperationalInsightsEndpointResourceId = "https://api.loganalytics.us";
122123

123124
/// <summary>
124125
/// The endpoint URI for Log Analytics Queries
125126
/// </summary>
126127
public const string AzureOperationalInsightsEndpoint = "https://api.loganalytics.io/v1";
128+
public const string USGovernmentOperationalInsightsEndpoint = "https://api.loganalytics.us/v1";
127129

128130
/// <summary>
129131
/// The domain name suffix for Azure DataLake services

‎src/Common/Commands.Common/AzurePSCmdlet.cs

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,50 @@ protected string PSVersion
137137

138138
protected abstract string DataCollectionWarning { get; }
139139

140+
private SessionState _sessionState;
141+
142+
public new SessionState SessionState
143+
{
144+
get
145+
{
146+
return _sessionState;
147+
}
148+
set
149+
{
150+
_sessionState = value;
151+
}
152+
}
153+
154+
private RuntimeDefinedParameterDictionary _asJobDynamicParameters;
155+
156+
public RuntimeDefinedParameterDictionary AsJobDynamicParameters
157+
{
158+
get
159+
{
160+
if (_asJobDynamicParameters == null)
161+
{
162+
_asJobDynamicParameters = new RuntimeDefinedParameterDictionary();
163+
}
164+
return _asJobDynamicParameters;
165+
}
166+
set
167+
{
168+
_asJobDynamicParameters = value;
169+
}
170+
}
171+
140172
/// <summary>
141173
/// Initializes AzurePSCmdlet properties.
142174
/// </summary>
143175
public AzurePSCmdlet()
144176
{
145177
DebugMessages = new ConcurrentQueue<string>();
178+
}
146179

180+
// Register Dynamic Parameters for use in long running jobs
181+
public void RegisterDynamicParameters(RuntimeDefinedParameterDictionary parameters)
182+
{
183+
this.AsJobDynamicParameters = parameters;
147184
}
148185

149186

@@ -252,6 +289,7 @@ protected virtual void TearDownHttpClientPipeline()
252289
/// </summary>
253290
protected override void BeginProcessing()
254291
{
292+
SessionState = base.SessionState;
255293
var profile = _dataCollectionProfile;
256294
//TODO: Inject from CI server
257295
lock (lockObject)

‎src/ResourceManager/Aks/Commands.Aks/help/AzureRM.Aks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
Module Name: AzureRM.Aks
33
Module Guid: a97e0c3e-e389-46a6-b73d-2b9bd6909bdb
4-
Download Help Link: {{Please enter FwLink manually}}
5-
Help Version: {{Please enter version of help manually (X.X.X.X) format}}
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.aks
5+
Help Version: 0.0.1.0
66
Locale: en-US
77
---
88

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/help/Azure.AnalysisServices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
Module Name: Azure.AnalysisServices
33
Module Guid: c717b5a4-1f1b-4a2f-8aa1-bfd09934626e
4-
Download Help Link: {{Please enter FwLink manually}}
5-
Help Version: {{Please enter version of help manually (X.X.X.X) format}}
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azure.analysisservices
5+
Help Version: 0.5.0.0
66
Locale: en-US
77
---
88

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/AzureRM.AnalysisServices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Module Name: AzureRM.AnalysisServices
33
Module Guid: acace26c-1775-4100-85c0-20c4d71eaa21
4-
Download Help Link: None_Azure
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices
55
Help Version: 0.0.1.0
66
Locale: en-US
77
---

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/help/AzureRM.ApiManagement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Module Name: AzureRM.ApiManagement
33
Module Guid: f875725d-8ce4-423f-a6af-ea880bc63f13
4-
Download Help Link: None
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.apimanagement
55
Help Version: 4.0.0.0
66
Locale: en-US
77
---

‎src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/help/AzureRM.ApplicationInsights.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
Module Name: AzureRM.ApplicationInsights
33
Module Guid: da67eaa7-4cb1-4bfa-a194-8bf3faae8ac6
4-
Download Help Link: None
5-
Help Version: 0.1.2
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.applicationinsights
5+
Help Version: 0.1.2.0
66
Locale: en-US
77
---
88

‎src/ResourceManager/Automation/Commands.Automation/help/AzureRM.Automation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Module Name: AzureRM.Automation
33
Module Guid: bcea1c70-a32b-48c3-a05c-323e1c02f4d3
4-
Download Help Link: None_Azure
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.automation
55
Help Version: 4.0.0.0
66
Locale: en-US
77
---

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/help/AzureRM.Backup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
Module Name: AzureRM.Backup
33
Module Guid: 0b1d76f5-a928-4b8f-9c83-df26947568d4
4-
Download Help Link: {{Please enter FwLink manually}}
5-
Help Version: {{Please enter version of help manually (X.X.X.X) format}}
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.backup
5+
Help Version: 4.0.4.0
66
Locale: en-US
77
---
88

‎src/ResourceManager/AzureBatch/Commands.Batch/help/AzureRM.Batch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Module Name: AzureRM.Batch
33
Module Guid: a8f00f40-1c1a-49b5-9db3-24076b75c3cf
4-
Download Help Link: http://go.microsoft.com/fwlink/?linkid=390762
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.batch
55
Help Version: 4.0.0.0
66
Locale: en-US
77
---

‎src/ResourceManager/Billing/Commands.Billing/help/AzureRM.Billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Module Name: AzureRM.Billing
33
Module Guid: a1f34ce9-bf46-4180-b36c-be232a1f8f63
4-
Download Help Link:
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.billing
55
Help Version: 2.0.0.0
66
Locale: en-US
77
---

‎src/ResourceManager/Cdn/AzureRM.Cdn.Netcore.psd1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ CmdletsToExport = 'Get-AzureRmCdnProfile', 'Get-AzureRmCdnProfileSsoUrl',
8282
'Start-AzureRmCdnEndpoint', 'Stop-AzureRmCdnEndpoint',
8383
'Test-AzureRmCdnCustomDomain', 'Get-AzureRmCdnCustomDomain',
8484
'New-AzureRmCdnCustomDomain', 'Remove-AzureRmCdnCustomDomain',
85-
'Get-AzureRmCdnProfileResourceUsage',
86-
'Get-AzureRmCdnEndpointResourceUsage',
87-
'Get-AzureRmCdnSubscriptionResourceUsage', 'Get-AzureRmCdnEdgeNodes'
85+
'Enable-AzureRmCdnCustomDomain', 'Disable-AzureRmCdnCustomDomain',
86+
'Get-AzureRmCdnProfileResourceUsage', 'Confirm-AzureRmCdnEndpointProbeUrl',
87+
'Get-AzureRmCdnEndpointResourceUsage', 'Get-AzureRmCdnProfileSupportedOptimizationType',
88+
'Get-AzureRmCdnSubscriptionResourceUsage',
89+
'Get-AzureRmCdnEdgeNodes'
8890

8991
# Variables to export from this module
9092
# VariablesToExport = @()

‎src/ResourceManager/Cdn/AzureRM.Cdn.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ CmdletsToExport = 'Get-AzureRmCdnProfile', 'Get-AzureRmCdnProfileSsoUrl',
8282
'Start-AzureRmCdnEndpoint', 'Stop-AzureRmCdnEndpoint',
8383
'Test-AzureRmCdnCustomDomain', 'Get-AzureRmCdnCustomDomain',
8484
'New-AzureRmCdnCustomDomain', 'Remove-AzureRmCdnCustomDomain',
85-
'Get-AzureRmCdnProfileResourceUsage',
86-
'Get-AzureRmCdnEndpointResourceUsage',
85+
'Enable-AzureRmCdnCustomDomain', 'Disable-AzureRmCdnCustomDomain',
86+
'Get-AzureRmCdnProfileResourceUsage', 'Confirm-AzureRmCdnEndpointProbeUrl',
87+
'Get-AzureRmCdnEndpointResourceUsage', 'Get-AzureRmCdnProfileSupportedOptimizationType',
8788
'Get-AzureRmCdnSubscriptionResourceUsage',
8889
'Get-AzureRmCdnEdgeNodes'
8990

@@ -142,4 +143,3 @@ PrivateData = @{
142143
# DefaultCommandPrefix = ''
143144

144145
}
145-

‎src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.csproj

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,11 @@
5252
<Reference Include="Microsoft.Azure.Gallery">
5353
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Microsoft.Azure.Management.Authorization">
56-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
57-
<Private>True</Private>
55+
<Reference Include="Microsoft.Azure.Management.Authorization, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.1\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
5857
</Reference>
59-
<Reference Include="Microsoft.Azure.Management.Cdn">
60-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Cdn.3.0.0-preview\lib\net45\Microsoft.Azure.Management.Cdn.dll</HintPath>
58+
<Reference Include="Microsoft.Azure.Management.Cdn, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Cdn.4.0.1-preview\lib\net452\Microsoft.Azure.Management.Cdn.dll</HintPath>
6160
</Reference>
6261
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6362
<SpecificVersion>False</SpecificVersion>
@@ -139,12 +138,21 @@
139138
<None Include="ScenarioTests\SubscriptionTests.ps1">
140139
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
141140
</None>
141+
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.CustomDomainTests\TestCustomDomainEnableDisableWithRunningEndpoint.json">
142+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
143+
</None>
142144
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.CustomDomainTests\TestCustomDomainGetRemoveWithRunningEndpoint.json">
143145
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
144146
</None>
145147
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.CustomDomainTests\TestCustomDomainGetRemoveWithStoppedEndpoint.json">
146148
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
147149
</None>
150+
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.EndpointTests\EndpointValidateProbeUrl.json">
151+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
152+
</None>
153+
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.EndpointTests\TestEndpointCreateWithDsa.json">
154+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
155+
</None>
148156
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.EndpointTests\TestEndpointCrudAndAction.json">
149157
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
150158
</None>
@@ -172,6 +180,9 @@
172180
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.OriginTests\TestOriginGetSetWithStoppedEndpoint.json">
173181
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
174182
</None>
183+
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\ProfileGetSupportedOptimizationType.json">
184+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
185+
</None>
175186
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\TestProfileCrud.json">
176187
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
177188
</None>

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/CustomDomainTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ public CustomDomainTests(Xunit.Abstractions.ITestOutputHelper output)
2828
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2929
}
3030

31+
[Fact]
32+
[Trait(Category.AcceptanceType, Category.CheckIn)]
33+
public void TestCustomDomainEnableDisableWithRunningEndpoint()
34+
{
35+
TestController.NewInstance.RunPowerShellTest(_logger, "Test-CustomDomainEnableDisableWithRunningEndpoint");
36+
}
37+
3138
[Fact]
3239
[Trait(Category.AcceptanceType, Category.CheckIn)]
3340
public void TestCustomDomainGetRemoveWithRunningEndpoint()

0 commit comments

Comments
 (0)