Skip to content

Commit

Permalink
remove contract assemblies script, use new feed
Browse files Browse the repository at this point in the history
  • Loading branch information
westin-m committed Oct 9, 2023
1 parent f544634 commit 1461b94
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 100 deletions.
2 changes: 1 addition & 1 deletion NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="nuget-public" value="https://identitydivision.pkgs.visualstudio.com/IDDP/_packaging/nuget-public/nuget/v3/index.json" />
</packageSources>
</configuration>
33 changes: 4 additions & 29 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 Down Expand Up @@ -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
70 changes: 0 additions & 70 deletions generateContractAssemblies.ps1

This file was deleted.

0 comments on commit 1461b94

Please sign in to comment.