Skip to content

Commit 157ee52

Browse files
committed
Merge branch 'master' into robust-newton-raphson-root-on-the-bound
2 parents 20671a2 + 717a6a6 commit 157ee52

6 files changed

Lines changed: 11 additions & 6 deletions

File tree

src/FSharp.Tests/FSharp.Tests.fsproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<Compile Include="Main.fs" />
3535
</ItemGroup>
3636
<ItemGroup>
37+
<PackageReference Include="FSharp.Core" Version="6.0.6" />
38+
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
3739
<PackageReference Include="NUnit" Version="3.13.3" />
3840
<PackageReference Include="NUnitLite" Version="3.13.3" />
3941
<PackageReference Include="FsUnit" Version="5.0.5" />

src/FSharp/FSharp.fsproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
6868
<Compile Include="Quaternion.fs" />
6969
</ItemGroup>
7070
<ItemGroup>
71+
<PackageReference Include="FSharp.Core" Version="6.0.6" />
72+
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
7173
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
7274
<PrivateAssets>all</PrivateAssets>
7375
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Numerics.Tests/Numerics.Tests.CUDA.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<PackageReference Include="NUnit" Version="3.13.3" />
2828
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
2929
<PackageReference Include="NUnitLite" Version="3.13.3" />
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
31-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
31+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
3232
<PrivateAssets>all</PrivateAssets>
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
</PackageReference>

src/Numerics.Tests/Numerics.Tests.MKL.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<PackageReference Include="NUnit" Version="3.13.3" />
2828
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
2929
<PackageReference Include="NUnitLite" Version="3.13.3" />
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
31-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
31+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
3232
<PrivateAssets>all</PrivateAssets>
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
</PackageReference>

src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<PackageReference Include="NUnit" Version="3.13.3" />
2828
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
2929
<PackageReference Include="NUnitLite" Version="3.13.3" />
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
31-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
31+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
3232
<PrivateAssets>all</PrivateAssets>
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
</PackageReference>

src/Numerics/Numerics.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
5353
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5454
</PackageReference>
5555
<PackageReference Include="System.ValueTuple" Version="4.4.0" Condition="'$(TargetFramework)' == 'net461'" />
56+
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
5657
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
5758
<PrivateAssets>all</PrivateAssets>
5859
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)