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

Commit7ea142f

Browse files
authored
Fixversioningmerge --- Fix merge issue that messed with versioning (dotnet#4186)
* Fix merge issue with versioning* Rev buildFrom source versions* Fixup vs tests
1 parent592b863 commit7ea142f

File tree

9 files changed

+27
-21
lines changed

9 files changed

+27
-21
lines changed

‎src/FSharpSource.Settings.targets‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
</PropertyGroup>
2020

2121
<!-- Version number computation-->
22+
<PropertyGroup>
23+
<FSCoreVersion>4.4.3.0</FSCoreVersion>
24+
<FSProductVersion>10.1.0.0</FSProductVersion>
25+
<FSPackageVersion>10.1.0</FSPackageVersion>
26+
<VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>
27+
</PropertyGroup>
28+
2229
<PropertyGroup>
2330
<!-- Put build number 0 and today's date if this was a local build-->
2431
<BUILD_BUILDNUMBERCondition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
@@ -38,9 +45,13 @@
3845
<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
3946
<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
4047

41-
<FSCoreVersion>4.4.3.0</FSCoreVersion>
4248
<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
43-
<MicroBuildAssemblyVersionCondition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.3.0</MicroBuildAssemblyVersion>
49+
50+
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->
51+
<MicroBuildAssemblyVersionCondition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersion)</MicroBuildAssemblyVersion>
52+
53+
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->
54+
<MicroBuildAssemblyVersionCondition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersion)</MicroBuildAssemblyVersion>
4455

4556
<!--
4657
@@ -62,11 +73,6 @@
6273
</PropertyGroup>
6374

6475
<PropertyGroup>
65-
<FSCoreVersion>4.4.3.0</FSCoreVersion>
66-
<FSProductVersion>10.1.0.0</FSProductVersion>
67-
<FSPackageVersion>10.1.0</FSPackageVersion>
68-
<VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>
69-
7076
<RoslynVersion>2.6.0-vs-for-mac-62329-05</RoslynVersion>
7177
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
7278
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>

‎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.1.0</FSCoreVersion>
6+
<FSCoreVersion>4.4.3.0</FSCoreVersion>
77
<OutputPath>$(MSBuildThisFileDirectory)../../BuildFromSource/$(Configuration)/bin</OutputPath>
88
<FSharpSourcesRoot>$(MSBuildThisFileDirectory)..</FSharpSourcesRoot>
99

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

Lines changed: 2 additions & 2 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("4.4.1.0")>]
12-
[<assembly:AssemblyVersion("4.4.1.0")>]
11+
[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
12+
[<assembly:AssemblyVersion("4.4.3.0")>]
1313
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
1414
do()

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

Lines changed: 2 additions & 2 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("4.4.1.0")>]
14-
[<assembly:AssemblyVersion("4.4.1.0")>]
13+
[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
14+
[<assembly:AssemblyVersion("4.4.3.0")>]
1515
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
1616
do()

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

Lines changed: 2 additions & 2 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("4.4.1.0")>]
14-
[<assembly:AssemblyVersion("4.4.1.0")>]
13+
[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
14+
[<assembly:AssemblyVersion("4.4.3.0")>]
1515
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
1616
do()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ open System.Runtime.InteropServices
1616
[<assembly:AssemblyFlags(System.Reflection.AssemblyNameFlags.Retargetable)>]
1717
#endif
1818

19-
[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
20-
[<assembly:AssemblyVersion("4.4.1.0")>]
19+
[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
20+
[<assembly:AssemblyVersion("4.4.3.0")>]
2121
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
2222
do()
2323

‎src/buildfromsource/Fsc/AssemblyInfo.fs‎

Lines changed: 2 additions & 2 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("4.4.1.0")>]
14-
[<assembly:AssemblyVersion("4.4.1.0")>]
13+
[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
14+
[<assembly:AssemblyVersion("4.4.3.0")>]
1515
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
1616
do()

‎src/buildfromsource/Fsi/AssemblyInfo.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ open System.Reflection
77
[<assembly:AssemblyTitle("fsi.exe")>]
88
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All Rights Reserved.")>]
99
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
10-
[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
11-
[<assembly:AssemblyVersion("4.4.1.0")>]
10+
[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
11+
[<assembly:AssemblyVersion("4.4.3.0")>]
1212
[<assembly:AssemblyFileVersion("2017.06.27.0")>]
1313
do()

‎vsintegration/tests/unittests/LegacyLanguageService/Tests.LanguageService.Script.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@ type UsingMSBuild() as this =
13431343
"4.4.0.0"
13441344
#endif
13451345
#if VS_VERSION_DEV15
1346-
"4.4.3.0"
1346+
"10.1.0.0"
13471347
#endif
13481348
letbinariesFolder=match Internal.Utilities.FSharpEnvironment.BinFolderOfDefaultFSharpCompiler(None)with
13491349
| Some(x)-> x

0 commit comments

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