Skip to content

Commit

Permalink
Merge branch 'main' into live
Browse files Browse the repository at this point in the history
  • Loading branch information
KirillOsenkov committed Jul 25, 2023
2 parents 314b475 + 531f81b commit 299a429
Show file tree
Hide file tree
Showing 39 changed files with 1,223 additions and 442 deletions.
3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
<!--<DebugType Condition="$(OS) == 'Windows_NT'">embedded</DebugType>-->
<LangVersion>latest</LangVersion>
<ImportFrameworkWinFXTargets>true</ImportFrameworkWinFXTargets>
<NoWarn>$(NoWarn);NU1701;CS8632</NoWarn>

<MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
<MSBuildPackageVersion>17.5.0</MSBuildPackageVersion>
<!--<NuGetVersionNerdbankGitVersioning>3.5.107</NuGetVersionNerdbankGitVersioning>-->
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion PublishNativeAOT.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
dotnet publish -c Release -r linux-x64 -p:PublishNativeAot=True src/StructuredLogViewer.Avalonia/StructuredLogViewer.Avalonia.csproj
strip bin/StructuredLogViewer.Avalonia/Release/net6.0/linux-x64/publish/StructuredLogViewer.Avalonia
strip bin/StructuredLogViewer.Avalonia/Release/net7.0/linux-x64/publish/StructuredLogViewer.Avalonia
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ View binlogs in the Browser: https://live.msbuildlog.com

Important: the NuGet package is now being published to https://nuget.org/packages/MSBuild.StructuredLogger (old location: https://nuget.org/packages/Microsoft.Build.Logging.StructuredLogger). Please update to use the new Package Id.

