Skip to content

Commit 61a7cb7

Browse files
DavidBlaaDavidBlaa
committed
Merge branch 'rc' of https://github.com/BEXIS2/Core into rc
2 parents b6229fa + cc6aaec commit 61a7cb7

File tree

8 files changed

+36
-627
lines changed

8 files changed

+36
-627
lines changed

‎Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Controllers/Api/CitationsController.cs‎

Lines changed: 0 additions & 616 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
</Reference>
8888
<Reference Include="netstandard" />
8989
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
90-
<HintPath>..\..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
90+
<HintPath>..\..\..\..\..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
9191
</Reference>
9292
<Reference Include="Newtonsoft.Json.Schema, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
9393
<HintPath>..\..\..\..\..\packages\Newtonsoft.Json.Schema.3.0.16\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
@@ -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=3.2.2.0, Culture=neutral, processorArchitecture=MSIL">
281-
<HintPath>..\..\..\..\..\packages\Vaelastrasz.Library.3.2.2\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
280+
<Reference Include="Vaelastrasz.Library, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
281+
<HintPath>..\..\..\..\..\packages\Vaelastrasz.Library.5.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/Controllers/DataCiteDoiController.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,16 @@ public async Task<ActionResult> Accept(long publicationId)
299299
{
300300
publication.Status = "accepted";
301301
publication.Response = JsonConvert.SerializeObject(dataCiteResponse.Data);
302-
publication.ExternalLink = dataCiteResponse.Data.Data.Attributes.Doi;
302+
303+
if(dataCiteResponse.Data.Data.Attributes.Identifiers.Count > 0)
304+
{
305+
publication.ExternalLink = dataCiteResponse.Data.Data.Id;
306+
}
307+
else
308+
{
309+
publication.ExternalLink = dataCiteResponse.Data.Data.Attributes.Doi;
310+
}
311+
303312
publication.ExternalLinkType = "DOI";
304313

305314
publicationManager.Update(publication);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<package id="Modernizr" version="2.8.3" targetFramework="net48" />
3131
<package id="NameParserSharp" version="1.5.0" targetFramework="net48" />
3232
<package id="NETStandard.Library" version="1.6.1" targetFramework="net48" />
33-
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
33+
<package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
3434
<package id="Newtonsoft.Json.Schema" version="3.0.16" targetFramework="net48" />
3535
<package id="RestSharp" version="106.15.0" targetFramework="net48" />
3636
<package id="System.AppContext" version="4.3.0" targetFramework="net48" />
@@ -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="3.2.2" targetFramework="net48" />
89+
<package id="Vaelastrasz.Library" version="5.0.0" targetFramework="net48" />
9090
<package id="WebActivatorEx" version="2.2.0" targetFramework="net48" />
9191
</packages>

‎Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/web.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@
7474
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
7575
<bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.0.0" />
7676
</dependentAssembly>
77+
<dependentAssembly>
78+
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
79+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
80+
</dependentAssembly>
81+
<dependentAssembly>
82+
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
83+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
84+
</dependentAssembly>
7785
</assemblyBinding>
7886
</runtime>
7987
</configuration>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<HintPath>..\..\..\packages\NameParserSharp.1.5.0\lib\net45\NameParser.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
69-
<HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<HintPath>..\..\..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System" />
7272
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -150,8 +150,8 @@
150150
</Reference>
151151
<Reference Include="System.Xml.Linq" />
152152
<Reference Include="System.Xml" />
153-
<Reference Include="Vaelastrasz.Library, Version=3.2.2.0, Culture=neutral, processorArchitecture=MSIL">
154-
<HintPath>..\..\..\packages\Vaelastrasz.Library.3.2.2\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
153+
<Reference Include="Vaelastrasz.Library, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
154+
<HintPath>..\..\..\packages\Vaelastrasz.Library.5.0.0\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
155155
</Reference>
156156
</ItemGroup>
157157
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Extensions.Primitives" version="7.0.0" targetFramework="net48" />
1010
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net48" />
1111
<package id="NameParserSharp" version="1.5.0" targetFramework="net48" />
12-
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
12+
<package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
1313
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
1414
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net48" />
1515
<package id="System.IO" version="4.3.0" targetFramework="net48" />
@@ -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="3.2.2" targetFramework="net48" />
31+
<package id="Vaelastrasz.Library" version="5.0.0" targetFramework="net48" />
3232
</packages>

‎Modules/RPM/BExIS.Modules.RPM.UI.Tests/app.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@
9898
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
9999
<bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.0.0" />
100100
</dependentAssembly>
101+
<dependentAssembly>
102+
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
103+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
104+
</dependentAssembly>
105+
<dependentAssembly>
106+
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
107+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
108+
</dependentAssembly>
101109
</assemblyBinding>
102110
</runtime>
103111
</configuration>

0 commit comments

Comments
 (0)