Skip to content

Commit 5869d6c

Browse files
markcowlmarkcowl
committed
Merge pull request #1837 from haocs/remotedebug
Changed RemoteDebuggingVersion from string type to enum and added tests.
2 parents 21d8faa + e1dc5ba commit 5869d6c

File tree

13 files changed

+32
-19
lines changed

13 files changed

+32
-19
lines changed

‎src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@
126126
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
127127
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
128128
</Reference>
129-
<Reference Include="Microsoft.WindowsAzure.Management.WebSites">
130-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
129+
<Reference Include="Microsoft.WindowsAzure.Management.WebSites, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130+
<SpecificVersion>False</SpecificVersion>
131+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
132+
<Private>True</Private>
131133
</Reference>
132134
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133135
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Common/Commands.ScenarioTest/Resources/Websites/WebsitesTests.ps1

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,7 @@ function Test-SetAzureWebsite
846846
{
847847
# Setup
848848
$name = Get-WebsiteName
849+
$remotedebuggingversion = "VS2015"
849850
New-AzureWebsite $name
850851

851852
# Test
@@ -856,6 +857,13 @@ function Test-SetAzureWebsite
856857
$website = Get-AzureWebsite $name -Slot Production
857858
Assert-AreEqual Classic $website.ManagedPipelineMode
858859
Assert-AreEqual $true $website.WebSocketsEnabled
860+
861+
$website.RemoteDebuggingEnabled = $true
862+
$website.RemoteDebuggingVersion = $remotedebuggingversion
863+
Set-AzureWebsite $name -Slot Production -SiteWithConfig $website
864+
865+
Assert-AreEqual $true $website.RemoteDebuggingEnabled
866+
Assert-AreEqual $remotedebuggingversion $website.RemoteDebuggingVersion
859867
}
860868

861869
########################################################################### Test-StartAzureWebsiteTriggeredJob Scenario Tests ###########################################################################
@@ -1068,4 +1076,4 @@ function Test-GettingJobHistory
10681076
$runs = Get-AzureWebsiteJobHistory -Name $webSiteName -JobName $jobName
10691077

10701078
Assert-AreEqual 4 $runs.Count
1071-
}
1079+
}

‎src/ServiceManagement/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected void RunPowerShellTest(params string[] scripts)
5252
SetupManagementClients();
5353

5454
helper.SetupEnvironment(AzureModule.AzureServiceManagement);
55-
helper.SetupModulesFromCommon(AzureModule.AzureServiceManagement,
55+
helper.SetupModules(AzureModule.AzureServiceManagement,
5656
"Resources\\Websites\\Common.ps1",
5757
"Resources\\Websites\\" + this.GetType().Name + ".ps1");
5858

‎src/ServiceManagement/Common/Commands.ScenarioTest/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.6.0" targetFramework="net45" />
2323
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.4" targetFramework="net45" />
2424
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
25-
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
25+
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.5.0-prerelease" targetFramework="net45" />
2626
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2727
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
2828
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />

‎src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@
151151
<Reference Include="Microsoft.WindowsAzure.Management.TrafficManager">
152152
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.TrafficManager.0.16.0-preview\lib\net40\Microsoft.WindowsAzure.Management.TrafficManager.dll</HintPath>
153153
</Reference>
154-
<Reference Include="Microsoft.WindowsAzure.Management.WebSites">
155-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
154+
<Reference Include="Microsoft.WindowsAzure.Management.WebSites, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
155+
<SpecificVersion>False</SpecificVersion>
156+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
157+
<Private>True</Private>
156158
</Reference>
157159
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
158160
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Services/Commands.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2727
<package id="Microsoft.WindowsAzure.Management.Store" version="0.15.0-preview" targetFramework="net45" />
2828
<package id="Microsoft.WindowsAzure.Management.TrafficManager" version="0.16.0-preview" targetFramework="net45" />
29-
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
29+
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.5.0-prerelease" targetFramework="net45" />
3030
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
3131
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
3232
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />

‎src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@
161161
</Reference>
162162
<Reference Include="Microsoft.WindowsAzure.Management.WebSites, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
163163
<SpecificVersion>False</SpecificVersion>
164-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
164+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
165+
<Private>True</Private>
165166
</Reference>
166167
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
167168
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebEntities/SiteConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public interface ISiteConfig
6363

6464
bool? RemoteDebuggingEnabled { get; set; }
6565

66-
RemoteDebuggingVersion RemoteDebuggingVersion { get; set; }
66+
string RemoteDebuggingVersion { get; set; }
6767

6868
List<RoutingRule> RoutingRules { get; set; }
6969

@@ -350,7 +350,7 @@ public bool? RemoteDebuggingEnabled
350350
set { SiteConfig.RemoteDebuggingEnabled = value; }
351351
}
352352

