Fix tests for cache => store rename.

2017-04-07 14:15:38 -05:00 · 2017-04-07 14:15:38 -05:00 · 95ff3f9bf8
commit 95ff3f9bf8
parent 07b25e268c
9 changed files with 313 additions and 92 deletions
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@ -209,7 +209,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.In
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.Internal.Tests", "test\Microsoft.DotNet.Cli.Sln.Internal.Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj", "{56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}"
 EndProject
-Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-cache.Tests", "test\dotnet-cache.Tests\dotnet-cache.Tests.csproj", "{CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}"
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-store.Tests", "test\dotnet-store.Tests\dotnet-store.Tests.csproj", "{CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk", "sdk", "{3275D006-54C8-4C64-A537-B9941C5D2F0C}"
 	ProjectSection(SolutionItems) = preProject
--- a/test/Microsoft.DotNet.Cli.Tests.sln
+++ b/test/Microsoft.DotNet.Cli.Tests.sln
@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-add-reference.Tests", "dotnet-add-reference.Tests\dotnet-add-reference.Tests.csproj", "{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}"
 EndProject
@ -72,190 +72,414 @@ Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-sln-remove.Tests", "
 EndProject
 Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-add-package.Tests", "dotnet-add-package.Tests\dotnet-add-package.Tests.csproj", "{3501AB72-3E05-45EE-9000-9515F5A139AC}"
 EndProject
-Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-cache.Tests", "dotnet-cache.Tests\dotnet-cache.Tests.csproj", "{7CA9ECD0-9284-496B-890F-94B63ECB37EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-store.Tests", "dotnet-store.Tests\dotnet-store.Tests.csproj", "{04B21F0F-E645-44E3-868B-3C97E435FB74}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Debug|x64.Build.0 = Debug|Any CPU
+		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Debug|x86.Build.0 = Debug|Any CPU
 		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Release|x64.Build.0 = Release|Any CPU
+		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Release|x86.ActiveCfg = Release|Any CPU
+		{AB63A3E5-76A3-4EE9-A380-8E0C7B7644DC}.Release|x86.Build.0 = Release|Any CPU
 		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Debug|x64.Build.0 = Debug|Any CPU
+		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Debug|x86.Build.0 = Debug|Any CPU
 		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Release|x64.ActiveCfg = Release|Any CPU
+		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Release|x64.Build.0 = Release|Any CPU
+		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Release|x86.ActiveCfg = Release|Any CPU
+		{44942A2B-EA59-4E47-A6E7-8D7CF82EC825}.Release|x86.Build.0 = Release|Any CPU
 		{A918B35C-0E62-44A5-94A1-111B82C67310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A918B35C-0E62-44A5-94A1-111B82C67310}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A918B35C-0E62-44A5-94A1-111B82C67310}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A918B35C-0E62-44A5-94A1-111B82C67310}.Debug|x64.Build.0 = Debug|Any CPU
+		{A918B35C-0E62-44A5-94A1-111B82C67310}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A918B35C-0E62-44A5-94A1-111B82C67310}.Debug|x86.Build.0 = Debug|Any CPU
 		{A918B35C-0E62-44A5-94A1-111B82C67310}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A918B35C-0E62-44A5-94A1-111B82C67310}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A918B35C-0E62-44A5-94A1-111B82C67310}.Release|x64.ActiveCfg = Release|Any CPU
+		{A918B35C-0E62-44A5-94A1-111B82C67310}.Release|x64.Build.0 = Release|Any CPU
+		{A918B35C-0E62-44A5-94A1-111B82C67310}.Release|x86.ActiveCfg = Release|Any CPU
+		{A918B35C-0E62-44A5-94A1-111B82C67310}.Release|x86.Build.0 = Release|Any CPU
 		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Debug|x64.Build.0 = Debug|Any CPU
+		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Debug|x86.Build.0 = Debug|Any CPU
 		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Release|x64.ActiveCfg = Release|Any CPU
