Permalink
Browse files

Merge pull request #637 from WindowsAzure/0.6.8

0.6.8
  • Loading branch information...
André Rodrigues
André Rodrigues committed Nov 22, 2012
2 parents 62a1908 + eeeac16 commit 3cc4b349c04c9efb065066636eb29e50af72c59a
Showing with 8,227 additions and 188 deletions.
  1. +6 −1 ChangeLog.txt
  2. +2 −2 WindowsAzurePowershell/setup/azurecmd.wxs
  3. +4 −4 WindowsAzurePowershell/src/Management.CloudService.Test/Management.CloudService.Test.csproj
  4. +1 −1 WindowsAzurePowershell/src/Management.CloudService.Test/Properties/AssemblyInfo.cs
  5. +4 −4 WindowsAzurePowershell/src/Management.CloudService/Management.CloudService.csproj
  6. +1 −1 WindowsAzurePowershell/src/Management.CloudService/Properties/AssemblyInfo.cs
  7. +1 −1 WindowsAzurePowershell/src/Management.SqlDatabase.Test/Properties/AssemblyInfo.cs
  8. +4 −4 WindowsAzurePowershell/src/Management.SqlDatabase/Management.SqlDatabase.csproj
  9. +1 −1 WindowsAzurePowershell/src/Management.SqlDatabase/Properties/AssemblyInfo.cs
  10. +1 −0 WindowsAzurePowershell/src/Management.Test/Management.Test.csproj
  11. +1 −1 WindowsAzurePowershell/src/Management.Test/Properties/AssemblyInfo.cs
  12. +15 −0 WindowsAzurePowershell/src/Management.Test/Resources/ValidProfile2.PublishSettings
  13. +10 −0 WindowsAzurePowershell/src/Management.Test/TestData/Data.cs
  14. +16 −0 WindowsAzurePowershell/src/Management.Test/Tests/Cmdlets/ImportAzurePublishSettingsTest.cs
  15. +0 −6 WindowsAzurePowershell/src/Management.WebSites.Test/Management.WebSites.Test.csproj
  16. +1 −1 WindowsAzurePowershell/src/Management.WebSites.Test/Properties/AssemblyInfo.cs
  17. +4 −5 WindowsAzurePowershell/src/Management.WebSites.Test/UnitTests/Cmdlets/GetAzureWebSiteTests.cs
  18. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/Common/DeploymentBaseCmdlet.cs
  19. +2 −3 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/Common/WebsiteContextBaseCmdlet.cs
  20. +2 −2 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/Common/WebsitesBaseCmdlet.cs
  21. +2 −4 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/NewAzureWebSite.cs
  22. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/RemoveAzureWebSite.cs
  23. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/RestartAzureWebsite.cs
  24. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/SetAzureWebsite.cs
  25. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/ShowAzureWebsite.cs
  26. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/StartAzureWebSite.cs
  27. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Cmdlets/StopAzureWebSite.cs
  28. +4 −4 WindowsAzurePowershell/src/Management.WebSites/Management.WebSites.csproj
  29. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Properties/AssemblyInfo.cs
  30. +2 −2 WindowsAzurePowershell/src/Management.WebSites/Services/GitClient.cs
  31. +9 −1 WindowsAzurePowershell/src/Management.WebSites/Services/Github/GithubAuthHeaderInserter.cs
  32. +21 −8 WindowsAzurePowershell/src/Management.WebSites/Services/GithubClient.cs
  33. +1 −0 WindowsAzurePowershell/src/Management.WebSites/Services/IWebsitesServiceManagement.cs
  34. +11 −3 WindowsAzurePowershell/src/Management.WebSites/Services/LinkedRevisionControl.cs
  35. +24 −38 WindowsAzurePowershell/src/Management.WebSites/Services/WebEntities/SiteConfig.cs
  36. +1 −1 WindowsAzurePowershell/src/Management.WebSites/Services/WebsitesExtensionMethods.cs
  37. +98 −64 WindowsAzurePowershell/src/Management/Cmdlets/Common/CloudBaseCmdlet.cs
  38. +10 −8 WindowsAzurePowershell/src/Management/Management.csproj
  39. +1 −1 WindowsAzurePowershell/src/Management/Properties/AssemblyInfo.cs
  40. +20 −7 WindowsAzurePowershell/src/Management/Services/GlobalComponents.cs
  41. +21 −2 WindowsAzurePowershell/src/Management/Services/SubscriptionsManager.cs
  42. +48 −0 WindowsAzurePowershell/src/Management/XmlSchema/PublishProfile.cs
  43. +77 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/ClientOutputMessageInspector.cs
  44. +36 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/ConfigurationConstants.cs
  45. +124 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/ErrorHelper.cs
  46. +70 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/ClientOutputMessageInspector.cs
  47. +42 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/Connection.cs
  48. +33 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/ConnectionCollection.cs
  49. +39 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/ConnectionEvent.cs
  50. +35 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/GatewayErrorCode.cs
  51. +36 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/GatewayErrorDetail.cs
  52. +36 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/GatewayEvent.cs
  53. +101 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/GatewayManagementHelper.cs
  54. +39 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/GatewayOperation.cs
  55. +27 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/GatewayOperationAsyncResponse.cs
  56. +24 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/GatewayOperationStatus.cs
  57. +62 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/GatewayServiceManagementExtensions.cs
  58. +73 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/IGatewayServiceManagement.cs
  59. +28 −0 ...wsAzurePowershell/src/ServiceManagement.Additions/Gateway/IGatewayServiceManagementExternalApi.cs
  60. +24 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/ProvisioningState.cs
  61. +31 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/SharedKey.cs
  62. +34 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/UpdateConnection.cs
  63. +31 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/UpdateConnectionOperation.cs
  64. +31 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/UpdateGateway.cs
  65. +25 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/UpdateGatewayOperation.cs
  66. +37 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Gateway/VnetGateway.cs
  67. BIN WindowsAzurePowershell/src/ServiceManagement.Additions/MSSharedLibKey.snk
  68. +42 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/Properties/AssemblyInfo.cs
  69. +11 −0 ...owsAzurePowershell/src/ServiceManagement.Additions/ReadmeBeforeUpdateServiceManagementVersion.txt
  70. +168 −0 WindowsAzurePowershell/src/ServiceManagement.Additions/ServiceManagement.Additions.csproj
  71. +99 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/AffinityGroup.cs
  72. +85 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/Certificates.cs
  73. +464 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/Deployment.cs
  74. +82 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/Disk.cs
  75. +432 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/DurableVMRole.cs
  76. +164 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/HostedService.cs
  77. +141 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/Image.cs
  78. +97 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/Networking.cs
  79. +84 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/OSImage.cs
  80. +68 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/OperatingSystem.cs
  81. +40 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/OperationTracking.cs
  82. +158 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/StorageService.cs
  83. +54 −0 WindowsAzurePowershell/src/ServiceManagement/Contract/Subscription.cs
  84. BIN WindowsAzurePowershell/src/ServiceManagement/MSSharedLibKey.snk
  85. +45 −0 WindowsAzurePowershell/src/ServiceManagement/Properties/AssemblyInfo.cs
  86. +121 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/AffinityGroup.cs
  87. +81 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/Certificates.cs
  88. +111 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/Constants.cs
  89. +347 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/Deployment.cs
  90. +107 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/Disk.cs
  91. +1,005 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/DurableVMRole.cs
  92. +65 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/ExtendedProperties.cs
  93. +224 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/HostedService.cs
  94. +178 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/IMergable.cs
  95. +41 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/IServiceManagementExternalApi.cs
  96. +183 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/Image.cs
  97. +242 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/Networking.cs
  98. +173 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/OSImage.cs
  99. +96 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/OperatingSystem.cs
  100. +39 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/OperationTracking.cs
  101. +204 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/Role.cs
  102. +92 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/ServiceManagementError.cs
  103. +251 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/ServiceManagementHelper.cs
  104. +304 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/ServiceManagementHelper2.cs
  105. +188 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/StorageService.cs
  106. +286 −0 WindowsAzurePowershell/src/ServiceManagement/ResourceModel/Subscription.cs
  107. +167 −0 WindowsAzurePowershell/src/ServiceManagement/ServiceManagement.csproj
  108. +36 −0 WindowsAzurePowershell/src/WindowsAzurePowershell.sln
  109. BIN WindowsAzurePowershell/src/lib/Microsoft.Samples.WindowsAzure.ServiceManagement.dll
  110. BIN WindowsAzurePowershell/src/lib/Microsoft.WindowsAzure.Management.Service.dll
  111. BIN WindowsAzurePowershell/src/lib/Microsoft.WindowsAzure.Management.ServiceManagement.dll
