From 757b34e83222e398124131cef523184209377e87 Mon Sep 17 00:00:00 2001
From: Andrey Kunchev <donandren@gmail.com>
Date: Tue, 7 Mar 2017 16:57:35 +0200
Subject: [PATCH] revert some accident changes

---
 .../Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj |  2 +-
 src/Markup/Avalonia.Markup/Avalonia.Markup.csproj    | 11 -----------
 src/Markup/Avalonia.Markup/packages.config           | 12 ------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index a3b5b4ea40..b79c59cbeb 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;OMNIXAML_no</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>CS1591</NoWarn>
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 50d5886e10..5826346fc9 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -114,14 +114,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.ComponentModel.Primitives, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\netstandard1.0\System.ComponentModel.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ComponentModel.TypeConverter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\netstandard1.0\System.ComponentModel.TypeConverter.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Reactive.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll</HintPath>
       <Private>True</Private>
@@ -142,9 +134,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Common\" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Markup/Avalonia.Markup/packages.config b/src/Markup/Avalonia.Markup/packages.config
index 34e612e93a..bcef21429a 100644
--- a/src/Markup/Avalonia.Markup/packages.config
+++ b/src/Markup/Avalonia.Markup/packages.config
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.ComponentModel" version="4.3.0" targetFramework="portable45-net45+win8" />
   <package id="System.ComponentModel.Annotations" version="4.1.0" targetFramework="portable45-net45+win8" />
-  <package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.Globalization" version="4.3.0" targetFramework="portable45-net45+win8" />
   <package id="System.Reactive" version="3.0.0" targetFramework="portable45-net45+win8" />
   <package id="System.Reactive.Core" version="3.0.0" targetFramework="portable45-net45+win8" />
   <package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="portable45-net45+win8" />
   <package id="System.Reactive.Linq" version="3.0.0" targetFramework="portable45-net45+win8" />
   <package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="portable45-net45+win8" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="portable45-net45+win8" />
-  <package id="System.Threading" version="4.3.0" targetFramework="portable45-net45+win8" />
 </packages>
\ No newline at end of file