Skip to content
This repository has been archived by the owner on Sep 23, 2021. It is now read-only.

Commit

Permalink
chore: merge from develop #18 (#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
godrose authored Jun 27, 2021
1 parent 585705d commit 85534d5
Show file tree
Hide file tree
Showing 16 changed files with 80 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>LogoFX.Client.Mvvm.ViewModel.Extensions.Core</id>
<version>2.2.0-rc3</version>
<version>2.2.0</version>
<title>LogoFX.Client.Mvvm.ViewModel.Extensions.Core</title>
<authors>Dmitry Bublik,Gennady Verdel,David Kossoglyad</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -16,13 +16,15 @@ for the most common view models (including editing, paging and virtualization)</
for the most common view models (including editing, paging and virtualization)</summary>
<releaseNotes>Updated dependent packages</releaseNotes>
<dependencies>
<dependency id="LogoFX.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Core.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.Model" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Core" version="2.2.0" />
<dependency id="LogoFX.Client.Core.Core" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.Model" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.0" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/logofx-client-mvvm-viewmodel-extensions" />
</metadata>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>LogoFX.Client.Mvvm.ViewModel.Extensions</id>
<version>2.2.0-rc3</version>
<version>2.2.0</version>
<title>LogoFX.Client.Mvvm.ViewModel.Extensions</title>
<authors>Dmitry Bublik,Gennady Verdel,David Kossoglyad</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -14,17 +14,19 @@
for the most common view models (including editing, paging and virtualization)</description>
<summary>LogoFX Client Mvvm ViewModel Extensions containing various use cases
for the most common view models (including editing, paging and virtualization)</summary>
<releaseNotes>Updated dependent packages</releaseNotes>
<releaseNotes></releaseNotes>
<dependencies>
<dependency id="LogoFX.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.Model" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Extensions.Core" version="2.2.0-rc3" />
<dependency id="LogoFX.Core" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.Core" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.Commanding.Core" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.Model" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Core" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Extensions.Core" version="2.2.0" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/logofx-client-mvvm-viewmodel-extensions" />
</metadata>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>LogoFX.Client.Mvvm.ViewModel.Services.Core</id>
<version>2.2.0-rc3</version>
<version>2.2.0</version>
<title>LogoFX.Client.Mvvm.ViewModel.Services.Core</title>
<authors>Gennady Verdel,Dmitry Bublik</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,15 +12,17 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Mvvm ViewModel Services Core containing commonly used cross-platform UI services.</description>
<summary>LogoFX Client Mvvm ViewModel Services Core containing commonly used cross-platform UI services.</summary>
<releaseNotes>Updated dependent packages</releaseNotes>
<releaseNotes></releaseNotes>
<dependencies>
<dependency id="Solid.Practices.IoC" version="2.3.1" />
<dependency id="Solid.Practices.Middleware" version="2.3.1" />
<dependency id="Solid.Bootstrapping" version="2.3.1" />
<dependency id="Solid.Extensibility" version="2.3.1" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModelFactory" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.0-rc3" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Contracts" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModelFactory" version="2.2.0" />
<dependency id="LogoFX.Client.Mvvm.ViewModel.Shared" version="2.2.0" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/logofx-client-mvvm-viewmodel-extensions" />
</metadata>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>LogoFX.Client.Mvvm.ViewModel.Services</id>
<version>2.2.0-rc3</version>
<version>2.2.0</version>
<title>LogoFX.Client.Mvvm.ViewModel.Services</title>
<authors>Gennady Verdel,Dmitry Bublik</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,6 +12,8 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Mvvm ViewModel Services containing commonly used UI services.</description>
<summary>LogoFX Client Mvvm ViewModel Services containing commonly used UI services.</summary>
<releaseNotes>Updated dependent packages</releaseNotes>
<releaseNotes></releaseNotes>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/logofx-client-mvvm-viewmodel-extensions" />
</metadata>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>LogoFX.Client.Mvvm.ViewModel.Shared</id>
<version>2.2.0-rc3</version>
<version>2.2.0</version>
<title>LogoFX.Client.Mvvm.ViewModel.Shared</title>
<authors>Dmitry Bublik,Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,6 +12,8 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Mvvm ViewModel Shared containing shared components.</description>
<summary>LogoFX Client Mvvm ViewModel Shared containing shared components.</summary>
<releaseNotes>Updated dependent packages</releaseNotes>
<releaseNotes></releaseNotes>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/logofx-client-mvvm-viewmodel-extensions" />
</metadata>
</package>
2 changes: 1 addition & 1 deletion devops/publish/PublishUtil/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ private static void PublishPackage(string packageId)
Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), "publish"));
var copyBat = Path.Combine(Directory.GetCurrentDirectory(), "copy-single.bat");
//TODO: pass version as well
process = Process.Start(copyBat, new [] {packageId, "2.2.0-rc3", "../../../../packages/Tests-All" });
process = Process.Start(copyBat, new [] {packageId, "2.2.0", "../../../../packages/Tests-All" });
process.WaitForExit();
GoUp(1);
}
Expand Down
2 changes: 1 addition & 1 deletion devops/publish/publish-all.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SET package_version=2.2.0-rc3
SET package_version=2.2.0
cd ../../src
nuget restore
cd ../devops
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
<PackageReference Include="FluentAssertions">
<Version>5.10.3</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Bootstrapping" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Bootstrapping" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.Model">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Testing.Integration.xUnit">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="xunit.core">
<Version>2.4.1</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<Compile Include="..\src\VirtualPagingScreenViewModel.WithFilter.cs" Link="VirtualPagingScreenViewModel.WithFilter.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="LogoFX.Client.Mvvm.Commanding.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Commanding.Core" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.Core" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Core" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LogoFX.Client.Mvvm.ViewModel.Extensions\LogoFX.Client.Mvvm.ViewModel.Extensions.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<Compile Include="..\src\VirtualPagingScreenViewModel.WithFilter.cs" Link="VirtualPagingScreenViewModel.WithFilter.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="LogoFX.Client.Mvvm.Commanding.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Commanding.Core" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.Core" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Core" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LogoFX.Client.Mvvm.ViewModel.Extensions\LogoFX.Client.Mvvm.ViewModel.Extensions.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,22 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="LogoFX.Client.Mvvm.Commanding.Core">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.Core">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.Model">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Contracts">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Core">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Core">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,25 +158,25 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="LogoFX.Client.Mvvm.Commanding.Core">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.Core">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.Model">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Contracts">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Core">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Core">
<Version>2.2.0-rc3</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.3.2" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
<PackageReference Include="LogoFX.Client.Bootstrapping" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Bootstrapping.Testing" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Tests.Shared" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Bootstrapping" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Bootstrapping.Adapters.SimpleContainer" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Bootstrapping.Testing" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Tests.Shared" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="xunit.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="LogoFX.Client.Mvvm.Commanding.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Contracts" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Core" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.Commanding.Core" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.Model" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Contracts" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Core" Version="2.2.0" />
<PackageReference Include="LogoFX.Core" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LogoFX.Client.Mvvm.ViewModel.Shared\LogoFX.Client.Mvvm.ViewModel.Shared.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Contracts" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModelFactory" Version="2.2.0-rc3" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModel.Contracts" Version="2.2.0" />
<PackageReference Include="LogoFX.Client.Mvvm.ViewModelFactory" Version="2.2.0" />
<PackageReference Include="Solid.Practices.IoC" Version="2.3.1" />
</ItemGroup>
<ItemGroup>
Expand Down

0 comments on commit 85534d5

Please sign in to comment.