mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix musl built on alpine

Browse source
This commit is contained in:
Manish Godse 2021-06-12 01:55:58 -07:00
parent 1013c2b24d
commit bc6490c598
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.vsts-ci.yml
View file

@ -217,7 +217,8 @@ stages:
_LinuxPortable: '' _LinuxPortable: ''
_RuntimeIdentifier: '--runtime-id linux-musl-x64' _RuntimeIdentifier: '--runtime-id linux-musl-x64'
_BuildArchitecture: 'x64' _BuildArchitecture: 'x64'
_AdditionalBuildParameters: '/p:OSName="linux-musl"' # Pass in HostOSName when running on alpine
_AdditionalBuildParameters: '/p:OSName="linux-musl" /p:HostOSName="linux-musl"'
_TestArg: $(_NonWindowsTestArg) _TestArg: $(_NonWindowsTestArg)
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Build_Arm_Release: Build_Arm_Release:
@ -261,7 +262,8 @@ stages:
_LinuxPortable: '' _LinuxPortable: ''
_RuntimeIdentifier: '--runtime-id linux-musl-x64' _RuntimeIdentifier: '--runtime-id linux-musl-x64'
_BuildArchitecture: 'x64' _BuildArchitecture: 'x64'
_AdditionalBuildParameters: '/p:OSName="linux-musl"' # Pass in HostOSName when running on alpine
_AdditionalBuildParameters: '/p:OSName="linux-musl" /p:HostOSName="linux-musl"'
Build_Linux_Portable_Deb_Release_x64: Build_Linux_Portable_Deb_Release_x64:
_BuildConfig: Release _BuildConfig: Release
_DockerParameter: '--docker ubuntu.16.04' _DockerParameter: '--docker ubuntu.16.04'

2
src/core-sdk-tasks/Crossgen.cs
View file

@ -68,7 +68,7 @@ namespace Microsoft.DotNet.Build.Tasks
// Copy both dll and pdb files to the destination folder // Copy both dll and pdb files to the destination folder
foreach(var file in files) foreach(var file in files)
{ {
File.Copy(file, $"{dest}{Path.GetFileName(file)}", overwrite: true); File.Copy(file, $"{dest}{Path.DirectorySeparatorChar}{Path.GetFileName(file)}", overwrite: true);
// Delete file in temp // Delete file in temp
File.Delete(file); File.Delete(file);
} }