Merge branch 'main' of https://github.com/PrimeEagle/VNet.Mathematics

PrimeEagle · Dec 19, 2023 · b7bb683 · b7bb683
2 parents ac33190 + 2f3ff03
commit b7bb683
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/.github/workflows/build-dotnet.yml b/.github/workflows/build-dotnet.yml
@@ -44,10 +44,9 @@ jobs:
         nuget sources Add -Name "GitHub" -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" -Username ${{ github.repository_owner }} -Password ${{ secrets.BUILD_TOKEN }}
       
     - name: Restore NuGet packages
-      run: dotnet restore ${{ secrets.DOTNET_SOLUTION }}
+      run: dotnet restore ${{ secrets.DOTNET_SOLUTION }} /p:ServerBuild=true
       env:
             NUGET_AUTH_TOKEN: ${{ secrets.BUILD_TOKEN }}
-            UsePackageReferences: true
 
     - name: Build with version
       run: dotnet build ${{ secrets.DOTNET_SOLUTION }} /p:BuildNumber=${{ github.run_number }} /p:ServerBuild=true

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # VNet.Mathematics
 
 ![Build .NET](https://github.com/PrimeEagle/VNet.System/actions/workflows/build-dotnet.yml/badge.svg)&nbsp;&nbsp;&nbsp;![Build NuGet](https://github.com/PrimeEagle/VNet.System/actions/workflows/create-nuget.yml/badge.svg)<br>
-![Static Badge](https://img.shields.io/badge/Latest_Build-v1.0.0.3-lightblue)&nbsp;&nbsp;&nbsp;![Static Badge](https://img.shields.io/badge/Latest_Release-v1.0.0-blue)&nbsp;&nbsp;&nbsp;![Static Badge](https://img.shields.io/badge/NuGet_Package-v1.0.0-blue)&nbsp;&nbsp;&nbsp;![Static Badge](https://img.shields.io/badge/.NET-8.0.100-darkblue)<br>
+![Static Badge](https://img.shields.io/badge/Latest_Build-v1.0.0.10-lightblue)&nbsp;&nbsp;&nbsp;![Static Badge](https://img.shields.io/badge/Latest_Release-v1.0.0-blue)&nbsp;&nbsp;&nbsp;![Static Badge](https://img.shields.io/badge/NuGet_Package-v1.0.0-blue)&nbsp;&nbsp;&nbsp;![Static Badge](https://img.shields.io/badge/.NET-8.0.100-darkblue)<br>
 ![GitHub License](https://img.shields.io/github/license/PrimeEagle/VNet.Mathematics)
 
 <img src="https://github.com/PrimeEagle/VNet.Mathematics/blob/main/vnet.mathematics.png?raw=true" width="250" />

diff --git a/VNet.Mathematics/VNet.Mathematics.csproj b/VNet.Mathematics/VNet.Mathematics.csproj
@@ -1,22 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-  </PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="alglib.net" Version="3.19.0" />
+		<PackageReference Include="MathNet.Filtering" Version="0.7.0" />
+		<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
+	</ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy /e /y &quot;$(TargetPath)&quot; &quot;D:\My Code\VNet bin\&quot;" />
-  </Target>
+	<PropertyGroup Condition="'$(ServerBuild)' != ''">
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="alglib.net" Version="3.19.0" />
-    <PackageReference Include="MathNet.Filtering" Version="0.7.0" />
-    <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
-    <PackageReference Include="VNet.Configuration" Version="1.0.0" />
-    <PackageReference Include="VNet.System" Version="1.0.0" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(ServerBuild)' != ''">
+		<PackageReference Include="VNet.Configuration" Version="1.0.0" />
+		<PackageReference Include="VNet.System" Version="1.0.0" />
+	</ItemGroup>
 
+	<ItemGroup Condition="'$(ServerBuild)' == ''">
+		<ProjectReference Include="..\..\VNet.Configuration\VNet.Configuration\VNet.Configuration.csproj" />
+		<ProjectReference Include="..\..\VNet.System\VNet.System\VNet.System.csproj" />
+	</ItemGroup>
+
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(ServerBuild)' == ''">
+		<Exec Command="xcopy /e /y &quot;$(TargetPath)&quot; &quot;D:\My Code\VNet bin\&quot;" />
+	</Target>
 </Project>