Skip to content

Bump Avalonia from 0.9.0 to 0.10.6 in /code #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot-preview wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Bump Avalonia from 0.9.0 to 0.10.6 in /code #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e763795
Refactoring
Egor92 Apr 3, 2021
884756a
Package versions are moved to Directory.build.targets
Egor92 Apr 10, 2021
af4ac8a
Revert "Package versions are moved to Directory.build.targets"
Egor92 Apr 16, 2021
75bddfa
Bump Avalonia from 0.9.0 to 0.10.6 in /code
dependabot-preview[bot] Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions code/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<Project>
<Import Project="version.props" />

<PropertyGroup Label="Nuget package information">
<Authors>Egor92</Authors>
<Company>Egor92</Company>
Expand All @@ -13,16 +15,8 @@

<PropertyGroup Label="Project information">
<RootNamespace>$(Company).$(MSBuildProjectName)</RootNamespace>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<PropertyGroup Label="Version">
<!-- Empty 'Version' is required for Appveyor -->
<Version />
<!-- Empty 'FileVersion' is required for Appveyor -->
<FileVersion />
<!-- Empty 'InformationalVersion' is required for Appveyor -->
<InformationalVersion />
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup Label="Release configuration">
Expand Down
4 changes: 3 additions & 1 deletion code/MvvmNavigation.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{A6FDCF5D-6C3E-4042-9CA9-C11FF327DDD3}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
src\Directory.Build.props = src\Directory.Build.props
version.props = version.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{E31339A4-1C1F-48AC-AE56-029CFD04B33E}"
Expand Down Expand Up @@ -52,7 +54,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNavigation.Tests.Common
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNavigation.Internal.ContractTests", "test\MvvmNavigation.Internal.ContractTests\MvvmNavigation.Internal.ContractTests.csproj", "{76FB8979-F2EB-4C91-9894-7BBA2E4014D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmNavigation.Avalonia.Unity.IntegrationTests", "test\MvvmNavigation.Avalonia.Unity.IntegrationTests\MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj", "{990D042A-6DF0-4BBD-8117-D42184C3309E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNavigation.Avalonia.Unity.IntegrationTests", "test\MvvmNavigation.Avalonia.Unity.IntegrationTests\MvvmNavigation.Avalonia.Unity.IntegrationTests.csproj", "{990D042A-6DF0-4BBD-8117-D42184C3309E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmNavigation.Avalonia.UnitTests", "test\MvvmNavigation.Avalonia.UnitTests\MvvmNavigation.Avalonia.UnitTests.csproj", "{31DA5F00-E708-4661-AFE9-CC3EFE952ABA}"
EndProject
Expand Down
4 changes: 4 additions & 0 deletions code/MvvmNavigation.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=Avalonia/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mvvm/@EntryIndexedValue">True</s:Boolean>
</wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion code/src/MvvmNavigation.Avalonia/MvvmNavigation.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="0.9.0" />
<PackageReference Include="Avalonia" Version="0.10.6" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion code/test/MvvmNavigation.Avalonia.UnitTests/MvvmNavigation.Avalonia.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
<PackageReference Include="Avalonia" Version="0.9.0" />
<PackageReference Include="Avalonia" Version="0.10.6" />
<PackageReference Include="Moq" Version="4.14.4" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
Expand Down
1 change: 1 addition & 0 deletions code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/View.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
namespace Egor92.MvvmNavigation.Avalonia.Unity.IntegrationTests.Internal.Types
{
[SuppressMessage("ReSharper", "UnusedMember.Global")]
[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
internal class View : ContentControl
{
}
Expand Down
1 change: 1 addition & 0 deletions code/test/MvvmNavigation.Avalonia.Unity.IntegrationTests/Internal/Types/ViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Egor92.MvvmNavigation.Avalonia.Unity.IntegrationTests.Internal.Types
{
[SuppressMessage("ReSharper", "UnusedMember.Global")]
[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
public class ViewModel
{
}
Expand Down
1 change: 1 addition & 0 deletions code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/View.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
namespace Egor92.MvvmNavigation.Wpf.Unity.IntegrationTests.Internal.Types
{
[SuppressMessage("ReSharper", "UnusedMember.Global")]
[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
internal class View : ContentControl
{
}
Expand Down
1 change: 1 addition & 0 deletions code/test/MvvmNavigation.Wpf.Unity.IntegrationTests/Internal/Types/ViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Egor92.MvvmNavigation.Wpf.Unity.IntegrationTests.Internal.Types
{
[SuppressMessage("ReSharper", "UnusedMember.Global")]
[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
public class ViewModel
{
}
Expand Down
10 changes: 10 additions & 0 deletions code/version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project>
<PropertyGroup Label="Version">
<!-- Empty 'Version' is required for Appveyor -->
<Version />
<!-- Empty 'FileVersion' is required for Appveyor -->
<FileVersion />
<!-- Empty 'InformationalVersion' is required for Appveyor -->
<InformationalVersion />
</PropertyGroup>
</Project>