Movatterモバイル変換

Skip to content

Pateldisolution/visualfsharpPublic

forked fromdotnet/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commita1f4569

KevinRansom

authored

Rev Dev15.8 to build F# 4.5, FSharp.Core 4.5.0.0 (dotnet#4988)

* Update to F# 4.5* typo

1 parente41bd4c commita1f4569Copy full SHA for a1f4569

File tree

37 files changed

+130

-130

lines changed

build/targets
- AssemblyVersions.props
setup
- FSharp.SDK
  - FSharp.SDK.wxs
- Swix
  - Microsoft.FSharp.SDK.Core
    - Files.swr
  - Microsoft.FSharp.SDK.Resources
    - Empty.swr
    - Files.swr
src
- FSharpSource.Settings.targets
- buildfromsource
  - BuildFromSource.targets
  - FSharp.Build
    - AssemblyInfo.fs
  - FSharp.Compiler.Interactive.Settings
    - AssemblyInfo.fs
  - FSharp.Compiler.Private
    - AssemblyInfo.fs
  - FSharp.Compiler.nuget
    - FSharp.Compiler.nuget.fsproj
  - FSharp.Core
    - AssemblyInfo.fs
  - Fsc
    - AssemblyInfo.fs
  - Fsi
    - AssemblyInfo.fs
- fsharp
  - FSharp.Core.nuget
    - FSharp.Core.LatestNuget.nuspec
  - Fsc
    - app.config
  - fsiAnyCpu
    - app.config
  - fsi
    - app.config
- utils
  - CompilerLocationUtils.fs
vsintegration
- Vsix
  - RegisterFsharpPackage.pkgdef
- src/FSharp.ProjectSystem.FSharp
- update-vsintegration.cmd

37 files changed

+130

-130

lines changed

`‎build/targets/AssemblyVersions.props‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@`
`19`	`19`	`<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>`
`20`	`20`	`<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>`
`21`	`21`
`22`		`- <FSCoreVersion>4.4.3.0</FSCoreVersion>`
`23`		`- <FSProductVersion>10.1.1.0</FSProductVersion>`
`24`		`- <FSPackageVersion>10.1.4</FSPackageVersion>`
	`22`	`+ <FSCoreVersion>4.5.0.0</FSCoreVersion>`
	`23`	`+ <FSProductVersion>10.2.0.0</FSProductVersion>`
	`24`	`+ <FSPackageVersion>10.2.0</FSPackageVersion>`
`25`	`25`	`<VSAssemblyVersion>15.8.0.0</VSAssemblyVersion>`
`26`	`26`	`<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>`
`27`	`27`

`‎setup/FSharp.SDK/FSharp.SDK.wxs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->`
`3`	`3`	`<Wixxmlns="http://schemas.microsoft.com/wix/2006/wi">`
`4`	`4`
`5`		`- <?define ProductVersion ="10.1"?>`
	`5`	`+ <?define ProductVersion ="10.2"?>`
`6`	`6`	`<?define ProductPlatform ="x86"?>`
`7`	`7`	`<?define ProductManufacturer ="Microsoft Corporation"?>`
`8`	`8`	`<?define ProductDescription ="Visual F# $(var.ProductVersion) SDK"?>`

`‎setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use vs`
`3`	`3`	`package name=Microsoft.FSharp.SDK.Core`
`4`	`4`	`version=$(FSharpPackageVersion)`
`5`	`5`	`vs.package.type=msi`
`6`		`- vs.package.providerKey=Microsoft.FSharp.SDK.Core,v10.1`
	`6`	`+ vs.package.providerKey=Microsoft.FSharp.SDK.Core,v10.2`
`7`	`7`
`8`	`8`	`vs.installSize`
`9`	`9`	`SystemDrive=194670592`

`‎setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ package name=Microsoft.FSharp.SDK.Resources`
`4`	`4`	`version=$(FSharpPackageVersion)`
`5`	`5`	`vs.package.language=$(LocaleSpecificCulture)`
`6`	`6`	`vs.package.installSize=1`
`7`		`- vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.1`
	`7`	`+ vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.2`

`‎setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ package name=Microsoft.FSharp.SDK.Resources`
`4`	`4`	`version=$(FSharpPackageVersion)`
`5`	`5`	`vs.package.type=msi`
`6`	`6`	`vs.package.language=$(LocaleSpecificCulture)`
`7`		`- vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.1`
	`7`	`+ vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.2`
`8`	`8`
`9`	`9`	`vs.installSize`
`10`	`10`	`SystemDrive=12681438`

`‎src/FSharpSource.Settings.targets‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`
`21`	`21`	`<!-- Version number computation-->`
`22`	`22`	`<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>`
`26`	`26`	`<VSAssemblyVersion>15.7.0.0</VSAssemblyVersion>`
`27`	`27`	`</PropertyGroup>`
`28`	`28`
`@@ -101,8 +101,8 @@`
`101`	`101`	`<!-- Frozen FSharp.Core package being built with this build-->`
`102`	`102`	`<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>`
`103`	`103`	`<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>`
`106`	`106`
`107`	`107`	`<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->`
`108`	`108`	`<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>`
`@@ -111,7 +111,7 @@`
`111`	`111`	`<!-- Frozen FSharp.Core package-->`
`112`	`112`	`<FSharpCoreFrozenPortablePackageVersion>10.1.0</FSharpCoreFrozenPortablePackageVersion>`
`113`	`113`	`<FSharpCoreFrozenPortableTargetPackageVersion>10.2.0</FSharpCoreFrozenPortableTargetPackageVersion>`
`114`		`- <FSharpCoreFrozenPortableTargetMajorVersion>10.1</FSharpCoreFrozenPortableTargetMajorVersion>`
	`114`	`+ <FSharpCoreFrozenPortableTargetMajorVersion>10.2</FSharpCoreFrozenPortableTargetMajorVersion>`
`115`	`115`
`116`	`116`	`<!-- Nunit-->`
`117`	`117`	`<NUnitVersion>3.5.0</NUnitVersion>`

`‎src/buildfromsource/BuildFromSource.targets‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`4`	`4`
`5`	`5`	`<PropertyGroup>`
`6`		`- <FSCoreVersion>4.4.3.0</FSCoreVersion>`
	`6`	`+ <FSCoreVersion>4.5.0.0</FSCoreVersion>`
`7`	`7`	`<OutputPath>$(MSBuildThisFileDirectory)../../BuildFromSource/$(Configuration)/bin</OutputPath>`
`8`	`8`	`<FSharpSourcesRoot>$(MSBuildThisFileDirectory)..</FSharpSourcesRoot>`
`9`	`9`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ open System.Reflection`
`8`	`8`	`[<assembly:AssemblyTitle("FSharp.Build.dll")>]`
`9`	`9`	`[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All Rights Reserved.")>]`
`10`	`10`	`[<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")>]`
`14`	`14`	`do()`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ open System.Runtime.InteropServices`
`10`	`10`	`[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All Rights Reserved.")>]`
`11`	`11`	`[<assembly:AssemblyProduct("Microsoft\174 F#")>]`
`12`	`12`	`[<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")>]`
`16`	`16`	`do()`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ open System.Runtime.InteropServices`
`10`	`10`	`[<assembly:AssemblyCopyright("\169 Microsoft Corporation. All Rights Reserved.")>]`
`11`	`11`	`[<assembly:AssemblyProduct("Microsoft\174 F#")>]`
`12`	`12`	`[<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")>]`
`16`	`16`	`do()`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp