Upgrade to RC.3

Removes __TemporarySources__ to use contentFiles packages
Remove default globs
Update test platform

build/common.props

@@ -8,10 +8,17 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
+    <NetStandardImplicitPackageVersion>1.6.2-*</NetStandardImplicitPackageVersion>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.0-*" PrivateAssets="All" />
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.1-*" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
+    <PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
   </ItemGroup>
   
 </Project>

global.json

@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "1.0.0-preview4-004233"
-  }
-}

makefile.shade

@@ -5,4 +5,4 @@ use-standard-lifecycle
 k-standard-goals
 
 #pack-sources target='build-pack'
-    dotnet command='msbuild shared/build.proj /t:Pack /v:n'
+    dotnet command='msbuild shared/sources.csproj "/t:Restore;PackAll" /v:n'

samples/CookieSample/CookieSample.csproj

@@ -5,22 +5,11 @@
     <OutputType>Exe</OutputType>
     <!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
     <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
+    <NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="web.config">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
@@ -29,8 +18,4 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
 </Project>

samples/CookieSessionSample/CookieSessionSample.csproj

@@ -5,22 +5,11 @@
     <OutputType>Exe</OutputType>
     <!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
     <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
+    <NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="web.config">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
@@ -29,8 +18,4 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
 </Project>

samples/JwtBearerSample/JwtBearerSample.csproj

@@ -7,22 +7,11 @@
     <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
     <OutputType>Exe</OutputType>
     <UserSecretsId>aspnet5-JwtBearerSample-20151210102827</UserSecretsId>
-  </PropertyGroup>
+    <NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
-
+ </PropertyGroup>
-  <ItemGroup>
-    <Content Include="wwwroot\**\*;web.config">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.JwtBearer\Microsoft.AspNetCore.Authentication.JwtBearer.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.2.0-*" />
@@ -30,8 +19,4 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
 </Project>

samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj

@@ -5,31 +5,17 @@
     <!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
     <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
     <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
+    <NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="web.config">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.OpenIdConnect\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.13.8" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-  <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0-msbuild*" />
   </ItemGroup>
 </Project>

samples/OpenIdConnectSample/OpenIdConnectSample.csproj

@@ -6,22 +6,12 @@
     <!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
     <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
     <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
+    <NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="web.config" CopyToPublishDirectory="PreserveNewest" />
-    <EmbeddedResource Include="compiler\resources\**\*" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.OpenIdConnect\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.2.0-*" />
@@ -30,13 +20,6 @@
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.2.0-*" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
-  <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0-msbuild*" />
   </ItemGroup>
 

samples/SocialSample/SocialSample.csproj

@@ -6,28 +6,15 @@
     <!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
     <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
     <UserSecretsId>aspnet5-SocialSample-20151210111056</UserSecretsId>
+    <NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="web.config" CopyToPublishDirectory="PreserveNewest" />
-    <EmbeddedResource Include="compiler\resources\**\*" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Facebook\Microsoft.AspNetCore.Authentication.Facebook.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Google\Microsoft.AspNetCore.Authentication.Google.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Twitter\Microsoft.AspNetCore.Authentication.Twitter.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
@@ -38,8 +25,4 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
 </Project>

shared/build.proj

@@ -1,24 +0,0 @@
-<Project ToolsVersion="15.0">
-  <Import Project="..\build\common.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(MSBuildThisFileDirectory)..\artifacts\build</OutputPath>
-    <Version>$(VersionPrefix)</Version>
-    <Version Condition="'$(VersionSuffix)'!=''">$(Version)-$(VersionSuffix)</Version>
-  </PropertyGroup>
-
-  <Target Name="Pack">
-    <MakeDir Directories="$(OutputPath)" />
-    <ItemGroup>
-      <Packages Include="$([System.IO.Directory]::GetDirectories(&quot;$(MSBuildThisFileDirectory)&quot;, '*.Sources'))" />
-    </ItemGroup>
-    <!-- TODO use PackNuspecTask once it is implemented -->
-    <Exec Command="dotnet nuget pack
-&quot;$(MSBuildThisFileDirectory)sources.nuspec&quot;
---base-path &quot;%(Packages.Identity)&quot;
---version $(Version)
---output-directory &quot;$(OutputPath)&quot;
---properties &quot;id=%(Packages.FileName)%(Packages.Extension)&quot;"
-        />
-  </Target>
-</Project>

shared/sources.csproj

@@ -0,0 +1,29 @@
+<!-- this is a dummy project to workaround https://github.com/NuGet/Home/issues/4254 -->
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <Import Project="..\build\common.props" />
+
+  <PropertyGroup>
+    <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(MSBuildThisFileDirectory)..\artifacts\build</PackageOutputPath>
+    <NuspecBasePath>$(MSBuildThisFileDirectory)\$(PackageId)</NuspecBasePath>
+    <TargetFramework>netstandard1.0</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <Description>$(PackageId)</Description>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <ContentTargetFolders>contentFiles</ContentTargetFolders>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(NuspecBasePath)' != ''">
+    <Compile Include="$(NuspecBasePath)\**\*.cs" Pack="true" />
+    <EmbeddedResource Include="$(NuspecBasePath)\**\*.resx" Pack="true" />
+    <PackageReference Update="@(PackageReference)" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Target Name="PackAll">
+    <ItemGroup>
+      <Packages Include="$([System.IO.Directory]::GetDirectories(&quot;$(MSBuildThisFileDirectory)&quot;, '*.Sources'))" />
+    </ItemGroup>
+    <MSBuild Projects="$(MSBuildThisFile)"
+             Targets="Pack"
+             Properties="PackageVersion=$(Version);PackageId=%(Packages.FileName)%(Packages.Extension);NoBuild=true" />
+  </Target>
+</Project>

shared/sources.nuspec

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$id$</description>
-    <contentFiles>
-      <files include="contentFiles/cs/**/*.cs" buildAction="Compile" />
-      <files include="**/*.resx" buildAction="EmbeddedResource" />
-    </contentFiles>
-  </metadata>
-  <files>
-    <file src="**\*.resx" target="contentFiles/any/netstandard1.0/" />
-    <file src="**\*.cs" target="contentFiles/cs/netstandard1.0/" />
-  </files>
-</package>

src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj

@@ -12,23 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="**\*.cs" />
     <Compile Include="..\..\shared\Microsoft.AspNetCore.ChunkingCookieManager.Sources\**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="1.2.0-*" />
-    <!--
+    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-      TODO remove files in __TemporarySources__ and use this content files package
-      <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-     -->
     <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="1.2.0-*" />
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Authentication.Cookies/__TemporarySources__/TaskCache.cs

@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache
-    {
-        /// <summary>
-        /// A <see cref="Task"/> that's already completed successfully.
-        /// </summary>
-        /// <remarks>
-        /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done
-        /// by <c>Task.CompletedTask</c>.
-        /// </remarks>
-#if NET451
-        public static readonly Task CompletedTask = Task.FromResult(0);
-#else
-        public static readonly Task CompletedTask = Task.CompletedTask;
-#endif
-    }
-}

src/Microsoft.AspNetCore.Authentication.Cookies/__TemporarySources__/TaskCacheOfT.cs

@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache<T>
-    {
-        /// <summary>
-        /// Gets a completed <see cref="Task"/> with the value of <c>default(T)</c>.
-        /// </summary>
-        public static Task<T> DefaultCompletedTask { get; }  = Task.FromResult(default(T));
-    }
-
-}

src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj

@@ -10,20 +10,8 @@
     <PackageTags>aspnetcore;authentication;security</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj

@@ -10,20 +10,8 @@
     <PackageTags>aspnetcore;authentication;security</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj

@@ -7,19 +7,9 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;authentication;security</PackageTags>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-  <ItemGroup>
-    <!--
-      TODO remove files in __TemporarySources__ and use this content files package
-      <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-     -->
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="2.1.2" />
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 </Project>

src/Microsoft.AspNetCore.Authentication.JwtBearer/__TemporarySources__/TaskCache.cs

@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache
-    {
-        /// <summary>
-        /// A <see cref="Task"/> that's already completed successfully.
-        /// </summary>
-        /// <remarks>
-        /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done
-        /// by <c>Task.CompletedTask</c>.
-        /// </remarks>
-#if NET451
-        public static readonly Task CompletedTask = Task.FromResult(0);
-#else
-        public static readonly Task CompletedTask = Task.CompletedTask;
-#endif
-    }
-}

src/Microsoft.AspNetCore.Authentication.JwtBearer/__TemporarySources__/TaskCacheOfT.cs

@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache<T>
-    {
-        /// <summary>
-        /// Gets a completed <see cref="Task"/> with the value of <c>default(T)</c>.
-        /// </summary>
-        public static Task<T> DefaultCompletedTask { get; }  = Task.FromResult(default(T));
-    }
-
-}

src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj

@@ -10,20 +10,8 @@
     <PackageTags>aspnetcore;authentication;security</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj

@@ -10,21 +10,9 @@
     <PackageTags>aspnetcore;authentication;security</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-
-  <ItemGroup>
-    <!--
-      TODO remove files in __TemporarySources__ and use this content files package
-      <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-     -->
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.Authentication.OAuth/__TemporarySources__/TaskCache.cs

