Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes update devexpress and othe rupdates #1389

Merged
merged 5 commits into from
Nov 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/OSPSuite.Infrastructure.Autofac/AutofacContainer.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Autofac;
using OSPSuite.Core;
Expand Down Expand Up @@ -126,6 +127,9 @@ public void RegisterOpenGeneric(Type serviceType, Type concreteType)

private void register(IReadOnlyCollection<Type> serviceTypes, Type concreteType, LifeStyle lifeStyle, string key = null)
{
if (concreteType.IsGenericTypeDefinition)
return;

var builder = AutofacBuilder
.RegisterType(concreteType)
.As(serviceTypes.ToArray())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@


<ItemGroup>
<PackageReference Include="Autofac" Version="4.9.4" />
<PackageReference Include="Autofac" Version="5.2.0" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


<ItemGroup>
<PackageReference Include="Castle.Windsor" Version="5.0.1" />
<PackageReference Include="Castle.Windsor" Version="5.1.1" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NPOI" Version="2.5.4" />
<PackageReference Include="NPOI" Version="2.5.5" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ private IEnumerable<ParsedDataSet> buildDataSets(IUnformattedData data, IEnumera
/// the second parameter is constraint to have its value equal to its ExistingValue on index 2, and
/// the third parameter is constraint to have its value equal to its ExistingValue on index 1</param>
/// <param name="dataSets">List to store the dataSets</param>
/// <param name="columnInfos">List of column infos</param>
private void buildDataSetsRecursively(IUnformattedData data, IEnumerable<(string ColumnName, IList<string> ExistingValues)> parameters, Stack<int> indexes, List<ParsedDataSet> dataSets, IReadOnlyList<ColumnInfo> columnInfos)
{
var valueTuples = parameters.ToList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public static class ImporterDataTableExtensions
/// Adds a list of values as a row to a DataTable
/// </summary>
/// <param name="rowValues">The values to be added to the DataTable</param>
/// <param name="dataTable">DataTable to add values to</param>
public static void AddRowToDataTable(this DataTable dataTable, IReadOnlyList<string> rowValues)
{
var dataRow = dataTable.NewRow();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NPOI" Version="2.5.4" />
<PackageReference Include="NPOI" Version="2.5.5" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="LumenWorksCsvReader" Version="4.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="1.60.6" />
<PackageReference Include="NHibernate" Version="5.2.5" />
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="NHibernate" Version="5.3.10" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="SharpZipLib" Version="1.3.1" />
<PackageReference Include="SharpZipLib" Version="1.3.3" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/OSPSuite.Presentation/OSPSuite.Presentation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DevExpress.Data" Version="20.1.6" />
<PackageReference Include="DevExpress.Data" Version="21.2.3" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.UI/OSPSuite.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@

<ItemGroup>
<PackageReference Include="Northwoods.GoWin" Version="5.2.0" />
<PackageReference Include="OSPSuite.DataBinding.DevExpress" Version="5.0.0.1" />
<PackageReference Include="OSPSuite.DevExpress" Version="20.1.6" />
<PackageReference Include="OSPSuite.DataBinding.DevExpress" Version="6.0.0.1" />
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
</ItemGroup>
Expand Down
17 changes: 0 additions & 17 deletions src/OSPSuite.UI/Properties/licenses.licx

This file was deleted.

7 changes: 0 additions & 7 deletions src/OSPSuite.UI/Properties/licenses.licx.bak

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" GeneratePathProperty="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ public SimModelManagerForSpecs(ISimModelExporter simModelExporter, ISimModelSimu

public Simulation CreateSimulation(IModelCoreSimulation modelCoreSimulation)
{
return base.CreateSimulation(_simModelExporter.ExportSimModelXml(modelCoreSimulation, SimModelExportMode.Optimized));
return CreateSimulation(_simModelExporter.ExportSimModelXml(modelCoreSimulation, SimModelExportMode.Optimized));
}

public IReadOnlyList<ParameterProperties> SetVariableParameters(Simulation simulation, IReadOnlyList<string> variablePaths)
{
return base.SetVariableParameters(simulation, variablePaths, calculateSensitivities: false);
return SetVariableParameters(simulation, variablePaths, calculateSensitivities: false);
}

public new IReadOnlyList<SpeciesProperties> SetVariableSpecies(Simulation simulation, IReadOnlyList<string> variablePaths)
public IReadOnlyList<SpeciesProperties> SetVariableSpecies(Simulation simulation, IReadOnlyList<string> variablePaths)
{
return base.SetVariableMolecules(simulation, variablePaths);
return SetVariableMolecules(simulation, variablePaths);
}
}
}
3 changes: 2 additions & 1 deletion tests/OSPSuite.Core.IntegrationTests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.12.0.0" newVersion="3.12.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.13.2.0" newVersion="3.13.2.0" />
</dependentAssembly>

</assemblyBinding>
</runtime>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public abstract class concern_for_CloneManagerForModel : ContextSpecification<IC
protected override void Context()
{
_dimensionRepository = A.Fake<IDimensionFactory>();
A.CallTo(() => _dimensionRepository.NoDimension).Returns(new Dimension());
A.CallTo(() => _dimensionRepository.NoDimension).Returns(Constants.Dimension.NO_DIMENSION);
_objectBaseFactory = new ObjectBaseFactoryForSpecs(_dimensionRepository);
_objectToClone = createEntityToClone();
_dataRepositoryTask = A.Fake<IDataRepositoryTask>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using OSPSuite.Core.Domain.Formulas;
using OSPSuite.Core.Domain.Services;
using OSPSuite.Core.Domain.UnitSystem;
using OSPSuite.Helpers;

namespace OSPSuite.Core.Domain
{
Expand All @@ -18,7 +19,7 @@ protected override void Context()
_objectBaseFactory = A.Fake<IObjectBaseFactory>();
_dimensionFactory = A.Fake<IDimensionFactory>();
A.CallTo(() => _objectBaseFactory.Create<IParameter>()).ReturnsLazily(x=>new Parameter());
A.CallTo(() => _dimensionFactory.Dimension(A<string>._)).Returns(new Dimension());
A.CallTo(() => _dimensionFactory.Dimension(A<string>._)).Returns(DomainHelperForSpecs.ConcentrationDimensionForSpecs());
_containerTask = A.Fake<IContainerTask>();
sut = new OutputIntervalFactory(_objectBaseFactory, _dimensionFactory, _containerTask);
}
Expand Down
5 changes: 3 additions & 2 deletions tests/OSPSuite.Core.Tests/Domain/TransportBuilderSpecs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
using OSPSuite.Core.Domain.Formulas;
using OSPSuite.Core.Domain.Services;
using OSPSuite.Core.Domain.UnitSystem;
using OSPSuite.Core.Extensions;
using OSPSuite.Helpers;
using OSPSuite.Utility.Exceptions;

namespace OSPSuite.Core.Domain
Expand All @@ -16,8 +18,7 @@ public abstract class concern_for_TransportBuilder : ContextSpecification<ITrans

protected override void Context()
{
var dim = new Dimension();
dim.AddUnit("mg", 1, 0);
var dim = DomainHelperForSpecs.ConcentrationDimensionForSpecs();

sut = new TransportBuilder()
.WithName("T1")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ protected Task<int> CreateTaskWithReturnValueThrowingException()
if (true)
throw new OSPSuiteException("ERROR");

#pragma warning disable 162
return 5;
#pragma warning restore 162
});
}

Expand Down
9 changes: 2 additions & 7 deletions tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion tests/OSPSuite.Core.Tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.12.0.0" newVersion="3.12.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.13.2.0" newVersion="3.13.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="FakeItEasy" Version="7.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ protected override void Context()

public class When_validating_empty_data_source : concern_for_DataSource
{
protected IReadOnlyList<ColumnInfo> _columnInfos;
protected IDimensionFactory _dimensionFactory;

protected override void Context()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="1.60.6" />
<PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/OSPSuite.Infrastructure.Tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.12.0.0" newVersion="3.12.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.13.2.0" newVersion="3.13.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" GeneratePathProperty="true" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/OSPSuite.Presentation.Tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.12.0.0" newVersion="3.12.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.13.2.0" newVersion="3.13.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
8 changes: 4 additions & 4 deletions tests/OSPSuite.R.Tests/OSPSuite.R.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PackageReference Include="FakeItEasy" Version="7.2.0" />
<PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion tests/OSPSuite.R.Tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.12.0.0" newVersion="3.12.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.13.2.0" newVersion="3.13.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
2 changes: 1 addition & 1 deletion tests/OSPSuite.Starter/OSPSuite.Starter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.DevExpress" Version="20.1.6" />
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
Expand Down
Loading