diff --git a/OwinOAuthProviders.sln b/OwinOAuthProviders.sln index 2e642fa..5178cf3 100644 --- a/OwinOAuthProviders.sln +++ b/OwinOAuthProviders.sln @@ -58,8 +58,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.Sal EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.Shopify", "src\Owin.Security.Providers.Shopify\Owin.Security.Providers.Shopify.csproj", "{67F12BFB-EB3A-4A86-B5DC-F4C066FDF792}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.Slack", "src\Owin.Security.Providers.Slack\Owin.Security.Providers.Slack.csproj", "{3E6F293D-8500-428D-BDC9-27440CC91E16}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.SoundCloud", "src\Owin.Security.Providers.SoundCloud\Owin.Security.Providers.SoundCloud.csproj", "{2C959026-7058-4302-A6C4-DFD10A030585}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.Spotify", "src\Owin.Security.Providers.Spotify\Owin.Security.Providers.Spotify.csproj", "{683B4041-A399-40CE-84B8-392F08A6805D}" @@ -92,6 +90,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.Yam EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.OpenIDBase", "base\Owin.Security.Providers.OpenIDBase\Owin.Security.Providers.OpenIDBase.csproj", "{4FD7B873-1994-4990-AA40-C37060121494}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.SlackProvider", "src\Owin.Security.Providers.SlackProvider\Owin.Security.Providers.SlackProvider.csproj", "{3E6F293D-8500-428D-BDC9-27440CC91E16}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -210,10 +210,6 @@ Global {67F12BFB-EB3A-4A86-B5DC-F4C066FDF792}.Debug|Any CPU.Build.0 = Debug|Any CPU {67F12BFB-EB3A-4A86-B5DC-F4C066FDF792}.Release|Any CPU.ActiveCfg = Release|Any CPU {67F12BFB-EB3A-4A86-B5DC-F4C066FDF792}.Release|Any CPU.Build.0 = Release|Any CPU - {3E6F293D-8500-428D-BDC9-27440CC91E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E6F293D-8500-428D-BDC9-27440CC91E16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E6F293D-8500-428D-BDC9-27440CC91E16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E6F293D-8500-428D-BDC9-27440CC91E16}.Release|Any CPU.Build.0 = Release|Any CPU {2C959026-7058-4302-A6C4-DFD10A030585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C959026-7058-4302-A6C4-DFD10A030585}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C959026-7058-4302-A6C4-DFD10A030585}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -278,6 +274,10 @@ Global {4FD7B873-1994-4990-AA40-C37060121494}.Debug|Any CPU.Build.0 = Debug|Any CPU {4FD7B873-1994-4990-AA40-C37060121494}.Release|Any CPU.ActiveCfg = Release|Any CPU {4FD7B873-1994-4990-AA40-C37060121494}.Release|Any CPU.Build.0 = Release|Any CPU + {3E6F293D-8500-428D-BDC9-27440CC91E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E6F293D-8500-428D-BDC9-27440CC91E16}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E6F293D-8500-428D-BDC9-27440CC91E16}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E6F293D-8500-428D-BDC9-27440CC91E16}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Rakefile.rb b/Rakefile.rb index bee65a6..6eb6641 100644 --- 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']) +CLEAN.include(['src/**/obj', '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.0.0-beta1" +@version = "2.0.0-rc1" PROJECTS = Dir.glob('src/*').select{|dir| File.directory? dir } desc 'Retrieve things' @@ -27,11 +27,13 @@ task :build => [:retrieve, :compile] desc 'clean, retrieve, build, generate nuspecs' task :preflight => [:clean, :build, :nuspec_gen] -build :compile do |t| +desc 'publish' +task :publish => [:preflight,:nuspec_gen, :nuspec_pack, :nuspec_publish] + +build :compile do |t| t.prop 'Configuration', Configuration t.sln = 'OwinOAuthProviders.sln' - end @@ -50,14 +52,21 @@ task :nuspec_gen do end desc 'pack nuspec files' -task :nuspec_pack => :nuspec_gen do +task :nuspec_pack do PROJECTS.each{|dir| Dir.chdir(dir) do - sh "#{NUGET_EXE} pack #{FileList["*.csproj"].first} -Prop Configuration=#{Configuration} -IncludeReferencedProjects" + sh "#{NUGET_EXE} pack #{FileList["*.csproj"].first} -Prop Configuration=#{Configuration}" end } sh "#{NUGET_EXE} pack Owin.Security.Providers.nuspec -Exclude \"**\"" end desc 'publish nugets' -task :nuget_ +task :nuspec_publish do + PROJECTS.each{|dir| + Dir.chdir(dir) do + sh "#{NUGET_EXE} push #{FileList["*.nupkg"].first}" + end + } + sh "#{NUGET_EXE} push #{FileList["*.nupkg"].first}" +end diff --git a/appveyor.yml b/appveyor.yml index e8feb4d..5c2d7f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,10 @@ version: 1.0.{build} -before_build: -- ps: nuget restore -build: - verbosity: minimal \ No newline at end of file +nuget: + project_feed: true +build_script: +- ps: >- + gem install bundle + bundle + rake preflight +artifacts: +- path: src\**\*.nupkg diff --git a/base/Readme.md b/base/Readme.md index efc3a0c..2102080 100644 --- a/base/Readme.md +++ b/base/Readme.md @@ -1 +1 @@ -Base libraries independently versioned go here \ No newline at end of file +Base libraries independently versioned go here...things that versions should be better (ie..manually) managed and what not diff --git a/nuget.rake b/nuget.rake index 70596f8..e43e24c 100644 --- a/nuget.rake +++ b/nuget.rake @@ -15,7 +15,7 @@ namespace :nuget do rescue FileUtils.rm_rf("#{NUGET}/nuget.exe") File.open("#{NUGET}/nuget.exe", "wb") do |file| - file.write open('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).read + file.write open('https://dist.nuget.org/win-x86-commandline/v3.2.0/nuget.exe', {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).read end end end diff --git a/src/Owin.Security.Providers.Slack/Constants.cs b/src/Owin.Security.Providers.SlackProvider/Constants.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/Constants.cs rename to src/Owin.Security.Providers.SlackProvider/Constants.cs diff --git a/src/Owin.Security.Providers.Slack/Owin.Security.Providers.Slack.csproj b/src/Owin.Security.Providers.SlackProvider/Owin.Security.Providers.SlackProvider.csproj similarity index 100% rename from src/Owin.Security.Providers.Slack/Owin.Security.Providers.Slack.csproj rename to src/Owin.Security.Providers.SlackProvider/Owin.Security.Providers.SlackProvider.csproj diff --git a/src/Owin.Security.Providers.Slack/Properties/AssemblyInfo.cs b/src/Owin.Security.Providers.SlackProvider/Properties/AssemblyInfo.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/Properties/AssemblyInfo.cs rename to src/Owin.Security.Providers.SlackProvider/Properties/AssemblyInfo.cs diff --git a/src/Owin.Security.Providers.Slack/Provider/ISlackAuthenticationProvider.cs b/src/Owin.Security.Providers.SlackProvider/Provider/ISlackAuthenticationProvider.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/Provider/ISlackAuthenticationProvider.cs rename to src/Owin.Security.Providers.SlackProvider/Provider/ISlackAuthenticationProvider.cs diff --git a/src/Owin.Security.Providers.Slack/Provider/SlackAuthenticatedContext.cs b/src/Owin.Security.Providers.SlackProvider/Provider/SlackAuthenticatedContext.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/Provider/SlackAuthenticatedContext.cs rename to src/Owin.Security.Providers.SlackProvider/Provider/SlackAuthenticatedContext.cs diff --git a/src/Owin.Security.Providers.Slack/Provider/SlackAuthenticationProvider.cs b/src/Owin.Security.Providers.SlackProvider/Provider/SlackAuthenticationProvider.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/Provider/SlackAuthenticationProvider.cs rename to src/Owin.Security.Providers.SlackProvider/Provider/SlackAuthenticationProvider.cs diff --git a/src/Owin.Security.Providers.Slack/Provider/SlackReturnEndpointContext.cs b/src/Owin.Security.Providers.SlackProvider/Provider/SlackReturnEndpointContext.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/Provider/SlackReturnEndpointContext.cs rename to src/Owin.Security.Providers.SlackProvider/Provider/SlackReturnEndpointContext.cs diff --git a/src/Owin.Security.Providers.Slack/Resources.Designer.cs b/src/Owin.Security.Providers.SlackProvider/Resources.Designer.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/Resources.Designer.cs rename to src/Owin.Security.Providers.SlackProvider/Resources.Designer.cs diff --git a/src/Owin.Security.Providers.Slack/Resources.resx b/src/Owin.Security.Providers.SlackProvider/Resources.resx similarity index 100% rename from src/Owin.Security.Providers.Slack/Resources.resx rename to src/Owin.Security.Providers.SlackProvider/Resources.resx diff --git a/src/Owin.Security.Providers.Slack/SlackAuthenticationExtensions.cs b/src/Owin.Security.Providers.SlackProvider/SlackAuthenticationExtensions.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/SlackAuthenticationExtensions.cs rename to src/Owin.Security.Providers.SlackProvider/SlackAuthenticationExtensions.cs diff --git a/src/Owin.Security.Providers.Slack/SlackAuthenticationHandler.cs b/src/Owin.Security.Providers.SlackProvider/SlackAuthenticationHandler.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/SlackAuthenticationHandler.cs rename to src/Owin.Security.Providers.SlackProvider/SlackAuthenticationHandler.cs diff --git a/src/Owin.Security.Providers.Slack/SlackAuthenticationMiddleware.cs b/src/Owin.Security.Providers.SlackProvider/SlackAuthenticationMiddleware.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/SlackAuthenticationMiddleware.cs rename to src/Owin.Security.Providers.SlackProvider/SlackAuthenticationMiddleware.cs diff --git a/src/Owin.Security.Providers.Slack/SlackAuthenticationOptions.cs b/src/Owin.Security.Providers.SlackProvider/SlackAuthenticationOptions.cs similarity index 100% rename from src/Owin.Security.Providers.Slack/SlackAuthenticationOptions.cs rename to src/Owin.Security.Providers.SlackProvider/SlackAuthenticationOptions.cs diff --git a/src/Owin.Security.Providers.Slack/packages.config b/src/Owin.Security.Providers.SlackProvider/packages.config similarity index 100% rename from src/Owin.Security.Providers.Slack/packages.config rename to src/Owin.Security.Providers.SlackProvider/packages.config