Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions Engine/Engine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,20 @@
<Compile Remove="Commands\GetScriptAnalyzerLoggerCommand.cs" />
</ItemGroup>

<ItemGroup>
<None Remove="Settings\*.psd1" />
<None Remove="Settings\*.json" />
</ItemGroup>

<ItemGroup>
<Content Include="Settings\*.psd1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Settings\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions build.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ function Start-ScriptAnalyzerBuild
"$projectRoot\Engine\ScriptAnalyzer.format.ps1xml", "$projectRoot\Engine\ScriptAnalyzer.types.ps1xml"
)

$settingsFiles = Get-Childitem "$projectRoot\Engine\Settings" | ForEach-Object -MemberName FullName

$destinationDir = "$projectRoot\out\PSScriptAnalyzer"
# this is normalizing case as well as selecting the proper location
if ( $Framework -eq "core" ) {
Expand Down Expand Up @@ -231,6 +229,7 @@ function Start-ScriptAnalyzerBuild
)
Publish-File $itemsToCopyBinaries $destinationDirBinaries

$settingsFiles = Get-Childitem "$projectRoot\Engine\Settings" | ForEach-Object -MemberName FullName
Publish-File $settingsFiles (Join-Path -Path $destinationDir -ChildPath Settings)

# copy newtonsoft dll if net451 framework
Expand Down