Fixed build DLLs

.github/workflows/main_automation.yml

@@ -28,19 +28,6 @@ jobs:
       with:
         java-version: 1.11
 
-    - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v0
-      with:
-        versionSpec: '6.x'
-        includePrerelease: true
-    - name: Determine Version
-      uses: gittools/actions/gitversion/execute@v0
-      with:
-        useConfigFile: true
-        configFilePath: .\.github\GitVersion.yml
-        additionalArguments: '/verbosity Diagnostic'
-
-
     - name: Install JetBrains
       run: dotnet tool install JetBrains.dotCover.GlobalTool --global
     - name: Install Sonar Scanner
@@ -57,7 +44,7 @@ jobs:
         /d:sonar.host.url="https://sonarcloud.io"
         /d:sonar.cs.dotcover.reportsPaths=./coveragereport.html
 
-    - name: Build Core DLL
+    - name: Build Core QuanTAlib DLL
       run: dotnet build ./Calculations/Calculations.csproj --verbosity minimal --configuration Release --nologo
     - name: Build Indicators DLL
       run: dotnet build ./Indicators/Indicators.csproj --verbosity minimal --configuration Release --nologo
@@ -93,12 +80,19 @@ jobs:
         prerelease: true
         title: "Latest Build"
         files: |
-          /Quantower/Settings/Scripts/Indicators/QuanTAlib/*.dll
+          .\Calculations\bin\Release\net6.0\QuanTAlib.dll
-          /Quantower/Settings/Scripts/Strategies/QuanTAlib/*.dll
+          .\Indicators\bin\Release\QuanTAlib_Indicators.dll
+          .\Strategies\bin\Release\QuanTAlib_Strategies.dll
+
+    - name: Push  package to myget.org
+      run: dotnet nuget push '.\Calculations\bin\Release\QuanTAlib.*.nupkg'
+          --api-key ${{ secrets.MYGET_DEPLOY_KEY_QUANTALIB }}
+          --source https://www.myget.org/F/quantalib/api/v2/package
+          --skip-duplicate
 
     - name: Push  package to nuget.org
       if: ${{ github.ref == 'refs/heads/main' }}
-      run: dotnet nuget push '.\Calculations\bin\Release\net8.0\QuanTAlib.*.nupkg'
+      run: dotnet nuget push '.\Calculations\bin\Release\QuanTAlib.*.nupkg'
           --api-key ${{ secrets.NUGET_DEPLOY_KEY_QUANTLIB }}
           --source https://api.nuget.org/v3/index.json
           --skip-duplicate

Calculations/Calculations.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Title>QuanTAlib</Title>
-    <Version>$(GitVersion_NuGetVersionV2)</Version>
+    <Version>0.1.30</Version>
     <Product>Library of TA Calculations, Charts and Strategies for Quantower</Product>
     <Description>Quantitative Technical Analysis Library in C# for Quantower</Description>
     <RepositoryType>git</RepositoryType>

Indicators/Indicators.csproj

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <Platforms>AnyCPU</Platforms>
     <AlgoType>Indicator</AlgoType>
-    <AssemblyName>Quantower_QTAlib</AssemblyName>
+    <AssemblyName>QuanTAlib_Indicators</AssemblyName>
     <RootNamespace>QuanTAlib</RootNamespace>
     <DebugType>embedded</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -20,7 +20,6 @@
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <PlatformTarget>anycpu</PlatformTarget>
     <DebugType>full</DebugType>
-    <OutputPath>C:\Quantower\TradingPlatform\v1.130.7\..\..\Settings\Scripts\Indicators\QuanTAlib</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>embedded</DebugType>
@@ -28,7 +27,6 @@
     <WarningLevel>3</WarningLevel>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <PlatformTarget>anycpu</PlatformTarget>
-    <OutputPath>C:\Quantower\TradingPlatform\v1.130.7\..\..\Settings\Scripts\Indicators\QuanTAlib</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\.sonarlint\mihakralj_quantalib\CSharp\SonarLint.xml" Link="SonarLint.xml" />
@@ -36,12 +34,17 @@
   <ItemGroup>
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
+  <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
+    <Copy SourceFiles=".\bin\$(Configuration)\QuanTAlib_Indicators.dll" DestinationFolder="\Quantower\Settings\Scripts\Indicators\QuanTAlib" />
+  </Target>
   <ItemGroup>
-    <ProjectReference Include="..\Calculations\Calculations.csproj" />
+    <Compile Include="..\Calculations\**\*.cs" Exclude="..\Calculations\obj\**">
+      <Link>QuanTAlib\%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="TradingPlatform.BusinessLayer">
-      <HintPath>..\QuantowerDLL\TradingPlatform.BusinessLayer.dll</HintPath>
+      <HintPath>..\.github\TradingPlatform.BusinessLayer.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>

Strategies/Strategies.csproj

@@ -1,19 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <Platforms>AnyCPU</Platforms>
     <AlgoType>Strategy</AlgoType>
-    <AssemblyName>Strategy</AssemblyName>
+    <AssemblyName>QuanTAlib_Strategies</AssemblyName>
-    <RootNamespace>Strategy</RootNamespace>
+    <RootNamespace>QuanTAlib</RootNamespace>
+    <DebugType>embedded</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Nullable>disable</Nullable>
     <SignAssembly>False</SignAssembly>
-    <StartAction>Program</StartAction>
+    <CodeAnalysisRuleSet>..\.sonarlint\mihakralj_quantalibcsharp.ruleset</CodeAnalysisRuleSet>
-    <StartProgram>C:\Quantower\TradingPlatform\v1.130.7\Console.StarterNew.exe</StartProgram>
-    <StartArguments>--address 127.0.0.1 --port 51113</StartArguments>
-    <CodeAnalysisRuleSet>..\.sonarlint\mihakralj_quantalibcsharp.ruleset</CodeAnalysisRuleSet>    
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>True</Optimize>
@@ -21,7 +20,6 @@
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <PlatformTarget>anycpu</PlatformTarget>
     <DebugType>full</DebugType>
-    <OutputPath>C:\Quantower\TradingPlatform\v1.130.7\..\..\Settings\Scripts\Strategies\QuanTAlib</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>embedded</DebugType>
@@ -29,17 +27,21 @@
     <WarningLevel>3</WarningLevel>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <PlatformTarget>anycpu</PlatformTarget>
-    <OutputPath>C:\Quantower\TradingPlatform\v1.130.7\..\..\Settings\Scripts\Strategies\QuanTAlib</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\.sonarlint\mihakralj_quantalib\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
+  <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
+    <Copy SourceFiles=".\bin\$(Configuration)\QuanTAlib_Strategies.dll" DestinationFolder="\Quantower\Settings\Scripts\Strategies\QuanTAlib" />
+  </Target>
   <ItemGroup>
-    <ProjectReference Include="..\Calculations\Calculations.csproj" />
+    <Compile Include="..\Calculations\**\*.cs" Exclude="..\Calculations\obj\**">
+      <Link>QuanTAlib\%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="TradingPlatform.BusinessLayer">
-      <HintPath>..\QuantowerDLL\TradingPlatform.BusinessLayer.dll</HintPath>
+      <HintPath>..\.github\TradingPlatform.BusinessLayer.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>

Tests/Tests.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>