Skip to content

Commit

Permalink
Update .NET Project to latest .NET Core 3.1.5 libs. Update albumviewe…
Browse files Browse the repository at this point in the history
…r.west-wind.com
  • Loading branch information
RickStrahl committed Jun 24, 2020
1 parent 84e4ffc commit 53a0c9b
Show file tree
Hide file tree
Showing 24 changed files with 82 additions and 34 deletions.
4 changes: 2 additions & 2 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ The **Angular** front end application demonstrates:
* Angular CLI Project

Version supported:
* **Angular 8.2.14**
* **Angular CLI 8.3.20**
* **Angular 9.1.1**
* **Angular CLI 9.1.9**


### Getting Started
Expand Down
1 change: 1 addition & 0 deletions src/AlbumViewerAngular/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import {HttpRequestInterceptor} from './business/httpRequestInterceptor'
import { FocusDirective } from './common/focusDirective';
import { NgbTypeaheadModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
import {ToastrModule} from "ngx-toastr";
import {cachingDisabled} from "@angular-devkit/build-angular/src/utils/environment-options";

// Enable production mode
// import { enableProdMode } from '@angular/core';
Expand Down
4 changes: 2 additions & 2 deletions src/AlbumViewerBusiness/AlbumViewerBusiness.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<!--<ProjectReference Include="..\Westwind.Utilities\Westwind.Utilities.csproj" />-->
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.5" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Westwind.Utilities" Version="3.0.32" />
<PackageReference Include="Westwind.Utilities" Version="3.0.41" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
Expand Down
21 changes: 9 additions & 12 deletions src/AlbumViewerNetCore/AlbumViewerNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
</PropertyGroup>


<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
<PackageReference Include="Westwind.AspNetCore" Version="3.2.9" />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.5" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
<PackageReference Include="Westwind.AspNetCore" Version="3.2.15" />
<ProjectReference Include="..\AlbumViewerBusiness\AlbumViewerBusiness.csproj" />
</ItemGroup>
</ItemGroup>

<ItemGroup>
<Content Update="wwwroot\**\*;Areas\**\Views;appsettings.json;albums.js;web.config">
Expand All @@ -31,9 +31,6 @@
<EmbeddedResource Remove="logs\**" />
<None Remove="logs\**" />
</ItemGroup>
<ItemGroup>
<None Remove="albums.js" />
</ItemGroup>
<ItemGroup>
<Content Include="albums.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
Binary file not shown.
55 changes: 52 additions & 3 deletions src/AlbumViewerNetCore/wwwroot/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ MIT
@angular/forms
MIT

@angular/http
@angular/localize
MIT

@angular/platform-browser
Expand Down Expand Up @@ -97,7 +97,7 @@ THE SOFTWARE.

core-js
MIT
Copyright (c) 2014-2018 Denis Pushkarev
Copyright (c) 2014-2019 Denis Pushkarev

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -118,9 +118,58 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


css-loader
MIT
Copyright JS Foundation and other contributors

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


font-awesome
(OFL-1.1 AND MIT)

ngx-toastr
MIT
The MIT License (MIT)

Copyright (c) Scott Cooper <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


regenerator-runtime
MIT
MIT License
Expand Down Expand Up @@ -418,7 +467,7 @@ zone.js
MIT
The MIT License

Copyright (c) 2016-2018 Google, Inc.
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions src/AlbumViewerNetCore/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
box-shadow: 4px 4px 6px #535353;
}
</style>
<link rel="stylesheet" href="styles.a35f2ac060eeb9d8a09a.css"></head>
<link rel="stylesheet" href="styles.f47ed14eeff9fa245dd2.css"></head>
<body>

<app-root>
Expand All @@ -47,5 +47,5 @@
</div>
</app-root>

<script src="runtime.a8ef3a8272419c2e2c66.js" defer></script><script src="polyfills-es5.89d26f178be05ba2e3cb.js" nomodule defer></script><script src="polyfills.312b52cb27b220c62ec1.js" defer></script><script src="scripts.7bd68d4423a1ac627fe9.js" defer></script><script src="main.f5a2ea3ed905c32893cd.js" defer></script></body>
<script src="runtime.c51bd5b1c616d9ffddc1.js" defer></script><script src="polyfills-es5.e9d750754f15857586fb.js" nomodule defer></script><script src="polyfills.3685da637ddd85b7da95.js" defer></script><script src="scripts.db8057d9cf2a8af13658.js" defer></script><script src="main.160133dc537c559f10c1.js" defer></script></body>
</html>

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

10 changes: 10 additions & 0 deletions src/AlbumViewerNetCore/wwwroot/styles.f47ed14eeff9fa245dd2.css

Large diffs are not rendered by default.

0 comments on commit 53a0c9b

Please sign in to comment.