Skip to content

Commit 732014d

Browse files
authored
upgrade from net451 to net452 since net451 is not supported any more and net452 is an in-place upgrade anyway (#1108)
1 parent 85563d0 commit 732014d

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

Engine/Engine.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
<PropertyGroup>
44
<VersionPrefix>1.17.1</VersionPrefix>
5-
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
66
<AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer</AssemblyName>
77
<PackageId>Engine</PackageId>
88
<RootNamespace>Microsoft.Windows.PowerShell.ScriptAnalyzer</RootNamespace> <!-- Namespace needs to match Assembly name for ressource binding -->
99
</PropertyGroup>
1010

11-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
11+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
1212
<Reference Include="System.ComponentModel.Composition" />
1313
</ItemGroup>
1414

15-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
15+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
1616
<DebugType>portable</DebugType>
1717
</PropertyGroup>
1818

@@ -51,15 +51,15 @@
5151
<PackageReference Include="System.Management.Automation" Version="6.0.2" />
5252
</ItemGroup>
5353

54-
<ItemGroup Condition="'$(TargetFramework)' == 'net451' AND '$(Configuration)' == 'PSV3Release' AND '$(Configuration)' != 'PSV4Release'">
54+
<ItemGroup Condition="'$(TargetFramework)' == 'net452' AND '$(Configuration)' == 'PSV3Release' AND '$(Configuration)' != 'PSV4Release'">
5555
<PackageReference Include="Microsoft.PowerShell.3.ReferenceAssemblies" Version="1.0.0" />
5656
</ItemGroup>
5757

58-
<ItemGroup Condition="'$(TargetFramework)' == 'net451' AND '$(Configuration)' == 'PSV4Release'">
58+
<ItemGroup Condition="'$(TargetFramework)' == 'net452' AND '$(Configuration)' == 'PSV4Release'">
5959
<PackageReference Include="Microsoft.PowerShell.4.ReferenceAssemblies" Version="1.0.0" />
6060
</ItemGroup>
6161

62-
<ItemGroup Condition="'$(TargetFramework)' == 'net451' AND '$(Configuration)' != 'PSV3Release'">
62+
<ItemGroup Condition="'$(TargetFramework)' == 'net452' AND '$(Configuration)' != 'PSV3Release'">
6363
<PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
6464
</ItemGroup>
6565

Rules/Rules.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<VersionPrefix>1.17.1</VersionPrefix>
5-
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
66
<AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules</AssemblyName>
77
<PackageId>Rules</PackageId>
88
<RootNamespace>Microsoft.Windows.PowerShell.ScriptAnalyzer</RootNamespace> <!-- Namespace needs to match Assembly name for ressource binding -->
@@ -13,12 +13,12 @@
1313
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1414
</ItemGroup>
1515

16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
1717
<Reference Include="System.ComponentModel.Composition" />
1818
<Reference Include="System.Data.Entity.Design" />
1919
</ItemGroup>
2020

21-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
21+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
2222
<DebugType>portable</DebugType>
2323
</PropertyGroup>
2424

@@ -41,7 +41,7 @@
4141
</EmbeddedResource>
4242
</ItemGroup>
4343

44-
<ItemGroup Condition="'$(TargetFramework)' == 'net451' ">
44+
<ItemGroup Condition="'$(TargetFramework)' == 'net452' ">
4545
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha*" />
4646
</ItemGroup>
4747

Utils/ReleaseMaker.psm1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ function New-ReleaseBuild
9393
try
9494
{
9595
if ( test-path out ) { remove-item out/ -recurse -force }
96-
.\buildCoreClr.ps1 -Framework net451 -Configuration PSV3Release -Build
97-
.\buildCoreClr.ps1 -Framework net451 -Configuration PSV4Release -Build
98-
.\buildCoreClr.ps1 -Framework net451 -Configuration Release -Build
96+
.\buildCoreClr.ps1 -Framework net452 -Configuration PSV3Release -Build
97+
.\buildCoreClr.ps1 -Framework net452 -Configuration PSV4Release -Build
98+
.\buildCoreClr.ps1 -Framework net452 -Configuration Release -Build
9999
.\buildCoreClr.ps1 -Framework netstandard2.0 -Configuration Release -Build
100100
.\build.ps1 -BuildDocs
101101
}

build.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function Start-ScriptAnalyzerBuild
167167
$frameworkName = "netstandard2.0"
168168
}
169169
else {
170-
$frameworkName = "net451"
170+
$frameworkName = "net452"
171171
}
172172

173173
# build the appropriate assembly
@@ -233,7 +233,7 @@ function Start-ScriptAnalyzerBuild
233233

234234
Publish-File $settingsFiles (Join-Path -Path $destinationDir -ChildPath Settings)
235235

236-
# copy newtonsoft dll if net451 framework
236+
# copy newtonsoft dll if net452 framework
237237
if ($Framework -eq "full") {
238238
Copy-Item -path "$projectRoot\Rules\bin\${config}\${frameworkName}\Newtonsoft.Json.dll" -Destination $destinationDirBinaries
239239
}

0 commit comments

Comments
 (0)