Skip to content

Commit

Permalink
Merge pull request #5 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 73afdb1 + 8e42f97 commit 4e22ac8
Show file tree
Hide file tree
Showing 36 changed files with 112 additions and 80 deletions.
3 changes: 1 addition & 2 deletions 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}
configuration: Release
before_build:
- cd src
Expand All @@ -16,4 +16,3 @@ artifacts:
- name: Packages
path: .\output\*.nupkg
...

21 changes: 21 additions & 0 deletions devops/deploy/LogoFX.Client.Testing.Shared.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\Bin\netstandard\Release</OutputPath>
<DocumentationFile>..\Bin\netstandard\Release\LogoFX.Client.Testing.Shared.xml</DocumentationFile>
<EmbedAllSources>True</EmbedAllSources>
<DebugType>embedded</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.4" />
<PackageReference Include="Solid.Practices.Scheduling" Version="2.3.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LogoFX.Client.Testing.Infra\LogoFX.Client.Testing.Infra.csproj" />
</ItemGroup>
</Project>
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.Client.Tests.Contracts %version%
call deploy-single.bat LogoFX.Client.Tests.Shared %version%
Expand Down
12 changes: 12 additions & 0 deletions devops/deploy/publish-all.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
cd ../../src
nuget restore
cd ../devops/publish
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '../build/build-all.ps1'"
SET package_version=2.2.4
cd ../pack
call pack-all
cd ../publish
call copy-all %package_version%
cd ../install
call uninstall-global-all.bat %package_version%
cd ..
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.Testing.EndToEnd.FlaUI</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.EndToEnd.FlaUI</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -14,7 +14,7 @@
<summary>LogoFX Client Testing EndToEnd FlaUI containing implementation of Application Facade using FlaUI.</summary>
<releaseNotes>Initial release</releaseNotes>
<dependencies>
<dependency id="Attest.Testing.Contracts" version="2.4.1" />
<dependency id="Attest.Testing.Contracts" version="2.4.2" />
<dependency id="FlaUI.Core" version="3.0.0" />
</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.Testing.EndToEnd.SpecFlow</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.EndToEnd.SpecFlow</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -14,9 +14,9 @@
<summary>LogoFX Client Tests SpecFlow containing base class for SpecFlow bridge.</summary>
<releaseNotes>Added support for scenario data store.</releaseNotes>
<dependencies>
<dependency id="Attest.Testing.Contracts" version="2.4.1" />
<dependency id="Attest.Tests.Core" version="2.4.1" />
<dependency id="Attest.Tests.SpecFlow" version="2.4.1" />
<dependency id="Attest.Testing.Contracts" version="2.4.2" />
<dependency id="Attest.Tests.Core" version="2.4.2" />
<dependency id="Attest.Tests.SpecFlow" version="2.4.2" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/testing" />
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.Testing.EndToEnd.White</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.EndToEnd.White</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,7 +15,7 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Attest.Testing.Contracts" version="2.4.1" />
<dependency id="Attest.Testing.Contracts" version="2.4.2" />
<dependency id="TestStack.White" version="0.13.3" />
</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.Testing.Integration.xUnit</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.Integration.xUnit</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -18,10 +18,10 @@ and base class for unit and integration tests.</summary>
<dependencies>
<dependency id="Solid.Core" version="2.3.2" />
<dependency id="Solid.Patterns.Builder" version="2.3.2" />
<dependency id="Attest.Testing.Contracts" version="2.4.1" />
<dependency id="Attest.Tests.Core" version="2.4.1" />
<dependency id="Attest.Tests.xUnit" version="2.4.1" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.3" />
<dependency id="Attest.Testing.Contracts" version="2.4.2" />
<dependency id="Attest.Tests.Core" version="2.4.2" />
<dependency id="Attest.Tests.xUnit" version="2.4.2" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/testing" />
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.Tests.Contracts</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.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.Tests.EndToEnd</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.EndToEnd</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,8 +15,8 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Attest.Testing.Contracts" version="2.4.1" />
<dependency id="LogoFX.Client.Tests.Contracts" version="2.2.3" />
<dependency id="Attest.Testing.Contracts" version="2.4.2" />
<dependency id="LogoFX.Client.Tests.Contracts" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/testing" />
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.Tests.Integration.NUnit</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.Integration.NUnit</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -16,10 +16,10 @@
<dependencies>
<dependency id="Solid.Core" version="2.3.2" />
<dependency id="Solid.Patterns.Builder" version="2.3.2" />
<dependency id="Attest.Testing.Contracts" version="2.4.1" />
<dependency id="Attest.Tests.Core" version="2.4.1" />
<dependency id="Attest.Tests.NUnit" version="2.4.1" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.3" />
<dependency id="Attest.Testing.Contracts" version="2.4.2" />
<dependency id="Attest.Tests.Core" version="2.4.2" />
<dependency id="Attest.Tests.NUnit" version="2.4.2" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/testing" />
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.Tests.Integration.SpecFlow</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.Integration.SpecFlow</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -17,10 +17,10 @@
<dependency id="Solid.Practices.IoC" version="2.3.2" />
<dependency id="Solid.Patterns.Builder" version="2.3.2" />
<dependency id="Solid.Core" version="2.3.2" />
<dependency id="Attest.Testing.Contracts" version="2.4.1" />
<dependency id="Attest.Tests.Core" version="2.4.1" />
<dependency id="Attest.Tests.SpecFlow" version="2.4.1" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.3" />
<dependency id="Attest.Testing.Contracts" version="2.4.2" />
<dependency id="Attest.Tests.Core" version="2.4.2" />
<dependency id="Attest.Tests.SpecFlow" version="2.4.2" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/testing" />
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.Tests.Integration</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.Integration</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,8 +15,8 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Attest.Testing.Contracts" version="2.4.1" />
<dependency id="LogoFX.Client.Tests.Contracts" version="2.2.3" />
<dependency id="Attest.Testing.Contracts" version="2.4.2" />
<dependency id="LogoFX.Client.Tests.Contracts" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/testing" />
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.Tests.Shared.Caliburn.Micro</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.Shared.Caliburn.Micro</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.Tests.Shared</id>
<version>2.2.3</version>
<version>2.2.4</version>
<title>LogoFX.Client.Testing.Shared</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -16,7 +16,7 @@
</releaseNotes>
<dependencies>
<dependency id="Solid.Practices.Scheduling" version="2.3.2" />
<dependency id="LogoFX.Client.Core.Core" version="2.2.3" />
<dependency id="LogoFX.Client.Core.Core" version="2.2.4" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/testing" />
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 ../pack
call pack-all
cd ../publish
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
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)'=='Debug|AnyCPU'">
<OutputPath>../bin/debug</OutputPath>
Expand All @@ -15,7 +15,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
<PackageReference Include="FlaUI.Core" Version="3.2.0" />
</ItemGroup>
</Project>
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,9 +12,9 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Attest.Fake.Data" Version="2.4.1" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
<PackageReference Include="Attest.Tests.Core" Version="2.4.1" />
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.1" />
<PackageReference Include="Attest.Fake.Data" Version="2.4.2" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
<PackageReference Include="Attest.Tests.Core" Version="2.4.2" />
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AssemblyName>LogoFX.Client.Testing.EndToEnd.White</AssemblyName>
<RootNamespace>LogoFX.Client.Testing.EndToEnd.White</RootNamespace>
<Version>2.2.3</Version>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\bin\net\Release\</OutputPath>
Expand All @@ -19,7 +19,7 @@
<Compile Include="..\src\TeardownService.cs" Link="TeardownService.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
<PackageReference Include="TestStack.White" Version="0.13.3" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AssemblyName>LogoFX.Client.Testing.EndToEnd.White</AssemblyName>
<RootNamespace>LogoFX.Client.Testing.EndToEnd.White</RootNamespace>
<Version>2.2.3</Version>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\bin\netcore\Release\</OutputPath>
Expand All @@ -19,7 +19,7 @@
<Compile Include="..\src\TeardownService.cs" Link="TeardownService.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.1" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.2" />
<PackageReference Include="TestStack.White" Version="0.13.3" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Attest.Testing.Contracts">
<Version>2.4.1</Version>
<Version>2.4.2</Version>
</PackageReference>
<PackageReference Include="TestStack.White">
<Version>0.13.3</Version>
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 4e22ac8

Please sign in to comment.