Merge branch 'develop'

jamsoft · Jun 18, 2023 · 0438c6c · 0438c6c
2 parents 4b2a963 + 9e2c6f2
commit 0438c6c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/JamSoft.Helpers.AvaloniaUI/JamSoft.Helpers.AvaloniaUI.csproj b/JamSoft.Helpers.AvaloniaUI/JamSoft.Helpers.AvaloniaUI.csproj
@@ -26,11 +26,11 @@
         <IncludeSymbols>false</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <DelaySign>false</DelaySign>
-        <Version>1.1.3</Version>
-        <PackageVersion>1.1.3</PackageVersion>
-        <AssemblyVersion>1.1.3.0</AssemblyVersion>
-        <FileVersion>1.1.3.0</FileVersion>
-        <InformationalVersion>1.1.3.0-rel</InformationalVersion>
+        <Version>1.1.4</Version>
+        <PackageVersion>1.1.4</PackageVersion>
+        <AssemblyVersion>1.1.4.0</AssemblyVersion>
+        <FileVersion>1.1.4.0</FileVersion>
+        <InformationalVersion>1.1.4.0-rel</InformationalVersion>
         <PublicSign>false</PublicSign>
         <SignAssembly>false</SignAssembly>
         <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -56,8 +56,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="0.10.18" />
-      <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
+      <PackageReference Include="Avalonia" Version="0.10.21" />
+      <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.21" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/JamSoft.Helpers.Tests/JamSoft.Helpers.Tests.csproj b/JamSoft.Helpers.Tests/JamSoft.Helpers.Tests.csproj
@@ -11,7 +11,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
         <PackageReference Include="Moq" Version="4.18.4" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

diff --git a/JamSoft.Helpers/JamSoft.Helpers.xml b/JamSoft.Helpers/JamSoft.Helpers.xml
diff --git a/JamSoft.Helpers/Ui/IDirtyValidatorFactory.cs → JamSoft.Helpers/Ui/DirtyValidatorFactory.cs b/JamSoft.Helpers/Ui/IDirtyValidatorFactory.cs → JamSoft.Helpers/Ui/DirtyValidatorFactory.cs
diff --git a/Sample/JamSoft.Helpers.Sample/JamSoft.Helpers.Sample/JamSoft.Helpers.Sample.csproj b/Sample/JamSoft.Helpers.Sample/JamSoft.Helpers.Sample/JamSoft.Helpers.Sample.csproj
@@ -26,13 +26,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.18" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+        <PackageReference Include="Avalonia" Version="0.10.21" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.21" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
-        <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.21" />
+        <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
     </ItemGroup>
 
     <ItemGroup>