From 1bce9edb12c282263012b553ec7e8d14c5db3abf Mon Sep 17 00:00:00 2001 From: Chris Holt Date: Wed, 23 Oct 2019 21:38:05 -0500 Subject: [PATCH] Update to 2.1.1 --- .paket/Paket.Restore.targets | 300 ++++++++++++++++++++----- Build.fsx | 12 +- RELEASE_NOTES.md | 6 +- src/canopy.integration/AssemblyInfo.fs | 8 +- src/canopy/AssemblyInfo.fs | 9 +- src/canopy/canopy.paket.template | 7 +- 6 files changed, 264 insertions(+), 78 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 6be03acb..a7955581 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -5,91 +5,168 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + $(MSBuildVersion) + 15.0.0 + false + true true $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)..\ $(PaketRootPath)paket-files\paket.restore.cached $(PaketRootPath)paket.lock + classic + proj + assembly + native /Library/Frameworks/Mono.framework/Commands/mono mono - - $(PaketRootPath)paket.exe - $(PaketToolsPath)paket.exe - "$(PaketExePath)" - $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" - - - <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) - dotnet "$(PaketExePath)" - - - "$(PaketExePath)" + $(PaketRootPath)paket.bootstrapper.exe $(PaketToolsPath)paket.bootstrapper.exe + $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\ + "$(PaketBootStrapperExePath)" $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" - + true true + + + True + + $(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/')) - + + + + + + + + + + + dotnet paket + - + + + + $(PaketRootPath)paket.exe + $(PaketToolsPath)paket.exe + $(PaketToolsPath)paket.exe + $(_PaketBootStrapperExeDir)paket.exe + paket.exe + + + $(PaketRootPath)paket + $(PaketToolsPath)paket + $(PaketToolsPath)paket + + + $(PaketRootPath)paket.exe + $(PaketToolsPath)paket.exe + + + $(PaketBootStrapperExeDir)paket.exe + + + paket + + <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) + dotnet "$(PaketExePath)" + $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" + "$(PaketExePath)" + + + + + + + + + + + + + + + + + + + + true $(NoWarn);NU1603;NU1604;NU1605;NU1608 + false + true - - - /usr/bin/shasum "$(PaketRestoreCacheFile)" | /usr/bin/awk '{ print $1 }' - /usr/bin/shasum "$(PaketLockFilePath)" | /usr/bin/awk '{ print $1 }' + + + + + + + $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) + + + + + + + $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``)) + $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``)) + + + + + %(PaketRestoreCachedKeyValue.Value) + %(PaketRestoreCachedKeyValue.Value) - - - - - - - - - - - - - - $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) - $([System.IO.File]::ReadAllText('$(PaketLockFilePath)')) + + true - false + false true - + + true - - - + + + + + + - + - + - $(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached + $(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached $(MSBuildProjectFullPath).paket.references @@ -124,8 +201,9 @@ - - + + + @@ -141,20 +219,24 @@ + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) %(PaketReferencesFileLinesInfo.PackageVersion) All - runtime + runtime + runtime true + true - $(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).paket.clitools + $(PaketIntermediateOutputPath)/$(MSBuildProjectFile).paket.clitools @@ -173,44 +255,144 @@ - + false - + - <_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/> + <_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/> + + $(MSBuildProjectDirectory)/$(MSBuildProjectFile) true - false - true - $(BaseIntermediateOutputPath)$(Configuration) - $(BaseIntermediateOutputPath) + false + true + false + true + false + true + false + true + $(PaketIntermediateOutputPath)\$(Configuration) + $(PaketIntermediateOutputPath) - <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/> + <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/> - + + + - - + + + + - "AssemblyInfo" ==> "Build" - ==> "RunTests" + // ==> "RunTests" ==> "All" "CleanDocs" @@ -236,11 +236,11 @@ Target "All" DoNothing ==> "ReleaseDocs" "All" - //==> "CleanDocs" - //==> "GenerateDocs" - //==> "ReleaseDocs" - ==> "NuGet" - ==> "NuGet.Integration" + ==> "CleanDocs" + ==> "GenerateDocs" + ==> "ReleaseDocs" + //==> "NuGet" + //==> "NuGet.Integration" ==> "Release" RunTargetOrDefault "All" diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7bbddf96..d7f7ef23 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -400,4 +400,8 @@ Update to Selenium 3.3 [Issue #351](https://github.com/lefthandedgoat/canopy/iss * Please read upgrade documentation http://lefthandedgoat.github.io/canopy/upgrade1to2.html #### 2.0.1 - April 21 2018 -* Fixed a bug in waitForElement function signature, thanks draganjovanovic!! [PR #428](https://github.com/lefthandedgoat/canopy/pull/428) \ No newline at end of file +* Fixed a bug in waitForElement function signature, thanks draganjovanovic!! [PR #428](https://github.com/lefthandedgoat/canopy/pull/428) + +#### 2.1.1 - October 23 2019 +* Added option to select WebDriver port and allow insecure SSL cert +* Thanks @OmanF (https://github.com/lefthandedgoat/canopy/pull/482) \ No newline at end of file diff --git a/src/canopy.integration/AssemblyInfo.fs b/src/canopy.integration/AssemblyInfo.fs index 865f5468..34da1af1 100644 --- a/src/canopy.integration/AssemblyInfo.fs +++ b/src/canopy.integration/AssemblyInfo.fs @@ -5,13 +5,13 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "canopy.integration" let [] AssemblyProduct = "canopy.integration" let [] AssemblyDescription = "F# web testing framework" - let [] AssemblyVersion = "2.0.0" - let [] AssemblyFileVersion = "2.0.0" \ No newline at end of file + let [] AssemblyVersion = "2.1.1" + let [] AssemblyFileVersion = "2.1.1" diff --git a/src/canopy/AssemblyInfo.fs b/src/canopy/AssemblyInfo.fs index e025a8be..73bc931f 100644 --- a/src/canopy/AssemblyInfo.fs +++ b/src/canopy/AssemblyInfo.fs @@ -5,14 +5,13 @@ open System.Reflection [] [] [] -[] -[] - +[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "canopy" let [] AssemblyProduct = "canopy" let [] AssemblyDescription = "F# web testing framework" - let [] AssemblyVersion = "2.0.0" - let [] AssemblyFileVersion = "2.0.0" + let [] AssemblyVersion = "2.1.1" + let [] AssemblyFileVersion = "2.1.1" diff --git a/src/canopy/canopy.paket.template b/src/canopy/canopy.paket.template index afc9d459..6412e087 100644 --- a/src/canopy/canopy.paket.template +++ b/src/canopy/canopy.paket.template @@ -2,7 +2,7 @@ type file id canopy version - 2.1.0 + 2.1.1 authors Chris Holt iconUrl @@ -21,8 +21,9 @@ files bin\Debug\netstandard2.0 ==> lib\netstandard2.0 releaseNotes - 2.1.0 - September 9 2018 - Fixed some small bugs + 2.1.1 - October 23 2019 + Added option to select WebDriver port and allow insecure SSL cert + Thanks @OmanF (https://github.com/lefthandedgoat/canopy/pull/482) dependencies framework: netstandard2.0