From cf0bedd16177d4528df98f18911417b4afb94bce Mon Sep 17 00:00:00 2001 From: Chuyu Wang Date: Tue, 3 Nov 2020 19:44:46 +0000 Subject: [PATCH 1/3] Merged PR 120039: update time zone info for refresh schedule api update time zone info for refresh schedule api --- .../Models/DirectQueryRefreshSchedule.cs | 9 +- .../Source/Models/MashupParameter.cs | 200 +++++++++--------- .../Source/Models/RefreshSchedule.cs | 9 +- sdk/swaggers/swagger.json | 4 +- 4 files changed, 110 insertions(+), 112 deletions(-) diff --git a/sdk/PowerBI.Api/Source/Models/DirectQueryRefreshSchedule.cs b/sdk/PowerBI.Api/Source/Models/DirectQueryRefreshSchedule.cs index e341452c..b5236294 100644 --- a/sdk/PowerBI.Api/Source/Models/DirectQueryRefreshSchedule.cs +++ b/sdk/PowerBI.Api/Source/Models/DirectQueryRefreshSchedule.cs @@ -35,8 +35,8 @@ public DirectQueryRefreshSchedule() /// Times to execute the refresh within each /// day /// The Id of the Time zone to use. See - /// **Name of Time Zone** column in [Microsoft Time Zone Index - /// Values.](https://support.microsoft.com/help/973627/microsoft-time-zone-index-values) + /// [Time Zone + /// Info](https://docs.microsoft.com/dotnet/api/system.timezoneinfo.id). public DirectQueryRefreshSchedule(int? frequency = default(int?), IList days = default(IList), IList times = default(IList), string localTimeZoneId = default(string)) { Frequency = frequency; @@ -71,9 +71,8 @@ public DirectQueryRefreshSchedule() public IList Times { get; set; } /// - /// Gets or sets the Id of the Time zone to use. See **Name of Time - /// Zone** column in [Microsoft Time Zone Index - /// Values.](https://support.microsoft.com/help/973627/microsoft-time-zone-index-values) + /// Gets or sets the Id of the Time zone to use. See [Time Zone + /// Info](https://docs.microsoft.com/dotnet/api/system.timezoneinfo.id). /// [JsonProperty(PropertyName = "localTimeZoneId")] public string LocalTimeZoneId { get; set; } diff --git a/sdk/PowerBI.Api/Source/Models/MashupParameter.cs b/sdk/PowerBI.Api/Source/Models/MashupParameter.cs index a0dde05d..0b61e55f 100644 --- a/sdk/PowerBI.Api/Source/Models/MashupParameter.cs +++ b/sdk/PowerBI.Api/Source/Models/MashupParameter.cs @@ -1,100 +1,100 @@ -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.PowerBI.Api.Models -{ - using Microsoft.Rest; - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - - /// - /// Power BI dataset parameter - /// - public partial class MashupParameter - { - /// - /// Initializes a new instance of the MashupParameter class. - /// - public MashupParameter() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the MashupParameter class. - /// - /// The parameter name - /// The parameter type - /// Is dataset parameter required - /// The parameter current value - /// List of the parameter suggested - /// values - public MashupParameter(string name, string type, bool isRequired, string currentValue = default(string), IList suggestedValues = default(IList)) - { - Name = name; - Type = type; - CurrentValue = currentValue; - IsRequired = isRequired; - SuggestedValues = suggestedValues; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets the parameter name - /// - [JsonProperty(PropertyName = "name")] - public string Name { get; set; } - - /// - /// Gets or sets the parameter type - /// - [JsonProperty(PropertyName = "type")] - public string Type { get; set; } - - /// - /// Gets or sets the parameter current value - /// - [JsonProperty(PropertyName = "currentValue")] - public string CurrentValue { get; set; } - - /// - /// Gets or sets is dataset parameter required - /// - [JsonProperty(PropertyName = "isRequired")] - public bool IsRequired { get; set; } - - /// - /// Gets or sets list of the parameter suggested values - /// - [JsonProperty(PropertyName = "suggestedValues")] - public IList SuggestedValues { get; set; } - - /// - /// Validate the object. - /// - /// - /// Thrown if validation fails - /// - public virtual void Validate() - { - if (Name == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Name"); - } - if (Type == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Type"); - } - } - } -} +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.PowerBI.Api.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Power BI dataset parameter + /// + public partial class MashupParameter + { + /// + /// Initializes a new instance of the MashupParameter class. + /// + public MashupParameter() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the MashupParameter class. + /// + /// The parameter name + /// The parameter type + /// Is dataset parameter required + /// The parameter current value + /// List of the parameter suggested + /// values + public MashupParameter(string name, string type, bool isRequired, string currentValue = default(string), IList suggestedValues = default(IList)) + { + Name = name; + Type = type; + CurrentValue = currentValue; + IsRequired = isRequired; + SuggestedValues = suggestedValues; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the parameter name + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets the parameter type + /// + [JsonProperty(PropertyName = "type")] + public string Type { get; set; } + + /// + /// Gets or sets the parameter current value + /// + [JsonProperty(PropertyName = "currentValue")] + public string CurrentValue { get; set; } + + /// + /// Gets or sets is dataset parameter required + /// + [JsonProperty(PropertyName = "isRequired")] + public bool IsRequired { get; set; } + + /// + /// Gets or sets list of the parameter suggested values + /// + [JsonProperty(PropertyName = "suggestedValues")] + public IList SuggestedValues { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Name == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Name"); + } + if (Type == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Type"); + } + } + } +} diff --git a/sdk/PowerBI.Api/Source/Models/RefreshSchedule.cs b/sdk/PowerBI.Api/Source/Models/RefreshSchedule.cs index 61c67406..4dee0242 100644 --- a/sdk/PowerBI.Api/Source/Models/RefreshSchedule.cs +++ b/sdk/PowerBI.Api/Source/Models/RefreshSchedule.cs @@ -32,8 +32,8 @@ public RefreshSchedule() /// day /// Is the refresh enabled /// The Id of the Time zone to use. See - /// **Name of Time Zone** column in [Microsoft Time Zone Index - /// Values.](https://support.microsoft.com/help/973627/microsoft-time-zone-index-values) + /// [Time Zone + /// Info](https://docs.microsoft.com/dotnet/api/system.timezoneinfo.id). /// Notification option at scheduled refresh /// termination. Possible values include: 'NoNotification', /// 'MailOnFailure' @@ -71,9 +71,8 @@ public RefreshSchedule() public bool? Enabled { get; set; } /// - /// Gets or sets the Id of the Time zone to use. See **Name of Time - /// Zone** column in [Microsoft Time Zone Index - /// Values.](https://support.microsoft.com/help/973627/microsoft-time-zone-index-values) + /// Gets or sets the Id of the Time zone to use. See [Time Zone + /// Info](https://docs.microsoft.com/dotnet/api/system.timezoneinfo.id). /// [JsonProperty(PropertyName = "localTimeZoneId")] public string LocalTimeZoneId { get; set; } diff --git a/sdk/swaggers/swagger.json b/sdk/swaggers/swagger.json index dfda9382..1b9f6685 100644 --- a/sdk/swaggers/swagger.json +++ b/sdk/swaggers/swagger.json @@ -15194,7 +15194,7 @@ }, "localTimeZoneId": { "type": "string", - "description": "The Id of the Time zone to use. See **Name of Time Zone** column in [Microsoft Time Zone Index Values.](https://support.microsoft.com/help/973627/microsoft-time-zone-index-values)" + "description": "The Id of the Time zone to use. See [Time Zone Info](https://docs.microsoft.com/dotnet/api/system.timezoneinfo.id)." }, "NotifyOption": { "type": "string", @@ -15270,7 +15270,7 @@ }, "localTimeZoneId": { "type": "string", - "description": "The Id of the Time zone to use. See **Name of Time Zone** column in [Microsoft Time Zone Index Values.](https://support.microsoft.com/help/973627/microsoft-time-zone-index-values)" + "description": "The Id of the Time zone to use. See [Time Zone Info](https://docs.microsoft.com/dotnet/api/system.timezoneinfo.id)." } } }, From 28d777dc4da6dd0b3a983e916c0c6bb9b1a5cb85 Mon Sep 17 00:00:00 2001 From: Mounir Shmordok Date: Mon, 9 Nov 2020 15:52:30 +0000 Subject: [PATCH 2/3] Merged PR 126095: Change reportId in takeOver API from string to guid Change reportId in takeOver API from string to guid --- .../Extensions/ReportsOperationsExtensions.cs | 4 ++-- sdk/PowerBI.Api/Source/IReportsOperations.cs | 5 +---- sdk/PowerBI.Api/Source/ReportsOperations.cs | 14 ++------------ .../Source/ReportsOperationsExtensions.cs | 4 ++-- sdk/swaggers/swagger.json | 3 ++- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/sdk/PowerBI.Api/Extensions/ReportsOperationsExtensions.cs b/sdk/PowerBI.Api/Extensions/ReportsOperationsExtensions.cs index b9e41fa7..4b96c0f0 100644 --- a/sdk/PowerBI.Api/Extensions/ReportsOperationsExtensions.cs +++ b/sdk/PowerBI.Api/Extensions/ReportsOperationsExtensions.cs @@ -848,7 +848,7 @@ public static Stream GetFileOfExportToFile(this IReportsOperations operations, G /// /// The report id /// - public static void TakeOver(this IReportsOperations operations, Guid groupId, string reportId) + public static void TakeOver(this IReportsOperations operations, Guid groupId, Guid reportId) { operations.TakeOverAsync(groupId, reportId).GetAwaiter().GetResult(); } @@ -868,7 +868,7 @@ public static void TakeOver(this IReportsOperations operations, Guid groupId, st /// /// The cancellation token. /// - public static async Task TakeOverAsync(this IReportsOperations operations, Guid groupId, string reportId, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task TakeOverAsync(this IReportsOperations operations, Guid groupId, Guid reportId, CancellationToken cancellationToken = default(CancellationToken)) { (await operations.TakeOverInGroupWithHttpMessagesAsync(groupId, reportId, null, cancellationToken).ConfigureAwait(false)).Dispose(); } diff --git a/sdk/PowerBI.Api/Source/IReportsOperations.cs b/sdk/PowerBI.Api/Source/IReportsOperations.cs index c9c2453e..c82824e3 100644 --- a/sdk/PowerBI.Api/Source/IReportsOperations.cs +++ b/sdk/PowerBI.Api/Source/IReportsOperations.cs @@ -1092,9 +1092,6 @@ public partial interface IReportsOperations /// /// Thrown when the operation returned an invalid status code /// - /// - /// Thrown when a required parameter is null - /// - Task TakeOverInGroupWithHttpMessagesAsync(System.Guid groupId, string reportId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task TakeOverInGroupWithHttpMessagesAsync(System.Guid groupId, System.Guid reportId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/sdk/PowerBI.Api/Source/ReportsOperations.cs b/sdk/PowerBI.Api/Source/ReportsOperations.cs index 51a1f36b..d9083f65 100644 --- a/sdk/PowerBI.Api/Source/ReportsOperations.cs +++ b/sdk/PowerBI.Api/Source/ReportsOperations.cs @@ -4871,21 +4871,11 @@ public ReportsOperations(PowerBIClient client) /// /// Thrown when the operation returned an invalid status code /// - /// - /// Thrown when a required parameter is null - /// - /// - /// Thrown when a required parameter is null - /// /// /// A response object containing the response body and response headers. /// - public async Task TakeOverInGroupWithHttpMessagesAsync(System.Guid groupId, string reportId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task TakeOverInGroupWithHttpMessagesAsync(System.Guid groupId, System.Guid reportId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (reportId == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "reportId"); - } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -4902,7 +4892,7 @@ public ReportsOperations(PowerBIClient client) var _baseUrl = Client.BaseUri.AbsoluteUri; var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "v1.0/myorg/groups/{groupId}/reports/{reportId}/Default.TakeOver").ToString(); _url = _url.Replace("{groupId}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(groupId, Client.SerializationSettings).Trim('"'))); - _url = _url.Replace("{reportId}", System.Uri.EscapeDataString(reportId)); + _url = _url.Replace("{reportId}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(reportId, Client.SerializationSettings).Trim('"'))); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; diff --git a/sdk/PowerBI.Api/Source/ReportsOperationsExtensions.cs b/sdk/PowerBI.Api/Source/ReportsOperationsExtensions.cs index 7f485454..ff6e2083 100644 --- a/sdk/PowerBI.Api/Source/ReportsOperationsExtensions.cs +++ b/sdk/PowerBI.Api/Source/ReportsOperationsExtensions.cs @@ -1841,7 +1841,7 @@ public static EmbedToken GenerateTokenInGroup(this IReportsOperations operations /// /// The report id /// - public static void TakeOverInGroup(this IReportsOperations operations, System.Guid groupId, string reportId) + public static void TakeOverInGroup(this IReportsOperations operations, System.Guid groupId, System.Guid reportId) { operations.TakeOverInGroupAsync(groupId, reportId).GetAwaiter().GetResult(); } @@ -1868,7 +1868,7 @@ public static void TakeOverInGroup(this IReportsOperations operations, System.Gu /// /// The cancellation token. /// - public static async Task TakeOverInGroupAsync(this IReportsOperations operations, System.Guid groupId, string reportId, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task TakeOverInGroupAsync(this IReportsOperations operations, System.Guid groupId, System.Guid reportId, CancellationToken cancellationToken = default(CancellationToken)) { (await operations.TakeOverInGroupWithHttpMessagesAsync(groupId, reportId, null, cancellationToken).ConfigureAwait(false)).Dispose(); } diff --git a/sdk/swaggers/swagger.json b/sdk/swaggers/swagger.json index 1b9f6685..fc131ebd 100644 --- a/sdk/swaggers/swagger.json +++ b/sdk/swaggers/swagger.json @@ -13761,7 +13761,8 @@ "in": "path", "description": "The report id", "required": true, - "type": "string" + "type": "string", + "format": "uuid" } ], "responses": { From dc9c9b4c1872bc6c8c3a1786ca4d59a7e6bace86 Mon Sep 17 00:00:00 2001 From: Laurent Amar Date: Mon, 9 Nov 2020 16:21:12 +0000 Subject: [PATCH 3/3] Merged PR 126099: Update patch version 3.18.1 Update patch version 3.18.1 --- scripts/pack-sdk.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pack-sdk.cmd b/scripts/pack-sdk.cmd index 83fb23f5..8ad8c70e 100644 --- a/scripts/pack-sdk.cmd +++ b/scripts/pack-sdk.cmd @@ -12,7 +12,7 @@ if "%MINOR%"=="" SET MINOR=0 echo ======================================== echo "Pack PowerBI.Api.csproj Release - AnyCPU..." echo ======================================== -call msbuild %~dp0..\sdk\PowerBI.Api\PowerBI.Api.csproj /t:pack /p:Configuration=Release /p:CdpxPostSigning=true /p:PackageVersion=%MAJOR%.%MINOR%.0 /p:PackageOutputPath=%~dp0..\pack\Clean +call msbuild %~dp0..\sdk\PowerBI.Api\PowerBI.Api.csproj /t:pack /p:Configuration=Release /p:CdpxPostSigning=true /p:PackageVersion=%MAJOR%.%MINOR%.1 /p:PackageOutputPath=%~dp0..\pack\Clean set EX=%ERRORLEVEL%