huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove package version from the output path for shared runtime archives

This commit is contained in:
Nate McMaster 2018-08-20 16:27:48 -07:00
parent 28d4064cba
commit d93aded1c0
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.vsts/builds/ci-official.yml
View File

@ -31,8 +31,8 @@ phases:
# TODO: configure harvesting to run as a part of build.cmd # TODO: configure harvesting to run as a part of build.cmd
- powershell: > - powershell: >
src/Installers/Windows/build.ps1 src/Installers/Windows/build.ps1
-x64 artifacts/assets/Runtime/2.2.0-preview1-$(Build.BuildNumber)/aspnetcore-runtime-internal-2.2.0-preview1-$(Build.BuildNumber)-win-x64.zip -x64 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview1-$(Build.BuildNumber)-win-x64.zip
-x86 artifacts/assets/Runtime/2.2.0-preview1-$(Build.BuildNumber)/aspnetcore-runtime-internal-2.2.0-preview1-$(Build.BuildNumber)-win-x86.zip -x86 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview1-$(Build.BuildNumber)-win-x86.zip
-Config $(BuildConfiguration) -Config $(BuildConfiguration)
-BuildNumber $(Build.BuildNumber) -BuildNumber $(Build.BuildNumber)
displayName: Build Windows installers displayName: Build Windows installers
@ -176,7 +176,7 @@ phases:
./build.sh ./build.sh
--ci --ci
/t:BuildInstallers /t:BuildInstallers
/p:_SharedFxSourceDir=$(Build.SourcesDirectory)/artifacts/assets/Runtime/2.2.0-preview1-$(Build.BuildNumber)/ /p:_SharedFxSourceDir=$(Build.SourcesDirectory)/artifacts/runtime/
displayName: Build linux installers displayName: Build linux installers
- task: PublishTestResults@2 - task: PublishTestResults@2
displayName: Publish test results displayName: Publish test results

4
build/SharedFx.targets
View File

@ -3,7 +3,9 @@
<Import Project="SharedFx.props" /> <Import Project="SharedFx.props" />
<PropertyGroup> <PropertyGroup>
<SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath> <SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))runtime\</SharedFxOutputPath>
<!-- TODO: temporary. Publish Windows to folder so dotnet-install.ps1 can use the folder as a source. -->
<SharedFxOutputPath Condition="$(SharedFxRID.StartsWith('win')) AND '$(TEAMCITY_VERSION)' != '' ">$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath>
</PropertyGroup> </PropertyGroup>
<Target Name="GetMetapackageArtifactInfo"> <Target Name="GetMetapackageArtifactInfo">