Skip to content

Commit e8202b9

Browse files
committed
updated server side nuget packages
1 parent 3e54a08 commit e8202b9

File tree

8 files changed

+18
-15
lines changed

8 files changed

+18
-15
lines changed
Binary file not shown.

src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@
6161
<HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
65-
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
64+
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Iesi.Collections.4.0.2\lib\net461\Iesi.Collections.dll</HintPath>
6766
</Reference>
6867
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
6968
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>

src/AbpCompanyName.AbpProjectName.NHibernate/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="Iesi.Collections" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

src/AbpCompanyName.AbpProjectName.NHibernate/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Castle.Windsor" version="4.0.0" targetFramework="net461" />
99
<package id="FluentMigrator" version="1.6.2" targetFramework="net452" />
1010
<package id="FluentNHibernate" version="2.0.3.0" targetFramework="net452" />
11-
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net452" />
11+
<package id="Iesi.Collections" version="4.0.2" targetFramework="net461" />
1212
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net461" />
1313
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />

src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@
191191
<Private>True</Private>
192192
</Reference>
193193
<Reference Include="System.Data.DataSetExtensions" />
194-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
195-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
194+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
195+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
196196
</Reference>
197197
<Reference Include="System.Globalization.Calendars">
198198
<HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
@@ -581,13 +581,15 @@
581581
</PropertyGroup>
582582
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
583583
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
584+
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
584585
</Target>
585586
<Target Name="RemoveNetFxForceConflicts" AfterTargets="ResolveAssemblyReferences">
586587
<ItemGroup>
587588
<ReferencePath Remove="@(ReferencePath)" Condition="'%(FileName)' == 'netfx.force.conflicts'" />
588589
</ItemGroup>
589590
</Target>
590591
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
592+
<Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
591593
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
592594
Other similar extension points exist, see Microsoft.Common.targets.
593595
<Target Name="BeforeBuild">

src/AbpCompanyName.AbpProjectName.WebMpa/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
<package id="Microsoft.Extensions.Options" version="2.0.0" targetFramework="net461" />
4242
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
4343
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net452" />
44-
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
44+
<package id="Microsoft.NETCore.Platforms" version="2.0.0" targetFramework="net461" />
4545
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
4646
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
4747
<package id="Modernizr" version="2.8.3" targetFramework="net452" />
4848
<package id="Moment.js" version="2.11.0" targetFramework="net452" />
49-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
49+
<package id="NETStandard.Library" version="2.0.0" targetFramework="net461" />
5050
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
5151
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
5252
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
@@ -63,7 +63,7 @@
6363
<package id="System.Console" version="4.3.0" targetFramework="net461" />
6464
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
6565
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
66-
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" />
66+
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net461" />
6767
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
6868
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" />
6969
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />

src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@
186186
<Private>True</Private>
187187
</Reference>
188188
<Reference Include="System.Data.DataSetExtensions" />
189-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
190-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
189+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
190+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
191191
</Reference>
192192
<Reference Include="System.Globalization.Calendars">
193193
<HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
@@ -1354,13 +1354,15 @@
13541354
</PropertyGroup>
13551355
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
13561356
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
1357+
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
13571358
</Target>
13581359
<Target Name="RemoveNetFxForceConflicts" AfterTargets="ResolveAssemblyReferences">
13591360
<ItemGroup>
13601361
<ReferencePath Remove="@(ReferencePath)" Condition="'%(FileName)' == 'netfx.force.conflicts'" />
13611362
</ItemGroup>
13621363
</Target>
13631364
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
1365+
<Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
13641366
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
13651367
Other similar extension points exist, see Microsoft.Common.targets.
13661368
<Target Name="BeforeBuild">

src/AbpCompanyName.AbpProjectName.WebSpaAngular/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
4545
<package id="Microsoft.Extensions.Options" version="2.0.0" targetFramework="net461" />
4646
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
47-
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
47+
<package id="Microsoft.NETCore.Platforms" version="2.0.0" targetFramework="net461" />
4848
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
4949
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
5050
<package id="Modernizr" version="2.8.3" targetFramework="net452" />
5151
<package id="Moment.js" version="2.11.0" targetFramework="net452" />
52-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
52+
<package id="NETStandard.Library" version="2.0.0" targetFramework="net461" />
5353
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
5454
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
5555
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
@@ -66,7 +66,7 @@
6666
<package id="System.Console" version="4.3.0" targetFramework="net461" />
6767
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
6868
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
69-
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" />
69+
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net461" />
7070
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
7171
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" />
7272
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)