Skip to content

Commit 01110d6

Browse files
svenboulangersvenboulanger
authored
Merge pull request #2 from SpiceSharp/development
Update project structure
2 parents 01682a2 + d91a3b9 commit 01110d6

File tree

8 files changed

+105
-232
lines changed

8 files changed

+105
-232
lines changed

‎.github/workflows/publish-nuget.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Restore dependencies
2121
run: dotnet restore
2222

23-
- name: Compile Spice#
23+
- name: Compile Spice#.BSIM
2424
run: dotnet build SpiceSharpBSIM\SpiceSharpBSIM.csproj --configuration Release --no-restore
2525

2626
- name: Publish to NuGet

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*.userprefs
1212

1313
# Build results
14+
[Bb]uild/
1415
[Dd]ebug/
1516
[Dd]ebugPublic/
1617
[Rr]elease/

‎Directory.Build.props

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<!-- Directories -->
4+
<PropertyGroup>
5+
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
6+
<BuildDir>$(RepoRoot)build\</BuildDir>
7+
<DocPath>$(BuildDir)doc\</DocPath>
8+
</PropertyGroup>
9+
10+
<!-- Build info -->
11+
<PropertyGroup>
12+
<TargetFramework>netstandard2.0</TargetFramework>
13+
<NeutralLanguage>en</NeutralLanguage>
14+
<DebugType>full</DebugType>
15+
<DebugSymbols>true</DebugSymbols>
16+
<LangVersion>latest</LangVersion>
17+
<OutputPath>$(BuildDir)bin\$(MSBuildProjectName)\</OutputPath>
18+
<BaseIntermediateOutputPath>$(BuildDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
19+
<DocumentationFile>$(DocPath)$(MSBuildProjectName).xml</DocumentationFile>
20+
</PropertyGroup>
21+
22+
<!-- Assembly info -->
23+
<PropertyGroup>
24+
<Authors>Sven Boulanger</Authors>
25+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
26+
<Title>Spice#.BSIM</Title>
27+
<Company>SpiceSharp</Company>
28+
</PropertyGroup>
29+
30+
<!-- NuGet package info -->
31+
<PropertyGroup>
32+
<PackageProjectUrl>https://github.com/SpiceSharp/SpiceSharpBSIM</PackageProjectUrl>
33+
<RepositoryUrl>https://github.com/SpiceSharp/SpiceSharpBSIM</RepositoryUrl>
34+
<PackageTags>circuit electronics netlist spice simulator simulation ode solver design bsim</PackageTags>
35+
<PackageReleaseNotes>Refer to the GitHub release for release notes.</PackageReleaseNotes>
36+
<PackageIcon>logo_full.png</PackageIcon>
37+
<PackageReadmeFile>README.md</PackageReadmeFile>
38+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
39+
<RepositoryType>git</RepositoryType>
40+
</PropertyGroup>
41+
42+
<ItemGroup>
43+
<None Include="$(RepoRoot)/logo_full.png" Pack="true" Visible="false" PackagePath="" />
44+
<None Include="$(RepoRoot)README.md" Pack="true" Visible="false" PackagePath="" />
45+
</ItemGroup>
46+
</Project>

‎Directory.Build.targets

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<!-- Only create packages for non-test projects -->
4+
<PropertyGroup Condition="'$(TestProjectType)' == ''">
5+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6+
</PropertyGroup>
7+
8+
<!-- Packages for all projects -->
9+
<ItemGroup>
10+
<PackageReference Include="SpiceSharp" Version="3.2.0" />
11+
<PackageReference Include="SpiceSharpGenerator" Version="1.0.7">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
</PackageReference>
15+
</ItemGroup>
16+
17+
<!-- Include the default test packages for test projects -->
18+
<ItemGroup Condition="'$(TestProjectType)' != ''">
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
20+
<PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
21+
<PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
22+
<PackageReference Include="NUnit" Version="4.1.0" />
23+
<PackageReference Include="NUnit.Console" Version="3.17.0" />
24+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
25+
<PrivateAssets>all</PrivateAssets>
26+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27+
</PackageReference>
28+
<PackageReference Include="NUnit.Analyzers" Version="4.2.0">
29+
<PrivateAssets>all</PrivateAssets>
30+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
31+
</PackageReference>
32+
</ItemGroup>
33+
34+
<!-- Disable some rules for test projects -->
35+
<PropertyGroup Condition="'$(TestProjectType)' != ''">
36+
<NoWarn>$(NoWarn);CS1591</NoWarn>
37+
</PropertyGroup>
38+
39+
<!-- Automatic versioning using GitInfo if UseGitInfo is set to true -->
40+
<PropertyGroup Condition="'$(UseGitInfo)' == 'true'">
41+
<GitSkipCache>true</GitSkipCache>
42+
<GitBaseVersionRegex>^(?:\w+-)?v?(?&lt;MAJOR&gt;\d+)\.(?&lt;MINOR&gt;\d+)\.(?&lt;PATCH&gt;\d+)$</GitBaseVersionRegex>
43+
</PropertyGroup>
44+
<ItemGroup Condition="'$(UseGitInfo)' == 'true'">
45+
<PackageReference Include="GitInfo" Version="3.3.5">
46+
<PrivateAssets>all</PrivateAssets>
47+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
48+
</PackageReference>
49+
</ItemGroup>
50+
51+
</Project>

‎SpiceSharpBSIM/SpiceSharpBSIM.csproj

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<Description>Spice#.BSIM is a library for Spice# that contains the BSIM models.</Description>
45
<UseGitInfo>true</UseGitInfo>
56
<GitTagRegex>v*</GitTagRegex>
6-
<TargetFramework>netstandard2.0</TargetFramework>
7-
<Title>Spice#.BSIM</Title>
8-
<Authors>Sven Boulanger</Authors>
9-
<PackageProjectUrl>https://github.com/SpiceSharp/SpiceSharpBSIM</PackageProjectUrl>
10-
<PackageReadmeFile>README.md</PackageReadmeFile>
11-
<RepositoryUrl>https://github.com/SpiceSharp/SpiceSharpBSIM</RepositoryUrl>
12-
<Description>BSIM models for Spice#.</Description>
13-
<PackageIcon>logo_full.png</PackageIcon>
14-
<RepositoryType>git</RepositoryType>
15-
<PackageTags>circuit electronics netlist spice simulator simulation ode solver design</PackageTags>
16-
<PackageReleaseNotes>Refer to the GitHub release for release notes.</PackageReleaseNotes>
17-
<NeutralLanguage>en</NeutralLanguage>
18-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
197
</PropertyGroup>
20-
21-
<PropertyGroup Condition="'$(UseGitInfo)' == 'true'">
22-
<GitSkipCache>true</GitSkipCache>
23-
<GitBaseVersionRegex>^(?:\w+-)?v?(?&lt;MAJOR&gt;\d+)\.(?&lt;MINOR&gt;\d+)\.(?&lt;PATCH&gt;\d+)$</GitBaseVersionRegex>
24-
</PropertyGroup>
25-
<ItemGroup Condition="'$(UseGitInfo)' == 'true'">
26-
<PackageReference Include="GitInfo" Version="3.3.5">
27-
<PrivateAssets>all</PrivateAssets>
28-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29-
</PackageReference>
30-
</ItemGroup>
31-
32-
<ItemGroup>
33-
<Compile Remove="Components\Semiconductors\BSIM\BSIM3v24\**" />
34-
<Compile Remove="Properties\**" />
35-
<EmbeddedResource Remove="Components\Semiconductors\BSIM\BSIM3v24\**" />
36-
<EmbeddedResource Remove="Properties\**" />
37-
<None Remove="Components\Semiconductors\BSIM\BSIM3v24\**" />
38-
<None Remove="Properties\**" />
39-
</ItemGroup>
40-
41-
<ItemGroup>
42-
<Compile Remove="Components\Semiconductors\BSIM\BSIM1Behaviors\TransientBehavior.cs" />
43-
<Compile Remove="Components\Semiconductors\BSIM\BSIM2Behaviors\TransientBehavior.cs" />
44-
<Compile Remove="Components\Semiconductors\BSIM\BSIM3Behaviors\TransientBehavior.cs" />
45-
</ItemGroup>
46-
47-
<ItemGroup>
48-
<None Include="..\README.md">
49-
<Pack>True</Pack>
50-
<PackagePath>\</PackagePath>
51-
</None>
52-
</ItemGroup>
53-
54-
<ItemGroup>
55-
<PackageReference Include="SpiceSharp" Version="3.2.0" />
56-
<PackageReference Include="SpiceSharpGenerator" Version="1.0.7">
57-
<PrivateAssets>all</PrivateAssets>
58-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
59-
</PackageReference>
60-
</ItemGroup>
61-
62-
<ItemGroup>
63-
<None Update="logo_full.png">
64-
<Pack>True</Pack>
65-
<PackagePath>\</PackagePath>
66-
</None>
67-
</ItemGroup>
68-
698
</Project>

‎SpiceSharpBSIMTests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
33

4-
[assembly: AssemblyTitle("SpiceSharpBSIMTests")]
5-
[assembly: AssemblyDescription("")]
6-
[assembly: AssemblyConfiguration("")]
7-
[assembly: AssemblyCompany("")]
8-
[assembly: AssemblyProduct("SpiceSharpBSIMTests")]
9-
[assembly: AssemblyCopyright("Copyright © 2018")]
10-
[assembly: AssemblyTrademark("")]
11-
[assembly: AssemblyCulture("")]
12-
134
[assembly: ComVisible(false)]
145

156
[assembly: Guid("973e74d9-9d52-432d-9400-8baa78d99b5c")]
16-
17-
// [assembly: AssemblyVersion("1.0.*")]
18-
[assembly: AssemblyVersion("1.0.0.0")]
19-
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)