diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 5c5ebd1..b387ca9 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -59,8 +59,6 @@ extends: - task: NuGetToolInstaller@1 - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: 'DevHomeInternal' - task: PowerShell@2 displayName: Replace Stubbed Files @@ -81,9 +79,8 @@ extends: restoreSolution: '$(solution)' feedsToUse: 'config' nugetConfigPath: 'nuget.config' - externalFeedCredentials: 'DevHomeInternal' - - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3 + - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4 displayName: Send and Download Localization Files for Artifacts condition: and(eq(variables['EnableLocalization'], 'true'), eq(variables['UpdateLocalization'], 'true')) inputs: @@ -98,7 +95,7 @@ extends: appendRelativeDir: true pseudoSetting: Included - - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3 + - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4 displayName: Download and Use Localization Files condition: eq(variables['EnableLocalization'], 'true') retryCountOnTaskFailure: 2 @@ -363,7 +360,7 @@ extends: artifactName: MsixBundle_Release targetPath: StorePublish - - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3 + - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4 displayName: Download and Use Localization Files condition: eq(variables['EnableLocalization'], 'true') retryCountOnTaskFailure: 2 @@ -388,11 +385,11 @@ extends: $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore } pwsh: true - - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2 + - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3 displayName: 'Create Staging StoreBroker Package' condition: eq(variables['BuildingBranch'], 'staging') inputs: - serviceEndpoint: 'DevHomeGitHubExtensionCanary StoreBroker' + ConnectedServiceNameARM: 'DevHomeGithubExtensionCanary StoreBroker ServiceConnection' sbConfigPath: '$(System.DefaultWorkingDirectory)\build\store\canary\SBConfig.json' sourceFolder: 'StorePublish' contents: '*.msixbundle' @@ -401,11 +398,11 @@ extends: outSBName: DevHomeStoreSubmissionPackage pdpInclude: 'PDP.xml' - - task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@2 + - task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@3 displayName: 'Publish Staging StoreBroker Package' condition: eq(variables['BuildingBranch'], 'staging') inputs: - serviceEndpoint: 'DevHomeGitHubExtensionCanary StoreBroker' + ConnectedServiceNameARM: 'DevHomeGithubExtensionCanary StoreBroker ServiceConnection' appId: 9N806ZKPW85R inputMethod: JsonAndZip jsonPath: '$(System.DefaultWorkingDirectory)\SBOutDir\DevHomeStoreSubmissionPackage.json' @@ -416,11 +413,11 @@ extends: jsonZipUpdateMetadata: true updateImages: true - - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2 + - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3 displayName: 'Create Release StoreBroker Package' condition: eq(variables['BuildingBranch'], 'release') inputs: - serviceEndpoint: 'DevHomeGitHubExtension StoreBroker' + ConnectedServiceNameARM: 'DevHomeGithubExtension StoreBroker ServiceConnection' sbConfigPath: '$(System.DefaultWorkingDirectory)\build\store\preview\SBConfig.json' sourceFolder: 'StorePublish' contents: '*.msixbundle' @@ -429,11 +426,11 @@ extends: outSBName: DevHomeStoreSubmissionPackage pdpInclude: 'PDP.xml' - - task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@2 + - task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@3 displayName: 'Publish Release StoreBroker Package' condition: eq(variables['BuildingBranch'], 'release') inputs: - serviceEndpoint: 'DevHomeGitHubExtension StoreBroker' + ConnectedServiceNameARM: 'DevHomeGithubExtension StoreBroker ServiceConnection' appId: 9NZCC27PR6N6 inputMethod: JsonAndZip jsonPath: '$(System.DefaultWorkingDirectory)\SBOutDir\DevHomeStoreSubmissionPackage.json' diff --git a/exclusion.dic b/exclusion.dic index 548f38a..3569188 100644 --- a/exclusion.dic +++ b/exclusion.dic @@ -12,3 +12,4 @@ Stringify riid Impl microsoft +octokit diff --git a/src/GitHubExtension/Client/Validation.cs b/src/GitHubExtension/Client/Validation.cs index d731b91..99da1c8 100644 --- a/src/GitHubExtension/Client/Validation.cs +++ b/src/GitHubExtension/Client/Validation.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using GitHubExtension.DataModel; using Octokit; using Serilog; diff --git a/src/GitHubExtension/DataManager/GitHubSearchManger.cs b/src/GitHubExtension/DataManager/GitHubSearchManager.cs similarity index 95% rename from src/GitHubExtension/DataManager/GitHubSearchManger.cs rename to src/GitHubExtension/DataManager/GitHubSearchManager.cs index 90d61d2..300c50b 100644 --- a/src/GitHubExtension/DataManager/GitHubSearchManger.cs +++ b/src/GitHubExtension/DataManager/GitHubSearchManager.cs @@ -4,7 +4,6 @@ using GitHubExtension.Client; using GitHubExtension.DataManager; using Microsoft.Windows.DevHome.SDK; -using Octokit; using Serilog; namespace GitHubExtension; @@ -53,7 +52,7 @@ public async Task SearchForGitHubIssuesOrPRs(Octokit.SearchIssuesRequest request await SearchForGitHubIssuesOrPRs(request, initiator, category, client, options); } - private async Task SearchForGitHubIssuesOrPRs(Octokit.SearchIssuesRequest request, string initiator, SearchCategory category, GitHubClient client, RequestOptions? options = null) + private async Task SearchForGitHubIssuesOrPRs(Octokit.SearchIssuesRequest request, string initiator, SearchCategory category, Octokit.GitHubClient client, RequestOptions? options = null) { Log.Information(Name, $"Searching for issues or pull requests for widget {initiator}"); request.State = Octokit.ItemState.Open; diff --git a/src/GitHubExtension/Widgets/GitHubReleasesWidget.cs b/src/GitHubExtension/Widgets/GitHubReleasesWidget.cs index 80c1e52..6d061d2 100644 --- a/src/GitHubExtension/Widgets/GitHubReleasesWidget.cs +++ b/src/GitHubExtension/Widgets/GitHubReleasesWidget.cs @@ -6,7 +6,6 @@ using GitHubExtension.DataManager; using GitHubExtension.Helpers; using GitHubExtension.Widgets.Enums; -using Octokit; namespace GitHubExtension.Widgets; diff --git a/src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs b/src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs index 990e7bf..067b36a 100644 --- a/src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs +++ b/src/GitHubExtension/Widgets/GitHubRepositoryWidget.cs @@ -46,6 +46,19 @@ public string GetUnescapedIssueQuery() return Uri.UnescapeDataString(GetIssueQuery()).Replace('+', ' '); } + // If the user changed the URL after clicking submit and clicked + // saved just after, we change it back to what was before to not corrupt our saved data. + private void CorrectUrl() + { + var configurationData = JsonNode.Parse(ConfigurationData); + if (configurationData != null) + { + configurationData["url"] = RepositoryUrl; + ConfigurationData = configurationData.ToJsonString(); + UpdateWidget(); + } + } + public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs) { var verb = GetWidgetActionForVerb(actionInvokedArgs.Verb); @@ -60,6 +73,7 @@ public override void OnActionInvoked(WidgetActionInvokedArgs actionInvokedArgs) case WidgetAction.Save: UpdateTitle(JsonNode.Parse(actionInvokedArgs.Data)); base.OnActionInvoked(actionInvokedArgs); + CorrectUrl(); break; default: @@ -256,7 +270,7 @@ public string GetConfiguration(string dataUrl) { "owner", repository.Owner.Login }, { "milestone", string.Empty }, { "project", repository.Description }, - { "url", repository.HtmlUrl }, + { "url", RepositoryUrl }, { "query", GetUnescapedIssueQuery() }, };