Clean Build for 2019

.gitignore

@@ -240,4 +240,8 @@ bower_components
 /smoke-alarm-requests-sample-data-INVALID.csv
 /smoke-alarm-requests-sample-data-EMPTY.csv
 /smoke-alarm-requests-sample-data-DUPLICATE.csv
-/AllReadyApp/Web-App/AllReady/wwwroot/upload
+/AllReadyApp/Web-App/AllReady/wwwroot/upload
+/AllReadyApp/Web-App/AllReady/wwwroot/js/site.js
+/AllReadyApp/Web-App/AllReady/wwwroot/ts/mappingTools.js
+/AllReadyApp/Web-App/AllReady/wwwroot/ts/shapelist.js
+/AllReadyApp/Web-App/AllReady/wwwroot/ts/shapes.js

AllReadyApp/AllReady.IntegrationTest/AllReady.ScenarioTest.fsproj

@@ -9,12 +9,13 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>AllReady.IntegrationTest</RootNamespace>
     <AssemblyName>AllReady.IntegrationTest</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
     <Name>AllReady.ScenarioTest</Name>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -100,7 +101,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.2.33.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.2.33.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.Chrome.WebDriver.2.45\build\Selenium.Chrome.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Chrome.WebDriver.2.45\build\Selenium.Chrome.WebDriver.targets'))" />
   </Target>
+  <Import Project="..\packages\Selenium.Chrome.WebDriver.2.45\build\Selenium.Chrome.WebDriver.targets" Condition="Exists('..\packages\Selenium.Chrome.WebDriver.2.45\build\Selenium.Chrome.WebDriver.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

AllReadyApp/AllReady.IntegrationTest/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+  </startup>
 </configuration>

AllReadyApp/AllReady.IntegrationTest/Program.fs

@@ -1,4 +1,4 @@
-open canopy
+open canopy
 open runner
 open System
 
@@ -11,6 +11,7 @@ CreatingActivitiesForCampaigns.All Constants.UrlLocalHost
 
 //Chrome Driver: https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver
 canopy.configuration.chromeDir <- System.AppDomain.CurrentDomain.BaseDirectory
+canopy.configuration.elementTimeout <- 100.0
 let chromeOptions = OpenQA.Selenium.Chrome.ChromeOptions()
 chromeOptions.AddArgument("--disable-extensions")
 start <| ChromeWithOptions chromeOptions

AllReadyApp/AllReady.IntegrationTest/packages.config

@@ -3,6 +3,7 @@
   <package id="canopy" version="1.6.1" targetFramework="net462" />
   <package id="FSharp.Core" version="4.2.3" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
+  <package id="Selenium.Chrome.WebDriver" version="2.45" targetFramework="net461" />
   <package id="Selenium.Support" version="3.7.0" targetFramework="net462" />
   <package id="Selenium.WebDriver" version="3.7.0" targetFramework="net462" />
   <package id="Selenium.WebDriver.ChromeDriver" version="2.33.0" targetFramework="net462" />

AllReadyApp/AllReadyWebOnly.sln

@@ -31,6 +31,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Builds", "Builds", "{79E5CF
 	EndProjectSection
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AllReady.ScenarioTest", "AllReady.IntegrationTest\AllReady.ScenarioTest.fsproj", "{44055C15-5757-4822-908B-C66B60251C54}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D00DE040-2254-4118-B172-F14E6FE56D44} = {D00DE040-2254-4118-B172-F14E6FE56D44}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -70,9 +73,6 @@ Global
 		{79E5CFB4-6FF7-4F89-B560-9342FFE91898} = {364DE571-98D2-4F69-8D93-F25F832E7D7A}
 		{44055C15-5757-4822-908B-C66B60251C54} = {1475C1FD-CE7D-4E6B-83B1-F7F82EA24FF8}
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {645EFF42-0422-4249-B544-6038D44E3CDE}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FCAA194F-AD24-45C2-AA51-78C71433DCC0}
 	EndGlobalSection

AllReadyApp/Web-App/AllReady/AllReady.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Description>AllReady</Description>
@@ -46,10 +46,7 @@
   </Target>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
   </ItemGroup>
 
 </Project>

AllReadyApp/Web-App/AllReady/gulpfile.js

@@ -1,4 +1,4 @@
-/// <binding Clean='clean' ProjectOpened='watch' />
+/// <binding Clean='clean' ProjectOpened='watch' />
 var gulp = require("gulp"),
     rimraf = require("rimraf"),
     concat = require("gulp-concat"),
@@ -23,7 +23,7 @@ gulp.task("clean", function (cb) {
     rimraf(paths.concatCssDest, cb);
 });
 
-gulp.task('build:lib', function () {
+gulp.task('build:lib', function (done) {
     function getNPMDependencies() {
         var buffer, packages, keys;
         buffer = fs.readFileSync('package.json');
@@ -40,18 +40,20 @@ gulp.task('build:lib', function () {
     function copyNodeModule(name) {
         gulp.src('node_modules/' + name + '/**/*')
             .pipe(gulp.dest('wwwroot/lib/' + name + '/'));
-    };
+    }
 
     var dependencies = getNPMDependencies();
     for (var i in dependencies) {
-        copyNodeModule(dependencies[i])
+        copyNodeModule(dependencies[i]);
     }
-})
+    done();
+});
 
-gulp.task('build:ts', function () {
+gulp.task('build:ts', function (done) {
     var tsResult = tsProject.src()
         .pipe(tsProject())
         .js.pipe(gulp.dest(paths.webroot));
+    done();
 });
 
 gulp.task("build:css", function () {
@@ -61,8 +63,8 @@ gulp.task("build:css", function () {
         .pipe(gulp.dest("."));
 });
 
-gulp.task("build", ["build:lib", "build:ts", "build:css"]);
-gulp.task("min", ["build"]);
+gulp.task("build", gulp.series("build:lib", "build:ts", "build:css"));
+gulp.task("min", gulp.series("build"));
 
 gulp.task("watch", function () {
     gulp.watch([paths.css, paths.ts], ["build"]);