Thanks to https://signpath.io for generously providing a certificate to sign the installer.
Thanks to [SignPath.io](https://signpath.io?utm_source=foundation&utm_medium=github&utm_campaign=MSBuildStructuredLog) for providing a free code signing service and to the [SignPath Foundation](https://signpath.org?utm_source=foundation&utm_medium=github&utm_campaign=MSBuildStructuredLog) for a free code signing certificate to sign the installer.

## Install:
Install from https://msbuildlog.com.
Expand Down
2 changes: 1 addition & 1 deletion src/BinlogTool/BinlogTool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<Version>1.0.6</Version>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>latest</LangVersion>
<DebugType>embedded</DebugType>
<Prefer32Bit>false</Prefer32Bit>
Expand Down
207 changes: 104 additions & 103 deletions src/StructuredLogViewer.Avalonia/Controls/BuildControl.xaml
Original file line number Diff line number Diff line change
@@ -1,119 +1,120 @@
<UserControl xmlns="https://github.com/avaloniaui"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:StructuredLogViewer.Avalonia.Controls;assembly=StructuredLogViewer.Avalonia"
x:Class="StructuredLogViewer.Avalonia.Controls.BuildControl">

<local:SplitterPanel Orientation="Vertical"
FirstChildRelativeSize="*"
SecondChildRelativeSize="50">
<local:SplitterPanel Orientation="Vertical" FirstChildRelativeSize="*" SecondChildRelativeSize="50">

<local:SplitterPanel.FirstChild>
<local:SplitterPanel FirstChildRelativeSize="1*" SecondChildRelativeSize="3*">
<local:SplitterPanel.FirstChild>
<local:SplitterPanel FirstChildRelativeSize="1*"
SecondChildRelativeSize="3*">
<local:SplitterPanel.FirstChild>
<TabControl Name="leftPaneTabControl"
SelectedIndex="0"
TabStripPlacement="Bottom"
Margin="0"
Padding="0">
<TabItem Name="searchLogTab"
Header="Search Log">
<local:SearchAndResultsControl Name="searchLogControl" />
</TabItem>
<TabControl Name="leftPaneTabControl" TabStripPlacement="Bottom" SelectedIndex="0" Margin="0" Padding="0">
<TabItem Name="searchLogTab" Header="Search Log">
<local:SearchAndResultsControl Name="searchLogControl"></local:SearchAndResultsControl>
</TabItem>

<TabItem Name="filesTab"
Header="Files"
IsVisible="false">
<TreeView Name="filesTree"
Background="#F5F5F5"
BorderThickness="0">
</TreeView>
</TabItem>
<TabItem x:Name="propertiesAndItemsTab" Header="Properties and items">
<DockPanel>
<Border DockPanel.Dock="Top"
BorderThickness="0,0,0,1"
Background="{DynamicResource Theme_InfoBarBackground}"
BorderBrush="Gray"
Name="projectContextBorder"
IsVisible="False"
Padding="4,2,4,2"
MinHeight="27">
<DockPanel>
<TextBlock DockPanel.Dock="Left" VerticalAlignment="Center" Text="Project: " />
<ContentControl Focusable="false" DockPanel.Dock="Top" VerticalAlignment="Center" Name="propertiesAndItemsContext" />
</DockPanel>
</Border>
<local:SearchAndResultsControl Name="propertiesAndItemsControl"></local:SearchAndResultsControl>
</DockPanel>
</TabItem>

<TabItem Name="findInFilesTab"
Header="Find in Files"
IsVisible="False">
<local:SearchAndResultsControl Name="findInFilesControl"
WatermarkContent="Search in files" />
</TabItem>
</TabControl>
</local:SplitterPanel.FirstChild>
<local:SplitterPanel.SecondChild>
<TabItem Name="filesTab" Header="Files" IsVisible="false">
<TreeView Name="filesTree"></TreeView>
</TabItem>

<local:SplitterPanel Name="tabs">
<local:SplitterPanel.FirstChild>
<TabControl Name="centralTabControl"
TabStripPlacement="Bottom"
SelectedIndex="0"
MinWidth="10">
<TabItem Name="mainTreeTab"
Header="Log">
<TreeView Name="treeView"
BorderBrush="Transparent"
BorderThickness="0"
Classes="searchable"
AutoScrollToSelectedItem="True"
Items="{Binding Children}"/>
</TabItem>
<TabItem Name="findInFilesTab" Header="Find in Files" IsVisible="False">
<local:SearchAndResultsControl Name="findInFilesControl" WatermarkContent="Search in files"></local:SearchAndResultsControl>
</TabItem>
</TabControl>
</local:SplitterPanel.FirstChild>
<local:SplitterPanel.SecondChild>

<!--<TabItem Name="timelineTab"
Header="Timeline">
<local:TimelineControl Name="timeline" />
</TabItem>-->
</TabControl>
</local:SplitterPanel.FirstChild>
<local:SplitterPanel Name="tabs">
<local:SplitterPanel.FirstChild>
<TabControl Name="centralTabControl"
TabStripPlacement="Bottom"
SelectedIndex="0"
MinWidth="10">
<TabItem Name="mainTreeTab" Header="Log">
<TreeView Name="treeView"
BorderBrush="Transparent"
BorderThickness="0"
Classes="searchable"
AutoScrollToSelectedItem="True"
Items="{Binding Children}"/>
</TabItem>

<local:SplitterPanel.SecondChild>
<local:DocumentWell Name="documentWell"
IsVisible="false" />
</local:SplitterPanel.SecondChild>
</local:SplitterPanel>
</local:SplitterPanel.SecondChild>
</local:SplitterPanel>
</local:SplitterPanel.FirstChild>
<!--<TabItem Name="timelineTab"
Header="Timeline">
<local:TimelineControl Name="timeline" />
</TabItem>-->
</TabControl>
</local:SplitterPanel.FirstChild>

<local:SplitterPanel.SecondChild>
<Border BorderBrush="Gray"
BorderThickness="1">
<ScrollViewer Background="LightYellow">
<ListBox Name="breadCrumb"
BorderThickness="0"
BorderBrush="Transparent">
<ListBox.Template>
<ControlTemplate TargetType="{x:Type ListBox}">
<Border BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}">
<ItemsPresenter Name="PART_ItemsPresenter"
Items="{TemplateBinding Items}"
ItemsPanel="{TemplateBinding ItemsPanel}"
ItemTemplate="{TemplateBinding ItemTemplate}"
Margin="{TemplateBinding Padding}"
VirtualizationMode="{TemplateBinding VirtualizationMode}" />
</Border>
</ControlTemplate>
</ListBox.Template>
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel />
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.Styles>
<Style Selector="Separator">
<Setter Property="Template">
<ControlTemplate>
<Polygon Points="0,0 3,3 0,6"
Stroke="Black"
Fill="Black"
VerticalAlignment="Center" />
</ControlTemplate>
</Setter>
</Style>
</ListBox.Styles>
</ListBox>
</ScrollViewer>
</Border>
<local:SplitterPanel.SecondChild>
<local:DocumentWell Name="documentWell" IsVisible="false"></local:DocumentWell>
</local:SplitterPanel.SecondChild>
</local:SplitterPanel>
</local:SplitterPanel.SecondChild>
</local:SplitterPanel>
</local:SplitterPanel.FirstChild>

<local:SplitterPanel.SecondChild>
<Border BorderBrush="Gray"
BorderThickness="1">
<ScrollViewer Background="LightYellow">
<ListBox Name="breadCrumb"
BorderThickness="0"
BorderBrush="Transparent">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel />
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.Template>
<ControlTemplate TargetType="{x:Type ListBox}">
<Border BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}">
<ItemsPresenter Name="PART_ItemsPresenter"
Items="{TemplateBinding Items}"
ItemsPanel="{TemplateBinding ItemsPanel}"
ItemTemplate="{TemplateBinding ItemTemplate}"
Margin="{TemplateBinding Padding}"
VirtualizationMode="{TemplateBinding VirtualizationMode}" />
</Border>
</ControlTemplate>
</ListBox.Template>
<ListBox.Styles>
<Style Selector="Separator">
<Setter Property="Template">
<ControlTemplate>
<Polygon Points="0,0 3,3 0,6"
Stroke="Black"
Fill="Black"
VerticalAlignment="Center" />
</ControlTemplate>
</Setter>
</Style>
</ListBox.Styles>
</ListBox>
</ScrollViewer>
</Border>
</local:SplitterPanel.SecondChild>

</local:SplitterPanel>
</local:SplitterPanel>

</UserControl>
Loading

0 comments on commit 299a429

Please sign in to comment.