Dev/dowaldma/mirror 3.28

.pipelines/pipeline.user.windows.official.yml

@@ -1,7 +1,7 @@
 version:
   name: 'sdk version'
   major: 3
-  minor: 23
+  minor: 28
   system: 'Buildrevision'
   exclude_commit: true
   assembly_version: 'majorminoronly'

scripts/pack-sdk-dev.cmd

@@ -11,7 +11,7 @@ if "%VERSION%"=="" SET VERSION=0.0.1111
 echo ========================================
 echo "Pack PowerBI.Api.csproj Release - AnyCPU..."
 echo ========================================
-call msbuild %~dp0..\sdk\PowerBI.Api\PowerBI.Api.csproj /t:pack /p:Configuration=Release /p:PackageVersion=%VERSION% /p:PackageOutputPath=%~dp0..\pack\Dev
+call msbuild %~dp0..\sdk\PowerBI.Api\PowerBI.Api.csproj /t:pack /p:Configuration=Release /p:PackageVersion=%VERSION%-dev /p:PackageOutputPath=%~dp0..\pack\Dev
 
 set EX=%ERRORLEVEL%
 if "%EX%" neq "0" (

sdk/PowerBI.Api.Tests/ImportsTests.cs

@@ -107,6 +107,76 @@ public async Task PostImportFileWithNameAndSkipReport()
             }
         }
 
+        [TestMethod]
+        public async Task PostImportFileWithNameAndNotOverrideReport()
+        {
+            var datasetDisplayName = "TestDataset";
+            var importResponse = CreateSampleImportResponse();
+            var overrideReportLabel = false;
+
+            using (var handler = new FakeHttpClientHandler(importResponse))
+            using (var client = CreatePowerBIClient(handler))
+            using (var stream = new MemoryStream())
+            {
+                await client.Imports.PostImportWithFileAsync(stream, datasetDisplayName, overrideReportLabel: overrideReportLabel);
+                var expectedRequesetUrl = $"https://api.powerbi.com/v1.0/myorg/imports?datasetDisplayName={datasetDisplayName}&overrideReportLabel={overrideReportLabel}";
+                Assert.AreEqual(expectedRequesetUrl, handler.Request.RequestUri.ToString());
+            }
+        }
+
+        [TestMethod]
+        public async Task PostImportFileWithNameAndNotOverrideModel()
+        {
+            var datasetDisplayName = "TestDataset";
+            var importResponse = CreateSampleImportResponse();
+            var overrideModelLabel = false;
+
+            using (var handler = new FakeHttpClientHandler(importResponse))
+            using (var client = CreatePowerBIClient(handler))
+            using (var stream = new MemoryStream())
+            {
+                await client.Imports.PostImportWithFileAsync(stream, datasetDisplayName, overrideModelLabel: overrideModelLabel);
+                var expectedRequesetUrl = $"https://api.powerbi.com/v1.0/myorg/imports?datasetDisplayName={datasetDisplayName}&overrideModelLabel={overrideModelLabel}";
+                Assert.AreEqual(expectedRequesetUrl, handler.Request.RequestUri.ToString());
+            }
+        }
+
+        [TestMethod]
+        public async Task PostImportFileWithNameAndNotOverrideLabels()
+        {
+            var datasetDisplayName = "TestDataset";
+            var importResponse = CreateSampleImportResponse();
+            var overrideReportLabel = false;
+            var overrideModelLabel = false;
+
+            using (var handler = new FakeHttpClientHandler(importResponse))
+            using (var client = CreatePowerBIClient(handler))
+            using (var stream = new MemoryStream())
+            {
+                await client.Imports.PostImportWithFileAsync(stream, datasetDisplayName, overrideReportLabel: overrideReportLabel, overrideModelLabel: overrideModelLabel);
+                var expectedRequesetUrl = $"https://api.powerbi.com/v1.0/myorg/imports?datasetDisplayName={datasetDisplayName}&overrideReportLabel={overrideReportLabel}&overrideModelLabel={overrideModelLabel}";
+                Assert.AreEqual(expectedRequesetUrl, handler.Request.RequestUri.ToString());
+            }
+        }
+
+        [TestMethod]
+        public async Task PostImportFileWithNameAndOverrideLabels()
+        {
+            var datasetDisplayName = "TestDataset";
+            var importResponse = CreateSampleImportResponse();
+            var overrideReportLabel = true;
+            var overrideModelLabel = true;
+
+            using (var handler = new FakeHttpClientHandler(importResponse))
+            using (var client = CreatePowerBIClient(handler))
+            using (var stream = new MemoryStream())
+            {
+                await client.Imports.PostImportWithFileAsync(stream, datasetDisplayName, overrideReportLabel: overrideReportLabel, overrideModelLabel: overrideModelLabel);
+                var expectedRequesetUrl = $"https://api.powerbi.com/v1.0/myorg/imports?datasetDisplayName={datasetDisplayName}&overrideReportLabel={overrideReportLabel}&overrideModelLabel={overrideModelLabel}";
+                Assert.AreEqual(expectedRequesetUrl, handler.Request.RequestUri.ToString());
+            }
+        }
+
         [TestMethod]
         public async Task PostImportWithFileWithNameAndConflictAndSkipReport()
         {

sdk/PowerBI.Api/Extensions/ImportsOperationsExtensions.cs

@@ -66,9 +66,15 @@ public static Imports GetImports(this IImportsOperations operations, Guid groupI
         /// <param name='skipReport'>
         /// Determines whether to skip report import, if specified value must be 'true'. Only supported for PBIX files.
         /// </param>
-        public static Import PostImport(this IImportsOperations operations, Guid groupId, string datasetDisplayName, ImportInfo importInfo, ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?))
+        /// <param name='overrideReportLabel'>
+        /// Determines whether to override existing label on report during republish of PBIX file, service default value is true.
+        /// </param>
+        /// <param name='overrideModelLabel'>
+        /// Determines whether to override existing label on model during republish of PBIX file, service default value is true.
+        /// </param>
+        public static Import PostImport(this IImportsOperations operations, Guid groupId, string datasetDisplayName, ImportInfo importInfo, ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), bool? overrideReportLabel = default(bool?), bool? overrideModelLabel = default(bool?))
         {
-            return operations.PostImportAsync(groupId, datasetDisplayName, importInfo, nameConflict, skipReport).GetAwaiter().GetResult();
+            return operations.PostImportAsync(groupId, datasetDisplayName, importInfo, nameConflict, skipReport, overrideReportLabel, overrideModelLabel).GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -92,12 +98,18 @@ public static Imports GetImports(this IImportsOperations operations, Guid groupI
         /// <param name='skipReport'>
         /// Determines whether to skip report import, if specified value must be 'true'. Only supported for PBIX files.
         /// </param>
+        /// <param name='overrideReportLabel'>
+        /// Determines whether to override existing label on report during republish of PBIX file, service default value is true.
+        /// </param>
+        /// <param name='overrideModelLabel'>
+        /// Determines whether to override existing label on model during republish of PBIX file, service default value is true.
+        /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public static async Task<Import> PostImportAsync(this IImportsOperations operations, Guid groupId, string datasetDisplayName, ImportInfo importInfo, ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), CancellationToken cancellationToken = default(CancellationToken))
+        public static async Task<Import> PostImportAsync(this IImportsOperations operations, Guid groupId, string datasetDisplayName, ImportInfo importInfo, ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), bool? overrideReportLabel = default(bool?), bool? overrideModelLabel = default(bool?), CancellationToken cancellationToken = default(CancellationToken))
         {
-            using (var _result = await operations.PostImportInGroupWithHttpMessagesAsync(groupId, datasetDisplayName, importInfo, nameConflict, skipReport, null, cancellationToken).ConfigureAwait(false))
+            using (var _result = await operations.PostImportInGroupWithHttpMessagesAsync(groupId, datasetDisplayName, importInfo, nameConflict, skipReport, overrideReportLabel, overrideModelLabel, null, cancellationToken).ConfigureAwait(false))
             {
                 return _result.Body;
             }
@@ -198,9 +210,15 @@ public static TemporaryUploadLocation CreateTemporaryUploadLocation(this IImport
         /// <param name='skipReport'>
         /// Determines whether to skip report import, if specified value must be 'true'. Only supported for PBIX files.
         /// </param>
-        public static Import PostImportWithFile(this IImportsOperations operations, Guid groupId, Stream fileStream, string datasetDisplayName = default(string), ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?))
+        /// <param name='overrideReportLabel'>
+        /// Determines whether to override existing label on report during republish of PBIX file, service default value is true.
+        /// </param>
+        /// <param name='overrideModelLabel'>
+        /// Determines whether to override existing label on model during republish of PBIX file, service default value is true.
+        /// </param>
+        public static Import PostImportWithFile(this IImportsOperations operations, Guid groupId, Stream fileStream, string datasetDisplayName = default(string), ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), bool? overrideReportLabel = default(bool?), bool? overrideModelLabel = default(bool?))
         {
-            return Task.Factory.StartNew(s => ((IImportsOperations)s).PostImportFileWithHttpMessage(groupId, fileStream, datasetDisplayName, nameConflict, skipReport), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult().Body;
+            return Task.Factory.StartNew(s => ((IImportsOperations)s).PostImportFileWithHttpMessage(groupId, fileStream, datasetDisplayName, nameConflict, skipReport, overrideReportLabel, overrideModelLabel), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult().Body;
         }
 
         /// <summary>
@@ -225,12 +243,18 @@ public static TemporaryUploadLocation CreateTemporaryUploadLocation(this IImport
         /// <param name='skipReport'>
         /// Determines whether to skip report import, if specified value must be 'true'. Only supported for PBIX files.
         /// </param>
+        /// <param name='overrideReportLabel'>
+        /// Determines whether to override existing label on report during republish of PBIX file, service default value is true.
+        /// </param>
+        /// <param name='overrideModelLabel'>
+        /// Determines whether to override existing label on model during republish of PBIX file, service default value is true.
+        /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public static async Task<Import> PostImportWithFileAsync(this IImportsOperations operations, Guid groupId, Stream fileStream, string datasetDisplayName = default(string), ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), CancellationToken cancellationToken = default(CancellationToken))
+        public static async Task<Import> PostImportWithFileAsync(this IImportsOperations operations, Guid groupId, Stream fileStream, string datasetDisplayName = default(string), ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), bool? overrideReportLabel = default(bool?), bool? overrideModelLabel = default(bool?), CancellationToken cancellationToken = default(CancellationToken))
         {
-            using (var _result = await operations.PostImportFileWithHttpMessage(groupId, fileStream, datasetDisplayName, nameConflict, skipReport, null, cancellationToken).ConfigureAwait(false))
+            using (var _result = await operations.PostImportFileWithHttpMessage(groupId, fileStream, datasetDisplayName, nameConflict, skipReport, overrideReportLabel, overrideModelLabel, null, cancellationToken).ConfigureAwait(false))
             {
                 return _result.Body;
             }

sdk/PowerBI.Api/Imports/IImportsOperations.cs

@@ -28,10 +28,16 @@ public partial interface IImportsOperations
         /// <param name='skipReport'>
         /// Determines whether to skip report import, if specified value must be 'true'. Only supported for PBIX files.
         /// </param>
+        /// <param name='overrideReportLabel'>
+        /// Determines whether to override existing label on report during republish of PBIX file, service default value is true.
+        /// </param>
+        /// <param name='overrideModelLabel'>
+        /// Determines whether to override existing label on model during republish of PBIX file, service default value is true.
+        /// </param>
         /// <param name="customHeaders">Optional custom headers</param>
         /// <param name="cancellationToken">Optional cancellation token</param>
         /// <returns></returns>
-        Task<HttpOperationResponse<Import>> PostImportFileWithHttpMessage(Stream file, string datasetDisplayName = default(string), ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<HttpOperationResponse<Import>> PostImportFileWithHttpMessage(Stream file, string datasetDisplayName = default(string), ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), bool? overrideReportLabel = default(bool?), bool? overrideModelLabel = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Uploads a PBIX file to the specified group
@@ -51,12 +57,18 @@ public partial interface IImportsOperations
         /// <param name='skipReport'>
         /// Determines whether to skip report import, if specified value must be 'true'. Only supported for PBIX files.
         /// </param>
+        /// <param name='overrideReportLabel'>
+        /// Determines whether to override existing label on report during republish of PBIX file, service default value is true.
+        /// </param>
+        /// <param name='overrideModelLabel'>
+        /// Determines whether to override existing label on model during republish of PBIX file, service default value is true.
+        /// </param>
         /// <param name="customHeaders">
         /// Optional custom headers
         /// </param>
         /// <param name="cancellationToken">
         /// Optional cancellation token
         /// </param>
-        Task<HttpOperationResponse<Import>> PostImportFileWithHttpMessage(Guid? groupId, Stream file, string datasetDisplayName = default(string), ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<HttpOperationResponse<Import>> PostImportFileWithHttpMessage(Guid? groupId, Stream file, string datasetDisplayName = default(string), ImportConflictHandlerMode? nameConflict = default(ImportConflictHandlerMode?), bool? skipReport = default(bool?), bool? overrideReportLabel = default(bool?), bool? overrideModelLabel = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }