Skip to content

Commit

Permalink
Merge pull request #10 from LogoFX/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
godrose authored Nov 6, 2021
2 parents 0ea1173 + 00f56a5 commit 5401d16
Show file tree
Hide file tree
Showing 43 changed files with 126 additions and 114 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2.2.3.{build}
version: 2.2.4.{build}
init:
- dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI
configuration: Release
Expand Down
2 changes: 1 addition & 1 deletion devops/deploy/deploy-all.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
rem TODO: Use common source for all version instances
SET version=2.2.3
SET version=2.2.4
rem TODO: Refactor using loop and automatic discovery
call deploy-single.bat LogoFX.Bootstrapping %version%
call deploy-single.bat LogoFX.Server.Bootstrapping %version%
Expand Down
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.Bootstrapping</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Bootstrapping</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand Down
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.Bootstrapping.Adapters.Contracts</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Bootstrapping.Adapters.Contracts</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand Down
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.Bootstrapping.Adapters.SimpleContainer</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Bootstrapping.Adapters.SimpleContainer</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -16,8 +16,8 @@
</releaseNotes>
<dependencies>
<dependency id="Solid.Practices.IoC" version="2.3.2" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.3" />
<dependency id="LogoFX.Practices.IoC" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.4" />
<dependency id="LogoFX.Practices.IoC" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/bootstrapping" />
Expand Down
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.Bootstrapping.Adapters.Unity</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Bootstrapping.Adapters.Unity</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,7 +15,7 @@
<releaseNotes>Added support for injecting unity container instance.</releaseNotes>
<dependencies>
<dependency id="Solid.Practices.IoC" version="2.3.2" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.4" />
<dependency id="Unity" version="5.11.10" />
</dependencies>
<tags>framework logofx dotnet</tags>
Expand Down
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.Bootstrapping.Core</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Bootstrapping.Core</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -19,7 +19,7 @@
<dependency id="Solid.Practices.Middleware" version="2.3.2" />
<dependency id="Solid.Bootstrapping" version="2.3.2" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.2" />
<dependency id="LogoFX.Bootstrapping" version="2.2.3" />
<dependency id="LogoFX.Bootstrapping" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/bootstrapping" />
Expand Down
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.Bootstrapping.Testing</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Bootstrapping.Testing</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -24,11 +24,11 @@
<dependency id="Solid.Practices.Modularity" version="2.3.2" />
<dependency id="Solid.Practices.Middleware" version="2.3.2" />
<dependency id="Solid.Bootstrapping" version="2.3.2" />
<dependency id="LogoFX.Core" version="2.2.3" />
<dependency id="LogoFX.Bootstrapping" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.3" />
<dependency id="LogoFX.Client.Core" version="2.2.3" />
<dependency id="LogoFX.Core" version="2.2.4" />
<dependency id="LogoFX.Bootstrapping" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.4" />
<dependency id="LogoFX.Client.Core" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/bootstrapping" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>LogoFX.Client.Bootstrapping.Xamarin.Forms</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Bootstrapping.Xamarin.Forms</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -26,13 +26,13 @@
<dependency id="Solid.Practices.IoC" version="2.3.2" />
<dependency id="Solid.Practices.Middleware" version="2.3.2" />
<dependency id="Solid.Practices.Modularity" version="2.3.2" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.4" />
</group>
<group targetFramework="MonoAndroid4.0.3">
<dependency id="LogoFX.Client.Core" version="2.2.3" />
<dependency id="LogoFX.Client.Core" version="2.2.4" />
</group>
<group targetFramework="Xamarin.iOS1.0">
<dependency id="LogoFX.Client.Core" version="2.2.3" />
<dependency id="LogoFX.Client.Core" version="2.2.4" />
</group>
</dependencies>
<tags>framework logofx dotnet</tags>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>LogoFX.Client.Bootstrapping</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Bootstrapping</title>
<authors>Gennady Verdel, Vlad Spivak</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -24,11 +24,11 @@
<dependency id="Solid.Practices.Modularity" version="2.3.2" />
<dependency id="Solid.Practices.Middleware" version="2.3.2" />
<dependency id="Solid.Bootstrapping" version="2.3.2" />
<dependency id="LogoFX.Core" version="2.2.3" />
<dependency id="LogoFX.Bootstrapping" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.3" />
<dependency id="LogoFX.Client.Core" version="2.2.3" />
<dependency id="LogoFX.Core" version="2.2.4" />
<dependency id="LogoFX.Bootstrapping" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.4" />
<dependency id="LogoFX.Client.Core" version="2.2.4" />
</group>
<group targetFramework="UAP10.0">
<dependency id="Solid.IoC.Registration" version="2.3.2" />
Expand All @@ -40,11 +40,11 @@
<dependency id="Solid.Practices.Middleware" version="2.3.2" />
<dependency id="Solid.Bootstrapping" version="2.3.2" />
<dependency id="Solid.Common" version="2.3.2" />
<dependency id="LogoFX.Core" version="2.2.3" />
<dependency id="LogoFX.Bootstrapping" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.3" />
<dependency id="LogoFX.Client.Core" version="2.2.3" />
<dependency id="LogoFX.Core" version="2.2.4" />
<dependency id="LogoFX.Bootstrapping" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.4" />
<dependency id="LogoFX.Client.Core" version="2.2.4" />
</group>
<group targetFramework=".NETCoreApp3.1">
<dependency id="Solid.IoC.Registration" version="2.3.2" />
Expand All @@ -55,11 +55,11 @@
<dependency id="Solid.Practices.Modularity" version="2.3.2" />
<dependency id="Solid.Practices.Middleware" version="2.3.2" />
<dependency id="Solid.Bootstrapping" version="2.3.2" />
<dependency id="LogoFX.Core" version="2.2.3" />
<dependency id="LogoFX.Bootstrapping" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.3" />
<dependency id="LogoFX.Client.Core" version="2.2.3" />
<dependency id="LogoFX.Core" version="2.2.4" />
<dependency id="LogoFX.Bootstrapping" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.4" />
<dependency id="LogoFX.Client.Core" version="2.2.4" />
</group>
<group targetFramework="net5.0">
<dependency id="Solid.IoC.Registration" version="2.3.2" />
Expand All @@ -70,11 +70,11 @@
<dependency id="Solid.Practices.Modularity" version="2.3.2" />
<dependency id="Solid.Practices.Middleware" version="2.3.2" />
<dependency id="Solid.Bootstrapping" version="2.3.2" />
<dependency id="LogoFX.Core" version="2.2.3" />
<dependency id="LogoFX.Bootstrapping" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.3" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.3" />
<dependency id="LogoFX.Client.Core" version="2.2.3" />
<dependency id="LogoFX.Core" version="2.2.4" />
<dependency id="LogoFX.Bootstrapping" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.4" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.4" />
<dependency id="LogoFX.Client.Core" version="2.2.4" />
</group>
</dependencies>
<tags>framework logofx dotnet</tags>
Expand Down
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.Server.Bootstrapping</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Server.Bootstrapping</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand Down
2 changes: 1 addition & 1 deletion devops/publish/publish-all.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cd ../../src
nuget restore
cd ../devops/publish
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '../build/build-all.ps1'"
SET package_version=2.2.3
SET package_version=2.2.4
cd ../test
call test-all
cd ../pack
Expand Down
2 changes: 1 addition & 1 deletion devops/publish/publish-single.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SET package_name=%1
SET package_version=2.2.3
SET package_version=2.2.4
SET target=../../../../packages/Tests-All
cd ../build
call build-all
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Version>2.2.3</Version>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\Bin\netstandard\Release</OutputPath>
Expand Down
13 changes: 8 additions & 5 deletions src/LogoFX.Bootstrapping.Specs/LogoFX.Bootstrapping.Specs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,22 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.1" />
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.2" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Solid.Bootstrapping" Version="2.3.2" />
<PackageReference Include="Solid.Core" Version="2.3.2" />
<PackageReference Include="Solid.Extensibility" Version="2.3.2" />
<PackageReference Include="Solid.Practices.IoC" Version="2.3.2" />
<PackageReference Include="Solid.Practices.Modularity" Version="2.3.2" />
<PackageReference Include="SpecFlow" Version="3.9.22" />
<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.50" />
<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.22" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.22" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.core" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/LogoFX.Bootstrapping/LogoFX.Bootstrapping.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Version>2.2.3</Version>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\Bin\netstandard\Release</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Version>2.2.3</Version>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\Bin\netstandard\Release</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
Expand All @@ -9,10 +9,10 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Version>2.2.3</Version>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\Bin\netstandard\Release</OutputPath>
Expand All @@ -12,7 +12,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="LogoFX.Practices.IoC" Version="2.2.3" />
<PackageReference Include="LogoFX.Practices.IoC" Version="2.2.4" />
<PackageReference Include="Solid.Practices.IoC" Version="2.3.2" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="FluentAssertions" Version="6.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Version>2.2.3</Version>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\Bin\netstandard\Release</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions">
<Version>6.1.0</Version>
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.3" />
<PackageReference Include="LogoFX.Client.Tests.Shared.Caliburn.Micro" Version="2.2.4" />
<PackageReference Include="Solid.Common.Core">
<Version>2.3.2</Version>
</PackageReference>
Expand All @@ -113,7 +113,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.2.3")]
[assembly: AssemblyFileVersion("2.2.3")]
[assembly: AssemblyVersion("2.2.4")]
[assembly: AssemblyFileVersion("2.2.4")]
Loading

0 comments on commit 5401d16

Please sign in to comment.