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.

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

remove FSharp.Core.4.1.*.nuspec build #5150

Merged
merged 1 commit into from
Jun 12, 2018
Merged

remove FSharp.Core.4.1.*.nuspec build #5150

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
6 changes: 2 additions & 4 deletions src/FSharpSource.Settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@
<IntermediateOutputPath Condition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>

<!-- Frozen FSharp.Core package being built with this build -->
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>
<FSharpCoreLatestTargetPackageVersion>4.3.5</FSharpCoreLatestTargetPackageVersion>
<FSharpCoreLatestTargetMajorVersion>4.3</FSharpCoreLatestTargetMajorVersion>
<FSharpCoreTargetPackageVersion>4.3.5</FSharpCoreTargetPackageVersion>
<FSharpCoreTargetMajorVersion>4.3</FSharpCoreTargetMajorVersion>

<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists -->
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
Expand Down
127 changes: 0 additions & 127 deletions src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
</PropertyGroup>

<ItemGroup>
<PackageNuspec Include="FSharp.Core.LatestNuget.nuspec" />
<PackageNuspec Include="FSharp.Core.4.1.xxx.nuspec" />
<PackageNuspec Include="FSharp.Core.nuspec" />
<PackageNuspec Include="Microsoft.Portable.FSharp.Core.nuspec" />
</ItemGroup>

Expand Down Expand Up @@ -58,11 +57,8 @@
<PackageVersion Condition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.nuspec'">$(FSharpCoreFrozenPortableTargetPackageVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.nuspec'">$(FSharpCoreFrozenPortableTargetMajorVersion)</PackageMajorVersion>

<PackageVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41TargetPackageVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41TargetMajorVersion)</PackageMajorVersion>

<PackageVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSharpCoreLatestTargetPackageVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSharpCoreLatestTargetMajorVersion)</PackageMajorVersion>
<PackageVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.nuspec'">$(FSharpCoreTargetPackageVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.nuspec'">$(FSharpCoreTargetMajorVersion)</PackageMajorVersion>

<!-- can't have &lt; and &gt; which happens when building locally -->
<NormalizedGitHeadSha>$(GitHeadSha)</NormalizedGitHeadSha>
Expand Down
0 ...Core.nuget/FSharp.Core.LatestNuget.nuspec → ...harp/FSharp.Core.nuget/FSharp.Core.nuspec
View file
Open in desktop
File renamed without changes.