Skip to content

Commit

Permalink
Merge pull request #154 from SpiceSharp/development
Browse files Browse the repository at this point in the history 
Use latest packages
  • Loading branch information
@marcin-golebiowski
marcin-golebiowski authored Jul 6, 2021
2 parents 265d834 + b7dc4b4 commit 84e05dd
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 90 deletions.
6 changes: 3 additions & 3 deletions src/SpiceSharpParser.CodeAnalysis/SpiceSharpParser.CodeAnalysis.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
<PackageReference Include="SpiceSharp" Version="3.1.3" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
<PackageReference Include="SpiceSharp" Version="3.1.5" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
6 changes: 3 additions & 3 deletions src/SpiceSharpParser.IntegrationTests/SpiceSharpParser.IntegrationTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="SpiceSharp" Version="3.1.3" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.0" />
<PackageReference Include="SpiceSharp" Version="3.1.5" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion src/SpiceSharpParser.PerformanceTests/SpiceSharpParser.PerformanceTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="SpiceSharp" Version="3.1.3" />
<PackageReference Include="SpiceSharp" Version="3.1.5" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions src/SpiceSharpParser.Tests/SpiceSharpParser.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="SpiceSharp" Version="3.1.3" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.0" />
<PackageReference Include="SpiceSharp" Version="3.1.5" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
2 changes: 0 additions & 2 deletions src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/ExpressionResolver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ public Dictionary<string, ResolverFunction> CreateFunctions()

result["poly"] = new PolyResolverFunction();
result["if"] = new IfResolverFunction();
result["max"] = new MaxResolverFunction();
result["min"] = new MinResolverFunction();
result["random"] = new RandomResolverFunction(Context);
result["gauss"] = new GaussResolverFunction(Context);

Expand Down
29 changes: 0 additions & 29 deletions src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/Functions/Random/LimitFunction.cs
View file

This file was deleted.

11 changes: 0 additions & 11 deletions src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/Functions/RandomFunctions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,6 @@ public static IFunction<double, double> CreateFlat()
return new FlatFunction();
}

/// <summary>
/// Get a limit() function.
/// </summary>
/// <returns>
/// A new instance of limit function.
/// </returns>
public static IFunction<double, double> CreateLimit()
{
return new LimitFunction();
}

/// <summary>
/// Get a unif() function.
/// </summary>
Expand Down
17 changes: 0 additions & 17 deletions ...harpParser/ModelReaders/Netlist/Spice/Evaluation/ResolverFunctions/MaxResolverFunction.cs
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...harpParser/ModelReaders/Netlist/Spice/Evaluation/ResolverFunctions/MinResolverFunction.cs
View file

This file was deleted.

1 change: 0 additions & 1 deletion src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/SpiceEvaluationContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ private void CreateSpiceFunctions()
MathFunctions.CreateInt(),
MathFunctions.CreateInv(),
MathFunctions.CreateLimit(),
RandomFunctions.CreateLimit(),
RandomFunctions.CreateMc(),
MathFunctions.CreateNint(),
RandomFunctions.CreateRandom(),
Expand Down
8 changes: 4 additions & 4 deletions src/SpiceSharpParser/SpiceSharpParser.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<StartupObject />
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<LangVersion>latest</LangVersion>
<Version>3.1.0</Version>
<Version>3.1.1</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.5|AnyCPU'">
Expand All @@ -35,9 +35,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
<PackageReference Include="SpiceSharp" Version="3.1.3" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
<PackageReference Include="SpiceSharp" Version="3.1.5" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.1.1" />
<PackageReference Include="SpiceSharpGenerator" Version="1.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit 84e05dd

Please sign in to comment.