Skip to content

Commit 02baa35

Browse files
Use non-stable SDK version for SB artifacts (#44362)
1 parent 3359d9e commit 02baa35

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

src/SourceBuild/content/eng/finish-source-only.proj

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,27 @@
3030
OutputPath="$(ArtifactsLogDir)" />
3131
</Target>
3232

33+
<Target Name="DetermineSourceBuiltSdkNonStableVersion"
34+
DependsOnTargets="DetermineSourceBuiltSdkVersion">
35+
<ItemGroup>
36+
<SdkVersionFileItem Include="$(DotNetSdkExtractDir)/sdk/**/.version" />
37+
</ItemGroup>
38+
39+
<PropertyGroup>
40+
<SourceBuiltSdkNonStableVersion>$([System.Text.RegularExpressions.Regex]::Split('$([System.IO.File]::ReadAllText('%(SdkVersionFileItem.Identity)'))', '\r\n|\r|\n')[3])</SourceBuiltSdkNonStableVersion>
41+
</PropertyGroup>
42+
</Target>
43+
3344
<!--
3445
Determine symbols tarball names and discover all intermediate symbols,
3546
to be used as inputs and outputs of symbols repackaging targets.
3647
-->
3748
<Target Name="DetermineSymbolsTargetsInputsAndOutputs"
3849
AfterTargets="Build"
39-
DependsOnTargets="DetermineSourceBuiltSdkVersion">
50+
DependsOnTargets="DetermineSourceBuiltSdkNonStableVersion">
4051
<PropertyGroup>
41-
<UnifiedSymbolsTarball>$(ArtifactsAssetsDir)dotnet-symbols-all-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension)</UnifiedSymbolsTarball>
42-
<SdkSymbolsTarball>$(ArtifactsAssetsDir)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension)</SdkSymbolsTarball>
52+
<UnifiedSymbolsTarball>$(ArtifactsAssetsDir)dotnet-symbols-all-$(SourceBuiltSdkNonStableVersion)-$(TargetRid)$(ArchiveExtension)</UnifiedSymbolsTarball>
53+
<SdkSymbolsTarball>$(ArtifactsAssetsDir)dotnet-symbols-sdk-$(SourceBuiltSdkNonStableVersion)-$(TargetRid)$(ArchiveExtension)</SdkSymbolsTarball>
4354
</PropertyGroup>
4455
<ItemGroup>
4556
<IntermediateSymbol Include="$(IntermediateSymbolsRootDir)**/*" />
@@ -162,10 +173,10 @@
162173
</Target>
163174

164175
<Target Name="CreatePrebuiltsTarballIfPrebuiltsExist"
165-
DependsOnTargets="DetermineSourceBuiltSdkVersion"
176+
DependsOnTargets="DetermineSourceBuiltSdkNonStableVersion"
166177
Condition="'@(PrebuiltFile)' != ''">
167178
<PropertyGroup>
168-
<PrebuiltsTarball>$(ArtifactsAssetsDir)$(SourceBuiltPrebuiltsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension)</PrebuiltsTarball>
179+
<PrebuiltsTarball>$(ArtifactsAssetsDir)$(SourceBuiltPrebuiltsTarballName).$(SourceBuiltSdkNonStableVersion).$(TargetRid)$(ArchiveExtension)</PrebuiltsTarball>
169180
<PrebuiltsTarballWorkingDir>$(ResultingPrebuiltPackagesDir)</PrebuiltsTarballWorkingDir>
170181
</PropertyGroup>
171182

@@ -182,7 +193,7 @@
182193

183194

184195
<Target Name="GetInputsOutputForCreatePrivateSourceBuiltArtifactsArchive"
185-
DependsOnTargets="DetermineSourceBuiltSdkVersion;ResolveProjectReferences">
196+
DependsOnTargets="DetermineSourceBuiltSdkNonStableVersion;ResolveProjectReferences">
186197
<!-- Inputs: Packages to include in the tarball -->
187198
<ItemGroup>
188199
<ArtifactsPackageToBundle Include="$(ArtifactsShippingPackagesDir)**;
@@ -198,7 +209,7 @@
198209
<SourceBuiltLayoutDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'artifacts-layout'))</SourceBuiltLayoutDir>
199210

200211
<!-- Outputs -->
201-
<SourceBuiltTarballName>$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension)</SourceBuiltTarballName>
212+
<SourceBuiltTarballName>$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkNonStableVersion).$(TargetRid)$(ArchiveExtension)</SourceBuiltTarballName>
202213
<SourceBuiltVersionName>$(SourceBuiltLayoutDir).version</SourceBuiltVersionName>
203214
<AllPackageVersionsPropsName>$(SourceBuiltLayoutDir)PackageVersions.props</AllPackageVersionsPropsName>
204215
<SourceBuiltMergedAssetManifestName>$(SourceBuiltLayoutDir)%(MergedAssetManifest.Filename)%(MergedAssetManifest.Extension)</SourceBuiltMergedAssetManifestName>
@@ -231,7 +242,7 @@
231242

232243
<!-- Content of the .version file to include in the tarball -->
233244
<ItemGroup>
234-
<VersionFileContent Include="$(RepositoryCommit);$(SourceBuiltSdkVersion)" />
245+
<VersionFileContent Include="$(RepositoryCommit);$(SourceBuiltSdkNonStableVersion)" />
235246
</ItemGroup>
236247

237248
<WriteLinesToFile File="$(SourceBuiltVersionName)"

0 commit comments

Comments
 (0)