diff --git a/src/SourceBuild/content/Directory.Build.targets b/src/SourceBuild/content/Directory.Build.targets index 02ff624bc743..b80cbf707904 100644 --- a/src/SourceBuild/content/Directory.Build.targets +++ b/src/SourceBuild/content/Directory.Build.targets @@ -10,6 +10,19 @@ + + + + + + + @(MicrosoftSourceBuildIntermediateInstallerVersionItem) + $(installerOutputPackageVersion) + + + diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 2504bca533bc..50c1b64f66d2 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -115,7 +115,7 @@ Condition="'$(SkipSmokeTestPrereqsTarballCreation)' != 'true'" DependsOnTargets=" CheckIfCreateSmokeTestPrereqsExistToPack; - CreateCreateSmokeTestPrereqsTarballIfPrereqsExist"/> + CreateSmokeTestPrereqsTarballIfPrereqsExist"/> @@ -130,10 +130,11 @@ - - $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).$(TargetRid).tar.gz + $(OutputPath)dotnet-smoke-test-prereqs.$(MicrosoftSourceBuildIntermediateInstallerVersion).$(TargetRid).tar.gz $(SmokeTestsArtifactsDir)prereq-packages/ @@ -187,9 +188,10 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(MicrosoftSourceBuildIntermediateInstallerVersion).$(TargetRid).tar.gz $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index ac30ad7a2a01..5bf79d8362f1 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -13,7 +13,8 @@ - + @@ -46,23 +47,10 @@ Directories="$(SourceBuildReferencePackagesDestination)extractArtifacts/" /> - $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz + $(OutputPath)$(SourceBuiltArtifactsTarballName).$(MicrosoftSourceBuildIntermediateInstallerVersion).$(TargetRid).tar.gz .version - - - - - - @(MicrosoftSourceBuildIntermediateInstallerVersionItem) - -