From 3220b142482c47f27d83b413ad34e806a45c76c0 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 9 Jan 2017 13:59:03 -0800
Subject: [PATCH 1/6] Updating the branding of the CLI to 1.0.0-rc3

---
 .../dotnet-dependency-tool-invoker.csproj                     | 2 +-
 branchinfo.txt                                                | 2 +-
 build/Microsoft.DotNet.Cli.Monikers.props                     | 2 +-
 build/Microsoft.DotNet.Cli.Prepare.targets                    | 2 +-
 build/package/Microsoft.DotNet.Cli.Nupkg.targets              | 2 +-
 build/test/TestPackageProjects.targets                        | 4 ++--
 dir.props                                                     | 2 ++
 packaging/windows/clisdk/registrykeys.wxs                     | 2 +-
 src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj  | 2 +-
 .../Microsoft.DotNet.Cli.Sln.Internal.csproj                  | 2 +-
 .../Microsoft.DotNet.Cli.Utils.csproj                         | 2 +-
 .../Microsoft.DotNet.Configurer.csproj                        | 2 +-
 .../Microsoft.DotNet.ProjectJsonMigration.csproj              | 2 +-
 .../Microsoft.DotNet.TestFramework.csproj                     | 2 +-
 src/dotnet/dotnet.csproj                                      | 2 +-
 src/redist/redist.csproj                                      | 2 +-
 src/tool_msbuild/tool_msbuild.csproj                          | 2 +-
 src/tool_nuget/tool_nuget.csproj                              | 2 +-
 src/tool_roslyn/tool_roslyn.csproj                            | 2 +-
 19 files changed, 21 insertions(+), 19 deletions(-)

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 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <SdkNugetVersion Condition=" '$(SdkNugetVersion)' == ''">1.0.0-preview5-*</SdkNugetVersion>
+    <SdkNugetVersion Condition=" '$(SdkNugetVersion)' == ''">1.0.0-rc3-*</SdkNugetVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/branchinfo.txt b/branchinfo.txt
index db5aa78d2..5658b0612 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=rc3
 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..d3b68396a 100644
--- a/build/Microsoft.DotNet.Cli.Monikers.props
+++ b/build/Microsoft.DotNet.Cli.Monikers.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkBrandName>Microsoft .NET Core 1.0.3 - SDK Preview 5</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core 1.0.3 - SDK RC 3</SdkBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core 1.0.3 - Runtime</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</SharedHostBrandName>
     <HostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</HostFxrBrandName>
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 @@
       <VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
       <SdkVersion>$(NugetVersion)</SdkVersion>
 
-      <SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-preview5-$(CommitCount)</SdkNugetVersion>
+      <SdkNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc3-$(CommitCount)</SdkNugetVersion>
       <ProjectModelNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-rc4-$(CommitCount)</ProjectModelNugetVersion>
       <DependencyModelAndInternalAbstractionsNugetVersion>$(VersionMajor).$(VersionMinor).1-beta-$(CommitCount)</DependencyModelAndInternalAbstractionsNugetVersion>
 
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)" />
   </Target>
 
diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets
index 4e127a874..feb98c5ea 100644
--- a/build/test/TestPackageProjects.targets
+++ b/build/test/TestPackageProjects.targets
@@ -181,8 +181,8 @@
         <ProjectName>Microsoft.DotNet.Cli.Utils.csproj</ProjectName>
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
-        <VersionPrefix>1.0.0-preview5-</VersionPrefix>
-        <VersionSuffix>preview5-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <VersionPrefix>1.0.0-rc3-</VersionPrefix>
+        <VersionSuffix>rc3-$(TestPackageBuildVersionSuffix)</VersionSuffix>
         <Clean>False</Clean>
         <Frameworks>netstandard1.5</Frameworks>
       </BaseTestPackageProject>
diff --git a/dir.props b/dir.props
index d0c1fdfa8..dd424deb9 100644
--- a/dir.props
+++ b/dir.props
@@ -12,5 +12,7 @@
 
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
 
+    <CliVersionPrefix>1.0.0-rc3</CliVersionPrefix>
+
   </PropertyGroup>
 </Project>
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 @@
       </Component>
       <Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
         <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
-          <RegistryValue Action="write" Name="1.0.0-preview2" Type="integer" Value="1" KeyPath="yes"/>
+          <RegistryValue Action="write" Name="1.0.0-rc3" Type="integer" Value="1" KeyPath="yes"/>
         </RegistryKey>
       </Component>
     </ComponentGroup>
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 @@
   
   <PropertyGroup>
     <Description>Archive and compression types.</Description>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
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 @@
 
   <PropertyGroup>
     <Description>SLN file reader/writer</Description>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netstandard1.6</TargetFramework>
     <DebugType>portable</DebugType>
     <AssemblyName>Microsoft.DotNet.Cli.Sln.Internal</AssemblyName>
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 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
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 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-rc3</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netstandard1.5</TargetFramework>
     <WarningsAsErrors>true</WarningsAsErrors>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
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 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <WarningsAsErrors>true</WarningsAsErrors>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
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 @@
 
   <PropertyGroup>
     <Description>Microsoft.DotNet.TestFramework Class Library</Description>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
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 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <AssemblyName>dotnet</AssemblyName>
     <OutputType>Exe</OutputType>
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 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.4</PackageTargetFallback>
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 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
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 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
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 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
 
   <PropertyGroup>
-    <VersionPrefix>1.0.0-preview5</VersionPrefix>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>

From c691f6d7fe508ab464bc4e34694219b7d1c01813 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 9 Jan 2017 16:49:57 -0800
Subject: [PATCH 2/6] Fixing the test packages preparation. First, allows it to
 run independently. Second, it actually points to packages produced by the
 repo.

---
 build/Microsoft.DotNet.Cli.Test.targets | 31 +++++++------------
 build/test/TestPackageProjects.targets  | 40 ++++++++++++-------------
 2 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets
index eb9e98c36..d38407ea4 100644
--- a/build/Microsoft.DotNet.Cli.Test.targets
+++ b/build/Microsoft.DotNet.Cli.Test.targets
@@ -203,7 +203,7 @@
   </Target>
 
   <Target Name="CreateTestAssetPackageNuPkgs"
-          DependsOnTargets="BuildTestAssetPackageProjects;
+          DependsOnTargets="PrepareTests;
                             SetupTestPackageProjectData;"
           Inputs="%(TestPackageProject.PackInputs)"
           Outputs="%(TestPackageProject.PackOutputs)">
@@ -212,6 +212,15 @@
       <DotNetPackMsbuildArgs>/p:TargetFramework=%(TestPackageProject.Framework)</DotNetPackMsbuildArgs>
       <DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
     </PropertyGroup>
+
+    <DotNetRestore ToolPath="$(Stage2Directory)"
+                   Source="$(TestPackagesDir)"
+                   WorkingDirectory="%(TestPackageProject.FullPath)" />
+
+    <DotNetBuild Framework="%(TestPackageProject.Framework)"
+                 Runtime="%(TestPackageProject.Runtime)"
+                 ProjectPath="%(TestPackageProject.ProjectPath)"
+                 ToolPath="$(Stage0Directory)" />
     
     <!-- https://github.com/NuGet/Home/issues/4063 -->
     <DotNetPack NoBuild="True"
@@ -221,24 +230,4 @@
                 VersionSuffix="%(TestPackageProject.VersionSuffix)"
                 MsbuildArgs="$(DotNetPackMsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" />
   </Target>
-
-  <Target Name="BuildTestAssetPackageProjects"
-          DependsOnTargets="RestoreTestAssetPackageProjects;
-                            SetupTestPackageProjectData;"
-          Inputs="%(TestPackageProject.BuildInputs)"
-          Outputs="%(TestPackageProject.BuildOutputs)">
-
-    <DotNetBuild Framework="%(TestPackageProject.Framework)"
-                 Runtime="%(TestPackageProject.Runtime)"
-                 ProjectPath="%(TestPackageProject.ProjectPath)"
-                 ToolPath="$(Stage0Directory)" />
-  </Target>
-
-  <Target Name="RestoreTestAssetPackageProjects"
-          DependsOnTargets="PrepareTests;
-                            SetupTestPackageProjectData;">
-
-    <DotNetRestore ToolPath="$(Stage2Directory)"
-                   WorkingDirectory="%(TestPackageProject.FullPath)" />
-  </Target>
 </Project>
diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets
index feb98c5ea..8ddad419c 100644
--- a/build/test/TestPackageProjects.targets
+++ b/build/test/TestPackageProjects.targets
@@ -70,6 +70,26 @@
 
   <Target Name="SetupTestPackageProjectBaseData">
     <ItemGroup>
+      <BaseTestPackageProject Include="src/Microsoft.DotNet.Cli.Utils">
+        <Name>Microsoft.DotNet.Cli.Utils</Name>
+        <ProjectName>Microsoft.DotNet.Cli.Utils.csproj</ProjectName>
+        <IsTool>True</IsTool>
+        <IsApplicable>True</IsApplicable>
+        <VersionPrefix>1.0.0-rc3-</VersionPrefix>
+        <VersionSuffix>rc3-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <Clean>False</Clean>
+        <Frameworks>netstandard1.5</Frameworks>
+      </BaseTestPackageProject>
+      <BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
+        <Name>Microsoft.DotNet.InternalAbstractions</Name>
+        <ProjectName>Microsoft.DotNet.InternalAbstractions.csproj</ProjectName>
+        <IsTool>True</IsTool>
+        <IsApplicable>True</IsApplicable>
+        <VersionPrefix>2.0.0-beta-</VersionPrefix>
+        <VersionSuffix>beta-$(TestPackageBuildVersionSuffix)</VersionSuffix>
+        <Clean>False</Clean>
+        <Frameworks>netstandard1.3</Frameworks>
+      </BaseTestPackageProject>
       <BaseTestPackageProject Include="TestAssets/TestPackages/PackageWithFakeNativeDep">
         <Name>PackageWithFakeNativeDep</Name>
         <ProjectName>PackageWithFakeNativeDep.csproj</ProjectName>
