Movatterモバイル変換

Skip to content

Pateldisolution/fsharp-1Public

forked fromfsharp/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commite7b51cf

KevinRansom

authored

Revert valuetuple for Product Build (#5190)

* Revert product to use System.ValueTuple 4.3.0* Revert "Update templates to FSharp.Core 4.5.0"This reverts commit4c9d706.* Revert "Update default fsharp.core to 4.5.0 and valuetuple to 4.4.0 for dotnet sdk apps (#5152)"This reverts commit13896d0.* Revert "Revert "Update default fsharp.core to 4.5.0 and valuetuple to 4.4.0 for dotnet sdk apps (#5152)""This reverts commit d1fcc8a8957f385ac7f0461e1bcf4643df769a52.* Revert "Revert "Update templates to FSharp.Core 4.5.0""This reverts commit 42bdccfdf3744170156fd9dfa7b7321e524468c4.* disable implicit references to valuetuple

1 parentc1e4e4b commite7b51cfCopy full SHA for e7b51cf

File tree

19 files changed

+19

-11

lines changed

packages.config
src/fsharp
- FSharp.Compiler.Private
- FSharp.Compiler.nuget
  - Microsoft.FSharp.Compiler.nuspec
  - Testing.FSharp.Compiler.nuspec
- Fsc-proto
  - Fsc-proto.fsproj
tests
- FSharp.Compiler.UnitTests
  - FSharp.Compiler.Unittests.fsproj
- FSharp.Core.UnitTests
  - FSharp.Core.Unittests.fsproj
  - FSharp.Core/SampleTuples
    - TupleSample.csproj
  - project.json
- fsharpqa/testenv/src/HostedCompilerServer
  - HostedCompilerServer.fsproj
vsintegration
- Utils/LanguageServiceProfiling
  - LanguageServiceProfiling.fsproj
- src
  - FSharp.Editor
    - FSharp.Editor.fsproj
  - FSharp.LanguageService
    - FSharp.LanguageService.fsproj
  - FSharp.ProjectSystem.FSharp
    - ProjectSystem.fsproj
  - FSharp.VS.FSI
    - FSharp.VS.FSI.fsproj
- tests
  - Salsa
    - VisualFSharp.Salsa.fsproj
  - UnitTests
    - VisualFSharp.UnitTests.fsproj

19 files changed

+19

-11

lines changed

`‎packages.config‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->`
`18`	`18`	`<packageid="System.Collections.Immutable"version="1.5.0" />`
`19`	`19`	`<packageid="System.Reflection.Metadata"version="1.6.0" />`
	`20`	`+ <packageid="System.ValueTuple"version="4.3.0" />`
`20`	`21`	`<packageid="System.ValueTuple"version="4.4.0" />`
`21`	`22`	`<packageid="FSharp.Core"version="4.5.0"/>`
`22`	`23`	`<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />`

`‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@`
`681`	`681`	`<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath>`
`682`	`682`	`</Reference>`
`683`	`683`	`<ReferenceInclude="System.ValueTuple">`
`684`		`- <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
	`684`	`+ <HintPath>..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
`685`	`685`	`<Private>true</Private>`
`686`	`686`	`</Reference>`
`687`	`687`	`</ItemGroup>`

`‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.netcore.nuspec‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`<dependencyid="System.Threading.Tasks.Parallel"version="4.0.1" />`
`32`	`32`	`<dependencyid="System.Threading.Thread"version="4.0.0" />`
`33`	`33`	`<dependencyid="System.Threading.ThreadPool"version="4.0.10" />`
`34`		`- <dependencyid="System.ValueTuple"version="4.4.0" />`
	`34`	`+ <dependencyid="System.ValueTuple"version="4.3.0" />`
`35`	`35`	`</group>`
`36`	`36`	`</dependencies>`
`37`	`37`	`</metadata>`

`‎src/fsharp/FSharp.Compiler.Private/project.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"System.Threading.Tasks.Parallel":"4.3.0",`
`18`	`18`	`"System.Threading.Thread":"4.3.0",`
`19`	`19`	`"System.Threading.ThreadPool":"4.3.0",`
`20`		`-"System.ValueTuple":"4.4.0"`
	`20`	`+"System.ValueTuple":"4.3.0"`
`21`	`21`	`},`
`22`	`22`	`"runtimes": {`
`23`	`23`	`"win7-x86": { },`

`‎src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`<dependencyid="System.Threading.Tasks.Parallel"version="4.0.1" />`
`34`	`34`	`<dependencyid="System.Threading.Thread"version="4.0.0" />`
`35`	`35`	`<dependencyid="System.Threading.ThreadPool"version="4.0.10" />`
`36`		`- <dependencyid="System.ValueTuple"version="4.4.0" />`
	`36`	`+ <dependencyid="System.ValueTuple"version="4.3.0" />`
`37`	`37`	`</group>`
`38`	`38`	`</dependencies>`
`39`	`39`	`<contentFiles>`

`‎src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`<dependencyid="System.Threading.Tasks.Parallel"version="4.0.1" />`
`32`	`32`	`<dependencyid="System.Threading.Thread"version="4.0.0" />`
`33`	`33`	`<dependencyid="System.Threading.ThreadPool"version="4.0.10" />`
`34`		`- <dependencyid="System.ValueTuple"version="4.4.0" />`
	`34`	`+ <dependencyid="System.ValueTuple"version="4.3.0" />`
`35`	`35`	`</group>`
`36`	`36`	`</dependencies>`
`37`	`37`	`</metadata>`

`‎src/fsharp/Fsc-proto/Fsc-proto.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@`
`467`	`467`	`<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath>`
`468`	`468`	`</Reference>`
`469`	`469`	`<ReferenceInclude="System.ValueTuple">`
`470`		`- <HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
	`470`	`+ <HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
`471`	`471`	`</Reference>`
`472`	`472`	`<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">`
`473`	`473`	`<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>`

`‎tests/FSharp.Compiler.UnitTests/FSharp.Compiler.Unittests.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`<ReferenceInclude="System.Numerics"Condition="'$(TargetDotnetProfile)' == 'net40'" />`
`45`	`45`	`<ReferenceInclude="System.Core" />`
`46`	`46`	`<ReferenceInclude="System.ValueTuple">`
`47`		`- <HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
	`47`	`+ <HintPath>..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>`
`48`	`48`	`</Reference>`
`49`	`49`	`</ItemGroup>`
`50`	`50`	`<ItemGroup>`

`‎tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`<HintPathCondition="'$(TargetDotnetProfile)' == 'net40'">$(FsCheckLibDir)\net452\FsCheck.dll</HintPath>`
`53`	`53`	`</Reference>`
`54`	`54`	`<ReferenceInclude="System.ValueTuple">`
`55`		`- <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>`
	`55`	`+ <HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>`
`56`	`56`	`<Private>True</Private>`
`57`	`57`	`</Reference>`
`58`	`58`	`</ItemGroup>`

`‎tests/FSharp.Core.UnitTests/FSharp.Core/SampleTuples/TupleSample.csproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`</PropertyGroup>`
`26`	`26`	`<ItemGroup>`
`27`	`27`	`<ReferenceInclude="System.ValueTuple">`
`28`		`- <HintPath>..\..\..\..\..\packages\System.ValueTuple.4.4.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>`
	`28`	`+ <HintPath>..\..\..\..\..\packages\System.ValueTuple.4.3.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>`
`29`	`29`	`</Reference>`
`30`	`30`	`</ItemGroup>`
`31`	`31`	`<ItemGroup>`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp