Skip to content

Commit 3ca8232

Browse files
wyunchi-mswyunchi-ms
authored
Merge pull request #11156 from wyunchi-ms/wyunchi/bugfix/stack-edge-build
Fix the problem that stack edge is filtered by stack
2 parents 5308f8b + 29fb1f7 commit 3ca8232

File tree

8 files changed

+72
-53
lines changed

8 files changed

+72
-53
lines changed

‎src/CosmosDB/CosmosDB/Az.CosmosDB.psd1

Lines changed: 63 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 1/21/2020
6+
# Generated on: 2020-02-20
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.1.0'
15+
ModuleVersion = '0.1.1'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
@@ -74,49 +74,62 @@ NestedModules = @('Microsoft.Azure.PowerShell.Cmdlets.CosmosDB.dll')
7474
FunctionsToExport = @()
7575

7676
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
77-
CmdletsToExport = 'Get-AzCosmosDBSqlContainer',
78-
'Get-AzCosmosDBSqlContainerThroughput', 'Get-AzCosmosDBSqlDatabase',
79-
'Get-AzCosmosDBSqlDatabaseThroughput',
80-
'Get-AzCosmosDBSqlStoredProcedure', 'Get-AzCosmosDBSqlTrigger',
81-
'Get-AzCosmosDBSqlUserDefinedFunction',
82-
'Set-AzCosmosDBSqlStoredProcedure', 'Set-AzCosmosDBSqlTrigger',
83-
'Set-AzCosmosDBSqlUserDefinedFunction',
84-
'Remove-AzCosmosDBSqlStoredProcedure',
85-
'Remove-AzCosmosDBSqlTrigger',
86-
'Remove-AzCosmosDBSqlUserDefinedFunction',
87-
'New-AzCosmosDBSqlConflictResolutionPolicy',
88-
'New-AzCosmosDBSqlIndexingPolicy', 'New-AzCosmosDBSqlUniqueKey',
89-
'New-AzCosmosDBSqlUniqueKeyPolicy', 'Remove-AzCosmosDBSqlContainer',
90-
'Remove-AzCosmosDBSqlDatabase', 'Set-AzCosmosDBSqlContainer',
91-
'Set-AzCosmosDBSqlDatabase', 'New-AzCosmosDBAccount',
92-
'Remove-AzCosmosDBAccount', 'Get-AzCosmosDBAccount',
93-
'Get-AzCosmosDBAccountKey', 'New-AzCosmosDBAccountKey',
94-
'Update-AzCosmosDBAccount', 'Update-AzCosmosDBAccountRegion',
95-
'Update-AzCosmosDBAccountFailoverPriority',
96-
'New-AzCosmosDBVirtualNetworkRule', 'New-AzCosmosDBLocationObject',
97-
'New-AzCosmosDBSqlSpatialSpec', 'New-AzCosmosDBSqlCompositePath',
98-
'New-AzCosmosDBSqlIncludedPath', 'New-AzCosmosDBSqlIncludedPathIndex',
99-
'Get-AzCosmosDBGremlinDatabase', 'Get-AzCosmosDBGremlinDatabaseThroughput',
100-
'Get-AzCosmosDBGremlinGraph', 'Get-AzCosmosDBGremlinGraphThroughput',
101-
'Remove-AzCosmosDBGremlinDatabase', 'Remove-AzCosmosDBGremlinGraph',
102-
'Set-AzCosmosDBGremlinDatabase', 'Set-AzCosmosDBGremlinGraph',
103-
'New-AzCosmosDBGremlinIndexingPolicy', 'New-AzCosmosDBGremlinUniqueKey',
104-
'New-AzCosmosDBGremlinUniqueKeyPolicy', 'New-AzCosmosDBGremlinSpatialSpec',
105-
'New-AzCosmosDBGremlinCompositePath', 'New-AzCosmosDBGremlinConflictResolutionPolicy',
106-
'New-AzCosmosDBGremlinIncludedPath', 'New-AzCosmosDBGremlinIncludedPathIndex',
107-
'Get-AzCosmosDBTable', 'Get-AzCosmosDBTableThroughput',
108-
'Remove-AzCosmosDBTable', 'Set-AzCosmosDBTable',
109-
'Get-AzCosmosDBCassandraKeyspace', 'Get-AzCosmosDBCassandraKeyspaceThroughput',
110-
'Get-AzCosmosDBCassandraTable', 'Get-AzCosmosDBCassandraTableThroughput',
111-
'New-AzCosmosDBCassandraClusterKey', 'New-AzCosmosDBCassandraColumn',
112-
'New-AzCosmosDBCassandraSchema', 'Remove-AzCosmosDBCassandraKeyspace',
113-
'Remove-AzCosmosDBCassandraTable', 'Set-AzCosmosDBCassandraKeyspace',
114-
'Set-AzCosmosDBCassandraTable', 'Get-AzCosmosDBMongoDBCollection',
115-
'Get-AzCosmosDBMongoDBCollectionThroughput', 'Get-AzCosmosDBMongoDBDatabase',
116-
'Get-AzCosmosDBMongoDBDatabaseThroughput', 'Remove-AzCosmosDBMongoDBCollection',
117-
'Remove-AzCosmosDBMongoDBDatabase', 'Set-AzCosmosDBMongoDBCollection',
118-
'Set-AzCosmosDBMongoDBDatabase', 'New-AzCosmosDBMongoDBIndex'
119-
77+
CmdletsToExport = 'Get-AzCosmosDBSqlContainer',
78+
'Get-AzCosmosDBSqlContainerThroughput', 'Get-AzCosmosDBSqlDatabase',
79+
'Get-AzCosmosDBSqlDatabaseThroughput',
80+
'Get-AzCosmosDBSqlStoredProcedure', 'Get-AzCosmosDBSqlTrigger',
81+
'Get-AzCosmosDBSqlUserDefinedFunction',
82+
'Set-AzCosmosDBSqlStoredProcedure', 'Set-AzCosmosDBSqlTrigger',
83+
'Set-AzCosmosDBSqlUserDefinedFunction',
84+
'Remove-AzCosmosDBSqlStoredProcedure',
85+
'Remove-AzCosmosDBSqlTrigger',
86+
'Remove-AzCosmosDBSqlUserDefinedFunction',
87+
'New-AzCosmosDBSqlConflictResolutionPolicy',
88+
'New-AzCosmosDBSqlIndexingPolicy', 'New-AzCosmosDBSqlUniqueKey',
89+
'New-AzCosmosDBSqlUniqueKeyPolicy', 'Remove-AzCosmosDBSqlContainer',
90+
'Remove-AzCosmosDBSqlDatabase', 'Set-AzCosmosDBSqlContainer',
91+
'Set-AzCosmosDBSqlDatabase', 'New-AzCosmosDBAccount',
92+
'Remove-AzCosmosDBAccount', 'Get-AzCosmosDBAccount',
93+
'Get-AzCosmosDBAccountKey', 'New-AzCosmosDBAccountKey',
94+
'Update-AzCosmosDBAccount', 'Update-AzCosmosDBAccountRegion',
95+
'Update-AzCosmosDBAccountFailoverPriority',
96+
'New-AzCosmosDBVirtualNetworkRule', 'New-AzCosmosDBLocationObject',
97+
'New-AzCosmosDBSqlSpatialSpec', 'New-AzCosmosDBSqlCompositePath',
98+
'New-AzCosmosDBSqlIncludedPath',
99+
'New-AzCosmosDBSqlIncludedPathIndex',
100+
'Get-AzCosmosDBGremlinDatabase',
101+
'Get-AzCosmosDBGremlinDatabaseThroughput',
102+
'Get-AzCosmosDBGremlinGraph',
103+
'Get-AzCosmosDBGremlinGraphThroughput',
104+
'Remove-AzCosmosDBGremlinDatabase', 'Remove-AzCosmosDBGremlinGraph',
105+
'Set-AzCosmosDBGremlinDatabase', 'Set-AzCosmosDBGremlinGraph',
106+
'New-AzCosmosDBGremlinIndexingPolicy',
107+
'New-AzCosmosDBGremlinUniqueKey',
108+
'New-AzCosmosDBGremlinUniqueKeyPolicy',
109+
'New-AzCosmosDBGremlinSpatialSpec',
110+
'New-AzCosmosDBGremlinCompositePath',
111+
'New-AzCosmosDBGremlinConflictResolutionPolicy',
112+
'New-AzCosmosDBGremlinIncludedPath',
113+
'New-AzCosmosDBGremlinIncludedPathIndex', 'Get-AzCosmosDBTable',
114+
'Get-AzCosmosDBTableThroughput', 'Remove-AzCosmosDBTable',
115+
'Set-AzCosmosDBTable', 'Get-AzCosmosDBCassandraKeyspace',
116+
'Get-AzCosmosDBCassandraKeyspaceThroughput',
117+
'Get-AzCosmosDBCassandraTable',
118+
'Get-AzCosmosDBCassandraTableThroughput',
119+
'New-AzCosmosDBCassandraClusterKey',
120+
'New-AzCosmosDBCassandraColumn', 'New-AzCosmosDBCassandraSchema',
121+
'Remove-AzCosmosDBCassandraKeyspace',
122+
'Remove-AzCosmosDBCassandraTable',
123+
'Set-AzCosmosDBCassandraKeyspace', 'Set-AzCosmosDBCassandraTable',
124+
'Get-AzCosmosDBMongoDBCollection',
125+
'Get-AzCosmosDBMongoDBCollectionThroughput',
126+
'Get-AzCosmosDBMongoDBDatabase',
127+
'Get-AzCosmosDBMongoDBDatabaseThroughput',
128+
'Remove-AzCosmosDBMongoDBCollection',
129+
'Remove-AzCosmosDBMongoDBDatabase',
130+
'Set-AzCosmosDBMongoDBCollection', 'Set-AzCosmosDBMongoDBDatabase',
131+
'New-AzCosmosDBMongoDBIndex'
132+
120133
# Variables to export from this module
121134
# VariablesToExport = @()
122135

