Skip to content

Commit 7f5e9fc

Browse files
author
dragonfly91
committed
Revert "Merge pull request #210 from MabOneSdk/release"
This reverts commit 6392926, reversing changes made to 23dcb27.
1 parent a5b35dc commit 7f5e9fc

File tree

2,214 files changed

+113408
-318670
lines changed

Some content is hidden

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

2,214 files changed

+113408
-318670
lines changed

AzurePowershell.Test.targets

Lines changed: 11 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@
2424
<OperationalInsightsTestDebug>.\src\ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\bin\Debug\Microsoft.Azure.Commands.OperationalInsights.Test.dll</OperationalInsightsTestDebug>
2525
<BatchTestDebug>.\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
2626
<WebsitesTestDebug>.\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll</WebsitesTestDebug>
27-
<LogicAppTestDebug>.\src\ResourceManager\LogicApp\Commands.LogicApp.Test\bin\Debug\Microsoft.Azure.Commands.LogicApp.Test.dll</LogicAppTestDebug>
2827
<RemoteAppTestDebug>.\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll</RemoteAppTestDebug>
2928
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
3029
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
3130
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
32-
<StorageTestDebug>.\src\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
31+
<StorageTestDebug>.\src\Common\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
3332
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
3433
<DataLakeAnalyticsTestDebug>.\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll</DataLakeAnalyticsTestDebug>
3534
<DataLakeStoreTestDebug>.\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeStore.Test.dll</DataLakeStoreTestDebug>
@@ -66,7 +65,6 @@
6665
<AsmXUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
6766
</ItemGroup>
6867
<ItemGroup Condition=" '$(scope)' == 'all' ">
69-
<XUnitTests Include=".\tools\StaticAnalysis\StaticAnalysis.Test\bin\Debug\StaticAnalysis.Test.dll"/>
7068
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
7169
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
7270
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
@@ -78,16 +76,13 @@
7876
<XUnitTests Include=".\src\ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\bin\Debug\Microsoft.Azure.Commands.OperationalInsights.Test.dll"/>
7977
<XUnitTests Include=".\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
8078
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
81-
<XUnitTests Include=".\src\ResourceManager\LogicApp\Commands.LogicApp.Test\bin\Debug\Microsoft.Azure.Commands.LogicApp.Test.dll"/>
8279
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
8380
<XUnitTests Include=".\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
8481
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
8582
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
8683
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
8784
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
88-
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
89-
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
90-
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
85+
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
9186
<XUnitTests Include="@(AsmXUnitTests)"/>
9287
</ItemGroup>
9388
<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">
@@ -101,37 +96,19 @@
10196
<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
10297
<Message Importance="high" Text="Running XUnit tests" />
10398
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
104-
105-
<xunit
106-
Assemblies="@(XUnitTests)"
107-
AppDomains="true"
108-
ShadowCopy="false"
109-
ParallelizeTestCollections="false"
110-
ParallelizeAssemblies="true"
111-
IncludeTraits="AcceptanceType=CheckIn"
112-
Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
113-
MaxParallelThreads="10"
114-
DiagnosticMessages="false"
115-
ContinueOnError="false"
116-
Condition=" @(XUnitTests) != '' "/>
99+
<Exec
100+
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -parallel none -maxthreads 0 -trait &quot;AcceptanceType=CheckIn&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
101+
Timeout="$(TestTimeout)" ContinueOnError="false" Condition=" @(XUnitTests) != '' "/>
102+
<OnError ExecuteTargets="TimeoutErrorHandler"/>
117103
</Target>
118104

119105
<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
120106
<Message Importance="high" Text="Running XUnit tests" />
121107
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
122-
123-
<xunit
124-
Assemblies="@(XUnitTests)"
125-
AppDomains="true"
126-
ShadowCopy="false"
127-
ParallelizeTestCollections="false"
128-
ParallelizeAssemblies="true"
129-
ExcludeTraits="RunType=LiveOnly"
130-
Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
131-
MaxParallelThreads="10"
132-
DiagnosticMessages="false"
133-
ContinueOnError="false"
134-
Condition=" @(XUnitTests) != '' "/>
108+
<Exec
109+
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -notrait &quot;RunType=LiveOnly&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
110+
Timeout="$(TestTimeout)" ContinueOnError="false"/>
111+
<OnError ExecuteTargets="TimeoutErrorHandler"/>
135112
</Target>
136113

137114
<Target Name="TimeoutErrorHandler">
@@ -186,12 +163,6 @@
186163
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
187164
</Target>
188165

