Commit75fbda0

authored

Merge pull request #5149 from brettfo/net46

target net46 instead of net45

2 parents62098ef +570c582 commit75fbda0Copy full SHA for 75fbda0

File tree

-3

lines changed

-3

lines changed

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`	`<Project>`
`4`	`4`
`5`		`- <PropertyGroupCondition="'$(TargetFramework)' == 'net45'">`
	`5`	`+ <PropertyGroupCondition="'$(TargetFramework)' == 'net46'">`
`6`	`6`	`<DefineConstantsCondition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>`
`7`	`7`	`<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>`
`8`	`8`	`<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`<ImportProject="FSharpSource.Profiles.targets" />`
`57`	`57`
`58`	`58`	`<PropertyGroupCondition="'$(TargetDotnetProfile)'=='net40'">`
`59`		`- <TargetFrameworkVersionCondition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>`
	`59`	`+ <TargetFrameworkVersionCondition="'$(TargetFrameworkVersion)' == ''">v4.6</TargetFrameworkVersion>`
`60`	`60`	`<TargetFrameworkProfile></TargetFrameworkProfile>`
`61`	`61`	`<!-- MSbuild works out the assembly references-->`
`62`	`62`	`</PropertyGroup>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>`
`7`	`7`	`<ProjectLanguage>FSharp</ProjectLanguage>`
`8`	`8`	`<BuildWithCondition=" '$(Configuration)' == 'Proto'">LKG</BuildWith>`
	`9`	`+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>`
`9`	`10`	`</PropertyGroup>`
`10`	`11`
`11`	`12`	`<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`<OutputType>Exe</OutputType>`
`13`	`13`	`<RootNamespace>HostedCompilerServer</RootNamespace>`
`14`	`14`	`<AssemblyName>HostedCompilerServer</AssemblyName>`
`15`		`- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>`
	`15`	`+ <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>`
`16`	`16`	`<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>`
`17`	`17`	`<OutputPath>..\..\bin</OutputPath>`
`18`	`18`	`<CustomOutputPath>true</CustomOutputPath>`

Comments

(0)