+		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Release|x64.Build.0 = Release|Any CPU
+		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{97267605-66B9-48B3-9D27-C253EEEC00D5}.Release|x86.Build.0 = Release|Any CPU
 		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Debug|x64.Build.0 = Debug|Any CPU
+		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Debug|x86.Build.0 = Debug|Any CPU
 		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Release|x64.ActiveCfg = Release|Any CPU
+		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Release|x64.Build.0 = Release|Any CPU
+		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Release|x86.ActiveCfg = Release|Any CPU
+		{1D6C9AA7-4830-4BF0-AE55-1F20102DEBC3}.Release|x86.Build.0 = Release|Any CPU
 		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Debug|x64.Build.0 = Debug|Any CPU
+		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Debug|x86.Build.0 = Debug|Any CPU
 		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Release|x64.ActiveCfg = Release|Any CPU
+		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Release|x64.Build.0 = Release|Any CPU
+		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Release|x86.ActiveCfg = Release|Any CPU
+		{394A9E3B-2E01-4FA2-A47A-2E26308E975E}.Release|x86.Build.0 = Release|Any CPU
 		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Debug|x64.Build.0 = Debug|Any CPU
+		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Debug|x86.Build.0 = Debug|Any CPU
 		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Release|x64.ActiveCfg = Release|Any CPU
+		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Release|x64.Build.0 = Release|Any CPU
+		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Release|x86.ActiveCfg = Release|Any CPU
+		{68420EEE-D084-4809-B2EB-C5EE22A6D827}.Release|x86.Build.0 = Release|Any CPU
 		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Debug|x64.Build.0 = Debug|Any CPU
+		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Debug|x86.Build.0 = Debug|Any CPU
 		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Release|x64.ActiveCfg = Release|Any CPU
+		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Release|x64.Build.0 = Release|Any CPU
+		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Release|x86.ActiveCfg = Release|Any CPU
+		{A616564F-53D5-4394-B7EC-C373CCAE92F8}.Release|x86.Build.0 = Release|Any CPU
 		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Debug|x64.Build.0 = Debug|Any CPU
+		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Debug|x86.Build.0 = Debug|Any CPU
 		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Release|x64.ActiveCfg = Release|Any CPU
+		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Release|x64.Build.0 = Release|Any CPU
+		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Release|x86.ActiveCfg = Release|Any CPU
+		{CC6F63B6-FE02-4561-BCBB-062DBFF8F758}.Release|x86.Build.0 = Release|Any CPU
 		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Debug|x64.Build.0 = Debug|Any CPU
+		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Debug|x86.Build.0 = Debug|Any CPU
 		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Release|x64.ActiveCfg = Release|Any CPU
+		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Release|x64.Build.0 = Release|Any CPU
+		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Release|x86.ActiveCfg = Release|Any CPU
+		{21C09199-7F81-494B-9100-6C4A74EFFB7F}.Release|x86.Build.0 = Release|Any CPU
 		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Debug|x64.Build.0 = Debug|Any CPU
+		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Debug|x86.Build.0 = Debug|Any CPU
 		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Release|x64.ActiveCfg = Release|Any CPU
+		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Release|x64.Build.0 = Release|Any CPU
+		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Release|x86.ActiveCfg = Release|Any CPU
+		{C60AF72E-52FA-4D32-8483-ACA508A9CC98}.Release|x86.Build.0 = Release|Any CPU
 		{40962934-929D-434D-B2C7-76341B387A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40962934-929D-434D-B2C7-76341B387A46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40962934-929D-434D-B2C7-76341B387A46}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{40962934-929D-434D-B2C7-76341B387A46}.Debug|x64.Build.0 = Debug|Any CPU
+		{40962934-929D-434D-B2C7-76341B387A46}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{40962934-929D-434D-B2C7-76341B387A46}.Debug|x86.Build.0 = Debug|Any CPU
 		{40962934-929D-434D-B2C7-76341B387A46}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40962934-929D-434D-B2C7-76341B387A46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40962934-929D-434D-B2C7-76341B387A46}.Release|x64.ActiveCfg = Release|Any CPU
