Skip to content

Commit

Permalink
Merged PR 10241: Update dev to fix the release build
Browse files Browse the repository at this point in the history
#### AI-Generated Description
This pull request introduces the following changes:

- Adds `System.Runtime.InteropServices` namespace to several test projects to use `RuntimeInformation` class.
- Adds conditional logic to skip or run some tests based on the operating system platform, since some features are not supported on Linux or OSX.
- Removes the `apiCompat.ps1` script and the `apiCompat.props` file that were used for API compatibility checks.
- Adds the `EnablePackageValidation` property and the `PackageValidationBaselineVersion` property to the `common.props` file to enable package validation checks.
- Comments out the `VerifyResourceUsage.pl` script invocation in the `build.ps1` file.
  • Loading branch information
Jean-Marc Prieur authored and Brent Schmaltz committed Oct 16, 2023
1 parent ec25d19 commit 5c1ea4a
Show file tree
Hide file tree
Showing 15 changed files with 83 additions and 459 deletions.
49 changes: 12 additions & 37 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ param(
[string]$root=$PSScriptRoot,
[string]$runTests="YES",
[string]$failBuildOnTest="YES",
[string]$slnFile="wilson.sln",
[switch]$runApiCompat,
[switch]$generateContractAssemblies)
[string]$slnFile="wilson.sln"
)

################################################# Functions ############################################################

Expand Down Expand Up @@ -47,21 +46,6 @@ function CreateArtifactsRoot($folder)
mkdir $folder | Out-Null
}

function GenerateContractAssemblies($root)
{
# clear content of baseline files as it is not relevant for the next version
ClearBaselineFiles($root)

# execute generateContractAssemblies script
& "$root\generateContractAssemblies.ps1".
}

function ClearBaselineFiles($root)
{
Write-Host ">>> Clear-Content $root\Tools\apiCompat\baseline\*.txt"
Clear-Content $root\Tools\apiCompat\baseline\*.txt
}

################################################# Functions ############################################################

if ($env:VSINSTALLDIR)
Expand All @@ -79,8 +63,6 @@ Write-Host "root: " $root;
Write-Host "runTests: " $runTests;
Write-Host "failBuildOnTest: " $failBuildOnTest;
Write-Host "slnFile: " $slnFile;
Write-Host "runApiCompat: " $runApiCompat;
Write-Host "generateContractAssemblies: " $generateContractAssemblies;
WriteSectionFooter("End build.ps1 - parameters");

[xml]$buildConfiguration = Get-Content $PSScriptRoot\buildConfiguration.xml
Expand All @@ -105,17 +87,17 @@ WriteSectionFooter("End Environment");

$ErrorActionPreference = "Stop"

WriteSectionHeader("VerifyResourceUsage.pl");
WriteSectionHeader("VerifyResourceUsage.pl");

Write-Host ">>> Start-Process -Wait -PassThru -NoNewWindow perl $root\src\VerifyResourceUsage.pl"
$verifyResourceUsageResult = Start-Process -Wait -PassThru -NoNewWindow perl $root\src\VerifyResourceUsage.pl
Write-Host ">>> Start-Process -Wait -PassThru -NoNewWindow perl $root\src\VerifyResourceUsage.pl"
$verifyResourceUsageResult = Start-Process -Wait -PassThru -NoNewWindow perl $root\src\VerifyResourceUsage.pl

if($verifyResourceUsageResult.ExitCode -ne 0)
{
throw "VerifyResourceUsage.pl failed."
}
if($verifyResourceUsageResult.ExitCode -ne 0)
{
throw "VerifyResourceUsage.pl failed."
}

WriteSectionFooter("End VerifyResourceUsage.pl");
WriteSectionFooter("End VerifyResourceUsage.pl");

WriteSectionHeader("Build");

Expand All @@ -138,24 +120,17 @@ CreateArtifactsRoot($artifactsRoot);
pushd
Set-Location $root
Write-Host ""
Write-Host ">>> Start-Process -wait -NoNewWindow $msbuildexe /restore:True /p:UseSharedCompilation=false /nr:false /verbosity:m /p:Configuration=$buildType /p:RunApiCompat=$runApiCompat $slnFile"
Write-Host ">>> Start-Process -wait -NoNewWindow $msbuildexe /restore:True /p:UseSharedCompilation=false /nr:false /verbosity:m /p:Configuration=$buildType $slnFile"
Write-Host ""
Write-Host "msbuildexe: " $msbuildexe
$p = Start-Process -Wait -PassThru -NoNewWindow $msbuildexe "/r:True /p:UseSharedCompilation=false /nr:false /verbosity:m /p:Configuration=$buildType /p:RunApiCompat=$runApiCompat $slnFile"
$p = Start-Process -Wait -PassThru -NoNewWindow $msbuildexe "/r:True /p:UseSharedCompilation=false /nr:false /verbosity:m /p:Configuration=$buildType $slnFile"

if($p.ExitCode -ne 0)
{
throw "Build failed."
}
popd

if ($generateContractAssemblies.IsPresent)
{
WriteSectionHeader("Generating Contract Assemblies");
GenerateContractAssemblies($root);
WriteSectionFooter("End Generating Contract Assemblies");
}

foreach($project in $buildConfiguration.SelectNodes("root/projects/src/project"))
{
$name = $project.name;
Expand Down
49 changes: 0 additions & 49 deletions build/apiCompat.props

This file was deleted.

224 changes: 0 additions & 224 deletions build/apiCompat.ps1

This file was deleted.

6 changes: 5 additions & 1 deletion build/common.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project>

<Import Project="apiCompat.props" />
<Import Project="dependencies.props" />
<Import Project="targets.props" />
<Import Project="version.props" />
Expand Down Expand Up @@ -35,6 +34,11 @@
<LangVersion>11</LangVersion>
</PropertyGroup>

<PropertyGroup>
<EnablePackageValidation>true</EnablePackageValidation>
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 5c1ea4a

Please sign in to comment.