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

Commit82b526f

Browse files
authored
Merge branch 'dev15.8' into merges/master-to-dev15.8
2 parentsec46b97 +2f362bd commit82b526f

File tree

117 files changed

+2464
-513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2464
-513
lines changed

‎build.cmd‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,6 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
666666
:: Restore the Tools directory
667667
call"%~dp0init-tools.cmd"
668668
)
669-
670669
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
671670
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
672671
setNUGET_PACKAGES=%~dp0packages
@@ -696,6 +695,32 @@ if not "%PB_PackageVersionPropsUrl%" == "" (
696695
setDotNetPackageVersionPropsPath=!dependencyUptakeDir!\PackageVersions.props
697696
)
698697

698+
echo ----------- Done with package restore, starting dependency uptake check -------------
699+
700+
ifnot"%PB_PackageVersionPropsUrl%"=="" (
701+
setdependencyUptakeDir=%~dp0Tools\dependencyUptake
702+
ifnotexist"!dependencyUptakeDir!"mkdir"!dependencyUptakeDir!"
703+
704+
:: download package version overrides
705+
echo powershell -noprofile -executionPolicy RemoteSigned -command"Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'"
706+
powershell -noprofile -executionPolicy RemoteSigned -command"Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'"
707+
ifERRORLEVEL1echo Error downloading package version properties&&goto :failure
708+
709+
:: prepare dependency uptake files
710+
echo%_msbuildexe%%msbuildflags%%~dp0build\projects\PrepareDependencyUptake.proj /t:Build
711+
%_msbuildexe%%msbuildflags%%~dp0build\projects\PrepareDependencyUptake.proj /t:Build
712+
ifERRORLEVEL1echo Error building dependency uptake files&&goto :failure
713+
714+
:: restore dependencies
715+
%_nugetexe% restore!dependencyUptakeDir!\packages.config -PackagesDirectory packages -ConfigFile!dependencyUptakeDir!\NuGet.config
716+
ifERRORLEVEL1echo Error restoring dependency uptake packages&&goto :failure
717+
)
718+
719+
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
720+
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
721+
setNUGET_PACKAGES=%~dp0Packages
722+
setpath=%~dp0Tools\dotnet20\;%path%
723+
699724
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"
700725
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
701726
%_ngenexe% install%_fsiexe% /nologo

