Fixed strong naming which was missing from Topshelf v4

jaider · May 8, 2016 · 7e64a47 · 7e64a47
1 parent fb17936
commit 7e64a47
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 8 deletions.
diff --git a/build.fsx b/build.fsx
@@ -12,7 +12,7 @@ let packagesPath = FullName "./src/packages"
 let keyFile = FullName "./Topshelf.snk"
 
 let assemblyVersion = "4.0.0.0"
-let baseVersion = "4.0.0"
+let baseVersion = "4.0.1"
 
 let semVersion : SemVerInfo = parse baseVersion
 

diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets
@@ -20,6 +20,7 @@
         <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
         <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
             <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://api.nuget.org/v3/index.json" />
         <!--
             <PackageSource Include="https://my-nuget-source/nuget/" />
         -->

diff --git a/src/SolutionVersion.cs b/src/SolutionVersion.cs
@@ -5,12 +5,12 @@
 [assembly: AssemblyDescriptionAttribute("Topshelf is an open source project for hosting services without friction. By referencing Topshelf, your console application *becomes* a service installer with a comprehensive set of command-line options for installing, configuring, and running your application as a service.")]
 [assembly: AssemblyProductAttribute("Topshelf")]
 [assembly: AssemblyVersionAttribute("4.0.0.0")]
-[assembly: AssemblyFileVersionAttribute("4.0.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("4.0.0.0 (drb/a3ac1e81)")]
+[assembly: AssemblyFileVersionAttribute("4.0.1.0")]
+[assembly: AssemblyInformationalVersionAttribute("4.0.1.0")]
 [assembly: AssemblyCopyrightAttribute("Copyright 2012 Chris Patterson, Dru Sellers, Travis Smith, All rights reserved.")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "4.0.0.0";
-        internal const string InformationalVersion = "4.0.0.0 (drb/a3ac1e81)";
+        internal const string InformationalVersion = "4.0.1.0";
     }
 }
diff --git a/src/Topshelf.Elmah/Topshelf.Elmah.csproj b/src/Topshelf.Elmah/Topshelf.Elmah.csproj
@@ -34,10 +34,6 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition="  '$(TargetFrameworkVersion)' == 'v3.5' ">
-    <DefineConstants>NET35</DefineConstants>
-    <OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Elmah">
       <HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>

diff --git a/src/Topshelf.Log4Net/Topshelf.Log4Net.csproj b/src/Topshelf.Log4Net/Topshelf.Log4Net.csproj
@@ -35,6 +35,12 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AssemblyOriginatorKeyFile>..\..\Topshelf.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>

diff --git a/src/Topshelf.NLog/Topshelf.NLog.csproj b/src/Topshelf.NLog/Topshelf.NLog.csproj
@@ -35,6 +35,12 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AssemblyOriginatorKeyFile>..\..\Topshelf.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.3.3\lib\net45\NLog.dll</HintPath>

diff --git a/src/Topshelf.Serilog/Topshelf.Serilog.csproj b/src/Topshelf.Serilog/Topshelf.Serilog.csproj
@@ -34,6 +34,12 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AssemblyOriginatorKeyFile>..\..\Topshelf.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.1.5.14\lib\net45\Serilog.dll</HintPath>

diff --git a/src/Topshelf/Topshelf.csproj b/src/Topshelf/Topshelf.csproj
@@ -36,6 +36,12 @@
     <NoWarn>3001,3009</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AssemblyOriginatorKeyFile>..\..\Topshelf.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />