diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj index be769ee999f0..361ebae1d9ab 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj @@ -126,8 +126,10 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll - - ..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll + + False + ..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll + True False diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Resources/Websites/WebsitesTests.ps1 b/src/ServiceManagement/Common/Commands.ScenarioTest/Resources/Websites/WebsitesTests.ps1 index e7c1369a2ed0..37d7e785d398 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Resources/Websites/WebsitesTests.ps1 +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Resources/Websites/WebsitesTests.ps1 @@ -846,6 +846,7 @@ function Test-SetAzureWebsite { # Setup $name = Get-WebsiteName + $remotedebuggingversion = "VS2015" New-AzureWebsite $name # Test @@ -856,6 +857,13 @@ function Test-SetAzureWebsite $website = Get-AzureWebsite $name -Slot Production Assert-AreEqual Classic $website.ManagedPipelineMode Assert-AreEqual $true $website.WebSocketsEnabled + + $website.RemoteDebuggingEnabled = $true + $website.RemoteDebuggingVersion = $remotedebuggingversion + Set-AzureWebsite $name -Slot Production -SiteWithConfig $website + + Assert-AreEqual $true $website.RemoteDebuggingEnabled + Assert-AreEqual $remotedebuggingversion $website.RemoteDebuggingVersion } ########################################################################### Test-StartAzureWebsiteTriggeredJob Scenario Tests ########################################################################### @@ -1068,4 +1076,4 @@ function Test-GettingJobHistory $runs = Get-AzureWebsiteJobHistory -Name $webSiteName -JobName $jobName Assert-AreEqual 4 $runs.Count -} \ No newline at end of file +} diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs index b7f97d4e5500..2747c4042bef 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs @@ -52,7 +52,7 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); helper.SetupEnvironment(AzureModule.AzureServiceManagement); - helper.SetupModulesFromCommon(AzureModule.AzureServiceManagement, + helper.SetupModules(AzureModule.AzureServiceManagement, "Resources\\Websites\\Common.ps1", "Resources\\Websites\\" + this.GetType().Name + ".ps1"); diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/packages.config b/src/ServiceManagement/Common/Commands.ScenarioTest/packages.config index 1681b1079b72..2f0230e2d907 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/packages.config +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/packages.config @@ -22,7 +22,7 @@ - + diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj index b6610e924a25..ee6a2cabd6ea 100644 --- a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj +++ b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj @@ -151,8 +151,10 @@ ..\..\..\packages\Microsoft.WindowsAzure.Management.TrafficManager.0.16.0-preview\lib\net40\Microsoft.WindowsAzure.Management.TrafficManager.dll - - ..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll + + False + ..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll + True False diff --git a/src/ServiceManagement/Services/Commands.Test/packages.config b/src/ServiceManagement/Services/Commands.Test/packages.config index 8a94988f22d1..1bda5359293c 100644 --- a/src/ServiceManagement/Services/Commands.Test/packages.config +++ b/src/ServiceManagement/Services/Commands.Test/packages.config @@ -26,7 +26,7 @@ - + diff --git a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj index 93f53d386664..43914d677d35 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj @@ -161,7 +161,8 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll + True False diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebEntities/SiteConfig.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebEntities/SiteConfig.cs index a9c93428bc69..4e76ceb8f1fc 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebEntities/SiteConfig.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebEntities/SiteConfig.cs @@ -63,7 +63,7 @@ public interface ISiteConfig bool? RemoteDebuggingEnabled { get; set; } - RemoteDebuggingVersion RemoteDebuggingVersion { get; set; } + string RemoteDebuggingVersion { get; set; } List RoutingRules { get; set; } @@ -350,7 +350,7 @@ public bool? RemoteDebuggingEnabled set { SiteConfig.RemoteDebuggingEnabled = value; } } - public RemoteDebuggingVersion RemoteDebuggingVersion + public string RemoteDebuggingVersion { get { return SiteConfig.RemoteDebuggingVersion; } set { SiteConfig.RemoteDebuggingVersion = value; } @@ -440,7 +440,7 @@ public class SiteConfig public bool? RemoteDebuggingEnabled { get; set; } [DataMember(IsRequired = false)] - public RemoteDebuggingVersion RemoteDebuggingVersion { get; set; } + public string RemoteDebuggingVersion { get; set; } [DataMember(IsRequired = false)] public List RoutingRules { get; set; } diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebSitesManagementExtensionMethods.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebSitesManagementExtensionMethods.cs index 4dfd360edaaa..e41342a341f7 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebSitesManagementExtensionMethods.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebSitesManagementExtensionMethods.cs @@ -47,7 +47,7 @@ internal static WebSiteUpdateConfigurationParameters ToUpdate(this WebSiteGetCon ManagedPipelineMode = getConfigResponse.ManagedPipelineMode, WebSocketsEnabled = getConfigResponse.WebSocketsEnabled, RemoteDebuggingEnabled = getConfigResponse.RemoteDebuggingEnabled, - RemoteDebuggingVersion = getConfigResponse.RemoteDebuggingVersion.GetValueOrDefault(), + RemoteDebuggingVersion = getConfigResponse.RemoteDebuggingVersion, }; getConfigResponse.AppSettings.ForEach(kvp => update.AppSettings.Add(kvp.Key, kvp.Value)); @@ -100,7 +100,7 @@ internal static Utilities.SiteConfig ToSiteConfig(this WebSiteGetConfigurationRe ManagedPipelineMode = getConfigResponse.ManagedPipelineMode, WebSocketsEnabled = getConfigResponse.WebSocketsEnabled, RemoteDebuggingEnabled = getConfigResponse.RemoteDebuggingEnabled, - RemoteDebuggingVersion = getConfigResponse.RemoteDebuggingVersion.GetValueOrDefault(), + RemoteDebuggingVersion = getConfigResponse.RemoteDebuggingVersion, RoutingRules = getConfigResponse.RoutingRules.Select(r => r.ToRoutingRule()).ToList(), Use32BitWorkerProcess = getConfigResponse.Use32BitWorkerProcess, AutoSwapSlotName = getConfigResponse.AutoSwapSlotName, diff --git a/src/ServiceManagement/Services/Commands.Utilities/packages.config b/src/ServiceManagement/Services/Commands.Utilities/packages.config index e9ea81c4f76a..d3d929faac87 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/packages.config +++ b/src/ServiceManagement/Services/Commands.Utilities/packages.config @@ -27,7 +27,7 @@ - + diff --git a/src/ServiceManagement/Services/Commands/Commands.csproj b/src/ServiceManagement/Services/Commands/Commands.csproj index 8e0bee982eb8..ef20cdc958e7 100644 --- a/src/ServiceManagement/Services/Commands/Commands.csproj +++ b/src/ServiceManagement/Services/Commands/Commands.csproj @@ -150,7 +150,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll False diff --git a/src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDebug.cs b/src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDebug.cs index 2a1e873cd991..d3a4e9edc53d 100644 --- a/src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDebug.cs +++ b/src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDebug.cs @@ -30,7 +30,7 @@ public class EnableAzureWebsiteDebugCommand : WebsiteContextBaseCmdlet public SwitchParameter PassThru { get; set; } [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The visual studio version.")] - public RemoteDebuggingVersion Version { get; set; } + public string Version { get; set; } public override void ExecuteCmdlet() { diff --git a/src/ServiceManagement/Services/Commands/packages.config b/src/ServiceManagement/Services/Commands/packages.config index aa07b5965a5c..dfd0c7a8738a 100644 --- a/src/ServiceManagement/Services/Commands/packages.config +++ b/src/ServiceManagement/Services/Commands/packages.config @@ -23,8 +23,8 @@ - + - + \ No newline at end of file