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

Merge pull request #2323 from weshaggard/UpdateNetCoreAppVersionScheme

Browse source 
Update net core app version scheme
This commit is contained in:
Wes Haggard 2016-04-06 16:56:02 -07:00
commit 4af7437aa6
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
View file

@ -41,13 +41,10 @@
</Dependency> </Dependency>
</ItemGroup> </ItemGroup>
<!-- Use NETStandard.Library version suffix for version suffix of Microsoft.NETCore.App -->
<PropertyGroup> <PropertyGroup>
<NETStandardBuildNumber Condition="'%(Dependency.Identity)' == 'NETSTandard.Library'">$([System.Text.RegularExpressions.Regex]::Match('%(Dependency.Version)', -.*))</NETStandardBuildNumber> <!-- For RC2 we need to start with -rc2-3 so that it is higher then the last published -rc2-23931 -->
<VersionSuffix Condition="'$(NETStandardBuildNumber)' != ''">$(NETStandardBuildNumber)</VersionSuffix> <VersionSuffix>-rc2-3$(CLIBuildVersion)</VersionSuffix>
<VersionSuffix Condition="'$(CLIBuildVersion)' != ''">$(VersionSuffix)-$(CLIBuildVersion)</VersionSuffix>
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

2
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -195,6 +195,8 @@ namespace Microsoft.DotNet.Cli.Build
var fileName = Path.GetFileName(file); var fileName = Path.GetFileName(file);
File.Copy(file, Path.Combine(Dirs.Corehost, fileName), true); File.Copy(file, Path.Combine(Dirs.Corehost, fileName), true);
runtimeCount += (fileName.StartsWith("runtime.") ? 1 : 0); runtimeCount += (fileName.StartsWith("runtime.") ? 1 : 0);
Console.WriteLine($"Copying package {fileName} to artifacts directory {Dirs.Corehost}.");
} }
if (runtimeCount < 3) if (runtimeCount < 3)
{ {

1
scripts/dotnet-cli-build/PublishTargets.cs
View file

@ -101,6 +101,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
var hostBlob = $"{Channel}/Binaries/{CliNuGetVersion}/{Path.GetFileName(file)}"; var hostBlob = $"{Channel}/Binaries/{CliNuGetVersion}/{Path.GetFileName(file)}";
AzurePublisherTool.PublishFile(hostBlob, file); AzurePublisherTool.PublishFile(hostBlob, file);
Console.WriteLine($"Publishing package {hostBlob} to Azure.");
} }
return c.Success(); return c.Success();