Skip to content

Commit c6b355b

Browse files
committed
Merge
2 parents 5267a1b + c2ff383 commit c6b355b

File tree

9 files changed

+31
-38
lines changed

9 files changed

+31
-38
lines changed

.config/dotnet-tools.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "9.0.0",
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
99
]
10+
},
11+
"fantomas": {
12+
"version": "6.2.3",
13+
"commands": [
14+
"fantomas"
15+
]
1016
}
1117
}
1218
}

RELEASE_NOTES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
### 0.12.3-beta
2+
* Removed erroneous `Dotnet.Reproduciblebuilds` dependency [#75](https://github.com/fsprojects/FSharp.AWS.DynamoDB/pull/75)
13
### 0.12.2-beta
24
* (breaking) Revised multi-table transaction API (thanks @bartelink)
35

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "9.0.101",
44
"rollForward": "latestMajor"
55
}
66
}

paket.dependencies

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@ source https://api.nuget.org/v3/index.json
33
storage: none
44
framework: net90, netstandard20, netstandard21
55

6+
# copy_local: true because this is a build-time dependency only
7+
nuget Dotnet.ReproducibleBuilds copy_local: true
8+
69
nuget Unquote ~> 6.1.0
7-
nuget FSharp.Core >= 4.7.2 lowest_matching: true
10+
11+
# NOTE re `content: false`
12+
# Workaround for malformed FSharp.Core packages https://github.com/dotnet/fsharp/issues/12706 via https://github.com/fsprojects/Paket/issues/4149
13+
# Removal triggers issues in dotnet publish, e.g. for Lambda projects
14+
# Also avoids Rider search finding stuff in FSharp.Core.xml
15+
nuget FSharp.Core >= 4.7.2 content: false, lowest_matching: true
816

917
nuget AWSSDK.DynamoDBv2 ~> 3.7.5
10-
nuget DotNet.ReproducibleBuilds
1118
nuget System.Diagnostics.DiagnosticSource >= 6.0.0
1219
github eiriktsarpalis/TypeShape:10.0.0 src/TypeShape/TypeShape.fs
1320

paket.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ STORAGE: NONE
22
RESTRICTION: || (== net9.0) (== netstandard2.0) (== netstandard2.1)
33
NUGET
44
remote: https://api.nuget.org/v3/index.json
5-
AWSSDK.Core (3.7.400.57)
5+
AWSSDK.Core (3.7.400.64)
66
Microsoft.Bcl.AsyncInterfaces (>= 1.1) - restriction: || (&& (== net9.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
7-
AWSSDK.DynamoDBv2 (3.7.403.7)
8-
AWSSDK.Core (>= 3.7.400.57 < 4.0)
9-
DotNet.ReproducibleBuilds (1.2.25)
7+
AWSSDK.DynamoDBv2 (3.7.404.5)
8+
AWSSDK.Core (>= 3.7.400.64 < 4.0)
9+
DotNet.ReproducibleBuilds (1.2.25) - copy_local: true
1010
FSharp.Core (4.7.2)
1111
Microsoft.Bcl.AsyncInterfaces (9.0) - restriction: || (&& (== net9.0) (< netcoreapp3.1)) (== netstandard2.0) (== netstandard2.1)
1212
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netstandard2.1)) (== netstandard2.0) (&& (== netstandard2.1) (>= net462))
@@ -50,7 +50,7 @@ NUGET
5050
xunit.assert (>= 2.9.2)
5151
xunit.core (2.9.2)
5252
xunit.abstractions (2.0.3)
53-
xunit.analyzers (1.17)
53+
xunit.analyzers (1.18)
5454
xunit.assert (2.9.2)
5555
xunit.core (2.9.2)
5656
xunit.extensibility.core (2.9.2)
@@ -59,4 +59,4 @@ NUGET
5959
xunit.abstractions (>= 2.0.3)
6060
xunit.extensibility.execution (2.9.2)
6161
xunit.extensibility.core (2.9.2)
62-
xunit.runner.visualstudio (2.8.2)
62+
xunit.runner.visualstudio (3.0)

src/FSharp.AWS.DynamoDB/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
66
[<assembly: AssemblyTitleAttribute("FSharp.AWS.DynamoDB")>]
77
[<assembly: AssemblyProductAttribute("FSharp.AWS.DynamoDB")>]
88
[<assembly: AssemblyDescriptionAttribute("An F# wrapper over the standard Amazon.DynamoDB library")>]
9-
[<assembly: AssemblyVersionAttribute("0.12.2")>]
10-
[<assembly: AssemblyFileVersionAttribute("0.12.2")>]
9+
[<assembly: AssemblyVersionAttribute("0.12.3")>]
10+
[<assembly: AssemblyFileVersionAttribute("0.12.3")>]
1111
[<assembly: InternalsVisibleToAttribute("FSharp.AWS.DynamoDB.Tests")>]
1212
do ()
1313

1414
module internal AssemblyVersionInformation =
1515
let [<Literal>] AssemblyTitle = "FSharp.AWS.DynamoDB"
1616
let [<Literal>] AssemblyProduct = "FSharp.AWS.DynamoDB"
1717
let [<Literal>] AssemblyDescription = "An F# wrapper over the standard Amazon.DynamoDB library"
18-
let [<Literal>] AssemblyVersion = "0.12.2"
19-
let [<Literal>] AssemblyFileVersion = "0.12.2"
18+
let [<Literal>] AssemblyVersion = "0.12.3"
19+
let [<Literal>] AssemblyFileVersion = "0.12.3"
2020
let [<Literal>] InternalsVisibleTo = "FSharp.AWS.DynamoDB.Tests"

src/FSharp.AWS.DynamoDB/FSharp.AWS.DynamoDB.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<Compile Include="TableContext.fs" />
4040
<Compile Include="Extensions.fs" />
4141
<None Include="Script.fsx" />
42-
<None Include="paket.template" />
4342
</ItemGroup>
4443
<Import Project="..\..\.paket\Paket.Restore.targets" />
4544
</Project>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
Unquote
21
AWSSDK.DynamoDBv2
32
DotNet.ReproducibleBuilds
3+
FSharp.Core
4+
Unquote
45
System.Diagnostics.DiagnosticSource
56
File: TypeShape.fs TypeShape

src/FSharp.AWS.DynamoDB/paket.template

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)