Skip to content

Commit

Permalink
Develop (#14)
Browse files Browse the repository at this point in the history
* chore: targeting .NET 6
  • Loading branch information
godrose committed Oct 21, 2022
1 parent 49e28f0 commit 1df81c9
Show file tree
Hide file tree
Showing 38 changed files with 108 additions and 96 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,12 @@ MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/

#Generated SpecFlow feature.cs files
*.feature.cs
# Generated packages and intermediate output
output
devops/pack/**/contents/lib
devops/pack/**/contents/lib
!devops/build/
**/secret.json
**/FeatureData.json
**/TestExecution.json
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.Core %version%
call deploy-single.bat LogoFX.Practices.IoC %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.Core.Core</id>
<version>2.2.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Core.Core</title>
<authors>Gennady Verdel, David Kossoglyad, Vlad Spivak</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 Core Core containing core facilities for client applications development, including implementation of INotifyPropertyChanged and ambient context for the dispatcher.</description>
<summary>LogoFX Client Core Core containing core facilities for client applications development, including implementation of INotifyPropertyChanged and ambient context for the dispatcher.</summary>
<releaseNotes>Added SetProperty functionality</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="LogoFX.Core" version="2.2.6" />
<dependency id="LogoFX.Core" version="2.2.7" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/core" />
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.Core</id>
<version>2.2.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Core</title>
<authors>Gennady Verdel, David Kossoglyad, Vlad Spivak</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 Core containing platform-specific utilities for client applications, including dispatcher.</description>
<summary>LogoFX Client Core containing platform-specific utilities for client applications, including dispatcher.</summary>
<releaseNotes>Added .NET 5 support</releaseNotes>
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="LogoFX.Client.Core.Core" version="2.2.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/core" />
Expand Down
6 changes: 3 additions & 3 deletions devops/pack/LogoFX.Client.Core/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.Core.Platform.* /E
mkdir net5.0
robocopy ../../../../../src/Bin/net/Release net5.0 LogoFX.Client.Core.Platform.* /E
cd net5.0
mkdir net6.0
robocopy ../../../../../src/Bin/net/Release net6.0 LogoFX.Client.Core.Platform.* /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.Modularity</id>
<version>2.2.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Modularity</title>
<authors>Gennady Verdel, David Kossoglyad, Dmitry Bublik</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,7 +15,7 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="Solid.Core" version="2.3.5" />
<dependency id="Solid.Core" version="2.3.6" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/core" />
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.Theming</id>
<version>2.2.6</version>
<version>2.2.7</version>
<title>LogoFX.Client.Theming</title>
<authors>Dmitry Bublik, David Kossoglyad, Gennady Verdel</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -12,7 +12,8 @@
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Client Theming containing rich theming infrastructure</description>
<summary>LogoFX Client Theming containing rich theming infrastructure</summary>
<releaseNotes>Initial release</releaseNotes>
<releaseNotes>
</releaseNotes>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/core" />
</metadata>
Expand Down
6 changes: 3 additions & 3 deletions devops/pack/LogoFX.Client.Theming/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.Theming.* /E
mkdir net5.0
robocopy ../../../../../src/Bin/net/Release net5.0 LogoFX.Client.Theming.* /E
cd net5.0
mkdir net6.0
robocopy ../../../../../src/Bin/net/Release net6.0 LogoFX.Client.Theming.* /E
cd net6.0
rmdir /Q /S ref
cd ..
mkdir netcoreapp3.1
Expand Down
5 changes: 3 additions & 2 deletions devops/pack/LogoFX.Core/contents/LogoFX.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>LogoFX.Core</id>
<version>2.2.6</version>
<version>2.2.7</version>
<authors>Gennady Verdel, David Kossoglyad, Vlad Spivak, Dmitry Bublik</authors>
<owners>Gennady Verdel</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<licenseUrl>https://github.com/LogoFX/core/blob/main/LICENSE</licenseUrl>
<projectUrl>https://github.com/LogoFX/core</projectUrl>
<iconUrl>https://github.com/LogoFX/logofx-assets/blob/master/icons/icon.png?raw=true</iconUrl>
<description>LogoFX Core assemblies containing collections and weak objects implementations.</description>
<releaseNotes>Improved notification management via dedicated interface.</releaseNotes>
<releaseNotes>
</releaseNotes>
<tags>framework logofx core dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/core" />
</metadata>
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.Practices.IoC</id>
<version>2.2.6</version>
<version>2.2.7</version>
<title>LogoFX.Practices.IoC</title>
<authors>Gennady Verdel, David Kossoglyad, Dmitry Bublik, Vlad Spivak</authors>
<owners>Gennady Verdel</owners>
Expand All @@ -15,8 +15,8 @@
<releaseNotes>
</releaseNotes>
<dependencies>
<dependency id="LogoFX.Core" version="2.2.6" />
<dependency id="Solid.Practices.Modularity" version="2.3.5" />
<dependency id="LogoFX.Core" version="2.2.7" />
<dependency id="Solid.Practices.Modularity" version="2.3.6" />
</dependencies>
<tags>framework logofx dotnet</tags>
<repository type="Open Source" url="https://github.com/LogoFX/core" />
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 ../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.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/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"profiles": {
"UpdateUtil": {
"commandName": "Project",
"commandLineArgs": "Solid 2.3.5"
"commandLineArgs": "Solid 2.3.6"
}
}
}
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 @@ -6,14 +6,14 @@
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="SpecFlow" Version="3.9.58" />
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="SpecFlow" Version="3.9.74" />
<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.58" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.58" />
<PackageReference Include="xunit.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.74" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />
<PackageReference Include="xunit.core" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
[assembly: AssemblyVersion("2.2.7")]
[assembly: AssemblyFileVersion("2.2.7")]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
[assembly: AssemblyVersion("2.2.7")]
[assembly: AssemblyFileVersion("2.2.7")]
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyName>LogoFX.Client.Core.Platform</AssemblyName>
<RootNamespace>LogoFX.Client.Core</RootNamespace>
<UseWPF>true</UseWPF>
<Version>2.2.6</Version>
<Version>2.2.7</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\Bin\net\Release</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyName>LogoFX.Client.Core.Platform</AssemblyName>
<RootNamespace>LogoFX.Client.Core</RootNamespace>
<UseWPF>true</UseWPF>
<Version>2.2.6</Version>
<Version>2.2.7</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\Bin\netcore\Release</OutputPath>
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.6")]
[assembly: AssemblyFileVersion("2.2.6")]
[assembly: AssemblyVersion("2.2.7")]
[assembly: AssemblyFileVersion("2.2.7")]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
[assembly: AssemblyVersion("2.2.7")]
[assembly: AssemblyFileVersion("2.2.7")]
[assembly: ComVisible(false)]
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>netstandard2.0</TargetFramework>
<IsPackable>false</IsPackable>
Expand All @@ -11,7 +11,7 @@
<LangVersion>8</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.5" />
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LogoFX.Client.Core\LogoFX.Client.Core.csproj" />
Expand Down
16 changes: 8 additions & 8 deletions src/LogoFX.Client.Core.Specs/LogoFX.Client.Core.Specs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.5" />
<PackageReference Include="FluentAssertions" Version="6.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="SpecFlow" Version="3.9.58" />
<PackageReference Include="Attest.Tests.SpecFlow" Version="2.4.6" />
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="SpecFlow" Version="3.9.74" />
<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.58" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.58" />
<PackageReference Include="xunit.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.74" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />
<PackageReference Include="xunit.core" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/LogoFX.Client.Core/LogoFX.Client.Core.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 Down
4 changes: 2 additions & 2 deletions src/LogoFX.Client.Modularity/LogoFX.Client.Modularity.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,6 +12,6 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Solid.Core" Version="2.3.5" />
<PackageReference Include="Solid.Core" Version="2.3.6" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<UseWPF>true</UseWPF>
<AssemblyName>LogoFX.Client.Theming.Platform</AssemblyName>
<RootNamespace>LogoFX.Client.Theming</RootNamespace>
<Version>2.2.6</Version>
<Version>2.2.7</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\bin\net\Release</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<UseWPF>true</UseWPF>
<AssemblyName>LogoFX.Client.Theming.Platform</AssemblyName>
<RootNamespace>LogoFX.Client.Theming</RootNamespace>
<Version>2.2.6</Version>
<Version>2.2.7</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\bin\netcore\Release</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.2.6")]
[assembly: AssemblyFileVersion("2.2.6")]
[assembly: AssemblyVersion("2.2.7")]
[assembly: AssemblyFileVersion("2.2.7")]
2 changes: 1 addition & 1 deletion src/LogoFX.Client.Theming/LogoFX.Client.Theming.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 Down
Loading

0 comments on commit 1df81c9

Please sign in to comment.