@@ -150,7 +163,11 @@ PrivateData = @{
150163
# IconUri = ''
151164

152165
# ReleaseNotes of this module
153-
ReleaseNotes = '* Preview release of ''Az.CosmosDB'' module'
166+
ReleaseNotes = '* Added cmdlets for Gremlin, MongoDB, Cassandra and Table APIs.
167+
* Updated .NET SDK Version to 1.0.1
168+
- .NET SDK Version used in the CosmosDB-Account and SQL cmdlets is updated to 1.0.1
169+
* Added parameters ConflictResolutionPolicyMode, ConflictResolutionPolicyPath and ConflictResolutionPolicyPath in Set-AzCosmosDBSqlContainer.
170+
* Added new cmdlets for Sql API : New-CosmosDBSqlSpatialSpec, New-CosmosDBSqlCompositePath, New-CosmosDBSqlIncludedPathIndex, New-CosmosDBSqlIncludedPath'
154171

155172
# Prerelease string of this module
156173
# Prerelease = ''

‎src/CosmosDB/CosmosDB/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020

2121
## Upcoming Release
22+
23+
## Version 0.1.1
2224
* Added cmdlets for Gremlin, MongoDB, Cassandra and Table APIs.
2325
* Updated .NET SDK Version to 1.0.1
2426
- .NET SDK Version used in the CosmosDB-Account and SQL cmdlets is updated to 1.0.1

‎src/CosmosDB/CosmosDB/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("d90791a2-8102-47fc-8150-de25ae796eb1")]
28-
[assembly: AssemblyVersion("0.1.0")]
29-
[assembly: AssemblyFileVersion("0.1.0")]
28+
[assembly: AssemblyVersion("0.1.1")]
29+
[assembly: AssemblyFileVersion("0.1.1")]

