Skip to content
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.

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

[release/8.1] Enable full signing and stable package versions #4989

Merged
merged 4 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<BaselineVersionForPackageValidation>8.0.1</BaselineVersionForPackageValidation>
<UseVSTestRunner>true</UseVSTestRunner>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ extends:

- job: Windows
# timeout accounts for wait times for helix agents up to 30mins
timeoutInMinutes: 90
timeoutInMinutes: 120

pool:
name: NetCore1ESPool-Internal
Expand Down Expand Up @@ -168,7 +168,7 @@ extends:
- ${{ if eq(variables._RunAsPublic, True) }}:
- job: Linux
# timeout accounts for wait times for helix agents up to 30mins
timeoutInMinutes: 90
timeoutInMinutes: 120

pool:
name: NetCore1ESPool-Internal
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ variables:
/p:DotNetPublishUsingPipelines=true
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
- name: PostBuildSign
value: true
value: false
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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @vicancy

<!-- 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)" />
radical marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
</Target>
</Project>
1 change: 1 addition & 0 deletions tests/Aspire.EndToEnd.Tests/Aspire.EndToEnd.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFramework>$(NetCurrent)</TargetFramework>
<ProductVersion>8.1.0</ProductVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to hard code this? Why can't it be generated from the other MSBuild properties?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried locally using major and minor version but I think this project didn't import the right props and due to timing just wanted to unblock the build. End to End tests are failing now, so I guess now I have to fix than anyway.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there are several assumptions that the testing infrastructure makes around package versions which may not be correct as they assume that the same package version will be used everywhere, which will certainly not always be the case. I just spent some time trying to fix another package testing issue I was seeing, but couldn't get the versions to flow correctly so due to time I just pushed another change which hardcodes the versions for now to unblock the build and be able to get a build out for validation. We should of course undo these hard coded hacks, but we should also fix these assumptions on versions. cc: @radical

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have an issue tracking this to fix it in main?


<!-- no docker support on helix/windows yet -->
<RunTestsOnHelix Condition="'$(OS)' != 'Windows_NT'">true</RunTestsOnHelix>
Expand Down
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
Loading