strong name all the things

2017-07-16 11:48:03 -04:00
parent 346facbe2f
commit 60f3438ce7
12 changed files with 53 additions and 17 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,4 +23,4 @@ DEPENDENCIES
  os

 BUNDLED WITH
-   1.12.1
+   1.13.7
--- a/Rakefile.rb
+++ b/Rakefile.rb
@@ -9,13 +9,13 @@ require 'nokogiri'
 require 'openssl'
 import 'nuget.rake'

-CLEAN.include(['src/**/obj', 'src/**/bin', 'tool', 'packages/**','src/**/*.nuspec', 'src/**/*.nupkg', 'tools', 'packages', '*.nupkg'])
+CLEAN.include(['src/**/obj', 'Owin.Security.Providers.nuspec', 'Owin.Security.Providers-signed.nuspec' 'src/**/bin', 'tool', 'packages/**','src/**/*.nuspec', 'src/**/*.nupkg', 'tools', 'packages', '*.nupkg'])
 Configuration = ENV['CONFIGURATION'] || 'Release'
 PACKAGES = File.expand_path("packages")
 TOOLS = File.expand_path("tools")
 NUGET = File.expand_path("#{TOOLS}/nuget")
 NUGET_EXE = File.expand_path("#{TOOLS}/nuget/nuget.exe")
-@version = "2.14.0"
+@version = "2.15.1"
 PROJECTS = Dir.glob('src/*').select{|dir| File.directory? dir }

 desc 'Retrieve things'
@@ -27,15 +27,19 @@ task :build => [:retrieve, :compile]
 desc 'clean, retrieve, build, generate nuspecs'
 task :preflight => [:clean, :build, :nuspec_gen]

+
 desc 'publish'
 task :publish => [:preflight,:nuspec_gen, :nuspec_pack,  :nuspec_publish]

+
+
 build :compile do |t|
  t.prop 'Configuration', Configuration
  t.sln = 'OwinOAuthProviders.sln'
+  t.prop 'SignAssembly', 'true'
+  t.prop 'AssemblyOriginatorKeyFile', File.expand_path("keypair.snk")
 end

-
 desc "Generate nuspec files"
 task :nuspec_gen do
  template = ERB.new(File.read('nuspectemplate.nuspec.erb'))
@@ -50,6 +54,7 @@ task :nuspec_gen do
  File.write('Owin.Security.Providers.nuspec', ERB.new(File.read('global.nuspec.erb')).result())
 end

+
 desc 'pack nuspec files'
 task :nuspec_pack do
  PROJECTS.each{|dir|
@@ -60,6 +65,7 @@ task :nuspec_pack do
  sh "#{NUGET_EXE} pack Owin.Security.Providers.nuspec -Exclude \"**\""
 end

+
 desc 'publish nugets'
 task :nuspec_publish do
  PROJECTS.each{|dir|
--- a/base/Owin.Security.Providers.OpenIDBase/Owin.Security.Providers.OpenIDBase.csproj
+++ b/base/Owin.Security.Providers.OpenIDBase/Owin.Security.Providers.OpenIDBase.csproj
@@ -89,6 +89,10 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\keypair.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.
--- a/base/Owin.Security.Providers.OpenIDBase/Owin.Security.Providers.OpenIDBase.nuspec
+++ b/base/Owin.Security.Providers.OpenIDBase/Owin.Security.Providers.OpenIDBase.nuspec
@@ -2,7 +2,7 @@
 <package >
  <metadata>
    <id>Owin.Security.Providers.OpenIDBase</id>
-    <version>2.1</version>
+    <version>2.1.1</version>
    <authors>Jerrie Pelser, Tommy Parnell and contributors</authors>
    <owners>Tommy Parnell</owners>
    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
--- a/global.nuspec.signed.erb
+++ b/global.nuspec.signed.erb
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Owin.Security.Providers-signed</id>
+    <version><%= @version %></version>
+    <authors>Jerrie Pelser, Tommy Parnell and contributors</authors>
+    <owners>Tommy Parnell</owners>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>https://github.com/tparnell8/OwinOAuthProviders</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>
+      Adds additional OAuth providers for OWIN to use with ASP.NET
+    </description>
+    <summary>
+      Additional OAuth providers for Katana (OWIN).
+      There are many individual providers, this package is a meta package that has a dependency on all of them.
+    </summary>
+    <releaseNotes>
+    View the release notes on github
+    </releaseNotes>
+    <copyright>Copyright 2013 - 2016</copyright>
+    <tags>owin katana oauth LinkedIn Yahoo Google+ GitHub Reddit Instagram StackExchange SalesForce TripIt Buffer ArcGIS Dropbox Wordpress Battle.NET Yammer OpenID Steam Twitch</tags>
+    <dependencies>
+      <% for @item in @nugets %>
+        <dependency id="<%= @item %>" version="[<%= @version %>]" />
+      <% end %>
+       </dependencies>
+  </metadata>
+</package>
--- a/keypair.snk
+++ b/keypair.snk
--- a/src/Owin.Security.Providers.OpenID/Owin.Security.Providers.OpenID.csproj
+++ b/src/Owin.Security.Providers.OpenID/Owin.Security.Providers.OpenID.csproj
@@ -46,9 +46,8 @@
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Owin.Security.Providers.OpenIDBase, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Owin.Security.Providers.OpenIDBase.2.1\lib\net45\Owin.Security.Providers.OpenIDBase.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Owin.Security.Providers.OpenIDBase, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1328b8c16b108c43, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Owin.Security.Providers.OpenIDBase.2.1.1\lib\net45\Owin.Security.Providers.OpenIDBase.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/src/Owin.Security.Providers.OpenID/packages.config
+++ b/src/Owin.Security.Providers.OpenID/packages.config
@@ -4,5 +4,5 @@
  <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
  <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="Owin.Security.Providers.OpenIDBase" version="2.1" targetFramework="net45" />
+  <package id="Owin.Security.Providers.OpenIDBase" version="2.1.1" targetFramework="net45" />
 </packages>
--- a/src/Owin.Security.Providers.Steam/Owin.Security.Providers.Steam.csproj
+++ b/src/Owin.Security.Providers.Steam/Owin.Security.Providers.Steam.csproj
@@ -46,9 +46,8 @@
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Owin.Security.Providers.OpenIDBase, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Owin.Security.Providers.OpenIDBase.2.1\lib\net45\Owin.Security.Providers.OpenIDBase.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Owin.Security.Providers.OpenIDBase, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1328b8c16b108c43, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Owin.Security.Providers.OpenIDBase.2.1.1\lib\net45\Owin.Security.Providers.OpenIDBase.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/src/Owin.Security.Providers.Steam/packages.config
+++ b/src/Owin.Security.Providers.Steam/packages.config
@@ -4,5 +4,5 @@
  <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
  <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="Owin.Security.Providers.OpenIDBase" version="2.1" targetFramework="net45" />
+  <package id="Owin.Security.Providers.OpenIDBase" version="2.1.1" targetFramework="net45" />
 </packages>
--- a/src/Owin.Security.Providers.Wargaming/Owin.Security.Providers.Wargaming.csproj
+++ b/src/Owin.Security.Providers.Wargaming/Owin.Security.Providers.Wargaming.csproj
@@ -46,9 +46,8 @@
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Owin.Security.Providers.OpenIDBase, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Owin.Security.Providers.OpenIDBase.2.1\lib\net45\Owin.Security.Providers.OpenIDBase.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Owin.Security.Providers.OpenIDBase, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1328b8c16b108c43, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Owin.Security.Providers.OpenIDBase.2.1.1\lib\net45\Owin.Security.Providers.OpenIDBase.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/src/Owin.Security.Providers.Wargaming/packages.config
+++ b/src/Owin.Security.Providers.Wargaming/packages.config
@@ -4,5 +4,5 @@
  <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
  <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="Owin.Security.Providers.OpenIDBase" version="2.1" targetFramework="net45" />
+  <package id="Owin.Security.Providers.OpenIDBase" version="2.1.1" targetFramework="net45" />
 </packages>