Skip to content

Commit 454f253

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#6267 from sergey-shandar/sergey-signalr-strategy4
SignalR: Merge from preview
2 parents 01cc744 + 1a19e38 commit 454f253

File tree

1,684 files changed

+594647
-3395229
lines changed

Some content is hidden

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

1,684 files changed

+594647
-3395229
lines changed

‎Azure.PowerShell.Netcore.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.AnalysisServices.D
145145
EndProject
146146
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Storage.Netcore", "src\Storage\Commands.Storage\Commands.Storage.Netcore.csproj", "{4F18000A-0329-4450-ADC8-8AA1C04A4666}"
147147
EndProject
148+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Common.Websites.Netcore", "src\Common\Commands.Common.Websites\Common.Websites.Netcore.csproj", "{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}"
149+
EndProject
148150
Global
149151
GlobalSection(SolutionConfigurationPlatforms) = preSolution
150152
Debug|Any CPU = Debug|Any CPU
@@ -1007,6 +1009,18 @@ Global
10071009
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x64.Build.0 = Release|Any CPU
10081010
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x86.ActiveCfg = Release|Any CPU
10091011
{4F18000A-0329-4450-ADC8-8AA1C04A4666}.Release|x86.Build.0 = Release|Any CPU
1012+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1013+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.Build.0 = Debug|Any CPU
1014+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x64.ActiveCfg = Debug|Any CPU
1015+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x64.Build.0 = Debug|Any CPU
1016+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x86.ActiveCfg = Debug|Any CPU
1017+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|x86.Build.0 = Debug|Any CPU
1018+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|Any CPU.ActiveCfg = Release|Any CPU
1019+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|Any CPU.Build.0 = Release|Any CPU
1020+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|x64.ActiveCfg = Release|Any CPU
1021+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|x64.Build.0 = Release|Any CPU
1022+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|x86.ActiveCfg = Release|Any CPU
1023+
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|x86.Build.0 = Release|Any CPU
10101024
EndGlobalSection
10111025
GlobalSection(SolutionProperties) = preSolution
10121026
HideSolutionNode = FALSE

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ For the Storage data plane project, this change log is located at `src\Storage\C
117117

118118
#### Breaking Changes
119119

120-
Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell, see [here](documentation/breaking-changes/breaking-changes-definition.md).
120+
Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell and how to declare them in the code using the [various breaking change attributes](documentation/breaking-changes/breaking-changes-attribute-help.md), see [here](documentation/breaking-changes/breaking-changes-definition.md).
121121

122122
Whenever a service team announces a breaking change, they must add it to the `upcoming-breaking-changes.md` file in their respective service folder. When the service team is ready to release the module with the breaking change, they must move the corresponding information from `upcoming-breaking-changes.md` into the `current-breaking-changes.md` file located in their service folder.
123123

‎ChangeLog.md

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,66 @@
1-
## 6.0.0 - May 2018
1+
## 6.1.0 - May 2018
2+
#### AzureRM.Profile
3+
* Fix issue where running 'Clear-AzureRmContext' would keep an empty context with the name of the previous default context, which prevented the user from creating a new context with the old name
4+
5+
#### AzureRM.AnalysisServices
6+
* Enable Gateway assocaite/disassociate operations on AS.
7+
8+
#### AzureRM.ApiManagement
9+
* Added support for ApiVersions, ApiReleases and ApiRevisions
10+
* Added suppport for ServiceFabric Backend
11+
* Added support for Application Insights Logger
12+
* Added support for recognizing 'Basic' sku as a valid sku of Api Management service
13+
* Added support for installing Certificates issued by private CA as Root or CA
14+
* Added support for accepting Custom SSL certificates via KeyVault and Multiple proxy hostnames
15+
* Added support for MSI identity
16+
* Added support for accepting Policies via Url
17+
NOTE: The following cmdlets will be deprecated in future release
18+
- Import-AzureRmApiManagementHostnameCertificate
19+
- New-AzureRmApiManagementHostnameConfiguration
20+
- Set-AzureRmApiManagementHostnames
21+
- Update-AzureRmApiManagementDeployment
22+
23+
#### AzureRM.Batch
24+
* Release new cmdlet Get-AzureBatchPoolNodeCounts
25+
* Release new cmdlet Start-AzureBatchComputeNodeServiceLogUpload
26+
27+
#### AzureRM.Consumption
28+
* Add new parameters Expand, ResourceGroup, InstanceName, InstanceId, Tags, and Top on Cmdlet Get-AzureRmConsumptionUsageDetail
29+
30+
#### AzureRM.DataLakeStore
31+
* Fix example for Export-AzureRmDataLakeStoreChildItemProperties
32+
* Fix null parameter exception for Recurse case in Set-AzureRmDataLakeStoreItemAclEntry
33+
* Fix the help files for Set-AzureRmDataLakeStoreItemAclEntry, Set-AzureRmDataLakeStoreItemAcl, Remove-AzureRmDataLakeStoreItemAclEntry
34+
35+
#### AzureRM.Network
36+
* Bump up Network SDK version from 18.0.0-preview to 19.0.0-preview
37+
* Added cmdlet to create protocol configuration
38+
- New-AzureRmNetworkWatcherProtocolConfiguration
39+
* Added cmdlet to add a new circuit connection to an existing express route circuit.
40+
- Add-AzureRmExpressRouteCircuitConnectionConfig
41+
* Added cmdlet to remove a circuit connection from an existing express route circuit.
42+
- Remove-AzureRmExpressRouteCircuitConnectionConfig
43+
* Added cmdlet to retrieve a circuit connection
44+
- Get-AzureRmExpressRouteCircuitConnectionConfig
45+
46+
#### AzureRM.ServiceFabric
47+
* Fixed server authentication usage with generated certificates (Issue #5998)
48+
49+
#### AzureRM.Sql
50+
* Updated Auditing cmdlets to allow removing AuditActions or AuditActionGroups
51+
* Fixed issue with Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy when setting a new flexible retention policy where the command would fail with 'Configure long term retention policy with azure recovery service vault and policy is no longer supported. Please submit request with the new flexible retention policy'.
52+
* Update all Azure Sql Database/ElasticPool Creation/Update related cmdlets to use the new Database API, which support Sku property for scale and tier-related properties.
53+
* The updated cmdlets including:
54+
- New-AzureRmSqlDatabase; Set-AzureRmSqlDatabase
55+
- New-AzureRmSqlElasticPool; Set-AzureRmSqlElasticPool
56+
- New-AzureRmSqlDatabaseCopy
57+
- New-AzureRmSqlDatabaseSecondary
58+
- Restore-AzureRmSqlDatabase
59+
60+
#### AzureRM.TrafficManager
61+
* Update the parameters for 'Get-AzureRmTrafficManagerProfile' so that -ResourceGroupName parameter is required when using -Name parameter.
62+
63+
## 6.0.0 - May 2018
264
#### General
365
* Set minimum dependency of modules to PowerShell 5.0
466

‎LICENSE.txt

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,25 +184,44 @@ BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT
184184
incurred by, or claims asserted against, such Contributor by reason
185185
of your accepting any such warranty or additional liability.
186186

187-
-------------------END OF LICENSE-------------------------------
187+
-------------------END OF LICENSE------------------------------------------
188188

189-
The software includes the AutoMapper library ("AutoMapper"). The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
190189

191-
----------------START OF LICENSE--------------------------------
190+
----------------START OF THIRD PARTY NOTICE--------------------------------
191+
192+
193+
The software includes the AutoMapper library ("AutoMapper"). The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
192194

193195
Provided for Informational Purposes Only
194196

195197
AutoMapper
196198

197199
The MIT License (MIT)
198-
199200
Copyright (c) 2010 Jimmy Bogard
200201

202+
201203
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
202204

203205
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
204206

205207
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
206208

207-
-------------END OF LICENSE----------------------------------------
209+
210+
211+
212+
213+
214+
***************
215+
216+
The software includes Newtonsoft.Json. The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
217+
218+
Newtonsoft.Json
219+
220+
The MIT License (MIT)
221+
Copyright (c) 2007 James Newton-King
222+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
223+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
224+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
225+
226+
-------------END OF THIRD PARTY NOTICE----------------------------------------
208227

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ build_script:
2020

2121
test: off
2222
on_success:
23-
- git clone -q --branch=%target_branch% %content_repo% %TEMP%\Azure
23+
- git clone -q --branch=%source_branch% %content_repo% %TEMP%\Azure
2424
- cd %TEMP%\Azure
2525
- ps: ls C:\docs -dir | % { copy $_.FullName . -Recurse -Force }
2626
- git add -A
27-
- 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"
27+
- git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %source_branch%:%target_branch% -f && appveyor AddMessage "Content Updated"

0 commit comments

Comments
 (0)