Skip to content

Upgrade build target from net451 to net452 since net451 is not supported any more and net452 is an in-place upgrade anyway #1108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 10, 2019
Merged

Upgrade build target from net451 to net452 since net451 is not supported any more and net452 is an in-place upgrade anyway #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a3eaa3
upgrade from net451 to net452 since net451 is not supported any more …
bergmeister Dec 12, 2018
f775500
Merge branch 'development' of https://github.com/PowerShell/PSScriptA…
bergmeister Dec 15, 2018
9a2848b
Merge branch 'development' of https://github.com/PowerShell/PSScriptA…
bergmeister Jan 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Engine/Engine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions Rules/Rules.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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>

Expand All @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions Utils/ReleaseMaker.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function Start-ScriptAnalyzerBuild
$frameworkName = "netstandard2.0"
}
else {
$frameworkName = "net451"
$frameworkName = "net452"
}

# build the appropriate assembly
Expand Down Expand Up @@ -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
}
Expand Down