Skip to content

Build a compiler dll with out a prerelease tag #6082

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.

Sign up for GitHub

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

Merged
KevinRansom merged 1 commit into from
Jan 12, 2019
Merged

Build a compiler dll with out a prerelease tag #6082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions build-nuget-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

<ItemGroup>
<PackageProjects Include="src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.csproj" Condition="'$(BUILD_CORECLR)'=='1'" />
<PackageProjects Include="src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.Prerelease.csproj" Condition="'$(BUILD_CORECLR)'=='1'" />
<PackageProjects Include="src\fsharp\FSharp.Core\FSharp.Core.fsproj" Condition="'$(BUILD_NUGET)'=='1'" />
</ItemGroup>

Expand Down
3 changes: 1 addition & 2 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ if /i "%ARG%" == "net40" (

if /i "%ARG%" == "coreclr" (
set _autoselect=0
set BUILD_PROTO_WITH_CORECLR_LKG=1
set BUILD_CORECLR=1
set BUILD_FROMSOURCE=1
)
Expand Down Expand Up @@ -237,7 +236,7 @@ if /i "%ARG%" == "nuget" (

set BUILD_PROTO=1
set BUILD_NET40_FSHARP_CORE=1
set BUILD_PROTO_WITH_CORECLR_LKG=1
set BUILD_NET40=1
set BUILD_CORECLR=1
set BUILD_NUGET=1
)
Expand Down
8 changes: 7 additions & 1 deletion fsharp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<BuildVS Condition="'$(BuildVS)' == ''">false</BuildVS>
<BuildFCS Condition="'$(BuildFCS)' == ''">false</BuildFCS>
<BuildSetup Condition="'$(BuildSetup)' == ''">false</BuildSetup>
<BuildNuget Condition="'$(BuildNuget)' == ''">false</BuildNuget>

<TestCompiler Condition="'$(TestCompiler)' == ''">false</TestCompiler>
<TestFSharpSuite Condition="'$(TestFSharpSuite)' == ''">false</TestFSharpSuite>
Expand All @@ -25,6 +26,7 @@
<BuildCompiler Condition="'$(BUILD_CORECLR)' == '1'">true</BuildCompiler>
<BuildVS Condition="'$(BUILD_VS)' == '1'">true</BuildVS>
<BuildFCS Condition="'$(BUILD_FCS)' == '1'">true</BuildFCS>
<BuildNuget Condition="'$(BUILD_NUGET)' == '1' or '$(BUILD_SETUP)' == '1'">true</BuildNuget>
<BuildSetup Condition="'$(BUILD_SETUP)' == '1'">true</BuildSetup>

<TestCompiler Condition="'$(TEST_NET40_COMPILERUNIT_SUITE)' == '1'">true</TestCompiler>
Expand Down Expand Up @@ -98,8 +100,12 @@
<Projects Include="$(MSBuildThisFileDirectory)fcs\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCrackerTool.fsproj" />
</ItemGroup>

<ItemGroup Condition="'$(BuildSetup)' == 'true' OR '$(_RunningRestore)' == 'true'">
<ItemGroup Condition="'$(BuildNuget)' == 'true' OR '$(_RunningRestore)' == 'true'">
<NugetProjects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.csproj" />
<NugetProjects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.Prerelease.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(BuildSetup)' == 'true' OR '$(_RunningRestore)' == 'true'">
<Projects Include="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions src/fsharp/FSharp.Compiler.nuget/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<NuspecFile>Microsoft.FSharp.Compiler.nuspec</NuspecFile>
<PreReleaseSuffix Condition="'$(PreRelease)' != 'false'">-rtm-$(NuGetPackageVersionSuffix)</PreReleaseSuffix>
<PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
</PropertyGroup>

</Project>
5 changes: 5 additions & 0 deletions src/fsharp/FSharp.Compiler.nuget/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<Project>

<PropertyGroup>
<PreReleaseSuffix Condition="'$(PreRelease)' != 'false'">-rtm-$(NuGetPackageVersionSuffix)</PreReleaseSuffix>
<PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Nuget.targets" />

Expand Down
8 changes: 8 additions & 0 deletions src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.Prerelease.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Microsoft.FSharp.Compiler</PackageId>
<PreRelease>true</PreRelease>
</PropertyGroup>

</Project>
1 change: 1 addition & 0 deletions src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<PackageId>Microsoft.FSharp.Compiler</PackageId>
<PreRelease>false</PreRelease>
</PropertyGroup>

</Project>
1 change: 1 addition & 0 deletions src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<PackageId>Testing.FSharp.Compiler</PackageId>
<PreRelease>true</PreRelease>
</PropertyGroup>

</Project>