‎tools/CheckAssemblies.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $DependencyMap = Import-Csv -Path $DependencyMapPath
2525
$ModuleManifestFiles = $ProjectPaths | ForEach-Object { Get-ChildItem -Path $_ -Filter "*.psd1" -Recurse | Where-Object { $_.FullName -like "*$($BuildConfig)*" -and `
2626
$_.FullName -notlike "*Netcore*" -and `
2727
$_.FullName -notlike "*dll-Help.psd1*" -and `
28-
$_.FullName -notlike "*Stack*" } }
28+
($_.FullName -notlike "*Stack*" -or $_.FullName -like "*StackEdge*") } }
2929

3030
foreach ($ModuleManifest in $ModuleManifestFiles) {
3131
Write-Host "checking $($ModuleManifest.Fullname)"

‎tools/CreateAliasMapping.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $mapping = [ordered]@{}
22

33
$psd1s = Get-ChildItem -Path $PSScriptRoot/../src -Recurse | `
44
Where-Object {($_.Name -like "*AzureRM*psd1" -or $_.Name -eq "Azure.AnalysisServices.psd1" -or $_.Name -eq "Azure.Storage.psd1") `
5-
-and $_.FullName -notlike "*Stack*" -and $_.FullName -notlike "*`\Package`\*" -and $_.FullName -notlike "*Test*" -and $_.FullName -notlike "*`\bin`\*" -and $_.FullName -notlike "*`\obj`\*"}
5+
-and ($_.FullName -notlike "*Stack*" -or $_.FullName -like "*StackEdge*") -and $_.FullName -notlike "*`\Package`\*" -and $_.FullName -notlike "*Test*" -and $_.FullName -notlike "*`\bin`\*" -and $_.FullName -notlike "*`\obj`\*"}
66

77
$psd1s | ForEach-Object {
88
$name = (($_.Name -replace "AzureRM", "Az") -replace "Azure", "Az") -replace ".psd1", "" -replace "RecoveryServices.SiteRecovery", "RecoveryServices" -replace "RecoveryServices.Backup", "RecoveryServices"

‎tools/CreateFilterMappings.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ function Add-SolutionReference
198198
[string]$ServiceFolderPath
199199
)
200200

201-
$CsprojFiles = Get-ChildItem -Path $ServiceFolderPath -Filter "*.csproj" -Recurse | Where-Object { $_.FullName -notlike "*Stack*" -and $_.FullName -notlike "*.Test*" }
201+
$CsprojFiles = Get-ChildItem -Path $ServiceFolderPath -Filter "*.csproj" -Recurse | Where-Object { ($_.FullName -notlike "*Stack*" -or $_.FullName -like "*StackEdge*") -and $_.FullName -notlike "*.Test*" }
202202
foreach ($CsprojFile in $CsprojFiles)
203203
{
204204
$Key = $CsprojFile.BaseName

‎tools/CreateMappings.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $results = @{};
1616
$warnings = @();
1717

1818
# Find all cmdlet names by help file names in the repository.
19-
$cmdlets = Get-ChildItem $RootPath -Recurse | Where-Object { $_.FullName -cmatch ".*\\help\\.*-.*.md" -and $_.Fullname -notlike "*Stack*" };
19+
$cmdlets = Get-ChildItem $RootPath -Recurse | Where-Object { $_.FullName -cmatch ".*\\help\\.*-.*.md" -and ($_.FullName -notlike "*Stack*" -or $_.FullName -like "*StackEdge*") };
2020

2121
$k = 0;
2222
$cmdlets | ForEach-Object {

‎tools/RunVersionController.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function Get-ReleaseNotes
134134
$_.FullName -notlike "*Debug*" -and `
135135
$_.FullName -notlike "*Netcore*" -and `
136136
$_.FullName -notlike "*dll-Help.psd1*" -and `
137-
$_.FullName -notlike "*Stack*" } }
137+
($_.FullName -notlike "*Stack*" -or $_.FullName -like "*StackEdge*") } }
138138

139139
Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $ModuleManifestFile.DirectoryName -FileName $ModuleManifestFile.Name
140140
return $ModuleMetadata.PrivateData.PSData.ReleaseNotes

0 commit comments

Comments
 (0)