diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index effb2348c..fe9359a2b 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -115,7 +115,7 @@ @@ -123,7 +123,7 @@ diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index 10981406b..615cbc0c7 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -1,7 +1,7 @@ - Microsoft .NET Core 1.0.3 - SDK RC 4 + Microsoft .NET Core 1.0.3 - SDK Microsoft .NET Core 1.0.3 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 5eb5af4b1..93a9d5897 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -68,16 +68,18 @@ $(DefaultCommitCount) - $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) - $(ReleaseSuffix)-$(CommitCount) - $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(VersionSuffix) + $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) + $(VersionMajor).$(VersionMinor).$(VersionPatch) + + $(ReleaseSuffix)-$(CommitCount) + + $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(VersionSuffix) + $(VersionMajor).$(VersionMinor).$(VersionPatch) + + $(NugetVersion) + $(NugetVersion) $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg - $(NugetVersion) - - $(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount) - $(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount) - $(VersionMajor).$(VersionMinor).1-beta-$(CommitCount) .zip .tar.gz diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index 2b85daa3e..c5322c5b5 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -59,7 +59,6 @@ DependsOnTargets="Init; SetupTestProjectData"> - $(CommitCount) $(RepoRoot)/artifacts/testpackages/ $(TestOutputDir)/packagesBuild/ $(TestOutputDir)/packages/ diff --git a/build/package/Microsoft.DotNet.Cli.Nupkg.targets b/build/package/Microsoft.DotNet.Cli.Nupkg.targets index 5fef716f2..4e57d0c41 100644 --- a/build/package/Microsoft.DotNet.Cli.Nupkg.targets +++ b/build/package/Microsoft.DotNet.Cli.Nupkg.targets @@ -4,7 +4,6 @@ - $(CommitCount) $(RepoRoot)/src $(Stage2CompilationDirectory)/forPackaging $(PackagesDirectory) @@ -26,7 +25,7 @@ Output="$(NupkgOutputDirectory)" ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj" ToolPath="$(Stage0Directory)" - VersionSuffix="rc4-$(NupkgVersionSuffix)" + VersionSuffix="$(VersionSuffix)" Configuration="$(Configuration)" /> diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index a12580b82..4b7c98c80 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -22,8 +22,8 @@ Microsoft.DotNet.Cli.Utils.csproj True True - $(CliVersionPrefix)- - rc4-$(TestPackageBuildVersionSuffix) + $(CliVersionPrefix) + $(VersionSuffix) False Microsoft.DotNet.Cli.Utils.csproj True True - $(CliVersionPrefix)- - rc4-$(TestPackageBuildVersionSuffix) + $(CliVersionPrefix) + $(VersionSuffix) False /p:TargetFramework=netstandard1.5 @@ -42,8 +42,8 @@ Microsoft.DotNet.InternalAbstractions.csproj True True - 2.0.0-beta- - beta-$(TestPackageBuildVersionSuffix) + 2.0.0 + $(VersionSuffix) False dotnet-dependency-context-test.csproj True True - 1.0.0-rc- - rc-$(TestPackageBuildVersionSuffix) + $(CliVersionPrefix) + $(VersionSuffix) True @@ -71,8 +71,8 @@ dotnet-dependency-tool-invoker.csproj True True - 1.0.0-rc- - rc-$(TestPackageBuildVersionSuffix) + $(CliVersionPrefix) + $(VersionSuffix) True dotnet-desktop-and-portable.csproj True True - 1.0.0-rc- - rc-$(TestPackageBuildVersionSuffix) + $(CliVersionPrefix) + $(VersionSuffix) True /p:RuntimeIdentifier=$(CoreCLRRid) @@ -93,8 +93,8 @@ True True $(DesktopAvailable) - 1.0.0-rc- - rc-$(TestPackageBuildVersionSuffix) + $(CliVersionPrefix) + $(VersionSuffix) True /p:RuntimeIdentifier=$(CoreCLRRid) diff --git a/build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs b/build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs index 212eabc97..9e5c1d493 100644 --- a/build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs +++ b/build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs @@ -27,15 +27,6 @@ namespace Microsoft.DotNet.Cli.Build [Output] public string ReleaseSuffix { get; set; } - [Output] - public string VersionSuffix { get; set; } - - [Output] - public string SimpleVersion { get; set; } - - [Output] - public string NugetVersion { get; set; } - [Output] public string MsiVersion { get; set; } @@ -56,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Build var branchInfo = new BranchInfo(RepoRoot); - var buildVersion = new BuildVersion() + var buildVersion = new Version { Major = int.Parse(branchInfo.Entries["MAJOR_VERSION"]), Minor = int.Parse(branchInfo.Entries["MINOR_VERSION"]), @@ -70,9 +61,6 @@ namespace Microsoft.DotNet.Cli.Build VersionPatch = buildVersion.Patch; CommitCount = buildVersion.CommitCountString; ReleaseSuffix = buildVersion.ReleaseSuffix; - VersionSuffix = buildVersion.VersionSuffix; - SimpleVersion = buildVersion.SimpleVersion; - NugetVersion = buildVersion.NuGetVersion; MsiVersion = buildVersion.GenerateMsiVersion(); VersionBadgeMoniker = Monikers.GetBadgeMoniker(); Channel = branchInfo.Entries["CHANNEL"]; diff --git a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs b/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs deleted file mode 100644 index 3e526f00c..000000000 --- a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; - -namespace Microsoft.DotNet.Cli.Build -{ - public class BuildVersion : Version - { - public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}"; - public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}"; - public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}"; - public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc4-{CommitCountString}"; - public string ProductionVersion => $"{Major}.{Minor}.{Patch}"; - } -} diff --git a/build_projects/shared-build-targets-utils/Utils/Version.cs b/build_projects/shared-build-targets-utils/Utils/Version.cs index 7bade35d6..def18eda2 100644 --- a/build_projects/shared-build-targets-utils/Utils/Version.cs +++ b/build_projects/shared-build-targets-utils/Utils/Version.cs @@ -1,8 +1,6 @@ -using System.Collections.Generic; - namespace Microsoft.DotNet.Cli.Build { - public abstract class Version + public class Version { public virtual int Major { get; set; } public virtual int Minor { get; set; } diff --git a/packaging/windows/clisdk/registrykeys.wxs b/packaging/windows/clisdk/registrykeys.wxs index 6da9817a3..44e0def3e 100644 --- a/packaging/windows/clisdk/registrykeys.wxs +++ b/packaging/windows/clisdk/registrykeys.wxs @@ -10,7 +10,7 @@ - +