Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,7 @@ internal AssetsOperations(AzureMediaServicesClient client)
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<AzureOperationResponse<AssetContainerSas>> ListContainerSasWithHttpMessagesAsync(string resourceGroupName, string accountName, string assetName, AssetContainerPermission? permissions = default(AssetContainerPermission?), System.DateTime? expiryTime = default(System.DateTime?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
public async Task<AzureOperationResponse<AssetContainerSas>> ListContainerSasWithHttpMessagesAsync(string resourceGroupName, string accountName, string assetName, string permissions = default(string), System.DateTime? expiryTime = default(System.DateTime?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
{
if (Client.SubscriptionId == null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ public static Asset Update(this IAssetsOperations operations, string resourceGro
/// The SAS URL expiration time. This must be less than 24 hours from the
/// current time.
/// </param>
public static AssetContainerSas ListContainerSas(this IAssetsOperations operations, string resourceGroupName, string accountName, string assetName, AssetContainerPermission? permissions = default(AssetContainerPermission?), System.DateTime? expiryTime = default(System.DateTime?))
public static AssetContainerSas ListContainerSas(this IAssetsOperations operations, string resourceGroupName, string accountName, string assetName, string permissions = default(string), System.DateTime? expiryTime = default(System.DateTime?))
{
return operations.ListContainerSasAsync(resourceGroupName, accountName, assetName, permissions, expiryTime).GetAwaiter().GetResult();
}
Expand Down Expand Up @@ -357,7 +357,7 @@ public static Asset Update(this IAssetsOperations operations, string resourceGro
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
public static async Task<AssetContainerSas> ListContainerSasAsync(this IAssetsOperations operations, string resourceGroupName, string accountName, string assetName, AssetContainerPermission? permissions = default(AssetContainerPermission?), System.DateTime? expiryTime = default(System.DateTime?), CancellationToken cancellationToken = default(CancellationToken))
public static async Task<AssetContainerSas> ListContainerSasAsync(this IAssetsOperations operations, string resourceGroupName, string accountName, string assetName, string permissions = default(string), System.DateTime? expiryTime = default(System.DateTime?), CancellationToken cancellationToken = default(CancellationToken))
{
using (var _result = await operations.ListContainerSasWithHttpMessagesAsync(resourceGroupName, accountName, assetName, permissions, expiryTime, null, cancellationToken).ConfigureAwait(false))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public partial interface IAssetsOperations
/// <exception cref="Microsoft.Rest.ValidationException">
/// Thrown when a required parameter is null
/// </exception>
Task<AzureOperationResponse<AssetContainerSas>> ListContainerSasWithHttpMessagesAsync(string resourceGroupName, string accountName, string assetName, AssetContainerPermission? permissions = default(AssetContainerPermission?), System.DateTime? expiryTime = default(System.DateTime?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
Task<AzureOperationResponse<AssetContainerSas>> ListContainerSasWithHttpMessagesAsync(string resourceGroupName, string accountName, string assetName, string permissions = default(string), System.DateTime? expiryTime = default(System.DateTime?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Gets the Asset storage key
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions src/SDKs/Media/Management.Media/Generated/Models/AacAudio.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public AacAudio()
/// <param name="profile">The encoding profile to be used when encoding
/// audio with AAC. Possible values include: 'AacLc', 'HeAacV1',
/// 'HeAacV2'</param>
public AacAudio(string label = default(string), int? channels = default(int?), int? samplingRate = default(int?), int? bitrate = default(int?), AacAudioProfile? profile = default(AacAudioProfile?))
public AacAudio(string label = default(string), int? channels = default(int?), int? samplingRate = default(int?), int? bitrate = default(int?), string profile = default(string))
: base(label, channels, samplingRate, bitrate)
{
Profile = profile;
Expand All @@ -57,7 +57,7 @@ public AacAudio()
/// with AAC. Possible values include: 'AacLc', 'HeAacV1', 'HeAacV2'
/// </summary>
[JsonProperty(PropertyName = "profile")]
public AacAudioProfile? Profile { get; set; }
public string Profile { get; set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,110 +10,26 @@

namespace Microsoft.Azure.Management.Media.Models
{
using Newtonsoft.Json;

/// <summary>
/// Defines values for AacAudioProfile.
/// </summary>
/// <summary>
/// Determine base value for a given allowed value if exists, else return
/// the value itself
/// </summary>
[JsonConverter(typeof(AacAudioProfileConverter))]
public struct AacAudioProfile : System.IEquatable<AacAudioProfile>
public static class AacAudioProfile
{
private AacAudioProfile(string underlyingValue)
{
UnderlyingValue=underlyingValue;
}

/// <summary>
/// Specifies that the output audio is to be encoded into AAC Low
/// Complexity profile (AAC-LC).
/// </summary>
public static readonly AacAudioProfile AacLc = "AacLc";

public const string AacLc = "AacLc";
/// <summary>
/// Specifies that the output audio is to be encoded into HE-AAC v1
/// profile.
/// </summary>
public static readonly AacAudioProfile HeAacV1 = "HeAacV1";

public const string HeAacV1 = "HeAacV1";
/// <summary>
/// Specifies that the output audio is to be encoded into HE-AAC v2
/// profile.
/// </summary>
public static readonly AacAudioProfile HeAacV2 = "HeAacV2";


/// <summary>
/// Underlying value of enum AacAudioProfile
/// </summary>
private readonly string UnderlyingValue;

/// <summary>
/// Returns string representation for AacAudioProfile
/// </summary>
public override string ToString()
{
return UnderlyingValue == null ? null : UnderlyingValue.ToString();
}

/// <summary>
/// Compares enums of type AacAudioProfile
/// </summary>
public bool Equals(AacAudioProfile e)
{
return UnderlyingValue.Equals(e.UnderlyingValue);
}

/// <summary>
/// Implicit operator to convert string to AacAudioProfile
/// </summary>
public static implicit operator AacAudioProfile(string value)
{
return new AacAudioProfile(value);
}

/// <summary>
/// Implicit operator to convert AacAudioProfile to string
/// </summary>
public static implicit operator string(AacAudioProfile e)
{
return e.UnderlyingValue;
}

/// <summary>
/// Overriding == operator for enum AacAudioProfile
/// </summary>
public static bool operator == (AacAudioProfile e1, AacAudioProfile e2)
{
return e2.Equals(e1);
}

/// <summary>
/// Overriding != operator for enum AacAudioProfile
/// </summary>
public static bool operator != (AacAudioProfile e1, AacAudioProfile e2)
{
return !e2.Equals(e1);
}

/// <summary>
/// Overrides Equals operator for AacAudioProfile
/// </summary>
public override bool Equals(object obj)
{
return obj is AacAudioProfile && Equals((AacAudioProfile)obj);
}

/// <summary>
/// Returns for hashCode AacAudioProfile
/// </summary>
public override int GetHashCode()
{
return UnderlyingValue.GetHashCode();
}

public const string HeAacV2 = "HeAacV2";
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// <auto-generated>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for
// license information.
//
// Code generated by Microsoft (R) AutoRest Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>

namespace Microsoft.Azure.Management.Media.Models
{

/// <summary>
/// Defines values for AnalysisResolution.
/// </summary>
public static class AnalysisResolution
{
public const string SourceResolution = "SourceResolution";
public const string StandardDefinition = "StandardDefinition";
}
}
4 changes: 2 additions & 2 deletions src/SDKs/Media/Management.Media/Generated/Models/Asset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public Asset()
/// <param name="storageEncryptionFormat">The Asset encryption format.
/// One of None or MediaStorageEncryption. Possible values include:
/// 'None', 'MediaStorageClientEncryption'</param>
public Asset(string id = default(string), string name = default(string), string type = default(string), System.Guid assetId = default(System.Guid), System.DateTime created = default(System.DateTime), System.DateTime lastModified = default(System.DateTime), string alternateId = default(string), string description = default(string), string container = default(string), string storageAccountName = default(string), AssetStorageEncryptionFormat storageEncryptionFormat = default(AssetStorageEncryptionFormat))
public Asset(string id = default(string), string name = default(string), string type = default(string), System.Guid assetId = default(System.Guid), System.DateTime created = default(System.DateTime), System.DateTime lastModified = default(System.DateTime), string alternateId = default(string), string description = default(string), string container = default(string), string storageAccountName = default(string), string storageEncryptionFormat = default(string))
: base(id, name, type)
{
AssetId = assetId;
Expand Down Expand Up @@ -116,7 +116,7 @@ public Asset()
/// 'MediaStorageClientEncryption'
/// </summary>
[JsonProperty(PropertyName = "properties.storageEncryptionFormat")]
public AssetStorageEncryptionFormat StorageEncryptionFormat { get; private set; }
public string StorageEncryptionFormat { get; private set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,108 +10,24 @@

namespace Microsoft.Azure.Management.Media.Models
{
using Newtonsoft.Json;

/// <summary>
/// Defines values for AssetContainerPermission.
/// </summary>
/// <summary>
/// Determine base value for a given allowed value if exists, else return
/// the value itself
/// </summary>
[JsonConverter(typeof(AssetContainerPermissionConverter))]
public struct AssetContainerPermission : System.IEquatable<AssetContainerPermission>
public static class AssetContainerPermission
{
private AssetContainerPermission(string underlyingValue)
{
UnderlyingValue=underlyingValue;
}

/// <summary>
/// The SAS URL will allow read access to the container.
/// </summary>
public static readonly AssetContainerPermission Read = "Read";

public const string Read = "Read";
/// <summary>
/// The SAS URL will allow read and write access to the container.
/// </summary>
public static readonly AssetContainerPermission ReadWrite = "ReadWrite";

public const string ReadWrite = "ReadWrite";
/// <summary>
/// The SAS URL will allow read, write and delete access to the
/// container.
/// </summary>
public static readonly AssetContainerPermission ReadWriteDelete = "ReadWriteDelete";


/// <summary>
/// Underlying value of enum AssetContainerPermission
/// </summary>
private readonly string UnderlyingValue;

/// <summary>
/// Returns string representation for AssetContainerPermission
/// </summary>
public override string ToString()
{
return UnderlyingValue == null ? null : UnderlyingValue.ToString();
}

/// <summary>
/// Compares enums of type AssetContainerPermission
/// </summary>
public bool Equals(AssetContainerPermission e)
{
return UnderlyingValue.Equals(e.UnderlyingValue);
}

/// <summary>
/// Implicit operator to convert string to AssetContainerPermission
/// </summary>
public static implicit operator AssetContainerPermission(string value)
{
return new AssetContainerPermission(value);
}

/// <summary>
/// Implicit operator to convert AssetContainerPermission to string
/// </summary>
public static implicit operator string(AssetContainerPermission e)
{
return e.UnderlyingValue;
}

/// <summary>
/// Overriding == operator for enum AssetContainerPermission
/// </summary>
public static bool operator == (AssetContainerPermission e1, AssetContainerPermission e2)
{
return e2.Equals(e1);
}

/// <summary>
/// Overriding != operator for enum AssetContainerPermission
/// </summary>
public static bool operator != (AssetContainerPermission e1, AssetContainerPermission e2)
{
return !e2.Equals(e1);
}

/// <summary>
/// Overrides Equals operator for AssetContainerPermission
/// </summary>
public override bool Equals(object obj)
{
return obj is AssetContainerPermission && Equals((AssetContainerPermission)obj);
}

/// <summary>
/// Returns for hashCode AssetContainerPermission
/// </summary>
public override int GetHashCode()
{
return UnderlyingValue.GetHashCode();
}

public const string ReadWriteDelete = "ReadWriteDelete";
}
}
Loading