downgrade .net 4

OpenIdentityPlatform · Jul 22, 2015 · d4753a6 · d4753a6
1 parent 0b7c515
commit d4753a6
Show file tree

Hide file tree

Showing 15 changed files with 171 additions and 37 deletions.
diff --git 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
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ru.org.openam.iis7Agent")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright © [email protected] 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
@@ -9,11 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ru.org.openam.iis7Agent</RootNamespace>
     <AssemblyName>ru.org.openam.iis7Agent</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,12 +46,6 @@
     <Compile Include="iis7AgentModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ru.org.openam.sdk\ru.org.openam.sdk.csproj">
-      <Project>{E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}</Project>
-      <Name>ru.org.openam.sdk</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="_ConfigDoc.txt" />
   </ItemGroup>
@@ -73,4 +67,10 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ru.org.openam.sdk\ru.org.openam.sdk.csproj">
+      <Project>{E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}</Project>
+      <Name>ru.org.openam.sdk</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
diff --git 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 © [email protected] 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/ru.org.openam.iis7AgentTestSite/packages.config b/ru.org.openam.iis7AgentTestSite/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" requireReinstallation="True" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" requireReinstallation="True" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" requireReinstallation="True" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" requireReinstallation="True" />
   <package id="WebGrease" version="1.6.0" targetFramework="net45" />
 </packages>
diff --git a/ru.org.openam.iis7AgentTestSite/ru.org.openam.iis7AgentTestSite.csproj b/ru.org.openam.iis7AgentTestSite/ru.org.openam.iis7AgentTestSite.csproj
@@ -10,7 +10,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ru.org.openam.iis7AgentTestSite</RootNamespace>
     <AssemblyName>ru.org.openam.iis7AgentTestSite</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
@@ -107,10 +106,6 @@
       <Project>{AF367FB4-2E40-4682-8496-D0C9732BC8DF}</Project>
       <Name>ru.org.openam.iis7Agent</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ru.org.openam.sdk\ru.org.openam.sdk.csproj">
-      <Project>{E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}</Project>
-      <Name>ru.org.openam.sdk</Name>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git 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 © [email protected] 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/ru.org.openam.loginSite/packages.config b/ru.org.openam.loginSite/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" requireReinstallation="True" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" requireReinstallation="True" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" requireReinstallation="True" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" requireReinstallation="True" />
   <package id="WebGrease" version="1.6.0" targetFramework="net45" />
 </packages>
diff --git a/ru.org.openam.loginSite/ru.org.openam.loginSite.csproj b/ru.org.openam.loginSite/ru.org.openam.loginSite.csproj
@@ -10,7 +10,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ru.org.openam.loginSite</RootNamespace>
     <AssemblyName>ru.org.openam.loginSite</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>false</UseIISExpress>
     <IISExpressSSLPort />
@@ -101,12 +100,6 @@
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ru.org.openam.sdk\ru.org.openam.sdk.csproj">
-      <Project>{E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}</Project>
-      <Name>ru.org.openam.sdk</Name>
-    </ProjectReference>
-  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -144,4 +137,14 @@
   </Target>
   <Target Name="AfterBuild">
   </Target> -->
+  <ItemGroup>
+    <ProjectReference Include="..\ru.org.openam.iis7Agent\ru.org.openam.iis7Agent.csproj">
+      <Project>{AF367FB4-2E40-4682-8496-D0C9732BC8DF}</Project>
+      <Name>ru.org.openam.iis7Agent</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ru.org.openam.sdk\ru.org.openam.sdk.csproj">
+      <Project>{E00C3D8D-6D8F-46D4-B305-BE5E89C8E085}</Project>
+      <Name>ru.org.openam.sdk</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
diff --git 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
@@ -7,7 +7,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>ru.org.openam.sdk.nunit</RootNamespace>
     <AssemblyName>ru.org.openam.sdk.nunit</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>

diff --git 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
@@ -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 © [email protected]")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Version;Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ru.org.openam.sdk</RootNamespace>
     <AssemblyName>ru.org.openam.sdk</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-Original file line number
+Diff line change
@@ Expand Up / @@ -176,6 +176,7 @@ public void RC5() @@
     				)
     			);
     		}
     	}
     }