Merge pull request #393 from microsoft/staging

Release - 5/19/24
microsoft · May 20, 2024 · 28650f7 · 28650f7
2 parents 8298c31 + 512d162
commit 28650f7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -20,7 +20,7 @@ parameters:
     - release
 
 variables:
-  MSIXVersion: '0.1300'
+  MSIXVersion: '0.1400'
   solution: '**/GitHubExtension.sln'
   appxPackageDir: 'AppxPackages'
   testOutputArtifactDir: 'TestResults'
@@ -83,13 +83,13 @@ extends:
                 nugetConfigPath: 'nuget.config'
                 externalFeedCredentials: 'DevHomeInternal'
 
-            - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
+            - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
               displayName: Send and Download Localization Files for Artifacts
               condition: and(eq(variables['EnableLocalization'], 'true'), eq(variables['UpdateLocalization'], 'true'))
               inputs:
                 teamId: 71221
-                authId: $(TouchdownAppId)
-                authKey: $(TouchdownAppKey)
+                TDBuildServiceConnection: $(TouchdownServiceConnection)
+                authType: SubjectNameIssuer
                 resourceFilePath: |
                   **\en-US\*.resw;P:466
                   **\en-US\PDP.xml
@@ -98,14 +98,14 @@ extends:
                 appendRelativeDir: true
                 pseudoSetting: Included
 
-            - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
+            - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
               displayName: Download and Use Localization Files
               condition: eq(variables['EnableLocalization'], 'true')
               retryCountOnTaskFailure: 2
               inputs:
                 teamId: 71221
-                authId: $(TouchdownAppId)
-                authKey: $(TouchdownAppKey)
+                TDBuildServiceConnection: $(TouchdownServiceConnection)
+                authType: SubjectNameIssuer
                 resourceFilePath: |
                   **\en-US\*.resw;P:466
                   **\en-US\PDP.xml
@@ -365,14 +365,14 @@ extends:
             artifactName: MsixBundle_Release
             targetPath: StorePublish
 
-        - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
+        - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
           displayName: Download and Use Localization Files
           condition: eq(variables['EnableLocalization'], 'true')
           retryCountOnTaskFailure: 2
           inputs:
             teamId: 71221
-            authId: $(TouchdownAppId)
-            authKey: $(TouchdownAppKey)
+            TDBuildServiceConnection: $(TouchdownServiceConnection)
+            authType: SubjectNameIssuer
             resourceFilePath: |
               **\en-US\PDP.xml
             localizationTarget: false

diff --git a/build/scripts/CreateBuildInfo.ps1 b/build/scripts/CreateBuildInfo.ps1
@@ -5,7 +5,7 @@ Param(
 )
 
 $Major = "0"
-$Minor = "13"
+$Minor = "14"
 $Patch = "99" # default to 99 for local builds
 
 $versionSplit = $Version.Split(".");

diff --git a/src/GitHubExtension/Providers/RepositoryProvider.cs b/src/GitHubExtension/Providers/RepositoryProvider.cs
@@ -222,6 +222,7 @@ public IAsyncOperation<ProviderOperationResult> CloneRepositoryAsync(IRepository
             var cloneOptions = new LibGit2Sharp.CloneOptions
             {
                 Checkout = true,
+                RecurseSubmodules = true,
             };
 
             if (developerId != null)
@@ -267,12 +268,12 @@ public IAsyncOperation<ProviderOperationResult> CloneRepositoryAsync(IRepository
             catch (LibGit2Sharp.LibGit2SharpException libGitTwoException)
             {
                 Log.Error(libGitTwoException, $"Either no logged in account has access to this repository, or the repository can't be found.");
-                return new ProviderOperationResult(ProviderOperationStatus.Failure, libGitTwoException, "LibGit2 library threw an exception.", "LibGit2 library threw an exception.");
+                return new ProviderOperationResult(ProviderOperationStatus.Failure, libGitTwoException, libGitTwoException.Message, libGitTwoException.Message);
             }
             catch (Exception e)
             {
                 Log.Error(e, "Could not clone the repository.");
-                return new ProviderOperationResult(ProviderOperationStatus.Failure, e, "Something happened when cloning the repository.", "Something happened when cloning the repository.");
+                return new ProviderOperationResult(ProviderOperationStatus.Failure, e, e.Message, e.Message);
             }
 
             return new ProviderOperationResult(ProviderOperationStatus.Success, new ArgumentException("Nothing wrong"), "Nothing wrong", "Nothing wrong");

diff --git a/src/GitHubExtension/Widgets/GitHubWidget.cs b/src/GitHubExtension/Widgets/GitHubWidget.cs
@@ -130,6 +130,8 @@ public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs)
                 // It might take some time to get the new data, so
                 // set data state to "unknown" so that loading page is shown.
                 DataState = WidgetDataState.Unknown;
+
+                ConfigurationData = actionInvokedArgs.Data;
                 UpdateWidget();
 
                 SavedConfigurationData = string.Empty;