Browse Source

Fixing missing config resources.

Former-commit-id: 891a1c4ad6c21c479a30c78b9bf25112ef2cad42
Former-commit-id: 9fdc7431dfdf7c7c84a7f862f475e5f9f6609560
af/merge-core
James South 11 years ago
parent
commit
7a70ce206e
  1. 2
      build/NuSpecs/ImageProcessor.Web.nuspec
  2. 2
      build/build.xml
  3. 10
      src/ImageProcessor.Web/ImageProcessor.Web.csproj
  4. 4
      src/ImageProcessor.Web/Properties/AssemblyInfo.cs
  5. 8
      src/TestWebsites/MVC/Web.config

2
build/NuSpecs/ImageProcessor.Web.nuspec

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata> <metadata>
<id>ImageProcessor.Web</id> <id>ImageProcessor.Web</id>
<version>4.2.0.0</version> <version>4.2.1.0</version>
<title>ImageProcessor.Web</title> <title>ImageProcessor.Web</title>
<authors>James South</authors> <authors>James South</authors>
<owners>James South</owners> <owners>James South</owners>

2
build/build.xml

@ -13,7 +13,7 @@
<project> <project>
<name>ImageProcessor Web</name> <name>ImageProcessor Web</name>
<version>4.2.0.0</version> <version>4.2.1.0</version>
<folder>..\src\ImageProcessor.Web</folder> <folder>..\src\ImageProcessor.Web</folder>
<projfile>ImageProcessor.Web.csproj</projfile> <projfile>ImageProcessor.Web.csproj</projfile>
<outputs> <outputs>

10
src/ImageProcessor.Web/ImageProcessor.Web.csproj

@ -112,13 +112,13 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Configuration\Resources\cache.config.transform"> <EmbeddedResource Include="Configuration\Resources\cache.config.transform">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </EmbeddedResource>
<None Include="Configuration\Resources\processing.config.transform"> <EmbeddedResource Include="Configuration\Resources\processing.config.transform">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </EmbeddedResource>
<None Include="Configuration\Resources\security.config.transform" /> <EmbeddedResource Include="Configuration\Resources\security.config.transform" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

4
src/ImageProcessor.Web/Properties/AssemblyInfo.cs

@ -40,5 +40,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.2.0.0")] [assembly: AssemblyVersion("4.2.1.0")]
[assembly: AssemblyFileVersion("4.2.0.0")] [assembly: AssemblyFileVersion("4.2.1.0")]

8
src/TestWebsites/MVC/Web.config

@ -6,17 +6,17 @@
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="imageProcessor"> <!--<sectionGroup name="imageProcessor">
<section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web" /> <section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web" />
<section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web" /> <section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web" />
<section name="caching" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web" /> <section name="caching" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web" />
</sectionGroup> </sectionGroup>-->
</configSections> </configSections>
<imageProcessor> <!--<imageProcessor>
<security configSource="config\imageprocessor\security.config" /> <security configSource="config\imageprocessor\security.config" />
<caching configSource="config\imageprocessor\cache.config" /> <caching configSource="config\imageprocessor\cache.config" />
<processing configSource="config\imageprocessor\processing.config" /> <processing configSource="config\imageprocessor\processing.config" />
</imageProcessor> </imageProcessor>-->
<appSettings> <appSettings>
<add key="webpages:Version" value="2.0.0.0" /> <add key="webpages:Version" value="2.0.0.0" />
<add key="webpages:Enabled" value="false" /> <add key="webpages:Enabled" value="false" />

Loading…
Cancel
Save