Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ready] Provide full fidelity of build options in Xamarin helpers #1702

Merged
merged 7 commits into from
Oct 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ let dotnetAssemblyInfos =
"Fake.DotNet.Testing.NUnit", "Running nunit test runner"
"Fake.DotNet.Testing.XUnit2", "Running xunit test runner"
"Fake.DotNet.Testing.MSTest", "Running mstest test runner"
"Fake.DotNet.Xamarin", "Running Xamarin builds"
"Fake.IO.FileSystem", "Core Filesystem utilities"
"Fake.IO.Zip", "Core Zip functionality"
"Fake.netcore", "Command line tool"
Expand All @@ -212,7 +213,7 @@ let dotnetAssemblyInfos =
"Fake.Windows.Chocolatey", "Running and packaging with Chocolatey"
"Fake.Testing.SonarQube", "Analyzing your project with SonarQube"
"Fake.DotNet.Testing.OpenCover", "Code coverage with OpenCover" ]

let assemblyInfos =
[ "./src/app/FAKE/AssemblyInfo.fs",
[ AssemblyInfo.Title "FAKE - F# Make Command line tool"
Expand Down Expand Up @@ -253,7 +254,7 @@ Target.Create "SetAssemblyInfo" (fun _ ->
)

Target.Create "DownloadPaket" (fun _ ->
if 0 <> Process.ExecProcess (fun info ->
if 0 <> Process.ExecProcess (fun info ->
info.FileName <- ".paket/paket.exe"
info.Arguments <- "--version") (System.TimeSpan.FromMinutes 5.0) then
failwith "paket failed to start"
Expand Down Expand Up @@ -330,14 +331,14 @@ Target.Create "GenerateDocs" (fun _ ->

Directory.ensure apidocsDir
dllFiles
|> FSFormatting.CreateDocsForDlls (fun s ->
{ s with
|> FSFormatting.CreateDocsForDlls (fun s ->
{ s with
OutputDirectory = apidocsDir
LayoutRoots = layoutroots
LayoutRoots = layoutroots
LibDirs = [ "./build" ]
// TODO: CurrentPage shouldn't be required as it's written in the template, but it is -> investigate
ProjectParameters = ("CurrentPage", "APIReference") :: projInfo
SourceRepository = githubLink + "/blob/master" })
SourceRepository = githubLink + "/blob/master" })

)

Expand Down Expand Up @@ -720,7 +721,7 @@ Target.Create "DotnetPackage_" (fun _ ->
Framework = Some "netcoreapp2.0"
OutputPath = Some outDir
}) netcoreFsproj

)

Target.Create "DotnetCoreCreateZipPackages" (fun _ ->
Expand Down Expand Up @@ -884,20 +885,20 @@ Target.Create "ReleaseDocs" (fun _ ->
)

Target.Create "FastRelease" (fun _ ->

Git.Staging.StageAll ""
Git.Commit.Commit "" (sprintf "Bump version to %s" release.NugetVersion)
let branch = Git.Information.getBranchName ""
Git.Branches.pushBranch "" "origin" branch

Git.Branches.tag "" release.NugetVersion
Git.Branches.pushTag "" "origin" release.NugetVersion

let token =
match Environment.environVarOrDefault "github_token" "" with
| s when not (System.String.IsNullOrWhiteSpace s) -> s
| _ -> failwith "please set the github_token environment variable to a github personal access token with repro access."

let draft =
GitHub.createClientWithToken token
|> GitHub.createDraft gitOwner gitName release.NugetVersion (release.SemVer.PreRelease <> None) release.Notes
Expand Down
15 changes: 15 additions & 0 deletions src/Fake-netcore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.Api.Slack", "app\Fake.
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.Api.GitHub", "app\Fake.Api.GitHub\Fake.Api.GitHub.fsproj", "{4BCE4F9C-8FC2-4207-81F1-20CB07D852DC}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.DotNet.Xamarin", "app\Fake.DotNet.Xamarin\Fake.DotNet.Xamarin.fsproj", "{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -480,6 +482,18 @@ Global
{4BCE4F9C-8FC2-4207-81F1-20CB07D852DC}.Release|x64.Build.0 = Release|x64
{4BCE4F9C-8FC2-4207-81F1-20CB07D852DC}.Release|x86.ActiveCfg = Release|x86
{4BCE4F9C-8FC2-4207-81F1-20CB07D852DC}.Release|x86.Build.0 = Release|x86
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Debug|x64.ActiveCfg = Debug|x64
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Debug|x64.Build.0 = Debug|x64
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Debug|x86.ActiveCfg = Debug|x86
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Debug|x86.Build.0 = Debug|x86
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Release|Any CPU.Build.0 = Release|Any CPU
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Release|x64.ActiveCfg = Release|x64
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Release|x64.Build.0 = Release|x64
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Release|x86.ActiveCfg = Release|x86
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E2CF8635-E7C4-4470-92DD-F706F052BF7B} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
Expand Down Expand Up @@ -514,5 +528,6 @@ Global
{A9AF015B-43C9-405E-BF74-CE936B8418F9} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{58A3EDF0-CA9D-4757-B1E8-2A4E3592B308} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{4BCE4F9C-8FC2-4207-81F1-20CB07D852DC} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
EndGlobalSection
EndGlobal
17 changes: 17 additions & 0 deletions src/app/Fake.DotNet.Xamarin/AssemblyInfo.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<assembly: AssemblyTitleAttribute("FAKE - F# Make Running msbuild")>]
[<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
[<assembly: AssemblyVersionAttribute("5.0.0")>]
[<assembly: AssemblyInformationalVersionAttribute("5.0.0")>]
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] AssemblyTitle = "FAKE - F# Make Running msbuild"
let [<Literal>] AssemblyProduct = "FAKE - F# Make"
let [<Literal>] AssemblyVersion = "5.0.0"
let [<Literal>] AssemblyInformationalVersion = "5.0.0"
let [<Literal>] AssemblyFileVersion = "5.0.0"
30 changes: 30 additions & 0 deletions src/app/Fake.DotNet.Xamarin/Fake.DotNet.Xamarin.fsproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>1.0.0-alpha-10</VersionPrefix>
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);DOTNETCORE</DefineConstants>
<DebugType>pdbonly</DebugType>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>Fake.DotNet.Xamarin</AssemblyName>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Xamarin.fs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Fake.Core.Globbing\Fake.Core.Globbing.fsproj" />
<ProjectReference Include="..\Fake.Core.Process\Fake.Core.Process.fsproj" />
<ProjectReference Include="..\Fake.Core.String\Fake.Core.String.fsproj" />
<ProjectReference Include="..\Fake.Core.Tracing\Fake.Core.Tracing.fsproj" />
<ProjectReference Include="..\Fake.DotNet.MsBuild\Fake.DotNet.MsBuild.fsproj" />
<ProjectReference Include="..\Fake.IO.FileSystem\Fake.IO.FileSystem.fsproj" />
</ItemGroup>
<PropertyGroup>
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION;NO_MSBUILD_AVAILABLE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project>
Loading