Skip to content

Commit 84e05dd

Browse files
Merge pull request #154 from SpiceSharp/development
Use latest packages
2 parents 265d834 + b7dc4b4 commit 84e05dd

11 files changed

Lines changed: 13 additions & 90 deletions

File tree

src/SpiceSharpParser.CodeAnalysis/SpiceSharpParser.CodeAnalysis.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
25-
<PackageReference Include="SpiceSharp" Version="3.1.3" />
26-
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.0" />
24+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
25+
<PackageReference Include="SpiceSharp" Version="3.1.5" />
26+
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.1" />
2727
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

src/SpiceSharpParser.IntegrationTests/SpiceSharpParser.IntegrationTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
2424
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
25-
<PackageReference Include="SpiceSharp" Version="3.1.3" />
26-
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.0" />
25+
<PackageReference Include="SpiceSharp" Version="3.1.5" />
26+
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.1" />
2727
<PackageReference Include="xunit" Version="2.4.1" />
2828
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2929
<PrivateAssets>all</PrivateAssets>

src/SpiceSharpParser.PerformanceTests/SpiceSharpParser.PerformanceTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
12-
<PackageReference Include="SpiceSharp" Version="3.1.3" />
12+
<PackageReference Include="SpiceSharp" Version="3.1.5" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/SpiceSharpParser.Tests/SpiceSharpParser.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
</PackageReference>
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
2222
<PackageReference Include="NSubstitute" Version="4.2.2" />
23-
<PackageReference Include="SpiceSharp" Version="3.1.3" />
24-
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.0" />
23+
<PackageReference Include="SpiceSharp" Version="3.1.5" />
24+
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.1" />
2525
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/ExpressionResolver.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ public Dictionary<string, ResolverFunction> CreateFunctions()
138138

139139
result["poly"] = new PolyResolverFunction();
140140
result["if"] = new IfResolverFunction();
141-
result["max"] = new MaxResolverFunction();
142-
result["min"] = new MinResolverFunction();
143141
result["random"] = new RandomResolverFunction(Context);
144142
result["gauss"] = new GaussResolverFunction(Context);
145143

src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/Functions/Random/LimitFunction.cs

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

src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/Functions/RandomFunctions.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,6 @@ public static IFunction<double, double> CreateFlat()
5959
return new FlatFunction();
6060
}
6161

62-
/// <summary>
63-
/// Get a limit() function.
64-
/// </summary>
65-
/// <returns>
66-
/// A new instance of limit function.
67-
/// </returns>
68-
public static IFunction<double, double> CreateLimit()
69-
{
70-
return new LimitFunction();
71-
}
72-
7362
/// <summary>
7463
/// Get a unif() function.
7564
/// </summary>

src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/ResolverFunctions/MaxResolverFunction.cs

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

src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/ResolverFunctions/MinResolverFunction.cs

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

src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/SpiceEvaluationContext.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ private void CreateSpiceFunctions()
4848
MathFunctions.CreateInt(),
4949
MathFunctions.CreateInv(),
5050
MathFunctions.CreateLimit(),
51-
RandomFunctions.CreateLimit(),
5251
RandomFunctions.CreateMc(),
5352
MathFunctions.CreateNint(),
5453
RandomFunctions.CreateRandom(),

0 commit comments

Comments
 (0)