From 8638e84e488da914c19ff07979c44822666f303f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Pluci=C5=84ski?= Date: Mon, 2 Sep 2019 20:31:25 +0200 Subject: [PATCH 1/7] multitargeting - upgraded to sdk csproj --- .../SpecFlow.SimpleInjector.nuspec | 2 +- .../SpecFlow.SimpleInjector.nuspec.props | 20 ++++- .../App.config | 2 - .../Properties/AssemblyInfo.cs | 26 +----- ...cFlow.SimpleInjector.SpecFlowPlugin.csproj | 88 +++---------------- .../packages.config | 12 --- 6 files changed, 31 insertions(+), 119 deletions(-) delete mode 100644 src/SpecFlow.SimpleInjector.SpecFlowPlugin/App.config delete mode 100644 src/SpecFlow.SimpleInjector.SpecFlowPlugin/packages.config diff --git a/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec b/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec index 86ff3bc..48b90bd 100644 --- a/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec +++ b/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec @@ -18,7 +18,7 @@ specflow SimpleInjector di dependency injection - + \ No newline at end of file diff --git a/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props b/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props index 74d370a..3ec1f4e 100644 --- a/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props +++ b/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props @@ -1,13 +1,29 @@  - + SpecFlow.SimpleInjector\lib\net45 - + SpecFlow.SimpleInjector\lib\net45 + + SpecFlow.SimpleInjector\lib\net471 + + + + SpecFlow.SimpleInjector\lib\net471 + + + + SpecFlow.SimpleInjector\lib\netstandard2.0 + + + + SpecFlow.SimpleInjector\lib\netstandard2.0 + + SpecFlow.SimpleInjector\content diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/App.config b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/App.config deleted file mode 100644 index a6a2b7f..0000000 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/App.config +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/Properties/AssemblyInfo.cs b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/Properties/AssemblyInfo.cs index b14c82b..1b52dbc 100644 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/Properties/AssemblyInfo.cs +++ b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/Properties/AssemblyInfo.cs @@ -1,18 +1,8 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SpecFlow.SimpleInjector (SpecFlow plugin)")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Spec Solutions")] -[assembly: AssemblyProduct("SpecFlow.SimpleInjector")] -[assembly: AssemblyCopyright("Copyright © 2017 Jakub Guc")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -21,17 +11,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("1eeff87c-9ec4-41c5-83b1-6ade8baa1e12")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0")] diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj index 82d37e3..a8f5055 100644 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj +++ b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj @@ -1,83 +1,17 @@ - - - + - Debug - AnyCPU - {1EEFF87C-9EC4-41C5-83B1-6ADE8BAA1E12} - Library - Properties SpecFlow.SimpleInjector - SpecFlow.SimpleInjector.SpecFlowPlugin - v4.5 - 512 + net45;net471;netstandard2.0 + SpecFlow.SimpleInjector (SpecFlow plugin) + Spec Solutions + SpecFlow.SimpleInjector + Copyright © 2017 Jakub Guc + 1.0.0 + 1.0.0.0 + 1.0.0.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\BoDi.1.4.1\lib\net45\BoDi.dll - - - ..\packages\Gherkin.6.0.0\lib\net45\Gherkin.dll - - - ..\packages\SimpleInjector.4.6.2\lib\net45\SimpleInjector.dll - - - - - ..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll - - - - - - - - - ..\packages\SpecFlow.3.0.225\lib\net45\TechTalk.SpecFlow.dll - - - ..\packages\Utf8Json.1.3.7\lib\net45\Utf8Json.dll - - - - - - - - - - - - + + - - \ No newline at end of file diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/packages.config b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/packages.config deleted file mode 100644 index d9c9a3c..0000000 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From f2928d410a64be5744d92c42551370cd00905ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Pluci=C5=84ski?= Date: Fri, 27 Dec 2019 17:40:25 +0100 Subject: [PATCH 2/7] updated libs, added .netstandard, new csproj --- .../SpecFlow.SimpleInjector.nuspec | 2 +- .../SpecFlow.SimpleInjector.nuspec.props | 20 ++++- src/NuGetPackages/packages.config | 2 +- .../App.config | 2 - .../Properties/AssemblyInfo.cs | 26 +----- ...cFlow.SimpleInjector.SpecFlowPlugin.csproj | 88 +++---------------- .../packages.config | 12 --- 7 files changed, 32 insertions(+), 120 deletions(-) delete mode 100644 src/SpecFlow.SimpleInjector.SpecFlowPlugin/App.config delete mode 100644 src/SpecFlow.SimpleInjector.SpecFlowPlugin/packages.config diff --git a/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec b/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec index 86ff3bc..48b90bd 100644 --- a/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec +++ b/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec @@ -18,7 +18,7 @@ specflow SimpleInjector di dependency injection - + \ No newline at end of file diff --git a/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props b/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props index 74d370a..3ec1f4e 100644 --- a/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props +++ b/src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props @@ -1,13 +1,29 @@  - + SpecFlow.SimpleInjector\lib\net45 - + SpecFlow.SimpleInjector\lib\net45 + + SpecFlow.SimpleInjector\lib\net471 + + + + SpecFlow.SimpleInjector\lib\net471 + + + + SpecFlow.SimpleInjector\lib\netstandard2.0 + + + + SpecFlow.SimpleInjector\lib\netstandard2.0 + + SpecFlow.SimpleInjector\content diff --git a/src/NuGetPackages/packages.config b/src/NuGetPackages/packages.config index 5d52664..5508b1e 100644 --- a/src/NuGetPackages/packages.config +++ b/src/NuGetPackages/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/App.config b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/App.config deleted file mode 100644 index a6a2b7f..0000000 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/App.config +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/Properties/AssemblyInfo.cs b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/Properties/AssemblyInfo.cs index b14c82b..1b52dbc 100644 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/Properties/AssemblyInfo.cs +++ b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/Properties/AssemblyInfo.cs @@ -1,18 +1,8 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SpecFlow.SimpleInjector (SpecFlow plugin)")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Spec Solutions")] -[assembly: AssemblyProduct("SpecFlow.SimpleInjector")] -[assembly: AssemblyCopyright("Copyright © 2017 Jakub Guc")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -21,17 +11,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("1eeff87c-9ec4-41c5-83b1-6ade8baa1e12")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0")] diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj index 82d37e3..57c574c 100644 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj +++ b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj @@ -1,83 +1,17 @@ - - - + - Debug - AnyCPU - {1EEFF87C-9EC4-41C5-83B1-6ADE8BAA1E12} - Library - Properties SpecFlow.SimpleInjector - SpecFlow.SimpleInjector.SpecFlowPlugin - v4.5 - 512 + net45;net471;netstandard2.0 + SpecFlow.SimpleInjector (SpecFlow plugin) + Spec Solutions + SpecFlow.SimpleInjector + Copyright © 2017 Jakub Guc + 1.0.0 + 1.0.0.0 + 1.0.0.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\BoDi.1.4.1\lib\net45\BoDi.dll - - - ..\packages\Gherkin.6.0.0\lib\net45\Gherkin.dll - - - ..\packages\SimpleInjector.4.6.2\lib\net45\SimpleInjector.dll - - - - - ..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll - - - - - - - - - ..\packages\SpecFlow.3.0.225\lib\net45\TechTalk.SpecFlow.dll - - - ..\packages\Utf8Json.1.3.7\lib\net45\Utf8Json.dll - - - - - - - - - - - - + + - - \ No newline at end of file diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/packages.config b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/packages.config deleted file mode 100644 index d9c9a3c..0000000 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From 1ab3d7834fd922655e5c98ba3129ddc1245651ab Mon Sep 17 00:00:00 2001 From: Todd Bennion Date: Thu, 16 Jan 2020 20:26:37 -0700 Subject: [PATCH 3/7] Replacing Appveyor build script to build for .net standard --- appveyor.yml | 25 ++++++++++--------- ...cFlow.SimpleInjector.SpecFlowPlugin.csproj | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4bc83a1..b9f9040 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,5 @@ -version: build{build} +version: '1.0.{build}' +image: Visual Studio 2019 branches: only: @@ -25,15 +26,15 @@ nuget: configuration: Release before_build: - - cd src - - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - - appveyor DownloadFile https://raw.githubusercontent.com/appveyor/ci/master/scripts/nuget-restore.cmd - - nuget-restore - - cd .. - -build: - project: src\SpecFlow.SimpleInjector.sln - verbosity: normal - + # Display .NET Core version + - cmd: dotnet --version + # Display minimal restore text + - cmd: dotnet restore ./src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj --verbosity m +build_script: + # output will be in ./src/bin/debug/netcoreapp1.1/publish + - cmd: dotnet publish ./src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj +after_build: + # For once the build has completed artifacts: -- path: 'src\NuGetPackages\bin\*.nupkg' + - path: '\src\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\Release' + name: NuGet diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj index 57c574c..0ec7b71 100644 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj +++ b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj @@ -1,7 +1,7 @@  SpecFlow.SimpleInjector - net45;net471;netstandard2.0 + netstandard2.0 SpecFlow.SimpleInjector (SpecFlow plugin) Spec Solutions SpecFlow.SimpleInjector From d0a40971c6b340c42f2d58478eb4f10393f1be1e Mon Sep 17 00:00:00 2001 From: Todd Bennion Date: Thu, 16 Jan 2020 20:43:05 -0700 Subject: [PATCH 4/7] Changing to one build target --- .../SpecFlow.SimpleInjector.SpecFlowPlugin.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj index 0ec7b71..0230fc4 100644 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj +++ b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj @@ -1,7 +1,7 @@  SpecFlow.SimpleInjector - netstandard2.0 + netstandard2.0 SpecFlow.SimpleInjector (SpecFlow plugin) Spec Solutions SpecFlow.SimpleInjector From afae9ce7f05d959baf4d54b5471f55d911b04da0 Mon Sep 17 00:00:00 2001 From: Todd Bennion Date: Thu, 16 Jan 2020 20:45:21 -0700 Subject: [PATCH 5/7] removing cache instruction --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b9f9040..c64659b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,9 +8,6 @@ branches: environment: BaseVersion: 1.0.1 NugetVersion: "1.0.1-ci$(APPVEYOR_BUILD_NUMBER)" - -cache: - - src\packages -> src\**\packages.config assembly_info: patch: true From e8d32b937edb80ee59f76f83d683099cc14c04d0 Mon Sep 17 00:00:00 2001 From: Todd Bennion Date: Thu, 16 Jan 2020 21:07:11 -0700 Subject: [PATCH 6/7] Updating the version (minor revision) and adding nuget pack instruction --- .../SpecFlow.SimpleInjector.SpecFlowPlugin.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj index 0230fc4..43712ff 100644 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj +++ b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj @@ -6,9 +6,10 @@ Spec Solutions SpecFlow.SimpleInjector Copyright © 2017 Jakub Guc - 1.0.0 + 1.1.0 1.0.0.0 1.0.0.0 + true From 02e84b7cb5c2370be1912138b1abefde426992d0 Mon Sep 17 00:00:00 2001 From: Todd Bennion Date: Thu, 16 Jan 2020 23:24:47 -0700 Subject: [PATCH 7/7] Changed the package name to match the existing package --- .../SpecFlow.SimpleInjector.SpecFlowPlugin.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj index 43712ff..e05a945 100644 --- a/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj +++ b/src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj @@ -10,6 +10,8 @@ 1.0.0.0 1.0.0.0 true + SpecFlow.SimpleInjector + Jakub Guc