From 5483ea80f3ee779b79828079074a60b6989f420f Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 13 Feb 2018 14:34:24 -0800
Subject: [PATCH] Rebase fixes

---
 build/Publish.targets    | 4 ++--
 build/dependencies.props | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index a8f065fdc5..f810dade57 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -249,12 +249,12 @@
     <ItemGroup>
       <PackageToPublishToTransport
         Include="@(PackageToPublish)"
-        Condition="'%(PackagesToPublish.Category)' == 'ship'" />
+        Condition="'%(PackageToPublish.Category)' == 'ship'" />
 
       <PackageToPublishToTransport
         Include="@(PackageToPublish)"
         ManifestArtifactData="NonShipping=true"
-        Condition="'%(PackagesToPublish.Category)' != 'ship'" />
+        Condition="'%(PackageToPublish.Category)' != 'ship'" />
 
       <!-- Filter aliased artifacts to workaround dotnet/buildtools#1855 -->
       <FilesToPublishToTransport Include="@(FilesToPublish)"
diff --git a/build/dependencies.props b/build/dependencies.props
index f442d498dc..ba6f56af5d 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -39,7 +39,7 @@
     <MicrosoftCSharpPackageVersion>4.5.0-preview2-26130-01</MicrosoftCSharpPackageVersion>
     <MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview2-25711-01</MicrosoftDotNetPlatformAbstractionsPackageVersion>
     <MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview1-26208-06</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview2-25711-01</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
@@ -142,6 +142,7 @@
     <SystemDataSqlClientPackageVersion>4.5.0-preview2-26130-01</SystemDataSqlClientPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-preview2-26130-01</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemDiagnosticsEventLogPackageVersion>4.5.0-preview2-26130-01</SystemDiagnosticsEventLogPackageVersion>
+    <SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>
     <SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion>
     <SystemIOFileSystemAccessControlPackageVersion>4.5.0-preview2-26130-01</SystemIOFileSystemAccessControlPackageVersion>
     <SystemIOPackagingPackageVersion>4.5.0-preview2-26130-01</SystemIOPackagingPackageVersion>