Remove references to PlatformAbstractions (#1585)

* Remove references to PlatformAbstractions PlatformAbstractions is being obsoleted and will be removed from dotnet/runtime. Contributes to dotnet/runtime#3470 * Update the SDK to preview3 Co-authored-by: Dan Seefeldt <DanSeefeldt@outlook.com>
dotnet · May 19, 2020 · 144650e · 144650e
1 parent 363de02
commit 144650e
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 207 deletions.
diff --git a/dir.props b/dir.props
@@ -68,8 +68,6 @@
     <DarcInstallDir>$(DotNetCliToolDir)tools/</DarcInstallDir>
     <DarcVersion>$([System.IO.File]::ReadAllText('$(ProjectDir)DarcVersion.txt').Trim())</DarcVersion>
     <DarcDll>$(DotNetCliToolDir)tools/.store/microsoft.dotnet.darc/$(DarcVersion)/microsoft.dotnet.darc/$(DarcVersion)/tools/netcoreapp3.0/any/Microsoft.DotNet.Darc.dll</DarcDll>
-    <TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/</TasksBinDir>
-    <SourceBuildTasksAssembly>$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll</SourceBuildTasksAssembly>
     <XPlatTasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks.XPlat/bin/Debug/netstandard2.0/</XPlatTasksBinDir>
     <XPlatSourceBuildTasksAssembly>$(XPlatTasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.XPlat.dll</XPlatSourceBuildTasksAssembly>
     <LeakDetectionTasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/</LeakDetectionTasksBinDir>
@@ -93,7 +91,6 @@
     <SourceBuiltToolsetDir>$(LocalBlobStorageRoot)Toolset/</SourceBuiltToolsetDir>
     <SourceBuiltRuntimeDir>$(LocalBlobStorageRoot)Runtime/</SourceBuiltRuntimeDir>
     <SourceBuiltAspNetCoreRuntime>$(LocalBlobStorageRoot)aspnetcore/Runtime/</SourceBuiltAspNetCoreRuntime>
-    <TargetInfoProps>$(IntermediatePath)TargetInfo.props</TargetInfoProps>
     <RestoreSourcePropsPath>$(IntermediatePath)RestoreSources.props</RestoreSourcePropsPath>
     <PackageVersionPropsPath>$(IntermediatePath)PackageVersions.props</PackageVersionPropsPath>
     <GennedPackageVersionPropsPath Condition="'$(OfflineBuild)' == 'true'">$(IntermediatePath)GennedPackageVersions.props</GennedPackageVersionPropsPath>
@@ -154,10 +151,24 @@
   <PropertyGroup>
      <ArmEnvironmentVariables Condition="'$(ArmEnvironmentVariables)' == ''">ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/arm</ArmEnvironmentVariables>
      <ArmEnvironmentVariables Condition="'$(Platform)' == 'armel'">ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/armel</ArmEnvironmentVariables>
-   </PropertyGroup>
+  </PropertyGroup>
 
-  <Import Project="$(TargetInfoProps)" Condition="$(GeneratingStaticPropertiesFile) != 'true' AND Exists('$(TargetInfoProps)')" />
+  <PropertyGroup>
+    <TargetRid Condition="'$(TargetRid)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
 
+    <TargetOS Condition="'$(TargetOS)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS'))">Windows_NT</TargetOS>
+    <TargetOS Condition="'$(TargetOS)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">OSX</TargetOS>
+    <TargetOS Condition="'$(TargetOS)' == '' AND $([MSBuild]::IsOSPlatform('LINUX'))">Linux</TargetOS>
+    <TargetOS Condition="'$(TargetOS)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD'))">FreeBSD</TargetOS>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(PortableBuild)' == 'true'">
+    <TargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</TargetRid>
+    <TargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</TargetRid>
+    <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</TargetRid>
+    <TargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</TargetRid>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- known-good (repos/known-good.proj) conditionally includes submodules based on the platform,
          so this will not always correspond to the same repos - see that file for details.

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.2.20153.3"
+    "dotnet": "5.0.100-preview.3.20216.6"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",

diff --git a/support/tarball/build.sh b/support/tarball/build.sh
@@ -136,5 +136,4 @@ export NUGET_PACKAGES="$SCRIPT_ROOT/packages/restored/"
 
 $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:BuildXPlatTasks.binlog $SCRIPT_ROOT/tools-local/init-build.proj /t:BuildXPlatTasks ${MSBUILD_ARGUMENTS[@]} "$@"
 
-$CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:initWriteDynamicPropsToStaticPropsFiles.binlog $SCRIPT_ROOT/tools-local/init-build.proj /t:WriteDynamicPropsToStaticPropsFiles /p:GeneratingStaticPropertiesFile=true ${MSBUILD_ARGUMENTS[@]} "$@"
 $CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:build.binlog $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@"
diff --git a/tools-local/init-build.proj b/tools-local/init-build.proj
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <!-- Don't try to import the target info file when building this project -->
-    <GeneratingStaticPropertiesFile>true</GeneratingStaticPropertiesFile>
-  </PropertyGroup>
   <Import Project="..\dir.props" />
   <Import Project="$(OfflineAllRepoPropsFile)" Condition="Exists('$(OfflineAllRepoPropsFile)')" />
 
-  <UsingTask AssemblyFile="$(SourceBuildTasksAssembly)" TaskName="GetHostInformation" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteSourceRepoProperties" />
   <UsingTask AssemblyFile="$(LeakDetectionTasksAssembly)" TaskName="MarkAndCatalogPackages" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="NuGetPack" />
@@ -20,10 +15,10 @@
   </PropertyGroup>
 
   <Target Name="Build"
-    Inputs="$(TargetInfoProps)"
+    Inputs="$(MSBuildThisFile)"
     Outputs="$(BuildCompetedSuccessSemaphore)"
     >
-    <CallTarget Targets="UnpackTarballs;BuildXPlatTasks;AcquireDarc;FetchSources;WriteSourceLinkMetadata;BuildTasks;ExtractToolPackage;InstallSourceBuildSdkResolver;WriteDynamicPropsToStaticPropsFiles;GenerateRootFs;ApplyPatches;PoisonPrebuiltPackages" />
+    <CallTarget Targets="UnpackTarballs;BuildXPlatTasks;AcquireDarc;FetchSources;WriteSourceLinkMetadata;ExtractToolPackage;InstallSourceBuildSdkResolver;GenerateRootFs;ApplyPatches;PoisonPrebuiltPackages" />
     <Touch Files="$(BuildCompetedSuccessSemaphore)" AlwaysCreate="true" />
   </Target>
 
@@ -51,13 +46,6 @@
     <Copy SourceFiles="$(PrebuiltSourceBuiltPackagesPath)PackageVersions.props" DestinationFiles="$(IntermediatePath)SourceBuiltPackageVersions.props" />
   </Target>
 
-  <Target Name="BuildTasks">
-    <PropertyGroup Condition="'$(OfflineBuild)' == 'true'">
-      <OfflineSources>&quot;$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)&quot;</OfflineSources>
-    </PropertyGroup>
-    <Exec Command="$(DotNetCliToolDir)dotnet build tasks\Microsoft.DotNet.SourceBuild.Tasks\Microsoft.DotNet.SourceBuild.Tasks.csproj /p:RestoreSources=$(OfflineSources) /p:OfflineBuild=$(OfflineBuild)" />
-  </Target>
-
   <Target Name="BuildXPlatTasks" DependsOnTargets="UnpackTarballs">
     <PropertyGroup Condition="'$(OfflineBuild)' == 'true'">
       <OfflineSources>&quot;$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)&quot;</OfflineSources>
