Merge branch 'hotfix/5.0.1'

WildGums · Dec 20, 2023 · 3f42ebd · 3f42ebd
2 parents c32324e + 0505515
commit 3f42ebd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/deployment/cake/issuetrackers-github.cake b/deployment/cake/issuetrackers-github.cake
@@ -8,13 +8,11 @@ public class GitHubIssueTracker : IIssueTracker
     {
         BuildContext = buildContext;
 
-        UserName = buildContext.BuildServer.GetVariable("GitHubUserName", showValue: true);
         ApiKey = buildContext.BuildServer.GetVariable("GitHubApiKey", showValue: false);
         OwnerName = buildContext.BuildServer.GetVariable("GitHubOwnerName", buildContext.General.Copyright.Company, showValue: true);
         ProjectName = buildContext.BuildServer.GetVariable("GitHubProjectName", buildContext.General.Solution.Name, showValue: true);
 
-        if (!string.IsNullOrWhiteSpace(UserName) &&
-            !string.IsNullOrWhiteSpace(ApiKey) &&
+        if (!string.IsNullOrWhiteSpace(ApiKey) &&
             !string.IsNullOrWhiteSpace(OwnerName) &&
             !string.IsNullOrWhiteSpace(ProjectName))
         {
@@ -24,7 +22,6 @@ public class GitHubIssueTracker : IIssueTracker
 
     public BuildContext BuildContext { get; private set; }
 
-    public string UserName { get; set; }
     public string ApiKey { get; set; }
     public string OwnerName { get; set; }
     public string ProjectName { get; set; }

diff --git a/deployment/cake/issuetrackers.cake b/deployment/cake/issuetrackers.cake
@@ -34,7 +34,7 @@ public class IssueTrackerIntegration : IntegrationBase
             }
             catch (Exception ex)
             {
-                BuildContext.CakeContext.Warning(ex.Message);
+                BuildContext.CakeContext.Error(ex.Message);
             }
         }
     }

diff --git a/deployment/cake/sourcecontrol-github.cake b/deployment/cake/sourcecontrol-github.cake
@@ -1,5 +1,5 @@
 #addin "nuget:?package=Cake.GitHub&version=0.1.0"
-#addin "nuget:?package=Octokit&version=9.0.0"
+#addin "nuget:?package=Octokit&version=9.0.0"
 
 //-------------------------------------------------------------
 
@@ -9,13 +9,11 @@ public class GitHubSourceControl : ISourceControl
     {
         BuildContext = buildContext;
 
-        UserName = buildContext.BuildServer.GetVariable("GitHubUserName", buildContext.General.Repository.Username, showValue: true);
         ApiKey = buildContext.BuildServer.GetVariable("GitHubApiKey", buildContext.General.Repository.Password, showValue: false);
         OwnerName = buildContext.BuildServer.GetVariable("GitHubOwnerName", buildContext.General.Copyright.Company, showValue: true);
         ProjectName = buildContext.BuildServer.GetVariable("GitHubProjectName", buildContext.General.Solution.Name, showValue: true);
 
-        if (!string.IsNullOrWhiteSpace(UserName) &&
-            !string.IsNullOrWhiteSpace(ApiKey) &&
+        if (!string.IsNullOrWhiteSpace(ApiKey) &&
             !string.IsNullOrWhiteSpace(OwnerName) &&
             !string.IsNullOrWhiteSpace(ProjectName))
         {
@@ -25,7 +23,6 @@ public class GitHubSourceControl : ISourceControl
 
     public BuildContext BuildContext { get; private set; }
 
-    public string UserName { get; set; }
     public string ApiKey { get; set; }
     public string OwnerName { get; set; }
     public string ProjectName { get; set; }
@@ -66,7 +63,8 @@ public class GitHubSourceControl : ISourceControl
 
         var commitSha = BuildContext.General.Repository.CommitId;
 
-        BuildContext.CakeContext.GitHubStatus(UserName, ApiKey, OwnerName, ProjectName, commitSha, new GitHubStatusSettings
+        // Note: UserName is not really required, use string.Empty, then only api key is needed
+        BuildContext.CakeContext.GitHubStatus(string.Empty, ApiKey, OwnerName, ProjectName, commitSha, new GitHubStatusSettings
         {
             State = state,
             TargetUrl = null,// "url-to-build-server",

diff --git a/src/Orc.Controls/Controls/TimeSpanPicker/Themes/TimeSpanPicker.generic.xaml b/src/Orc.Controls/Controls/TimeSpanPicker/Themes/TimeSpanPicker.generic.xaml
@@ -111,8 +111,8 @@
                         <Border x:Name="PART_MainContainer"
                                 Margin="0"
                                 Padding="{TemplateBinding Padding}"
-                                BorderThickness="1" 
-                                Visibility="{Binding ElementName=PART_NumericTBEditorContainer, Path=IsVisible, Converter={catel:BooleanToCollapsingVisibilityConverter SupportInversionUsingCommandParameter=True}, ConverterParameter=True}"
+                                BorderThickness="1"
+                                Visibility="{Binding ElementName=PART_NumericTBEditorContainerBorder, Path=IsVisible, Converter={catel:BooleanToCollapsingVisibilityConverter SupportInversionUsingCommandParameter=True}, ConverterParameter=True}"
                                 Style="{DynamicResource TimeSpanBorderStyle}">
 
                             <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">

diff --git a/src/Orc.Controls/Themes/Generic.generated.xaml b/src/Orc.Controls/Themes/Generic.generated.xaml
@@ -1668,7 +1668,7 @@
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:TimeSpanPicker}">
           <Grid VerticalAlignment="Stretch">
-            <Border x:Name="PART_MainContainer" Margin="0" Padding="{TemplateBinding Padding}" BorderThickness="1" Visibility="{Binding ElementName=PART_NumericTBEditorContainer, Path=IsVisible, Converter={catel:BooleanToCollapsingVisibilityConverter SupportInversionUsingCommandParameter=True}, ConverterParameter=True}" Style="{DynamicResource TimeSpanBorderStyle}">
+            <Border x:Name="PART_MainContainer" Margin="0" Padding="{TemplateBinding Padding}" BorderThickness="1" Visibility="{Binding ElementName=PART_NumericTBEditorContainerBorder, Path=IsVisible, Converter={catel:BooleanToCollapsingVisibilityConverter SupportInversionUsingCommandParameter=True}, ConverterParameter=True}" Style="{DynamicResource TimeSpanBorderStyle}">
               <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ public class IssueTrackerIntegration : IntegrationBase @@
                 }
                 catch (Exception ex)
                 {
-                    BuildContext.CakeContext.Warning(ex.Message);
+                    BuildContext.CakeContext.Error(ex.Message);
                 }
             }
         }
@@ Expand Down @@