merge
This commit is contained in:
commit
58bf70a476
100 changed files with 845 additions and 376 deletions
|
@ -57,6 +57,7 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
{ "osx_x64", false },
|
||||
{ "debian_x64", false },
|
||||
{ "centos_x64", false },
|
||||
{ "linux_x64", false },
|
||||
};
|
||||
|
||||
if (!badges.ContainsKey(VersionBadgeMoniker))
|
||||
|
|
|
@ -13,16 +13,12 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
[Output]
|
||||
public string Rid { get; set; }
|
||||
|
||||
[Output]
|
||||
public string Architecture { get; set; }
|
||||
|
||||
[Output]
|
||||
public string OSName { get; set; }
|
||||
|
||||
public override bool Execute()
|
||||
{
|
||||
Rid = RuntimeEnvironment.GetRuntimeIdentifier();
|
||||
Architecture = RuntimeEnvironment.RuntimeArchitecture;
|
||||
OSName = GetOSShortName();
|
||||
|
||||
return true;
|
||||
|
|
|
@ -7,6 +7,9 @@
|
|||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<OutputPath>bin\$(Configuration)</OutputPath>
|
||||
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback>
|
||||
|
||||
<!-- Specify a RID so that the runtime package with crossgen will be restored -->
|
||||
<RuntimeIdentifiers>$(CoreCLRRid)</RuntimeIdentifiers>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -31,5 +34,9 @@
|
|||
<PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
|
||||
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
|
||||
<PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
|
||||
|
||||
<!-- This will cause the package with crossgen in it to be restored -->
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
|
||||
|
||||
</ItemGroup>
|
||||
</Project>
|
Loading…
Add table
Add a link
Reference in a new issue