Skip to content

Commit f9fdbbb

Browse files
huangpfhuangpf
committed
Merge pull request #168 from huangpf/dev
Dev
2 parents 74436c7 + 3f9baa7 commit f9fdbbb

File tree

154 files changed

+1813
-310
lines changed

Some content is hidden

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

154 files changed

+1813
-310
lines changed

‎src/Common/Commands.Common.Authentication.Test/Commands.Common.Authentication.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<Private>True</Private>
8585
</Reference>
8686
<Reference Include="Moq">
87-
<HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
87+
<HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
8888
</Reference>
8989
<Reference Include="Newtonsoft.Json">
9090
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

‎src/Common/Commands.Common.Authentication.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.0.2" targetFramework="net45" />
1313
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
15-
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
15+
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
1616
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1717
<package id="xunit" version="2.1.0" targetFramework="net45" />
1818
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />

‎src/Common/Commands.Common/Commands.Common.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@
159159
<Compile Include="RecordingTracingInterceptor.cs" />
160160
<Compile Include="ClientCreatedArgs.cs" />
161161
<Compile Include="CmdletExtensions.cs" />
162-
<Compile Include="ServiceClientTracingInterceptor.cs" />
163162
<Compile Include="TestMockSupport.cs" />
164163
<Compile Include="Properties\AssemblyInfo.cs" />
165164
<Compile Include="ValidateGuidNotEmpty.cs" />

‎src/Common/Commands.Common/ServiceClientTracingInterceptor.cs

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎src/Common/Commands.Common/TestMockSupport.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ public static void Delay(int milliSeconds)
2929
{
3030
System.Threading.Thread.Sleep(milliSeconds);
3131
}
32+
else
33+
{
34+
System.Threading.Thread.Yield();
35+
}
3236
}
3337

3438
public static void Delay(TimeSpan duration)
@@ -37,6 +41,10 @@ public static void Delay(TimeSpan duration)
3741
{
3842
System.Threading.Thread.Sleep(duration);
3943
}
44+
else
45+
{
46+
System.Threading.Thread.Yield();
47+
}
4048
}
4149
}
4250
}

‎src/Common/Storage/Azure.Storage.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,27 @@ ModuleList = @()
9191
FileList = @()
9292

9393
# Private data to pass to the module specified in ModuleToProcess
94-
PrivateData = ''
94+
PrivateData = @{
95+
96+
PSData = @{
97+
98+
# Tags applied to this module. These help with module discovery in online galleries.
99+
# Tags = @()
100+
101+
# A URL to the license for this module.
102+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
103+
104+
# A URL to the main website for this project.
105+
ProjectUri = 'https://github.com/Azure/azure-powershell'
106+
107+
# A URL to an icon representing this module.
108+
# IconUri = ''
109+
110+
# ReleaseNotes of this module
111+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
112+
113+
} # End of PSData hashtable
114+
115+
} # End of PrivateData hashtable
95116

96117
}

‎src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,27 @@ ModuleList = @()
8181
FileList = @()
8282

8383
# Private data to pass to the module specified in ModuleToProcess
84-
PrivateData = ''
84+
PrivateData = @{
85+
86+
PSData = @{
87+
88+
# Tags applied to this module. These help with module discovery in online galleries.
89+
# Tags = @()
90+
91+
# A URL to the license for this module.
92+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
93+
94+
# A URL to the main website for this project.
95+
ProjectUri = 'https://github.com/Azure/azure-powershell'
96+
97+
# A URL to an icon representing this module.
98+
# IconUri = ''
99+
100+
# ReleaseNotes of this module
101+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
102+
103+
} # End of PSData hashtable
104+
105+
} # End of PrivateData hashtable
85106

86107
}

‎src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,27 @@ ModuleList = @()
8484
FileList = @()
8585

8686
# Private data to pass to the module specified in ModuleToProcess
87-
PrivateData = ''
87+
PrivateData = @{
88+
89+
PSData = @{
90+
91+
# Tags applied to this module. These help with module discovery in online galleries.
92+
# Tags = @()
93+
94+
# A URL to the license for this module.
95+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
96+
97+
# A URL to the main website for this project.
98+
ProjectUri = 'https://github.com/Azure/azure-powershell'
99+
100+
# A URL to an icon representing this module.
101+
# IconUri = ''
102+
103+
# ReleaseNotes of this module
104+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
105+
106+
} # End of PSData hashtable
107+
108+
} # End of PrivateData hashtable
88109

89110
}

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,27 @@ ModuleList = @()
8181
FileList = @()
8282

