diff --git a/.gitignore b/.gitignore index 91637fa..6b8e004 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ test-tmp/ .idea/ .DS_Store *.nupkg +*.snupkg packages/ diff --git a/Tenduke.Client.AspNetCore/Tenduke.Client.AspNetCore.csproj b/Tenduke.Client.AspNetCore/Tenduke.Client.AspNetCore.csproj index 062a89d..7a3c9f0 100755 --- a/Tenduke.Client.AspNetCore/Tenduke.Client.AspNetCore.csproj +++ b/Tenduke.Client.AspNetCore/Tenduke.Client.AspNetCore.csproj @@ -7,15 +7,17 @@ ASP.NET client library for 10Duke Identity and Entitlement Entitlement Licensing Identity 10Duke AspNet Copyright © 2018- 10Duke Software - https://github.com/10Duke/10duke-dotnet-client/blob/master/LICENSE https://github.com/10Duke/10duke-dotnet-client https://raw.githubusercontent.com/10Duke/10duke-dotnet-client/master/10duke.ico - https://github.com/10Duke/10duke-dotnet-client - Update to Tenduke.Client 3.2.0 + https://github.com/10Duke/10duke-dotnet-client.git + Update to Tenduke.Client 3.3.1 true true - 3.2.0 - 3.2.0.0 + 3.3.1 + 3.3.1.0 + MIT + true + snupkg @@ -24,10 +26,7 @@ - - - - + diff --git a/Tenduke.Client.DefaultBrowser/Tenduke.Client.DefaultBrowser.csproj b/Tenduke.Client.DefaultBrowser/Tenduke.Client.DefaultBrowser.csproj index aa01045..8d3484b 100644 --- a/Tenduke.Client.DefaultBrowser/Tenduke.Client.DefaultBrowser.csproj +++ b/Tenduke.Client.DefaultBrowser/Tenduke.Client.DefaultBrowser.csproj @@ -3,16 +3,19 @@ netstandard2.0 true - 3.2.0 + 3.3.1 10Duke Software 10Duke Software Client library for 10Duke Identity and Entitlement that uses the operating system default browser for user interaction Copyright © 2018- 10Duke Software https://raw.githubusercontent.com/10Duke/10duke-dotnet-client/master/10duke.ico https://github.com/10Duke/10duke-dotnet-client - https://github.com/10Duke/10duke-dotnet-client + https://github.com/10Duke/10duke-dotnet-client.git Entitlement Licensing Identity 10Duke - Initial version + Support reading signer key from server JWKS endpoint, fix public key serialization with .NET Core, and update dependency versions + MIT + true + snupkg @@ -24,8 +27,8 @@ - - + + diff --git a/Tenduke.Client.DefaultBrowserSample/Tenduke.Client.DefaultBrowserSample.csproj b/Tenduke.Client.DefaultBrowserSample/Tenduke.Client.DefaultBrowserSample.csproj index 2062f55..f572f42 100644 --- a/Tenduke.Client.DefaultBrowserSample/Tenduke.Client.DefaultBrowserSample.csproj +++ b/Tenduke.Client.DefaultBrowserSample/Tenduke.Client.DefaultBrowserSample.csproj @@ -11,9 +11,7 @@ - - - + diff --git a/Tenduke.Client.Desktop/Properties/AssemblyInfo.cs b/Tenduke.Client.Desktop/Properties/AssemblyInfo.cs index c241f8c..d6c7911 100644 --- a/Tenduke.Client.Desktop/Properties/AssemblyInfo.cs +++ b/Tenduke.Client.Desktop/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] +[assembly: AssemblyVersion("3.3.1.0")] +[assembly: AssemblyFileVersion("3.3.1.0")] diff --git a/Tenduke.Client.Desktop/Tenduke.Client.Desktop.csproj b/Tenduke.Client.Desktop/Tenduke.Client.Desktop.csproj index 8fdeaad..4796c92 100644 --- a/Tenduke.Client.Desktop/Tenduke.Client.Desktop.csproj +++ b/Tenduke.Client.Desktop/Tenduke.Client.Desktop.csproj @@ -18,6 +18,8 @@ true + true + snupkg AnyCPU @@ -29,6 +31,8 @@ prompt 4 true + true + snupkg AnyCPU @@ -39,6 +43,8 @@ prompt 4 true + true + snupkg @@ -64,6 +70,12 @@ ..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll + + ..\packages\Microsoft.IdentityModel.Logging.6.15.0\lib\net461\Microsoft.IdentityModel.Logging.dll + + + ..\packages\Microsoft.IdentityModel.Tokens.6.15.0\lib\net461\Microsoft.IdentityModel.Tokens.dll + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll @@ -102,6 +114,12 @@ ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + ..\packages\Tenduke.Client.3.3.1\lib\netstandard2.0\Tenduke.Client.dll + + + ..\packages\Tenduke.Client.WinBase.3.3.1\lib\netstandard2.0\Tenduke.Client.WinBase.dll + @@ -114,16 +132,6 @@ - - - {8930610c-b2ca-4167-a6b0-b4a10676bb54} - Tenduke.Client.WinBase - - - {b5112486-55f1-4fb7-9239-bd32a8bbfab7} - Tenduke.Client - - diff --git a/Tenduke.Client.Desktop/Tenduke.Client.Desktop.nuspec b/Tenduke.Client.Desktop/Tenduke.Client.Desktop.nuspec index 855c238..423c714 100644 --- a/Tenduke.Client.Desktop/Tenduke.Client.Desktop.nuspec +++ b/Tenduke.Client.Desktop/Tenduke.Client.Desktop.nuspec @@ -6,15 +6,14 @@ $title$ 10Duke Software 10Duke Software - https://github.com/10Duke/10duke-dotnet-client/blob/master/LICENSE + MIT https://github.com/10Duke/10duke-dotnet-client https://raw.githubusercontent.com/10Duke/10duke-dotnet-client/master/10duke.ico false $description$ - - Update CefSharp to 88.2.90 -- Add support for additional claims in license consumption requests - + Support reading signer key from server JWKS endpoint, fix public key serialization with .NET Core, and update dependency versions Copyright © 2019- 10Duke Software Entitlement Licensing Identity 10Duke Desktop + \ No newline at end of file diff --git a/Tenduke.Client.Desktop/packages.config b/Tenduke.Client.Desktop/packages.config index 9de76d7..498a7b0 100644 --- a/Tenduke.Client.Desktop/packages.config +++ b/Tenduke.Client.Desktop/packages.config @@ -8,6 +8,8 @@ + + @@ -19,4 +21,6 @@ + + \ No newline at end of file diff --git a/Tenduke.Client.WPF/Properties/AssemblyInfo.cs b/Tenduke.Client.WPF/Properties/AssemblyInfo.cs index 50e5c58..a1b3ad4 100755 --- a/Tenduke.Client.WPF/Properties/AssemblyInfo.cs +++ b/Tenduke.Client.WPF/Properties/AssemblyInfo.cs @@ -51,6 +51,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] +[assembly: AssemblyVersion("3.3.1.0")] +[assembly: AssemblyFileVersion("3.3.1.0")] diff --git a/Tenduke.Client.WPF/Tenduke.Client.WPF.csproj b/Tenduke.Client.WPF/Tenduke.Client.WPF.csproj index 7acad20..94224e5 100755 --- a/Tenduke.Client.WPF/Tenduke.Client.WPF.csproj +++ b/Tenduke.Client.WPF/Tenduke.Client.WPF.csproj @@ -19,6 +19,8 @@ true + true + snupkg AnyCPU @@ -30,6 +32,8 @@ prompt 4 true + true + snupkg AnyCPU @@ -40,6 +44,8 @@ prompt 4 true + true + snupkg @@ -63,6 +69,12 @@ ..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll + + ..\packages\Microsoft.IdentityModel.Logging.6.15.0\lib\net461\Microsoft.IdentityModel.Logging.dll + + + ..\packages\Microsoft.IdentityModel.Tokens.6.15.0\lib\net461\Microsoft.IdentityModel.Tokens.dll + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll @@ -124,6 +136,15 @@ 4.0 + + ..\packages\Tenduke.Client.3.3.1\lib\netstandard2.0\Tenduke.Client.dll + + + ..\packages\Tenduke.Client.Desktop.3.3.1\lib\net461\Tenduke.Client.Desktop.dll + + + ..\packages\Tenduke.Client.WinBase.3.3.1\lib\netstandard2.0\Tenduke.Client.WinBase.dll + @@ -241,20 +262,6 @@ - - - {bb3b0629-a838-4beb-bff0-32aaff87e37d} - Tenduke.Client.Desktop - - - {8930610c-b2ca-4167-a6b0-b4a10676bb54} - Tenduke.Client.WinBase - - - {b5112486-55f1-4fb7-9239-bd32a8bbfab7} - Tenduke.Client - - diff --git a/Tenduke.Client.WPF/Tenduke.Client.WPF.nuspec b/Tenduke.Client.WPF/Tenduke.Client.WPF.nuspec index aef9146..3ee01db 100755 --- a/Tenduke.Client.WPF/Tenduke.Client.WPF.nuspec +++ b/Tenduke.Client.WPF/Tenduke.Client.WPF.nuspec @@ -6,15 +6,14 @@ $title$ 10Duke Software 10Duke Software - https://github.com/10Duke/10duke-dotnet-client/blob/master/LICENSE + MIT https://github.com/10Duke/10duke-dotnet-client https://raw.githubusercontent.com/10Duke/10duke-dotnet-client/master/10duke.ico false $description$ - - Update CefSharp to 88.2.90 -- Add support for additional claims in license consumption requests - + Support reading signer key from server JWKS endpoint, fix public key serialization with .NET Core, and update dependency versions Copyright © 2018- 10Duke Software Entitlement Licensing Identity 10Duke Desktop WPF + \ No newline at end of file diff --git a/Tenduke.Client.WPF/packages.config b/Tenduke.Client.WPF/packages.config index 4ae9983..6f19b6e 100644 --- a/Tenduke.Client.WPF/packages.config +++ b/Tenduke.Client.WPF/packages.config @@ -9,6 +9,8 @@ + + @@ -22,4 +24,7 @@ + + + \ No newline at end of file diff --git a/Tenduke.Client.WPFSample/Tenduke.Client.WPFSample.csproj b/Tenduke.Client.WPFSample/Tenduke.Client.WPFSample.csproj index 33579a0..03fb624 100755 --- a/Tenduke.Client.WPFSample/Tenduke.Client.WPFSample.csproj +++ b/Tenduke.Client.WPFSample/Tenduke.Client.WPFSample.csproj @@ -127,6 +127,18 @@ 4.0 + + ..\packages\Tenduke.Client.3.3.1\lib\netstandard2.0\Tenduke.Client.dll + + + ..\packages\Tenduke.Client.Desktop.3.3.1\lib\net461\Tenduke.Client.Desktop.dll + + + ..\packages\Tenduke.Client.WinBase.3.3.1\lib\netstandard2.0\Tenduke.Client.WinBase.dll + + + ..\packages\Tenduke.Client.WPF.3.3.1\lib\net461\Tenduke.Client.WPF.dll + @@ -180,24 +192,6 @@ - - - {bb3b0629-a838-4beb-bff0-32aaff87e37d} - Tenduke.Client.Desktop - - - {8930610c-b2ca-4167-a6b0-b4a10676bb54} - Tenduke.Client.WinBase - - - {c7354410-7bb2-4ad5-880a-68b8cbaf908d} - Tenduke.Client.WPF - - - {b5112486-55f1-4fb7-9239-bd32a8bbfab7} - Tenduke.Client - - diff --git a/Tenduke.Client.WPFSample/packages.config b/Tenduke.Client.WPFSample/packages.config index df9395d..d76fd1c 100644 --- a/Tenduke.Client.WPFSample/packages.config +++ b/Tenduke.Client.WPFSample/packages.config @@ -24,4 +24,8 @@ + + + + \ No newline at end of file diff --git a/Tenduke.Client.WinBase/Tenduke.Client.WinBase.csproj b/Tenduke.Client.WinBase/Tenduke.Client.WinBase.csproj index 4f0ca43..6ccbae6 100644 --- a/Tenduke.Client.WinBase/Tenduke.Client.WinBase.csproj +++ b/Tenduke.Client.WinBase/Tenduke.Client.WinBase.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 3.2.0 + 3.3.1 Base library for Windows based 10Duke Identity and Entitlement client libraries 10Duke Software 10Duke Software @@ -10,17 +10,18 @@ https://raw.githubusercontent.com/10Duke/10duke-dotnet-client/master/10duke.ico https://github.com/10Duke/10duke-dotnet-client Entitlement Licensing Identity 10Duke - Initial version + Support reading signer key from server JWKS endpoint, fix public key serialization with .NET Core, and update dependency versions true + https://github.com/10Duke/10duke-dotnet-client.git + MIT + true + snupkg - - - - + diff --git a/Tenduke.Client.WinForms/Properties/AssemblyInfo.cs b/Tenduke.Client.WinForms/Properties/AssemblyInfo.cs index 3116632..aeb97b8 100755 --- a/Tenduke.Client.WinForms/Properties/AssemblyInfo.cs +++ b/Tenduke.Client.WinForms/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] +[assembly: AssemblyVersion("3.3.1.0")] +[assembly: AssemblyFileVersion("3.3.1.0")] diff --git a/Tenduke.Client.WinForms/Tenduke.Client.WinForms.csproj b/Tenduke.Client.WinForms/Tenduke.Client.WinForms.csproj index 635f9f7..fba2183 100755 --- a/Tenduke.Client.WinForms/Tenduke.Client.WinForms.csproj +++ b/Tenduke.Client.WinForms/Tenduke.Client.WinForms.csproj @@ -17,6 +17,8 @@ true + true + snupkg true @@ -26,6 +28,8 @@ DEBUG;TRACE prompt 4 + true + snupkg pdbonly @@ -34,6 +38,8 @@ TRACE prompt 4 + true + snupkg @@ -54,6 +60,12 @@ ..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll + + ..\packages\Microsoft.IdentityModel.Logging.6.15.0\lib\net461\Microsoft.IdentityModel.Logging.dll + + + ..\packages\Microsoft.IdentityModel.Tokens.6.15.0\lib\net461\Microsoft.IdentityModel.Tokens.dll + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll @@ -131,6 +143,15 @@ + + ..\packages\Tenduke.Client.3.3.1\lib\netstandard2.0\Tenduke.Client.dll + + + ..\packages\Tenduke.Client.Desktop.3.3.1\lib\net461\Tenduke.Client.Desktop.dll + + + ..\packages\Tenduke.Client.WinBase.3.3.1\lib\netstandard2.0\Tenduke.Client.WinBase.dll + @@ -231,20 +252,6 @@ - - - {bb3b0629-a838-4beb-bff0-32aaff87e37d} - Tenduke.Client.Desktop - - - {8930610c-b2ca-4167-a6b0-b4a10676bb54} - Tenduke.Client.WinBase - - - {b5112486-55f1-4fb7-9239-bd32a8bbfab7} - Tenduke.Client - - diff --git a/Tenduke.Client.WinForms/Tenduke.Client.WinForms.nuspec b/Tenduke.Client.WinForms/Tenduke.Client.WinForms.nuspec index ee04783..1ca028a 100755 --- a/Tenduke.Client.WinForms/Tenduke.Client.WinForms.nuspec +++ b/Tenduke.Client.WinForms/Tenduke.Client.WinForms.nuspec @@ -6,15 +6,14 @@ $title$ 10Duke Software 10Duke Software - https://github.com/10Duke/10duke-dotnet-client/blob/master/LICENSE + MIT https://github.com/10Duke/10duke-dotnet-client https://raw.githubusercontent.com/10Duke/10duke-dotnet-client/master/10duke.ico false $description$ - - Update CefSharp to 88.2.90 -- Add support for additional claims in license consumption requests - + Support reading signer key from server JWKS endpoint, fix public key serialization with .NET Core, and update dependency versions Copyright © 2019- 10Duke Software Entitlement Licensing Identity 10Duke Desktop WinForms + \ No newline at end of file diff --git a/Tenduke.Client.WinForms/packages.config b/Tenduke.Client.WinForms/packages.config index 5a9784a..207a0fd 100644 --- a/Tenduke.Client.WinForms/packages.config +++ b/Tenduke.Client.WinForms/packages.config @@ -9,6 +9,8 @@ + + @@ -22,4 +24,7 @@ + + + \ No newline at end of file diff --git a/Tenduke.Client.WinFormsSample/Tenduke.Client.WinFormsSample.csproj b/Tenduke.Client.WinFormsSample/Tenduke.Client.WinFormsSample.csproj index 84ee0e4..98283d3 100755 --- a/Tenduke.Client.WinFormsSample/Tenduke.Client.WinFormsSample.csproj +++ b/Tenduke.Client.WinFormsSample/Tenduke.Client.WinFormsSample.csproj @@ -126,6 +126,18 @@ + + ..\packages\Tenduke.Client.3.3.1\lib\netstandard2.0\Tenduke.Client.dll + + + ..\packages\Tenduke.Client.Desktop.3.3.1\lib\net461\Tenduke.Client.Desktop.dll + + + ..\packages\Tenduke.Client.WinBase.3.3.1\lib\netstandard2.0\Tenduke.Client.WinBase.dll + + + ..\packages\Tenduke.Client.WinForms.3.3.1\lib\net461\Tenduke.Client.WinForms.dll + @@ -248,24 +260,6 @@ - - - {bb3b0629-a838-4beb-bff0-32aaff87e37d} - Tenduke.Client.Desktop - - - {8930610c-b2ca-4167-a6b0-b4a10676bb54} - Tenduke.Client.WinBase - - - {a53c3d21-1e8d-41df-84a9-d89fa9ed0885} - Tenduke.Client.WinForms - - - {b5112486-55f1-4fb7-9239-bd32a8bbfab7} - Tenduke.Client - - diff --git a/Tenduke.Client.WinFormsSample/packages.config b/Tenduke.Client.WinFormsSample/packages.config index a116982..77c51c5 100644 --- a/Tenduke.Client.WinFormsSample/packages.config +++ b/Tenduke.Client.WinFormsSample/packages.config @@ -25,4 +25,8 @@ + + + + \ No newline at end of file diff --git a/Tenduke.Client/Tenduke.Client.csproj b/Tenduke.Client/Tenduke.Client.csproj index 0ff1468..3ad2228 100755 --- a/Tenduke.Client/Tenduke.Client.csproj +++ b/Tenduke.Client/Tenduke.Client.csproj @@ -5,17 +5,18 @@ 10Duke Software Base classes and utilities for 10Duke Identity and Entitlement client libraries Copyright © 2018- 10Duke Software - https://github.com/10Duke/10duke-dotnet-client/blob/master/LICENSE https://github.com/10Duke/10duke-dotnet-client https://raw.githubusercontent.com/10Duke/10duke-dotnet-client/master/10duke.ico - https://github.com/10Duke/10duke-dotnet-client + https://github.com/10Duke/10duke-dotnet-client.git Entitlement Licensing Identity 10Duke - - Refactor utilities, prepare support for a new client library that uses OS default browser -- Add support for additional claims in license consumption calls + Support reading signer key from server JWKS endpoint, fix public key serialization with .NET Core, and update dependency versions true true - 3.2.0 - 3.2.0.0 + 3.3.1 + 3.3.1.0 + MIT + true + snupkg