From acc3d012acc21f2561e0113e6610fe37042cb7b4 Mon Sep 17 00:00:00 2001
From: Christopher Costa <chcosta@microsoft.com>
Date: Fri, 5 May 2017 13:29:38 -0700
Subject: [PATCH 1/8] Testing version 25305-19

---
 build/BuildDefaults.props      | 3 +--
 build/BundledRuntimes.props    | 8 +++-----
 build/DependencyVersions.props | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props
index 32ae1dfac..64eddcfd4 100644
--- a/build/BuildDefaults.props
+++ b/build/BuildDefaults.props
@@ -4,8 +4,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <IncludeNuGetPackageArchive Condition=" '$(IncludeNuGetPackageArchive)' == '' ">true</IncludeNuGetPackageArchive>
     <SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers>
-    <UsePortableSharedFramework Condition=" '$(UsePortableSharedFramework)' == '' ">true</UsePortableSharedFramework>
-    <UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(UsePortableSharedFramework)' == 'true' AND '$(OSPlatform)' == 'linux' ">true</UsePortableLinuxSharedFramework>
+    <UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(OSPlatform)' == 'linux' ">true</UsePortableLinuxSharedFramework>
     <IncludeSharedFrameworksForBackwardsCompatibilityTests Condition=" $(IncludeSharedFrameworksForBackwardsCompatibilityTests) == '' AND '$(Rid)' != 'linux-x64' ">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>
     <HighEntropyVA>true</HighEntropyVA>
   </PropertyGroup>
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 0821f4f2c..f1c18bf1f 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -1,16 +1,14 @@
 <Project>
   <PropertyGroup>
-    <ArchivePortableSuffix Condition=" '$(UsePortableSharedFramework)' == 'true' ">-portable</ArchivePortableSuffix>
-    <InstallerPortableSuffix Condition=" '$(UsePortableSharedFramework)' == 'true' AND '$(OSName)' != 'ubuntu' ">-portable</InstallerPortableSuffix>
 
     <!-- Downloaded Installers + Archives -->
-    <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(SharedHostVersion)$(InstallerPortableSuffix)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
+    <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(SharedHostVersion)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
     <DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
 
-    <DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(HostFxrVersion)$(InstallerPortableSuffix)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
+    <DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(HostFxrVersion)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
     <DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName)</DownloadedHostFxrInstallerFile>
 
-    <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerPortableSuffix)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
+    <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
     <DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
 
     <!-- Use the portable linux-x64 Rid when downloading the shared framework compressed file.
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 54fda00c4..84c44d091 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.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>
-    <CLI_SharedFrameworkVersion>2.0.0-preview2-002093-00</CLI_SharedFrameworkVersion>
+    <CLI_SharedFrameworkVersion>2.0.0-preview2-25305-19</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.2.0-preview-000093-02</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
     <CLI_NETSDK_Version>2.0.0-preview2-20170425-7</CLI_NETSDK_Version>
@@ -14,8 +14,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170425-201</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170425-203</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170425-203</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview2-002093</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview2-002093</DependencyModelVersion>
+    <PlatformAbstractionsVersion>2.0.0-preview2-25305-19</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview2-25305-19</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
 

From 01c5f59bdbb6c8048a45252f6de88171fd49cc59 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 2 May 2017 21:00:24 -0500
Subject: [PATCH 2/8] Fix test to use case-insensitive search on
 DependencyContext library name.

---
 test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
index 5c120645e..31f271f50 100644
--- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
+++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
@@ -118,7 +118,7 @@ namespace Microsoft.DotNet.New.Tests
                     var context = reader.Read(stream);
                     var dependency = context
                         .RuntimeLibraries
-                        .Single(library => library.Name == packageName);
+                        .Single(library => string.Equals(library.Name, packageName, StringComparison.OrdinalIgnoreCase));
 
                     return dependency.Version;
                 }

From 9e9f17a3e2a346a61edd853d6a2c4190ff82e879 Mon Sep 17 00:00:00 2001
From: Christopher Costa <chcosta@microsoft.com>
Date: Fri, 5 May 2017 17:05:35 -0700
Subject: [PATCH 3/8] Reset platformabstraction and dependencymodel versions
 while issue is being investigated

---
 build/DependencyVersions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 84c44d091..517ef21df 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -14,8 +14,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170425-201</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170425-203</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170425-203</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview2-25305-19</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview2-25305-19</DependencyModelVersion>
+    <PlatformAbstractionsVersion>2.0.0-preview2-002093</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview2-002093</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
 

From f9cebfda09dd215a2a45b6f52bf4eb7a8f06eb32 Mon Sep 17 00:00:00 2001
From: Christopher Costa <chcosta@microsoft.com>
Date: Sat, 6 May 2017 12:18:35 -0700
Subject: [PATCH 4/8] update versions to 25306-06

---
 build/DependencyVersions.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index b7fe32d55..7c3298805 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.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>
-    <CLI_SharedFrameworkVersion>2.0.0-preview2-25305-19</CLI_SharedFrameworkVersion>
+    <CLI_SharedFrameworkVersion>2.0.0-preview2-25306-06</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.3.0-preview-000117-01</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
     <CLI_NETSDK_Version>2.0.0-preview2-20170506-1</CLI_NETSDK_Version>
@@ -14,8 +14,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170503-217</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170504-221</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170504-221</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview2-002093</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview2-002093</DependencyModelVersion>
+    <PlatformAbstractionsVersion>2.0.0-preview2-25306-06</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview2-25306-06</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
     <AspNetCoreRuntimeVersion>2.0.0-preview1-65</AspNetCoreRuntimeVersion>

From cc2cbd4d7fc564564b51bd9b2c102b7df3a41d3d Mon Sep 17 00:00:00 2001
From: Christopher Costa <chcosta@microsoft.com>
Date: Sat, 6 May 2017 13:16:56 -0700
Subject: [PATCH 5/8] Undo back dependencymodel / platformabstractions change

---
 build/DependencyVersions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 7c3298805..2844e469c 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -14,8 +14,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170503-217</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170504-221</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170504-221</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview2-25306-06</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview2-25306-06</DependencyModelVersion>
+    <PlatformAbstractionsVersion>2.0.0-preview2-002093</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview2-002093</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
     <AspNetCoreRuntimeVersion>2.0.0-preview1-65</AspNetCoreRuntimeVersion>

From 6df51ceb3b26ba984386e98e5077c01b6414c45d Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Mon, 8 May 2017 17:39:14 -0500
Subject: [PATCH 6/8] Fix CLI's reference to core-setup's installer files to
 use $(RID) instead of a moniker.

---
 build/BundledRuntimes.props | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 3cb55220f..7f579209a 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -1,19 +1,21 @@
 <Project>
   <PropertyGroup>
+    <CoreSetupRid>$(Rid)</CoreSetupRid>
+    <CoreSetupRid Condition=" '$(OSName)' == 'win' or '$(OSName)' == 'osx' ">$(ProductMonikerRid)</CoreSetupRid>
 
     <!-- Downloaded Installers + Archives -->
-    <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(SharedHostVersion)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
+    <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(CoreSetupRid).$(SharedHostVersion)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
     <DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
 
-    <DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(HostFxrVersion)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
+    <DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(CoreSetupRid).$(HostFxrVersion)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
     <DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName)</DownloadedHostFxrInstallerFile>
 
-    <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
+    <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(CoreSetupRid).$(SharedFrameworkVersion)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
     <DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
 
     <!-- Use the portable linux-x64 Rid when downloading the shared framework compressed file.
          NOTE: There isn't a 'linux-x64' version of the installers or the additional shared framweork. -->
-    <SharedFrameworkRid>$(ProductMonikerRid)</SharedFrameworkRid>
+    <SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
     <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
     <CombinedFrameworkHostCompressedFileName>dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchivePortableSuffix)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
   </PropertyGroup>

From 3aba7b8a55025a81dfe0fe5a16085ce2f9ee9943 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 9 May 2017 15:58:03 -0500
Subject: [PATCH 7/8] Update Core-Setup to 2.0.0-preview2-25309-07

---
 build/DependencyVersions.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 2844e469c..c96b5c839 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.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>
-    <CLI_SharedFrameworkVersion>2.0.0-preview2-25306-06</CLI_SharedFrameworkVersion>
+    <CLI_SharedFrameworkVersion>2.0.0-preview2-25309-07</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.3.0-preview-000117-01</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
     <CLI_NETSDK_Version>2.0.0-preview2-20170506-1</CLI_NETSDK_Version>
@@ -14,8 +14,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170503-217</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170504-221</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170504-221</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview2-002093</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview2-002093</DependencyModelVersion>
+    <PlatformAbstractionsVersion>2.0.0-preview2-25309-07</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview2-25309-07</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
     <AspNetCoreRuntimeVersion>2.0.0-preview1-65</AspNetCoreRuntimeVersion>

From 4670323694b1ed375a60e2e2ba12a0df879a226a Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 9 May 2017 21:51:32 -0500
Subject: [PATCH 8/8] Remove unused property.

---
 build/BundledRuntimes.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 7f579209a..56e0a9c11 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -17,7 +17,7 @@
          NOTE: There isn't a 'linux-x64' version of the installers or the additional shared framweork. -->
     <SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
     <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
-    <CombinedFrameworkHostCompressedFileName>dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchivePortableSuffix)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
+    <CombinedFrameworkHostCompressedFileName>dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
   </PropertyGroup>
 
   <PropertyGroup>