Movatterモバイル変換

Skip to content

Pateldisolution/visualfsharpPublic

forked fromdotnet/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitef06fc2

KevinRansom

authored

Merge pull requestdotnet#5394 from KevinRansom/versions

Minor build cleanup, Rev Tools version, and update templates and sdk to use FSharp.Core.nuget 4.5.2

2 parentsbfa5fdf +3531cd9 commitef06fc2Copy full SHA for ef06fc2

File tree

13 files changed

+24

-27

lines changed

build/targets
- AssemblyVersions.props
packages.config
src
- FSharpSource.Settings.targets
- fsharp
  - FSharp.Build
    - Microsoft.FSharp.NetSdk.props
  - FSharp.Core.nuget
    - FSharp.Core.nuget.proj
- utils
  - CompilerLocationUtils.fs
vsintegration
- ProjectTemplates
  - ConsoleProject/Template
    - ConsoleApplication.fsproj
    - ConsoleApplication.vstemplate
  - LibraryProject/Template
    - Library.fsproj
    - Library.vstemplate
  - TutorialProject/Template
    - Tutorial.fsproj
    - Tutorial.vstemplate
- Vsix/VisualFSharpTemplates
  - VisualFSharpTemplates.csproj

13 files changed

+24

-27

lines changed

`‎build/targets/AssemblyVersions.props‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,13 @@`
`20`	`20`	`<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>`
`21`	`21`
`22`	`22`	`<FSCoreVersion>4.5.0.0</FSCoreVersion>`
`23`		`- <FSProductVersion>10.2.0.0</FSProductVersion>`
`24`		`- <FSPackageVersion>10.2.0</FSPackageVersion>`
	`23`	`+ <FSCoreMajorVersion>4.5</FSCoreMajorVersion>`
	`24`	`+ <FSCorePackageVersion>4.5.3</FSCorePackageVersion>`
	`25`	`+ <FSProductVersion>10.2.3.0</FSProductVersion>`
	`26`	`+ <FSPackageVersion>10.2.3</FSPackageVersion>`
	`27`	`+ <FSPackageMajorVersion>10.2</FSPackageMajorVersion>`
`25`	`28`	`<VSAssemblyVersion>15.8.0.0</VSAssemblyVersion>`
	`29`	`+`
`26`	`30`	`<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>`
`27`	`31`
`28`	`32`	`<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->`

`‎packages.config‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`<packageid="System.Reflection.Metadata"version="1.6.0" />`
`20`	`20`	`<packageid="System.ValueTuple"version="4.3.0" />`
`21`	`21`	`<packageid="System.ValueTuple"version="4.4.0" />`
`22`		`- <packageid="FSharp.Core"version="4.5.0"/>`
	`22`	`+ <packageid="FSharp.Core"version="4.5.2"/>`
`23`	`23`	`<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />`
`24`	`24`	`<packageid="Microsoft.Build"version="14.3.0" />`
`25`	`25`	`<packageid="Microsoft.Build.Framework"version="14.3.0" />`

`‎src/FSharpSource.Settings.targets‎`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,11 @@`
`21`	`21`	`<!-- Version number computation-->`
`22`	`22`	`<PropertyGroup>`
`23`	`23`	`<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`	`+ <FSCorePackageVersion>4.5.3</FSCorePackageVersion>`
	`26`	`+ <FSProductVersion>10.2.3.0</FSProductVersion>`
	`27`	`+ <FSPackageVersion>10.2.3</FSPackageVersion>`
	`28`	`+ <FSPackageMajorVersion>10.2</FSPackageMajorVersion>`
