Browse Source

Allow setting 'Option Infer' in project options.

Create new projects with 'Option Infer' set to true.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4210 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 16 years ago
parent
commit
ac14bb27f2
  1. 1
      data/templates/project/VBNet/CompactFormsProject.xpt
  2. 1
      data/templates/project/VBNet/ConsoleProject.xpt
  3. 1
      data/templates/project/VBNet/ControlLibrary.xpt
  4. 1
      data/templates/project/VBNet/Direct3DProject.xpt
  5. 3
      data/templates/project/VBNet/EmptyProject.xpt
  6. 1
      data/templates/project/VBNet/FormsProject.xpt
  7. 1
      data/templates/project/VBNet/Library.xpt
  8. 1
      data/templates/project/VBNet/Service.xpt
  9. 1
      data/templates/project/VBNet/SharedAddin.xpt
  10. 1
      data/templates/project/VBNet/SharpDevelopAddin.xpt
  11. 1
      data/templates/project/VBNet/SharpDevelopMacro.xpt
  12. 18
      src/AddIns/BackendBindings/VBNetBinding/Project/Resources/BuildOptions.xfrm
  13. 4
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs
  14. 2
      src/AddIns/Misc/HtmlHelp2/JScriptGlobals/HtmlHelp2JScriptGlobals.vbproj

1
data/templates/project/VBNet/CompactFormsProject.xpt

@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<OptionInfer>On</OptionInfer>
<PlatformFamilyName>PocketPC</PlatformFamilyName>
<PlatformID>WinCE</PlatformID>

1
data/templates/project/VBNet/ConsoleProject.xpt

@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<Files>

1
data/templates/project/VBNet/ControlLibrary.xpt

@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<Files>

1
data/templates/project/VBNet/Direct3DProject.xpt

@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<StartupObject>${StandardNamespace}.MainClass</StartupObject>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<Files>

3
data/templates/project/VBNet/EmptyProject.xpt

@ -21,5 +21,8 @@ @@ -21,5 +21,8 @@
<Import Include="System" />
<Import Include="Microsoft.VisualBasic" />
</ProjectItems>
<PropertyGroup>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
</Project>
</Template>

1
data/templates/project/VBNet/FormsProject.xpt

@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ProjectItems>

1
data/templates/project/VBNet/Library.xpt

@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ProjectItems>

1
data/templates/project/VBNet/Service.xpt

@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ProjectItems>

1
data/templates/project/VBNet/SharedAddin.xpt

@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RegisterForComInterop>true</RegisterForComInterop>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<Files>

1
data/templates/project/VBNet/SharpDevelopAddin.xpt

@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ProjectItems>

1
data/templates/project/VBNet/SharpDevelopMacro.xpt

@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ProjectItems>

18
src/AddIns/BackendBindings/VBNetBinding/Project/Resources/BuildOptions.xfrm

@ -12,19 +12,27 @@ @@ -12,19 +12,27 @@
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
<Controls>
<System.Windows.Forms.ComboBox>
<Name value="optionInferComboBox" />
<TabIndex value="8" />
<Location value="394, 125" />
<Size value="121, 21" />
<FormattingEnabled value="True" />
<DropDownStyle value="DropDownList" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.ComboBox>
<Name value="optionCompareComboBox" />
<TabIndex value="7" />
<Location value="317, 125" />
<Size value="132, 21" />
<Location value="267, 125" />
<Size value="121, 21" />
<FormattingEnabled value="True" />
<DropDownStyle value="DropDownList" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.ComboBox>
<Name value="optionStrictComboBox" />
<TabIndex value="6" />
<Location value="179, 125" />
<Size value="132, 21" />
<Location value="140, 125" />
<Size value="121, 21" />
<FormattingEnabled value="True" />
<DropDownStyle value="DropDownList" />
</System.Windows.Forms.ComboBox>
@ -32,7 +40,7 @@ @@ -32,7 +40,7 @@
<Name value="optionExplicitComboBox" />
<TabIndex value="5" />
<Location value="13, 125" />
<Size value="160, 21" />
<Size value="121, 21" />
<FormattingEnabled value="True" />
<DropDownStyle value="DropDownList" />
</System.Windows.Forms.ComboBox>

4
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs

@ -45,6 +45,10 @@ namespace VBNetBinding.OptionPanels @@ -45,6 +45,10 @@ namespace VBNetBinding.OptionPanels
new StringPair("Binary", "Compare Binary"),
new StringPair("Text", "Compare Text"));
b.RegisterLocationButton(locationButton);
b = helper.BindStringEnum("optionInferComboBox", "OptionInfer", "Off",
new StringPair("Off", "Infer Off"),
new StringPair("On", "Infer On"));
b.RegisterLocationButton(locationButton);
InitBaseIntermediateOutputPath();
InitIntermediateOutputPath();

2
src/AddIns/Misc/HtmlHelp2/JScriptGlobals/HtmlHelp2JScriptGlobals.vbproj

@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<SourceAnalysisOverrideSettingsFile>C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
@ -35,6 +36,7 @@ @@ -35,6 +36,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save