merge

1 files changed, 1 insertions, 32 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
index 11e023f86..ce7c361e3 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
@@ -77,9 +77,6 @@
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
@@ -180,9 +177,6 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AvalonEditCommands.cs" />
-    <Compile Include="BreakPointSymbolPressedEventArgs.cs" />
-    <Compile Include="CachedAssembly.cs" />
-    <Compile Include="CachedUsing.cs" />
     <Compile Include="CodeCompletion\CompletionListBox.cs" />
     <Compile Include="CodeCompletion\CompletionListBoxItem.cs" />
     <Compile Include="CodeCompletion\CompletionWindowBase.cs" />
@@ -197,19 +191,14 @@
     <Compile Include="CodeCompletion\OverloadViewer.cs" />
     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\BooleanToVisibilityInversedConverter.cs" />
-    <Compile Include="Editing\BreakPointMargin.cs" />
-    <Compile Include="Errors\ITextMarker.cs" />
-    <Compile Include="Errors\TextMarkerService.cs" />
     <Compile Include="ExtensionMethods.cs" />
     <Compile Include="Intellisense\ClassCompletionItemPopup.cs" />
     <Compile Include="Intellisense\CompletionItem.cs" />
     <Compile Include="Intellisense\CompletionItemPopupControl.cs" />
     <Compile Include="Intellisense\EnumCompletionItem.cs" />
     <Compile Include="Intellisense\EnumCompletionItemPopup.cs" />
-    <Compile Include="Intellisense\EventCompletionItem.cs" />
     <Compile Include="Intellisense\FieldCompletionItem.cs" />
     <Compile Include="Intellisense\FieldCompletionItemPopup.cs" />
-    <Compile Include="Intellisense\HideIntellisenseAttribute.cs" />
     <Compile Include="Intellisense\ICompletionItem.cs" />
     <Compile Include="Intellisense\ICompletionProvider.cs" />
     <Compile Include="Intellisense\InterfaceCompletionItem.cs" />
@@ -347,7 +336,6 @@
     <Compile Include="Indentation\DefaultIndentationStrategy.cs" />
     <Compile Include="Indentation\IIndentationStrategy.cs" />
     <Compile Include="Intellisense\KnownTypeConstructor.cs" />
-    <Compile Include="Intellisense\KnownTypeEvent.cs" />
     <Compile Include="Intellisense\KnownTypeField.cs" />
     <Compile Include="Intellisense\KnownTypeMember.cs" />
     <Compile Include="Intellisense\KnownTypeMethodParameter.cs" />
@@ -360,7 +348,6 @@
     <Compile Include="Intellisense\NamespaceCompletionItemPopup.cs" />
     <Compile Include="Intellisense\PropertyCompletionItem.cs" />
     <Compile Include="Intellisense\PropertyCompletionItemPopup.cs" />
-    <Compile Include="Intellisense\SnippetCompletionItem.cs" />
     <Compile Include="Intellisense\StructCompletionItem.cs" />
     <Compile Include="Intellisense\StructCompletionItemPopup.cs" />
     <Compile Include="Intellisense\Utils.cs" />
@@ -513,7 +500,6 @@
     <Compile Include="Utils\ThrowUtil.cs" />
     <Compile Include="Utils\Win32.cs" />
     <CodeAnalysisDictionary Include="Properties\CodeAnalysisDictionary.xml" />
-    <Compile Include="XamlEditor.cs" />
     <Compile Include="Xml\AbstractAXmlVisitor.cs" />
     <Compile Include="Xml\AXmlAttribute.cs" />
     <Compile Include="Xml\AXmlAttributeCollection.cs" />
@@ -593,14 +579,6 @@
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tango.Scripting.Core\Tango.Scripting.Core.csproj">
-      <Project>{5812E1C6-ABAA-4066-94AC-971C27B4F46A}</Project>
-      <Name>Tango.Scripting.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Tango.Scripting.Formatting\Tango.Scripting.Formatting.csproj">
-      <Project>{8d8f06ed-7f75-4933-b0c5-829b0ff654d0}</Project>
-      <Name>Tango.Scripting.Formatting</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Tango.Scripting\Tango.Scripting.csproj">
       <Project>{1e938fd2-c669-4738-98c9-77f96ce4d451}</Project>
       <Name>Tango.Scripting</Name>
@@ -648,18 +626,9 @@
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\event.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\snippet.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\break_point_arrow.png" />
-  </ItemGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UseGlobalSettings="True" />
+      <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file