Skip to content

Commit 8da3119

Browse files
Upgraded other nuget packages (jquery, bootstrap, ...)
1 parent 4c72d71 commit 8da3119

File tree

155 files changed

+64071
-18389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+64071
-18389
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Iesi.Collections.4.0.2\lib\net461\Iesi.Collections.dll</HintPath>
68+
<HintPath>..\packages\Iesi.Collections.4.0.3\lib\net461\Iesi.Collections.dll</HintPath>
6969
</Reference>
7070
<Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
7171
<HintPath>..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>

src/AbpCompanyName.AbpProjectName.NHibernate/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
1010
<package id="FluentMigrator" version="1.6.2" targetFramework="net452" />
1111
<package id="FluentNHibernate" version="2.0.3.0" targetFramework="net452" />
12-
<package id="Iesi.Collections" version="4.0.2" targetFramework="net461" />
12+
<package id="Iesi.Collections" version="4.0.3" targetFramework="net461" />
1313
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
1414
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />

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

Lines changed: 53 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@
318318
<Reference Include="System.Web.Services" />
319319
<Reference Include="System.EnterpriseServices" />
320320
<Reference Include="System.Xml.Linq" />
321-
<Reference Include="System.Xml.ReaderWriter">
322-
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
321+
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
322+
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
323323
<Private>True</Private>
324324
</Reference>
325325
<Reference Include="System.Xml.XmlDocument">
@@ -360,8 +360,10 @@
360360
<Content Include="Abp\Framework\styles\abp.mixings.css" />
361361
<Content Include="Abp\Framework\styles\abp.mixings.min.css" />
362362
<Content Include="Abp\Framework\styles\utils\ie10fix.css" />
363-
<Content Include="Content\bootstrap-theme.css" />
364-
<Content Include="Content\bootstrap-theme.min.css" />
363+
<Content Include="Content\bootstrap-grid.css" />
364+
<Content Include="Content\bootstrap-grid.min.css" />
365+
<Content Include="Content\bootstrap-reboot.css" />
366+
<Content Include="Content\bootstrap-reboot.min.css" />
365367
<Content Include="Content\bootstrap.css" />
366368
<Content Include="Content\bootstrap.min.css" />
367369
<Content Include="Content\font-awesome.css" />
@@ -443,26 +445,37 @@
443445
<Content Include="fonts\fontawesome-webfont.ttf" />
444446
<Content Include="fonts\fontawesome-webfont.svg" />
445447
<Content Include="fonts\fontawesome-webfont.eot" />
446-
<Content Include="fonts\glyphicons-halflings-regular.woff2" />
447-
<Content Include="fonts\glyphicons-halflings-regular.woff" />
448-
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
449-
<Content Include="fonts\glyphicons-halflings-regular.svg" />
450-
<Content Include="fonts\glyphicons-halflings-regular.eot" />
451-
<Content Include="Content\bootstrap.min.css.map" />
452-
<Content Include="Content\bootstrap.css.map" />
453-
<Content Include="Content\bootstrap-theme.min.css.map" />
454-
<Content Include="Content\bootstrap-theme.css.map" />
455-
<Content Include="Scripts\bootstrap.js" />
456-
<Content Include="Scripts\bootstrap.min.js" />
457448
<Content Include="Abp\Framework\styles\abp.mixings.less" />
458449
<Content Include="Abp\Framework\styles\abp.mixings.css.map" />
459450
<Content Include="Abp\Framework\styles\abp.less" />
460451
<Content Include="Abp\Framework\styles\abp.css.map" />
461-
<None Include="Scripts\jquery-3.2.1.intellisense.js" />
462-
<Content Include="Scripts\jquery-3.2.1.js" />
463-
<Content Include="Scripts\jquery-3.2.1.min.js" />
464-
<Content Include="Scripts\jquery-3.2.1.slim.js" />
465-
<Content Include="Scripts\jquery-3.2.1.slim.min.js" />
452+
<Content Include="Scripts\bootstrap.bundle.js" />
453+
<Content Include="Scripts\bootstrap.bundle.min.js" />
454+
<Content Include="Scripts\bootstrap.js" />
455+
<Content Include="Scripts\bootstrap.min.js" />
456+
<Content Include="Scripts\esm\popper-utils.js" />
457+
<Content Include="Scripts\esm\popper-utils.min.js" />
458+
<Content Include="Scripts\esm\popper.js" />
459+
<Content Include="Scripts\esm\popper.min.js" />
460+
<Content Include="Scripts\esm\popper.min.js.map" />
461+
<Content Include="Scripts\esm\popper.js.map" />
462+
<Content Include="Scripts\esm\popper-utils.min.js.map" />
463+
<Content Include="Scripts\esm\popper-utils.js.map" />
464+
<Content Include="Scripts\bootstrap.min.js.map" />
465+
<Content Include="Scripts\bootstrap.js.map" />
466+
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
467+
<Content Include="Scripts\bootstrap.bundle.js.map" />
468+
<Content Include="Content\bootstrap.min.css.map" />
469+
<Content Include="Content\bootstrap.css.map" />
470+
<Content Include="Content\bootstrap-reboot.min.css.map" />
471+
<Content Include="Content\bootstrap-reboot.css.map" />
472+
<Content Include="Content\bootstrap-grid.min.css.map" />
473+
<Content Include="Content\bootstrap-grid.css.map" />
474+
<None Include="Scripts\jquery-3.3.1.intellisense.js" />
475+
<Content Include="Scripts\jquery-3.3.1.js" />
476+
<Content Include="Scripts\jquery-3.3.1.min.js" />
477+
<Content Include="Scripts\jquery-3.3.1.slim.js" />
478+
<Content Include="Scripts\jquery-3.3.1.slim.min.js" />
466479
<Content Include="Scripts\jquery-ui-1.12.1.js" />
467480
<Content Include="Scripts\jquery-ui-1.12.1.min.js" />
468481
<Content Include="Scripts\jquery.blockUI.js" />
@@ -483,13 +496,21 @@
483496
<Content Include="Scripts\others\spinjs\spin.js" />
484497
<Content Include="Scripts\json2.js" />
485498
<Content Include="Scripts\json2.min.js" />
499+
<Content Include="Scripts\popper-utils.js" />
500+
<Content Include="Scripts\popper-utils.min.js" />
501+
<Content Include="Scripts\popper.js" />
502+
<Content Include="Scripts\popper.min.js" />
486503
<Content Include="Scripts\sweetalert\ie9.css" />
487504
<Content Include="Scripts\sweetalert\sweet-alert.css" />
488505
<Content Include="Scripts\sweetalert\sweet-alert.html" />
489506
<Content Include="Scripts\sweetalert\sweet-alert.js" />
490507
<Content Include="Scripts\sweetalert\sweet-alert.min.js" />
491508
<Content Include="Scripts\toastr.js" />
492509
<Content Include="Scripts\toastr.min.js" />
510+
<Content Include="Scripts\umd\popper-utils.js" />
511+
<Content Include="Scripts\umd\popper-utils.min.js" />
512+
<Content Include="Scripts\umd\popper.js" />
513+
<Content Include="Scripts\umd\popper.min.js" />
493514
<Content Include="Web.config">
494515
<SubType>Designer</SubType>
495516
</Content>
@@ -524,8 +545,17 @@
524545
<Content Include="Views\Layout\_TopMenu.cshtml" />
525546
<Content Include="Views\Shared\Error.cshtml" />
526547
<Content Include="Scripts\sweetalert\sweet-alert.scss" />
527-
<Content Include="Scripts\jquery-3.2.1.slim.min.map" />
528-
<Content Include="Scripts\jquery-3.2.1.min.map" />
548+
<Content Include="Scripts\jquery-3.3.1.slim.min.map" />
549+
<Content Include="Scripts\jquery-3.3.1.min.map" />
550+
<Content Include="Scripts\umd\popper.min.js.map" />
551+
<Content Include="Scripts\umd\popper.js.map" />
552+
<Content Include="Scripts\umd\popper-utils.min.js.map" />
553+
<Content Include="Scripts\umd\popper-utils.js.map" />
554+
<Content Include="Scripts\README.md" />
555+
<Content Include="Scripts\popper.min.js.map" />
556+
<Content Include="Scripts\popper.js.map" />
557+
<Content Include="Scripts\popper-utils.min.js.map" />
558+
<Content Include="Scripts\popper-utils.js.map" />
529559
<None Include="Web.Debug.config">
530560
<DependentUpon>Web.config</DependentUpon>
531561
</None>
@@ -561,6 +591,7 @@
561591
<TypeScriptCompile Include="Abp\Framework\scripts\abp.d.ts" />
562592
<TypeScriptCompile Include="Abp\Framework\scripts\libs\abp.jquery.d.ts" />
563593
<TypeScriptCompile Include="Abp\Framework\scripts\libs\abp.signalr.d.ts" />
594+
<TypeScriptCompile Include="Scripts\index.d.ts" />
564595
</ItemGroup>
565596
<PropertyGroup>
566597
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

src/AbpCompanyName.AbpProjectName.WebMpa/App_Start/BundleConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static void RegisterBundles(BundleCollection bundles)
3636
.Include(
3737
"~/Scripts/json2.min.js",
3838

39-
"~/Scripts/jquery-3.2.1.min.js",
39+
"~/Scripts/jquery-3.3.1.min.js",
4040
"~/Scripts/jquery-ui-1.12.1.min.js",
4141

4242
"~/Scripts/bootstrap.min.js",

0 commit comments

Comments
 (0)