Skip to content

Read package information from msbuild #22352

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
weshaggard merged 3 commits into from
Jul 1, 2021
Merged

Read package information from msbuild #22352

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
bfe14c1
Read package information from msbuild
weshaggard Jul 1, 2021
9287f34
PR Feedback
weshaggard Jul 1, 2021
6f54d24
Ignore empty lines from msbuild output
weshaggard Jul 1, 2021
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
18 changes: 18 additions & 0 deletions eng/Directory.Build.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,5 +264,23 @@
<Target Name="RunApiCompat" DependsOnTargets="ValidateApiCompatForSrc" Condition="'$(ApiCompatVersion)' != ''">
</Target>

<Target Name="GetPackageInfo">
<PropertyGroup>
<PackageIsNewSdk>false</PackageIsNewSdk>
<PackageIsNewSdk Condition="'$(IsClientLibrary)' == 'true'">true</PackageIsNewSdk>

<PackageSdkType>data</PackageSdkType>
<PackageSdkType Condition="'$(IsClientLibrary)' == 'true'">client</PackageSdkType>
<PackageSdkType Condition="'$(IsMgmtLibrary)' == 'true'">mgmt</PackageSdkType>

<PackageRootDirectory>$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory)/../).Trim("/").Trim("\\"))</PackageRootDirectory>

<!-- Parse out the service directory based on the relative path to the sdk folder -->
<ServiceDirectory><![CDATA[$([System.Text.RegularExpressions.Regex]::Replace($(PackageRootDirectory), '^.*[\\/]+sdk[\\/]+([^\\/]+).*$', '$1'))]]></ServiceDirectory>
</PropertyGroup>

<Message Condition="'$(IsShippingLibrary)' == 'true'" Text="'$(PackageRootDirectory)' '$(ServiceDirectory)' '$(PackageId)' '$(_VersionInProject)' '$(PackageSdkType)' '$(PackageIsNewSdk)'" Importance="High" />
Comment thread
pakrym marked this conversation as resolved.
</Target>

<Import Project="$(CentralPackageVersionPackagePath)\Sdk.targets" />
</Project>
40 changes: 10 additions & 30 deletions eng/scripts/Language-Settings.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,26 @@ $packagePattern = "*.nupkg"
$MetadataUri = "https://raw.githubusercontent.com/Azure/azure-sdk/main/_data/releases/latest/dotnet-packages.csv"
$BlobStorageUrl = "https://azuresdkdocs.blob.core.windows.net/%24web?restype=container&comp=list&prefix=dotnet%2F&delimiter=%2F"

function Get-dotnet-PackageInfoFromRepo ($pkgPath, $serviceDirectory)
function Get-AllPackageInfoFromRepo($serviceDirectory)
{
$projDirPath = (Join-Path $pkgPath "src")
$allPackageProps = @()
$msbuildOutput = dotnet msbuild /nologo /t:GetPackageInfo $EngDir/service.proj /p:ServiceDirectory=$serviceDirectory

if (!(Test-Path $projDirPath))
foreach ($projectOutput in $msbuildOutput)
{
return $null
}

$projectPaths = @(Resolve-Path (Join-Path $projDirPath "*.csproj"))
if (!$projectOutput) { continue }

if ($projectpaths.Count -ge 1) {
$projectPath = $projectPaths[0].path
if ($projectPaths.Count -gt 1) {
LogWarning "There is more than on csproj file in the projectpath/src directory. First project picked."
}
}
else {
return $null
}
$pkgPath, $serviceDirectory, $pkgName, $pkgVersion, $sdkType, $isNewSdk = $projectOutput.Split(' ',[System.StringSplitOptions]::RemoveEmptyEntries).Trim("'")
Comment thread
weshaggard marked this conversation as resolved.

if ($projectPath -and (Test-Path $projectPath))
{
$pkgName = Split-Path -Path $projectPath -LeafBase
$projectData = New-Object -TypeName XML
$projectData.load($projectPath)
$pkgVersion = Select-XML -Xml $projectData -XPath '/Project/PropertyGroup/Version'
$sdkType = "client"
if ($pkgName -match "\.ResourceManager\." -or $pkgName -match "\.Management\.")
{
$sdkType = "mgmt"
}
$pkgProp = [PackageProps]::new($pkgName, $pkgVersion, $pkgPath, $serviceDirectory)
$pkgProp.SdkType = $sdkType
$pkgProp.IsNewSdk = $pkgName.StartsWith("Azure")
$pkgProp.IsNewSdk = ($isNewSdk -eq 'true')
$pkgProp.ArtifactName = $pkgName
return $pkgProp

$allPackageProps += $pkgProp
}

return $null
return $allPackageProps
}

# Returns the nuget publish status of a package id and version.
Expand Down
8 changes: 8 additions & 0 deletions eng/service.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,12 @@
<Message Text="Final Build References:" Importance="high"/>
<Message Text=" %(ProjectReference.Identity)" Importance="high"/>
</Target>

<Target Name="GetPackageInfo">
<MSBuild Projects="@(ProjectReference)"
Targets="GetPackageInfo"
BuildInParallel="$(BuildInParallel)"
SkipNonexistentProjects="false"
SkipNonexistentTargets="true" />
</Target>
</Project>