Skip to content

Changed RemoteDebuggingVersion from string type to enum and added tests. #1837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 25, 2016
Merged

Changed RemoteDebuggingVersion from string type to enum and added tests. #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c11c192
Bumped up WindowsAzure.Management.WebSites to 4.5.0
Feb 19, 2016
6de6808
Added Scenario Test for AzureWebsite RemoteDebuggingEnable/RemoteDebu…
Feb 19, 2016
285860e
Fix building error
Feb 20, 2016
129d0d0
Align indentation
Feb 23, 2016
e1dc5ba
Merge branch 'dev' of github.com:Azure/azure-powershell into remotedebug
Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,10 @@
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.WebSites">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
<Reference Include="Microsoft.WindowsAzure.Management.WebSites, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
10 changes: 9 additions & 1 deletion src/ServiceManagement/Common/Commands.ScenarioTest/Resources/Websites/WebsitesTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,7 @@ function Test-SetAzureWebsite
{
# Setup
$name = Get-WebsiteName
$remotedebuggingversion = "VS2015"
New-AzureWebsite $name

# Test
Expand All @@ -856,6 +857,13 @@ function Test-SetAzureWebsite
$website = Get-AzureWebsite $name -Slot Production
Assert-AreEqual Classic $website.ManagedPipelineMode
Assert-AreEqual $true $website.WebSocketsEnabled

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@haocs Didn't this require an update in the test recording?

$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 ###########################################################################
Expand Down Expand Up @@ -1068,4 +1076,4 @@ function Test-GettingJobHistory
$runs = Get-AzureWebsiteJobHistory -Name $webSiteName -JobName $jobName

Assert-AreEqual 4 $runs.Count
}
}
2 changes: 1 addition & 1 deletion src/ServiceManagement/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/Common/Commands.ScenarioTest/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.5.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.4" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.5.0-prerelease" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
Expand Down
6 changes: 4 additions & 2 deletions src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,10 @@
<Reference Include="Microsoft.WindowsAzure.Management.TrafficManager">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.TrafficManager.0.16.0-preview\lib\net40\Microsoft.WindowsAzure.Management.TrafficManager.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.WebSites">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
<Reference Include="Microsoft.WindowsAzure.Management.WebSites, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/Services/Commands.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Store" version="0.15.0-preview" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.TrafficManager" version="0.16.0-preview" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.5.0-prerelease" targetFramework="net45" />
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
Expand Down
3 changes: 2 additions & 1 deletion src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.WebSites, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
6 changes: 3 additions & 3 deletions ...ServiceManagement/Services/Commands.Utilities/Websites/Services/WebEntities/SiteConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public interface ISiteConfig

bool? RemoteDebuggingEnabled { get; set; }

RemoteDebuggingVersion RemoteDebuggingVersion { get; set; }
string RemoteDebuggingVersion { get; set; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the type "RemoteDebugginVersion" used anywhere stil? If not we should delete the type.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has string constants with the known values now, it's not used elsewhere or compilation would have failed.


List<RoutingRule> RoutingRules { get; set; }

Expand Down Expand Up @@ -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; }
Expand Down Expand Up @@ -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<RoutingRule> RoutingRules { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions ...ement/Services/Commands.Utilities/Websites/Services/WebSitesManagementExtensionMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/Services/Commands.Utilities/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Store" version="0.15.0-preview" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.TrafficManager" version="0.16.0-preview" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.5.0-prerelease" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
<package id="WindowsAzure.ServiceBus" version="2.3.2.0" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/Services/Commands/Commands.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.WebSites, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.4.2-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.WebSites.4.5.0-prerelease\lib\net40\Microsoft.WindowsAzure.Management.WebSites.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDebug.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
4 changes: 2 additions & 2 deletions src/ServiceManagement/Services/Commands/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Store" version="0.15.0-preview" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.TrafficManager" version="0.16.0-preview" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.5.0-prerelease" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
<package id="WindowsAzure.ServiceBus" version="2.3.2.0" targetFramework="net45" />
</packages>
</packages>