diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index 0dbda4972..61ab7e04f 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -10,7 +10,7 @@ - 1.0.0-preview5-* + $(CliVersionPrefix)-* diff --git a/branchinfo.txt b/branchinfo.txt index db5aa78d2..77dd90714 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,6 +4,6 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=0 -RELEASE_SUFFIX=preview5 +RELEASE_SUFFIX=rc4 CHANNEL=rel-1.0.0 BRANCH_NAME=rel/1.0.0 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index f017176a0..7a8439645 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 Preview 5 + Microsoft .NET Core 1.0.3 - SDK RC 4 Microsoft .NET Core 1.0.3 - Runtime Microsoft .NET Core 1.0.1 - Host Microsoft .NET Core 1.0.1 - Host FX Resolver diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index b7b34b8a3..28589ed70 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -72,7 +72,7 @@ $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg $(NugetVersion) - $(VersionMajor).$(VersionMinor).$(VersionPatch)-preview5-$(CommitCount) + $(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount) $(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount) $(VersionMajor).$(VersionMinor).1-beta-$(CommitCount) diff --git a/build/package/Microsoft.DotNet.Cli.Nupkg.targets b/build/package/Microsoft.DotNet.Cli.Nupkg.targets index 623838bed..5fef716f2 100644 --- a/build/package/Microsoft.DotNet.Cli.Nupkg.targets +++ b/build/package/Microsoft.DotNet.Cli.Nupkg.targets @@ -26,7 +26,7 @@ Output="$(NupkgOutputDirectory)" ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj" ToolPath="$(Stage0Directory)" - VersionSuffix="preview5-$(NupkgVersionSuffix)" + VersionSuffix="rc4-$(NupkgVersionSuffix)" Configuration="$(Configuration)" /> diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index b0e765e96..e09a73bdb 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -76,7 +76,7 @@ True True $(CliVersionPrefix)- - preview5-$(TestPackageBuildVersionSuffix) + rc4-$(TestPackageBuildVersionSuffix) False netstandard1.5 diff --git a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs b/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs index d3789dfd3..3e526f00c 100644 --- a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs +++ b/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build 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}-rc3-{CommitCountString}"; + public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc4-{CommitCountString}"; public string ProductionVersion => $"{Major}.{Minor}.{Patch}"; } } diff --git a/dir.props b/dir.props index 692364995..425b5d385 100644 --- a/dir.props +++ b/dir.props @@ -12,7 +12,7 @@ true - 1.0.0-preview5 + 1.0.0-rc4 diff --git a/packaging/windows/clisdk/registrykeys.wxs b/packaging/windows/clisdk/registrykeys.wxs index 4499348a8..6da9817a3 100644 --- a/packaging/windows/clisdk/registrykeys.wxs +++ b/packaging/windows/clisdk/registrykeys.wxs @@ -10,7 +10,7 @@ - +