Skip to content

Commit

Permalink
Upgrade to .NET Core 2.2 Preview 2.
Browse files Browse the repository at this point in the history
Delete unused razor pages.
  • Loading branch information
jasontaylordev committed Oct 16, 2018
1 parent 5f74aa7 commit d20ce54
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 85 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--<Import Project="..\Northwind.CodeAnalysis.targets" />-->
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.0-preview2-35157" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0-preview2-35157" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="Shouldly" Version="3.0.0" />
<PackageReference Include="xunit" Version="2.3.1" />
Expand Down
4 changes: 2 additions & 2 deletions Northwind.Application/Northwind.Application.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--<Import Project="..\Northwind.CodeAnalysis.targets" />-->
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<AssemblyName>Northwind.Application</AssemblyName>
<RootNamespace>Northwind.Application</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="1.50.5" />
<PackageReference Include="FluentValidation" Version="7.6.101" />
<PackageReference Include="MediatR" Version="5.0.1" />
<PackageReference Include="MediatR" Version="5.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions Northwind.Common/Northwind.Common.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--<Import Project="..\Northwind.CodeAnalysis.targets" />-->
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<AssemblyName>Northwind.Common</AssemblyName>
<RootNamespace>Northwind.Common</RootNamespace>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion Northwind.Domain.Tests/Northwind.Domain.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--<Import Project="..\Northwind.CodeAnalysis.targets" />-->
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
18 changes: 1 addition & 17 deletions Northwind.Domain/Northwind.Domain.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--<Import Project="..\Northwind.CodeAnalysis.targets" />-->
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<AssemblyName>Northwind.Domain</AssemblyName>
<RootNamespace>Northwind.Domain</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<LangVersion>7.1</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0" />
</ItemGroup>

<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Northwind.Infrastructure/Northwind.Infrastructure.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--<Import Project="..\Northwind.CodeAnalysis.targets" />-->
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions Northwind.Persistence/Northwind.Persistence.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<LangVersion>7.1</LangVersion>
Expand All @@ -10,11 +10,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0-preview2-35157" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0-preview2-35157" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0-preview2-35157" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0-preview2-35157" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0-preview2-35157" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions Northwind.WebUI/Northwind.WebUI.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<IsPackable>false</IsPackable>
Expand All @@ -14,10 +14,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
<PackageReference Include="NSwag.AspNetCore" Version="11.18.6" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
<PackageReference Include="NSwag.AspNetCore" Version="11.18.6" />
<PackageReference Include="NSwag.MSBuild" Version="11.18.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
23 changes: 0 additions & 23 deletions Northwind.WebUI/Pages/Error.cshtml

This file was deleted.

19 changes: 0 additions & 19 deletions Northwind.WebUI/Pages/Error.cshtml.cs

This file was deleted.

3 changes: 0 additions & 3 deletions Northwind.WebUI/Pages/_ViewImports.cshtml

This file was deleted.

12 changes: 7 additions & 5 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Use these instuctions to get the project up and running.
You will need the following tools:

* [Visual Studio Code or 2017](https://www.visualstudio.com/downloads/)
* [.NET Core SDK 2.1](https://www.microsoft.com/net/download/)
* [.NET Core SDK 2.2 Preview 2](https://www.microsoft.com/net/download/dotnet-core/2.2)

### Setup
Follow these steps to get your development environment set up:
Expand All @@ -35,12 +35,14 @@ Follow these steps to get your development environment set up:
```
dotnet run
```
5. Finally, launch [http://localhost:5211/swagger/]() in your browser to view the Swagger UI for the Northwind API.
5. Launch [http://localhost:52468/](http://localhost:52468/) in your browser to view the Web UI
6. Launch [http://localhost:52468/docs](http://localhost:52468/docs) in your browser to view the API
## Technologies
* [.NET Core 2.1](https://blogs.msdn.microsoft.com/dotnet/2018/05/30/announcing-net-core-2-1/)
* [ASP.NET Core 2.1](https://blogs.msdn.microsoft.com/webdev/2018/05/30/asp-net-core-2-1-0-now-available/)
* [Entity Framework Core 2.1](https://blogs.msdn.microsoft.com/dotnet/2018/05/30/announcing-entity-framework-core-2-1/)
* [.NET Core 2.2](https://blogs.msdn.microsoft.com/dotnet/2018/09/12/announcing-net-core-2-2-preview-2/)
* [ASP.NET Core 2.2](https://blogs.msdn.microsoft.com/webdev/2018/08/22/asp-net-core-2-2-0-preview1-now-available/)
* [Entity Framework Core 2.2](https://blogs.msdn.microsoft.com/dotnet/2018/09/12/announcing-entity-framework-core-2-2-preview-2/)
## License
Expand Down

0 comments on commit d20ce54

Please sign in to comment.