pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Set target framework to 4.5.

newNRvisualizers
Daniel Grunwald 14 years ago
parent
aa1642faa8
commit
f0bf6dbd8d
24 changed files with 35 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
  2. 3
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user
  3. 2
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
  4. 2
      src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
  5. 3
      src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user
  6. 2
      src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj
  7. 2
      src/AddIns/Misc/StartPage/Project/StartPage.csproj
  8. 3
      src/AddIns/Misc/StartPage/Project/StartPage.csproj.user
  9. 2
      src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj
  10. 2
      src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj
  11. 4
      src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj
  12. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  13. 13
      src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs
  14. 2
      src/Main/Core/Project/ICSharpCode.Core.csproj
  15. 3
      src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
  16. 2
      src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
  17. 2
      src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
  18. 2
      src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj
  19. 2
      src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config
  20. 2
      src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj
  21. 2
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj
  22. 2
      src/Main/StartUp/Project/StartUp.csproj
  23. 3
      src/Main/StartUp/Project/StartUp.csproj.user
  24. 2
      src/Main/StartUp/Project/app.template.config

2
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
Unescape View File

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
<NoStdLib>False</NoStdLib>
<NoConfig>False</NoConfig>
<RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<OutputType>Library</OutputType>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>

3
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user
Unescape View File

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>

2
src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.AvalonEdit.AddIn</RootNamespace>
<AssemblyName>ICSharpCode.AvalonEdit.AddIn</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<SourceAnalysisOverrideSettingsFile>C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<OutputPath>..\..\..\..\AddIns\DisplayBindings\AvalonEdit\</OutputPath>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>

2
src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
Unescape View File

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>

3
src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user
Unescape View File

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>

2
src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj
Unescape View File

@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>

2
src/AddIns/Misc/StartPage/Project/StartPage.csproj
Unescape View File

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<BaseAddress>126877696</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<TargetFrameworkProfile>
</TargetFrameworkProfile>

3
src/AddIns/Misc/StartPage/Project/StartPage.csproj.user
Unescape View File

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>

2
src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj
Unescape View File

@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>

2
src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj
Unescape View File

@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>

4
src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj
Unescape View File

@ -19,7 +19,9 @@ @@ -19,7 +19,9 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunCodeAnalysis>False</RunCodeAnalysis>
<SourceAnalysisOverrideSettingsFile>C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\..\bin\</OutputPath>

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
Unescape View File

@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
<NoWarn>0809 1591</NoWarn>
<WarningLevel>4</WarningLevel>
<OutputPath>..\..\..\..\bin\</OutputPath>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>

13
src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs
Unescape View File

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Windows;
using System.Threading.Tasks;
using ICSharpCode.AvalonEdit;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.AvalonEdit.Highlighting;
@ -70,24 +71,20 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -70,24 +71,20 @@ namespace ICSharpCode.SharpDevelop.Gui
UpdateTick(e);
}
void UpdateTick(ParserUpdateStepEventArgs e)
async void UpdateTick(ParserUpdateStepEventArgs e)
{
if (!ctl.IsVisible) return;
LoggingService.Debug("DefinitionViewPad.Update");
ResolveResult res = /* TODO await */ ResolveAtCaret(e);
ResolveResult res = await ResolveAtCaretAsync(e);
if (res == null) return;
var pos = res.GetDefinitionRegion();
if (pos.IsEmpty) return;
OpenFile(pos);
}
bool disableDefinitionView;
ResolveResult ResolveAtCaret(ParserUpdateStepEventArgs e)
Task<ResolveResult> ResolveAtCaretAsync(ParserUpdateStepEventArgs e)
{
if (disableDefinitionView)
return null;
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window == null) return null;
ITextEditorProvider provider = window.ActiveViewContent as ITextEditorProvider;
@ -98,7 +95,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -98,7 +95,7 @@ namespace ICSharpCode.SharpDevelop.Gui
// don't resolve when an unrelated file was changed
if (e != null && editor.FileName != e.FileName) return null;
return ParserService.Resolve(editor.FileName, editor.Caret.Location, editor.Document);
return ParserService.ResolveAsync(editor.FileName, editor.Caret.Location, editor.Document);
}
DomRegion oldPosition;

2
src/Main/Core/Project/ICSharpCode.Core.csproj
Unescape View File

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
<DelaySign>False</DelaySign>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<SourceAnalysisOverrideSettingsFile>C:\Users\daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>

3
src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
Unescape View File

@ -22,12 +22,13 @@ @@ -22,12 +22,13 @@
<RegisterForComInterop>False</RegisterForComInterop>
<PlatformTarget>x86</PlatformTarget>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\ICSharpCode.SharpDevelop.snk</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
<DebugSymbols>true</DebugSymbols>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>DEBUG</DefineConstants>

2
src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.Core.Presentation</RootNamespace>
<AssemblyName>ICSharpCode.Core.Presentation</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>"C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis"</SourceAnalysisOverrideSettingsFile>
<OutputPath>..\..\..\bin\</OutputPath>

2
src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.Core.WinForms</RootNamespace>
<AssemblyName>ICSharpCode.Core.WinForms</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<OutputPath>..\..\..\bin\</OutputPath>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>

2
src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>ICSharpCode.SharpDevelop.BuildWorker</RootNamespace>
<AssemblyName>ICSharpCode.SharpDevelop.BuildWorker40</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>

2
src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

2
src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj
Unescape View File

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>100663296</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>4096</FileAlignment>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>

2
src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj
Unescape View File

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
<AssemblyOriginatorKeyFile>..\..\ICSharpCode.SharpDevelop.snk</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

2
src/Main/StartUp/Project/StartUp.csproj
Unescape View File

@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DelaySign>False</DelaySign>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<ApplicationManifest>app.manifest</ApplicationManifest>
<TargetFrameworkProfile>
</TargetFrameworkProfile>

3
src/Main/StartUp/Project/StartUp.csproj.user
Unescape View File

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>

2
src/Main/StartUp/Project/app.template.config
Unescape View File

@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
-->
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<runtime>

Write Preview
Loading…
Cancel
Save