`26`	`29`	`<VSAssemblyVersion>15.7.0.0</VSAssemblyVersion>`
`27`	`30`	`</PropertyGroup>`
`28`	`31`
`@@ -98,12 +101,6 @@`
`98`	`101`	`<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>`
`99`	`102`	`<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>`
`100`	`103`
`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.2</FSharpCoreLatestTargetPackageVersion>`
`105`		`- <FSharpCoreLatestTargetMajorVersion>4.5</FSharpCoreLatestTargetMajorVersion>`
`106`		`-`
`107`	`104`	`<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->`
`108`	`105`	`<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>`
`109`	`106`	`<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and`
`73`	`73`
`74`	`74`	`<PropertyGroup>`
`75`	`75`	`<DefaultValueTuplePackageVersion>4.4.0</DefaultValueTuplePackageVersion>`
`76`		`- <DefaultFSharpCorePackageVersion>4.5.1</DefaultFSharpCorePackageVersion>`
	`76`	`+ <DefaultFSharpCorePackageVersion>4.5.2</DefaultFSharpCorePackageVersion>`
`77`	`77`	`<ValueTupleImplicitPackageVersion>$(DefaultValueTuplePackageVersion)</ValueTupleImplicitPackageVersion>`
`78`	`78`	`<FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePackageVersion)</FSharpCoreImplicitPackageVersion>`
`79`	`79`	`</PropertyGroup>`

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

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`
`18`	`18`	`<ItemGroup>`
`19`	`19`	`<PackageNuspecInclude="FSharp.Core.LatestNuget.nuspec" />`
`20`		`- <PackageNuspecInclude="FSharp.Core.4.1.xxx.nuspec" />`
`21`	`20`	`<PackageNuspecInclude="Microsoft.Portable.FSharp.Core.nuspec" />`
`22`	`21`	`</ItemGroup>`
`23`	`22`
`@@ -55,11 +54,8 @@`
`55`	`54`	`<PackageVersionCondition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.nuspec'">$(FSharpCoreFrozenPortableTargetPackageVersion)</PackageVersion>`
`56`	`55`	`<PackageMajorVersionCondition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.nuspec'">$(FSharpCoreFrozenPortableTargetMajorVersion)</PackageMajorVersion>`
`57`	`56`
`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>`
	`57`	`+ <PackageVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSCorePackageVersion)</PackageVersion>`
	`58`	`+ <PackageMajorVersionCondition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSCoreMajorVersion)</PackageMajorVersion>`
`63`	`59`
`64`	`60`	`<!-- can't have < and > which happens when building locally-->`
`65`	`61`	`<NormalizedGitHeadSha>$(GitHeadSha)</NormalizedGitHeadSha>`

`‎src/utils/CompilerLocationUtils.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ open System.Runtime.InteropServices`
`12`	`12`	`moduleinternalFSharpEnvironment=`
`13`	`13`
`14`	`14`	`/// 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"`
`16`	`16`
`17`	`17`	`letversionOf<'t>=`
`18`	`18`	`#if FX_RESHAPED_REFLECTION`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`<ReferenceInclude="System.Core"/>`
`43`	`43`	`<ReferenceInclude="System.Numerics"/>`
`44`	`44`	`<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>`
`46`	`46`	`<Private>True</Private>`
`47`	`47`	`</Reference>`
`48`	`48`	`<ReferenceInclude="System.ValueTuple">`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`<WizardData>`
`28`	`28`	`<packagesrepository="extension"repositoryId="VisualFSharpTemplates">`
`29`	`29`	`<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" />`
`31`	`31`	`</packages>`
`32`	`32`	`</WizardData>`
`33`	`33`	`</VSTemplate>`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`<ReferenceInclude="System.Core"/>`
`39`	`39`	`<ReferenceInclude="System.Numerics"/>`
`40`	`40`	`<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>`
`42`	`42`	`<Private>True</Private>`
`43`	`43`	`</Reference>`
`44`	`44`	`<ReferenceInclude="System.ValueTuple">`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`<WizardData>`
`28`	`28`	`<packagesrepository="extension"repositoryId="VisualFSharpTemplates">`
`29`	`29`	`<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" />`
`31`	`31`	`</packages>`
`32`	`32`	`</WizardData>`
`33`	`33`	`</VSTemplate>`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp