1
0
Steven Kirk 10 жил өмнө
parent
commit
241cd04c07

+ 5 - 5
samples/XamlTestApplication/XamlTestApplication.csproj

@@ -36,12 +36,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Glass, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.1.4.4.0\lib\portable-net451+win81+wpa81\Glass.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OmniXaml, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OmniXaml.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
     <Reference Include="ReactiveUI, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -61,7 +61,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Sprache, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sprache.SuperJMN.2.0.0.46\lib\portable-net451+win81+wpa81\Sprache.dll</HintPath>
+      <HintPath>..\..\packages\Sprache.SuperJMN.2.0.0.50\lib\portable-net451+netcore451+wpa81\Sprache.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

+ 3 - 3
samples/XamlTestApplication/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Glass" version="1.4.4.0" targetFramework="net46" />
-  <package id="OmniXaml" version="1.4.4.0" targetFramework="net46" />
+  <package id="Glass" version="1.4.8.0" targetFramework="net46" />
+  <package id="OmniXaml" version="1.4.8.0" targetFramework="net46" />
   <package id="reactiveui" version="6.5.0" targetFramework="net46" />
   <package id="reactiveui-core" version="6.5.0" targetFramework="net46" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net46" />
@@ -13,5 +13,5 @@
   <package id="Serilog" version="1.5.9" targetFramework="net46" />
   <package id="Splat" version="1.6.2" targetFramework="net46" />
   <package id="Sprache" version="2.0.0.46" targetFramework="net46" />
-  <package id="Sprache.SuperJMN" version="2.0.0.46" targetFramework="net46" />
+  <package id="Sprache.SuperJMN" version="2.0.0.50" targetFramework="net46" />
 </packages>

+ 5 - 5
src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj

@@ -113,12 +113,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Glass, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Glass.1.4.4.0\lib\portable-net451+win81+wpa81\Glass.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OmniXaml, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\OmniXaml.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
     <Reference Include="ReactiveUI, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -134,7 +134,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Sprache, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Sprache.SuperJMN.2.0.0.46\lib\portable-net451+win81+wpa81\Sprache.dll</HintPath>
+      <HintPath>..\..\..\packages\Sprache.SuperJMN.2.0.0.50\lib\portable-net451+netcore451+wpa81\Sprache.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+ 3 - 3
src/Markup/Perspex.Markup.Xaml/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Glass" version="1.4.4.0" targetFramework="portable46-net451+win81" />
-  <package id="OmniXaml" version="1.4.4.0" targetFramework="portable46-net451+win81" />
+  <package id="Glass" version="1.4.8.0" targetFramework="portable46-net451+win81" />
+  <package id="OmniXaml" version="1.4.8.0" targetFramework="portable46-net451+win81" />
   <package id="reactiveui" version="6.5.0" targetFramework="portable46-net451+win81" />
   <package id="reactiveui-core" version="6.5.0" targetFramework="portable46-net451+win81" />
   <package id="Rx-Core" version="2.2.5" targetFramework="portable46-net451+win81" />
@@ -12,6 +12,6 @@
   <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" version="2.0.0.46" targetFramework="portable46-net451+win81" />
-  <package id="Sprache.SuperJMN" version="2.0.0.46" 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>