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

CR feedback

Browse source
This commit is contained in:
Manish Godse 2021-06-13 17:47:24 -07:00
parent bc6490c598
commit 959245b50a
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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
foreach(var file in files)
{
File.Copy(file, $"{dest}{Path.DirectorySeparatorChar}{Path.GetFileName(file)}", overwrite: true);
File.Copy(file, Path.Combine(dest, Path.GetFileName(file)), overwrite: true);
// Delete file in temp
File.Delete(file);
}
@ -162,7 +162,7 @@ namespace Microsoft.DotNet.Build.Tasks
private string GetInPath()
{
return $" \"{SourceAssembly}\"";
return $"\"{SourceAssembly}\"";
}
private string GetOutPath()

7
src/redist/targets/GetRuntimeInformation.targets
View file

@ -5,15 +5,12 @@
<HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRid>
<IsLinux Condition = " $([MSBuild]::IsOSPlatform('LINUX')) ">True</IsLinux>
<OSName Condition=" '$(OSName)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS')) ">win</OSName>
<OSName Condition=" '$(OSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX')) ">osx</OSName>
<OSName Condition=" '$(OSName)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD')) ">freebsd</OSName>
<OSName Condition=" '$(OSName)' == '' AND '$(IsLinux)' == 'True' ">linux</OSName>
<HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS')) ">win</HostOSName>
<HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX')) ">osx</HostOSName>
<HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD')) ">freebsd</HostOSName>
<HostOSName Condition=" '$(HostOSName)' == '' AND '$(IsLinux)' == 'True' ">linux</HostOSName>
<OSName Condition=" '$(OSName)' == '' ">$(HostOSName)</OSName>
<Rid Condition=" '$(Rid)' == '' ">$(OSName)-$(Architecture)</Rid>
</PropertyGroup>