diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b237713 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "nuget" # See documentation for possible values + directory: "/src/Avalonia.Samples" # Location of package manifests + schedule: + interval: "weekly" + target-branch: "Dependabot" diff --git a/src/Avalonia.Samples/CompleteApps/SimpleToDoList/SimpleToDoList.csproj b/src/Avalonia.Samples/CompleteApps/SimpleToDoList/SimpleToDoList.csproj index fdf49ea..5bce12b 100644 --- a/src/Avalonia.Samples/CompleteApps/SimpleToDoList/SimpleToDoList.csproj +++ b/src/Avalonia.Samples/CompleteApps/SimpleToDoList/SimpleToDoList.csproj @@ -9,17 +9,17 @@ - + - - - - + + + + - - + + diff --git a/src/Avalonia.Samples/CustomControls/RatingControlSample/RatingControlSample.csproj b/src/Avalonia.Samples/CustomControls/RatingControlSample/RatingControlSample.csproj index 5550eb0..a415dcf 100644 --- a/src/Avalonia.Samples/CustomControls/RatingControlSample/RatingControlSample.csproj +++ b/src/Avalonia.Samples/CustomControls/RatingControlSample/RatingControlSample.csproj @@ -18,11 +18,12 @@ - - + + - - - + + + + diff --git a/src/Avalonia.Samples/CustomControls/SnowflakesControlSample/SnowflakesControlSample.csproj b/src/Avalonia.Samples/CustomControls/SnowflakesControlSample/SnowflakesControlSample.csproj index c388158..ef09267 100644 --- a/src/Avalonia.Samples/CustomControls/SnowflakesControlSample/SnowflakesControlSample.csproj +++ b/src/Avalonia.Samples/CustomControls/SnowflakesControlSample/SnowflakesControlSample.csproj @@ -9,16 +9,16 @@ - + - - - - + + + + - - + + diff --git a/src/Avalonia.Samples/DataTemplates/BasicDataTemplateSample/BasicDataTemplateSample.csproj b/src/Avalonia.Samples/DataTemplates/BasicDataTemplateSample/BasicDataTemplateSample.csproj index 5f1a8e2..363ec70 100644 --- a/src/Avalonia.Samples/DataTemplates/BasicDataTemplateSample/BasicDataTemplateSample.csproj +++ b/src/Avalonia.Samples/DataTemplates/BasicDataTemplateSample/BasicDataTemplateSample.csproj @@ -19,11 +19,12 @@ - - + + - - - + + + + diff --git a/src/Avalonia.Samples/DataTemplates/FuncDataTemplateSample/FuncDataTemplateSample.csproj b/src/Avalonia.Samples/DataTemplates/FuncDataTemplateSample/FuncDataTemplateSample.csproj index 5f1a8e2..363ec70 100644 --- a/src/Avalonia.Samples/DataTemplates/FuncDataTemplateSample/FuncDataTemplateSample.csproj +++ b/src/Avalonia.Samples/DataTemplates/FuncDataTemplateSample/FuncDataTemplateSample.csproj @@ -19,11 +19,12 @@ - - + + - - - + + + + diff --git a/src/Avalonia.Samples/DataTemplates/IDataTemplateSample/IDataTemplateSample.csproj b/src/Avalonia.Samples/DataTemplates/IDataTemplateSample/IDataTemplateSample.csproj index 5f1a8e2..363ec70 100644 --- a/src/Avalonia.Samples/DataTemplates/IDataTemplateSample/IDataTemplateSample.csproj +++ b/src/Avalonia.Samples/DataTemplates/IDataTemplateSample/IDataTemplateSample.csproj @@ -19,11 +19,12 @@ - - + + - - - + + + + diff --git a/src/Avalonia.Samples/Drawing/BattleCity/BattleCity.csproj b/src/Avalonia.Samples/Drawing/BattleCity/BattleCity.csproj index f6331a0..d01a4c4 100644 --- a/src/Avalonia.Samples/Drawing/BattleCity/BattleCity.csproj +++ b/src/Avalonia.Samples/Drawing/BattleCity/BattleCity.csproj @@ -7,9 +7,9 @@ - - - - + + + + diff --git a/src/Avalonia.Samples/Drawing/RectPainter/RectPainter.csproj b/src/Avalonia.Samples/Drawing/RectPainter/RectPainter.csproj index a5868e8..25e42c6 100644 --- a/src/Avalonia.Samples/Drawing/RectPainter/RectPainter.csproj +++ b/src/Avalonia.Samples/Drawing/RectPainter/RectPainter.csproj @@ -12,12 +12,13 @@ - - - - - + + + + + - + + diff --git a/src/Avalonia.Samples/MVVM/BasicMvvmSample/BasicMvvmSample.csproj b/src/Avalonia.Samples/MVVM/BasicMvvmSample/BasicMvvmSample.csproj index c4d67fb..4b79314 100644 --- a/src/Avalonia.Samples/MVVM/BasicMvvmSample/BasicMvvmSample.csproj +++ b/src/Avalonia.Samples/MVVM/BasicMvvmSample/BasicMvvmSample.csproj @@ -20,11 +20,12 @@ - - + + - - - + + + + diff --git a/src/Avalonia.Samples/MVVM/CommandSample/CommandSample.csproj b/src/Avalonia.Samples/MVVM/CommandSample/CommandSample.csproj index c4d67fb..4b79314 100644 --- a/src/Avalonia.Samples/MVVM/CommandSample/CommandSample.csproj +++ b/src/Avalonia.Samples/MVVM/CommandSample/CommandSample.csproj @@ -20,11 +20,12 @@ - - + + - - - + + + + diff --git a/src/Avalonia.Samples/MVVM/ValidationSample/ValidationSample.csproj b/src/Avalonia.Samples/MVVM/ValidationSample/ValidationSample.csproj index 1ee4da3..3fc7b81 100644 --- a/src/Avalonia.Samples/MVVM/ValidationSample/ValidationSample.csproj +++ b/src/Avalonia.Samples/MVVM/ValidationSample/ValidationSample.csproj @@ -20,12 +20,13 @@ - - + + - - - + + + + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./ diff --git a/src/Avalonia.Samples/MVVM/ValueConversionSample/ValueConversionSample.csproj b/src/Avalonia.Samples/MVVM/ValueConversionSample/ValueConversionSample.csproj index c4d67fb..4b79314 100644 --- a/src/Avalonia.Samples/MVVM/ValueConversionSample/ValueConversionSample.csproj +++ b/src/Avalonia.Samples/MVVM/ValueConversionSample/ValueConversionSample.csproj @@ -20,11 +20,12 @@ - - + + - - - + + + + diff --git a/src/Avalonia.Samples/Routing/BasicViewLocatorSample/BasicViewLocatorSample.csproj b/src/Avalonia.Samples/Routing/BasicViewLocatorSample/BasicViewLocatorSample.csproj index c4d67fb..4b79314 100644 --- a/src/Avalonia.Samples/Routing/BasicViewLocatorSample/BasicViewLocatorSample.csproj +++ b/src/Avalonia.Samples/Routing/BasicViewLocatorSample/BasicViewLocatorSample.csproj @@ -20,11 +20,12 @@ - - + + - - - + + + + diff --git a/src/Avalonia.Samples/Testing/TestableApp.Appium/CalculatorTests.cs b/src/Avalonia.Samples/Testing/TestableApp.Appium/CalculatorTests.cs index e882d99..2bcc1e5 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Appium/CalculatorTests.cs +++ b/src/Avalonia.Samples/Testing/TestableApp.Appium/CalculatorTests.cs @@ -6,7 +6,7 @@ namespace TestableApp.Appium; [Collection("Default")] public class CalculatorTests { - private readonly AppiumDriver _session; + private readonly AppiumDriver _session; public CalculatorTests(DefaultAppFixture fixture) @@ -18,10 +18,11 @@ public CalculatorTests(DefaultAppFixture fixture) public void Should_Add_Numbers() { // Assert: - var firstOperandInput = _session.FindElementByAccessibilityId("FirstOperandInput")!; - var secondOperandInput = _session.FindElementByAccessibilityId("SecondOperandInput")!; - var addButton = _session.FindElementByAccessibilityId("AddButton")!; - var resultBox = _session.FindElementByAccessibilityId("ResultBox")!; + const string ByAccessibilityId = "AccessibilityId"; + var firstOperandInput = _session.FindElement(ByAccessibilityId, "FirstOperandInput")!; + var secondOperandInput = _session.FindElement(ByAccessibilityId, "SecondOperandInput")!; + var addButton = _session.FindElement(ByAccessibilityId, "AddButton")!; + var resultBox = _session.FindElement(ByAccessibilityId, "ResultBox")!; // Act: firstOperandInput.Clear(); @@ -39,10 +40,11 @@ public void Should_Add_Numbers() public void Cannot_Divide_By_Zero() { // Assert: - var firstOperandInput = _session.FindElementByAccessibilityId("FirstOperandInput")!; - var secondOperandInput = _session.FindElementByAccessibilityId("SecondOperandInput")!; - var divideButton = _session.FindElementByAccessibilityId("DivideButton")!; - var resultBox = _session.FindElementByAccessibilityId("ResultBox")!; + const string ByAccessibilityId = "AccessibilityId"; + var firstOperandInput = _session.FindElement(ByAccessibilityId, "FirstOperandInput")!; + var secondOperandInput = _session.FindElement("AccessibilityId", "SecondOperandInput")!; + var divideButton = _session.FindElement("AccessibilityId", "DivideButton")!; + var resultBox = _session.FindElement("AccessibilityId", "ResultBox")!; // Act: firstOperandInput.Clear(); diff --git a/src/Avalonia.Samples/Testing/TestableApp.Appium/DefaultAppFixture.cs b/src/Avalonia.Samples/Testing/TestableApp.Appium/DefaultAppFixture.cs index 8b65f16..2710706 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Appium/DefaultAppFixture.cs +++ b/src/Avalonia.Samples/Testing/TestableApp.Appium/DefaultAppFixture.cs @@ -28,7 +28,7 @@ public DefaultAppFixture() if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { ConfigureWin32Options(options); - Session = new WindowsDriver( + Session = new WindowsDriver( new Uri("http://127.0.0.1:4723"), options); @@ -40,7 +40,7 @@ public DefaultAppFixture() else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { ConfigureMacOptions(options); - Session = new MacDriver( + Session = new MacDriver( new Uri("http://127.0.0.1:4723/wd/hub"), options); } @@ -53,22 +53,22 @@ public DefaultAppFixture() protected virtual void ConfigureWin32Options(AppiumOptions options) { var path = Path.GetFullPath(TestAppPath); - options.AddAdditionalCapability(MobileCapabilityType.App, path); - options.AddAdditionalCapability(MobileCapabilityType.PlatformName, MobilePlatform.Windows); - options.AddAdditionalCapability(MobileCapabilityType.DeviceName, "WindowsPC"); + options.App = path; + options.PlatformName = MobilePlatform.Windows; + options.DeviceName= "WindowsPC"; // options.AddAdditionalCapability("appArguments", "--customArg"); } protected virtual void ConfigureMacOptions(AppiumOptions options) { - options.AddAdditionalCapability("appium:bundleId", TestAppBundleId); - options.AddAdditionalCapability(MobileCapabilityType.PlatformName, MobilePlatform.MacOS); - options.AddAdditionalCapability(MobileCapabilityType.AutomationName, "mac2"); - options.AddAdditionalCapability("appium:showServerLogs", true); + options.AddAdditionalOption("appium:bundleId", TestAppBundleId); + options.PlatformName = MobilePlatform.MacOS; + options.AutomationName = "mac2"; + options.AddAdditionalOption("appium:showServerLogs", true); // options.AddAdditionalCapability("appium:arguments", new[] { "--customArg" }); } - public AppiumDriver Session { get; } + public AppiumDriver Session { get; } public void Dispose() { diff --git a/src/Avalonia.Samples/Testing/TestableApp.Appium/TestableApp.Appium.csproj b/src/Avalonia.Samples/Testing/TestableApp.Appium/TestableApp.Appium.csproj index 5b41a3f..4a3d3e9 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Appium/TestableApp.Appium.csproj +++ b/src/Avalonia.Samples/Testing/TestableApp.Appium/TestableApp.Appium.csproj @@ -10,14 +10,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/CalculatorTests.cs b/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/CalculatorTests.cs index fb885eb..f5bd484 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/CalculatorTests.cs +++ b/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/CalculatorTests.cs @@ -28,7 +28,7 @@ public void Should_Add_Numbers() // Raise click event on the button: window.AddButton.Focus(); - window.KeyPress(Key.Enter, RawInputModifiers.None); + window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None); Assert.That(window.ResultBox.Text, Is.EqualTo("30")); } @@ -49,7 +49,7 @@ public void Cannot_Divide_By_Zero() // Raise click event on the button: window.DivideButton.Focus(); - window.KeyPress(Key.Enter, RawInputModifiers.None); + window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None); Assert.That(window.ResultBox.Text, Is.EqualTo("Cannot divide by zero!")); } diff --git a/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/TestableApp.Headless.NUnit.csproj b/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/TestableApp.Headless.NUnit.csproj index 707de1d..fdf5a38 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/TestableApp.Headless.NUnit.csproj +++ b/src/Avalonia.Samples/Testing/TestableApp.Headless.NUnit/TestableApp.Headless.NUnit.csproj @@ -9,12 +9,13 @@ - - - - - - + + + + + + + diff --git a/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/CalculatorTests.cs b/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/CalculatorTests.cs index 62ba5fe..db36745 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/CalculatorTests.cs +++ b/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/CalculatorTests.cs @@ -28,7 +28,7 @@ public void Should_Add_Numbers() // Raise click event on the button: window.AddButton.Focus(); - window.KeyPress(Key.Enter, RawInputModifiers.None); + window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None); Assert.Equal("30", window.ResultBox.Text); } @@ -49,7 +49,7 @@ public void Cannot_Divide_By_Zero() // Raise click event on the button: window.DivideButton.Focus(); - window.KeyPress(Key.Enter, RawInputModifiers.None); + window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None); Assert.Equal("Cannot divide by zero!", window.ResultBox.Text); } diff --git a/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/TestableApp.Headless.XUnit.csproj b/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/TestableApp.Headless.XUnit.csproj index c1fdcc9..271d96f 100644 --- a/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/TestableApp.Headless.XUnit.csproj +++ b/src/Avalonia.Samples/Testing/TestableApp.Headless.XUnit/TestableApp.Headless.XUnit.csproj @@ -9,14 +9,15 @@ - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Avalonia.Samples/Testing/TestableApp/TestableApp.csproj b/src/Avalonia.Samples/Testing/TestableApp/TestableApp.csproj index 0d1e181..837e71f 100644 --- a/src/Avalonia.Samples/Testing/TestableApp/TestableApp.csproj +++ b/src/Avalonia.Samples/Testing/TestableApp/TestableApp.csproj @@ -12,13 +12,13 @@ - - - - + + + + - - + + diff --git a/src/Avalonia.Samples/ViewInteraction/DialogManagerSample/DialogManagerSample.csproj b/src/Avalonia.Samples/ViewInteraction/DialogManagerSample/DialogManagerSample.csproj index 8138bb0..b7d90c1 100644 --- a/src/Avalonia.Samples/ViewInteraction/DialogManagerSample/DialogManagerSample.csproj +++ b/src/Avalonia.Samples/ViewInteraction/DialogManagerSample/DialogManagerSample.csproj @@ -12,11 +12,11 @@ - - + + - - - + + + diff --git a/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj index c345103..637b326 100644 --- a/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj +++ b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj @@ -12,12 +12,13 @@ - - + + - - - - + + + + +