diff --git a/src/Common/Commands.Common/Common/ServiceManagementTypes.cs b/src/Common/Commands.Common/Common/ServiceManagementTypes.cs index fe274f3e3221..b613f7e99ace 100644 --- a/src/Common/Commands.Common/Common/ServiceManagementTypes.cs +++ b/src/Common/Commands.Common/Common/ServiceManagementTypes.cs @@ -5258,7 +5258,7 @@ public string PrivateConfigurationSchema public string CompanyName { get; set; } #region IExtensibleDataObject Members - ExtensionDataObject IExtensibleDataObject.ExtensionData { get; set; } + public ExtensionDataObject ExtensionData { get; set; } #endregion } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/ProvisioningFailedException.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/ProvisioningFailedException.cs index f3e7bc93d732..b717a8b80619 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/ProvisioningFailedException.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/ProvisioningFailedException.cs @@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.DataFactories { + [Serializable] internal class ProvisioningFailedException : Exception { public ProvisioningFailedException(string errorMessage) diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs index 4560934c6834..e29eda280d29 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs +++ b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs @@ -31,8 +31,8 @@ public sealed class ResourcesController { private CSMTestEnvironmentFactory csmTestFactory; private EnvironmentSetupHelper helper; - protected const string TenantIdKey = "TenantId"; - protected const string DomainKey = "Domain"; + private const string TenantIdKey = "TenantId"; + private const string DomainKey = "Domain"; public GraphRbacManagementClient GraphClient { get; private set; } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/DscSettingsSerializer.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/DscSettingsSerializer.cs index 5f9293030da6..9dac6c85073e 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/DscSettingsSerializer.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/DscSettingsSerializer.cs @@ -68,9 +68,9 @@ public static DscPublicSettings DeserializePublicSettings(string publicSettingsS JsonConvert.DeserializeObject(publicSettingsString); publicSettings = publicSettingsV1.ToCurrentVersion(); } - catch (JsonException e) + catch (JsonException) { - throw e; + throw; } } return publicSettings; diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightJobSubmissionClientSimulator.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightJobSubmissionClientSimulator.cs index d59b5c97ee79..728f8bb95712 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightJobSubmissionClientSimulator.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightJobSubmissionClientSimulator.cs @@ -54,7 +54,7 @@ public AzureHDInsightJobSubmissionClientSimulator( this.InitializeSimulator(); } - public void Dispose() + public new void Dispose() { } @@ -65,17 +65,17 @@ public string GetCustomUserAgent() throw new NotImplementedException(); } - public void AddLogWriter(ILogWriter logWriter) + public new void AddLogWriter(ILogWriter logWriter) { this.logger.AddWriter(logWriter); } - public void RemoveLogWriter(ILogWriter logWriter) + public new void RemoveLogWriter(ILogWriter logWriter) { this.logger.RemoveWriter(logWriter); } - public void Cancel() + public new void Cancel() { } @@ -329,12 +329,12 @@ public Task ListJobsAsync() return TaskEx2.FromResult(jobDetailList); } - public void SetCancellationSource(CancellationTokenSource tokenSource) + public new void SetCancellationSource(CancellationTokenSource tokenSource) { this.cancellationTokenSource = tokenSource; } - public bool IgnoreSslErrors { get; set; } + public new bool IgnoreSslErrors { get; set; } public JobDetails StopJob(string jobId) { @@ -537,6 +537,6 @@ private void WriteJobOutput(string jobId, string statusDirectory, string stdoutC this.jobOutput[jobId] = stdoutContent; } - public ILogger Logger { get; private set; } + public new ILogger Logger { get; private set; } } } diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj index ade95128367b..041540ad328f 100644 --- a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj +++ b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj @@ -78,11 +78,11 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.0\lib\net45\Microsoft.WindowsAzure.Common.dll + ..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.dll False - ..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.0\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll + ..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll @@ -97,7 +97,7 @@ False - ..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.11.2-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll + ..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.16.2-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll ..\..\..\packages\Microsoft.WindowsAzure.Management.MediaServices.1.2.0\lib\net40\Microsoft.WindowsAzure.Management.MediaServices.dll diff --git a/src/ServiceManagement/Services/Commands.Test/packages.config b/src/ServiceManagement/Services/Commands.Test/packages.config index 16f8f94a59ca..47d2bba97b0d 100644 --- a/src/ServiceManagement/Services/Commands.Test/packages.config +++ b/src/ServiceManagement/Services/Commands.Test/packages.config @@ -7,12 +7,12 @@ - - + + - +