|
30 | 30 | OutputPath="$(ArtifactsLogDir)" />
|
31 | 31 | </Target>
|
32 | 32 |
|
| 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 | + |
33 | 44 | <!--
|
34 | 45 | Determine symbols tarball names and discover all intermediate symbols,
|
35 | 46 | to be used as inputs and outputs of symbols repackaging targets.
|
36 | 47 | -->
|
37 | 48 | <Target Name="DetermineSymbolsTargetsInputsAndOutputs"
|
38 | 49 | AfterTargets="Build"
|
39 |
| - DependsOnTargets="DetermineSourceBuiltSdkVersion"> |
| 50 | + DependsOnTargets="DetermineSourceBuiltSdkNonStableVersion"> |
40 | 51 | <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> |
43 | 54 | </PropertyGroup>
|
44 | 55 | <ItemGroup>
|
45 | 56 | <IntermediateSymbol Include="$(IntermediateSymbolsRootDir)**/*" />
|
|
162 | 173 | </Target>
|
163 | 174 |
|
164 | 175 | <Target Name="CreatePrebuiltsTarballIfPrebuiltsExist"
|
165 |
| - DependsOnTargets="DetermineSourceBuiltSdkVersion" |
| 176 | + DependsOnTargets="DetermineSourceBuiltSdkNonStableVersion" |
166 | 177 | Condition="'@(PrebuiltFile)' != ''">
|
167 | 178 | <PropertyGroup>
|
168 |
| - <PrebuiltsTarball>$(ArtifactsAssetsDir)$(SourceBuiltPrebuiltsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension)</PrebuiltsTarball> |
| 179 | + <PrebuiltsTarball>$(ArtifactsAssetsDir)$(SourceBuiltPrebuiltsTarballName).$(SourceBuiltSdkNonStableVersion).$(TargetRid)$(ArchiveExtension)</PrebuiltsTarball> |
169 | 180 | <PrebuiltsTarballWorkingDir>$(ResultingPrebuiltPackagesDir)</PrebuiltsTarballWorkingDir>
|
170 | 181 | </PropertyGroup>
|
171 | 182 |
|
|
182 | 193 |
|
183 | 194 |
|
184 | 195 | <Target Name="GetInputsOutputForCreatePrivateSourceBuiltArtifactsArchive"
|
185 |
| - DependsOnTargets="DetermineSourceBuiltSdkVersion;ResolveProjectReferences"> |
| 196 | + DependsOnTargets="DetermineSourceBuiltSdkNonStableVersion;ResolveProjectReferences"> |
186 | 197 | <!-- Inputs: Packages to include in the tarball -->
|
187 | 198 | <ItemGroup>
|
188 | 199 | <ArtifactsPackageToBundle Include="$(ArtifactsShippingPackagesDir)**;
|
|
198 | 209 | <SourceBuiltLayoutDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'artifacts-layout'))</SourceBuiltLayoutDir>
|
199 | 210 |
|
200 | 211 | <!-- Outputs -->
|
201 |
| - <SourceBuiltTarballName>$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension)</SourceBuiltTarballName> |
| 212 | + <SourceBuiltTarballName>$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkNonStableVersion).$(TargetRid)$(ArchiveExtension)</SourceBuiltTarballName> |
202 | 213 | <SourceBuiltVersionName>$(SourceBuiltLayoutDir).version</SourceBuiltVersionName>
|
203 | 214 | <AllPackageVersionsPropsName>$(SourceBuiltLayoutDir)PackageVersions.props</AllPackageVersionsPropsName>
|
204 | 215 | <SourceBuiltMergedAssetManifestName>$(SourceBuiltLayoutDir)%(MergedAssetManifest.Filename)%(MergedAssetManifest.Extension)</SourceBuiltMergedAssetManifestName>
|
|
231 | 242 |
|
232 | 243 | <!-- Content of the .version file to include in the tarball -->
|
233 | 244 | <ItemGroup>
|
234 |
| - <VersionFileContent Include="$(RepositoryCommit);$(SourceBuiltSdkVersion)" /> |
| 245 | + <VersionFileContent Include="$(RepositoryCommit);$(SourceBuiltSdkNonStableVersion)" /> |
235 | 246 | </ItemGroup>
|
236 | 247 |
|
237 | 248 | <WriteLinesToFile File="$(SourceBuiltVersionName)"
|
|
0 commit comments