Skip to content

Commit

Permalink
Merge pull request #5032 from joperezr/MergeFromRelease
Browse files Browse the repository at this point in the history
Merge branch release/8.1 into main
  • Loading branch information
joperezr authored Jul 23, 2024
2 parents 0e56769 + 52ac331 commit df935f4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<PackageTags>aspire hosting azure webpubsub pubsub websocket</PackageTags>
<Description>Azure WebPubSub resource types for .NET Aspire.</Description>
<PackageIconFullPath>$(SharedDir)AzureWebPubSub_256x.png</PackageIconFullPath>
<!-- This library can't ship stable until Azure.Provisioning.WebPubSub ships stable. -->
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
<!-- Disable package validation as this package hasn't shipped yet. -->
<EnablePackageValidation>false</EnablePackageValidation>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- Used by Aspire.Workload.Testing.targets -->
<Target Name="GetPackageName" Returns="@(PackageName)">
<ItemGroup>
<PackageName Include="$(MSBuildProjectName)" Condition="'$(IsPackable)' == 'true'" />
<PackageName Include="$(MSBuildProjectName)" Condition="'$(IsPackable)' == 'true'" WithPackageVersion="$(PackageVersion)" />
</ItemGroup>
</Target>
</Project>
2 changes: 1 addition & 1 deletion tests/Shared/Aspire.Workload.Testing.targets
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@

<ItemGroup>
<AllPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
<ExpectedPackagePaths Include="$(ArtifactsShippingPackagesDir)%(ExpectedPackageNames.Identity).$(PackageVersion).nupkg" />
<ExpectedPackagePaths Include="$(ArtifactsShippingPackagesDir)%(ExpectedPackageNames.Identity).%(ExpectedPackageNames.WithPackageVersion).nupkg" />
<MissingPackages Include="@(ExpectedPackagePaths)" Condition="!Exists(%(ExpectedPackagePaths.Identity))" />

<UnexpectedPackages Include="@(AllPackages)" Exclude="@(ExpectedPackagePaths)" />
Expand Down

0 comments on commit df935f4

Please sign in to comment.