Skip to content

Commit

Permalink
Develop (#24)
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 c266777 commit 1902609
Show file tree
Hide file tree
Showing 51 changed files with 19,088 additions and 280 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}
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.6
SET version=2.2.7
rem TODO: Refactor using loop and automatic discovery
call deploy-single.bat LogoFX.Bootstrapping %version%
call deploy-single.bat LogoFX.Server.IoC.Abstractions %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.6</version>
<version>2.2.7</version>
<title>LogoFX.Bootstrapping</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -17,14 +17,14 @@ Also includes composition helpers.</summary>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Core" version="2.3.5" />
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="Solid.Practices.Modularity" version="2.3.5" />
<dependency id="Solid.Practices.Middleware" version="2.3.5" />
<dependency id="Solid.Bootstrapping" version="2.3.5" />
<dependency id="Solid.Extensibility" version="2.3.5" />
<dependency id="Solid.Common.Core" version="2.3.5" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.5" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="Solid.Practices.Modularity" version="2.3.6" />
<dependency id="Solid.Practices.Middleware" version="2.3.6" />
<dependency id="Solid.Bootstrapping" version="2.3.6" />
<dependency id="Solid.Extensibility" version="2.3.6" />
<dependency id="Solid.Common.Core" version="2.3.6" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.6" />
</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.Contracts</id>
<version>2.2.6</version>
<version>2.2.7</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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Bootstrapping.Adapters.SimpleContainer</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,9 +15,9 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.6" />
<dependency id="LogoFX.Practices.IoC" version="2.2.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.7" />
<dependency id="LogoFX.Practices.IoC" version="2.2.7" />
</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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Bootstrapping.Adapters.Unity</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,10 +12,11 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Bootstrapping Adapter for Unity Container containing an adapter for the Unity Container which is compatible with Caliburn.Micro.</description>
<summary>LogoFX Client Bootstrapping Adapter for Unity Container containing an adapter for the Unity Container which is compatible with Caliburn.Micro.</summary>
<releaseNotes>Added support for injecting unity container instance.</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.7" />
<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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Bootstrapping.Core</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,11 +15,11 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="Solid.Practices.Middleware" version="2.3.5" />
<dependency id="Solid.Bootstrapping" version="2.3.5" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.5" />
<dependency id="LogoFX.Bootstrapping" version="2.2.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="Solid.Practices.Middleware" version="2.3.6" />
<dependency id="Solid.Bootstrapping" version="2.3.6" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.6" />
<dependency id="LogoFX.Bootstrapping" version="2.2.7" />
</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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Bootstrapping.Testing</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,20 +15,20 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.IoC.Registration" version="2.3.5" />
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="Solid.Core" version="2.3.5" />
<dependency id="Solid.Common.Core" version="2.3.5" />
<dependency id="Solid.Extensibility" version="2.3.5" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.5" />
<dependency id="Solid.Practices.Modularity" version="2.3.5" />
<dependency id="Solid.Practices.Middleware" version="2.3.5" />
<dependency id="Solid.Bootstrapping" version="2.3.5" />
<dependency id="LogoFX.Core" version="2.2.6" />
<dependency id="LogoFX.Bootstrapping" version="2.2.6" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.6" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.6" />
<dependency id="LogoFX.Client.Core" version="2.2.6" />
<dependency id="Solid.IoC.Registration" version="2.3.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Solid.Common.Core" version="2.3.6" />
<dependency id="Solid.Extensibility" version="2.3.6" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.6" />
<dependency id="Solid.Practices.Modularity" version="2.3.6" />
<dependency id="Solid.Practices.Middleware" version="2.3.6" />
<dependency id="Solid.Bootstrapping" version="2.3.6" />
<dependency id="LogoFX.Core" version="2.2.7" />
<dependency id="LogoFX.Bootstrapping" version="2.2.7" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.7" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.7" />
<dependency id="LogoFX.Client.Core" version="2.2.7" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/bootstrapping" />
Expand Down
10 changes: 5 additions & 5 deletions devops/pack/LogoFX.Client.Bootstrapping.Testing/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.Bootstrapping.Testing.* /E
robocopy ../../../../../src/Bin/netframework/Release net461 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/netframework/Release net461 System.Windows.Interactivity.dll /E
mkdir net5.0
robocopy ../../../../../src/Bin/net/Release net5.0 LogoFX.Client.Bootstrapping.Testing.* /E
robocopy ../../../../../src/Bin/net/Release net5.0 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/net/Release net5.0 System.Windows.Interactivity.dll /E
cd net5.0
mkdir net6.0
robocopy ../../../../../src/Bin/net/Release net6.0 LogoFX.Client.Bootstrapping.Testing.* /E
robocopy ../../../../../src/Bin/net/Release net6.0 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/net/Release net6.0 System.Windows.Interactivity.dll /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/2012/06/nuspec.xsd">
<metadata>
<id>LogoFX.Client.Bootstrapping.Xamarin.Forms</id>
<version>2.2.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Bootstrapping.Xamarin.Forms</title>
<authors>Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -17,22 +17,22 @@
<dependencies>
<group>
<dependency id="Xamarin.Forms" version="4.5.0.396" />
<dependency id="Solid.Bootstrapping" version="2.3.5" />
<dependency id="Solid.Common.Core" version="2.3.5" />
<dependency id="Solid.Core" version="2.3.5" />
<dependency id="Solid.Extensibility" version="2.3.5" />
<dependency id="Solid.IoC.Registration" version="2.3.5" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.5" />
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="Solid.Practices.Middleware" version="2.3.5" />
<dependency id="Solid.Practices.Modularity" version="2.3.5" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.6" />
<dependency id="Solid.Bootstrapping" version="2.3.6" />
<dependency id="Solid.Common.Core" version="2.3.6" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Solid.Extensibility" version="2.3.6" />
<dependency id="Solid.IoC.Registration" version="2.3.6" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="Solid.Practices.Middleware" version="2.3.6" />
<dependency id="Solid.Practices.Modularity" version="2.3.6" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.7" />
</group>
<group targetFramework="MonoAndroid4.0.3">
<dependency id="LogoFX.Client.Core" version="2.2.6" />
<dependency id="LogoFX.Client.Core" version="2.2.7" />
</group>
<group targetFramework="Xamarin.iOS1.0">
<dependency id="LogoFX.Client.Core" version="2.2.6" />
<dependency id="LogoFX.Client.Core" version="2.2.7" />
</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.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Bootstrapping</title>
<authors>Gennady Verdel, Vlad Spivak</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,53 +12,53 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Bootstrapping containing base bootstrapper that performs several boilerplate tasks: modules registration, assemblies discovery using plugin framework via middlewares</description>
<summary>LogoFX Client Bootstrapping containing base bootstrapper that performs several boilerplate tasks: modules registration, assemblies discovery.</summary>
<releaseNotes>1. Added ability to initialize explicitly.
2. Added more configuration options for root object registration.</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="Solid.IoC.Registration" version="2.3.5" />
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="Solid.Core" version="2.3.5" />
<dependency id="Solid.Extensibility" version="2.3.5" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.5" />
<dependency id="Solid.Practices.Modularity" version="2.3.5" />
<dependency id="Solid.Practices.Middleware" version="2.3.5" />
<dependency id="Solid.Bootstrapping" version="2.3.5" />
<dependency id="LogoFX.Core" version="2.2.6" />
<dependency id="LogoFX.Bootstrapping" version="2.2.6" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.6" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.6" />
<dependency id="LogoFX.Client.Core" version="2.2.6" />
</group>
<dependency id="Solid.IoC.Registration" version="2.3.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Solid.Extensibility" version="2.3.6" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.6" />
<dependency id="Solid.Practices.Modularity" version="2.3.6" />
<dependency id="Solid.Practices.Middleware" version="2.3.6" />
<dependency id="Solid.Bootstrapping" version="2.3.6" />
<dependency id="LogoFX.Core" version="2.2.7" />
<dependency id="LogoFX.Bootstrapping" version="2.2.7" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.7" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.7" />
<dependency id="LogoFX.Client.Core" version="2.2.7" />
</group>
<group targetFramework=".NETCoreApp3.1">
<dependency id="Solid.IoC.Registration" version="2.3.5" />
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="Solid.Core" version="2.3.5" />
<dependency id="Solid.Extensibility" version="2.3.5" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.5" />
<dependency id="Solid.Practices.Modularity" version="2.3.5" />
<dependency id="Solid.Practices.Middleware" version="2.3.5" />
<dependency id="Solid.Bootstrapping" version="2.3.5" />
<dependency id="LogoFX.Core" version="2.2.6" />
<dependency id="LogoFX.Bootstrapping" version="2.2.6" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.6" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.6" />
<dependency id="LogoFX.Client.Core" version="2.2.6" />
<dependency id="Solid.IoC.Registration" version="2.3.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Solid.Extensibility" version="2.3.6" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.6" />
<dependency id="Solid.Practices.Modularity" version="2.3.6" />
<dependency id="Solid.Practices.Middleware" version="2.3.6" />
<dependency id="Solid.Bootstrapping" version="2.3.6" />
<dependency id="LogoFX.Core" version="2.2.7" />
<dependency id="LogoFX.Bootstrapping" version="2.2.7" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.7" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.7" />
<dependency id="LogoFX.Client.Core" version="2.2.7" />
</group>
<group targetFramework="net5.0">
<dependency id="Solid.IoC.Registration" version="2.3.5" />
<dependency id="Solid.Practices.IoC" version="2.3.5" />
<dependency id="Solid.Core" version="2.3.5" />
<dependency id="Solid.Extensibility" version="2.3.5" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.5" />
<dependency id="Solid.Practices.Modularity" version="2.3.5" />
<dependency id="Solid.Practices.Middleware" version="2.3.5" />
<dependency id="Solid.Bootstrapping" version="2.3.5" />
<dependency id="LogoFX.Core" version="2.2.6" />
<dependency id="LogoFX.Bootstrapping" version="2.2.6" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.6" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.6" />
<dependency id="LogoFX.Client.Core" version="2.2.6" />
<group targetFramework="net6.0">
<dependency id="Solid.IoC.Registration" version="2.3.6" />
<dependency id="Solid.Practices.IoC" version="2.3.6" />
<dependency id="Solid.Core" version="2.3.6" />
<dependency id="Solid.Extensibility" version="2.3.6" />
<dependency id="Solid.Practices.Composition.Core" version="2.3.6" />
<dependency id="Solid.Practices.Modularity" version="2.3.6" />
<dependency id="Solid.Practices.Middleware" version="2.3.6" />
<dependency id="Solid.Bootstrapping" version="2.3.6" />
<dependency id="LogoFX.Core" version="2.2.7" />
<dependency id="LogoFX.Bootstrapping" version="2.2.7" />
<dependency id="LogoFX.Client.Bootstrapping.Adapters.Contracts" version="2.2.7" />
<dependency id="LogoFX.Client.Bootstrapping.Core" version="2.2.7" />
<dependency id="LogoFX.Client.Core" version="2.2.7" />
</group>
</dependencies>
<tags>framework logofx dotnet</tags>
Expand Down
10 changes: 5 additions & 5 deletions devops/pack/LogoFX.Client.Bootstrapping/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.Bootstrapping.Platform.* /E
robocopy ../../../../../src/Bin/netframework/Release net461 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/netframework/Release net461 System.Windows.Interactivity.dll /E
mkdir net5.0
robocopy ../../../../../src/Bin/net/Release net5.0 LogoFX.Client.Bootstrapping.Platform.* /E
robocopy ../../../../../src/Bin/net/Release net5.0 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/net/Release net5.0 System.Windows.Interactivity.dll /E
cd net5.0
mkdir net6.0
robocopy ../../../../../src/Bin/net/Release net6.0 LogoFX.Client.Bootstrapping.Platform.* /E
robocopy ../../../../../src/Bin/net/Release net6.0 Caliburn.Micro.* /E
robocopy ../../../../../src/Bin/net/Release net6.0 System.Windows.Interactivity.dll /E
cd net6.0
rmdir /Q /S ref
cd ..
mkdir netcoreapp3.1
Expand Down
Loading

0 comments on commit 1902609

Please sign in to comment.