Skip to content

Commit 0a7069b

Browse files
committed
Merge branch 'rc' of https://github.com/BEXIS2/Core into rc
2 parents 037c4b5 + 6cdbfd4 commit 0a7069b

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

.github/workflows/codeql.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ name: "CodeQL Advanced"
1313

1414
on:
1515
push:
16-
branches:
16+
branches:
17+
- master
1718
- rc
1819
pull_request:
1920
branches:
21+
- master
2022
- rc
2123
schedule:
2224
- cron: '38 14 * * 4'

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/BExIS.Modules.Dim.UI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@
277277
<Reference Include="Telerik.Web.Mvc, Version=2013.2.611.340, Culture=neutral, PublicKeyToken=29ac1a93ec063d92, processorArchitecture=MSIL">
278278
<HintPath>..\..\..\..\..\packages\TelerikMvcExtensions.2013.2.611\lib\net40\Telerik.Web.Mvc.dll</HintPath>
279279
</Reference>
280-
<Reference Include="Vaelastrasz.Library, Version=5.0.2.0, Culture=neutral, processorArchitecture=MSIL">
281-
<HintPath>..\..\..\..\..\packages\Vaelastrasz.Library.5.0.2\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
280+
<Reference Include="Vaelastrasz.Library, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
281+
<HintPath>..\..\..\..\..\packages\Vaelastrasz.Library.6.0.0\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
282282
</Reference>
283283
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
284284
<HintPath>..\..\..\..\..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath>

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@
8686
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net48" />
8787
<package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net48" />
8888
<package id="TelerikMvcExtensions" version="2013.2.611" targetFramework="net48" />
89-
<package id="Vaelastrasz.Library" version="5.0.2" targetFramework="net48" />
89+
<package id="Vaelastrasz.Library" version="6.0.0" targetFramework="net48" />
9090
<package id="WebActivatorEx" version="2.2.0" targetFramework="net48" />
9191
</packages>

Modules/DIM/BExIS.Dim.Helper/BExIS.Dim.Helpers.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@
150150
</Reference>
151151
<Reference Include="System.Xml.Linq" />
152152
<Reference Include="System.Xml" />
153-
<Reference Include="Vaelastrasz.Library, Version=5.0.2.0, Culture=neutral, processorArchitecture=MSIL">
154-
<HintPath>..\..\..\packages\Vaelastrasz.Library.5.0.2\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
153+
<Reference Include="Vaelastrasz.Library, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
154+
<HintPath>..\..\..\packages\Vaelastrasz.Library.6.0.0\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
155155
</Reference>
156156
</ItemGroup>
157157
<ItemGroup>

Modules/DIM/BExIS.Dim.Helper/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
2929
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
3030
<package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net48" />
31-
<package id="Vaelastrasz.Library" version="5.0.2" targetFramework="net48" />
31+
<package id="Vaelastrasz.Library" version="6.0.0" targetFramework="net48" />
3232
</packages>

0 commit comments

Comments
 (0)