Upgrade from .Net Core 1.x to 2.0.5 runtime (using SDK 2.1.4)

.build.ps1

@@ -9,7 +9,6 @@ param(
 # todo remove aliases
 # todo make each project have its own build script
 
-$resourceScript = Join-Path $BuildRoot "New-StronglyTypedCsFileForResx.ps1"
 $outPath = "$BuildRoot/out"
 $modulePath = "$outPath/PSScriptAnalyzer"
 
@@ -81,8 +80,8 @@ function Get-BuildTaskParams($project) {
 
 function Get-RestoreTaskParams($project) {
     @{
-        Inputs  = "$BuildRoot/$project/project.json"
-        Outputs = "$BuildRoot/$project/project.lock.json"
+        Inputs  = "$BuildRoot/$project/$project.csproj"
+        Outputs = "$BuildRoot/$project/$project.csproj"
         Jobs    = {dotnet restore}
     }
 }
@@ -109,20 +108,6 @@ function Get-TestTaskParam($project) {
     }
 }
 
-function Get-ResourceTaskParam($project) {
-    @{
-        Inputs  = "$project/Strings.resx"
-        Outputs = "$project/Strings.cs"
-        Data = $project
-        Jobs    = {
-            Push-Location $BuildRoot
-            & $resourceScript $Task.Data
-            Pop-Location
-        }
-        Before  = "$project/build"
-    }
-}
-
 function Add-ProjectTask([string]$project, [string]$taskName, [hashtable]$taskParams, [string]$pathPrefix = $buildRoot) {
     $jobs = [scriptblock]::Create(@"
 pushd $pathPrefix/$project
@@ -136,14 +121,12 @@ popd
 
 $projects = @("engine", "rules")
 $projects | ForEach-Object {
-    Add-ProjectTask $_ buildResource (Get-ResourceTaskParam $_)
     Add-ProjectTask $_ build (Get-BuildTaskParams $_)
     Add-ProjectTask $_ restore (Get-RestoreTaskParams $_)
     Add-ProjectTask $_ clean (Get-CleanTaskParams $_)
     Add-ProjectTask $_ test (Get-TestTaskParam $_) "$BuildRoot/tests"
 }
 
-task buildResource -Before build "engine/buildResource", "rules/buildResource"
 task build "engine/build", "rules/build"
 task restore "engine/restore", "rules/restore"
 task clean "engine/clean", "rules/clean"

.gitignore

@@ -38,7 +38,7 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
-# DNX
+# .Net Core CLI
 project.lock.json
 artifacts/
 

Engine/Engine.csproj

@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <VersionPrefix>1.16.1</VersionPrefix>
+    <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+    <AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer</AssemblyName>
+    <PackageId>Engine</PackageId>
+    <RootNamespace>Microsoft.Windows.PowerShell.ScriptAnalyzer</RootNamespace> <!-- Namespace needs to match Assembly name for ressource binding -->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Management.Automation" Version="6.0.0-alpha13" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <Compile Remove="SafeDirectoryCatalog.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+  <Compile Remove="Commands\GetScriptAnalyzerLoggerCommand.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Strings.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'PSV3Release' ">
+    <DefineConstants>$(DefineConstants);PSV3;PSV5</DefineConstants>
+  </PropertyGroup>
+
+</Project>