bump version

mbraceproject · Oct 28, 2017 · 571e6fd · 571e6fd
1 parent c07e375
commit 571e6fd
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 53 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -30,7 +30,7 @@
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
   </PropertyGroup>
 
-  <Target Name="PaketRestore" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
+  <Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
 
     <!-- Step 1 Check if lockfile is properly restored -->
     <PropertyGroup>
@@ -88,7 +88,7 @@
     <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)"' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
 
     <!-- This shouldn't actually happen, but just to be sure. -->
-    <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' " Text="A paket file for the framework '$(TargetFramework)' is missing. Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
+    <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' AND '$(ResolveNuGetPackages)' != 'False' " Text="Paket file '$(PaketResolvedFilePath)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
 
     <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
     <ReadLinesFromFile Condition="Exists('$(PaketResolvedFilePath)')" File="$(PaketResolvedFilePath)" >

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.5.2
+* Upgrade FsPickler version.
+
 ### 1.5.1
 * Fix Azure.Management packaging issue.
 

diff --git a/paket.dependencies b/paket.dependencies
@@ -10,7 +10,7 @@ nuget MBrace.CSharp
 nuget WindowsAzure.ServiceBus ~> 3.0
 nuget WindowsAzure.Storage ~> 7.0
 nuget Argu ~> 3.2
-nuget FsPickler ~> 4.0
+nuget FsPickler ~> 4.5
 nuget Microsoft.WindowsAzure.Management.Libraries
 nuget Microsoft.WindowsAzure.Management.ServiceBus prerelease
 nuget Microsoft.WindowsAzure.ConfigurationManager
@@ -42,4 +42,4 @@ group Build
 
   nuget FAKE
   nuget Nuget.CommandLine  
-  github fsharp/FAKE modules/Octokit/Octokit.fsx
+  github fsharp/FAKE modules/Octokit/Octokit.fsx
diff --git a/paket.lock b/paket.lock
@@ -3,33 +3,30 @@ RESTRICTION: == net45
 NUGET
   remote: https://www.nuget.org/api/v2
     Argu (3.7)
-    FSharp.Compiler.Tools (4.1.27)
     FSharp.Core (4.2.3)
-    FsPickler (4.0.1)
-      FSharp.Compiler.Tools
+    FsPickler (4.5)
       FSharp.Core (>= 3.1)
-    FsPickler.Json (4.0.1)
-      FSharp.Compiler.Tools
+    FsPickler.Json (4.5)
       FSharp.Core (>= 3.1)
-      FsPickler (4.0.1)
+      FsPickler (4.5)
       Newtonsoft.Json (>= 6.0.5)
     Hyak.Common (1.1.3)
       Newtonsoft.Json (>= 6.0.8)
-    MBrace.Core (1.5)
+    MBrace.Core (1.5.3)
       FSharp.Core (>= 4.0.0.1)
-    MBrace.CSharp (1.5.0-alpha)
+    MBrace.CSharp (1.5.3-alpha)
       FSharp.Core (>= 4.0)
-      MBrace.Core (1.5)
-      MBrace.Flow (1.5)
+      MBrace.Core (1.5.3)
+      MBrace.Flow (1.5.3)
       Streams
-    MBrace.Flow (1.5)
+    MBrace.Flow (1.5.3)
       FSharp.Core (>= 4.0)
-      MBrace.Core (1.5)
+      MBrace.Core (1.5.3)
       Streams
-    MBrace.Runtime (1.5)
-      FsPickler (>= 4.0 < 5.0)
+    MBrace.Runtime (1.5.3)
+      FsPickler (>= 4.4 < 5.0)
       FsPickler.Json
-      MBrace.Core (1.5)
+      MBrace.Core (1.5.3)
       Vagabond (>= 0.15 < 1.0)
     Microsoft.Azure.Common (2.1.4)
       Hyak.Common (>= 1.1.3)
@@ -125,7 +122,7 @@ NUGET
     Octokit (0.27)
 GITHUB
   remote: fsharp/FAKE
-    modules/Octokit/Octokit.fsx (ddf45441759a2a7bc528b3b4c6f9a1edc7bd9f55)
+    modules/Octokit/Octokit.fsx (838f43e1e6ac18014b2515799fe7fa0e23186fbc)
       Octokit (>= 0.20)
 GROUP Test
 REDIRECTS: ON
@@ -144,17 +141,17 @@ NUGET
       MathNet.Numerics (3.7.1)
     MathNet.Numerics.MKL.Win-x64 (1.8)
       MathNet.Numerics (>= 2.4)
-    MBrace.Core (1.5)
+    MBrace.Core (1.5.3)
       FSharp.Core (>= 4.0.0.1)
-    MBrace.Flow (1.5)
+    MBrace.Flow (1.5.3)
       FSharp.Core (>= 4.0)
-      MBrace.Core (1.5)
+      MBrace.Core (1.5.3)
       Streams
-    MBrace.Tests (1.5)
+    MBrace.Tests (1.5.3)
       FsCheck (>= 2.0.1)
       FSharp.Core (>= 4.1 < 5.0)
-      MBrace.Core (1.5)
-      MBrace.Flow (1.5)
+      MBrace.Core (1.5.3)
+      MBrace.Flow (1.5.3)
       NUnit (>= 2.6 < 3.0)
       Unquote (>= 3.0 < 4.0)
     Microsoft.NETCore.Platforms (2.0)

diff --git a/samples/MBrace.Azure.StandaloneClient/MBrace.Azure.StandaloneClient.fsproj b/samples/MBrace.Azure.StandaloneClient/MBrace.Azure.StandaloneClient.fsproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props" Condition="Exists('..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props')" Label="Paket" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/MBrace.Azure.Management/AssemblyInfo.fs b/src/MBrace.Azure.Management/AssemblyInfo.fs
@@ -6,18 +6,18 @@ open System.Reflection
 [<assembly: AssemblyCompanyAttribute("@mbraceproject")>]
 [<assembly: AssemblyCopyrightAttribute("© Nessos Information Technologies and other contributors.")>]
 [<assembly: AssemblyTrademarkAttribute("MBrace")>]
-[<assembly: AssemblyMetadataAttribute("Release Signature","Version 1.5.1, Git Hash 3e142f, Build Date 23102017 07:10 +01:00")>]
-[<assembly: AssemblyVersionAttribute("1.5.1")>]
-[<assembly: AssemblyFileVersionAttribute("1.5.1")>]
+[<assembly: AssemblyMetadataAttribute("Release Signature","Version 1.5.2, Git Hash c07e37, Build Date 28102017 16:35 +01:00")>]
+[<assembly: AssemblyVersionAttribute("1.5.2")>]
+[<assembly: AssemblyFileVersionAttribute("1.5.2")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyProduct = "MBrace.Azure"
     let [<Literal>] AssemblyCompany = "@mbraceproject"
     let [<Literal>] AssemblyCopyright = "© Nessos Information Technologies and other contributors."
     let [<Literal>] AssemblyTrademark = "MBrace"
-    let [<Literal>] AssemblyMetadata_Release_Signature = "Version 1.5.1, Git Hash 3e142f, Build Date 23102017 07:10 +01:00"
-    let [<Literal>] AssemblyVersion = "1.5.1"
-    let [<Literal>] AssemblyFileVersion = "1.5.1"
+    let [<Literal>] AssemblyMetadata_Release_Signature = "Version 1.5.2, Git Hash c07e37, Build Date 28102017 16:35 +01:00"
+    let [<Literal>] AssemblyVersion = "1.5.2"
+    let [<Literal>] AssemblyFileVersion = "1.5.2"
 
-    let [<Literal>] ReleaseTag = "1.5.1"
+    let [<Literal>] ReleaseTag = "1.5.2"
diff --git a/src/MBrace.Azure.Management/MBrace.Azure.Management.fsproj b/src/MBrace.Azure.Management/MBrace.Azure.Management.fsproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props" Condition="Exists('..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props')" Label="Paket" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/MBrace.Azure.StandaloneWorker/AssemblyInfo.fs b/src/MBrace.Azure.StandaloneWorker/AssemblyInfo.fs
@@ -6,18 +6,18 @@ open System.Reflection
 [<assembly: AssemblyCompanyAttribute("@mbraceproject")>]
 [<assembly: AssemblyCopyrightAttribute("© Nessos Information Technologies and other contributors.")>]
 [<assembly: AssemblyTrademarkAttribute("MBrace")>]
-[<assembly: AssemblyMetadataAttribute("Release Signature","Version 1.5.1, Git Hash 3e142f, Build Date 23102017 07:10 +01:00")>]
-[<assembly: AssemblyVersionAttribute("1.5.1")>]
-[<assembly: AssemblyFileVersionAttribute("1.5.1")>]
+[<assembly: AssemblyMetadataAttribute("Release Signature","Version 1.5.2, Git Hash c07e37, Build Date 28102017 16:35 +01:00")>]
+[<assembly: AssemblyVersionAttribute("1.5.2")>]
+[<assembly: AssemblyFileVersionAttribute("1.5.2")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyProduct = "MBrace.Azure"
     let [<Literal>] AssemblyCompany = "@mbraceproject"
     let [<Literal>] AssemblyCopyright = "© Nessos Information Technologies and other contributors."
     let [<Literal>] AssemblyTrademark = "MBrace"
-    let [<Literal>] AssemblyMetadata_Release_Signature = "Version 1.5.1, Git Hash 3e142f, Build Date 23102017 07:10 +01:00"
-    let [<Literal>] AssemblyVersion = "1.5.1"
-    let [<Literal>] AssemblyFileVersion = "1.5.1"
+    let [<Literal>] AssemblyMetadata_Release_Signature = "Version 1.5.2, Git Hash c07e37, Build Date 28102017 16:35 +01:00"
+    let [<Literal>] AssemblyVersion = "1.5.2"
+    let [<Literal>] AssemblyFileVersion = "1.5.2"
 
-    let [<Literal>] ReleaseTag = "1.5.1"
+    let [<Literal>] ReleaseTag = "1.5.2"
diff --git a/src/MBrace.Azure.StandaloneWorker/MBrace.Azure.StandaloneWorker.fsproj b/src/MBrace.Azure.StandaloneWorker/MBrace.Azure.StandaloneWorker.fsproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props" Condition="Exists('..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props')" Label="Paket" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/MBrace.Azure.WorkerRole/MBrace.Azure.WorkerRole.csproj b/src/MBrace.Azure.WorkerRole/MBrace.Azure.WorkerRole.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props" Condition="Exists('..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props')" Label="Paket" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/src/MBrace.Azure/AssemblyInfo.fs b/src/MBrace.Azure/AssemblyInfo.fs
@@ -6,18 +6,18 @@ open System.Reflection
 [<assembly: AssemblyCompanyAttribute("@mbraceproject")>]
 [<assembly: AssemblyCopyrightAttribute("© Nessos Information Technologies and other contributors.")>]
 [<assembly: AssemblyTrademarkAttribute("MBrace")>]
-[<assembly: AssemblyMetadataAttribute("Release Signature","Version 1.5.1, Git Hash 3e142f, Build Date 23102017 07:10 +01:00")>]
-[<assembly: AssemblyVersionAttribute("1.5.1")>]
-[<assembly: AssemblyFileVersionAttribute("1.5.1")>]
+[<assembly: AssemblyMetadataAttribute("Release Signature","Version 1.5.2, Git Hash c07e37, Build Date 28102017 16:35 +01:00")>]
+[<assembly: AssemblyVersionAttribute("1.5.2")>]
+[<assembly: AssemblyFileVersionAttribute("1.5.2")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyProduct = "MBrace.Azure"
     let [<Literal>] AssemblyCompany = "@mbraceproject"
     let [<Literal>] AssemblyCopyright = "© Nessos Information Technologies and other contributors."
     let [<Literal>] AssemblyTrademark = "MBrace"
-    let [<Literal>] AssemblyMetadata_Release_Signature = "Version 1.5.1, Git Hash 3e142f, Build Date 23102017 07:10 +01:00"
-    let [<Literal>] AssemblyVersion = "1.5.1"
-    let [<Literal>] AssemblyFileVersion = "1.5.1"
+    let [<Literal>] AssemblyMetadata_Release_Signature = "Version 1.5.2, Git Hash c07e37, Build Date 28102017 16:35 +01:00"
+    let [<Literal>] AssemblyVersion = "1.5.2"
+    let [<Literal>] AssemblyFileVersion = "1.5.2"
 
-    let [<Literal>] ReleaseTag = "1.5.1"
+    let [<Literal>] ReleaseTag = "1.5.2"
diff --git a/src/MBrace.Azure/MBrace.Azure.fsproj b/src/MBrace.Azure/MBrace.Azure.fsproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props" Condition="Exists('..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props')" Label="Paket" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/tests/MBrace.Azure.Tests/MBrace.Azure.Tests.fsproj b/tests/MBrace.Azure.Tests/MBrace.Azure.Tests.fsproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props" Condition="Exists('..\..\packages\FSharp.Compiler.Tools\build\FSharp.Compiler.Tools.props')" Label="Paket" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>