Skip to content

Commit d1117d6

Browse files
authored
Merge pull request #14 from Rajivhost/feature/migrate-to-typeshape-8
Update to TypeShape 8.0.
2 parents aeb7d89 + 795fe1c commit d1117d6

File tree

6 files changed

+73
-111
lines changed

6 files changed

+73
-111
lines changed

.paket/Paket.Restore.targets

Lines changed: 64 additions & 103 deletions
Large diffs are not rendered by default.

paket.dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ framework: netstandard2.0, netcoreapp2.0
33
redirects: force
44

55
nuget FSharp.Core >= 4.2.3
6-
nuget TypeShape >= 7.0.0 < 8.0
6+
nuget TypeShape >= 8.0.0
77
nuget Microsoft.Extensions.Configuration
88

99
group Build

paket.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ REDIRECTS: FORCE
22
RESTRICTION: || (== netcoreapp2.0) (== netstandard2.0)
33
NUGET
44
remote: https://www.nuget.org/api/v2
5-
FSharp.Core (4.6.2)
5+
FSharp.Core (4.7)
66
Microsoft.Extensions.Configuration (2.1.1)
77
Microsoft.Extensions.Configuration.Abstractions (>= 2.1.1)
88
Microsoft.Extensions.Configuration.Abstractions (2.1.1)
@@ -55,7 +55,7 @@ NUGET
5555
Microsoft.NETCore.Platforms (>= 1.1)
5656
Microsoft.NETCore.Targets (>= 1.1)
5757
System.Runtime (>= 4.3)
58-
TypeShape (7.0)
58+
TypeShape (8.0.1)
5959
FSharp.Core (>= 4.3.4)
6060
System.Reflection.Emit.Lightweight (>= 4.3)
6161

src/FsConfig/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependentAssembly>
1616
<Paket>True</Paket>
1717
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.6.0.0" />
18+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.7.0.0" />
1919
</dependentAssembly>
2020
<dependentAssembly>
2121
<Paket>True</Paket>

tests/FsConfig.Tests/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<dependentAssembly>
66
<Paket>True</Paket>
77
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.6.0.0" />
8+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.7.0.0" />
99
</dependentAssembly>
1010
<dependentAssembly>
1111
<Paket>True</Paket>

tests/FsConfig.Tests/FsConfig.Tests.fsproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<Compile Include="Common.fs" />
1010
<Compile Include="EnvConfig.fs" />
1111
<Compile Include="AppConfig.fs" />
12+
<None Include="App.config" />
1213
<None Include="paket.references" />
13-
<Content Include="settings.json" CopyToOutputDirectory="PreserveNewest"/>
14-
<Content Include="settings.xml" CopyToOutputDirectory="PreserveNewest"/>
15-
<Content Include="settings.ini" CopyToOutputDirectory="PreserveNewest"/>
14+
<Content Include="settings.json" CopyToOutputDirectory="PreserveNewest" />
15+
<Content Include="settings.xml" CopyToOutputDirectory="PreserveNewest" />
16+
<Content Include="settings.ini" CopyToOutputDirectory="PreserveNewest" />
1617
</ItemGroup>
1718
<ItemGroup>
1819
<ProjectReference Include="..\..\src\FsConfig\FsConfig.fsproj" />

0 commit comments

Comments
 (0)