@@ -176,26 +196,6 @@
         <Clean>True</Clean>
         <Frameworks>netcoreapp1.0</Frameworks>
       </BaseTestPackageProject>
-      <BaseTestPackageProject Include="src/Microsoft.DotNet.Cli.Utils">
-        <Name>Microsoft.DotNet.Cli.Utils</Name>
-        <ProjectName>Microsoft.DotNet.Cli.Utils.csproj</ProjectName>
-        <IsTool>True</IsTool>
-        <IsApplicable>True</IsApplicable>
-        <VersionPrefix>1.0.0-rc3-</VersionPrefix>
-        <VersionSuffix>rc3-$(TestPackageBuildVersionSuffix)</VersionSuffix>
-        <Clean>False</Clean>
-        <Frameworks>netstandard1.5</Frameworks>
-      </BaseTestPackageProject>
-      <BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
-        <Name>Microsoft.DotNet.InternalAbstractions</Name>
-        <ProjectName>Microsoft.DotNet.InternalAbstractions.csproj</ProjectName>
-        <IsTool>True</IsTool>
-        <IsApplicable>True</IsApplicable>
-        <VersionPrefix>2.0.0-beta-</VersionPrefix>
-        <VersionSuffix>beta-$(TestPackageBuildVersionSuffix)</VersionSuffix>
-        <Clean>False</Clean>
-        <Frameworks>netstandard1.3</Frameworks>
-      </BaseTestPackageProject>
 
       <TestPackageProjectFrameworksExcludes Condition=" '$(IsDesktopAvailable)' != 'True' " Include="net45" />
       <TestPackageProjectFrameworksExcludes Condition=" '$(IsDesktopAvailable)' != 'True' " Include="net451" />

From e71c58c15617fd58f153d0b0782241e5d4239063 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 10 Jan 2017 10:43:05 -0800
Subject: [PATCH 3/6] Fixing nuget API calls and fixing the nuget test package
 directory creation, so that nuget can restore using it.

---
 build/Microsoft.DotNet.Cli.Test.targets            |  7 +++++--
 build_projects/dotnet-cli-build/DotNetRestore.cs   | 14 +++++++++++++-
 .../CommandResolution/DepsJsonBuilder.cs           |  2 +-
 .../Resolution/PackageDependencyProvider.cs        |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets
index d38407ea4..10d426160 100644
--- a/build/Microsoft.DotNet.Cli.Test.targets
+++ b/build/Microsoft.DotNet.Cli.Test.targets
@@ -70,6 +70,8 @@
       <TestDirectory>$(RepoRoot)/test/</TestDirectory>
       <DotnetUnderTest>$(Stage2Directory)</DotnetUnderTest>
     </PropertyGroup>
+
+    <MakeDir Directories="$(TestPackagesDir)" Condition="!Exists('$(TestPackagesDir)')"/>
   </Target>
 
   <Target Name="BuildTests"
@@ -213,9 +215,10 @@
       <DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
     </PropertyGroup>
 
-    <DotNetRestore ToolPath="$(Stage2Directory)"
+    <DotNetRestore ToolPath="$(Stage0Directory)"
                    Source="$(TestPackagesDir)"
-                   WorkingDirectory="%(TestPackageProject.FullPath)" />
+                   ConfigFile="$(RepoRoot)\NuGet.Config"
+                   ProjectPath="%(TestPackageProject.ProjectPath)" />
 
     <DotNetBuild Framework="%(TestPackageProject.Framework)"
                  Runtime="%(TestPackageProject.Runtime)"
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/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs
index 4de9841d5..b682bb5af 100644
--- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs
@@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Cli.Utils
         public DepsJsonBuilder()
         {
             // This resolver is only used for building file names, so that base path is not required.
-            _versionFolderPathResolver = new VersionFolderPathResolver(path: null);
+            _versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
         }
 
         public DependencyContext Build(
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs
index c1661fd49..b554fb29f 100644
--- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs
+++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs
@@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Resolution
                 _packagePathResolver = new FallbackPackagePathResolver(nugetPathContext);
 
                 // This resolver is only used for building file names, so that base path is not required.
-                _versionFolderPathResolver = new VersionFolderPathResolver(path: null);
+                _versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
             }
 
             _frameworkReferenceResolver = frameworkReferenceResolver;

From e795e12a1660f4834363dfcab1830945c1a53278 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 10 Jan 2017 10:47:10 -0800
Subject: [PATCH 4/6] Addressing code review comments.

---
 build/Microsoft.DotNet.Cli.Test.targets | 2 +-
 build/test/TestPackageProjects.targets  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets
index 10d426160..2b18620d0 100644
--- a/build/Microsoft.DotNet.Cli.Test.targets
+++ b/build/Microsoft.DotNet.Cli.Test.targets
@@ -215,7 +215,7 @@
       <DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
     </PropertyGroup>
 
-    <DotNetRestore ToolPath="$(Stage0Directory)"
+    <DotNetRestore ToolPath="$(Stage2Directory)"
                    Source="$(TestPackagesDir)"
                    ConfigFile="$(RepoRoot)\NuGet.Config"
                    ProjectPath="%(TestPackageProject.ProjectPath)" />
diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets
index 8ddad419c..34f6b4e66 100644
--- a/build/test/TestPackageProjects.targets
+++ b/build/test/TestPackageProjects.targets
@@ -75,7 +75,7 @@
         <ProjectName>Microsoft.DotNet.Cli.Utils.csproj</ProjectName>
         <IsTool>True</IsTool>
         <IsApplicable>True</IsApplicable>
-        <VersionPrefix>1.0.0-rc3-</VersionPrefix>
+        <VersionPrefix>$(CliVersionPrefix)-</VersionPrefix>
         <VersionSuffix>rc3-$(TestPackageBuildVersionSuffix)</VersionSuffix>
         <Clean>False</Clean>
         <Frameworks>netstandard1.5</Frameworks>

From 8a6faa2dcae96b4356835e3254138aaa158d5937 Mon Sep 17 00:00:00 2001
From: Livar Cunha <licavalc@microsoft.com>
Date: Tue, 10 Jan 2017 14:12:04 -0800
Subject: [PATCH 5/6] Fixing windows test.

---
 .../dotnet-desktop-and-portable.csproj                    | 2 +-
 .../dotnet-desktop-binding-redirects.csproj               | 3 ---
 build/Microsoft.DotNet.Cli.Test.targets                   | 8 +++++---
 3 files changed, 6 insertions(+), 7 deletions(-)

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 @@
     <RuntimeIdentifiers>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</RuntimeIdentifiers>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
       <FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
     </BuiltProjectOutputGroupOutput>
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 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>5.0.0</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Protocol.Core.v3">
-      <Version>3.3.0</Version>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets
index 2b18620d0..610850103 100644
--- a/build/Microsoft.DotNet.Cli.Test.targets
+++ b/build/Microsoft.DotNet.Cli.Test.targets
@@ -211,8 +211,10 @@
           Outputs="%(TestPackageProject.PackOutputs)">
 
     <PropertyGroup>
-      <DotNetPackMsbuildArgs>/p:TargetFramework=%(TestPackageProject.Framework)</DotNetPackMsbuildArgs>
-      <DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
+      <Framework>%(TestPackageProject.Framework)</Framework>
+      <DoPackRuntime Condition=" '$(Framework)' == 'net45' Or '$(Framework)' == 'net451' ">true</DoPackRuntime>
+      <DotNetPackMsbuildArgs>/p:TargetFramework=$(Framework)</DotNetPackMsbuildArgs>
+      <DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' And '$(DoPackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
     </PropertyGroup>
 
     <DotNetRestore ToolPath="$(Stage2Directory)"
@@ -220,7 +222,7 @@
                    ConfigFile="$(RepoRoot)\NuGet.Config"
                    ProjectPath="%(TestPackageProject.ProjectPath)" />
 
-    <DotNetBuild Framework="%(TestPackageProject.Framework)"
+    <DotNetBuild Framework="$(Framework)"
                  Runtime="%(TestPackageProject.Runtime)"
                  ProjectPath="%(TestPackageProject.ProjectPath)"
                  ToolPath="$(Stage0Directory)" />

From daba5cf499e8e55afb297571876c31e5f75dab0d Mon Sep 17 00:00:00 2001
From: Livar Cunha <licavalc@microsoft.com>
Date: Tue, 10 Jan 2017 14:16:15 -0800
Subject: [PATCH 6/6] Updating additional values of branchinfo.txt.

---
 branchinfo.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/branchinfo.txt b/branchinfo.txt
index 5658b0612..b1f44626c 100644
--- a/branchinfo.txt
+++ b/branchinfo.txt
@@ -5,5 +5,5 @@ MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_VERSION=0
 RELEASE_SUFFIX=rc3
-CHANNEL=rel-1.0.0
-BRANCH_NAME=rel/1.0.0
+CHANNEL=rel-1.0.0-rc3
+BRANCH_NAME=rel/1.0.0-rc3