View
@@ -1,3 +1,8 @@
+2012.11.21 Version 0.6.8
+ * Multiple bugfixes
+ * Added dedicated cache role support
+ * Added github support
+
2012.10.08 Version 0.6.5
* Adding websites cmdlets
@@ -24,4 +29,4 @@
* iisnode 0.1.13
2011.12.09 Version 0.5.0
- * Initial Release
+ * Initial Release
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define productName="Windows Azure PowerShell - October 2012" ?>
+ <?define productName="Windows Azure PowerShell - November 2012" ?>
<?define sourceDir="$(var.SolutionDir)..\..\Package\$(var.Configuration)" ?>
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
- <?define version="0.6.7" ?>
+ <?define version="0.6.8" ?>
<?define azureSdkVersion="1.7" ?>
<?define versionedStartMenuFolder="Windows Azure" ?>
@@ -76,10 +76,6 @@
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Microsoft.Samples.WindowsAzure.ServiceManagement, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\Microsoft.Samples.WindowsAzure.ServiceManagement.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -174,6 +170,10 @@
<Project>{CD5AA507-F5EF-473D-855B-84B91A1ABE54}</Project>
<Name>Management</Name>
</ProjectReference>
+ <ProjectReference Include="..\ServiceManagement\ServiceManagement.csproj">
+ <Project>{559a16c7-b11c-4aa6-8c16-8adeca6abed7}</Project>
+ <Name>ServiceManagement</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Resources\testruntimemanifest.xml" />
@@ -41,4 +41,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.6.7")]
+[assembly: AssemblyFileVersion("0.6.8")]
@@ -104,10 +104,6 @@
<DelaySign>true</DelaySign>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Microsoft.Samples.WindowsAzure.ServiceManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\Microsoft.Samples.WindowsAzure.ServiceManagement.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.WindowsAzure.Management.ServiceManagement">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Microsoft.WindowsAzure.Management.ServiceManagement.dll</HintPath>
@@ -407,6 +403,10 @@
<Project>{CD5AA507-F5EF-473D-855B-84B91A1ABE54}</Project>
<Name>Management</Name>
</ProjectReference>
+ <ProjectReference Include="..\ServiceManagement\ServiceManagement.csproj">
+ <Project>{559a16c7-b11c-4aa6-8c16-8adeca6abed7}</Project>
+ <Name>ServiceManagement</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
@@ -44,7 +44,7 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.6.7")]
+[assembly: AssemblyFileVersion("0.6.8")]
#if SIGN
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Management.CloudService.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
#else
@@ -41,4 +41,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.6.7")]
+[assembly: AssemblyFileVersion("0.6.8")]
@@ -104,10 +104,6 @@
<DelaySign>true</DelaySign>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Microsoft.Samples.WindowsAzure.ServiceManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\Microsoft.Samples.WindowsAzure.ServiceManagement.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Microsoft.WindowsAzure.StorageClient.dll</HintPath>
@@ -201,6 +197,10 @@
<Project>{CD5AA507-F5EF-473D-855B-84B91A1ABE54}</Project>
<Name>Management</Name>
</ProjectReference>
+ <ProjectReference Include="..\ServiceManagement\ServiceManagement.csproj">
+ <Project>{559a16c7-b11c-4aa6-8c16-8adeca6abed7}</Project>
+ <Name>ServiceManagement</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Microsoft.WindowsAzure.Management.SqlDatabase.dll-Help.xml">
@@ -44,7 +44,7 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.6.7")]
+[assembly: AssemblyFileVersion("0.6.8")]
#if SIGN
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Management.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Management.SqlDatabase.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
@@ -119,6 +119,7 @@
</ItemGroup>
<ItemGroup>
<None Include="MSSharedLibKey.snk" />
+ <None Include="Resources\ValidProfile2.PublishSettings" />
<None Include="Resources\ValidProfile.PublishSettings" />
</ItemGroup>
<ItemGroup>
@@ -27,4 +27,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.6.7")]
+[assembly: AssemblyFileVersion("0.6.8")]
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishData>
+ <PublishProfile
+ SchemaVersion="2.0"
+ PublishMethod="AzureServiceManagementAPI">
+ <Subscription
+ ServiceManagementUrl="https://newmanagement.core.windows.net/"
+ Id="pp68c8ef-f470-4cdd-cm07-f4cce809ga9g"
+Name="Sample Subscription 1" ManagementCertificate="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"/>
+ <Subscription
+ ServiceManagementUrl="https://newmanagement.core.sample.gov/"
+ Id="nn74c8ef-f472-4cgg-cm07-f4rre809mg9g"
+Name="Sample Subscription 2" ManagementCertificate="MIIKDAIBAzCCCcwGCSqGSIb3DQEHAaCCCb0Eggm5MIIJtTCCBe4GCSqGSIb3DQEHAaCCBd8EggXbMIIF1zCCBdMGCyqGSIb3DQEMCgECoIIE7jCCBOowHAYKKoZIhvcNAQwBAzAOBAiwUFBlodDd6gICB9AEggTIeBL4pcNtyF8UrGSv4eu7r1FgSCUhXPKTusqCE07cup5NSv0b7dFQShZ79ynHKr9xjReRdcUa9pt4KjHZ6jnBkybY/Em1naYipBGQmzl/2oANWdo120i6oiUGsXgXJhbuLkbsN58/RPiTaJjkMirJmKDQJeOs4YxBHgSMQO6yVhcGwnPn1ZM71sjNji88SgcuiPJDnZMyLy4oUbFShSxIBj7VTj4TIST2h7srPN3k/0oAGuacjH4toiekjkGTHZSmM+DeqBwig4fdiOppUWAJOX0z1+FX9/0qpBUXuoGEkEVDR2QiP7t8yfrnQ/sr/veWtiakjsoFM2QMxKTAE0pVjAs2U2aXBaCPveWbR4MLcQu5Yc3HEsJv4Gd7/bOXjr6z5L+RVFKgTh8DptgdUmjyi7C4Kszg2/xv9w9AE6Xe/WqNaahYsKaOlbCnhnQ29s9e6iY+R+TMZLfP/u+bQbl1Pl3OczYvHn8jTXeiuY8a2gu2uOJgFDcju15tdCWKr+dyMt0QkNYe6sZhJ+GkzhFHh+loQU/WjNnqM9yuBbqkDvF5PBSdlFiB0HgqH+ujxPPPoq+TuOau6ho7WHMsCAE8APT9S+pX+EVqutZ6BFIw4JVTOUrOq3nZFN4YtyOI6NJeByfKl4OQrUIAr4DdN0doS1/9omDV94MF3g1lqDZohPeF6o2ounZJ8lYp6TOvmlNJL45Cqq3tmJdMsjiJeIzIumPyaHPP/OV+RBrcwOVdzq173YQa+25bb6BQ5+aybhQhyUxQMlrDeb5lDhPL9Cqn7Ae/iHCuCw7UujY+whnCfNaYPi2OTZUBfz+k61IVSKzcR2gPU+sFtK6f8YBmQ2Jmi53dzDC2fF2Ihwts8O5OTIhOQcto7dgeAox9q/oGDZ2jXAEsZbJOQoSJRwH3DL0oYEr7EkeX2xUOIKtzgbfxaDS2j8KyRTBYBUeezFjd1hPOnBC/lQ7By+g1bOBf/sjfL2ImKbaiteuWGYmMMdptz7oSOaBia2AlXWQkNMrTxDlflP/lVgntvGbP6AdbgzDmJKevtgUtYeR8WS6iPtrIWCpOma3+pQwEAxbT17q96brZzDm9jFTyy9KXpzCt19XtiC3zGlzQzeR8+2tX6zoUJpus3/xGBt4BvzQ9ljwtM66VqdLbF+CnCogNKOOheA+oDgy9Cb4IIcnMZxMdegsP5eig0+rmp96FvafwmG5U6G8Ru+OlUyA61aNdYaFvfgFhUU4smbauxaJpP2pVVi4quZmMB3q8k44NUBR048DClplQ/uxmHXezye/1w2ne2vN9P2UIkE5mep4+P0lGPDZHJ6L1NJMmtTGrKlRs+2463pq4XiiBqB1nyj2++uVw9E527Z9kKak5h638E/5Vcx9gWTPH9qVfW++XaIo/dJ+FiON+lqteYJ4He90fTUtCx3TnRXLNYw8rc5l4kjLKA+6cgPGjbrfnTLmJ/5h+QC7RWABKtuaAyceGsIN83hWRubb3kDFsYuDJGU4B0w1GvLkflzKv87EE3+8v8UkCvNzx4E/8HM5t3r9ohaYZOboUMPPco3DJlvHE2SqjLip9ipTme96A7k2/Zun9ls1IfXaVYTNE4vQX0JQVs3J1o2zF4bmEDWHF5oTwl8a0MYHRMBMGCSqGSIb3DQEJFTEGBAQBAAAAMFsGCSqGSIb3DQEJFDFOHkwAewAxAEYAMQAwADUAMQA5AEQALQA5ADEARAA5AC0ANAA4ADQAQgAtADkAMQAyADIALQBGADMAQwA0ADEANQAwADUAMwBGAEIAMQB9MF0GCSsGAQQBgjcRATFQHk4ATQBpAGMAcgBvAHMAbwBmAHQAIABTAG8AZgB0AHcAYQByAGUAIABLAGUAeQAgAFMAdABvAHIAYQBnAGUAIABQAHIAbwB2AGkAZABlAHIwggO/BgkqhkiG9w0BBwagggOwMIIDrAIBADCCA6UGCSqGSIb3DQEHATAcBgoqhkiG9w0BDAEGMA4ECOj4gd686KgHAgIH0ICCA3hlJPSxZowqGFuSb+keBwsxDYfQRwO8Tle/Qq7BuWOhGLH1BRz4S5wC7kmeM7aQ6TFAqEwZxb5ucpgSkwksgxjbZrULpzPJ5Aw74PVmFgJBDCGHBXk2nFna+WQv4RgJfqFm3ncmqb7/qDu73z3HgB2MpX/GjWwvUJr1fHJONqXAdmNdH/b4EDBUx99LBvuszh6ZnJNQlYk9biXlGhRCdz19kAXGn10s7GsQExS3asHKXJ9f2pXdJyPIyUe3Pp5oLGQpOuPDZugnVREZSx4lVa/lXNFI7KV1egcO3weVQAmLqAvxpIFSdeg9+WVmkEJmqFh7eVKlinwjm11szAu6w3Biy+/orP7cESrIas/9SP46XfoQthlKPofEjlj2bCtt+dpoRWBx6zI452I8u5yYhsqSrHJaV8PGZo5PQwVB3ns8OPplgjATl36WDrgO/zaqtYa56Pso8rPzbOq1rd/EQ+kFR5KcZfteeBaXPGe5hdNo5DRn28NoWGX9LyiaBTwZ8PLjRpcJikXBj1Ym9eKEMB+2PSpuOBD7ofmEDL9fuKnjZxi7XyzSWLEY2ZcN042hR1a23k8bGt5DuIDmGE/TWmtV66yaAFc4UktNDlHUu3rOjQDmXBNSmHvfxVCHOk7UHzFYJXQmODUaCI7lGOuNi10pmQ73VrVSwGav+YEqOuYQi3HEecMvVRqwmip6kMRh8tmau7KWOv1JYtqKfK6Lp6MS3FDuLatVfNeMr7p7v4uD4tmiflvP+wJewp7ffLnKUWfONBO4w0/cG1NYt+ONuNh7ufx5a2nNvoIgj01guTroXuLEuqlm8JVYKOTOjxHT/foD/gAVlSmXEJgErWepXdJfcTLw/bnxILOnYPFktU1T98wBkoHg4kb5oFHXiMBthaJFBbtMqAcjWB9mN7iA/6tYEIlRbYUxMojQs2+RFCepdTnYQIArZHjp01ZBMsew303jYPMn3agrkQDRrkduDKXExlmxA3sUg6/E/3PwF5LMfSQ+MYjtitUFKsuO+xzv43QAwkSxayA0tMcXERrwZ+5I7c0SKB4iVrjRrm0l0CeGHJRiRAl10fK4zoz5wbPT3Zb+IIAIPwLvQQWxbvt1IwgbpZn3zTGYgSqwWW+FMzSesACipVjac7wjcu7G4ZFYqjjelaEKlRNyPCsJ/oe6U4RbBzkuRsx4e88wNzAfMAcGBSsOAwIaBBS9smrVQRRQ9gole0Yc5qfE3bt3wAQUCpjtuVNQ1DP+/OCXP2adVaF7J4M="/>
+ </PublishProfile>
+</PublishData>
@@ -24,9 +24,11 @@ namespace Microsoft.WindowsAzure.Management.Test.TestData
static class Data
{
public static string Subscription1 = "Windows Azure Sandbox 9-220";
+ public static string SampleSubscription1 = "Sample Subscription 1";
public static List<string> ValidServiceName { get; private set; }
public static List<string> ValidPublishSettings { get; private set; }
+ public static List<string> ValidPublishSettings2 { get; private set; }
public static List<string> ValidSubscriptionsData { get; private set; }
public static List<string> ValidSubscriptionName { get; private set; }
public static List<string> ValidServiceRootName { get; private set; }
@@ -48,6 +50,9 @@ static Data()
ValidPublishSettings = new List<string>();
InitializeValidPublishSettingsData();
+ ValidPublishSettings2 = new List<string>();
+ InitializeValidPublishSettings2Data();
+
ValidSubscriptionsData = new List<string>();
InitializeValidSubscriptionsData();
@@ -91,6 +96,11 @@ private static void InitializeValidPublishSettingsData()
ValidPublishSettings.Add(Testing.GetTestResourcePath("ValidProfile.PublishSettings"));
}
+ private static void InitializeValidPublishSettings2Data()
+ {
+ ValidPublishSettings2.Add(Testing.GetTestResourcePath("ValidProfile2.PublishSettings"));
+ }
+
private static void InitializeValidSubscriptionsData()
{
ValidSubscriptionsData.Add(Testing.GetTestResourcePath("subscriptions.xml"));
@@ -63,6 +63,22 @@ public void TestImportSubscriptionPublishSettingsOnlyProcess()
Assert.IsTrue(currentSubscription.IsDefault);
}
+
+ [TestMethod]
+ public void TestImportSubscriptionPublishSettingsSecondVersionOnlyProcess()
+ {
+ var importSubscriptionCommand = new ImportAzurePublishSettingsCommand();
+ importSubscriptionCommand.ImportSubscriptionProcess(
+ Data.ValidPublishSettings2.First(),
+ null);
+
+ var currentSubscription = importSubscriptionCommand.GetCurrentSubscription();
+ Assert.AreEqual(Data.SampleSubscription1, currentSubscription.SubscriptionName);
+ Assert.AreEqual("https://newmanagement.core.windows.net/", currentSubscription.ServiceEndpoint);
+ Assert.IsNotNull(currentSubscription.Certificate);
+ Assert.IsTrue(currentSubscription.IsDefault);
+ }
+
[TestMethod]
public void TestImportSubscriptionPublishSettingsOnlyMultipleTimesProcess()
{
@@ -80,13 +80,7 @@
</PropertyGroup>
<PropertyGroup />
<ItemGroup>
- <Reference Include="Microsoft.Samples.WindowsAzure.ServiceManagement">
- <HintPath>..\lib\Microsoft.Samples.WindowsAzure.ServiceManagement.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
- <Reference Include="Microsoft.WindowsAzure.Management.Service">
- <HintPath>..\lib\Microsoft.WindowsAzure.Management.Service.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Microsoft.WindowsAzure.StorageClient.dll</HintPath>
@@ -44,4 +44,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.6.7")]
+[assembly: AssemblyFileVersion("0.6.8")]
@@ -117,15 +117,14 @@ public void GetWebsiteProcessShowTest()
};
getAzureWebsiteCommand.ExecuteCommand();
- Assert.AreEqual(2, ((MockCommandRuntime)getAzureWebsiteCommand.CommandRuntime).WrittenObjects.Count);
+ Assert.AreEqual(1, ((MockCommandRuntime)getAzureWebsiteCommand.CommandRuntime).WrittenObjects.Count);
- var website = ((MockCommandRuntime) getAzureWebsiteCommand.CommandRuntime).WrittenObjects[0] as Site;
- var websiteConfig = ((MockCommandRuntime)getAzureWebsiteCommand.CommandRuntime).WrittenObjects[1] as SiteConfig;
+ var website = ((MockCommandRuntime) getAzureWebsiteCommand.CommandRuntime).WrittenObjects[0] as SiteWithConfig;
+ Assert.IsNotNull(website);
Assert.IsNotNull(website);
- Assert.IsNotNull(websiteConfig);
Assert.AreEqual("website1", website.Name);
Assert.AreEqual("webspace1", website.WebSpace);
- Assert.AreEqual("user1", websiteConfig.PublishingUsername);
+ Assert.AreEqual("user1", website.PublishingUsername);
}
}
}
@@ -19,7 +19,7 @@ namespace Microsoft.WindowsAzure.Management.Websites.Cmdlets.Common
using Properties;
using Services;
using Services.WebEntities;
- using WebSites.Cmdlets.Common;
+ using Websites.Cmdlets.Common;
using Samples.WindowsAzure.ServiceManagement;
public abstract class DeploymentBaseCmdlet : WebsiteContextBaseCmdlet
Oops, something went wrong.

0 comments on commit 3cc4b34

Please sign in to comment.