Movatterモバイル変換

Skip to content

Pateldisolution/fsharp-1Public

forked fromfsharp/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit6854fbc

dsyme

authored

Merge pull request #5193 from dsyme/fb4

fix mono build/install

2 parents59156db +43cbb79 commit6854fbcCopy full SHA for 6854fbc

File tree

28 files changed

+32

-32

lines changed

mono
- config.make
tests
- projects
  - Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013
    - Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013.fsproj
  - Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40
    - Sample_VS2012_FSharp_ConsoleApp_net40.fsproj
  - Sample_VS2012_FSharp_Portable_Library_upgraded_2013
    - Sample_VS2012_FSharp_Portable_Library_upgraded_2013.fsproj
  - Sample_VS2012_FSharp_Portable_Library
    - Sample_VS2012_FSharp_Portable_Library.fsproj
  - Sample_VS2013_FSharp_Portable_Library_Legacy_net40
    - Sample_VS2013_FSharp_Portable_Library_Legacy_net40.fsproj
  - Sample_VS2013_FSharp_Portable_Library_Legacy_net451
    - Sample_VS2013_FSharp_Portable_Library_Legacy_net451.fsproj
  - Sample_VS2013_FSharp_Portable_Library_Legacy_net45
    - Sample_VS2013_FSharp_Portable_Library_Legacy_net45.fsproj
  - Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile259
    - Sample_VS2013_FSharp_Portable_Library_net451.fsproj
  - Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile78
    - Sample_VS2013_FSharp_Portable_Library_net451.fsproj
  - Sample_VS2013_FSharp_Portable_Library_net451
    - Sample_VS2013_FSharp_Portable_Library_net451.fsproj
  - Sample_VS2013_FSharp_Portable_Library_net45
    - Sample_VS2013_FSharp_Portable_Library_net45.fsproj
  - Sample_VS2015_FSharp_Portable259_Library
    - Sample_VS2015_FSharp_Portable259_Library.fsproj
  - Sample_VS2015_FSharp_Portable47_Library
    - Sample_VS2015_FSharp_Portable47_Library.fsproj
  - Sample_VS2015_FSharp_Portable78_Library
    - Sample_VS2015_FSharp_Portable78_Library.fsproj
  - Sample_VS2015_FSharp_Portable7_Library
    - Sample_VS2015_FSharp_Portable7_Library.fsproj
- service/data
  - DifferingOutputDir
    - Dir1
      - Test1.fsproj
    - Dir2
      - Test2.fsproj
  - FsAndFsiFiles.fsproj
  - MultiLanguageProject
    - ConsoleApplication1.fsproj
    - ConsoleApplication2.fsproj
  - TestProject
    - TestProject.fsproj
  - TestTP
    - TestTP.fsproj
  - TypeProviderConsole
    - TypeProviderConsole.fsproj
  - TypeProviderLibrary
    - TypeProviderLibrary.fsproj
  - TypeProvidersBug
    - TestConsole
      - TestConsole.fsproj
    - TypeProvidersBug
      - TypeProvidersBug.fsproj
  - sqlite-net-spike
    - sqlite-net-spike.fsproj

28 files changed

+32

-32

lines changed

`‎mono/config.make‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,11 +212,11 @@ install-sdk-lib:`
`212`	`212`	`$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\`
`213`	`213`	`$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/;\`
`214`	`214`	`\`
`215`		`-$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/;\`
`216`		`-$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/;\`
`217`		`-$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/;\`
`218`		`-$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\`
`219`		`-$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/;\`
	`215`	`+$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/;\`
	`216`	`+$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/;\`
	`217`	`+$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/;\`
	`218`	`+$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\`
	`219`	`+$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/;\`
`220`	`220`	`fi`
`221`	`221`	`@iftest x-$(outsuffix) = x-net40;then\`
`222`	`222`	`iftest -e$(outdir)$(NAME).dll;then \`

`‎tests/projects/Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`<ReferenceInclude="System.Core" />`
`44`	`44`	`<ReferenceInclude="System.Numerics" />`
`45`	`45`	`<ReferenceInclude="FSharp.Core">`
`46`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
	`46`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