@@ -82,41 +70,13 @@
   </Target>
 
   <Target Name="ExtractToolPackage"
-          DependsOnTargets="UnpackTarballs;BuildTasks"
+          DependsOnTargets="UnpackTarballs"
           Condition="'$(OfflineBuild)' == 'true'">
     <ZipFileExtractToDirectory SourceArchive="$(PrebuiltSourceBuiltPackagesPath)Microsoft.DotNet.Arcade.Sdk.$(ARCADE_BOOTSTRAP_VERSION).nupkg"
                                DestinationDirectory="$(ArcadeBootstrapPackageDir)microsoft.dotnet.arcade.sdk/$(ARCADE_BOOTSTRAP_VERSION)/"
                                OverwriteDestination="true" />
   </Target>
 
-  <Target Name="WriteDynamicPropsToStaticPropsFiles" DependsOnTargets="BuildTasks">
-    <GetHostInformation Condition="'$(TargetRid)' == ''">
-      <Output PropertyName="TargetRid" TaskParameter="Rid" />
-    </GetHostInformation>
-
-    <GetHostInformation Condition="'$(TargetOS)' == ''">
-      <Output PropertyName="TargetOS" TaskParameter="OSName" />
-    </GetHostInformation>
-
-    <PropertyGroup Condition="'$(PortableBuild)' == 'true'">
-      <TargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</TargetRid>
-      <TargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</TargetRid>
-      <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</TargetRid>
-      <TargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</TargetRid>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <TargetInfoPropsContent>&lt;Project ToolsVersion=&quot;15.0&quot;&gt;
-  &lt;PropertyGroup&gt;
-    &lt;TargetRid&gt;$(TargetRid)&lt;/TargetRid&gt;
-    &lt;TargetOS&gt;$(TargetOS)&lt;/TargetOS&gt;
-  &lt;/PropertyGroup&gt;
-&lt;/Project&gt;</TargetInfoPropsContent>
-    </PropertyGroup>
-    <MakeDir Directories="$(IntermediatePath)" Condition="!Exists('$(IntermediatePath)')" />
-    <WriteLinesToFile File="$(TargetInfoProps)" Lines="$(TargetInfoPropsContent)" Overwrite="True" />
-  </Target>
-
   <Target Name="PoisonPrebuiltPackages" Condition="'$(EnablePoison)' == 'true' and '$(OfflineBuild)' == 'true'">
     <ItemGroup>
       <PrebuiltPackages Include="$(PrebuiltPackagesPath)**/*.nupkg" />

diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml
@@ -39,27 +39,19 @@
   <NeverRestoredTarballPrebuilts>
     <PackageIdentity Id="MicroBuild.Core" Version="0.2.0" />
     <PackageIdentity Id="MicroBuild.Core.Sentinel" Version="1.0.0" />
-    <PackageIdentity Id="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
-    <PackageIdentity Id="Microsoft.CodeAnalysis.Common" Version="2.9.0" />
-    <PackageIdentity Id="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" />
-    <PackageIdentity Id="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19616.4" />
-    <PackageIdentity Id="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20153.1" />
-    <PackageIdentity Id="Microsoft.DotNet.SignTool" Version="5.0.0-beta.19616.4" />
-    <PackageIdentity Id="Microsoft.Net.Compilers.Toolset" Version="3.5.0-beta4-20128-03" />
+    <PackageIdentity Id="Microsoft.CodeAnalysis.Analyzers" Version="2.9.6" />
+    <PackageIdentity Id="Microsoft.CodeAnalysis.Common" Version="3.4.0" />
+    <PackageIdentity Id="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
     <PackageIdentity Id="Microsoft.NETCore.DotNetAppHost" Version="5.0.0-alpha.1.20080.9" />
     <PackageIdentity Id="Microsoft.NETCore.DotNetHost" Version="5.0.0-alpha.1.20080.9" />
     <PackageIdentity Id="Microsoft.NETCore.DotNetHostPolicy" Version="5.0.0-alpha.1.20080.9" />
     <PackageIdentity Id="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-alpha.1.20080.9" />
     <PackageIdentity Id="Microsoft.NETCore.ILAsm" Version="5.0.0-alpha1.19563.3" />
     <PackageIdentity Id="Microsoft.NETCore.ILDAsm" Version="5.0.0-alpha1.19563.3" />
-    <PackageIdentity Id="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
+    <PackageIdentity Id="Microsoft.NETCore.Platforms" Version="2.1.2" />
     <PackageIdentity Id="runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" />
     <PackageIdentity Id="runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" />
     <PackageIdentity Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" />
-    <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="5.0.0-alpha.1.20080.9" />
-    <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="5.0.0-alpha.1.20080.9" />
-    <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="5.0.0-alpha.1.20080.9" />
-    <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-alpha.1.20080.9" />
     <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="5.0.0-alpha1.19563.3" />
     <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="5.0.0-alpha1.19563.3" />
     <PackageIdentity Id="runtime.native.System" Version="4.0.0" />
@@ -79,46 +71,30 @@
     <PackageIdentity Id="runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" />
     <PackageIdentity Id="runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" />
     <PackageIdentity Id="runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" />
-    <PackageIdentity Id="sn" Version="1.0.0" />
     <PackageIdentity Id="System.Composition" Version="1.0.31" />
-    <PackageIdentity Id="System.Composition.AttributedModel" Version="1.0.31" />
-    <PackageIdentity Id="System.Composition.Convention" Version="1.0.31" />
-    <PackageIdentity Id="System.Composition.Hosting" Version="1.0.31" />
-    <PackageIdentity Id="System.Composition.Runtime" Version="1.0.31" />
-    <PackageIdentity Id="System.Composition.TypedParts" Version="1.0.31" />
-    <PackageIdentity Id="System.Runtime.CompilerServices.Unsafe" Version="4.5.0" />
-    <PackageIdentity Id="System.Text.Json" Version="1.0" />
-    <PackageIdentity Id="System.ValueTuple" Version="4.3.0" />
-    <PackageIdentity Id="System.Xml.XPath" Version="4.3.0" />
-    <PackageIdentity Id="System.Xml.XPath.XDocument" Version="4.3.0" />
-    <PackageIdentity Id="vswhere" Version="2.6.7" />
     <PackageIdentity Id="XliffTasks" Version="1.0.0-beta.19252.1" />
     <PackageIdentity Id="XliffTasks" Version="1.0.0-beta.20152.1" />
   </NeverRestoredTarballPrebuilts>
   <Usages>
-    <Usage Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="5.0.0-preview.2.20152.3" />
-    <Usage Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="5.0.0-preview.2.20152.3" />
-    <Usage Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-preview.2.20152.3" />
+    <Usage Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="5.0.0-preview.3.20215.14" />
+    <Usage Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="5.0.0-preview.3.20215.14" />
+    <Usage Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-preview.3.20215.14" />
     <Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
     <Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
     <Usage Id="Microsoft.Build.Traversal" Version="2.0.2" />
-    <Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.9.6" />
-    <Usage Id="Microsoft.CodeAnalysis.Common" Version="3.4.0" />
-    <Usage Id="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" IsDirectDependency="true" />
     <Usage Id="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" IsDirectDependency="true" />
     <Usage Id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="2.9.8" />
     <Usage Id="Microsoft.CodeQuality.Analyzers" Version="2.9.8" />
     <Usage Id="Microsoft.CSharp" Version="4.4.1" />
     <Usage Id="Microsoft.DiaSymReader" Version="1.0.8" />
     <Usage Id="Microsoft.NET.Sdk.IL" Version="5.0.0-alpha.1.20076.2" />
     <Usage Id="Microsoft.NetCore.Analyzers" Version="2.9.8" />
-    <Usage Id="Microsoft.NETCore.App.Host.linux-musl-x64" Version="5.0.0-preview.2.20152.11" />
-    <Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.0.1" />
-    <Usage Id="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-preview.2.20152.11" />
-    <Usage Id="Microsoft.NETCore.App.Ref" Version="3.1.0" />
-    <Usage Id="Microsoft.NETCore.App.Runtime.linux-musl-x64" Version="5.0.0-preview.2.20152.11" />
-    <Usage Id="Microsoft.NETCore.App.Runtime.linux-x64" Version="5.0.0-preview.2.20152.11" />
-    <Usage Id="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.2.20152.11" />
+    <Usage Id="Microsoft.NETCore.App.Host.linux-musl-x64" Version="5.0.0-preview.3.20214.6" />
+    <Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="3.0.3" />
+    <Usage Id="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-preview.3.20214.6" />
+    <Usage Id="Microsoft.NETCore.App.Runtime.linux-musl-x64" Version="5.0.0-preview.3.20214.6" />
+    <Usage Id="Microsoft.NETCore.App.Runtime.linux-x64" Version="5.0.0-preview.3.20214.6" />
+    <Usage Id="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.3.20214.6" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
@@ -128,13 +104,18 @@
     <Usage Id="Microsoft.NETCore.Platforms" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="1.1.1" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
-    <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.2" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="3.1.0" />
     <Usage Id="Microsoft.NETCore.Targets" Version="1.0.1" />
     <Usage Id="Microsoft.NetFramework.Analyzers" Version="2.9.8" />
+    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" IsDirectDependency="true" IsAutoReferenced="true" />
     <Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" IsDirectDependency="true" />
-    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.0" />
+    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net45" Version="1.0.0" />
+    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net451" Version="1.0.0" />
+    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net46" Version="1.0.0" />
+    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0" />
+    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.0" />
+    <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net47" Version="1.0.0" />
     <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net471" Version="1.0.0" />
     <Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0" />
     <Usage Id="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19462.14" />
@@ -254,8 +235,6 @@
     <Usage Id="System.Security.Principal.Windows" Version="4.5.0" />
     <Usage Id="System.Security.Principal.Windows" Version="4.6.0" />
     <Usage Id="System.Security.Principal.Windows" Version="4.7.0" />
-    <Usage Id="System.Text.Encoding.CodePages" Version="4.3.0" />
-    <Usage Id="System.Text.Encoding.CodePages" Version="4.5.1" />
     <Usage Id="System.Text.Encoding.CodePages" Version="4.6.0" />
     <Usage Id="System.Text.Encoding.CodePages" Version="4.7.0" />
     <Usage Id="System.Text.Encodings.Web" Version="4.7.0" />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -136,5 +136,4 @@ export NUGET_PACKAGES="$SCRIPT_ROOT/packages/restored/"

		$CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:BuildXPlatTasks.binlog $SCRIPT_ROOT/tools-local/init-build.proj /t:BuildXPlatTasks ${MSBUILD_ARGUMENTS[@]} "$@"

		$CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:initWriteDynamicPropsToStaticPropsFiles.binlog $SCRIPT_ROOT/tools-local/init-build.proj /t:WriteDynamicPropsToStaticPropsFiles /p:GeneratingStaticPropertiesFile=true ${MSBUILD_ARGUMENTS[@]} "$@"
		$CLI_ROOT/dotnet $CLI_ROOT/sdk/$SDK_VERSION/MSBuild.dll /bl:build.binlog $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@"