Skip to content

[Release 4.3.0] Merge master --> preview #4448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 106 commits into from
Aug 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
acc35fa
fixed dsc cmdlets to get more than 100
balukambala Aug 6, 2016
9ef9080
Made changes to logic such that customer can terminate cmdlet while c…
balukambala Jul 19, 2017
3987800
update setroledef command to find the roledefinition based on ID and …
darshanhs90 Jul 21, 2017
1b0cfc5
fix the logic for calls and update session records
darshanhs90 Jul 26, 2017
3806b74
add tests for rdupdate
darshanhs90 Jul 27, 2017
4a45f28
update the command code
darshanhs90 Jul 27, 2017
499e9aa
fix merge conflicts
darshanhs90 Jul 27, 2017
4429b9f
update automerged code
darshanhs90 Jul 27, 2017
4bb66e3
Relay RP version 2017-04-01 changes
Jul 28, 2017
e8537bb
removed app.config
Jul 28, 2017
d6a30a8
Newtonsoft package version corrected.
Jul 28, 2017
d70b8eb
Session record.
Jul 28, 2017
55337f8
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Jul 28, 2017
0b28baf
Add-AzureAnalysisServicesAccount to support login with Service Principal
liangyong79 Jul 31, 2017
28baa4a
EventHub RP version 2017-04-01 changes
Jul 31, 2017
ec6eabb
Servicebus RP version 2017-04-01 changes
Jul 31, 2017
c8d053c
review comments.
Jul 31, 2017
3c7cb8f
Merge branch 'preview' into preview
liangyong79 Jul 31, 2017
00e9354
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Jul 31, 2017
2c3a0f4
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Jul 31, 2017
f43a906
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Jul 31, 2017
ab6f0eb
corrected prj file
Jul 31, 2017
0fe82e9
Updated changelog and Resolved the issue where the Verbose streams st…
balukambala Aug 1, 2017
dc0c059
Opt in user to telemetry by default, send HashMacAddress as a part of…
cormacpayne Aug 1, 2017
1deb07a
Added test cases for DSC cmdlets
balukambala Aug 1, 2017
20e1f04
made changes to remove the conflict
balukambala Aug 1, 2017
2a04f96
resolved conflicts with azure powershell preview branch
balukambala Aug 1, 2017
4f3a8a9
Removed the wait statement
Aug 1, 2017
8694c98
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Aug 1, 2017
fee05ee
Add RunCommand cmdlets,
hyonholee Aug 1, 2017
1bbc4df
Resolve review feedback
cormacpayne Aug 1, 2017
70cecfc
Removed the analysis services exception addition from breaking changes.
Aug 1, 2017
192febd
Update Compute change log
hyonholee Aug 1, 2017
7a20a7c
Added ResourceGroup to Namespace Attribute
Aug 1, 2017
65e83a3
Remove 'Input' string from the names of RunCommand cmdlets.
hyonholee Aug 1, 2017
da06db9
Autoinflate parameter set correction
Aug 2, 2017
3d09961
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Aug 2, 2017
6650d37
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Aug 2, 2017
d14fc18
Remove position value for Switch parameters.
hyonholee Aug 2, 2017
b257b6f
Allow piping for RunCommandInput
hyonholee Aug 2, 2017
2866b76
Update Compute help files.
hyonholee Aug 2, 2017
bbaa57a
updated the Dependencies
Aug 3, 2017
5f5c14a
updated with review comments.
Aug 3, 2017
1b73dfc
Update HashMacAddress calculation
cormacpayne Aug 3, 2017
18bad62
Review comments
Aug 3, 2017
4fe3dc1
nuget
Aug 3, 2017
25ce462
updated the parameterset
Aug 3, 2017
c71d4c4
Address review comments - update help file and add test
liangyong79 Aug 3, 2017
1670ff4
Merge branch 'preview' of https://github.com/liangyong79/azure-powers…
liangyong79 Aug 3, 2017
2bab6f0
Removed the dependencies from croj and package.config files
Aug 3, 2017
837f146
Fixed merge issue in change log
balukambala Aug 3, 2017
6eb47f6
Removed dependencies
Aug 3, 2017
870e53b
Change -RunCommandInput parameter to -InputObject
hyonholee Aug 3, 2017
d4bbb8f
Remove usage of CheckIfInteractive method in base cmdlet classes
cormacpayne Aug 3, 2017
d574793
Removed extra dependencies
Aug 3, 2017
392bdc6
Updated the Parametersets with attributes
Aug 3, 2017
5b4aac5
Removed TestClass attribute
balukambala Aug 3, 2017
f1c8c93
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Aug 3, 2017
751f660
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Aug 3, 2017
8dbd037
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Aug 3, 2017
0c144af
from Preview
Aug 3, 2017
12ed188
Remove runCommand cmdlets
hyonholee Aug 3, 2017
de8cceb
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
Aug 3, 2017
a4d48ac
Update module versions for August release of Azure PowerShell
cormacpayne Aug 3, 2017
47535ea
Address review comments 2 - remove dependency to Microsoft.Azure.Comm…
liangyong79 Aug 3, 2017
6af8281
Change boolean parameter to SwitchParameter
hyonholee Aug 4, 2017
a2d81f5
Corrected the markdown
Aug 4, 2017
f5c0fcb
fixed signatureissues
Aug 4, 2017
6ec1172
Merge pull request #4397 from hyonholee/preview
cormacpayne Aug 4, 2017
f9acea2
Merge pull request #4380 from v-Ajnava/Relaypwr2017
cormacpayne Aug 4, 2017
de1d2b3
Merge pull request #4338 from balukambala/preview
cormacpayne Aug 4, 2017
57c6598
fixed the signature issue
Aug 4, 2017
544546d
Add back SubscriptionId and TenantId for visual studio script compati…
markcowl Aug 4, 2017
f145ccd
Merge pull request #4348 from darshanhs90/settoledeffix
markcowl Aug 4, 2017
b700071
Update SignatureIssues.csv
cormacpayne Aug 4, 2017
8ba2bdd
Update version bump criteria for "preview" modules
cormacpayne Aug 4, 2017
4aeb0d1
Fix failing Profile test
cormacpayne Aug 4, 2017
f4c9f4d
Merge pull request #4363 from v-Ajnava/SBpwr2017
cormacpayne Aug 4, 2017
0c0b56e
Merge branch 'release-4.3.0' into EHpwr2017
cormacpayne Aug 4, 2017
e7d65f3
Update Profile change log
cormacpayne Aug 4, 2017
e3f7b70
Update ClientRuntime version to latest
cormacpayne Aug 4, 2017
b1345f2
Address review comments 3 - Mark RolloutEnvironment as optional param…
liangyong79 Aug 4, 2017
e9a4cb3
Merge pull request #4414 from markcowl/vssubid
cormacpayne Aug 4, 2017
497a8de
Merge pull request #4389 from liangyong79/preview
markcowl Aug 5, 2017
bcb395c
Merge pull request #4408 from cormacpayne/release-4.3.0
markcowl Aug 5, 2017
d804d5f
Merge pull request #4415 from cormacpayne/clientruntime-update
markcowl Aug 5, 2017
ea9b657
Corrected BreakingChangeIssues.csv
Aug 6, 2017
33c51f7
Move environment variable declaration to test constructor from contro…
cormacpayne Aug 7, 2017
7d81fa2
Adding RunOn support and other issue fixes.
vrdmr Jun 14, 2017
4e1081c
Update change logs and release notes for August release
cormacpayne Aug 7, 2017
c09c61c
Merge pull request #4307 from v-Ajnava/EHpwr2017
cormacpayne Aug 7, 2017
ff4bde9
Add extension methods to enable and disable data collection for tests
cormacpayne Aug 7, 2017
173e94a
Fix misplaced yaml strings, wrongly formatted output headers, and add…
cormacpayne Aug 7, 2017
d8a4425
Adding support for IncrementNodeConfigurationBuild
vrdmr Jul 13, 2017
1fa63f7
Add output for cmdlets missing the field
cormacpayne Aug 7, 2017
884a396
Merge pull request #4349 from vrdmr/vameru-runon-issue-fixes
cormacpayne Aug 7, 2017
2efa86e
Merge branch 'release-4.3.0' into vameru-nodeconfig-changes
vrdmr Aug 7, 2017
89dd272
Merge pull request #4352 from vrdmr/vameru-nodeconfig-changes
markcowl Aug 8, 2017
f3ad702
Merge pull request #4421 from cormacpayne/fix-help
markcowl Aug 8, 2017
fa08219
Update failing Storage tests
cormacpayne Aug 8, 2017
4fd2472
Merge pull request #4396 from cormacpayne/telemetry-fix
markcowl Aug 8, 2017
39579d9
Merge branch 'release-4.3.0' of https://github.com/Azure/azure-powers…
cormacpayne Aug 8, 2017
8aaf643
Update license uri in module manifests
cormacpayne Aug 8, 2017
e2335ed
Fix error in EventHub psd1 file
cormacpayne Aug 8, 2017
25d427d
Merge pull request #4425 from cormacpayne/update-change-log
markcowl Aug 9, 2017
99d490a
Merge pull request #4447 from Azure/release-4.3.0
cormacpayne Aug 9, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
108 changes: 107 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,110 @@
## 2017.07.17 - Version 4.2.1
## 2017.08.07 - Version 4.3.0
* AnalysisServices
* Fixed bug in Set-AzureRmAnalysisServciesServer
- When admin was not provided, the admin will be removed.
* Added BackupBlobContainerUri in New-AzureRmAnalysisServicesServer and Set-AzureRmAnalysisServicesServer
- Enable to set/disable backup blob container for backup/restore Azure Analysis Services Server
* Updated Sku lookup in New-AzureRmAnalysisServicesServer and Set-AzureRmAnalysisServicesServer
- Changed hard coded Sku into dynamic lookup.
* Add-AzureAnalysisServicesAccount to support login with Service Principal
* Automation
* Made changes to AutomationDSC* cmdlets to pull more than 100 records
* Resolved the issue where the Verbose streams stop working after calling some Automation cmdlets (for example Get-AzureRmAutomationVariable, Get-AzureRmAutomationJob).
* Support for NodeConfiguration Build versioning added in StartAzureAutomationDscCompilationJob and ImportAzureAutomationDscNodeConfiguration.
* Bug fixes for existing issues - Fixes the alias issue is #3775 and the runOn alias and support for HybridWorkers.
* Compute
* Set-AzureRmVMAEMExtension: Add support for new Premium Disk sizes
* Set-AzureRmVMAEMExtension: Add support for M series
* Add ForceUpdateTag parameter to Add-AzureRmVmssExtension
* Add Primary parameter to New-AzureRmVmssIpConfig
* Add EnableAcceleratedNetworking parameter to Add-AzureRmVmssNetworkInterfaceConfig
* Add InstanceId to Set-AzureRmVmss
* Expose MaintenanceRedeployStatus to Get-AzureRmVM -Status output
* Expose Restriction and Capability to the table format of Get-AzureRmComputeResourceSku
* DataLakeStore
* Fix for issue: https://github.com/Azure/azure-powershell/issues/4323
* EventHub
* added ResourceGroup property to NamespaceAttributes
- 'ResourceGroup' Gets the name of the resource group the Namespace is in
* updated commandlets with new parameter and parameter alias
- below cmdlets updated with Parametersets for Namespace and EventHub for operation of AuthorizationRule
- New-AzureRmEventHubAuthorizationRule
+ Adds a new AuthorizationRule to the existing NameSpace or EventHub.
- Get-AzureRmEventHubAuthorizationRule
+ Gets AuthorizationRule / List of AuthorizationRules for the existing NameSpace or EventHub.
- Set-AzureRmEventHubAuthorizationRule
+ Updates properties of existing AuthorizationRule of EventHub NameSpace.
- Remove-AzureRmEventHubAuthorizationRule
+ Deletes the existing AuthorizationRule of existing NameSpace or EventHub.
- New-AzureRmEventHubKey
+ Generates a new Primary/Secondary Key for AuthorizationRule of existing NameSpace or EventHub.
- Get-AzureRmEventHubKey
+ Gets Primary/Secondary Key for AuthorizationRule of existing NameSpace or EventHub.
* Network
* New-AzureRmExpressRouteCircuitPeeringConfig: Added IPv6 support. New optional parameter added
- PeerAddressType
* Set-AzureRmExpressRouteCircuitPeeringConfig: Added IPv6 support. New optional parameter added
- PeerAddressType
* Remove-AzureRmExpressRouteCircuitPeeringConfig: Added IPv6 support. New optional parameter added
- PeerAddressType
* Marked parameter -ProbeEnabled as obsolete
- Add-AzureRmApplicationGatewayBackendHttpSettings
- New-AzureRmApplicationGatewayBackendHttpSettings
- Set-AzureRmApplicationGatewayBackendHttpSettings
* Profile
* Data collection has been enabled by default. Usage data is collected by Microsoft in order to improve the user experience. The data is anonymous and does not include command-line argument values.
- Use the Disable-AzureRmDataCollection cmdlet to turn the feature off
- Use the Enable-AzureRmDataCollection cmdlet to turn this feature on
* Resources
* Add Support for validation of scopes for the following roledefinition and roleassignment commandlets before sending the request to ARM
- Get-AzureRMRoleAssignment
- New-AzureRMRoleAssignment
- Remove-AzureRMRoleAssignment
- Get-AzureRMRoleDefinition
- New-AzureRMRoleDefinition
- Remove-AzureRMRoleDefinition
- Set-AzureRMRoleDefinition
* ServiceBus
* Added below new commandlets for AuthorizationRules for NameSpace, Queue and Topic. according to parameter set the authorization rule orperations are perfomed.
- New-AzureRmServiceBusAuthorizationRule
- Adds a new AuthorizationRule to the existing ServiceBus NameSpace/Queue/Topic.
- Get-AzureRmServiceBusAuthorizationRule
- Gets AuthorizationRule / List of AuthorizationRules for the existing ServiceBus NameSpace/Queue/Topic.
- Set-AzureRmServiceBusAuthorizationRule
- Updates properties of existing AuthorizationRule of Servicebus NameSpace/Queue/Topic.
- New-AzureRmServiceBusKey
- Generates a new Primary/Secondary Key for AuthorizationRule of existing ServiceBus NameSpace/Queue/Topic.
- Get-AzureRmServiceBusKey
- Gets Primary/Secondary Key for AuthorizationRule of existing ServiceBus NameSpace/Queue/Topic.
- Remove-AzureRmServiceBusNamespaceAuthorizationRule
- Deletes the existing AuthorizationRule of ServiceBus NameSpace/Queue/Topic.
* Added Resource Group property to NamespceAttributes
* Sql
* Updating Set-AzureRmSqlServerTransparentDataEncryptionProtector to display a warning and require confirmation if the Encryption Protector Type is being set to AzureKeyVault
* Adding new updated cmdlets for Auditing settings
- Adding Get-AzureRmSqlDatabaseAuditing cmdlet which gets the auditing settings of an Azure SQL database.
- Adding Get-AzureRmSqlServerAuditing cmdlet which gets the auditing settings of an Azure SQL server.
- Adding Set-AzureRmSqlDatabaseAuditing cmdlet which changes the auditing settings for an Azure SQL database.
- Adding Set-AzureRmSqlServerAuditing cmdlet which changes the auditing settings of an Azure SQL server.
* Deprecating the existing Auditing policy cmdlets
- Deprecating Get-AzureRmSqlDatabaseAuditingPolicy
- Deprecating Get-AzureRmSqlServerAuditingPolicy
- Deprecating Set-AzureRmSqlDatabaseAuditingPolicy
- Deprecating Set-AzureRmSqlServerAuditingPolicy
- Deprecating Use-AzureRmSqlServerAuditingPolicy
- Deprecating Remove-AzureRmSqlDatabaseAuditing
- Deprecating Remove-AzureRmSqlServerAuditing
* Schema file parsing for Update-AzureRmSqlSyncGroup is now case insensitive.
* Storage
* Add NeworkRule support to resource mode storage account cmdlets
- New-AzureRmStorageAccount
- Set-AzureRmStorageAccount
- Get-AzureRmStorageAccountNetworkRuleSet
- Update-AzureRmStorageAccountNetworkRuleSet
- Add-AzureRmStorageAccountNetworkRule
- Remove-AzureRmStorageAccountNetworkRule

