Merge pull request #36 from bradymholt/netcore21

Upgrade to .NET Core 2.1

Author: bradymholt

.gitignore

@@ -4,7 +4,6 @@
 bin/
 obj/
 project.lock.json
-.NETCoreApp,Version=v2.0.AssemblyAttributes.cs
 NuGetScratch/
 
 api/wwwroot/**

.vscode/launch.json

@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceRoot}/api/bin/Debug/netcoreapp2.0/api.dll",
+      "program": "${workspaceRoot}/api/bin/Debug/netcoreapp2.1/api.dll",
       "args": [],
       "env": {
         "ASPNETCORE_ENVIRONMENT": "Development",

README.md

@@ -1,13 +1,13 @@
 # ASP.NET Core / React SPA Template App
 
-This app is a template application using ASP.NET Core 2.0 for a REST/JSON API server and React for a web client.
+This app is a template application using ASP.NET Core 2.1 for a REST/JSON API server and React for a web client.
 
 ![screen recording 2017-06-10 at 04 12 pm](https://user-images.githubusercontent.com/759811/27006360-bd3b8152-4df7-11e7-9011-f22204abe4d5.gif)
 
 ## Overview of Stack
 - Server
-  - ASP.NET Core 2.0
-  - PostgreSQL
+  - ASP.NET Core 2.1
+  - PostgreSQL 10
   - Entity Framework Core w/ EF Migrations
   - JSON Web Token (JWT) authorization
   - Docker used for development PostgreSQL database and MailCatcher server
@@ -31,7 +31,7 @@ This app is a template application using ASP.NET Core 2.0 for a REST/JSON API se
 ## Setup
 
 1. Install the following:
-   - [.NET Core 2.0](https://www.microsoft.com/net/core)
+   - [.NET Core 2.1](https://www.microsoft.com/net/core)
    - [Node.js >= v8](https://nodejs.org/en/download/)
    - [Ansible >= 2.0](http://docs.ansible.com/ansible/intro_installation.html)
    - [Docker](https://docs.docker.com/engine/installation/)
@@ -69,7 +69,9 @@ This will run the xUnit tests in api.test/ and the Mocha/Enzyme tests in client-
 
  _Before running this script, you need to create an ops/hosts file first.  See the [ops README](ops/) for instructions._
 
- This will run the ops/provision.yml Ansible playbook and provision hosts in ops/hosts inventory file.  This prepares the hosts to recieve deployments by doing the following:
+ This will run the ops/provision.yml Ansible playbook and provision hosts in ops/hosts inventory file.  Ubuntu 16.04 (Xenial) and Ubuntu 18.04 (Bionic) is supported and tested.
+
+ This prepares the hosts to recieve deployments by doing the following:
   - Install Nginx
   - Generate a SSL certificate from [Let's Encrypt](https://letsencrypt.org/) and configure Nginx to use it
   - Install .Net Core
@@ -86,7 +88,9 @@ _Before running this script, you need to create a ops/hosts file first.  See the
 This script will:
  - Build release Webpack bundles
  - Package the .NET Core application in Release mode (dotnet publish)
- - Run the ops/deploy.yml Ansible playbook to deploy this app to hosts in /ops/hosts inventory file.  This does the following:
+ - Run the ops/deploy.yml Ansible playbook to deploy this app to hosts in /ops/hosts inventory file.
+
+ This does the following:
   - Copies the build assets to the remote host(s)
   - Updates the `appsettings.json` file with PostgreSQL credentials specified in ops/hosts file and the app URL (needed for JWT tokens)
   - Restarts the app so that changes will be picked up

api.test/api.test.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>api.test</AssemblyName>
     <PackageId>api.test</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

api/Migrations/20171204210645_Initial.Designer.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using System;
 using System.Collections.Generic;
 

api/Migrations/20171204210645_Initial.cs

@@ -6,6 +6,7 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.Internal;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using System;
 
 namespace api.Migrations

api/Migrations/DefaultDbContextModelSnapshot.cs

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>api</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>api</PackageId>
@@ -14,12 +14,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
     <PackageReference Include="AspNet.Security.OAuth.Validation" Version="2.0.0-*" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
   </ItemGroup>
 </Project>

api/api.csproj

@@ -2,7 +2,7 @@ This folder contains [Ansible](https://www.ansible.com/) assets responsible for
 
 ## Setup
 
-1. Procure access to Ubuntu 16 host(s) which will be used to host this application.  [AWS](aws.amazon.com) or [Digital Ocean](https://m.do.co/c/974ef9a471c1) are good options.
+1. Procure access to Ubuntu 16.04 (Xenial) or Ubuntu 18.04 (Bionic) host which will be used to host this application.  [AWS](aws.amazon.com) or [Digital Ocean](https://m.do.co/c/974ef9a471c1) are good options.
 2. Setup DNS records to point to these host(s).
 3. Create `hosts` file in this directory, using `hosts.example` as a pattern.
 

ops/README.md

@@ -1,6 +1,7 @@
 ---
 database_name: "{{ app_name }}"
 database_username: "{{ app_name }}"
+source_directory: ../api/bin/Release/netcoreapp2.1/publish/
 deploy_directory: "/home/{{ deploy_user }}/apps/{{ app_name }}"
 email_enable_ssl: true
 email_from_name: "{{ app_name }}"

ops/group_vars/all

@@ -1,15 +1,14 @@
 # Global variables
 [all:vars]
-app_name=aspnetCoreReactTemplate                                          # Name of the application
-source_directory=../../../../appName/bin/Release/netcoreapp2.0/publish/   # The local deploy build asset source location (source files for deploy)
-entry_dll_file_name=api.dll                                               # The name of the .NET Core DLL to run
+app_name=aspnetCoreReactTemplate
 
 # Production variables
 [production_web]
 0.0.0.0                                   # The IP address or hostname of the production web server
 
 [production:vars]
-deploy_user=jdoe                          # The name of the remote user account for provisioning and deployment
+# The name of the remote user account for provisioning and deployment
+deploy_user=jdoe
 gh_pubkey_user=johndoe1981                # The GitHub username used to pull the public key for deploy_user authorized_user access
 use_ssl=true                              # If true, SSL cert will be obtained from Let's Encrypt and Nginx provisioned for SSL
 letsencrypt_use_live_ca=true              # If true, will use the Live Let's Encrypt ACME servers; otherwise will use staging server

ops/hosts.example

@@ -1,2 +1,2 @@
 ---
-dotnetcore_package_name: dotnet-sdk-2.0.0
+dotnetcore_package_name: dotnet-sdk-2.1

ops/roles/dotnetcore/defaults/main.yml

@@ -1,17 +1,15 @@
 ---
-- name: Create dotnetdev.list file
-  command: touch /etc/apt/sources.list.d/dotnetdev.list creates="/etc/apt/sources.list.d/dotnetdev.list"
+- name: Download product repository file
+  get_url:
+    url: "https://packages.microsoft.com/config/ubuntu/{{ansible_distribution_major_version}}.04/packages-microsoft-prod.deb"
+    dest: "/tmp/packages-microsoft-prod.deb"
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "18"
 
-- name: Set apt-get feed for Ubuntu Xenial
-  lineinfile: dest=/etc/apt/sources.list.d/dotnetdev.list line="deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main"
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16"
+- name: Execute dehydrated shell script
+  shell: "dpkg -i /tmp/packages-microsoft-prod.deb"
 
-- name: Set apt-get feed for Ubuntu Trusty
-  lineinfile: dest=/etc/apt/sources.list.d/dotnetdev.list line="deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main"
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "14"
-
-- name: Add apt key
-  apt_key: keyserver=apt-mo.trafficmanager.net id=417A0893
+- name: Install transport-https
+  apt: pkg=apt-transport-https state=present update_cache=yes
 
 - name: Install dotnet core SDK
-  apt: name={{ dotnetcore_package_name }} state=present update_cache=yes
+  apt: name={{ dotnetcore_package_name }} state=present

ops/roles/dotnetcore/tasks/main.yml

@@ -14,7 +14,7 @@
 - name: Configure | postgres | pidfile
   lineinfile:
     state: present
-    dest: "/etc/postgresql/{{ postgresql_version }}/main/postgresql.conf"
+    dest: "/etc/postgresql/{{ postgresql_major_version }}/main/postgresql.conf"
     regexp: '^#*external_pid_file'
     line: "external_pid_file = '{{ postgresql_pidfile_path }}'"
   notify: Reload Service | postgres
@@ -25,7 +25,7 @@
 - name: Configure | postgres | listen_address
   lineinfile:
     state: present
-    dest: "/etc/postgresql/{{ postgresql_version }}/main/postgresql.conf"
+    dest: "/etc/postgresql/{{ postgresql_major_version }}/main/postgresql.conf"
     regexp: '^#* *listen_addresses ='
     line: "listen_addresses = '*'"
   notify: Reload Service | postgres
@@ -36,7 +36,7 @@
 - name: Configure | postgres | pg_hba.conf
   lineinfile:
     state: present
-    dest: "/etc/postgresql/{{ postgresql_version }}/main/pg_hba.conf"
+    dest: "/etc/postgresql/{{ postgresql_major_version }}/main/pg_hba.conf"
     regexp: "^#* *host {{ item }}"
     line: "host {{ item }} {{ database_username | default(project) }} all md5"
   with_items:

ops/roles/postgresql/tasks/configure.yml

@@ -1,2 +1,2 @@
 ---
-postgresql_version: '9.5'
+postgresql_major_version: '10'

ops/roles/postgresql/vars/main.yml

@@ -1,3 +1,2 @@
-entry_dll_file_name: "{{app_name}}.dll"
 log_file: "/var/log/{{app_name}}.out.log"
 error_file: "/var/log/{{app_name}}.err.log"

ops/roles/supervisor/defaults/main.yml

@@ -1,8 +1,8 @@
 ---
 - name: Reload supervisor
+  become: true
   service: name=supervisor state=reloaded enabled=true
 
 - name: Reload supervisor app config
-  become: yes
-  become_method: sudo
+  become: true
   command: supervisorctl restart {{app_name}}

ops/roles/supervisor/handlers/main.yml

@@ -1,10 +1,13 @@
 ---
 - name: Install Supervisor
+  become: true
   apt: pkg=supervisor state=present cache_valid_time=86400
 
 - name: Setup app config
+  become: true
   template: src=etc_supervisor_conf.d_app_name.conf.j2 dest=/etc/supervisor/conf.d/{{app_name}}.conf
   notify: Reload supervisor
 
 - name: Create .NET Core cert cache directory and give access to {{ webserver_user }}
+  become: true
   file: path=/var/www/.dotnet/corefx/cryptography/crls state=directory owner={{ webserver_user }} group={{ webserver_user }} mode=0775

ops/roles/supervisor/tasks/main.yml

@@ -1,5 +1,5 @@
 [program:{{app_name}}]
-command=/usr/bin/dotnet {{deploy_directory}}/{{entry_dll_file_name}}
+command=/usr/bin/dotnet {{deploy_directory}}/api.dll
 directory={{deploy_directory}}
 autostart=true
 autorestart=true