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

make versions consistent for PackCommand, add back * to test packages, remove --version-suffix from publish

Browse source
This commit is contained in:
Bryan 2016-05-05 10:51:58 -07:00
parent 51968b7105
commit abc155e273
7 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestPackages/dotnet-dependency-context-test/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0", "version": "1.0.0-preview1-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },

2
TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0", "version": "1.0.0-preview1-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },

2
TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0", "version": "1.0.0-preview1-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },

2
TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0", "version": "1.0.0-preview1-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },

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

@ -625,9 +625,7 @@ namespace Microsoft.DotNet.Cli.Build
outputDir, outputDir,
"--configuration", "--configuration",
configuration, configuration,
Path.Combine(c.BuildContext.BuildDirectory, "src", project), Path.Combine(c.BuildContext.BuildDirectory, "src", project))
"--version-suffix",
buildVersion.VersionSuffix)
.Environment("DOTNET_BUILD_VERSION", buildVersion.VersionSuffix) .Environment("DOTNET_BUILD_VERSION", buildVersion.VersionSuffix)
.Execute() .Execute()
.EnsureSuccessful(); .EnsureSuccessful();

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

@ -162,7 +162,7 @@ namespace Microsoft.DotNet.Cli.Build
var versionSuffix = testPackageProject.VersionSuffix; var versionSuffix = testPackageProject.VersionSuffix;
if (versionSuffix.Equals(s_testPackageBuildVersionSuffix)) if (versionSuffix.Equals(s_testPackageBuildVersionSuffix))
{ {
versionSuffix = c.BuildContext.Get<BuildVersion>("BuildVersion").VersionSuffix; versionSuffix = c.BuildContext.Get<BuildVersion>("BuildVersion").CommitCountString;
} }
var fullPath = Path.Combine(c.BuildContext.BuildDirectory, relativePath.Replace('/', Path.DirectorySeparatorChar)); var fullPath = Path.Combine(c.BuildContext.BuildDirectory, relativePath.Replace('/', Path.DirectorySeparatorChar));

2
scripts/dotnet-cli-build/Utils/BuildVersion.cs
View file

@ -5,7 +5,7 @@ namespace Microsoft.DotNet.Cli.Build
public class BuildVersion : Version public class BuildVersion : Version
{ {
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}"; public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
public string VersionSuffix => $"{CommitCountString}"; public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}"; public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}"; public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}";
public string ProductionVersion => $"{Major}.{Minor}.{Patch}"; public string ProductionVersion => $"{Major}.{Minor}.{Patch}";