Skip to content

Commit

Permalink
Develop (#11)
Browse files Browse the repository at this point in the history
* chore: targeting .NET 6
  • Loading branch information
godrose authored Oct 21, 2022
1 parent a793405 commit 921ad1c
Show file tree
Hide file tree
Showing 37 changed files with 114 additions and 109 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.6.{build}
version: 2.2.7.{build}
configuration: Release
before_build:
- cd src
Expand Down
4 changes: 2 additions & 2 deletions devops/deploy/LogoFX.Client.Testing.Shared.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.6</Version>
<Version>2.2.7</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.Client.Core.Core" Version="2.2.6" />
<PackageReference Include="LogoFX.Client.Core.Core" Version="2.2.7" />
<PackageReference Include="Solid.Practices.Scheduling" Version="2.3.5" />
</ItemGroup>
<ItemGroup>
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.6
SET version=2.2.7
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
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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Testing.EndToEnd.FlaUI</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,9 +12,10 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Testing EndToEnd FlaUI containing implementation of Application Facade using FlaUI.</description>
<summary>LogoFX Client Testing EndToEnd FlaUI containing implementation of Application Facade using FlaUI.</summary>
<releaseNotes>Initial release</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Attest.Testing.Contracts" version="2.4.4" />
<dependency id="Attest.Testing.Contracts" version="2.4.6" />
<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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Testing.EndToEnd.SpecFlow</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,11 +12,12 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Tests SpecFlow containing base class for SpecFlow bridge.</description>
<summary>LogoFX Client Tests SpecFlow containing base class for SpecFlow bridge.</summary>
<releaseNotes>Added support for scenario data store.</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Attest.Testing.Contracts" version="2.4.4" />
<dependency id="Attest.Tests.Core" version="2.4.4" />
<dependency id="Attest.Tests.SpecFlow" version="2.4.4" />
<dependency id="Attest.Testing.Contracts" version="2.4.6" />
<dependency id="Attest.Tests.Core" version="2.4.6" />
<dependency id="Attest.Tests.SpecFlow" version="2.4.6" />
</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.6</version>
<version>2.2.7</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.4" />
<dependency id="Attest.Testing.Contracts" version="2.4.6" />
<dependency id="TestStack.White" version="0.13.3" />
</dependencies>
<tags>framework logofx dotnet</tags>
Expand Down
6 changes: 3 additions & 3 deletions devops/pack/LogoFX.Client.Testing.EndToEnd.White/pack.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ mkdir lib
cd lib
mkdir net461\
robocopy ../../../../../src/Bin/netframework/Release net461 LogoFX.Client.Testing.EndToEnd.White.* /E
mkdir net5.0
robocopy ../../../../../src/Bin/net/Release net5.0 LogoFX.Client.Testing.EndToEnd.White.* /E
cd net5.0
mkdir net6.0
robocopy ../../../../../src/Bin/net/Release net6.0 LogoFX.Client.Testing.EndToEnd.White.* /E
cd net6.0
rmdir /Q /S ref
cd ..
mkdir netcoreapp3.1
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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Testing.Integration.xUnit</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -14,14 +14,15 @@
and base class for unit and integration tests.</description>
<summary>LogoFX Client Tests Integration xUnit containing implementation of Builder Registration Service for xUnit
and base class for unit and integration tests.</summary>
<releaseNotes>Added support for key value data store.</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Core" version="2.3.4" />
<dependency id="Solid.Patterns.Builder" version="2.3.4" />
<dependency id="Attest.Testing.Contracts" version="2.4.4" />
<dependency id="Attest.Tests.Core" version="2.4.4" />
<dependency id="Attest.Tests.xUnit" version="2.4.4" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.6" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Solid.Patterns.Builder" version="2.3.6" />
<dependency id="Attest.Testing.Contracts" version="2.4.6" />
<dependency id="Attest.Tests.Core" version="2.4.6" />
<dependency id="Attest.Tests.xUnit" version="2.4.6" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.7" />
</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.6</version>
<version>2.2.7</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.6</version>
<version>2.2.7</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.4" />
<dependency id="LogoFX.Client.Tests.Contracts" version="2.2.6" />
<dependency id="Attest.Testing.Contracts" version="2.4.6" />
<dependency id="LogoFX.Client.Tests.Contracts" version="2.2.7" />
</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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Testing.Integration.NUnit</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,14 +12,15 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Testing Integration NUnit containing base class for unit and integration tests which are based on NUnit.</description>
<summary>LogoFX Client Testing Integration NUnit containing base class for unit and integration tests which are based on NUnit.</summary>
<releaseNotes>Added support for dependency registrator and resolver.</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Core" version="2.3.4" />
<dependency id="Solid.Patterns.Builder" version="2.3.4" />
<dependency id="Attest.Testing.Contracts" version="2.4.4" />
<dependency id="Attest.Tests.Core" version="2.4.4" />
<dependency id="Attest.Tests.NUnit" version="2.4.4" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.6" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Solid.Patterns.Builder" version="2.3.6" />
<dependency id="Attest.Testing.Contracts" version="2.4.6" />
<dependency id="Attest.Tests.Core" version="2.4.6" />
<dependency id="Attest.Tests.NUnit" version="2.4.6" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.7" />
</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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Testing.Integration.SpecFlow</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,15 +12,16 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Testing Integration SpecFlow containing base class for unit and integration tests which are based on SpecFlow.</description>
<summary>LogoFX Client Testing Integration SpecFlow containing base class for unit and integration tests which are based on SpecFlow.</summary>
<releaseNotes>Added support for parallel run via scenario context.</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Practices.IoC" version="2.3.4" />
<dependency id="Solid.Patterns.Builder" version="2.3.4" />
<dependency id="Solid.Core" version="2.3.4" />
<dependency id="Attest.Testing.Contracts" version="2.4.4" />
<dependency id="Attest.Tests.Core" version="2.4.4" />
<dependency id="Attest.Tests.SpecFlow" version="2.4.4" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="Solid.Patterns.Builder" version="2.3.6" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Attest.Testing.Contracts" version="2.4.6" />
<dependency id="Attest.Tests.Core" version="2.4.6" />
<dependency id="Attest.Tests.SpecFlow" version="2.4.6" />
<dependency id="LogoFX.Client.Tests.Shared" version="2.2.7" />
</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.6</version>
<version>2.2.7</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.4" />
<dependency id="LogoFX.Client.Tests.Contracts" version="2.2.6" />
<dependency id="Attest.Testing.Contracts" version="2.4.6" />
<dependency id="LogoFX.Client.Tests.Contracts" version="2.2.7" />
</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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Testing.Shared.Caliburn.Micro</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand Down
10 changes: 5 additions & 5 deletions devops/pack/LogoFX.Client.Tests.Shared.Caliburn.Micro/pack.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ mkdir net461\
robocopy ../../../../../src/Bin/netframework/Release net461 LogoFX.Client.Testing.Shared.Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/netframework/Release net461 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/netframework/Release net461 System.Windows.Interactivity.* /E
mkdir net5.0
robocopy ../../../../../src/Bin/net/Release net5.0 LogoFX.Client.Testing.Shared.Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/net/Release net5.0 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/net/Release net5.0 System.Windows.Interactivity.* /E
cd net5.0
mkdir net6.0
robocopy ../../../../../src/Bin/net/Release net6.0 LogoFX.Client.Testing.Shared.Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/net/Release net6.0 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/net/Release net6.0 System.Windows.Interactivity.* /E
cd net6.0
rmdir /Q /S ref
cd ..
mkdir netcoreapp3.1
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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Testing.Shared</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,8 +15,8 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Practices.Scheduling" version="2.3.4" />
<dependency id="LogoFX.Client.Core.Core" version="2.2.6" />
<dependency id="Solid.Practices.Scheduling" version="2.3.6" />
<dependency id="LogoFX.Client.Core.Core" version="2.2.7" />
</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.6
SET package_version=2.2.7
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.6
SET package_version=2.2.7
SET target=../../../../packages/Tests-All
cd ../build
call build-all
Expand Down
2 changes: 1 addition & 1 deletion devops/update/UpdateUtil/SdkProjectFileTypeHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public override void UpdateFiles(string prefix, VersionInfo versionInfo)
}

if (!targetFrameworkElement.InnerText.StartsWith("netcoreapp") &&
!targetFrameworkElement.InnerText.StartsWith("net5") &&
!targetFrameworkElement.InnerText.StartsWith("net6") &&
!targetFrameworkElement.InnerText.StartsWith("netstandard"))
{
continue;
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.6</Version>
<Version>2.2.7</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.6</Version>
<Version>2.2.7</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.5" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.6" />
<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.6</Version>
<Version>2.2.7</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.5" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.5" />
<PackageReference Include="Attest.Tests.Core" Version="2.4.5" />
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.5" />
<PackageReference Include="Attest.Fake.Data" Version="2.4.6" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.6" />
<PackageReference Include="Attest.Tests.Core" Version="2.4.6" />
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.6" />
</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.6</Version>
<Version>2.2.7</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.5" />
<PackageReference Include="Attest.Testing.Contracts" Version="2.4.6" />
<PackageReference Include="TestStack.White" Version="0.13.3" />
</ItemGroup>
</Project>
Loading

0 comments on commit 921ad1c

Please sign in to comment.