Skip to content

Commit 8703f60

Browse files
1eyewonder1eyewonder
committed
Update FSharp.Core
1 parent d78bafe commit 8703f60

File tree

11 files changed

+93
-265
lines changed

11 files changed

+93
-265
lines changed

‎integrationtests/Paket.IntegrationTests/App.config‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
<configuration>
33
<runtime>
44
<AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
5+
56

67
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
7-
<dependentAssembly>
8-
<Paket>True</Paket>
9-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
11-
</dependentAssembly>
128
<dependentAssembly>
139
<Paket>True</Paket>
1410
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎integrationtests/Paket.IntegrationTests/FsiExtension.fs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
module FsiExtension =
33
open System
44
open System.IO
5-
open FSharp.Compiler.SourceCodeServices
5+
open FSharp.Compiler.CodeAnalysis
66
open FSharp.Compiler.Text
77
open NUnit.Framework
88

@@ -41,7 +41,6 @@ module FsiExtension =
4141
match answer with
4242
| FSharpCheckFileAnswer.Succeeded(result) ->
4343
Assert.IsTrue result.HasFullTypeCheckInfo
44-
Assert.IsTrue (Array.isEmpty result.Errors)
4544
Assert.AreEqual("v", result.PartialAssemblySignature.Entities.[0].MembersFunctionsAndValues.[0].DisplayName)
4645
Assert.AreEqual("FSharp.Data", result.PartialAssemblySignature.Entities.[0].MembersFunctionsAndValues.[0].FullType.TypeDefinition.AccessPath)
4746
Assert.AreEqual("JsonValue", result.PartialAssemblySignature.Entities.[0].MembersFunctionsAndValues.[0].FullType.TypeDefinition.DisplayName)

‎integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<Compile Include="UpdatePackageSpecs.fs" />
2121
<Compile Include="UpdateGroupsSpecs.fs" />
2222
<Compile Include="AddSpecs.fs" />
23-
<Compile Include="OutdatedSpecs.fs" />
2423
<Compile Include="PackSpecs.fs" />
2524
<Compile Include="InstallSpecs.fs" />
2625
<Compile Include="RestoreSpecs.fs" />

‎paket.dependencies‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ content: none
55

66
nuget Newtonsoft.Json >= 10.0.3 redirects: force
77
nuget Argu >= 5.1.0
8-
nuget FSharp.Core >= 6.0.3 redirects: force
8+
nuget FSharp.Core >= 6.0.3
99
nuget Chessie >= 0.6
1010
nuget Mono.Cecil ~> 0.11.1
1111

1212
nuget System.Security.Cryptography.ProtectedData >= 4.4
1313

1414
nuget NETStandard.Library ~> 2.0
15-
nuget Microsoft.NETCore.App ~> 2.1
1615
nuget System.Net.Http.WinHttpHandler >= 4.5
1716
nuget Nuget.Packaging
1817
nuget Microsoft.Win32.Registry
@@ -57,7 +56,3 @@ group Build
5756

5857
# add icon to exe
5958
github enricosada/add_icon_to_exe:e11eda501acea369ac2950beb34b8888495bf21f rh/ResourceHacker.exe
60-
61-
group FSharpDepManagerExtension
62-
source https://api.nuget.org/v3/index.json
63-
nuget FSharp.Core = 5.0.0 redirects: force

‎paket.lock‎

Lines changed: 75 additions & 222 deletions
Large diffs are not rendered by default.

‎src/FSharp.DependencyManager.Paket/paket.references‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
DotNet.ReproducibleBuilds
2-
3-
group FSharpDepManagerExtension
4-
52
FSharp.Core

‎src/Paket.Core/app.config‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3+
34
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4-
<dependentAssembly>
5-
<Paket>True</Paket>
6-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
8-
</dependentAssembly>
95
<dependentAssembly>
106
<Paket>True</Paket>
117
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Paket/App.config‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
3+
44
<startup>
55
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
66
</startup>
7+
78
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<dependentAssembly>
9-
<Paket>True</Paket>
10-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
12-
</dependentAssembly>
139
<dependentAssembly>
1410
<Paket>True</Paket>
1511
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎src/Paket/Paket.fsproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
34
<OutputType>Exe</OutputType>
45
<TargetFrameworks>net461;net8</TargetFrameworks>
56
<PackageId>Paket</PackageId>
67
<AssemblyName>paket</AssemblyName>
78
<IsPackable>true</IsPackable>
9+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
810
</PropertyGroup>
911
<PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
1012
<TargetFramework>net8</TargetFramework>
1113
</PropertyGroup>
1214
<ItemGroup>
13-
<None Include="../../README.md" Pack="true" PackagePath="\"/>
14-
<None Include="../../docs/files/img/logo.png" Pack="true" PackagePath="\"/>
15+
<None Include="../../README.md" Pack="true" PackagePath="\" />
16+
<None Include="../../docs/files/img/logo.png" Pack="true" PackagePath="\" />
1517
<Compile Include="Commands.fs" />
1618
<Compile Include="Program.fs" />
1719
<Content Include="App.config" Condition=" '$(TargetFramework)' == 'net461' " />
@@ -29,4 +31,4 @@
2931
<ProjectReference Include="..\Paket.Core\Paket.Core.fsproj" />
3032
</ItemGroup>
3133
<Import Project="..\..\.paket\Paket.Restore.targets" />
32-
</Project>
34+
</Project>

‎tests/Paket.Bootstrapper.Tests/app.config‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4-
<dependentAssembly>
5-
<Paket>True</Paket>
6-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="5.0.0.0" />
8-
</dependentAssembly>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5+
</startup>
6+
7+
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
98
<dependentAssembly>
109
<Paket>True</Paket>
1110
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

0 commit comments

Comments
 (0)