‎build/config/AssemblySignToolData.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
}
5858
],
5959
"exclude": [
60+
"FSharp.Core.4.3.4.nupkg",
6061
"FSharp.Data.TypeProviders.dll",
6162
"Microsoft.Build.Conversion.Core.dll",
6263
"Microsoft.Build.dll",

‎build/targets/AssemblyVersions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
2020
<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
2121

22-
<FSCoreVersion>4.4.3.0</FSCoreVersion>
23-
<FSProductVersion>10.1.1.0</FSProductVersion>
24-
<FSPackageVersion>10.1.4</FSPackageVersion>
25-
<VSAssemblyVersion>15.7.0.0</VSAssemblyVersion>
22+
<FSCoreVersion>4.5.0.0</FSCoreVersion>
23+
<FSProductVersion>10.2.0.0</FSProductVersion>
24+
<FSPackageVersion>10.2.0</FSPackageVersion>
25+
<VSAssemblyVersion>15.8.0.0</VSAssemblyVersion>
2626
<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
2727

2828
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->

‎packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<packageid="System.Reflection.Metadata"version="1.4.2" />
2020
<packageid="System.ValueTuple"version="4.3.1" />
2121
<packageid="System.ValueTuple"version="4.4.0" />
22+
<packageid="FSharp.Core"version="4.3.4"/>
2223
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
2324
<packageid="Microsoft.Build"version="14.3.0" />
2425
<packageid="Microsoft.Build.Framework"version="14.3.0" />

‎src/FSharpSource.Settings.targets‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
<!-- Version number computation-->
2222
<PropertyGroup>
23-
<FSCoreVersion>4.4.3.0</FSCoreVersion>
24-
<FSProductVersion>10.1.1.0</FSProductVersion>
25-
<FSPackageVersion>10.1.4</FSPackageVersion>
23+
<FSCoreVersion>4.5.0.0</FSCoreVersion>
24+
<FSProductVersion>10.2.0.0</FSProductVersion>
25+
<FSPackageVersion>10.2.0</FSPackageVersion>
2626
<VSAssemblyVersion>15.7.0.0</VSAssemblyVersion>
2727
</PropertyGroup>
2828

@@ -101,8 +101,8 @@
101101
<!-- Frozen FSharp.Core package being built with this build-->
102102
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
103103
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>
104-
<FSharpCoreLatestTargetPackageVersion>4.3.5</FSharpCoreLatestTargetPackageVersion>
105-
<FSharpCoreLatestTargetMajorVersion>4.3</FSharpCoreLatestTargetMajorVersion>
104+
<FSharpCoreLatestTargetPackageVersion>4.5.0</FSharpCoreLatestTargetPackageVersion>
105+
<FSharpCoreLatestTargetMajorVersion>4.5</FSharpCoreLatestTargetMajorVersion>
106106

107107
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
108108
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
@@ -111,7 +111,7 @@
111111
<!-- Frozen FSharp.Core package-->
112112
<FSharpCoreFrozenPortablePackageVersion>10.1.0</FSharpCoreFrozenPortablePackageVersion>
113113
<FSharpCoreFrozenPortableTargetPackageVersion>10.2.0</FSharpCoreFrozenPortableTargetPackageVersion>
114-
<FSharpCoreFrozenPortableTargetMajorVersion>10.1</FSharpCoreFrozenPortableTargetMajorVersion>
114+
<FSharpCoreFrozenPortableTargetMajorVersion>10.2</FSharpCoreFrozenPortableTargetMajorVersion>
115115

116116
<!-- Nunit-->
117117
<NUnitVersion>3.5.0</NUnitVersion>

‎src/buildfromsource/BuildFromSource.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44

55
<PropertyGroup>
6-
<FSCoreVersion>4.4.3.0</FSCoreVersion>
6+
<FSCoreVersion>4.5.0.0</FSCoreVersion>
77
<OutputPath>$(MSBuildThisFileDirectory)../../BuildFromSource/$(Configuration)/bin</OutputPath>
88
<FSharpSourcesRoot>$(MSBuildThisFileDirectory)..</FSharpSourcesRoot>
99

‎src/buildfromsource/FSharp.Build/AssemblyInfo.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open System.Reflection
88
[<assembly:AssemblyTitle("FSharp.Build.dll")>]
99
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All Rights Reserved.")>]
1010
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
11-
[<assembly:AssemblyInformationalVersion("10.1.1.0")>]
12-
[<assembly:AssemblyVersion("10.1.1.0")>]
13-
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
11+
[<assembly:AssemblyInformationalVersion("10.2.0.0")>]
12+
[<assembly:AssemblyVersion("10.2.0.0")>]
13+
[<assembly:AssemblyFileVersion("2018.05.22.0")>]
1414
do()

‎src/buildfromsource/FSharp.Compiler.Interactive.Settings/AssemblyInfo.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ open System.Runtime.InteropServices
1010
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All Rights Reserved.")>]
1111
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
1212
[<assembly:ComVisible(false)>]
13-
[<assembly:AssemblyInformationalVersion("10.1.1.0")>]
14-
[<assembly:AssemblyVersion("10.1.1.0")>]
15-
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
13+
[<assembly:AssemblyInformationalVersion("10.2.0.0")>]
14+
[<assembly:AssemblyVersion("10.2.0.0")>]
15+
[<assembly:AssemblyFileVersion("2018.05.22.0")>]
1616
do()

‎src/buildfromsource/FSharp.Compiler.Private/AssemblyInfo.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ open System.Runtime.InteropServices
1010
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All Rights Reserved.")>]
1111
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
1212
[<assembly:ComVisible(false)>]
13-
[<assembly:AssemblyInformationalVersion("10.1.1.0")>]
14-
[<assembly:AssemblyVersion("10.1.1.0")>]
15-
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
13+
[<assembly:AssemblyInformationalVersion("10.2.0.0")>]
14+
[<assembly:AssemblyVersion("10.2.0.0")>]
15+
[<assembly:AssemblyFileVersion("2018.05.22.0")>]
1616
do()

‎src/buildfromsource/FSharp.Compiler.nuget/FSharp.Compiler.nuget.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageAuthorsCondition="'$(PackageAuthors)' == ''" >Microsoft and F# Software Foundation</PackageAuthors>
2121
<PackageTagsCondition="'$(PackageTags)' == ''" >Visual F# Compiler FSharp functional programming</PackageTags>
2222
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rc-$(BuildRevision.Trim())-0</PreReleaseSuffix>
23-
<PackageVersion>10.1.1$(PreReleaseSuffix)</PackageVersion>
23+
<PackageVersion>10.2.0$(PreReleaseSuffix)</PackageVersion>
2424
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
2525
</PropertyGroup>
2626

0 commit comments

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