Skip to content

Commit

Permalink
Bump version to 6.0.0-alpha013
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Jan 10, 2020
1 parent 7e6d5a5 commit 2e4a433
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 11 deletions.
12 changes: 9 additions & 3 deletions .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,16 @@
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>

<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT' ">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>

<!-- Disable automagic references for F# DotNet SDK -->
<!-- This will not do anything for other project types -->
<!-- see https://github.com/fsharp/fslang-design/blob/master/tooling/FST-1002-fsharp-in-dotnet-sdk.md -->
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>

<!-- Disable Paket restore under NCrunch build -->
<PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>

Expand Down Expand Up @@ -130,7 +136,7 @@
<!-- Parse our simple 'paket.restore.cached' json ...-->
<PaketRestoreCachedSplitObject Include="$([System.Text.RegularExpressions.Regex]::Split(`$(PaketRestoreCachedContents)`, `{|}|,`))"></PaketRestoreCachedSplitObject>
<!-- Keep Key, Value ItemGroup-->
<PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)"
<PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)"
Condition=" $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `&quot;: &quot;`).Length) &gt; 1 ">
<Key>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``))</Key>
<Value>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``))</Value>
Expand Down Expand Up @@ -163,7 +169,7 @@
<Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
<Error Text="Stop build because of PAKET_ERROR_ON_MSBUILD_EXEC and we need a full restore (hashes don't match)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' AND '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true'" />
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true' " ContinueOnError="false" />

<!-- Step 2 Detect project specific changes -->
<ItemGroup>
<MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>
Expand Down
4 changes: 2 additions & 2 deletions src/LockFileComparer/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ open System.Reflection
[<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")>]
[<assembly: AssemblyVersionAttribute("6.0.0")>]
[<assembly: AssemblyFileVersionAttribute("6.0.0")>]
[<assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha012")>]
[<assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha013")>]
do ()

module internal AssemblyVersionInformation =
Expand All @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation =
let [<Literal>] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."
let [<Literal>] AssemblyVersion = "6.0.0"
let [<Literal>] AssemblyFileVersion = "6.0.0"
let [<Literal>] AssemblyInformationalVersion = "6.0.0-alpha012"
let [<Literal>] AssemblyInformationalVersion = "6.0.0-alpha013"
4 changes: 2 additions & 2 deletions src/Paket.Bootstrapper/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
[assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")]
[assembly: AssemblyVersionAttribute("6.0.0")]
[assembly: AssemblyFileVersionAttribute("6.0.0")]
[assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha012")]
[assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha013")]
namespace System {
internal static class AssemblyVersionInformation {
internal const System.String AssemblyTitle = "Paket.Bootstrapper";
internal const System.String AssemblyProduct = "Paket";
internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories.";
internal const System.String AssemblyVersion = "6.0.0";
internal const System.String AssemblyFileVersion = "6.0.0";
internal const System.String AssemblyInformationalVersion = "6.0.0-alpha012";
internal const System.String AssemblyInformationalVersion = "6.0.0-alpha013";
}
}
4 changes: 2 additions & 2 deletions src/Paket.Core/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ open System.Reflection
[<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")>]
[<assembly: AssemblyVersionAttribute("6.0.0")>]
[<assembly: AssemblyFileVersionAttribute("6.0.0")>]
[<assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha012")>]
[<assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha013")>]
do ()

module internal AssemblyVersionInformation =
Expand All @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation =
let [<Literal>] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."
let [<Literal>] AssemblyVersion = "6.0.0"
let [<Literal>] AssemblyFileVersion = "6.0.0"
let [<Literal>] AssemblyInformationalVersion = "6.0.0-alpha012"
let [<Literal>] AssemblyInformationalVersion = "6.0.0-alpha013"
4 changes: 2 additions & 2 deletions src/Paket/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ open System.Reflection
[<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")>]
[<assembly: AssemblyVersionAttribute("6.0.0")>]
[<assembly: AssemblyFileVersionAttribute("6.0.0")>]
[<assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha012")>]
[<assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha013")>]
do ()

module internal AssemblyVersionInformation =
Expand All @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation =
let [<Literal>] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."
let [<Literal>] AssemblyVersion = "6.0.0"
let [<Literal>] AssemblyFileVersion = "6.0.0"
let [<Literal>] AssemblyInformationalVersion = "6.0.0-alpha012"
let [<Literal>] AssemblyInformationalVersion = "6.0.0-alpha013"

0 comments on commit 2e4a433

Please sign in to comment.