SpiceSharp · svenboulanger · Sep 1, 2024 · Sep 1, 2024 · Sep 1, 2024 · Sep 1, 2024
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -15,16 +15,16 @@ jobs:
     - name: Setup dotnet tooling
       uses: actions/setup-dotnet@master
       with:
-        dotnet-version: '5.0.100'
+        dotnet-version: '8.0.x'
 
     - name: Restore dependencies
       run: dotnet restore
 
-    - name: Compile Spice#
+    - name: Compile Spice#.Behavioral
       run: dotnet build SpiceSharpBehavioral\SpiceSharpBehavioral.csproj --configuration Release --no-restore
 
     - name: Publish to NuGet
       env:
         APIKEY: ${{ secrets.NUGET_APIKEY }}
-      run: dotnet nuget push .\SpiceSharpBehavioral\bin\Release\SpiceSharpBehavioral.*.nupkg -k $env:APIKEY -s "https://api.nuget.org/v3/index.json"
-
+      run: dotnet nuget push ".\build\bin\SpiceSharpBehavioral\SpiceSharpBehavioral.*.nupkg" -k $env:APIKEY -s "https://api.nuget.org/v3/index.json"
+
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -19,13 +19,13 @@ jobs:
     - name: Setup dotnet tooling
       uses: actions/setup-dotnet@master
       with:
-        dotnet-version: '5.0.100'
+        dotnet-version: '8.0.x'
 
     - name: Restore dependencies
       run: dotnet restore
 
     - name: Compile Spice#.Behavioral
       run: dotnet build SpiceSharpBehavioral/SpiceSharpBehavioral.csproj --configuration Debug --no-restore
 
-    - name: Compile Spice#.Behavioral.Test
+    - name: Compile Spice#.Behavioral.Tests
       run: dotnet test SpiceSharpBehavioralTest/SpiceSharpBehavioralTest.csproj --configuration Debug --no-restore
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -19,13 +19,13 @@ jobs:
     - name: Setup dotnet tooling
       uses: actions/setup-dotnet@master
       with:
-        dotnet-version: '5.0.100'
+        dotnet-version: '8.0.x'
 
     - name: Restore dependencies
       run: dotnet restore
 
     - name: Compile Spice#.Behavioral
-      run: dotnet build SpiceSharpbehavioral/SpiceSharpBehavioral.csproj --configuration Debug --no-restore
+      run: dotnet build SpiceSharpBehavioral/SpiceSharpBehavioral.csproj --configuration Debug --no-restore
 
-    - name: Compile Spice#.Behavioral.Test
+    - name: Compile Spice#.Behavioral.Tests
       run: dotnet test SpiceSharpBehavioralTest/SpiceSharpBehavioralTest.csproj --configuration Debug --no-restore
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup dotnet tooling
       uses: actions/setup-dotnet@master
       with:
-        dotnet-version: '5.0.100'
+        dotnet-version: '8.0.x'
 
     - name: Restore dependencies
       run: dotnet restore

diff --git a/Benchmark/App.config b/Benchmark/App.config
diff --git a/Benchmark/Benchmark.csproj b/Benchmark/Benchmark.csproj
diff --git a/Benchmark/BenchmarkBehavioralVsParser.cs b/Benchmark/BenchmarkBehavioralVsParser.cs
diff --git a/Benchmark/Program.cs b/Benchmark/Program.cs
diff --git a/Benchmark/Properties/AssemblyInfo.cs b/Benchmark/Properties/AssemblyInfo.cs
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,47 @@
-<Project>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Directories -->
   <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+    <UserDocsDir>$(RepoRoot)docs/</UserDocsDir>
+    <BuildDir>$(RepoRoot)build\</BuildDir>
+    <DocPath>$(BuildDir)doc\</DocPath>
+  </PropertyGroup>
+
+  <!-- Build info -->
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NeutralLanguage>en</NeutralLanguage>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <LangVersion>latest</LangVersion>
+	<OutputPath>$(BuildDir)bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath>$(BuildDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <DocumentationFile>$(DocPath)$(MSBuildProjectName).xml</DocumentationFile>
+  </PropertyGroup>
+
+  <!-- Assembly info -->
+  <PropertyGroup>
+    <Authors>Sven Boulanger</Authors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Title>Spice#</Title>
+    <Company>SpiceSharp</Company>
+  </PropertyGroup>
+
+  <!-- NuGet package info -->
+  <PropertyGroup>
+    <PackageProjectUrl>https://github.com/SpiceSharp/SpiceSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/SpiceSharp/SpiceSharp</RepositoryUrl>
+    <PackageTags>circuit electronics netlist spice simulator simulation ode solver design</PackageTags>
+	<PackageReleaseNotes>Refer to the GitHub release for release notes.</PackageReleaseNotes>
+    <PackageIcon>logo_full.png</PackageIcon> 
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>circuit electronics netlist parser spice simulator simulation ode solver design</PackageTags>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="$(UserDocsDir)api/images/logo_full.png" Pack="true" Visible="false" PackagePath="" />
+    <None Include="$(RepoRoot)README.md" Pack="true" Visible="false" PackagePath="" />
+  </ItemGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,51 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Only create packages for non-test projects -->
+  <PropertyGroup Condition="'$(TestProjectType)' == ''">
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <!-- Packages for all projects -->
+  <ItemGroup>
+    <PackageReference Include="SpiceSharp" Version="3.2.0" />
+    <PackageReference Include="SpiceSharpGenerator" Version="1.0.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- Include the default test packages for test projects -->
+  <ItemGroup Condition="'$(TestProjectType)' != ''">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit.Console" Version="3.17.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- Disable some rules for test projects -->
+  <PropertyGroup Condition="'$(TestProjectType)' != ''">
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+  </PropertyGroup>
+
+  <!-- Automatic versioning using GitInfo if UseGitInfo is set to true -->
+  <PropertyGroup Condition="'$(UseGitInfo)' == 'true'">
+    <GitSkipCache>true</GitSkipCache>
+    <GitBaseVersionRegex>^(?:\w+-)?v?(?&lt;MAJOR&gt;\d+)\.(?&lt;MINOR&gt;\d+)\.(?&lt;PATCH&gt;\d+)$</GitBaseVersionRegex>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(UseGitInfo)' == 'true'">
+    <PackageReference Include="GitInfo" Version="3.3.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>