+		{40962934-929D-434D-B2C7-76341B387A46}.Release|x64.Build.0 = Release|Any CPU
+		{40962934-929D-434D-B2C7-76341B387A46}.Release|x86.ActiveCfg = Release|Any CPU
+		{40962934-929D-434D-B2C7-76341B387A46}.Release|x86.Build.0 = Release|Any CPU
 		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Debug|x64.Build.0 = Debug|Any CPU
+		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Debug|x86.Build.0 = Debug|Any CPU
 		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Release|x64.ActiveCfg = Release|Any CPU
+		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Release|x64.Build.0 = Release|Any CPU
+		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Release|x86.ActiveCfg = Release|Any CPU
+		{948FCF35-9FE5-4ACF-9CF6-B65C20805DDD}.Release|x86.Build.0 = Release|Any CPU
 		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Debug|x64.Build.0 = Debug|Any CPU
+		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Debug|x86.Build.0 = Debug|Any CPU
 		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Release|x64.ActiveCfg = Release|Any CPU
+		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Release|x64.Build.0 = Release|Any CPU
+		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Release|x86.ActiveCfg = Release|Any CPU
+		{128917C9-F2CD-4C98-9BD3-20D0F0B13D61}.Release|x86.Build.0 = Release|Any CPU
 		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Debug|x86.Build.0 = Debug|Any CPU
 		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Release|x64.Build.0 = Release|Any CPU
+		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4D339C2-21E7-4EAE-8BDD-2A7DAF88AFDF}.Release|x86.Build.0 = Release|Any CPU
 		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Debug|x64.Build.0 = Debug|Any CPU
+		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Debug|x86.Build.0 = Debug|Any CPU
 		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Release|x64.ActiveCfg = Release|Any CPU
+		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Release|x64.Build.0 = Release|Any CPU
+		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Release|x86.ActiveCfg = Release|Any CPU
+		{CC1EAB87-2A9E-4F05-99EA-5B0F14031D78}.Release|x86.Build.0 = Release|Any CPU
 		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Debug|x64.Build.0 = Debug|Any CPU
+		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Debug|x86.Build.0 = Debug|Any CPU
 		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Release|x64.ActiveCfg = Release|Any CPU
+		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Release|x64.Build.0 = Release|Any CPU
+		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Release|x86.ActiveCfg = Release|Any CPU
+		{B45638FC-D4F6-47E7-9440-C1D65F0492C2}.Release|x86.Build.0 = Release|Any CPU
 		{18702FC5-7B1A-49B7-A335-A926064D577A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{18702FC5-7B1A-49B7-A335-A926064D577A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18702FC5-7B1A-49B7-A335-A926064D577A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18702FC5-7B1A-49B7-A335-A926064D577A}.Debug|x64.Build.0 = Debug|Any CPU
+		{18702FC5-7B1A-49B7-A335-A926064D577A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18702FC5-7B1A-49B7-A335-A926064D577A}.Debug|x86.Build.0 = Debug|Any CPU
 		{18702FC5-7B1A-49B7-A335-A926064D577A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18702FC5-7B1A-49B7-A335-A926064D577A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18702FC5-7B1A-49B7-A335-A926064D577A}.Release|x64.ActiveCfg = Release|Any CPU
+		{18702FC5-7B1A-49B7-A335-A926064D577A}.Release|x64.Build.0 = Release|Any CPU
+		{18702FC5-7B1A-49B7-A335-A926064D577A}.Release|x86.ActiveCfg = Release|Any CPU
+		{18702FC5-7B1A-49B7-A335-A926064D577A}.Release|x86.Build.0 = Release|Any CPU
 		{67418187-0CF6-4213-87D0-5B9B841FD755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67418187-0CF6-4213-87D0-5B9B841FD755}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67418187-0CF6-4213-87D0-5B9B841FD755}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{67418187-0CF6-4213-87D0-5B9B841FD755}.Debug|x64.Build.0 = Debug|Any CPU
+		{67418187-0CF6-4213-87D0-5B9B841FD755}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{67418187-0CF6-4213-87D0-5B9B841FD755}.Debug|x86.Build.0 = Debug|Any CPU
 		{67418187-0CF6-4213-87D0-5B9B841FD755}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67418187-0CF6-4213-87D0-5B9B841FD755}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67418187-0CF6-4213-87D0-5B9B841FD755}.Release|x64.ActiveCfg = Release|Any CPU
+		{67418187-0CF6-4213-87D0-5B9B841FD755}.Release|x64.Build.0 = Release|Any CPU
+		{67418187-0CF6-4213-87D0-5B9B841FD755}.Release|x86.ActiveCfg = Release|Any CPU
+		{67418187-0CF6-4213-87D0-5B9B841FD755}.Release|x86.Build.0 = Release|Any CPU
 		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Debug|x64.Build.0 = Debug|Any CPU
+		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Debug|x86.Build.0 = Debug|Any CPU
 		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Release|x64.ActiveCfg = Release|Any CPU
+		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Release|x64.Build.0 = Release|Any CPU
+		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Release|x86.ActiveCfg = Release|Any CPU
+		{8818FEBB-7243-4AB5-9E1C-179F5189FBD7}.Release|x86.Build.0 = Release|Any CPU
 		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Debug|x64.Build.0 = Debug|Any CPU
+		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Debug|x86.Build.0 = Debug|Any CPU
 		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Release|x64.ActiveCfg = Release|Any CPU
+		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Release|x64.Build.0 = Release|Any CPU
+		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF42BEE8-3E23-44EB-B226-3859029A0BF5}.Release|x86.Build.0 = Release|Any CPU
 		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Debug|x64.Build.0 = Debug|Any CPU
+		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Debug|x86.Build.0 = Debug|Any CPU
 		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Release|x64.ActiveCfg = Release|Any CPU
+		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Release|x64.Build.0 = Release|Any CPU
+		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{7C460953-7E23-436E-9EA9-E4CF37A919B7}.Release|x86.Build.0 = Release|Any CPU
 		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Debug|x64.Build.0 = Debug|Any CPU
+		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Debug|x86.Build.0 = Debug|Any CPU
 		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Release|x64.ActiveCfg = Release|Any CPU
+		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Release|x64.Build.0 = Release|Any CPU
+		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Release|x86.ActiveCfg = Release|Any CPU
+		{91CBD27F-5069-4FD2-AC61-15A69D65E202}.Release|x86.Build.0 = Release|Any CPU
 		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Debug|x64.Build.0 = Debug|Any CPU
+		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Debug|x86.Build.0 = Debug|Any CPU
 		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Release|x64.ActiveCfg = Release|Any CPU
+		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Release|x64.Build.0 = Release|Any CPU
+		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CCE366D-7438-40FB-A868-57D6ACD505BF}.Release|x86.Build.0 = Release|Any CPU
 		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Debug|x64.Build.0 = Debug|Any CPU
+		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Debug|x86.Build.0 = Debug|Any CPU
 		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Release|x64.ActiveCfg = Release|Any CPU
+		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Release|x64.Build.0 = Release|Any CPU
+		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Release|x86.ActiveCfg = Release|Any CPU
+		{D399E9DD-3049-47A2-8BFF-CBE26EACED7E}.Release|x86.Build.0 = Release|Any CPU
 		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Debug|x86.Build.0 = Debug|Any CPU
 		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Release|x64.Build.0 = Release|Any CPU
+		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5A9E29F-B47B-47F4-A25B-BC991DE3369C}.Release|x86.Build.0 = Release|Any CPU
 		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Debug|x86.Build.0 = Debug|Any CPU
 		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Release|x64.Build.0 = Release|Any CPU
+		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB8A1F16-614A-428F-970F-CD5F1A981343}.Release|x86.Build.0 = Release|Any CPU
 		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Debug|x86.Build.0 = Debug|Any CPU
 		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Release|x64.Build.0 = Release|Any CPU
