Changes to .net standard and enables appveyor build.

appveyor.yml

@@ -1,4 +1,5 @@
-version: build{build}
+version: '1.0.{build}'
+image: Visual Studio 2019
 
 branches:
   only:
@@ -7,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
@@ -25,15 +23,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

src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec

@@ -18,7 +18,7 @@
     <tags>specflow SimpleInjector di dependency injection</tags>
     <dependencies>
       <dependency id="SpecFlow" version="3.0.225" />
-      <dependency id="SimpleInjector" version="4.6.2" />
+      <dependency id="SimpleInjector" version="4.7.1" />
     </dependencies>
   </metadata>
 </package>

src/NuGetPackages/SpecFlow.SimpleInjector/SpecFlow.SimpleInjector.nuspec.props

@@ -1,13 +1,29 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
   <ItemGroup Label="SpecFlow.SimpleInjector">
-    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\$(Configuration)\SpecFlow.SimpleInjector.SpecFlowPlugin.dll">
+    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\$(Configuration)\net45\SpecFlow.SimpleInjector.SpecFlowPlugin.dll">
       <targetFolder>SpecFlow.SimpleInjector\lib\net45</targetFolder>
     </additionalFiles>
 
-    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\$(Configuration)\SpecFlow.SimpleInjector.SpecFlowPlugin.pdb">
+    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\$(Configuration)\net45\SpecFlow.SimpleInjector.SpecFlowPlugin.pdb">
       <targetFolder>SpecFlow.SimpleInjector\lib\net45</targetFolder>
     </additionalFiles>
 
+    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\$(Configuration)\net471\SpecFlow.SimpleInjector.SpecFlowPlugin.dll">
+      <targetFolder>SpecFlow.SimpleInjector\lib\net471</targetFolder>
+    </additionalFiles>
+
+    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\$(Configuration)\net471\SpecFlow.SimpleInjector.SpecFlowPlugin.pdb">
+      <targetFolder>SpecFlow.SimpleInjector\lib\net471</targetFolder>
+    </additionalFiles>
+
+    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\$(Configuration)\netstandard2.0\SpecFlow.SimpleInjector.SpecFlowPlugin.dll">
+      <targetFolder>SpecFlow.SimpleInjector\lib\netstandard2.0</targetFolder>
+    </additionalFiles>
+
+    <additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\SpecFlow.SimpleInjector.SpecFlowPlugin\bin\$(Configuration)\netstandard2.0\SpecFlow.SimpleInjector.SpecFlowPlugin.pdb">
+      <targetFolder>SpecFlow.SimpleInjector\lib\netstandard2.0</targetFolder>
+    </additionalFiles>
+
     <additionalFiles Include="$(MSBuildThisFileDirectory)\App.config.transform">
       <targetFolder>SpecFlow.SimpleInjector\content</targetFolder>
     </additionalFiles>

src/NuGetPackages/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="MSBuild.MSBBuildConvention" version="2.0.0" targetFramework="net45" />
   <package id="MSBuild.MSBNuget" version="1.1.2-pre04" targetFramework="net45" />
-  <package id="NuGet.CommandLine" version="2.8.3" />
+  <package id="NuGet.CommandLine" version="5.4.0" targetFramework="net45" developmentDependency="true" />
 </packages>

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")]

src/SpecFlow.SimpleInjector.SpecFlowPlugin/SpecFlow.SimpleInjector.SpecFlowPlugin.csproj

@@ -1,83 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1EEFF87C-9EC4-41C5-83B1-6ADE8BAA1E12}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SpecFlow.SimpleInjector</RootNamespace>
-    <AssemblyName>SpecFlow.SimpleInjector.SpecFlowPlugin</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyTitle>SpecFlow.SimpleInjector (SpecFlow plugin)</AssemblyTitle>
+    <Company>Spec Solutions</Company>
+    <Product>SpecFlow.SimpleInjector</Product>
+    <Copyright>Copyright © 2017 Jakub Guc</Copyright>
+    <Version>1.1.0</Version>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageId>SpecFlow.SimpleInjector</PackageId>
+    <Authors>Jakub Guc</Authors>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="BoDi, Version=1.4.1.0, Culture=neutral, PublicKeyToken=ff7cd5ea2744b496, processorArchitecture=MSIL">
-      <HintPath>..\packages\BoDi.1.4.1\lib\net45\BoDi.dll</HintPath>
-    </Reference>
-    <Reference Include="Gherkin, Version=6.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
-      <HintPath>..\packages\Gherkin.6.0.0\lib\net45\Gherkin.dll</HintPath>
-    </Reference>
-    <Reference Include="SimpleInjector, Version=4.6.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
-      <HintPath>..\packages\SimpleInjector.4.6.2\lib\net45\SimpleInjector.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TechTalk.SpecFlow, Version=3.0.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecFlow.3.0.225\lib\net45\TechTalk.SpecFlow.dll</HintPath>
-    </Reference>
-    <Reference Include="Utf8Json, Version=1.3.7.0, Culture=neutral, PublicKeyToken=8a73d3ba7e392e27, processorArchitecture=MSIL">
-      <HintPath>..\packages\Utf8Json.1.3.7\lib\net45\Utf8Json.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="SimpleInjectorTestObjectResolver.cs" />
-    <Compile Include="SimpleInjectorPlugin.cs" />
-    <Compile Include="BindingRegistryExtensions.cs" />
-    <Compile Include="ContainerBuilderFinder.cs" />
-    <Compile Include="IContainerBuilderFinder.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ScenarioDependenciesAttribute.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="SimpleInjector" Version="4.8.1" />
+    <PackageReference Include="SpecFlow" Version="3.1.74" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>