add NuGet package for SQL provider

lanlanlee2008 · lanlanlee2008 · commit 4787918cca1d · 2017-04-25T19:57:26.000-07:00
diff --git a/Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider/packages.config b/Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider/packages.config
diff --git a/Microsoft.AspNet.OutputCache.sln b/Microsoft.AspNet.OutputCache.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.OutputCach
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.OutputCache.CustomOutputCacheProvider", "test\CustomOutputCacheProvider\Microsoft.AspNet.OutputCache.CustomOutputCacheProvider.csproj", "{A8F3E399-BCAF-4F3E-BC16-5CA98A779916}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider", "Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider\Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider.csproj", "{062FD141-4E51-4943-8C69-385DDE3D2792}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider", "src\SQLOutputCacheAsyncProvider\Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider.csproj", "{062FD141-4E51-4943-8C69-385DDE3D2792}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/MicrosoftAspNetOutputCache.msbuild b/MicrosoftAspNetOutputCache.msbuild
@@ -3,6 +3,7 @@
  
   <ItemGroup>
     <AssemblyProject Include="src\OutputCacheModuleAsync\Microsoft.AspNet.OutputCache.OutputCacheModuleAsync.csproj" />
+    <AssemblyProject Include="src\SQLOutputCacheAsyncProvider\Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider.csproj" />
     <AssemblyProject Include="test\CustomOutputCacheProvider\Microsoft.AspNet.OutputCache.CustomOutputCacheProvider.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/OutputCacheModuleAsync/Microsoft.AspNet.OutputCache.OutputCacheModuleAsync.csproj b/src/OutputCacheModuleAsync/Microsoft.AspNet.OutputCache.OutputCacheModuleAsync.csproj
@@ -27,6 +27,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\bin\Debug\Microsoft.AspNet.OutputCache.OutputCacheModuleAsync.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/src/SQLOutputCacheAsyncProvider/BinarySerializer.cs b/src/SQLOutputCacheAsyncProvider/BinarySerializer.cs
diff --git a/src/SQLOutputCacheAsyncProvider/Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider.csproj b/src/SQLOutputCacheAsyncProvider/Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider.csproj
@@ -1,7 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
-  <Import Project="..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -29,10 +27,11 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\bin\Debug\Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -42,32 +41,28 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="BinarySerializer.cs" />
     <Compile Include="SQLAsyncOutputCacheProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SQLHelper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\src\OutputCacheModuleAsync\Microsoft.AspNet.OutputCache.OutputCacheModuleAsync.csproj">
+    <ProjectReference Include="..\OutputCacheModuleAsync\Microsoft.AspNet.OutputCache.OutputCacheModuleAsync.csproj">
       <Project>{3b446e33-7b1c-4a32-aeb8-92dc6ce94f77}</Project>
       <Name>Microsoft.AspNet.OutputCache.OutputCacheModuleAsync</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -97,8 +92,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/SQLOutputCacheAsyncProvider/Properties/AssemblyInfo.cs b/src/SQLOutputCacheAsyncProvider/Properties/AssemblyInfo.cs
diff --git a/src/SQLOutputCacheAsyncProvider/SQLAsyncOutputCacheProvider.cs b/src/SQLOutputCacheAsyncProvider/SQLAsyncOutputCacheProvider.cs
diff --git a/src/SQLOutputCacheAsyncProvider/SQLHelper.cs b/src/SQLOutputCacheAsyncProvider/SQLHelper.cs
@@ -1,9 +1,9 @@
 ﻿namespace Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider {
     using System;
-    using System.Data.SqlClient;
     using System.Threading.Tasks;
     using System.Collections.Specialized;
     using System.Configuration;
+    using System.Data.SqlClient;
 
     class SQLHelper {
         public ConnectionStringSettings ConnectionStringInfo { get; set; }
diff --git a/src/SQLOutputCacheAsyncProvider/packages.config b/src/SQLOutputCacheAsyncProvider/packages.config
@@ -0,0 +1,4 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net462" developmentDependency="true" />
+</packages>
diff --git a/src/packages/Packages.csproj b/src/packages/Packages.csproj
@@ -19,6 +19,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <NuGetProject Include="OutputCacheModuleAsync.nupkg\Microsoft.AspNet.OutputCache.OutputCacheModuleAsync.nuproj" />
+    <NuGetProject Include="SQLOutputCacheAsyncProvider.nupkg\Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider.nuproj" />
     <NuGetProject Include="CustomOutputCacheProvider.nupkg\Microsoft.AspNet.OutputCache.CustomOutputCacheProvider.nuproj" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/packages/SQLOutputCacheAsyncProvider.nupkg/Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider.nuproj b/src/packages/SQLOutputCacheAsyncProvider.nupkg/Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider.nuproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.OutputCache.sln))\tools\MicrosoftAspNetOutputCache.settings.targets" />
