upgrade from net451 to net452 since net451 is not supported any more …

…and net452 is an in-place upgrade anyway (PowerShell#1108)
bergmeister · Mar 5, 2019 · 6f52715 · 6f52715
1 parent f3993ee
commit 6f52715
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/Engine/Engine.csproj b/Engine/Engine.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <VersionPrefix>1.17.1</VersionPrefix>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net452</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 Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System.ComponentModel.Composition" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
@@ -51,15 +51,15 @@
     <PackageReference Include="System.Management.Automation" Version="6.0.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net451' AND '$(Configuration)' == 'PSV3Release' AND '$(Configuration)' != 'PSV4Release'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452' AND '$(Configuration)' == 'PSV3Release' AND '$(Configuration)' != 'PSV4Release'">
     <PackageReference Include="Microsoft.PowerShell.3.ReferenceAssemblies" Version="1.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net451' AND '$(Configuration)' == 'PSV4Release'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452' AND '$(Configuration)' == 'PSV4Release'">
     <PackageReference Include="Microsoft.PowerShell.4.ReferenceAssemblies" Version="1.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net451' AND '$(Configuration)' != 'PSV3Release'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452' AND '$(Configuration)' != 'PSV3Release'">
     <PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
   </ItemGroup>
 

diff --git a/Rules/Rules.csproj b/Rules/Rules.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.17.1</VersionPrefix>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
     <AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules</AssemblyName>
     <PackageId>Rules</PackageId>
     <RootNamespace>Microsoft.Windows.PowerShell.ScriptAnalyzer</RootNamespace> <!-- Namespace needs to match Assembly name for ressource binding -->
@@ -13,12 +13,12 @@
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data.Entity.Design" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
@@ -41,7 +41,7 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452' ">
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha*" />
   </ItemGroup>
 

diff --git a/Utils/ReleaseMaker.psm1 b/Utils/ReleaseMaker.psm1
@@ -93,9 +93,9 @@ function New-ReleaseBuild
     try
     {
         if ( test-path out ) { remove-item out/ -recurse -force }
-        .\buildCoreClr.ps1 -Framework net451 -Configuration PSV3Release -Build
-        .\buildCoreClr.ps1 -Framework net451 -Configuration PSV4Release -Build
-        .\buildCoreClr.ps1 -Framework net451 -Configuration Release -Build
+        .\buildCoreClr.ps1 -Framework net452 -Configuration PSV3Release -Build
+        .\buildCoreClr.ps1 -Framework net452 -Configuration PSV4Release -Build
+        .\buildCoreClr.ps1 -Framework net452 -Configuration Release -Build
         .\buildCoreClr.ps1 -Framework netstandard2.0 -Configuration Release -Build
         .\build.ps1 -BuildDocs
     }

diff --git a/build.psm1 b/build.psm1
@@ -167,7 +167,7 @@ function Start-ScriptAnalyzerBuild
             $frameworkName = "netstandard2.0"
         }
         else {
-            $frameworkName = "net451"
+            $frameworkName = "net452"
         }
 
         # build the appropriate assembly
@@ -233,7 +233,7 @@ function Start-ScriptAnalyzerBuild
 
         Publish-File $settingsFiles (Join-Path -Path $destinationDir -ChildPath Settings)
 
-        # copy newtonsoft dll if net451 framework
+        # copy newtonsoft dll if net452 framework
         if ($Framework -eq "full") {
             Copy-Item -path "$projectRoot\Rules\bin\${config}\${frameworkName}\Newtonsoft.Json.dll" -Destination $destinationDirBinaries
         }