tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated OmniXAML. 

Well, downgraded in terms of version number, as OmniXAML has moved to a
proper semantic versioning scheme and restarted at 0.1.0.
pull/90/head
Steven Kirk 11 years ago
parent
ee814028c5
commit
9a2dbef228
5 changed files with 31 additions and 33 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. 8
      samples/XamlTestApplication/XamlTestApplication.csproj
  2. 23
      samples/XamlTestApplication/packages.config
  3. 2
      src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
  4. 8
      src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
  5. 23
      src/Markup/Perspex.Markup.Xaml/packages.config

8
samples/XamlTestApplication/XamlTestApplication.csproj
View File

@ -36,12 +36,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Glass, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Glass.1.4.8.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll</HintPath>
<Reference Include="Glass, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Glass.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OmniXaml, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OmniXaml.1.4.8.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll</HintPath>
<Reference Include="OmniXaml, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OmniXaml.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">

23
samples/XamlTestApplication/packages.config
View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Glass" version="1.4.8.0" targetFramework="net46" userInstalled="true" />
<package id="OmniXaml" version="1.4.8.0" targetFramework="net46" userInstalled="true" />
<package id="Rx-Core" version="2.2.5" targetFramework="net46" userInstalled="true" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net46" userInstalled="true" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net46" userInstalled="true" />
<package id="Rx-Main" version="2.2.5" targetFramework="net46" userInstalled="true" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net46" userInstalled="true" />
<package id="Rx-XAML" version="2.2.5" targetFramework="net46" userInstalled="true" />
<package id="Serilog" version="1.5.9" targetFramework="net46" userInstalled="true" />
<package id="Splat" version="1.6.2" targetFramework="net46" userInstalled="true" />
<package id="Sprache" version="2.0.0.46" targetFramework="net46" userInstalled="true" />
<package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="net46" userInstalled="true" />
<package id="Glass" version="0.1.0" targetFramework="net451" />
<package id="OmniXaml" version="0.1.0" targetFramework="net451" />
<package id="Rx-Core" version="2.2.5" targetFramework="net46" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net46" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net46" />
<package id="Rx-Main" version="2.2.5" targetFramework="net46" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net46" />
<package id="Rx-XAML" version="2.2.5" targetFramework="net46" />
<package id="Serilog" version="1.5.9" targetFramework="net46" />
<package id="Splat" version="1.6.2" targetFramework="net46" />
<package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="net451" />
</packages>

2
src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
View File

@ -9,7 +9,7 @@ namespace Perspex.Markup.Xaml.Context
using OmniXaml;
using OmniXaml.ObjectAssembler;
using OmniXaml.Parsers.ProtoParser;
using OmniXaml.Parsers.XamlNodes;
using OmniXaml.Parsers.XamlInstructions;
public class PerspexParserFactory : IXamlParserFactory
{

8
src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
View File

@ -113,12 +113,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Glass, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Glass.1.4.8.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll</HintPath>
<Reference Include="Glass, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Glass.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Glass.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OmniXaml, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\OmniXaml.1.4.8.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll</HintPath>
<Reference Include="OmniXaml, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\OmniXaml.0.1.0\lib\portable-net45+win+Xamarin.iOS10+MonoAndroid10+MonoTouch10\OmniXaml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">

23
src/Markup/Perspex.Markup.Xaml/packages.config
View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Glass" version="1.4.8.0" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="OmniXaml" version="1.4.8.0" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Rx-Core" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Rx-Linq" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Serilog" version="1.5.9" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Splat" version="1.6.2" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Sprache" version="2.0.0.46" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="portable46-net451+win81" userInstalled="true" />
<package id="StyleCop.Analyzers" version="1.0.0-beta008" targetFramework="portable46-net451+win81" developmentDependency="true" userInstalled="true" />
<package id="Glass" version="0.1.0" targetFramework="portable46-net451+win81" />
<package id="OmniXaml" version="0.1.0" 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-Linq" version="2.2.5" targetFramework="portable46-net451+win81" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable46-net451+win81" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable46-net451+win81" />
<package id="Serilog" version="1.5.9" targetFramework="portable46-net451+win81" />
<package id="Splat" version="1.6.2" targetFramework="portable46-net451+win81" />
<package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="portable46-net451+win81" />
<package id="StyleCop.Analyzers" version="1.0.0-beta008" targetFramework="portable46-net451+win81" developmentDependency="true" />
</packages>
Write Preview
Loading…
Cancel
Save