From 3e8c51c38a67fd0187433ff0933e7f060fb15a14 Mon Sep 17 00:00:00 2001 From: Maxime Mangel Date: Mon, 30 Sep 2019 14:20:41 +0200 Subject: [PATCH] Release version 2.2.0 --- .ionide/symbolCache.db | Bin 0 -> 73728 bytes .paket/Paket.Restore.targets | 167 +++++++++++++++++++++-------------- CHANGELOG.md | 2 +- 3 files changed, 104 insertions(+), 65 deletions(-) create mode 100644 .ionide/symbolCache.db diff --git a/.ionide/symbolCache.db b/.ionide/symbolCache.db new file mode 100644 index 0000000000000000000000000000000000000000..6b77476ddc4e5e934518827f0f45209ef184b962 GIT binary patch literal 73728 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 cR@Hy$ce>fE $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + $(MSBuildVersion) + 15.0.0 + false + true true $(MSBuildThisFileDirectory) @@ -22,44 +27,13 @@ $(PaketRootPath)paket.bootstrapper.exe $(PaketToolsPath)paket.bootstrapper.exe $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\ - - - - - $(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)" - - + "$(PaketBootStrapperExePath)" $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" - + true true @@ -69,41 +43,102 @@ $(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 @@ -116,7 +151,10 @@ + + + @@ -126,7 +164,7 @@ - + $(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached @@ -163,6 +201,7 @@ + @@ -184,7 +223,7 @@ $([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]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) %(PaketReferencesFileLinesInfo.PackageVersion) @@ -224,12 +263,10 @@ false - $(MSBuildVersion) - 15.8.0 - + <_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/> @@ -252,10 +289,12 @@ - <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/> + <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/> - + + + @@ -281,7 +320,7 @@ DevelopmentDependency="$(DevelopmentDependency)" BuildOutputInPackage="@(_BuildOutputInPackage)" TargetPathsToSymbols="@(_TargetPathsToSymbols)" - SymbolPackageFormat="symbols.nupkg" + SymbolPackageFormat="$(SymbolPackageFormat)" TargetFrameworks="@(_TargetFrameworks)" AssemblyName="$(AssemblyName)" PackageOutputPath="$(PackageOutputAbsolutePath)" @@ -328,7 +367,7 @@ DevelopmentDependency="$(DevelopmentDependency)" BuildOutputInPackage="@(_BuildOutputInPackage)" TargetPathsToSymbols="@(_TargetPathsToSymbols)" - SymbolPackageFormat="symbols.nupkg" + SymbolPackageFormat="$(SymbolPackageFormat)" TargetFrameworks="@(_TargetFrameworks)" AssemblyName="$(AssemblyName)" PackageOutputPath="$(PackageOutputAbsolutePath)" diff --git a/CHANGELOG.md b/CHANGELOG.md index e5efd98..412ef8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -* Fix encoding when passing array (see [#3](https://github.com/thoth-org/Thoth.Json.Giraffe/pull/3)) +* Fix encoding when passing array (see [#3](https://github.com/thoth-org/Thoth.Json.Giraffe/pull/3)) (by @johannesegger) ## 2.1.0