diff --git a/ru.org.openam.dotnet.sln b/ru.org.openam.dotnet.sln
index ff47c3f..72f7481 100644
--- a/ru.org.openam.dotnet.sln
+++ b/ru.org.openam.dotnet.sln
@@ -40,6 +40,141 @@ Global
{E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ Policies = $0
+ $0.DotNetNamingPolicy = $1
+ $1.DirectoryNamespaceAssociation = None
+ $1.ResourceNamePolicy = FileFormatDefault
+ $0.StandardHeader = $2
+ $2.Text =
+ $2.IncludeInNewFiles = True
+ $0.NameConventionPolicy = $3
+ $3.Rules = $4
+ $4.NamingRule = $5
+ $5.Name = Namespaces
+ $5.AffectedEntity = Namespace
+ $5.VisibilityMask = VisibilityMask
+ $5.NamingStyle = PascalCase
+ $5.IncludeInstanceMembers = True
+ $5.IncludeStaticEntities = True
+ $4.NamingRule = $6
+ $6.Name = Types
+ $6.AffectedEntity = Class, Struct, Enum, Delegate
+ $6.VisibilityMask = Public
+ $6.NamingStyle = PascalCase
+ $6.IncludeInstanceMembers = True
+ $6.IncludeStaticEntities = True
+ $4.NamingRule = $7
+ $7.Name = Interfaces
+ $7.RequiredPrefixes = $8
+ $8.String = I
+ $7.AffectedEntity = Interface
+ $7.VisibilityMask = Public
+ $7.NamingStyle = PascalCase
+ $7.IncludeInstanceMembers = True
+ $7.IncludeStaticEntities = True
+ $4.NamingRule = $9
+ $9.Name = Attributes
+ $9.RequiredSuffixes = $10
+ $10.String = Attribute
+ $9.AffectedEntity = CustomAttributes
+ $9.VisibilityMask = Public
+ $9.NamingStyle = PascalCase
+ $9.IncludeInstanceMembers = True
+ $9.IncludeStaticEntities = True
+ $4.NamingRule = $11
+ $11.Name = Event Arguments
+ $11.RequiredSuffixes = $12
+ $12.String = EventArgs
+ $11.AffectedEntity = CustomEventArgs
+ $11.VisibilityMask = Public
+ $11.NamingStyle = PascalCase
+ $11.IncludeInstanceMembers = True
+ $11.IncludeStaticEntities = True
+ $4.NamingRule = $13
+ $13.Name = Exceptions
+ $13.RequiredSuffixes = $14
+ $14.String = Exception
+ $13.AffectedEntity = CustomExceptions
+ $13.VisibilityMask = VisibilityMask
+ $13.NamingStyle = PascalCase
+ $13.IncludeInstanceMembers = True
+ $13.IncludeStaticEntities = True
+ $4.NamingRule = $15
+ $15.Name = Methods
+ $15.AffectedEntity = Methods
+ $15.VisibilityMask = Protected, Public
+ $15.NamingStyle = PascalCase
+ $15.IncludeInstanceMembers = True
+ $15.IncludeStaticEntities = True
+ $4.NamingRule = $16
+ $16.Name = Static Readonly Fields
+ $16.AffectedEntity = ReadonlyField
+ $16.VisibilityMask = Protected, Public
+ $16.NamingStyle = PascalCase
+ $16.IncludeInstanceMembers = False
+ $16.IncludeStaticEntities = True
+ $4.NamingRule = $17
+ $17.Name = Fields
+ $17.AffectedEntity = Field
+ $17.VisibilityMask = Protected, Public
+ $17.NamingStyle = PascalCase
+ $17.IncludeInstanceMembers = True
+ $17.IncludeStaticEntities = True
+ $4.NamingRule = $18
+ $18.Name = ReadOnly Fields
+ $18.AffectedEntity = ReadonlyField
+ $18.VisibilityMask = Protected, Public
+ $18.NamingStyle = PascalCase
+ $18.IncludeInstanceMembers = True
+ $18.IncludeStaticEntities = False
+ $4.NamingRule = $19
+ $19.Name = Constant Fields
+ $19.AffectedEntity = ConstantField
+ $19.VisibilityMask = Protected, Public
+ $19.NamingStyle = PascalCase
+ $19.IncludeInstanceMembers = True
+ $19.IncludeStaticEntities = True
+ $4.NamingRule = $20
+ $20.Name = Properties
+ $20.AffectedEntity = Property
+ $20.VisibilityMask = Protected, Public
+ $20.NamingStyle = PascalCase
+ $20.IncludeInstanceMembers = True
+ $20.IncludeStaticEntities = True
+ $4.NamingRule = $21
+ $21.Name = Events
+ $21.AffectedEntity = Event
+ $21.VisibilityMask = Protected, Public
+ $21.NamingStyle = PascalCase
+ $21.IncludeInstanceMembers = True
+ $21.IncludeStaticEntities = True
+ $4.NamingRule = $22
+ $22.Name = Enum Members
+ $22.AffectedEntity = EnumMember
+ $22.VisibilityMask = VisibilityMask
+ $22.NamingStyle = PascalCase
+ $22.IncludeInstanceMembers = True
+ $22.IncludeStaticEntities = True
+ $4.NamingRule = $23
+ $23.Name = Parameters
+ $23.AffectedEntity = Parameter
+ $23.VisibilityMask = VisibilityMask
+ $23.NamingStyle = CamelCase
+ $23.IncludeInstanceMembers = True
+ $23.IncludeStaticEntities = True
+ $4.NamingRule = $24
+ $24.Name = Type Parameters
+ $24.RequiredPrefixes = $25
+ $25.String = T
+ $24.AffectedEntity = TypeParameter
+ $24.VisibilityMask = VisibilityMask
+ $24.NamingStyle = PascalCase
+ $24.IncludeInstanceMembers = True
+ $24.IncludeStaticEntities = True
+ $0.VersionControlPolicy = $26
+ $26.inheritsSet = Mono
+ EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
diff --git a/ru.org.openam.iis7Agent/Properties/AssemblyInfo.cs b/ru.org.openam.iis7Agent/Properties/AssemblyInfo.cs
index 5bc979f..aa5f098 100755
--- a/ru.org.openam.iis7Agent/Properties/AssemblyInfo.cs
+++ b/ru.org.openam.iis7Agent/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ru.org.openam.iis7Agent")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyCopyright("Copyright © support@openam.org.ru 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/ru.org.openam.iis7Agent/ru.org.openam.iis7Agent.csproj b/ru.org.openam.iis7Agent/ru.org.openam.iis7Agent.csproj
index f89cb99..6eaa8db 100644
--- a/ru.org.openam.iis7Agent/ru.org.openam.iis7Agent.csproj
+++ b/ru.org.openam.iis7Agent/ru.org.openam.iis7Agent.csproj
@@ -9,11 +9,11 @@
Properties
ru.org.openam.iis7Agent
ru.org.openam.iis7Agent
- v4.0
512
..\..\
true
+ v4.0
true
@@ -46,12 +46,6 @@
-
-
- {E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}
- ru.org.openam.sdk
-
-
@@ -73,4 +67,10 @@
+
+
+ {E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}
+ ru.org.openam.sdk
+
+
\ No newline at end of file
diff --git a/ru.org.openam.iis7AgentTestSite/Properties/AssemblyInfo.cs b/ru.org.openam.iis7AgentTestSite/Properties/AssemblyInfo.cs
index 83ccc69..a09099a 100755
--- a/ru.org.openam.iis7AgentTestSite/Properties/AssemblyInfo.cs
+++ b/ru.org.openam.iis7AgentTestSite/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ru.org.openam.iis7AgentTestSite")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyCopyright("Copyright © support@openam.org.ru 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/ru.org.openam.iis7AgentTestSite/packages.config b/ru.org.openam.iis7AgentTestSite/packages.config
index f43ebee..4aefcca 100755
--- a/ru.org.openam.iis7AgentTestSite/packages.config
+++ b/ru.org.openam.iis7AgentTestSite/packages.config
@@ -1,11 +1,11 @@
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/ru.org.openam.iis7AgentTestSite/ru.org.openam.iis7AgentTestSite.csproj b/ru.org.openam.iis7AgentTestSite/ru.org.openam.iis7AgentTestSite.csproj
index 201dd15..9d473a7 100644
--- a/ru.org.openam.iis7AgentTestSite/ru.org.openam.iis7AgentTestSite.csproj
+++ b/ru.org.openam.iis7AgentTestSite/ru.org.openam.iis7AgentTestSite.csproj
@@ -10,7 +10,6 @@
Properties
ru.org.openam.iis7AgentTestSite
ru.org.openam.iis7AgentTestSite
- v4.5
false
true
@@ -107,10 +106,6 @@
{AF367FB4-2E40-4682-8496-D0C9732BC8DF}
ru.org.openam.iis7Agent
-
- {E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}
- ru.org.openam.sdk
-
10.0
diff --git a/ru.org.openam.loginSite/Properties/AssemblyInfo.cs b/ru.org.openam.loginSite/Properties/AssemblyInfo.cs
index de91006..88dc091 100644
--- a/ru.org.openam.loginSite/Properties/AssemblyInfo.cs
+++ b/ru.org.openam.loginSite/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ru.org.openam.loginSite")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyCopyright("Copyright © support@openam.org.ru 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/ru.org.openam.loginSite/packages.config b/ru.org.openam.loginSite/packages.config
index f43ebee..4aefcca 100644
--- a/ru.org.openam.loginSite/packages.config
+++ b/ru.org.openam.loginSite/packages.config
@@ -1,11 +1,11 @@
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/ru.org.openam.loginSite/ru.org.openam.loginSite.csproj b/ru.org.openam.loginSite/ru.org.openam.loginSite.csproj
index db96b79..bd4d91a 100644
--- a/ru.org.openam.loginSite/ru.org.openam.loginSite.csproj
+++ b/ru.org.openam.loginSite/ru.org.openam.loginSite.csproj
@@ -10,7 +10,6 @@
Properties
ru.org.openam.loginSite
ru.org.openam.loginSite
- v4.5
false
false
@@ -101,12 +100,6 @@
-
-
- {E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}
- ru.org.openam.sdk
-
-
10.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
@@ -144,4 +137,14 @@
-->
+
+
+ {AF367FB4-2E40-4682-8496-D0C9732BC8DF}
+ ru.org.openam.iis7Agent
+
+
+ {E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}
+ ru.org.openam.sdk
+
+
\ No newline at end of file
diff --git a/ru.org.openam.sdk.nunit/TestCase.cs b/ru.org.openam.sdk.nunit/TestCase.cs
index 932dd7b..bee9ad9 100644
--- a/ru.org.openam.sdk.nunit/TestCase.cs
+++ b/ru.org.openam.sdk.nunit/TestCase.cs
@@ -176,6 +176,7 @@ public void RC5()
)
);
}
+
}
}
diff --git a/ru.org.openam.sdk.nunit/ru.org.openam.sdk.nunit.csproj b/ru.org.openam.sdk.nunit/ru.org.openam.sdk.nunit.csproj
index 2d9b41d..4026649 100644
--- a/ru.org.openam.sdk.nunit/ru.org.openam.sdk.nunit.csproj
+++ b/ru.org.openam.sdk.nunit/ru.org.openam.sdk.nunit.csproj
@@ -7,7 +7,6 @@
Library
ru.org.openam.sdk.nunit
ru.org.openam.sdk.nunit
- v4.5
..\
true
diff --git a/ru.org.openam.sdk/Policy.cs b/ru.org.openam.sdk/Policy.cs
index 18dec99..0cfbf32 100755
--- a/ru.org.openam.sdk/Policy.cs
+++ b/ru.org.openam.sdk/Policy.cs
@@ -5,10 +5,10 @@ namespace ru.org.openam.sdk
{
public class Policy
{
- readonly Agent agent;
+// readonly Agent agent;
Policy(Agent agent)
{
- this.agent = agent;
+// this.agent = agent;
}
public policy.Response result;
diff --git a/ru.org.openam.sdk/Properties/AssemblyInfo.cs b/ru.org.openam.sdk/Properties/AssemblyInfo.cs
index 4fec2ea..2fda294 100755
--- a/ru.org.openam.sdk/Properties/AssemblyInfo.cs
+++ b/ru.org.openam.sdk/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("openam.org.ru")]
[assembly: AssemblyProduct("ru.org.openam.sdk")]
-[assembly: AssemblyCopyright("Copyright © Valera V.Harseko 2012")]
+[assembly: AssemblyCopyright("Copyright © support@openam.org.ru")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/ru.org.openam.sdk/pll/Request.cs b/ru.org.openam.sdk/pll/Request.cs
index b0ee176..3211cf7 100755
--- a/ru.org.openam.sdk/pll/Request.cs
+++ b/ru.org.openam.sdk/pll/Request.cs
@@ -6,6 +6,7 @@
using System.IO;
using System.Xml;
using System.Net.Sockets;
+using System.Reflection;
namespace ru.org.openam.sdk.pll
{
@@ -44,7 +45,8 @@ virtual protected naming.Response GetNaming(){
}
static string UserAgent = string.Format(
- "openam.org.ru/{0} (.Net) {1}/{2}","1.0"
+ "openam.org.ru/{0} (.Net) {1}/{2}"
+ ,Assembly.GetCallingAssembly().GetName().Version
,System.Environment.MachineName
,String.Join(",",((from ip in Dns.GetHostAddresses(System.Environment.MachineName) where ip.AddressFamily == AddressFamily.InterNetwork select ip.ToString()).ToList() )
)
diff --git a/ru.org.openam.sdk/ru.org.openam.sdk.csproj b/ru.org.openam.sdk/ru.org.openam.sdk.csproj
index c9d206f..e330b70 100644
--- a/ru.org.openam.sdk/ru.org.openam.sdk.csproj
+++ b/ru.org.openam.sdk/ru.org.openam.sdk.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -8,7 +8,6 @@
Properties
ru.org.openam.sdk
ru.org.openam.sdk
- v4.0
512
..\..\
true