Skip to content

Commit 5fa336c

Browse files
PMeiraPMeira
committed
Extensive updates to support multiple DSS instances, GR, and exceptions.
- Use the new DSS Context API, available in the upcoming DSS C-API 0.12. - Fix license (no direct use of EPRI code here); OpenDSS license is of course still included through DSS C-API, so it's present in the final package. - Allow using .NET std 2.1 (`#if NETSTANDARD2_1_OR_GREATER`) to use UTF8 conversion strings; default build is still .NET 4.5 -- users should restrict inputs to ASCII on that. - Implement GR usage (less memory allocations). See https://github.com/dss-extensions/dss_capi/blob/ccefd69b06dfe09af5daa2d31da7967f14275511/docs/usage.md#global-result-gr-new-in-v0100 - Introduce `#if NETSTANDARD2_1_OR_GREATER` for UTF8 support - Update project file
1 parent 34cca84 commit 5fa336c

File tree

8 files changed

+24440
-7944
lines changed

8 files changed

+24440
-7944
lines changed

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Copyright (c) 2008-2018, Electric Power Research Institute, Inc.
2-
Copyright (c) 2017-2018, Paulo Meira
1+
Copyright (c) 2016-2022 Paulo Meira
2+
Copyright (c) 2018-2022 DSS Extensions contributors
33
All rights reserved.
44

55
Redistribution and use in source and binary forms, with or without

‎OPENDSS_LICENSE‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
* Copyright (c) 2008-2021, Electric Power Research Institute, Inc.
2+
* All rights reserved.
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions are met:
6+
* * Redistributions of source code must retain the above copyright
7+
* notice, this list of conditions and the following disclaimer.
8+
* * Redistributions in binary form must reproduce the above copyright
9+
* notice, this list of conditions and the following disclaimer in the
10+
* documentation and/or other materials provided with the distribution.
11+
* * Neither the name of the Electric Power Research Institute, Inc., nor
12+
* the names of its contributors may be used to endorse or promote
13+
* products derived from this software without specific prior written
14+
* permission.
15+
*
16+
* THIS SOFTWARE IS PROVIDED BY Electric Power Research Institute, Inc., "AS IS"
17+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19+
* DISCLAIMED. IN NO EVENT SHALL Electric Power Research Institute, Inc., BE
20+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
* POSSIBILITY OF SUCH DAMAGE.
27+

‎dss_sharp.csproj‎

Lines changed: 12 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
7-
<ProjectGuid>{398768E0-151E-4974-8A2A-2DD2724F6426}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>dss_sharp</RootNamespace>
11-
<AssemblyName>dss_sharp</AssemblyName>
12-
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
<PlatformTarget>x64</PlatformTarget>
33-
<DocumentationFile>bin\Release\dss_sharp.xml</DocumentationFile>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="System.Data" />
38-
</ItemGroup>
39-
<ItemGroup>
40-
<Compile Include="src\dss_sharp.cs" />
41-
<Compile Include="src\Properties\AssemblyInfo.cs" />
42-
</ItemGroup>
43-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
44-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net45</TargetFramework>
5+
<Nullable>disable</Nullable>
6+
<ProjectGuid>{398768E0-151E-4974-8A2A-2DD2724F6426}</ProjectGuid>
7+
<DocumentationFile>dss_sharp.xml</DocumentationFile>
8+
<NoWarn>1591</NoWarn>
9+
<PlatformTarget>x64</PlatformTarget>
10+
</PropertyGroup>
11+
12+
</Project>

‎dss_sharp.sln‎

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

‎src/Properties/AssemblyInfo.cs‎

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

0 commit comments

Comments
 (0)