189-
<Target Name="TestLogicApp">
190-
<Xunit.Runner.MSBuild.xunit Assemblies="$(LogicAppTestDebug)" Html="$(TestOutputDirectory)\LogicAppTestDebug.xunit.dll.html" Verbose="false"
191-
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
192-
</Target>
193-
194-
195166
<Target Name="TestDataFactoryManager">
196167
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataFactoryManagerTestDebug)" Html="$(TestOutputDirectory)\DataFactoryManagerTestDebug.xunit.dll.html" Verbose="false"
197168
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
@@ -479,7 +450,7 @@
479450

480451
<Target Name="LiveTests">
481452
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
482-
<Exec Command="packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
453+
<Exec Command="packages\xunit.runners.1.9.2\tools\xunit.console.clr4.exe @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
483454
</Target>
484455

485456

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Contribute Code or Provide Feedback
22

3-
If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.io/guidelines/).
3+
If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
44

55
If you encounter any bugs with Microsoft Azure PowerShell please file an issue in the [Issues](https://github.com/Azure/azure-powershell/issues) section of the project.

ChangeLog.md

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,3 @@
1-
##2016.03.30 version 1.2.3
2-
* Azure Storage
3-
* Made Protocol parameter in following cmdlets to be nullable and optional
4-
- New-AzureStorageBlobSASToken
5-
- New-AzureStorageContainerSASToken
6-
- New-AzureStorageFileSASToken
7-
- New-AzureStorageShareSASToken
8-
- New-AzureStorageQueueSASToken
9-
- New-AzureStorageTableSASToken
10-
- New-AzureStorageAccountSASToken
11-
12-
##2016.03.03 version 1.2.2
13-
* Azure Compute (ARM):
14-
* Add -LicenseType parameter to New-AzureRmVM for bring your own license (BYOL)
15-
* Add -SecureExecution parameter to Set-AzureRmVMCustomScriptExtension
16-
* Add -DisableAutoUpgradeMinorVersion and -ForceRerun parameters to Set-AzureRmVMExtension
17-
* Add Set-AzureRmVMPlan cmdlet
18-
* Add -Redeploy parameter to Set-AzureRmVM
19-
* Add AutoUpgradeMinorVersion and ForceUpdateTag parameters for Get-AzureRmVMExtension
20-
* Update positions of parameters for New-AzureRmVM
21-
* Azure Compute (Service Management):
22-
* Add Set-AzureBootDiagnostics cmdlets
23-
* Enable boot diagnostics by default for New-AzureVM and New-AzureQuickVM
24-
* Azure LogicApp: New cmdlets for managing LogicApps
25-
* Get-AzureLogicAppAccessKey
26-
* Get-AzureLogicApp
27-
* Get-AzureLogicAppRunAction
28-
* Get-AzureLogicAppRunHistory
29-
* Get-AzureLogicAppTrigger
30-
* Get-AzureLogicAppTriggerHistory
31-
* New-AzureLogicApp
32-
* Remove-AzureLogicApp
33-
* Start-AzureLogicApp
34-
* Set-AzureLogicAppAccessKey
35-
* Set-AzureLogicApp
36-
* Stop-AzureLogicAppRun
37-
* Azure Storage
38-
* Added cmdlet to generate SAS token against storage account
39-
- New-AzureStorageAccountSASToken
40-
* Added IPAddressOrRange/Protocol support in cmdlets to generate SAS token against blob, container, file, share, table, queue
41-
- New-AzureStorageBlobSASToken
42-
- New-AzureStorageContainerSASToken
43-
- New-AzureStorageFileSASToken
44-
- New-AzureStorageShareSASToken
45-
- New-AzureStorageQueueSASToken
46-
- New-AzureStorageTableSASToken
47-
* Azure SQL DB Backup/restore
48-
* Get-AzureRmSqlDatabaseGeoBackup
49-
* Get-AzureRmSqlDeletedDatabaseBackup
50-
* Restore-AzureRmSqlDatabase
51-
* This cmdlet accepts as pipelined input the result of one of the first two cmdlets (or Get-AzureRmSqlDatabase if restoring a live DB to a point-in-time)
52-
53-
## 2016.02.04 version 1.2.1
54-
* Fix installer issue - remove PSGallery modules on install
55-
561
## 2016.02.03 version 1.2.0
572
* Azure RemoteApp:
583
* Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.

0 commit comments

Comments
 (0)