Skip to content

Commit

Permalink
[release/6.0] Fix stable builds for some transport packages (#60635)
Browse files Browse the repository at this point in the history
* Fix stable builds for some transport packages
Some non-shipping transport and sources packages were getting incorrectly getting stable versions. This didn't show up in the servicing excercise, though they probably did the right thing for unrelated reasons.

* Fix transport package version by not using PackageVersion property on workloads-testing.targets

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
  • Loading branch information
mmitche and safern committed Oct 19, 2021
1 parent 034f191 commit 263945a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/libraries/workloads-testing.targets
@@ -1,7 +1,8 @@
<Project>

<PropertyGroup>
<PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</PackageVersion>
<_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
<_PackageVersion Condition="'$(_PackageVersion)' == ''">$(PackageVersion)</_PackageVersion>
</PropertyGroup>

<Target Name="ProvisionSdkForWorkloadTesting"
Expand Down Expand Up @@ -94,7 +95,7 @@

<PropertyGroup>
<!-- Eg. Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm.6.0.0-dev.nupkg -->
<_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(PackageVersion).nupkg</_AOTCrossNuGetPath>
<_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(_PackageVersion).nupkg</_AOTCrossNuGetPath>
</PropertyGroup>

<Error Text="Could not find cross compiler nupkg at $(_AOTCrossNuGetPath). Found packages: @(_BuiltNuGets)"
Expand Down

0 comments on commit 263945a

Please sign in to comment.