8383
# Private data to pass to the module specified in ModuleToProcess
84-
PrivateData = ''
84+
PrivateData = @{
85+
86+
PSData = @{
87+
88+
# Tags applied to this module. These help with module discovery in online galleries.
89+
# Tags = @()
90+
91+
# A URL to the license for this module.
92+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
93+
94+
# A URL to the main website for this project.
95+
ProjectUri = 'https://github.com/Azure/azure-powershell'
96+
97+
# A URL to an icon representing this module.
98+
# IconUri = ''
99+
100+
# ReleaseNotes of this module
101+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
102+
103+
} # End of PSData hashtable
104+
105+
} # End of PrivateData hashtable
85106

86107
}

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,27 @@ ModuleList = @()
8181
FileList = @()
8282

8383
# Private data to pass to the module specified in ModuleToProcess
84-
PrivateData = ''
84+
PrivateData = @{
85+
86+
PSData = @{
87+
88+
# Tags applied to this module. These help with module discovery in online galleries.
89+
# Tags = @()
90+
91+
# A URL to the license for this module.
92+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
93+
94+
# A URL to the main website for this project.
95+
ProjectUri = 'https://github.com/Azure/azure-powershell'
96+
97+
# A URL to an icon representing this module.
98+
# IconUri = ''
99+
100+
# ReleaseNotes of this module
101+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
102+
103+
} # End of PSData hashtable
104+
105+
} # End of PrivateData hashtable
85106

86107
}

‎src/ResourceManager/Automation/AzureRM.Automation.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,27 @@ ModuleList = @()
8383
FileList = @()
8484

8585
# Private data to pass to the module specified in ModuleToProcess
86-
PrivateData = ''
86+
PrivateData = @{
87+
88+
PSData = @{
89+
90+
# Tags applied to this module. These help with module discovery in online galleries.
91+
# Tags = @()
92+
93+
# A URL to the license for this module.
94+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
95+
96+
# A URL to the main website for this project.
97+
ProjectUri = 'https://github.com/Azure/azure-powershell'
98+
99+
# A URL to an icon representing this module.
100+
# IconUri = ''
101+
102+
# ReleaseNotes of this module
103+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
104+
105+
} # End of PSData hashtable
106+
107+
} # End of PrivateData hashtable
87108

88109
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@
107107
<SpecificVersion>False</SpecificVersion>
108108
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
109109
</Reference>
110-
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
110+
<Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
111111
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
112+
<HintPath>..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
113113
</Reference>
114114
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
115115
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Automation/Commands.Automation.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<package id="Microsoft.Rest.ClientRuntime" version="2.0.1" targetFramework="net45" />
1515
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
17-
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
17+
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1919
<package id="xunit" version="2.1.0" targetFramework="net45" />
2020
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />

‎src/ResourceManager/Automation/Commands.Automation/Microsoft.Azure.Commands.ResourceManager.Automation.dll-help.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,27 @@ ModuleList = @()
8181
FileList = @()
8282

8383
# Private data to pass to the module specified in ModuleToProcess
84-
PrivateData = ''
84+
PrivateData = @{
85+
86+
PSData = @{
87+
88+
# Tags applied to this module. These help with module discovery in online galleries.
89+
# Tags = @()
90+
91+
# A URL to the license for this module.
92+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
93+
94+
# A URL to the main website for this project.
95+
ProjectUri = 'https://github.com/Azure/azure-powershell'
96+
97+
# A URL to an icon representing this module.
98+
# IconUri = ''
99+
100+
# ReleaseNotes of this module
101+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
102+
103+
} # End of PSData hashtable
104+
105+
} # End of PrivateData hashtable
85106

86107
}

‎src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,27 @@ ModuleList = @()
8585
FileList = @()
8686

8787
# Private data to pass to the module specified in ModuleToProcess
88-
PrivateData = ''
88+
PrivateData = @{
89+
90+
PSData = @{
91+
92+
# Tags applied to this module. These help with module discovery in online galleries.
93+
# Tags = @()
94+
95+
# A URL to the license for this module.
96+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
97+
98+
# A URL to the main website for this project.
99+
ProjectUri = 'https://github.com/Azure/azure-powershell'
100+
101+
# A URL to an icon representing this module.
102+
# IconUri = ''
103+
104+
# ReleaseNotes of this module
105+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
106+
107+
} # End of PSData hashtable
108+
109+
} # End of PrivateData hashtable
89110

90111
}

0 commit comments

Comments
 (0)