+    <PropertyGroup>
+        <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+        <NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
+        <NuSpecFile>Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider.nuspec</NuSpecFile>
+    </PropertyGroup>
+    <ItemGroup>
+        <NuGetContent Include="$(AssemblyName).dll">
+            <Source>$(AssemblyPath)</Source>
+            <Destination>lib\Net462</Destination>
+        </NuGetContent>
+        <NuGetContent Include="$(AssemblyName).xml">
+            <Source>$(OutputPath)</Source>
+            <Destination>lib\Net462</Destination>
+        </NuGetContent>
+        <NuGetContent Include="$(AssemblyName).pdb" Condition="'$(NuGetPackSymbols)' == 'true'">
+            <Source>$(OutputPath)</Source>
+            <Destination>lib\Net462</Destination>
+        </NuGetContent>
+        <NuGetContentProject Include="$(RepositoryRoot)\src\OutputCacheModuleAsync\$(MSBuildProjectName).csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />
+        <NuGetContent Include="Content\Net462\*">
+            <Destination>content\Net462</Destination>
+        </NuGetContent>
+    </ItemGroup>
+    <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+</Project>
diff --git a/src/packages/SQLOutputCacheAsyncProvider.nupkg/Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider.nuspec b/src/packages/SQLOutputCacheAsyncProvider.nupkg/Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>$NuGetPackageId$</id>
+    <version>$NuGetPackageVersion$</version>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
+    <title>Microsoft ASP.NET Async SQL OutputCache Provider</title>
+    <description>Async version SQL OutputCache Provider</description>
+    <summary>Async version SQL OutputCache Provider</summary>
+    <language>en-US</language>
+    <projectUrl>http://www.asp.net/</projectUrl>
+    <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_ENU.htm</licenseUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <tags>ASP.NET Async SQL OutputCache Provider</tags>
+  </metadata>
+</package>
diff --git a/src/packages/SQLOutputCacheAsyncProvider.nupkg/content/Net462/web.config.install.xdt b/src/packages/SQLOutputCacheAsyncProvider.nupkg/content/Net462/web.config.install.xdt
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <system.web>
+    <caching>
+	 <outputCache xdt:Transform="Remove">
+	 </outputCache>
+    </caching>
+  </system.web> 
+ <system.web>
+     <caching xdt:Transform="InsertIfMissing">
+      <outputCache defaultProvider="SQLAsyncOutputCacheProvider" xdt:Transform="InsertIfMissing"> 
+        <providers>
+          <add name="SQLAsyncOutputCacheProvider" connectionStringName="DefaultConnection"
+              type="Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider.SQLAsyncOutputCacheProvider, Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider"
+              xdt:Transform="InsertIfMissing" />
+        </providers>
+      </outputCache>
+    </caching>
+  </system.web>
+</configuration>
diff --git a/src/packages/SQLOutputCacheAsyncProvider.nupkg/content/Net462/web.config.uninstall.xdt b/src/packages/SQLOutputCacheAsyncProvider.nupkg/content/Net462/web.config.uninstall.xdt
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+ <system.web>
+     <caching>
+      <outputCache defaultProvider="SQLAsyncOutputCacheProvider" xdt:Transform="Remove"> 
+        <providers>
+          <add name="SQLAsyncOutputCacheProvider" connectionStringName="DefaultConnection"
+              type="Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider.SQLAsyncOutputCacheProvider, Microsoft.AspNet.OutputCache.SQLAsyncOutputCacheProvider"
+              xdt:Transform="Remove" xdt:Locator="Match(type)"  />
+        </providers>
+      </outputCache>
+    </caching>
+  </system.web>
+</configuration>
diff --git a/tools/CI/CITask.targets b/tools/CI/CITask.targets
@@ -38,6 +38,7 @@
 
   <ItemGroup>
     <BinScopeTargetFiles Include="$(OutputPath)Microsoft.AspNet.OutputCache.OutputCacheModuleAsync.dll"/>
+    <BinScopeTargetFiles Include="$(OutputPath)Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider.dll"/>
     <BinScopeTargetFiles Include="$(OutputPath)Microsoft.AspNet.OutputCache.CustomOutputCacheProvider.dll"/>
   </ItemGroup>
   
@@ -66,6 +67,10 @@
             <AuthCodeCert>10006</AuthCodeCert>
             <StrongNameCert>72</StrongNameCert>
         </CodeSign>
+        <CodeSign Include="$(OutputPath)Microsoft.AspNet.OutputCache.SQLOutputCacheAsyncProvider.dll">
+            <AuthCodeCert>10006</AuthCodeCert>
+            <StrongNameCert>72</StrongNameCert>
+        </CodeSign>
 <!--
         <CodeSign Include="$(OutputPath)Microsoft.AspNet.OutputCache.CustomOutputCacheProvider.dll">
             <AuthCodeCert>10006</AuthCodeCert>
