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 4ca756e18..a67ca793b 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 @@ -8,7 +8,7 @@ - 1.0.0-preview5-* + 1.0.0-rc3-* diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj index d2e22acd7..8a1e7d530 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj @@ -7,7 +7,7 @@ win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64 - + $(ProjectRuntimeConfigFilePath) diff --git a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj index 9830625a4..cea1ac554 100644 --- a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj +++ b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj @@ -12,9 +12,6 @@ 5.0.0 - - 3.3.0 - diff --git a/branchinfo.txt b/branchinfo.txt index db5aa78d2..b1f44626c 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,6 +4,6 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=0 -RELEASE_SUFFIX=preview5 -CHANNEL=rel-1.0.0 -BRANCH_NAME=rel/1.0.0 +RELEASE_SUFFIX=rc3 +CHANNEL=rel-1.0.0-rc3 +BRANCH_NAME=rel/1.0.0-rc3 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index f017176a0..d3b68396a 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 3 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..2b0282626 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)-rc3-$(CommitCount) $(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount) $(VersionMajor).$(VersionMinor).1-beta-$(CommitCount) diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets index eb9e98c36..610850103 100644 --- a/build/Microsoft.DotNet.Cli.Test.targets +++ b/build/Microsoft.DotNet.Cli.Test.targets @@ -70,6 +70,8 @@ $(RepoRoot)/test/ $(Stage2Directory) + + - /p:TargetFramework=%(TestPackageProject.Framework) - /p:RuntimeIdentifier=%(TestPackageProject.PackRuntime) + %(TestPackageProject.Framework) + true + /p:TargetFramework=$(Framework) + /p:RuntimeIdentifier=%(TestPackageProject.PackRuntime) + + + + - - - - - - - - - - diff --git a/build/package/Microsoft.DotNet.Cli.Nupkg.targets b/build/package/Microsoft.DotNet.Cli.Nupkg.targets index 623838bed..6ccca20cb 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="rc3-$(NupkgVersionSuffix)" Configuration="$(Configuration)" /> diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index 4e127a874..34f6b4e66 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -70,6 +70,26 @@ + + Microsoft.DotNet.Cli.Utils + Microsoft.DotNet.Cli.Utils.csproj + True + True + $(CliVersionPrefix)- + rc3-$(TestPackageBuildVersionSuffix) + False + netstandard1.5 + + + Microsoft.DotNet.InternalAbstractions + Microsoft.DotNet.InternalAbstractions.csproj + True + True + 2.0.0-beta- + beta-$(TestPackageBuildVersionSuffix) + False + netstandard1.3 + PackageWithFakeNativeDep PackageWithFakeNativeDep.csproj @@ -176,26 +196,6 @@ True netcoreapp1.0 - - Microsoft.DotNet.Cli.Utils - Microsoft.DotNet.Cli.Utils.csproj - True - True - 1.0.0-preview5- - preview5-$(TestPackageBuildVersionSuffix) - False - netstandard1.5 - - - Microsoft.DotNet.InternalAbstractions - Microsoft.DotNet.InternalAbstractions.csproj - True - True - 2.0.0-beta- - beta-$(TestPackageBuildVersionSuffix) - False - netstandard1.3 - diff --git a/build_projects/dotnet-cli-build/DotNetRestore.cs b/build_projects/dotnet-cli-build/DotNetRestore.cs index c074d4fba..d3f1a2b4d 100644 --- a/build_projects/dotnet-cli-build/DotNetRestore.cs +++ b/build_projects/dotnet-cli-build/DotNetRestore.cs @@ -12,9 +12,11 @@ namespace Microsoft.DotNet.Cli.Build protected override string Args { - get { return $"{GetProjectPath()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; } + get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; } } + public string ConfigFile { get; set; } + public string AdditionalParameters { get; set; } public string ProjectPath { get; set; } @@ -27,6 +29,16 @@ namespace Microsoft.DotNet.Cli.Build public string Runtime { get; set; } + private string GetConfigFile() + { + if (!string.IsNullOrEmpty(ConfigFile)) + { + return $"--configfile {ConfigFile}"; + } + + return null; + } + private string GetSource() { if (!string.IsNullOrEmpty(Source)) diff --git a/dir.props b/dir.props index d0c1fdfa8..dd424deb9 100644 --- a/dir.props +++ b/dir.props @@ -12,5 +12,7 @@ true + 1.0.0-rc3 + diff --git a/packaging/windows/clisdk/registrykeys.wxs b/packaging/windows/clisdk/registrykeys.wxs index 92f54dba8..e1b32d5a1 100644 --- a/packaging/windows/clisdk/registrykeys.wxs +++ b/packaging/windows/clisdk/registrykeys.wxs @@ -10,7 +10,7 @@ - + diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj index 90c84d19a..dcb0a221c 100644 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj @@ -3,7 +3,7 @@ Archive and compression types. - 1.0.0-preview5 + $(CliVersionPrefix) netstandard1.3 ../../tools/Key.snk true diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj index 368c98b3a..215c6a5e5 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj @@ -3,7 +3,7 @@ SLN file reader/writer - 1.0.0-preview5 + $(CliVersionPrefix) netstandard1.6 portable Microsoft.DotNet.Cli.Sln.Internal diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index f6337cf28..ce5308d98 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -2,7 +2,7 @@ - 1.0.0-preview5 + $(CliVersionPrefix) netstandard1.5;net46 true ../../tools/Key.snk diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 27792ffdf..1b39817e3 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -2,7 +2,7 @@ - 1.0.0-rc3 + $(CliVersionPrefix) netstandard1.5 true ../../tools/Key.snk diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index 99d86def9..fc987fa3d 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -2,7 +2,7 @@ - 1.0.0-preview5 + $(CliVersionPrefix) netcoreapp1.0 true ../../tools/Key.snk diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj index 90a401f2a..df14f600d 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj @@ -3,7 +3,7 @@ Microsoft.DotNet.TestFramework Class Library - 1.0.0-preview5 + $(CliVersionPrefix) netstandard1.5;net46 ../../tools/Key.snk true diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index a15a1c99b..cf444ff04 100755 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -2,7 +2,7 @@ - 1.0.0-preview5 + $(CliVersionPrefix) netcoreapp1.0 dotnet Exe diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 7711edecb..5c0c36e2d 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -2,7 +2,7 @@ - 1.0.0-preview5 + $(CliVersionPrefix) netcoreapp1.0 true $(PackageTargetFallback);dotnet5.4 diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 06fb5ebb0..40082b920 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -2,7 +2,7 @@ - 1.0.0-preview5 + $(CliVersionPrefix) netcoreapp1.0 diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 36c74b48b..ef70fa8e6 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -2,7 +2,7 @@ - 1.0.0-preview5 + $(CliVersionPrefix) netcoreapp1.0 diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index 9b9965d49..3f52caad6 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -3,7 +3,7 @@ - 1.0.0-preview5 + $(CliVersionPrefix) netcoreapp1.0 true