Browse Source

Merge pull request #532 from wieslawsoltes/GlassCoreFix

Remove Glass nuget package dependency
pull/534/head
Steven Kirk 11 years ago
parent
commit
49916db399
  1. 2
      src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs
  2. 3
      src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs
  3. 2
      src/Markup/Perspex.Markup.Xaml/MarkupExtensions/StaticExtension.cs
  4. 2
      src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TypeExtension.cs
  5. 4
      src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
  6. 1
      src/Markup/Perspex.Markup.Xaml/packages.config

2
src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs

@ -5,7 +5,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Glass;
using OmniXaml.Builder; using OmniXaml.Builder;
using OmniXaml.Typing; using OmniXaml.Typing;
using Perspex.Controls; using Perspex.Controls;
@ -14,6 +13,7 @@ using Perspex.Media;
using Perspex.Metadata; using Perspex.Metadata;
using Perspex.Platform; using Perspex.Platform;
using Perspex.Styling; using Perspex.Styling;
using Glass.Core;
namespace Perspex.Markup.Xaml.Context namespace Perspex.Markup.Xaml.Context
{ {

3
src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs

@ -2,10 +2,9 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using System; using System;
using Glass;
using OmniXaml; using OmniXaml;
using OmniXaml.Typing; using OmniXaml.Typing;
using Perspex.Markup.Xaml.Data; using Glass.Core;
namespace Perspex.Markup.Xaml.Context namespace Perspex.Markup.Xaml.Context
{ {

2
src/Markup/Perspex.Markup.Xaml/MarkupExtensions/StaticExtension.cs

@ -4,8 +4,8 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Glass;
using OmniXaml; using OmniXaml;
using Glass.Core;
namespace Perspex.Markup.Xaml.MarkupExtensions namespace Perspex.Markup.Xaml.MarkupExtensions
{ {

2
src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TypeExtension.cs

@ -2,10 +2,10 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using System; using System;
using Glass;
using OmniXaml; using OmniXaml;
using OmniXaml.Attributes; using OmniXaml.Attributes;
using OmniXaml.Typing; using OmniXaml.Typing;
using Glass.Core;
namespace Perspex.Markup.Xaml.MarkupExtensions namespace Perspex.Markup.Xaml.MarkupExtensions
{ {

4
src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj

@ -318,10 +318,6 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Glass, Version=1.6.0.113, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Glass.1.6.0.113\lib\portable45-net45+win8\Glass.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Sprache, Version=2.0.0.50, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Sprache, Version=2.0.0.50, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Sprache.2.0.0.50\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid+Xamarin.iOS10+MonoTouch\Sprache.dll</HintPath> <HintPath>..\..\..\packages\Sprache.2.0.0.50\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid+Xamarin.iOS10+MonoTouch\Sprache.dll</HintPath>
<Private>True</Private> <Private>True</Private>

1
src/Markup/Perspex.Markup.Xaml/packages.config

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Glass" version="1.6.0.113" targetFramework="portable45-net45+win8" />
<package id="Rx-Core" version="2.2.5" targetFramework="portable46-net451+win81" /> <package id="Rx-Core" version="2.2.5" targetFramework="portable46-net451+win81" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="portable46-net451+win81" /> <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable46-net451+win81" />
<package id="Rx-Linq" version="2.2.5" targetFramework="portable46-net451+win81" /> <package id="Rx-Linq" version="2.2.5" targetFramework="portable46-net451+win81" />

Loading…
Cancel
Save