@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache
-    {
-        /// <summary>
-        /// A <see cref="Task"/> that's already completed successfully.
-        /// </summary>
-        /// <remarks>
-        /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done
-        /// by <c>Task.CompletedTask</c>.
-        /// </remarks>
-#if NET451
-        public static readonly Task CompletedTask = Task.FromResult(0);
-#else
-        public static readonly Task CompletedTask = Task.CompletedTask;
-#endif
-    }
-}

src/Microsoft.AspNetCore.Authentication.OAuth/__TemporarySources__/TaskCacheOfT.cs

@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache<T>
-    {
-        /// <summary>
-        /// Gets a completed <see cref="Task"/> with the value of <c>default(T)</c>.
-        /// </summary>
-        public static Task<T> DefaultCompletedTask { get; }  = Task.FromResult(default(T));
-    }
-
-}

src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj

@@ -7,19 +7,9 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;authentication;security</PackageTags>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-  <ItemGroup>
-    <!--
-      TODO remove files in __TemporarySources__ and use this content files package
-      <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-     -->
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="2.1.2" />
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 </Project>

src/Microsoft.AspNetCore.Authentication.OpenIdConnect/__TemporarySources__/TaskCache.cs

@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache
-    {
-        /// <summary>
-        /// A <see cref="Task"/> that's already completed successfully.
-        /// </summary>
-        /// <remarks>
-        /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done
-        /// by <c>Task.CompletedTask</c>.
-        /// </remarks>
-#if NET451
-        public static readonly Task CompletedTask = Task.FromResult(0);
-#else
-        public static readonly Task CompletedTask = Task.CompletedTask;
-#endif
-    }
-}

src/Microsoft.AspNetCore.Authentication.OpenIdConnect/__TemporarySources__/TaskCacheOfT.cs

@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache<T>
-    {
-        /// <summary>
-        /// Gets a completed <see cref="Task"/> with the value of <c>default(T)</c>.
-        /// </summary>
-        public static Task<T> DefaultCompletedTask { get; }  = Task.FromResult(default(T));
-    }
-
-}

src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj

@@ -10,21 +10,9 @@
     <PackageTags>aspnetcore;authentication;security</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-
-  <ItemGroup>
-    <!--
-      TODO remove files in __TemporarySources__ and use this content files package
-      <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-     -->
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.Authentication.Twitter/__TemporarySources__/TaskCache.cs

@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache
-    {
-        /// <summary>
-        /// A <see cref="Task"/> that's already completed successfully.
-        /// </summary>
-        /// <remarks>
-        /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done
-        /// by <c>Task.CompletedTask</c>.
-        /// </remarks>
-#if NET451
-        public static readonly Task CompletedTask = Task.FromResult(0);
-#else
-        public static readonly Task CompletedTask = Task.CompletedTask;
-#endif
-    }
-}

src/Microsoft.AspNetCore.Authentication.Twitter/__TemporarySources__/TaskCacheOfT.cs

@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache<T>
-    {
-        /// <summary>
-        /// Gets a completed <see cref="Task"/> with the value of <c>default(T)</c>.
-        /// </summary>
-        public static Task<T> DefaultCompletedTask { get; }  = Task.FromResult(default(T));
-    }
-
-}

src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj

@@ -11,24 +11,15 @@
     <PackageTags>aspnetcore;authentication;security</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="1.2.0-*" />
-    <!--
+    <PackageReference Include="Microsoft.Extensions.SecurityHelper.Sources"  Version="1.2.0-*" PrivateAssets="All" />
-      TODO remove files in __TemporarySources__ and use this content files package
+    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-      <PackageReference Include="Microsoft.Extensions.SecurityHelper.Sources"  Version="1.2.0-*" PrivateAssets="All" />
-      <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-     -->
     <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="1.2.0-*" />
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Authentication/__TemporarySources__/SecurityHelper.cs

@@ -1,40 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using System.Security.Claims;
-
-namespace Microsoft.Extensions.Internal
-{
-    /// <summary>
-    /// Helper code used when implementing authentication middleware
-    /// </summary>
-    internal static class SecurityHelper
-    {
-        /// <summary>
-        /// Add all ClaimsIdentities from an additional ClaimPrincipal to the ClaimsPrincipal
-        /// Merges a new claims principal, placing all new identities first, and eliminating
-        /// any empty unauthenticated identities from context.User
-        /// </summary>
-        /// <param name="existingPrincipal">The <see cref="ClaimsPrincipal"/> containing existing <see cref="ClaimsIdentity"/>.</param>
-        /// <param name="additionalPrincipal">The <see cref="ClaimsPrincipal"/> containing <see cref="ClaimsIdentity"/> to be added.</param>
-        public static ClaimsPrincipal MergeUserPrincipal(ClaimsPrincipal existingPrincipal, ClaimsPrincipal additionalPrincipal)
-        {
-            var newPrincipal = new ClaimsPrincipal();
-
-            // New principal identities go first
-            if (additionalPrincipal != null)
-            {
-                newPrincipal.AddIdentities(additionalPrincipal.Identities);
-            }
-
-            // Then add any existing non empty or authenticated identities
-            if (existingPrincipal != null)
-            {
-                newPrincipal.AddIdentities(existingPrincipal.Identities.Where(i => i.IsAuthenticated || i.Claims.Any()));
-            }
-            return newPrincipal;
-        }
-    }
-}

src/Microsoft.AspNetCore.Authentication/__TemporarySources__/TaskCache.cs

@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache
-    {
-        /// <summary>
-        /// A <see cref="Task"/> that's already completed successfully.
-        /// </summary>
-        /// <remarks>
-        /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done
-        /// by <c>Task.CompletedTask</c>.
-        /// </remarks>
-#if NET451
-        public static readonly Task CompletedTask = Task.FromResult(0);
-#else
-        public static readonly Task CompletedTask = Task.CompletedTask;
-#endif
-    }
-}

src/Microsoft.AspNetCore.Authentication/__TemporarySources__/TaskCacheOfT.cs

@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache<T>
-    {
-        /// <summary>
-        /// Gets a completed <see cref="Task"/> with the value of <c>default(T)</c>.
-        /// </summary>
-        public static Task<T> DefaultCompletedTask { get; }  = Task.FromResult(default(T));
-    }
-
-}

src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj

@@ -13,19 +13,10 @@ Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
     <PackageTags>aspnetcore;authorization</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="1.2.0-*" />
-    <!--
+    <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-      TODO remove files in __TemporarySources__ and use this content files package
-      <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
-     -->
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

src/Microsoft.AspNetCore.Authorization/__TemporarySources__/TaskCache.cs

@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache
-    {
-        /// <summary>
-        /// A <see cref="Task"/> that's already completed successfully.
-        /// </summary>
-        /// <remarks>
-        /// We're caching this in a static readonly field to make it more inlinable and avoid the volatile lookup done
-        /// by <c>Task.CompletedTask</c>.
-        /// </remarks>
-#if NET451
-        public static readonly Task CompletedTask = Task.FromResult(0);
-#else
-        public static readonly Task CompletedTask = Task.CompletedTask;
-#endif
-    }
-}

src/Microsoft.AspNetCore.Authorization/__TemporarySources__/TaskCacheOfT.cs

@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace Microsoft.Extensions.Internal
-{
-    internal static class TaskCache<T>
-    {
-        /// <summary>
-        /// Gets a completed <see cref="Task"/> with the value of <c>default(T)</c>.
-        /// </summary>
-        public static Task<T> DefaultCompletedTask { get; }  = Task.FromResult(default(T));
-    }
-
-}

src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj

@@ -10,15 +10,9 @@
     <PackageTags>aspnetcore</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="1.2.0-*" />
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
 </Project>

src/Microsoft.Owin.Security.Interop/Microsoft.Owin.Security.Interop.csproj

@@ -10,15 +10,9 @@
     <PackageTags>aspnetcore;katana;owin;security</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Owin.Security" Version="3.0.1" />
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
 </Project>

test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj

@@ -6,11 +6,6 @@
     <TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Facebook\Microsoft.AspNetCore.Authentication.Facebook.csproj" />
@@ -19,24 +14,11 @@
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.OpenIdConnect\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Twitter\Microsoft.AspNetCore.Authentication.Twitter.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
     <PackageReference Include="xunit" Version="2.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj

@@ -6,18 +6,9 @@
     <TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authorization\Microsoft.AspNetCore.Authorization.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
-
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" />
@@ -25,8 +16,4 @@
     <PackageReference Include="xunit" Version="2.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj

@@ -7,20 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="**\*.cs" />
     <Compile Include="..\..\shared\Microsoft.AspNetCore.ChunkingCookieManager.Sources\**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
     <PackageReference Include="xunit" Version="2.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj

@@ -6,29 +6,14 @@
     <TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.CookiePolicy\Microsoft.AspNetCore.CookiePolicy.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" />
     <PackageReference Include="xunit" Version="2.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
-  </ItemGroup>
-
 </Project>

test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj

@@ -6,26 +6,14 @@
     <TargetFramework>net451</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.Owin.Security.Interop\Microsoft.Owin.Security.Interop.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="3.0.1" />
     <PackageReference Include="Microsoft.Owin.Testing" Version="3.0.1" />
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
     <PackageReference Include="xunit" Version="2.2.0-*" />
   </ItemGroup>