Dotnetcore (picklesdoc#612)

* Add build.yml (picklesdoc#604) * Add GitHub actions (picklesdoc#605) * Converted Newtonsoft.json and other updates * Migrate packages.config to packagereference * migrate-2019 wizard results and subsequent fixes * dotnet core-standard clean build * switch back to Newtonsoft.Json - updated version * pull in markdowndeep and move basedhtmlfiles * moved BaseDhtmlFiles, updated testing frameworks, removed UI project for now, using dotnet build for versioning * disposing of a streamreader also disposes the underlying stream * updating gherkin library and fixing unit tests - work in progress * Unit test updates. * update Gherkin GetDialect override
CoverGo · Jun 1, 2021 · 9a33c3f · 9a33c3f
1 parent 250e82b
commit 9a33c3f
Show file tree

Hide file tree

Showing 303 changed files with 20,047 additions and 15,252 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,35 @@
+name: build-pickles
+on: 
+    push:
+        branches:
+        - release/*
+jobs:
+    build:
+        runs-on: windows-latest
+
+        steps:
+        - uses: actions/checkout@v1
+          name: Checkout Code
+
+        - name: Setup NuGet
+          uses: NuGet/[email protected]
+          #with:
+            # NuGet API Key to configure.
+            #nuget-api-key: # optional
+            # Source to scope the NuGet API Key to.
+            #nuget-api-key-source: # optional
+
+        - name: Restore NuGet Packages
+          run: nuget restore src\pickles\pickles.sln
+
+        - name: Run build
+          run: build.bat
+
+        #- name: Build and Publish Web App
+        #  run: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild SimpleFrameworkApp.sln /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile
+
+        #- name: Upload Artifact
+        #  uses: actions/[email protected]
+        #  with:
+        #    name: published_webapp
+        #    path: bin\Release\Publish
diff --git a/build.bat b/build.bat
@@ -3,24 +3,23 @@ set "picklesVersion=2.3.3"
 
 cls
 
-"packages\nuget\NuGet.exe" "Install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion"
+rem "packages\nuget\NuGet.exe" "Install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion"
 "packages\nuget\NuGet.exe" "Install" "Chocolatey" "-OutputDirectory" "packages" "-ExcludeVersion"
-"packages\nuget\NuGet.exe" "Install" "NUnit.ConsoleRunner" "-OutputDirectory" "packages" "-ExcludeVersion"
-"packages\nuget\NuGet.exe" "Restore" "src\Pickles\Pickles.sln"
-
-"packages\FAKE\tools\Fake.exe" build.fsx --envvar version %picklesVersion%
-"packages\FAKE\tools\Fake.exe" test.fsx --envvar version %picklesVersion%
-if errorlevel 1 goto handleerror1orhigher
-"packages\FAKE\tools\Fake.exe" nuget.fsx --envvar version %picklesVersion%
-"packages\FAKE\tools\Fake.exe" chocolatey.fsx --envvar version %picklesVersion%
-
-call InstallPackages.cmd
-
-rem FOR %%A IN (testRunnerMsBuild ) DO (
-FOR %%A IN (testRunnerCmd testRunnerMsBuild testRunnerPowerShell) DO (
-   call %%A.cmd %picklesVersion%
-  if errorlevel 1 goto handleerror1orhigher
-)
+rem "packages\nuget\NuGet.exe" "Install" "NUnit.ConsoleRunner" "-OutputDirectory" "packages" "-ExcludeVersion"
+rem "packages\nuget\NuGet.exe" "Restore" "src\Pickles\Pickles.sln"
+
+rem "packages\FAKE\tools\Fake.exe" build.fsx --envvar version %picklesVersion%
+rem "packages\FAKE\tools\Fake.exe" test.fsx --envvar version %picklesVersion%
+rem if errorlevel 1 goto handleerror1orhigher
+rem "packages\FAKE\tools\Fake.exe" nuget.fsx --envvar version %picklesVersion%
+rem "packages\FAKE\tools\Fake.exe" chocolatey.fsx --envvar version %picklesVersion%
+
+rem call InstallPackages.cmd
+
+rem FOR %%A IN (testRunnerCmd testRunnerMsBuild testRunnerPowerShell) DO (
+rem  call %%A.cmd %picklesVersion%
+rem   if errorlevel 1 goto handleerror1orhigher
+rem )
 
 @ECHO all fine
 goto end

diff --git a/build.yml b/build.yml
@@ -0,0 +1,5 @@
+name: build-pickles
+on: [push]
+jobs:
+    run-bat:
+        runs-on: windows-latest
diff --git a/src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj b/src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj
@@ -1,127 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C708FB0D-E2E0-4BE4-BB64-4373E4A0C8AA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PicklesDoc.Pickles.CommandLine.UnitTests</RootNamespace>
     <AssemblyName>PicklesDoc.Pickles.CommandLine.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
+    <AssemblyTitle>Pickles.CommandLine.Test</AssemblyTitle>
+    <Description>Unit and integration tests for the command line runner of Pickles</Description>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
   </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>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NFluent, Version=2.2.0.125, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
-      <HintPath>..\packages\NFluent.2.2.0\lib\net45\NFluent.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.IO.Abstractions, Version=2.1.0.178, Culture=neutral, PublicKeyToken=96bf224d23c43e59, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.1.0.178\lib\net40\System.IO.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="TestingHelpers, Version=2.1.0.178, Culture=neutral, PublicKeyToken=96bf224d23c43e59, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.1.0.178\lib\net40\TestingHelpers.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise />
-  </Choose>
   <ItemGroup>
-    <Compile Include="..\VersionInfo.cs">
-      <Link>VersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WhenParsingCommandLineArguments.cs" />
+    <Compile Include="..\VersionInfo.cs" Link="VersionInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <ProjectReference Include="..\Pickles.CommandLine\Pickles.CommandLine.csproj" />
+    <ProjectReference Include="..\Pickles.ObjectModel\Pickles.ObjectModel.csproj" />
+    <ProjectReference Include="..\Pickles.Test\Pickles.Test.csproj" />
+    <ProjectReference Include="..\Pickles\Pickles.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Pickles.CommandLine\Pickles.CommandLine.csproj">
-      <Project>{A4EBBB5F-A18D-46D2-9ADE-2B90BD48CEC8}</Project>
-      <Name>Pickles.CommandLine</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Pickles.ObjectModel\Pickles.ObjectModel.csproj">
-      <Project>{55382afc-e050-4df7-aa4f-0aba71e2e169}</Project>
-      <Name>Pickles.ObjectModel</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Pickles.Test\Pickles.Test.csproj">
-      <Project>{8BD9FCD2-7ED5-46B5-B6A4-7FA3775E159F}</Project>
-      <Name>Pickles.Test</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Pickles\Pickles.csproj">
-      <Project>{38BAD6E0-78AB-4AC3-91A8-BF72AF5EE394}</Project>
-      <Name>Pickles</Name>
-    </ProjectReference>
+    <PackageReference Include="NFluent" Version="2.2.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="2.1.0.178" />
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
-  </Target>
-  <!-- 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>
diff --git a/src/Pickles/Pickles.CommandLine.UnitTests/Properties/AssemblyInfo.cs b/src/Pickles/Pickles.CommandLine.UnitTests/Properties/AssemblyInfo.cs
diff --git a/src/Pickles/Pickles.CommandLine.UnitTests/app.config b/src/Pickles/Pickles.CommandLine.UnitTests/app.config
@@ -4,15 +4,31 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/Pickles/Pickles.CommandLine.UnitTests/packages.config b/src/Pickles/Pickles.CommandLine.UnitTests/packages.config