From 923d70195d6027abed07f57d8383a7f09fc9f415 Mon Sep 17 00:00:00 2001 From: Stefan Ossendorf Date: Thu, 30 May 2019 14:46:03 +0200 Subject: [PATCH 1/2] Nsspi target framework changed to .NetStandard2.0 Nsspi targets now .NetStandard2.0 Other projects now targets .net4 .6.1 Nuspec file removed and nuget file will now be created on each build (new capaibility of VS17 used for that) Assemblyinfo resieds now within csproj of nsspi project ReSharpher folder added to gitignore --- .gitignore | 1 + NSspi/NSspi.csproj | 99 ++----------------- NSspi/NSspi.nuspec | 18 ---- NSspi/Properties/AssemblyInfo.cs | 30 +----- NsspiDemo/App.config | 4 +- NsspiDemo/NsspiDemo.csproj | 6 +- NsspiDemo/Properties/Resources.Designer.cs | 4 +- NsspiDemo/Properties/Settings.Designer.cs | 4 +- TestClient/App.config | 4 +- TestClient/Properties/Resources.Designer.cs | 4 +- TestClient/Properties/Settings.Designer.cs | 4 +- TestClient/TestClient.csproj | 6 +- TestProtocol/App.config | 4 +- TestProtocol/Properties/Resources.Designer.cs | 4 +- TestProtocol/Properties/Settings.Designer.cs | 4 +- TestProtocol/TestProtocol.csproj | 6 +- TestServer/App.config | 4 +- TestServer/Properties/Resources.Designer.cs | 4 +- TestServer/Properties/Settings.Designer.cs | 4 +- TestServer/TestServer.csproj | 6 +- 20 files changed, 52 insertions(+), 168 deletions(-) delete mode 100644 NSspi/NSspi.nuspec diff --git a/.gitignore b/.gitignore index 360ea12..0de6416 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .vs +/_ReSharper.Caches diff --git a/NSspi/NSspi.csproj b/NSspi/NSspi.csproj index b0f5a8c..9602a88 100644 --- a/NSspi/NSspi.csproj +++ b/NSspi/NSspi.csproj @@ -1,97 +1,16 @@ - - - + - Debug - AnyCPU - {4B4CD933-BF62-4F92-B8FA-6771758C5197} - Library - Properties + netstandard2.0 NSspi NSspi - v4.0 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - false - bin\Debug\NSspi.XML - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\NSspi.XML - - - - + true + Kevin Thompson + Adds support for username/password credentials, but introduces a minor change in the interface that breaks existing code. + https://github.com/antiduh/nsspi + 0.2.1.0 + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NSspi/NSspi.nuspec b/NSspi/NSspi.nuspec deleted file mode 100644 index 452f93b..0000000 --- a/NSspi/NSspi.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - NSspi - 0.2.1.0 - Kevin Thompson - Kevin Thompson - https://github.com/antiduh/nsspi - false - - A C#/.Net interface to the Win32 SSPI authentication API, - better known as Windows Integrated Authentication. - - C# - Adds support for username/password credentials, but introduces a minor change in the interface that breaks existing code. - Copyright 2018 - - diff --git a/NSspi/Properties/AssemblyInfo.cs b/NSspi/Properties/AssemblyInfo.cs index 7226b00..9155bc5 100644 --- a/NSspi/Properties/AssemblyInfo.cs +++ b/NSspi/Properties/AssemblyInfo.cs @@ -1,17 +1,4 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle( "NSspi" )] -[assembly: AssemblyDescription( "" )] -[assembly: AssemblyConfiguration( "" )] -[assembly: AssemblyCompany( "Kevin Thompson" )] -[assembly: AssemblyProduct( "NSspi" )] -[assembly: AssemblyCopyright( "Copyright © Kevin Thompson 2018" )] -[assembly: AssemblyTrademark( "" )] -[assembly: AssemblyCulture( "" )] +using System.Runtime.InteropServices; // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -19,17 +6,4 @@ using System.Runtime.InteropServices; [assembly: ComVisible( false )] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid( "9abf710c-c646-42aa-8183-76bfa141a07b" )] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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( "0.2.1.0" )] -[assembly: AssemblyFileVersion( "0.2.1.0" )] \ No newline at end of file +[assembly: Guid( "9abf710c-c646-42aa-8183-76bfa141a07b" )] \ No newline at end of file diff --git a/NsspiDemo/App.config b/NsspiDemo/App.config index bb48c20..08b4571 100644 --- a/NsspiDemo/App.config +++ b/NsspiDemo/App.config @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/NsspiDemo/NsspiDemo.csproj b/NsspiDemo/NsspiDemo.csproj index 9effc7b..52eb0e4 100644 --- a/NsspiDemo/NsspiDemo.csproj +++ b/NsspiDemo/NsspiDemo.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties NsspiDemo NsspiDemo - v4.0 + v4.6.1 512 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -31,6 +32,7 @@ TRACE prompt 4 + false diff --git a/NsspiDemo/Properties/Resources.Designer.cs b/NsspiDemo/Properties/Resources.Designer.cs index f153cd4..7f1389b 100644 --- a/NsspiDemo/Properties/Resources.Designer.cs +++ b/NsspiDemo/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace NsspiDemo.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/NsspiDemo/Properties/Settings.Designer.cs b/NsspiDemo/Properties/Settings.Designer.cs index 6822ba3..c0075b3 100644 --- a/NsspiDemo/Properties/Settings.Designer.cs +++ b/NsspiDemo/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace NsspiDemo.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TestClient/App.config b/TestClient/App.config index bb48c20..08b4571 100644 --- a/TestClient/App.config +++ b/TestClient/App.config @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/TestClient/Properties/Resources.Designer.cs b/TestClient/Properties/Resources.Designer.cs index 4170414..160f262 100644 --- a/TestClient/Properties/Resources.Designer.cs +++ b/TestClient/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace TestClient.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/TestClient/Properties/Settings.Designer.cs b/TestClient/Properties/Settings.Designer.cs index 013bc7a..3d6351b 100644 --- a/TestClient/Properties/Settings.Designer.cs +++ b/TestClient/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace TestClient.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TestClient/TestClient.csproj b/TestClient/TestClient.csproj index 09ba16d..7da633b 100644 --- a/TestClient/TestClient.csproj +++ b/TestClient/TestClient.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties TestClient TestClient - v4.0 + v4.6.1 512 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -31,6 +32,7 @@ TRACE prompt 4 + false diff --git a/TestProtocol/App.config b/TestProtocol/App.config index bb48c20..08b4571 100644 --- a/TestProtocol/App.config +++ b/TestProtocol/App.config @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/TestProtocol/Properties/Resources.Designer.cs b/TestProtocol/Properties/Resources.Designer.cs index def688b..503090d 100644 --- a/TestProtocol/Properties/Resources.Designer.cs +++ b/TestProtocol/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace TestProtocol.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/TestProtocol/Properties/Settings.Designer.cs b/TestProtocol/Properties/Settings.Designer.cs index 9d6636f..30cae6c 100644 --- a/TestProtocol/Properties/Settings.Designer.cs +++ b/TestProtocol/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace TestProtocol.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TestProtocol/TestProtocol.csproj b/TestProtocol/TestProtocol.csproj index 505b2cb..7036c35 100644 --- a/TestProtocol/TestProtocol.csproj +++ b/TestProtocol/TestProtocol.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties TestProtocol TestProtocol - v4.0 + v4.6.1 512 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -31,6 +32,7 @@ TRACE prompt 4 + false diff --git a/TestServer/App.config b/TestServer/App.config index bb48c20..08b4571 100644 --- a/TestServer/App.config +++ b/TestServer/App.config @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/TestServer/Properties/Resources.Designer.cs b/TestServer/Properties/Resources.Designer.cs index 240181e..0f17dd7 100644 --- a/TestServer/Properties/Resources.Designer.cs +++ b/TestServer/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace TestServer.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/TestServer/Properties/Settings.Designer.cs b/TestServer/Properties/Settings.Designer.cs index 89b77e0..b20c6e6 100644 --- a/TestServer/Properties/Settings.Designer.cs +++ b/TestServer/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace TestServer.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TestServer/TestServer.csproj b/TestServer/TestServer.csproj index 0a728bd..3f6ff18 100644 --- a/TestServer/TestServer.csproj +++ b/TestServer/TestServer.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties TestServer TestServer - v4.0 + v4.6.1 512 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -31,6 +32,7 @@ TRACE prompt 4 + false From 3ccdcc701e51f69d1fff843452ae0eddcb584233 Mon Sep 17 00:00:00 2001 From: Stefan Ossendorf Date: Fri, 31 May 2019 09:12:53 +0200 Subject: [PATCH 2/2] Nsspi targets now Net4.0 and .NetStandard2.0 Nsspi now multi targets .Net 4.0 and .NetStandard 2.0. Dependencies are included based on framework. --- NSspi/NSspi.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NSspi/NSspi.csproj b/NSspi/NSspi.csproj index 9602a88..7a0afcc 100644 --- a/NSspi/NSspi.csproj +++ b/NSspi/NSspi.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net40 NSspi NSspi true @@ -10,7 +10,7 @@ 0.2.1.0 - + \ No newline at end of file