From b354e1a3c65e21e64d288ec6f5bda11841b07465 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Thu, 10 Nov 2016 10:19:37 -0800
Subject: [PATCH] Eliminate imports from CLI, where possible (#4673)

* Remove imports from dotnet.dll

* Add back dotnet5.4 to dotnet.dll due to AppInsights

* dotnet-cli-build.csproj: OData
redist.csproj: AppInsights
---
 build_projects/dotnet-cli-build/dotnet-cli-build.csproj      | 4 ++--
 .../shared-build-targets-utils/Publishing/AzurePublisher.cs  | 2 +-
 .../Microsoft.DotNet.Cli.Utils.csproj                        | 1 -
 .../Microsoft.DotNet.Configurer.csproj                       | 1 -
 .../Microsoft.DotNet.TestFramework.csproj                    | 1 -
 src/dotnet/dotnet.csproj                                     | 2 +-
 src/dotnet/project.json                                      | 5 +----
 src/redist/redist.csproj                                     | 2 +-
 src/tool_csc/tool_csc.csproj                                 | 1 -
 src/tool_msbuild/tool_msbuild.csproj                         | 4 ----
 10 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index 03bbb7670..2677c92d3 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -5,8 +5,8 @@
     <VersionPrefix>1.0.0</VersionPrefix>
     <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
     <OutputPath>bin\$(Configuration)</OutputPath>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback> 
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NETStandard.Library">
@@ -31,7 +31,7 @@
       <Version>4.0.11</Version>
     </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
-      <Version>6.2.2-preview</Version>
+      <Version>7.2.1</Version>
     </PackageReference>
     <PackageReference Include="NuGet.CommandLine.XPlat">
       <Version>4.0.0-rc-2048</Version>
diff --git a/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs b/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs
index b9e17e09a..ff102bf0d 100644
--- a/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs
+++ b/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs
@@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Cli.Build
         {
             string url = CalculateRelativePathForFile(file, product, version);
             CloudBlockBlob blob = _blobContainer.GetBlockBlobReference(url);
-            blob.UploadFromFileAsync(file, FileMode.Open).Wait();
+            blob.UploadFromFileAsync(file).Wait();
             SetBlobPropertiesBasedOnFileType(blob);
             return url;
         }
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 4fd8c7220..301223f26 100644
--- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
@@ -7,7 +7,6 @@
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="**\*.cs" />
diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
index 9a2e95ac4..a065fb049 100644
--- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
+++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
@@ -9,7 +9,6 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/dotnet/cli</RepositoryUrl>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="**\*.cs" />
diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj
index 65bc9b929..3b9a3a324 100644
--- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj
+++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj
@@ -7,7 +7,6 @@
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="**\*.cs" />
diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj
index 9a898eb55..7cfa0e25c 100755
--- a/src/dotnet/dotnet.csproj
+++ b/src/dotnet/dotnet.csproj
@@ -9,7 +9,7 @@
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.5;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.4</PackageTargetFallback> 
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index 53a005488..6289f5518 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -59,10 +59,7 @@
   "frameworks": {
     "netcoreapp1.0": {
       "imports": [
-        "dnxcore50",
-        "netstandardapp1.5",
-        "portable-net45+win8",
-        "portable-net45+wp80+win8+wpa81+dnxcore50"
+        "dotnet5.4"
       ]
     }
   }
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 36c6b9e56..ec0ef726c 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -4,7 +4,7 @@
     <VersionPrefix>1.0.0-preview4</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.5;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.4</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="RunCsc.sh;RunCsc.cmd">
diff --git a/src/tool_csc/tool_csc.csproj b/src/tool_csc/tool_csc.csproj
index a755923c1..38e178b2b 100644
--- a/src/tool_csc/tool_csc.csproj
+++ b/src/tool_csc/tool_csc.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <VersionPrefix>1.0.0-preview4</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk">
diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj
index fe4811f1d..4e11edf8a 100644
--- a/src/tool_msbuild/tool_msbuild.csproj
+++ b/src/tool_msbuild/tool_msbuild.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <VersionPrefix>1.0.0-preview4</VersionPrefix>
     <TargetFramework>netcoreapp1.0</TargetFramework>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk">
@@ -25,9 +24,6 @@
     <PackageReference Include="Microsoft.Cci">
       <Version>4.0.0-rc3-24128-00</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Composition">
-      <Version>1.0.30</Version>
-    </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>