Updated packages
This commit is contained in:
Wiesław Šoltés
Родитель
e755abfc97
Коммит
691b3c973f
18
SpiroNet.sln
18
SpiroNet.sln
|
|
@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
|||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25123.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Wpf", "src\SpiroNet.Wpf\SpiroNet.Wpf.csproj", "{D06A68AB-E369-4EC5-860F-04F54D29077F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet", "src\SpiroNet\SpiroNet.csproj", "{B2DEAB02-F231-4AA9-8879-0FD73096C60D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Editor", "src\SpiroNet.Editor\SpiroNet.Editor.csproj", "{4F0E9E3E-DA95-40B2-8FDE-22902388E90A}"
|
||||
|
|
@ -13,7 +11,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Json", "src\SpiroN
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.ViewModels", "src\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj", "{A4CD560C-4567-4889-AC1A-FE03E15FF75E}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Avalonia", "src\SpiroNet.Avalonia\SpiroNet.Avalonia.csproj", "{B8DB18EB-3BE1-4344-812E-5B3B22D969A3}"
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{14839D79-4183-4D13-A0C3-6E396D51FA9B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Avalonia", "samples\SpiroNet.Avalonia\SpiroNet.Avalonia.csproj", "{B8DB18EB-3BE1-4344-812E-5B3B22D969A3}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Wpf", "samples\SpiroNet.Wpf\SpiroNet.Wpf.csproj", "{D06A68AB-E369-4EC5-860F-04F54D29077F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{945E10EB-994A-4B19-884C-35B203D1991B}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
|
@ -49,4 +53,12 @@ Global
|
|||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{D06A68AB-E369-4EC5-860F-04F54D29077F} = {945E10EB-994A-4B19-884C-35B203D1991B}
|
||||
{B2DEAB02-F231-4AA9-8879-0FD73096C60D} = {14839D79-4183-4D13-A0C3-6E396D51FA9B}
|
||||
{4F0E9E3E-DA95-40B2-8FDE-22902388E90A} = {14839D79-4183-4D13-A0C3-6E396D51FA9B}
|
||||
{DDAF7FA6-7EE3-4CF8-9800-25A2C9387AFC} = {14839D79-4183-4D13-A0C3-6E396D51FA9B}
|
||||
{A4CD560C-4567-4889-AC1A-FE03E15FF75E} = {14839D79-4183-4D13-A0C3-6E396D51FA9B}
|
||||
{B8DB18EB-3BE1-4344-812E-5B3B22D969A3} = {945E10EB-994A-4B19-884C-35B203D1991B}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -38,83 +38,83 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Avalonia.Animation, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Animation.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Animation.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Base, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Base.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Base.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Cairo, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1697-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1705-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Controls, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Controls.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Controls.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.DesignerSupport, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.DesignerSupport.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.DesignerSupport.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Diagnostics, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Diagnostics.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Diagnostics.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Direct2D1, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1697-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1705-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Gtk, Version=1.0.6035.26088, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1697-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
|
||||
<Reference Include="Avalonia.Gtk, Version=1.0.6039.36629, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1705-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.HtmlRenderer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.HtmlRenderer.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.HtmlRenderer.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Input, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Input.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Input.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Interactivity, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Interactivity.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Interactivity.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Layout, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Layout.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Layout.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Logging.Serilog, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Logging.Serilog.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Logging.Serilog.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Markup, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Markup.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Markup.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Markup.Xaml, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Markup.Xaml.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Markup.Xaml.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.ReactiveUI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.ReactiveUI.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.ReactiveUI.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.SceneGraph, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.SceneGraph.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.SceneGraph.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Styling, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Styling.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Styling.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Themes.Default, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Themes.Default.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Themes.Default.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Avalonia.Win32, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1697-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
|
||||
<HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1705-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
|
||||
|
|
@ -197,20 +197,23 @@
|
|||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\SpiroNet.Editor\SpiroNet.Editor.csproj">
|
||||
<ProjectReference Include="..\..\src\SpiroNet.Editor\SpiroNet.Editor.csproj">
|
||||
<Project>{4f0e9e3e-da95-40b2-8fde-22902388e90a}</Project>
|
||||
<Name>SpiroNet.Editor</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj">
|
||||
<ProjectReference Include="..\..\src\SpiroNet.Json\SpiroNet.Json.csproj">
|
||||
<Project>{ddaf7fa6-7ee3-4cf8-9800-25a2c9387afc}</Project>
|
||||
<Name>SpiroNet.Json</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\src\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj">
|
||||
<Project>{a4cd560c-4567-4889-ac1a-fe03e15ff75e}</Project>
|
||||
<Name>SpiroNet.ViewModels</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SpiroNet\SpiroNet.csproj">
|
||||
<ProjectReference Include="..\..\src\SpiroNet\SpiroNet.csproj">
|
||||
<Project>{b2deab02-f231-4aa9-8879-0fd73096c60d}</Project>
|
||||
<Name>SpiroNet</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="MainWindow.xaml" />
|
||||
</ItemGroup>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Avalonia" version="0.2.0.1697-alpha" targetFramework="net45" />
|
||||
<package id="Avalonia.Desktop" version="0.2.0.1697-alpha" targetFramework="net45" />
|
||||
<package id="Avalonia" version="0.2.0.1705-alpha" targetFramework="net45" />
|
||||
<package id="Avalonia.Desktop" version="0.2.0.1705-alpha" targetFramework="net45" />
|
||||
<package id="Serilog" version="1.5.14" targetFramework="net45" />
|
||||
<package id="SharpDX" version="3.0.2" targetFramework="net45" />
|
||||
<package id="SharpDX.Direct2D1" version="3.0.2" targetFramework="net45" />
|
||||
|
|
@ -108,15 +108,19 @@
|
|||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\SpiroNet.Editor\SpiroNet.Editor.csproj">
|
||||
<ProjectReference Include="..\..\src\SpiroNet.Editor\SpiroNet.Editor.csproj">
|
||||
<Project>{4f0e9e3e-da95-40b2-8fde-22902388e90a}</Project>
|
||||
<Name>SpiroNet.Editor</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj">
|
||||
<ProjectReference Include="..\..\src\SpiroNet.Json\SpiroNet.Json.csproj">
|
||||
<Project>{ddaf7fa6-7ee3-4cf8-9800-25a2c9387afc}</Project>
|
||||
<Name>SpiroNet.Json</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\src\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj">
|
||||
<Project>{a4cd560c-4567-4889-ac1a-fe03e15ff75e}</Project>
|
||||
<Name>SpiroNet.ViewModels</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SpiroNet\SpiroNet.csproj">
|
||||
<ProjectReference Include="..\..\src\SpiroNet\SpiroNet.csproj">
|
||||
<Project>{b2deab02-f231-4aa9-8879-0fd73096c60d}</Project>
|
||||
<Name>SpiroNet</Name>
|
||||
</ProjectReference>
|
||||
|
|
@ -39,8 +39,8 @@
|
|||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
|
||||
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="portable45-net45+win8" />
|
||||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8" />
|
||||
</packages>
|
||||
Загрузка…
Ссылка в новой задаче