Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite0602ed

Browse files
author
Kevin Ransom
committed
Minor build cleanup, Rev Tools version, and update templates and sdk to use FSharp.Core.nuget 4.5.2
1 parent98f8d71 commite0602ed

File tree

13 files changed

+18
-25
lines changed

13 files changed

+18
-25
lines changed

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<packageid="System.Reflection.Metadata"version="1.6.0" />
2020
<packageid="System.ValueTuple"version="4.3.0" />
2121
<packageid="System.ValueTuple"version="4.4.0" />
22-
<packageid="FSharp.Core"version="4.5.0"/>
22+
<packageid="FSharp.Core"version="4.5.2"/>
2323
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
2424
<packageid="Microsoft.Build"version="14.3.0" />
2525
<packageid="Microsoft.Build.Framework"version="14.3.0" />

‎src/FSharpSource.Settings.targets‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
<!-- Version number computation-->
2222
<PropertyGroup>
2323
<FSCoreVersion>4.5.0.0</FSCoreVersion>
24-
<FSProductVersion>10.2.2.0</FSProductVersion>
25-
<FSPackageVersion>10.2.2</FSPackageVersion>
24+
<FSCoreMajorVersion>4.5</FSCoreMajorVersion>
25+
<FSProductVersion>10.2.3.0</FSProductVersion>
26+
<FSPackageVersion>10.2.3</FSPackageVersion>
27+
<FSPackageMajorVersion>10.2</FSPackageMajorVersion>
2628
<VSAssemblyVersion>15.7.0.0</VSAssemblyVersion>
2729
</PropertyGroup>
2830

@@ -98,12 +100,6 @@
98100
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
99101
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
100102

101-
<!-- Frozen FSharp.Core package being built with this build-->
102-
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
103-
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>
104-
<FSharpCoreLatestTargetPackageVersion>4.5.1</FSharpCoreLatestTargetPackageVersion>
105-
<FSharpCoreLatestTargetMajorVersion>4.5</FSharpCoreLatestTargetMajorVersion>
106-
107103
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
108104
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
109105
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>

‎src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
7373

7474
<PropertyGroup>
7575
<DefaultValueTuplePackageVersion>4.4.0</DefaultValueTuplePackageVersion>
76-
<DefaultFSharpCorePackageVersion>4.5.1</DefaultFSharpCorePackageVersion>
76+
<DefaultFSharpCorePackageVersion>4.5.2</DefaultFSharpCorePackageVersion>
7777
<ValueTupleImplicitPackageVersion>$(DefaultValueTuplePackageVersion)</ValueTupleImplicitPackageVersion>
7878
<FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePackageVersion)</FSharpCoreImplicitPackageVersion>
7979
</PropertyGroup>

‎src/fsharp/FSharp.Core.nuget/FSharp.Core.LatestNuget.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>FSharp.Core for F# 4.5</title>
77
<summary>FSharp.Core for F# 4.5</summary>
88
<description>
9-
FSharp.Core redistributables from Visual F# Tools version 10.2 For F# 4.5
9+
FSharp.Core redistributables from Visual F# Tools version 10.3 For F# 4.5
1010
Supported Platforms:
1111
.NET 4.5+ (net45)
1212
netstandard1.6 (netstandard1.6)

‎src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,8 @@
5555
<PackageVersionCondition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.nuspec'">$(FSharpCoreFrozenPortableTargetPackageVersion)</PackageVersion>
5656
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.nuspec'">$(FSharpCoreFrozenPortableTargetMajorVersion)</PackageMajorVersion>
5757

58-
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41TargetPackageVersion)</PackageVersion>
59-
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41TargetMajorVersion)</PackageMajorVersion>
60-
61-
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSharpCoreLatestTargetPackageVersion)</PackageVersion>
62-
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSharpCoreLatestTargetMajorVersion)</PackageMajorVersion>
58+
<PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSCorePackageVersion)</PackageVersion>
59+
<PackageMajorVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSCoreMajorVersion)</PackageMajorVersion>
6360

6461
<!-- can't have &lt; and &gt; which happens when building locally-->
6562
<NormalizedGitHeadSha>$(GitHeadSha)</NormalizedGitHeadSha>

‎src/utils/CompilerLocationUtils.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open System.Runtime.InteropServices
1212
moduleinternalFSharpEnvironment=
1313

1414
/// The F# version reported in the banner
15-
letFSharpBannerVersion="10.2.1 for F# 4.5"
15+
letFSharpBannerVersion="10.2.3 for F# 4.5"
1616

1717
letversionOf<'t>=
1818
#if FX_RESHAPED_REFLECTION

‎vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<ReferenceInclude="System.Core"/>
4343
<ReferenceInclude="System.Numerics"/>
4444
<ReferenceInclude="FSharp.Core">
45-
<HintPath>..\packages\FSharp.Core.4.5.1\lib\net45\FSharp.Core.dll</HintPath>
45+
<HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<ReferenceInclude="System.ValueTuple">

‎vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<WizardData>
2828
<packagesrepository="extension"repositoryId="VisualFSharpTemplates">
2929
<packageid="System.ValueTuple"version="4.4.0"targetFramework="net40" />
30-
<packageid="FSharp.Core"version="4.5.1"targetFramework="net40" />
30+
<packageid="FSharp.Core"version="4.5.2"targetFramework="net40" />
3131
</packages>
3232
</WizardData>
3333
</VSTemplate>

‎vsintegration/ProjectTemplates/LibraryProject/Template/Library.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ReferenceInclude="System.Core"/>
3939
<ReferenceInclude="System.Numerics"/>
4040
<ReferenceInclude="FSharp.Core">
41-
<HintPath>..\packages\FSharp.Core.4.5.1\lib\net45\FSharp.Core.dll</HintPath>
41+
<HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<ReferenceInclude="System.ValueTuple">

‎vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<WizardData>
2828
<packagesrepository="extension"repositoryId="VisualFSharpTemplates">
2929
<packageid="System.ValueTuple"version="4.4.0"targetFramework="net40" />
30-
<packageid="FSharp.Core"version="4.5.1"targetFramework="net40" />
30+
<packageid="FSharp.Core"version="4.5.2"targetFramework="net40" />
3131
</packages>
3232
</WizardData>
3333
</VSTemplate>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp