Permalink
Browse files

Merge branch '4.0'

  • Loading branch information...
2 parents b1f0cc4 + ab3f7c5 commit d00cd04e67223427085ba758be7804e385ae47d3 @mrward mrward committed Jul 24, 2011
Showing with 1,122 additions and 391 deletions.
  1. +42 −39 data/templates/project/CSharp/SilverlightApplication.xpt
  2. +1 −1 data/templates/project/CSharp/WebService.xpt
  3. +87 −87 data/templates/project/CSharp/WebpageProject.xpt
  4. +42 −39 data/templates/project/VB/SilverlightApplication.xpt
  5. +1 −1 data/templates/project/VB/WebService.xpt
  6. +96 −94 data/templates/project/VB/WebpageProject.xpt
  7. +89 −24 src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/NRefactoryToPythonConverter.cs
  8. +74 −0 src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ForNextConversionTests.cs
  9. +60 −0 ...ns/BackendBindings/Python/PythonBinding/Test/Converter/LocalVariableDefinitionsOnSameLineTests.cs
  10. +106 −0 src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/MultipleFieldsOnSameLineTests.cs
  11. +38 −0 src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/VBExitConversionTests.cs
  12. +4 −0 src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj
  13. +88 −27 src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/NRefactoryToRubyConverter.cs
  14. +80 −0 src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/ForNextConversionTests.cs
  15. +1 −1 .../BackendBindings/Ruby/RubyBinding/Test/Converter/LocalVariableAssignedInConstructorTestFixture.cs
  16. +64 −0 ...AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/LocalVariableDefinitionsOnSameLineTests.cs
  17. +115 −0 src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/MultipleFieldsOnSameLineTests.cs
  18. +41 −0 src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Converter/VBExitConversionTests.cs
  19. +4 −0 src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj
  20. +7 −2 src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceUtilities.cs
  21. +2 −8 src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchStrategy/BruteForceSearchStrategy.cs
  22. +1 −1 src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs
  23. +12 −4 src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/SingleCharacterElementGenerator.cs
  24. +52 −60 src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
  25. +5 −0 src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingService.cs
  26. +10 −3 src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs
@@ -19,36 +19,39 @@
<ProjectItems>
<Reference Include="System.Windows" />
- <Reference Include="mscorlib" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Net" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Windows.Browser" />
+ <Reference Include="mscorlib" />
+ <Reference Include="system" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Net" />
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Windows.Browser" />
</ProjectItems>
- <PropertyGroup>
+ <PropertyGroup escapeValue="False">
<ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+ </PropertyGroup>
+
+ <PropertyGroup>
<OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>${StandardNamespace}</RootNamespace>
- <AssemblyName>${StandardNamespace}</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <SilverlightApplication>true</SilverlightApplication>
- <SupportedCultures>
- </SupportedCultures>
- <XapOutputs>true</XapOutputs>
- <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
- <XapFilename>${StandardNamespace}.xap</XapFilename>
- <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
- <SilverlightAppEntry>${StandardNamespace}.App</SilverlightAppEntry>
- <TestPageFileName>TestPage.html</TestPageFileName>
- <CreateTestPage>true</CreateTestPage>
- <ValidateXaml>true</ValidateXaml>
- <UsePlatformExtensions>false</UsePlatformExtensions>
- <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>${StandardNamespace}</RootNamespace>
+ <AssemblyName>${StandardNamespace}</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <SilverlightApplication>true</SilverlightApplication>
+ <SupportedCultures>
+ </SupportedCultures>
+ <XapOutputs>true</XapOutputs>
+ <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+ <XapFilename>${StandardNamespace}.xap</XapFilename>
+ <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+ <SilverlightAppEntry>${StandardNamespace}.App</SilverlightAppEntry>
+ <TestPageFileName>TestPage.html</TestPageFileName>
+ <CreateTestPage>true</CreateTestPage>
+ <ValidateXaml>true</ValidateXaml>
+ <UsePlatformExtensions>false</UsePlatformExtensions>
+ <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
+ <NoConfig>true</NoConfig>
</PropertyGroup>
<PropertyGroup configuration="Debug" escapeValue="false">
@@ -66,12 +69,12 @@
<Files>
<File name="App.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- x:Class="${StandardNamespace}.App"
- >
- <Application.Resources>
-
- </Application.Resources>
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ x:Class="${StandardNamespace}.App"
+ >
+ <Application.Resources>
+
+ </Application.Resources>
</Application>]]></File>
<File name="App.xaml.cs" SubType="Code" DependentUpon="App.xaml"><![CDATA[using System;
@@ -132,12 +135,12 @@ namespace ${StandardNamespace}
}]]></File>
<File name="MainPage.xaml" buildAction="Page" language="XML"><![CDATA[<UserControl x:Class="${StandardNamespace}.MainPage"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- Width="400" Height="300">
- <Grid x:Name="LayoutRoot" Background="White">
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ Width="400" Height="300">
+ <Grid x:Name="LayoutRoot" Background="White">
- </Grid>
+ </Grid>
</UserControl>]]></File>
<File name="MainPage.xaml.cs" SubType="Code" DependentUpon="MainPage.xaml"><![CDATA[using System;
@@ -164,10 +167,10 @@ namespace ${StandardNamespace}
}]]></File>
<File name="Properties\AppManifest.xml"><![CDATA[<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
>
- <Deployment.Parts>
- </Deployment.Parts>
+ <Deployment.Parts>
+ </Deployment.Parts>
</Deployment>]]></File>
<File name="Properties\AssemblyInfo.cs" src="DefaultAssemblyInfo.cs" />
@@ -28,7 +28,7 @@
<Reference Include="System.Xml" />
</ProjectItems>
- <PropertyGroup>
+ <PropertyGroup escapeValue="False">
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<Template originator = "Tom Schroeter"
- created = "24/03/2006"
+ created = "24/03/2006"
lastModified = "06/05/2006">
<!-- Template Header -->
@@ -29,7 +29,7 @@
<Reference Include="System.Web.Services" />
</ProjectItems>
- <PropertyGroup>
+ <PropertyGroup escapeValue="False">
<OutputType>Library</OutputType>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
</PropertyGroup>
@@ -368,101 +368,101 @@ A:hover
<system.web>
- <!-- DYNAMIC DEBUG COMPILATION
- Set compilation debug="true" to enable ASPX debugging. Otherwise, setting this value to
- false will improve runtime performance of this application.
- Set compilation debug="true" to insert debugging symbols (.pdb information)
- into the compiled page. Because this creates a larger file that executes
- more slowly, you should set this value to true only when debugging and to
- false at all other times. For more information, refer to the documentation about
- debugging ASP.NET files.
- -->
- <compilation
- defaultLanguage="c#"
- debug="true"
- />
-
- <!-- CUSTOM ERROR MESSAGES
- Set customErrors mode="On" or "RemoteOnly" to enable custom error messages, "Off" to disable.
- Add <error> tags for each of the errors you want to handle.
-
- "On" Always display custom (friendly) messages.
- "Off" Always display detailed ASP.NET error information.
- "RemoteOnly" Display custom (friendly) messages only to users not running
- on the local Web server. This setting is recommended for security purposes, so
- that you do not display application detail information to remote clients.
- -->
- <customErrors mode="RemoteOnly" />
-
- <!-- AUTHENTICATION
- This section sets the authentication policies of the application. Possible modes are "Windows",
- "Forms", "Passport" and "None"
-
- "None" No authentication is performed.
- "Windows" IIS performs authentication (Basic, Digest, or Integrated Windows) according to
- its settings for the application. Anonymous access must be disabled in IIS.
- "Forms" You provide a custom form (Web page) for users to enter their credentials, and then
- you authenticate them in your application. A user credential token is stored in a cookie.
- "Passport" Authentication is performed via a centralized authentication service provided
- by Microsoft that offers a single logon and core profile services for member sites.
- -->
- <authentication mode="None" />
+ <!-- DYNAMIC DEBUG COMPILATION
+ Set compilation debug="true" to enable ASPX debugging. Otherwise, setting this value to
+ false will improve runtime performance of this application.
+ Set compilation debug="true" to insert debugging symbols (.pdb information)
+ into the compiled page. Because this creates a larger file that executes
+ more slowly, you should set this value to true only when debugging and to
+ false at all other times. For more information, refer to the documentation about
+ debugging ASP.NET files.
+ -->
+ <compilation
+ defaultLanguage="c#"
+ debug="true"
+ />
+
+ <!-- CUSTOM ERROR MESSAGES
+ Set customErrors mode="On" or "RemoteOnly" to enable custom error messages, "Off" to disable.
+ Add <error> tags for each of the errors you want to handle.
+
+ "On" Always display custom (friendly) messages.
+ "Off" Always display detailed ASP.NET error information.
+ "RemoteOnly" Display custom (friendly) messages only to users not running
+ on the local Web server. This setting is recommended for security purposes, so
+ that you do not display application detail information to remote clients.
+ -->
+ <customErrors mode="RemoteOnly" />
+
+ <!-- AUTHENTICATION
+ This section sets the authentication policies of the application. Possible modes are "Windows",
+ "Forms", "Passport" and "None"
+
+ "None" No authentication is performed.
+ "Windows" IIS performs authentication (Basic, Digest, or Integrated Windows) according to
+ its settings for the application. Anonymous access must be disabled in IIS.
+ "Forms" You provide a custom form (Web page) for users to enter their credentials, and then
+ you authenticate them in your application. A user credential token is stored in a cookie.
+ "Passport" Authentication is performed via a centralized authentication service provided
+ by Microsoft that offers a single logon and core profile services for member sites.
+ -->
+ <authentication mode="None" />
<!-- AUTHORIZATION
- This section sets the authorization policies of the application. You can allow or deny access
- to application resources by user or role. Wildcards: "*" mean everyone, "?" means anonymous
- (unauthenticated) users.
- -->
-
- <authorization>
- <allow users="*" /> <!-- Allow all users -->
- <!-- <allow users="[comma separated list of users]"
- roles="[comma separated list of roles]"/>
- <deny users="[comma separated list of users]"
- roles="[comma separated list of roles]"/>
- -->
- </authorization>
-
- <!-- APPLICATION-LEVEL TRACE LOGGING
- Application-level tracing enables trace log output for every page within an application.
- Set trace enabled="true" to enable application trace logging. If pageOutput="true", the
- trace information will be displayed at the bottom of each page. Otherwise, you can view the
- application trace log by browsing the "trace.axd" page from your web application
- root.
- -->
- <trace
- enabled="false"
- requestLimit="10"
- pageOutput="false"
- traceMode="SortByTime"
+ This section sets the authorization policies of the application. You can allow or deny access
+ to application resources by user or role. Wildcards: "*" mean everyone, "?" means anonymous
+ (unauthenticated) users.
+ -->
+
+ <authorization>
+ <allow users="*" /> <!-- Allow all users -->
+ <!-- <allow users="[comma separated list of users]"
+ roles="[comma separated list of roles]"/>
+ <deny users="[comma separated list of users]"
+ roles="[comma separated list of roles]"/>
+ -->
+ </authorization>
+
+ <!-- APPLICATION-LEVEL TRACE LOGGING
+ Application-level tracing enables trace log output for every page within an application.
+ Set trace enabled="true" to enable application trace logging. If pageOutput="true", the
+ trace information will be displayed at the bottom of each page. Otherwise, you can view the
+ application trace log by browsing the "trace.axd" page from your web application
+ root.
+ -->
+ <trace
+ enabled="false"
+ requestLimit="10"
+ pageOutput="false"
+ traceMode="SortByTime"
localOnly="true"
- />
-
- <!-- SESSION STATE SETTINGS
- By default ASP.NET uses cookies to identify which requests belong to a particular session.
- If cookies are not available, a session can be tracked by adding a session identifier to the URL.
- To disable cookies, set sessionState cookieless="true".
- -->
- <sessionState
- mode="InProc"
- cookieless="true"
- timeout="20"
- />
-
- <!-- GLOBALIZATION
- This section sets the globalization settings of the application.
- -->
- <globalization
- requestEncoding="utf-8"
- responseEncoding="utf-8"
+ />
+
+ <!-- SESSION STATE SETTINGS
+ By default ASP.NET uses cookies to identify which requests belong to a particular session.
+ If cookies are not available, a session can be tracked by adding a session identifier to the URL.
+ To disable cookies, set sessionState cookieless="true".
+ -->
+ <sessionState
+ mode="InProc"
+ cookieless="true"
+ timeout="20"
+ />
+
+ <!-- GLOBALIZATION
+ This section sets the globalization settings of the application.
+ -->
+ <globalization
+ requestEncoding="utf-8"
+ responseEncoding="utf-8"
/>
</system.web>
<appSettings>
<add key="SqlConnectionString"
- value="Server=localhost; Database=; Uid=root; Pwd=;"
+ value="Server=localhost; Database=; Uid=root; Pwd=;"
/>
</appSettings>
Oops, something went wrong.

0 comments on commit d00cd04

Please sign in to comment.