## 2017.07.17 - Version 4.2.1
* Compute
- Fix issue with VM DIsk and VM Disk snapshot create and update cmdlets, (link)[https://github.com/azure/azure-powershell/issues/4309]
- New-AzureRmDisk
Expand Down
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="local-feed" value="tools/LocalFeed" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
</packageSources>
Expand Down
4 changes: 2 additions & 2 deletions setup/azurecmd.wxs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">

<?define productName="Microsoft Azure PowerShell - July 2017" ?>
<?define productName="Microsoft Azure PowerShell - August 2017" ?>
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>

<?define version="4.2.1" ?>
<?define version="4.3.0" ?>

<Product Id="*"
Name="$(var.productName)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.7\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.8\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common.Authentication/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.7" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.8" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.8\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands.Common.Authorization/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.8" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.8\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands.Common.Graph.RBAC/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net452" />
<package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.8" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.8\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands.Common.Network/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.8" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
</packages>
43 changes: 7 additions & 36 deletions src/Common/Commands.Common/AzureDataCmdlet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,48 +111,19 @@ protected override void SaveDataCollectionProfile()
WriteWarning(string.Format(Resources.DataCollectionSaveFileInformation, fileFullPath));
}

protected override void PromptForDataCollectionProfileIfNotExists()
protected override void SetDataCollectionProfileIfNotExists()
{
// Initialize it from the environment variable or profile file.
InitializeDataCollectionProfile();

if (!_dataCollectionProfile.EnableAzureDataCollection.HasValue && CheckIfInteractive())
if (_dataCollectionProfile.EnableAzureDataCollection.HasValue)
{
WriteWarning(Resources.DataCollectionPrompt);

const double timeToWaitInSeconds = 60;
var status = string.Format(Resources.DataCollectionConfirmTime, timeToWaitInSeconds);
ProgressRecord record = new ProgressRecord(0, Resources.DataCollectionActivity, status);

var startTime = DateTime.Now;
var endTime = DateTime.Now;
double elapsedSeconds = 0;

while (!this.Host.UI.RawUI.KeyAvailable && elapsedSeconds < timeToWaitInSeconds)
{
TestMockSupport.Delay(10 * 1000);
endTime = DateTime.Now;

elapsedSeconds = (endTime - startTime).TotalSeconds;
record.PercentComplete = ((int)elapsedSeconds * 100 / (int)timeToWaitInSeconds);
WriteProgress(record);
}

bool enabled = false;
if (this.Host.UI.RawUI.KeyAvailable)
{
KeyInfo keyInfo =
this.Host.UI.RawUI.ReadKey(ReadKeyOptions.NoEcho | ReadKeyOptions.AllowCtrlC |
ReadKeyOptions.IncludeKeyDown);
enabled = (keyInfo.Character == 'Y' || keyInfo.Character == 'y');
}

_dataCollectionProfile.EnableAzureDataCollection = enabled;
return;
}

WriteWarning(enabled ? Resources.DataCollectionConfirmYes : Resources.DataCollectionConfirmNo);
WriteWarning(Resources.RDFEDataCollectionMessage);

SaveDataCollectionProfile();
}
_dataCollectionProfile.EnableAzureDataCollection = true;
SaveDataCollectionProfile();
}

protected override void InitializeQosEvent()
Expand Down
Loading