未验证 提交 311db1a6 编写于 作者: B Brett V. Forsgren 提交者: GitHub

Merge branch 'dev15.9' into merges/dev15.8-to-dev15.9

......@@ -21,8 +21,8 @@
<!-- Version number computation -->
<PropertyGroup>
<FSCoreVersion>4.5.0.0</FSCoreVersion>
<FSProductVersion>10.2.2.0</FSProductVersion>
<FSPackageVersion>10.2.2</FSPackageVersion>
<FSProductVersion>10.2.3.0</FSProductVersion>
<FSPackageVersion>10.2.3</FSPackageVersion>
<VSAssemblyVersion>15.7.0.0</VSAssemblyVersion>
</PropertyGroup>
......@@ -101,7 +101,7 @@
<!-- Frozen FSharp.Core package being built with this build -->
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>
<FSharpCoreLatestTargetPackageVersion>4.5.1</FSharpCoreLatestTargetPackageVersion>
<FSharpCoreLatestTargetPackageVersion>4.5.2</FSharpCoreLatestTargetPackageVersion>
<FSharpCoreLatestTargetMajorVersion>4.5</FSharpCoreLatestTargetMajorVersion>
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists -->
......
......@@ -73,7 +73,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<PropertyGroup>
<DefaultValueTuplePackageVersion>4.4.0</DefaultValueTuplePackageVersion>
<DefaultFSharpCorePackageVersion>4.5.1</DefaultFSharpCorePackageVersion>
<DefaultFSharpCorePackageVersion>4.5.2</DefaultFSharpCorePackageVersion>
<ValueTupleImplicitPackageVersion>$(DefaultValueTuplePackageVersion)</ValueTupleImplicitPackageVersion>
<FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePackageVersion)</FSharpCoreImplicitPackageVersion>
</PropertyGroup>
......
......@@ -42,7 +42,7 @@
<Reference Include="System.Core"/>
<Reference Include="System.Numerics"/>
<Reference Include="FSharp.Core">
<HintPath>..\packages\FSharp.Core.4.5.1\lib\net45\FSharp.Core.dll</HintPath>
<HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ValueTuple">
......
......@@ -27,7 +27,7 @@
<WizardData>
<packages repository="extension" repositoryId="VisualFSharpTemplates">
<package id="System.ValueTuple" version="4.4.0" targetFramework="net40" />
<package id="FSharp.Core" version="4.5.1" targetFramework="net40" />
<package id="FSharp.Core" version="4.5.2" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -38,7 +38,7 @@
<Reference Include="System.Core"/>
<Reference Include="System.Numerics"/>
<Reference Include="FSharp.Core">
<HintPath>..\packages\FSharp.Core.4.5.1\lib\net45\FSharp.Core.dll</HintPath>
<HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ValueTuple">
......
......@@ -27,7 +27,7 @@
<WizardData>
<packages repository="extension" repositoryId="VisualFSharpTemplates">
<package id="System.ValueTuple" version="4.4.0" targetFramework="net40" />
<package id="FSharp.Core" version="4.5.1" targetFramework="net40" />
<package id="FSharp.Core" version="4.5.2" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
......@@ -45,7 +45,7 @@
<Reference Include="System.Drawing"/>
<Reference Include="System.Windows.Forms"/>
<Reference Include="FSharp.Core">
<HintPath>..\packages\FSharp.Core.4.5.1\lib\net45\FSharp.Core.dll</HintPath>
<HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ValueTuple">
......
......@@ -25,7 +25,7 @@
<WizardData>
<packages repository="extension" repositoryId="VisualFSharpTemplates">
<package id="System.ValueTuple" version="4.4.0" targetFramework="net40" />
<package id="FSharp.Core" version="4.5.1" targetFramework="net40" />
<package id="FSharp.Core" version="4.5.2" targetFramework="net40" />
</packages>
</WizardData>
</VSTemplate>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册