+		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4B5DA8E-E2EA-49CB-8B8C-4E157D42E710}.Release|x86.Build.0 = Release|Any CPU
 		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|x64.ActiveCfg = Debug|x64
-		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|x64.Build.0 = Debug|x64
-		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|x86.ActiveCfg = Debug|x86
-		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|x86.Build.0 = Debug|x86
+		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|x64.Build.0 = Debug|Any CPU
+		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Debug|x86.Build.0 = Debug|Any CPU
 		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|x64.ActiveCfg = Release|x64
-		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|x64.Build.0 = Release|x64
-		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|x86.ActiveCfg = Release|x86
-		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|x86.Build.0 = Release|x86
+		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|x64.ActiveCfg = Release|Any CPU
+		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|x64.Build.0 = Release|Any CPU
+		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|x86.ActiveCfg = Release|Any CPU
+		{FC849626-89C9-4F50-A2CA-53C4315A87F8}.Release|x86.Build.0 = Release|Any CPU
 		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|x64.ActiveCfg = Debug|x64
-		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|x64.Build.0 = Debug|x64
-		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|x86.ActiveCfg = Debug|x86
-		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|x86.Build.0 = Debug|x86
+		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Debug|x86.Build.0 = Debug|Any CPU
 		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|x64.ActiveCfg = Release|x64
-		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|x64.Build.0 = Release|x64
-		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|x86.ActiveCfg = Release|x86
-		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|x86.Build.0 = Release|x86
+		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|x64.Build.0 = Release|Any CPU
+		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{5767D8F0-4ED9-4083-8BDC-ED9E65AA86EF}.Release|x86.Build.0 = Release|Any CPU
 		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|x64.ActiveCfg = Debug|x64
-		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|x64.Build.0 = Debug|x64
-		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|x86.ActiveCfg = Debug|x86
-		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|x86.Build.0 = Debug|x86
+		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|x64.Build.0 = Debug|Any CPU
+		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Debug|x86.Build.0 = Debug|Any CPU
 		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|x64.ActiveCfg = Release|x64
-		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|x64.Build.0 = Release|x64
-		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|x86.ActiveCfg = Release|x86
-		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|x86.Build.0 = Release|x86
+		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|x64.ActiveCfg = Release|Any CPU
+		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|x64.Build.0 = Release|Any CPU
+		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|x86.ActiveCfg = Release|Any CPU
+		{92BA9F90-E25B-4A1C-9598-2295D3DFC12F}.Release|x86.Build.0 = Release|Any CPU
 		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|x64.ActiveCfg = Debug|x64
-		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|x64.Build.0 = Debug|x64
-		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|x86.ActiveCfg = Debug|x86
-		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|x86.Build.0 = Debug|x86
+		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|x64.Build.0 = Debug|Any CPU
+		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Debug|x86.Build.0 = Debug|Any CPU
 		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|x64.ActiveCfg = Release|x64
-		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|x64.Build.0 = Release|x64
-		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|x86.ActiveCfg = Release|x86
-		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|x86.Build.0 = Release|x86
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Debug|x64.ActiveCfg = Debug|x64
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Debug|x64.Build.0 = Debug|x64
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Debug|x86.ActiveCfg = Debug|x86
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Debug|x86.Build.0 = Debug|x86
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Release|x64.ActiveCfg = Release|x64
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Release|x64.Build.0 = Release|x64
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Release|x86.ActiveCfg = Release|x86
-		{7CA9ECD0-9284-496B-890F-94B63ECB37EC}.Release|x86.Build.0 = Release|x86
+		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|x64.ActiveCfg = Release|Any CPU
+		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|x64.Build.0 = Release|Any CPU
+		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|x86.ActiveCfg = Release|Any CPU
+		{3501AB72-3E05-45EE-9000-9515F5A139AC}.Release|x86.Build.0 = Release|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Debug|x64.Build.0 = Debug|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Debug|x86.Build.0 = Debug|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Release|x64.ActiveCfg = Release|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Release|x64.Build.0 = Release|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Release|x86.ActiveCfg = Release|Any CPU
+		{04B21F0F-E645-44E3-868B-3C97E435FB74}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs
@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
        private string _framework;
        private string _output;
        private string _runtime;
-        private List<string> _profileFilterProject = new List<string>();
+        private List<string> _targetManifests = new List<string>();
        private bool? _selfContained;

        public PublishCommand WithFramework(string framework)
@ -38,9 +38,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
            return this;
        }

-        public PublishCommand WithProfileProject(string profileproj)
+        public PublishCommand WithTargetManifest(string target)
        {
-            _profileFilterProject.Add( $" --filter {profileproj}");
+            _targetManifests.Add( $"--target {target}");
            return this;
        }

@ -67,7 +67,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
            return string.Join(" ", 
                FrameworkOption,
                OutputOption,
-                ProfileProjOption,
+                TargetOption,
                RuntimeOption,
                SelfContainedOption);
        }
@ -78,7 +78,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities

        private string RuntimeOption => string.IsNullOrEmpty(_runtime) ? "" : $"-r {_runtime}";

-        private string ProfileProjOption => string.Join(" ", _profileFilterProject);
+        private string TargetOption => string.Join(" ", _targetManifests);

        private string SelfContainedOption => _selfContained.HasValue ? $"--self-contained:{_selfContained.Value}" : "";
    }
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/StoreCommand.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/StoreCommand.cs
@ -7,7 +7,7 @@ using System.Collections.Generic;

 namespace Microsoft.DotNet.Tools.Test.Utilities
 {
-    public sealed class CacheCommand : DotnetCommand
+    public sealed class StoreCommand : DotnetCommand
    {
        private List<string> _profileProject = new List<string>();
        private string _framework;
@ -16,42 +16,42 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
        private string _frameworkVersion;
        private string _intermediateWorkingDirectory;

-        public CacheCommand WithEntries(string profileProject)
+        public StoreCommand WithManifest(string profileProject)
        {
-            _profileProject.Add($"--entries {profileProject}");
+            _profileProject.Add($"--manifest {profileProject}");

            return this;
        }
-        public CacheCommand WithFramework(string framework)
+        public StoreCommand WithFramework(string framework)
        {
            _framework = framework;
            return this;
        }

-        public CacheCommand WithFramework(NuGetFramework framework)
+        public StoreCommand WithFramework(NuGetFramework framework)
        {
            return WithFramework(framework.GetShortFolderName());
        }

-        public CacheCommand WithOutput(string output)
+        public StoreCommand WithOutput(string output)
        {
            _output = output;
            return this;
        }

-        public CacheCommand WithRuntime(string runtime)
+        public StoreCommand WithRuntime(string runtime)
        {
            _runtime = runtime;
            return this;
        }

-        public CacheCommand WithRuntimeFrameworkVersion(string frameworkVersion)
+        public StoreCommand WithRuntimeFrameworkVersion(string frameworkVersion)
        {
            _frameworkVersion = frameworkVersion;
            return this;
        }

-        public CacheCommand WithIntermediateWorkingDirectory(string intermediateWorkingDirectory)
+        public StoreCommand WithIntermediateWorkingDirectory(string intermediateWorkingDirectory)
        {
            _intermediateWorkingDirectory = intermediateWorkingDirectory;
            return this;
@ -59,13 +59,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities

        public override CommandResult Execute(string args = "")
        {
-            args = $"cache {BuildArgs()} {args}";
+            args = $"store {BuildArgs()} {args}";
            return base.Execute(args);
        }

        public override CommandResult ExecuteWithCapturedOutput(string args = "")
        {
-            args = $"cache {BuildArgs()} {args}";
+            args = $"store {BuildArgs()} {args}";
            return base.ExecuteWithCapturedOutput(args);
        }

--- a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs
@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
        [InlineData(new string[] { "-c", "<config>" }, "/p:Configuration=<config>")]
        [InlineData(new string[] { "--configuration", "<config>" }, "/p:Configuration=<config>")]
        [InlineData(new string[] { "--version-suffix", "<versionsuffix>" }, "/p:VersionSuffix=<versionsuffix>")]
-        [InlineData(new string[] { "--filter", "<filterprojectfiles>" }, "/p:FilterProjectFiles=<filterprojectfiles>")]
+        [InlineData(new string[] { "--target", "<targetfiles>" }, "/p:FilterProjectFiles=<targetfiles>")]
        [InlineData(new string[] { "-v", "minimal" }, "/verbosity:minimal")]
        [InlineData(new string[] { "--verbosity", "minimal" }, "/verbosity:minimal")]
        [InlineData(new string[] { "<project>" }, "<project>")]
@ -60,7 +60,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
        [InlineData(new string[] { "-c", "<config>" }, "/p:Configuration=<config>")]
        [InlineData(new string[] { "--configuration", "<config>" }, "/p:Configuration=<config>")]
        [InlineData(new string[] { "--version-suffix", "<versionsuffix>" }, "/p:VersionSuffix=<versionsuffix>")]
-        [InlineData(new string[] { "--filter", "<filterprojectfiles>" }, "/p:FilterProjectFiles=<filterprojectfiles>")]
+        [InlineData(new string[] { "--target", "<targetfiles>" }, "/p:FilterProjectFiles=<targetfiles>")]
        [InlineData(new string[] { "-v", "minimal" }, "/verbosity:minimal")]
        [InlineData(new string[] { "--verbosity", "minimal" }, "/verbosity:minimal")]
        public void OptionForwardingIsCorrect(string[] args, string expectedAdditionalArgs)
--- a/test/dotnet-msbuild.Tests/GivenDotnetStoreInvocation.cs
+++ b/test/dotnet-msbuild.Tests/GivenDotnetStoreInvocation.cs
@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

-using Microsoft.DotNet.Tools.Cache;
+using Microsoft.DotNet.Tools.Store;
 using FluentAssertions;
 using Xunit;
 using System;
@ -10,19 +10,19 @@ using System.IO;

 namespace Microsoft.DotNet.Cli.MSBuild.Tests
 {
-    public class GivenDotnetCacheInvocation
+    public class GivenDotnetStoreInvocation
    {
        const string ExpectedPrefix = "exec <msbuildpath> /m /v:m /t:ComposeCache <project>";
-        static readonly string[] ArgsPrefix = { "-e", "<project>" };
+        static readonly string[] ArgsPrefix = { "-m", "<project>" };

        [Theory]
-        [InlineData("-e")]
-        [InlineData("--entries")]
+        [InlineData("-m")]
+        [InlineData("--manifest")]
        public void ItAddsProjectToMsbuildInvocation(string optionName)
        {
            var msbuildPath = "<msbuildpath>";
            string[] args = new string[] { optionName, "<project>" };
-            CacheCommand.FromArgs(args, msbuildPath)
+            StoreCommand.FromArgs(args, msbuildPath)
                .GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix}");
        }

@ -31,14 +31,14 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
        [InlineData(new string[] { "--framework", "<tfm>" }, @"/p:TargetFramework=<tfm>")]
        [InlineData(new string[] { "-r", "<rid>" }, @"/p:RuntimeIdentifier=<rid>")]
        [InlineData(new string[] { "--runtime", "<rid>" }, @"/p:RuntimeIdentifier=<rid>")]
-        [InlineData(new string[] { "--entries", "one.xml", "--entries", "two.xml", "--entries", "three.xml" }, @"/p:AdditionalProjects=one.xml%3Btwo.xml%3Bthree.xml")]
+        [InlineData(new string[] { "--manifest", "one.xml", "--manifest", "two.xml", "--manifest", "three.xml" }, @"/p:AdditionalProjects=one.xml%3Btwo.xml%3Bthree.xml")]
        public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
        {
            args = ArgsPrefix.Concat(args).ToArray();
            expectedAdditionalArgs = (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}");

            var msbuildPath = "<msbuildpath>";
-            CacheCommand.FromArgs(args, msbuildPath)
+            StoreCommand.FromArgs(args, msbuildPath)
                .GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}");
        }

@ -51,7 +51,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
            var args = ArgsPrefix.Concat(new string[] { optionName, path }).ToArray();

            var msbuildPath = "<msbuildpath>";
-            CacheCommand.FromArgs(args, msbuildPath)
+            StoreCommand.FromArgs(args, msbuildPath)
                .GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix} /p:ComposeDir={Path.GetFullPath(path)}");
        }
    }
--- a/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs
+++ b/test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs
@ -1,14 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

+using FluentAssertions;
+using Microsoft.DotNet.Tools.Test.Utilities;
 using System;
 using System.IO;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using FluentAssertions;
-using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.PlatformAbstractions;
-using Microsoft.DotNet.Tools.Test.Utilities;
 using Xunit;

 namespace Microsoft.DotNet.Cli.Publish.Tests
@ -18,6 +14,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
        private static string _tfm = "netcoreapp2.0";
        private static string _frameworkVersion = Microsoft.DotNet.TestFramework.TestAssetInstance.CurrentRuntimeFrameworkVersion;
        private static string _arch = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant();
+
        [Fact]
        public void ItPublishesARunnablePortableApp()
        {
@ -41,8 +38,8 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
                .Execute()
                .Should().Pass();

-            new CacheCommand()
-                .WithEntries(profileProject)
+            new StoreCommand()
+                .WithManifest(profileProject)
                .WithFramework(_tfm)
                .WithRuntime(rid)
                .WithOutput(localAssemblyCache)
@ -57,7 +54,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
            new PublishCommand()
                .WithFramework(_tfm)
                .WithWorkingDirectory(testProjectDirectory)
-                .WithProfileProject(profileFilter)
+                .WithTargetManifest(profileFilter)
                .Execute()
                .Should().Pass();

@ -95,7 +92,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
            new PublishCommand()
                .WithFramework(_tfm)
                .WithWorkingDirectory(testProjectDirectory)
-                .WithProfileProject(profileFilter)
+                .WithTargetManifest(profileFilter)
                .Execute()
                .Should().Pass();

@ -137,9 +134,9 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
                .Execute()
                .Should().Pass();

-            new CacheCommand()
-                .WithEntries(profileProject)
-                .WithEntries(profileProject1)
+            new StoreCommand()
+                .WithManifest(profileProject)
+                .WithManifest(profileProject1)
                .WithFramework(_tfm)
                .WithRuntime(rid)
                .WithOutput(localAssemblyCache)
@ -153,8 +150,8 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
            new PublishCommand()
                .WithFramework(_tfm)
                .WithWorkingDirectory(testProjectDirectory)
-                .WithProfileProject(profileFilter)
-                .WithProfileProject(profileFilter1)
+                .WithTargetManifest(profileFilter)
+                .WithTargetManifest(profileFilter1)
                .Execute()
                .Should().Pass();

--- a/test/dotnet-store.Tests/dotnet-store.Tests.csproj
+++ b/test/dotnet-store.Tests/dotnet-store.Tests.csproj
--- a/test/dotnet.Tests/GivenThatTheUserRequestsHelp.cs
+++ b/test/dotnet.Tests/GivenThatTheUserRequestsHelp.cs
@ -16,7 +16,6 @@ namespace dotnet.Tests
        [InlineData("add package -h")]
        [InlineData("add reference -h")]
        [InlineData("build -h")]
-        [InlineData("cache -h")]
        [InlineData("clean -h")]
        [InlineData("list -h")]
        [InlineData("migrate -h")]
@ -32,6 +31,7 @@ namespace dotnet.Tests
        [InlineData("sln add -h")]
        [InlineData("sln list -h")]
        [InlineData("sln remove -h")]
+        [InlineData("store -h")]
        [InlineData("test -h")]
        public void TheResponseIsNotAnError(string commandLine)
        {