Upgrade system.automation.management to 6.0.1.1 for netstandard, which required upgrade from netstandard 1.6 to netstandard2.0,which included some breaking changes in netstandard2.0 that required some more nuget packges.

bergmeister · bergmeister · commit a17699b6e0b7 · 2018-03-03T21:11:06.000Z
diff --git a/.build.ps1 b/.build.ps1
@@ -1,5 +1,5 @@
 param(
-    [ValidateSet("net451", "netstandard1.6")]
+    [ValidateSet("net451", "netstandard2.0")]
     [string]$Framework = "net451",
 
     [ValidateSet("Debug", "Release", "PSv3Debug", "PSv3Release")]
@@ -19,7 +19,7 @@ if ($BuildTask -eq "release") {
             "net451"         = @{
                 Configuration = @('Release', "PSV3Release")
             }
-            "netstandard1.6" = @{
+            "netstandard2.0" = @{
                 Configuration = @('Release')
             }
         }
@@ -145,7 +145,7 @@ task createModule {
             $itemsToCopyBinaries = @("$solutionDir\Engine\bin\$Configuration\$Framework\Microsoft.Windows.PowerShell.ScriptAnalyzer.dll",
                 "$solutionDir\Rules\bin\$Configuration\$Framework\Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules.dll")
 
-            if ($Framework -eq "netstandard1.6") {
+            if ($Framework -eq "netstandard2.0") {
                 $destinationDirBinaries = "$destinationDir\coreclr"
             }
             elseif ($Configuration -match 'PSv3') {
diff --git a/Engine/Engine.csproj b/Engine/Engine.csproj
@@ -2,38 +2,37 @@
 
   <PropertyGroup>
     <VersionPrefix>1.16.1</VersionPrefix>
-    <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;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' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <Compile Remove="SafeDirectoryCatalog.cs" />
   </ItemGroup>
 
   <ItemGroup>
   <Compile Remove="Commands\GetScriptAnalyzerLoggerCommand.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Strings.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -49,6 +48,14 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Management.Automation" Version="6.0.1.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
+    <PackageReference Include="System.Management.Automation" Version="6.0.0-alpha13" />
+  </ItemGroup>
+   
   <PropertyGroup Condition=" '$(Configuration)' == 'PSV3Release' ">
     <DefineConstants>$(DefineConstants);PSV3;PSV5</DefineConstants>
   </PropertyGroup>
diff --git a/Engine/ScriptAnalyzer.cs b/Engine/ScriptAnalyzer.cs
@@ -1141,7 +1141,7 @@ private List<ExternalRule> GetExternalRule(string[] moduleNames)
                             {
                                 dynamic description = helpContent[0].Properties["Description"];
 
-                                if (null != description && null != description.Value && description.Value.GetType().IsArray)
+                                if (description != null && description.Value != null && description.Value.GetType().IsArray)
                                 {
                                     desc = description.Value[0].Text;
                                 }
diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ Exit
     ```
     * PowerShell Core
     ```powershell
-    .\buildCoreClr.ps1 -Framework netstandard1.6 -Configuration Release -Build
+    .\buildCoreClr.ps1 -Framework netstandard2.0 -Configuration Release -Build
     ```
 * Build documenatation
     ```powershell
diff --git a/Rules/Rules.csproj b/Rules/Rules.csproj
@@ -2,20 +2,16 @@
 
   <PropertyGroup>
     <VersionPrefix>1.16.1</VersionPrefix>
-    <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
     <AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules</AssemblyName>
     <PackageId>Rules</PackageId>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback)</PackageTargetFallback>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.0.4</RuntimeFrameworkVersion>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(PackageTargetFallback)</PackageTargetFallback>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">1.0.4</RuntimeFrameworkVersion>
     <RootNamespace>Microsoft.Windows.PowerShell.ScriptAnalyzer</RootNamespace> <!-- Namespace needs to match Assembly name for ressource binding -->
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Engine\Engine.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Management.Automation" Version="6.0.0-alpha13" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 
@@ -30,14 +26,10 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <Compile Remove="UseSingularNouns.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Strings.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -53,6 +45,17 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
+    <PackageReference Include="System.Management.Automation" Version="6.0.0-alpha13" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Management.Automation" Version="6.0.1.1" />
+    <PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha08" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0-preview1-26216-02" />
+    <Compile Remove="UseSingularNouns.cs" />
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'PSV3Release' ">
     <DefineConstants>$(DefineConstants);PSV3;PSV5</DefineConstants>
   </PropertyGroup>
diff --git a/Utils/ReleaseMaker.psm1 b/Utils/ReleaseMaker.psm1
@@ -95,7 +95,7 @@ function New-ReleaseBuild
         remove-item out/ -recurse -force
         .\buildCoreClr.ps1 -Framework net451 -Configuration Release -Build
         .\buildCoreClr.ps1 -Framework net451 -Configuration PSV3Release -Build
-        .\buildCoreClr.ps1 -Framework netstandard1.6 -Configuration Release -Build
+        .\buildCoreClr.ps1 -Framework netstandard2.0 -Configuration Release -Build
         .\build.ps1 -BuildDocs
     }
     finally
diff --git a/appveyor.yml b/appveyor.yml
@@ -52,7 +52,7 @@ build_script:
         Write-Verbose ".NET SDK version: $(dotnet --version)" -Verbose
         Push-Location C:\projects\psscriptanalyzer
         # Test build using netstandard to test whether APIs are being called that are not available in .Net Core. Remove output afterwards.
-        .\buildCoreClr.ps1 -Framework netstandard1.6 -Configuration Release -Build
+        .\buildCoreClr.ps1 -Framework netstandard2.0 -Configuration Release -Build
         git clean -dfx
         C:\projects\psscriptanalyzer\buildCoreClr.ps1 -Framework net451 -Configuration $env:BuildConfiguration -Build
         C:\projects\psscriptanalyzer\build.ps1 -BuildDocs
diff --git a/buildCoreClr.ps1 b/buildCoreClr.ps1
@@ -3,14 +3,14 @@
     [switch]$Uninstall,
     [switch]$Install,
 
-    [ValidateSet("net451", "netstandard1.6")]
-    [string]$Framework = "netstandard1.6",
+    [ValidateSet("net451", "netstandard2.0")]
+    [string]$Framework = "netstandard2.0",
 
     [ValidateSet("Debug", "Release", "PSv3Debug", "PSv3Release")]
     [string]$Configuration = "Debug"
 )
 
-if ($Configuration -match "PSv3" -and $Framework -eq "netstandard1.6")
+if ($Configuration -match "PSv3" -and $Framework -eq "netstandard2.0")
 {
     throw ("{0} configuration is not applicable to {1} framework" -f $Configuration,$Framework)
 }
@@ -32,7 +32,7 @@ $itemsToCopyCommon = @("$solutionDir\Engine\PSScriptAnalyzer.psd1",
 
 $destinationDir = "$solutionDir\out\PSScriptAnalyzer"
 $destinationDirBinaries = $destinationDir
-if ($Framework -eq "netstandard1.6")
+if ($Framework -eq "netstandard2.0")
 {
     $destinationDirBinaries = "$destinationDir\coreclr"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`param(`
`2`		`- [ValidateSet("net451", "netstandard1.6")]`
	`2`	`+ [ValidateSet("net451", "netstandard2.0")]`
`3`	`3`	`[string]$Framework = "net451",`
`4`	`4`
`5`	`5`	`[ValidateSet("Debug", "Release", "PSv3Debug", "PSv3Release")]`
`@@ -19,7 +19,7 @@ if ($BuildTask -eq "release") {`
`19`	`19`	`"net451" = @{`
`20`	`20`	`Configuration = @('Release', "PSV3Release")`
`21`	`21`	`}`
`22`		`- "netstandard1.6" = @{`
	`22`	`+ "netstandard2.0" = @{`
`23`	`23`	`Configuration = @('Release')`
`24`	`24`	`}`
`25`	`25`	`}`
`@@ -145,7 +145,7 @@ task createModule {`
`145`	`145`	`$itemsToCopyBinaries = @("$solutionDir\Engine\bin\$Configuration\$Framework\Microsoft.Windows.PowerShell.ScriptAnalyzer.dll",`
`146`	`146`	`"$solutionDir\Rules\bin\$Configuration\$Framework\Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules.dll")`
`147`	`147`
`148`		`- if ($Framework -eq "netstandard1.6") {`
	`148`	`+ if ($Framework -eq "netstandard2.0") {`
`149`	`149`	`$destinationDirBinaries = "$destinationDir\coreclr"`
`150`	`150`	`}`
`151`	`151`	`elseif ($Configuration -match 'PSv3') {`
Original file line number	Diff line number	Diff line change
`@@ -1141,7 +1141,7 @@ private List<ExternalRule> GetExternalRule(string[] moduleNames)`
`1141`	`1141`	`{`
`1142`	`1142`	`dynamic description = helpContent[0].Properties["Description"];`
`1143`	`1143`
`1144`		`- if (null != description && null != description.Value && description.Value.GetType().IsArray)`
	`1144`	`+ if (description != null && description.Value != null && description.Value.GetType().IsArray)`
`1145`	`1145`	`{`
`1146`	`1146`	`desc = description.Value[0].Text;`
`1147`	`1147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ function New-ReleaseBuild`
`95`	`95`	`remove-item out/ -recurse -force`
`96`	`96`	`.\buildCoreClr.ps1 -Framework net451 -Configuration Release -Build`
`97`	`97`	`.\buildCoreClr.ps1 -Framework net451 -Configuration PSV3Release -Build`
`98`		`- .\buildCoreClr.ps1 -Framework netstandard1.6 -Configuration Release -Build`
	`98`	`+ .\buildCoreClr.ps1 -Framework netstandard2.0 -Configuration Release -Build`
`99`	`99`	`.\build.ps1 -BuildDocs`
`100`	`100`	`}`
`101`	`101`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@`
`3`	`3`	`[switch]$Uninstall,`
`4`	`4`	`[switch]$Install,`
`5`	`5`
`6`		`- [ValidateSet("net451", "netstandard1.6")]`
`7`		`- [string]$Framework = "netstandard1.6",`
	`6`	`+ [ValidateSet("net451", "netstandard2.0")]`
	`7`	`+ [string]$Framework = "netstandard2.0",`
`8`	`8`
`9`	`9`	`[ValidateSet("Debug", "Release", "PSv3Debug", "PSv3Release")]`
`10`	`10`	`[string]$Configuration = "Debug"`
`11`	`11`	`)`
`12`	`12`
`13`		`-if ($Configuration -match "PSv3" -and $Framework -eq "netstandard1.6")`
	`13`	`+if ($Configuration -match "PSv3" -and $Framework -eq "netstandard2.0")`
`14`	`14`	`{`
`15`	`15`	`throw ("{0} configuration is not applicable to {1} framework" -f $Configuration,$Framework)`
`16`	`16`	`}`
`@@ -32,7 +32,7 @@ $itemsToCopyCommon = @("$solutionDir\Engine\PSScriptAnalyzer.psd1",`
`32`	`32`
`33`	`33`	`$destinationDir = "$solutionDir\out\PSScriptAnalyzer"`
`34`	`34`	`$destinationDirBinaries = $destinationDir`
`35`		`-if ($Framework -eq "netstandard1.6")`
	`35`	`+if ($Framework -eq "netstandard2.0")`
`36`	`36`	`{`
`37`	`37`	`$destinationDirBinaries = "$destinationDir\coreclr"`
`38`	`38`	`}`