`47`	`47`	`</Reference>`
`48`	`48`	`</ItemGroup>`
`49`	`49`	`<ItemGroup>`

`‎tests/projects/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`<ReferenceInclude="System.Core" />`
`44`	`44`	`<ReferenceInclude="System.Numerics" />`
`45`	`45`	`<ReferenceInclude="FSharp.Core">`
`46`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
	`46`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
`47`	`47`	`</Reference>`
`48`	`48`	`</ItemGroup>`
`49`	`49`	`<ItemGroup>`

`‎tests/projects/Sample_VS2012_FSharp_Portable_Library/Sample_VS2012_FSharp_Portable_Library.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`<ReferenceInclude="FSharp.Core">`
`37`	`37`	`<Name>FSharp.Core</Name>`
`38`	`38`	`<AssemblyName>FSharp.Core.dll</AssemblyName>`
`39`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
	`39`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
`40`	`40`	`</Reference>`
`41`	`41`	`</ItemGroup>`
`42`	`42`	`<ItemGroup>`

`‎tests/projects/Sample_VS2012_FSharp_Portable_Library_upgraded_2013/Sample_VS2012_FSharp_Portable_Library_upgraded_2013.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`</PropertyGroup>`
`36`	`36`	`<ItemGroup>`
`37`	`37`	`<ReferenceInclude="FSharp.Core">`
`38`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
	`38`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
`39`	`39`	`<Private>True</Private>`
`40`	`40`	`</Reference>`
`41`	`41`	`</ItemGroup>`

`‎tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net40/Sample_VS2013_FSharp_Portable_Library_Legacy_net40.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`<ReferenceInclude="FSharp.Core">`
`38`	`38`	`<Name>FSharp.Core</Name>`
`39`	`39`	`<AssemblyName>FSharp.Core.dll</AssemblyName>`
`40`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
	`40`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
`41`	`41`	`</Reference>`
`42`	`42`	`</ItemGroup>`
`43`	`43`	`<ItemGroup>`

`‎tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net45/Sample_VS2013_FSharp_Portable_Library_Legacy_net45.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`<ReferenceInclude="FSharp.Core">`
`38`	`38`	`<Name>FSharp.Core</Name>`
`39`	`39`	`<AssemblyName>FSharp.Core.dll</AssemblyName>`
`40`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
	`40`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
`41`	`41`	`</Reference>`
`42`	`42`	`</ItemGroup>`
`43`	`43`	`<ItemGroup>`

`‎tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net451/Sample_VS2013_FSharp_Portable_Library_Legacy_net451.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`<ReferenceInclude="FSharp.Core">`
`38`	`38`	`<Name>FSharp.Core</Name>`
`39`	`39`	`<AssemblyName>FSharp.Core.dll</AssemblyName>`
`40`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
	`40`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>`
`41`	`41`	`</Reference>`
`42`	`42`	`</ItemGroup>`
`43`	`43`	`<ItemGroup>`

`‎tests/projects/Sample_VS2013_FSharp_Portable_Library_net45/Sample_VS2013_FSharp_Portable_Library_net45.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`<ReferenceInclude="FSharp.Core">`
`39`	`39`	`<Name>FSharp.Core</Name>`
`40`	`40`	`<AssemblyName>FSharp.Core.dll</AssemblyName>`
`41`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>`
	`41`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>`
`42`	`42`	`</Reference>`
`43`	`43`	`</ItemGroup>`
`44`	`44`	`<ItemGroup>`

`‎tests/projects/Sample_VS2013_FSharp_Portable_Library_net451/Sample_VS2013_FSharp_Portable_Library_net451.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`<ReferenceInclude="FSharp.Core">`
`39`	`39`	`<Name>FSharp.Core</Name>`
`40`	`40`	`<AssemblyName>FSharp.Core.dll</AssemblyName>`
`41`		`- <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>`
	`41`	`+ <HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>`
`42`	`42`	`</Reference>`
`43`	`43`	`</ItemGroup>`
`44`	`44`	`<ItemGroup>`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp