michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop/UnionTown' into develop/SLM-PT50

Browse Source
This commit is contained in:
Marek Frniak 2026-05-06 09:08:09 +02:00
commit c1573390b5
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
TBF/Build/CopyGci.targets.xml
View File

@ -1,3 +1,19 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="CopyPackageCommonToTbfOutput" AfterTargets="Build">
<ItemGroup>
<CommonPackageFiles Include="$(SolutionDir)packages\Common\*.dll" />
<CommonPackageFiles Include="$(SolutionDir)packages\Common\*.exe" />
<CommonPackageFiles Include="$(SolutionDir)packages\Common\*.config" />
<CommonPackageFiles Include="$(SolutionDir)packages\Common\*.json" />
</ItemGroup>
<Message Text="Copying packages\Common to TBF output: $(TargetDir)" Importance="High" />
<Copy
SourceFiles="@(CommonPackageFiles)"
DestinationFolder="$(TargetDir)"
SkipUnchangedFiles="true" />
</Target>
</Project>

4
TBF/TBF.csproj
View File

@ -124,8 +124,8 @@
<Reference Include="MySql.Data">
<HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>

2
TBF/packages.config
View File

@ -5,7 +5,7 @@
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
<package id="log4net" version="2.0.15" targetFramework="net472" />
<package id="MySql.Data" version="6.6.5" targetFramework="net20" requireReinstallation="true" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
<package id="NHibernate" version="4.0.4.4000" targetFramework="net40" />
<package id="NLog" version="5.2.2" targetFramework="net48" />
<package id="Oracle.ManagedDataAccess" version="19.11.0" targetFramework="net472" />