Browse Source

Fix build

Former-commit-id: 9105190ab9948ec79d04336d512acc97a8246474
Former-commit-id: 280d791ee41b6305aaca75c6e3b32bbb340c27c9
af/merge-core
James South 11 years ago
parent
commit
fd205ae5e6
  1. 4
      build/Build.bat
  2. 22
      build/build.xml
  3. 2
      build/content/ImageProcessor.Web.Plugins.AzureBlobCache/config/imageprocessor/cache.config.transform
  4. 1
      src/ImageProcessor.sln
  5. 4
      src/Plugins/ImageProcessor.Web/ImageProcessor.Web.Plugins.AzureBlobCache/ImageProcessor.Web.Plugins.AzureBlobCache.csproj

4
build/Build.bat

@ -1,3 +1,5 @@
@echo off
powershell "Import-Module %~dp0\psake.psm1 ; Invoke-Psake %~dp0\build.ps1 ; exit $LASTEXITCODE"
powershell "Import-Module %~dp0\psake.psm1 ; Invoke-Psake %~dp0\build.ps1 ; exit $LASTEXITCODE"
pause

22
build/build.xml

@ -22,17 +22,6 @@
<nuspec>ImageProcessor.Web.nuspec</nuspec>
</project>
<project>
<name>ImageProcessor Web Azure Blob Cache plugin</name>
<version>1.0.0.0</version>
<folder>..\src\Plugins\ImageProcessor.Web\ImageProcessor.Web.Plugins.AzureBlobCache</folder>
<projfile>ImageProcessor.Web.Plugins.AzureBlobCache.csproj</projfile>
<outputs>
<output folder="ImageProcessor.Web.Plugins.AzureBlobCache\lib\net45" />
</outputs>
<nuspec>ImageProcessor.Web.Plugins.AzureBlobCache.nuspec</nuspec>
</project>
<project>
<name>ImageProcessor Web PostProcessor</name>
<version>1.0.2.0</version>
@ -50,6 +39,17 @@
<nuspec>ImageProcessor.Web.Config.nuspec</nuspec>
</project>
<project>
<name>ImageProcessor Web Azure Blob Cache plugin</name>
<version>1.0.0.0</version>
<folder>..\src\Plugins\ImageProcessor.Web\ImageProcessor.Web.Plugins.AzureBlobCache</folder>
<projfile>ImageProcessor.Web.Plugins.AzureBlobCache.csproj</projfile>
<outputs>
<output folder="ImageProcessor.Web.Plugins.AzureBlobCache\lib\net45" />
</outputs>
<nuspec>ImageProcessor.Web.Plugins.AzureBlobCache.nuspec</nuspec>
</project>
<project>
<name>ImageProcessor Cair plugin</name>
<version>1.0.0.0</version>

2
build/content/ImageProcessor.Web.Plugins.AzureBlobCache/config/imageprocessor/cache.config.transform

@ -1,6 +1,6 @@
<caching currentCache="AzureBlobCache">
<caches>
<cache name="AzureBlobCache" type="ImageProcessor.Web.Caching.AzureBlobCache, ImageProcessor.Web.Caching.AzureBlobCache" maxDays="365">
<cache name="AzureBlobCache" type="ImageProcessor.Web.Plugins.AzureBlobCache.AzureBlobCache, ImageProcessor.Web.Plugins.AzureBlobCache" maxDays="365">
<settings>
<setting key="CachedStorageAccount" value="DefaultEndpointsProtocol=https;AccountName=[CacheAccountName];AccountKey=[CacheAccountKey]"/>
<setting key="CachedBlobContainer" value="cache"/>

1
src/ImageProcessor.sln

@ -207,6 +207,7 @@ Global
{633B1C4C-4823-47BE-9A01-A665F3118C8C} = {B5217BED-B0B7-408E-81B7-877DE2BF9036}
{F6A208E9-C18F-43E9-B051-3C6EED30FDAF} = {B5217BED-B0B7-408E-81B7-877DE2BF9036}
{C7D1F0DD-CBD6-4127-82B4-51949EFF0BF5} = {5D12E196-FB7A-4D97-B156-56901EF8084D}
{7BF5274B-56A7-4B62-8105-E9BDF25BAFE7} = {B5217BED-B0B7-408E-81B7-877DE2BF9036}
{3C805E4C-D679-43F8-8C43-8909CDB4D4D7} = {5D12E196-FB7A-4D97-B156-56901EF8084D}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution

4
src/Plugins/ImageProcessor.Web/ImageProcessor.Web.Plugins.AzureBlobCache/ImageProcessor.Web.Plugins.AzureBlobCache.csproj

@ -82,12 +82,12 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<!--<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
</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.
<Target Name="BeforeBuild">

Loading…
Cancel
Save