-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into pseudoclasses-has
- Loading branch information
Showing
141 changed files
with
5,387 additions
and
1,145 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # Starter pipeline | ||
| # Start with a minimal pipeline that you can customize to build and deploy your code. | ||
| # Add steps that build, run tests, deploy, and more: | ||
| # https://aka.ms/yaml | ||
|
|
||
| trigger: | ||
| - master | ||
|
|
||
| jobs: | ||
| - job: Mac | ||
| pool: | ||
| name: 'AvaloniaMacPool' | ||
|
|
||
| steps: | ||
| - script: ./tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh | ||
| displayName: 'run integration tests' | ||
|
|
||
|
|
||
| - job: Windows | ||
| pool: | ||
| vmImage: 'windows-2022' | ||
|
|
||
| steps: | ||
| - task: UseDotNet@2 | ||
| displayName: 'Use .NET Core SDK 6.0.202' | ||
| inputs: | ||
| version: 6.0.202 | ||
|
|
||
| - task: Windows Application Driver@0 | ||
| inputs: | ||
| OperationType: 'Start' | ||
| AgentResolution: '4K' | ||
| displayName: 'Start WinAppDriver' | ||
|
|
||
| - task: DotNetCoreCLI@2 | ||
| inputs: | ||
| command: 'build' | ||
| projects: 'samples/IntegrationTestApp/IntegrationTestApp.csproj' | ||
|
|
||
| - task: DotNetCoreCLI@2 | ||
| inputs: | ||
| command: 'test' | ||
| projects: 'tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj' | ||
|
|
||
| - task: Windows Application Driver@0 | ||
| inputs: | ||
| OperationType: 'Stop' | ||
| displayName: 'Stop WinAppDriver' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,57 @@ | ||
| <UserControl xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| x:Class="ControlCatalog.Pages.DialogsPage"> | ||
| <StackPanel Orientation="Vertical" Spacing="4" Margin="4"> | ||
| <CheckBox Name="UseFilters">Use filters</CheckBox> | ||
| <Button Name="OpenFile">_Open File</Button> | ||
| <Button Name="OpenMultipleFiles">Open _Multiple File</Button> | ||
| <Button Name="SaveFile">_Save File</Button> | ||
| <Button Name="SelectFolder">Select Fo_lder</Button> | ||
| <Button Name="OpenBoth">Select _Both</Button> | ||
| <UserControl x:Class="ControlCatalog.Pages.DialogsPage" | ||
| xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> | ||
| <StackPanel Margin="4" | ||
| Orientation="Vertical" | ||
| Spacing="4"> | ||
|
|
||
| <TextBlock x:Name="PickerLastResultsVisible" | ||
| Classes="h2" | ||
| IsVisible="False" | ||
| Text="Last picker results:" /> | ||
| <ItemsPresenter x:Name="PickerLastResults" /> | ||
| <TextBlock Text="Windows:" /> | ||
|
|
||
| <TextBlock Margin="0, 8, 0, 0" | ||
| Classes="h1" | ||
| Text="Window dialogs" /> | ||
| <Button Name="DecoratedWindow">Decorated _window</Button> | ||
| <Button Name="DecoratedWindowDialog">Decorated w_indow (dialog)</Button> | ||
| <Button Name="Dialog" ToolTip.Tip="Shows a dialog">_Dialog</Button> | ||
| <Button Name="DialogNoTaskbar">Dialog (_No taskbar icon)</Button> | ||
| <Button Name="OwnedWindow">Own_ed window</Button> | ||
| <Button Name="OwnedWindowNoTaskbar">Owned window (No tas_kbar icon)</Button> | ||
| <Expander Header="Window dialogs"> | ||
| <StackPanel Spacing="4"> | ||
| <Button Name="DecoratedWindow">Decorated _window</Button> | ||
| <Button Name="DecoratedWindowDialog">Decorated w_indow (dialog)</Button> | ||
| <Button Name="Dialog" ToolTip.Tip="Shows a dialog">_Dialog</Button> | ||
| <Button Name="DialogNoTaskbar">Dialog (_No taskbar icon)</Button> | ||
| <Button Name="OwnedWindow">Own_ed window</Button> | ||
| <Button Name="OwnedWindowNoTaskbar">Owned window (No tas_kbar icon)</Button> | ||
| </StackPanel> | ||
| </Expander> | ||
|
|
||
| <TextBlock Margin="0,20,0,0" Text="Pickers:" /> | ||
|
|
||
| <CheckBox Name="UseFilters">Use filters</CheckBox> | ||
| <Expander Header="FilePicker API"> | ||
| <StackPanel Spacing="4"> | ||
| <CheckBox Name="ForceManaged">Force managed dialog</CheckBox> | ||
| <CheckBox Name="OpenMultiple">Open multiple</CheckBox> | ||
| <Button Name="OpenFolderPicker">Select Fo_lder</Button> | ||
| <Button Name="OpenFilePicker">_Open File</Button> | ||
| <Button Name="SaveFilePicker">_Save File</Button> | ||
| <Button Name="OpenFileFromBookmark">Open File Bookmark</Button> | ||
| <Button Name="OpenFolderFromBookmark">Open Folder Bookmark</Button> | ||
| </StackPanel> | ||
| </Expander> | ||
| <Expander Header="Legacy OpenFileDialog"> | ||
| <StackPanel Spacing="4"> | ||
| <Button Name="OpenFile">_Open File</Button> | ||
| <Button Name="OpenMultipleFiles">Open _Multiple File</Button> | ||
| <Button Name="SaveFile">_Save File</Button> | ||
| <Button Name="SelectFolder">Select Fo_lder</Button> | ||
| <Button Name="OpenBoth">Select _Both</Button> | ||
| </StackPanel> | ||
| </Expander> | ||
|
|
||
| <TextBlock x:Name="PickerLastResultsVisible" | ||
| Classes="h2" | ||
| IsVisible="False" | ||
| Text="Last picker results:" /> | ||
| <ItemsPresenter x:Name="PickerLastResults" /> | ||
|
|
||
| <TextBox Name="BookmarkContainer" Watermark="Bookmark" /> | ||
| <TextBox Name="OpenedFileContent" | ||
| MaxLines="10" | ||
| Watermark="Picked file content" /> | ||
|
|
||
| </StackPanel> | ||
| </UserControl> |
Oops, something went wrong.