353-
public RemoteDebuggingVersion RemoteDebuggingVersion
353+
public string RemoteDebuggingVersion
354354
{
355355
get { return SiteConfig.RemoteDebuggingVersion; }
356356
set { SiteConfig.RemoteDebuggingVersion = value; }
@@ -440,7 +440,7 @@ public class SiteConfig
440440
public bool? RemoteDebuggingEnabled { get; set; }
441441

442442
[DataMember(IsRequired = false)]
443-
public RemoteDebuggingVersion RemoteDebuggingVersion { get; set; }
443+
public string RemoteDebuggingVersion { get; set; }
444444

445445
[DataMember(IsRequired = false)]
446446
public List<RoutingRule> RoutingRules { get; set; }

‎src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebSitesManagementExtensionMethods.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ internal static WebSiteUpdateConfigurationParameters ToUpdate(this WebSiteGetCon
4747
ManagedPipelineMode = getConfigResponse.ManagedPipelineMode,
4848
WebSocketsEnabled = getConfigResponse.WebSocketsEnabled,
4949
RemoteDebuggingEnabled = getConfigResponse.RemoteDebuggingEnabled,
50-
RemoteDebuggingVersion = getConfigResponse.RemoteDebuggingVersion.GetValueOrDefault(),
50+
RemoteDebuggingVersion = getConfigResponse.RemoteDebuggingVersion,
5151
};
5252

5353
getConfigResponse.AppSettings.ForEach(kvp => update.AppSettings.Add(kvp.Key, kvp.Value));
@@ -100,7 +100,7 @@ internal static Utilities.SiteConfig ToSiteConfig(this WebSiteGetConfigurationRe
100100
ManagedPipelineMode = getConfigResponse.ManagedPipelineMode,
101101
WebSocketsEnabled = getConfigResponse.WebSocketsEnabled,
102102
RemoteDebuggingEnabled = getConfigResponse.RemoteDebuggingEnabled,
103-
RemoteDebuggingVersion = getConfigResponse.RemoteDebuggingVersion.GetValueOrDefault(),
103+
RemoteDebuggingVersion = getConfigResponse.RemoteDebuggingVersion,
104104
RoutingRules = getConfigResponse.RoutingRules.Select(r => r.ToRoutingRule()).ToList(),
105105
Use32BitWorkerProcess = getConfigResponse.Use32BitWorkerProcess,
106106
AutoSwapSlotName = getConfigResponse.AutoSwapSlotName,

‎src/ServiceManagement/Services/Commands.Utilities/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2828
<package id="Microsoft.WindowsAzure.Management.Store" version="0.15.0-preview" targetFramework="net45" />
2929
<package id="Microsoft.WindowsAzure.Management.TrafficManager" version="0.16.0-preview" targetFramework="net45" />
30-
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
30+
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.5.0-prerelease" targetFramework="net45" />
3131
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
3232
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
3333
<package id="WindowsAzure.ServiceBus" version="2.3.2.0" targetFramework="net45" />

‎src/ServiceManagement/Services/Commands/Commands.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
</Reference>
151151
<Reference Include="Microsoft.WindowsAzure.Management.WebSites, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
152152
<SpecificVersion>False</SpecificVersion>
153-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
153+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
154154
</Reference>
155155
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
156156
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDebug.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class EnableAzureWebsiteDebugCommand : WebsiteContextBaseCmdlet
3030
public SwitchParameter PassThru { get; set; }
3131

3232
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The visual studio version.")]
33-
public RemoteDebuggingVersion Version { get; set; }
33+
public string Version { get; set; }
3434

3535
public override void ExecuteCmdlet()
3636
{

‎src/ServiceManagement/Services/Commands/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2424
<package id="Microsoft.WindowsAzure.Management.Store" version="0.15.0-preview" targetFramework="net45" />
2525
<package id="Microsoft.WindowsAzure.Management.TrafficManager" version="0.16.0-preview" targetFramework="net45" />
26-
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
26+
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.5.0-prerelease" targetFramework="net45" />
2727
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2828
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
2929
<package id="WindowsAzure.ServiceBus" version="2.3.2.0" targetFramework="net45" />
30-
</packages>
30+
</packages>

0 commit comments

Comments
 (0)