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
Show stats 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>
</ItemGroup>
<!-- Use NETStandard.Library version suffix for version suffix of Microsoft.NETCore.App -->
<PropertyGroup>
<NETStandardBuildNumber Condition="'%(Dependency.Identity)' == 'NETSTandard.Library'">$([System.Text.RegularExpressions.Regex]::Match('%(Dependency.Version)', -.*))</NETStandardBuildNumber>
<VersionSuffix Condition="'$(NETStandardBuildNumber)' != ''">$(NETStandardBuildNumber)</VersionSuffix>
<VersionSuffix Condition="'$(CLIBuildVersion)' != ''">$(VersionSuffix)-$(CLIBuildVersion)</VersionSuffix>
<!-- For RC2 we need to start with -rc2-3 so that it is higher then the last published -rc2-23931 -->
<VersionSuffix>-rc2-3$(CLIBuildVersion)</VersionSuffix>
</PropertyGroup>
</Target>
<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);
File.Copy(file, Path.Combine(Dirs.Corehost, fileName), true);
runtimeCount += (fileName.StartsWith("runtime.") ? 1 : 0);
Console.WriteLine($"Copying package {fileName} to artifacts directory {Dirs.Corehost}.");
}
if (runtimeCount < 3)
{

25
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)}";
AzurePublisherTool.PublishFile(hostBlob, file);
Console.WriteLine($"Publishing package {hostBlob} to Azure.");
}
return c.Success();
@ -114,7 +115,7 @@ namespace Microsoft.DotNet.Cli.Build
var installerFile = c.BuildContext.Get<string>("SharedHostInstallerFile");
AzurePublisherTool.PublishInstallerFileAndLatest(installerFile, Channel, version);
return c.Success();
}
@ -126,7 +127,7 @@ namespace Microsoft.DotNet.Cli.Build
var installerFile = c.BuildContext.Get<string>("SharedFrameworkInstallerFile");
AzurePublisherTool.PublishInstallerFileAndLatest(installerFile, Channel, version);
return c.Success();
}
@ -219,10 +220,10 @@ namespace Microsoft.DotNet.Cli.Build
var osname = Monikers.GetOSShortName();
var latestSharedFXVersionBlob = $"{Channel}/dnvm/latest.sharedfx.{osname}.{CurrentArchitecture.Current}.version";
var latestSharedFXVersionFile = Path.Combine(
Dirs.Stage2,
"shared",
CompileTargets.SharedFrameworkName,
version,
Dirs.Stage2,
"shared",
CompileTargets.SharedFrameworkName,
version,
".version");
AzurePublisherTool.PublishFile(latestSharedFXVersionBlob, latestSharedFXVersionFile);
@ -240,8 +241,8 @@ namespace Microsoft.DotNet.Cli.Build
var uploadUrl = AzurePublisherTool.CalculateInstallerUploadUrl(installerFile, Channel, version);
DebRepoPublisherTool.PublishDebFileToDebianRepo(
packageName,
version,
packageName,
version,
uploadUrl);
return c.Success();
@ -258,8 +259,8 @@ namespace Microsoft.DotNet.Cli.Build
var uploadUrl = AzurePublisherTool.CalculateInstallerUploadUrl(installerFile, Channel, version);
DebRepoPublisherTool.PublishDebFileToDebianRepo(
packageName,
version,
packageName,
version,
uploadUrl);
return c.Success();
@ -276,8 +277,8 @@ namespace Microsoft.DotNet.Cli.Build
var uploadUrl = AzurePublisherTool.CalculateInstallerUploadUrl(installerFile, Channel, version);
DebRepoPublisherTool.PublishDebFileToDebianRepo(
packageName,
version,
packageName,
version,
uploadUrl);
return c.Success();