Merge pull request win-acme#138 from Lone-Coder/remove-extra-dll-files

1.8.9 Pre-Release
ThomasCr · Feb 20, 2016 · 173c7f4 · 173c7f4
2 parents eb9d6f8 + dd1606d
commit 173c7f4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/letsencrypt-win-simple/App.config b/letsencrypt-win-simple/App.config
@@ -2,11 +2,8 @@
 
 <configuration>
   <configSections>
-    <sectionGroup name="applicationSettings"
-                  type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="LetsEncrypt.ACME.Simple.Properties.Settings"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               requirePermission="false" />
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="LetsEncrypt.ACME.Simple.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
   </configSections>
   <appSettings>
@@ -57,16 +54,12 @@
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider"
-             type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-             serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider"
-             type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-             serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
       </providers>
     </roleManager>
   </system.web>

diff --git a/letsencrypt-win-simple/FodyWeavers.xml b/letsencrypt-win-simple/FodyWeavers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+	<Costura/>
+
+</Weavers>
diff --git a/letsencrypt-win-simple/Properties/AssemblyInfo.cs b/letsencrypt-win-simple/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.8.8.*")]
-[assembly: AssemblyFileVersion("1.8.8.8")]
+[assembly: AssemblyVersion("1.8.9.*")]
+[assembly: AssemblyFileVersion("1.8.9.1")]
diff --git a/letsencrypt-win-simple/letsencrypt-win-simple.csproj b/letsencrypt-win-simple/letsencrypt-win-simple.csproj
@@ -194,6 +194,7 @@
       <Link>x64\ssleay32.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="FodyWeavers.xml" />
     <Content Include="Web_Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -210,7 +211,9 @@
       <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.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
   </Target>
+  <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
   <!-- 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">

diff --git a/letsencrypt-win-simple/packages.config b/letsencrypt-win-simple/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="ACMESharp" version="0.8.1.214-EA" targetFramework="net45" />
   <package id="ACMESharp.PKI.Providers.OpenSslLib32" version="0.8.1.214-EA" targetFramework="net45" />
@@ -8,6 +7,8 @@
   <package id="AWSSDK.Route53" version="3.1.2.1" targetFramework="net45" />
   <package id="AWSSDK.S3" version="3.1.3.11" targetFramework="net45" />
   <package id="CommandLineParser" version="2.0.275-beta" targetFramework="net45" />
+  <package id="Costura.Fody" version="1.3.5.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
   <package id="log4net" version="2.0.5" targetFramework="net45" />
   <package id="ManagedOpenSsl32" version="0.6.1.3" targetFramework="net45" />
   <package id="ManagedOpenSsl64" version="0.6.1.3" targetFramework="net45" />