Skip to content

Commit

Permalink
Downgrade Xwt to 0.2.234 to avoid #37
Browse files Browse the repository at this point in the history
  • Loading branch information
@roman-yagodin
roman-yagodin committed Sep 28, 2021
1 parent ab81894 commit b87a1ac
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 27 deletions.
28 changes: 14 additions & 14 deletions R7.Webmate.Xwt.DependencyHelper/R7.Webmate.Xwt.DependencyHelper.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xwt.Gtk3.0.2.250\build\Xwt.Gtk3.props" Condition="Exists('..\packages\Xwt.Gtk3.0.2.250\build\Xwt.Gtk3.props')" />
<Import Project="..\packages\Xwt.Gtk.0.2.250\build\Xwt.Gtk.props" Condition="Exists('..\packages\Xwt.Gtk.0.2.250\build\Xwt.Gtk.props')" />
<Import Project="..\packages\Xwt.Gtk3.0.2.234\build\Xwt.Gtk3.props" Condition="Exists('..\packages\Xwt.Gtk3.0.2.234\build\Xwt.Gtk3.props')" />
<Import Project="..\packages\Xwt.Gtk.0.2.234\build\Xwt.Gtk.props" Condition="Exists('..\packages\Xwt.Gtk.0.2.234\build\Xwt.Gtk.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -42,24 +42,24 @@
<Reference Include="UIAutomationProvider" />
<Reference Include="UIAutomationTypes" />
<Reference Include="WindowsBase" />
<Reference Include="Xwt, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.0.2.250\lib\net472\Xwt.dll</HintPath>
<Reference Include="Xwt, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.0.2.234\lib\net472\Xwt.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xwt.Gtk, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.Gtk.0.2.250\lib\net472\Xwt.Gtk.dll</HintPath>
<Reference Include="Xwt.Gtk, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.Gtk.0.2.234\lib\net472\Xwt.Gtk.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xwt.Gtk.Windows, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.Gtk.Windows.0.2.250\lib\net472\Xwt.Gtk.Windows.dll</HintPath>
<Reference Include="Xwt.Gtk.Windows, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.Gtk.Windows.0.2.234\lib\net472\Xwt.Gtk.Windows.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xwt.Gtk3, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.Gtk3.0.2.250\lib\net472\Xwt.Gtk3.dll</HintPath>
<Reference Include="Xwt.Gtk3, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.Gtk3.0.2.234\lib\net472\Xwt.Gtk3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xwt.WPF, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.WPF.0.2.250\lib\net472\Xwt.WPF.dll</HintPath>
<Reference Include="Xwt.WPF, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.WPF.0.2.234\lib\net472\Xwt.WPF.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand All @@ -72,7 +72,7 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Xwt.Gtk.0.2.250\build\Xwt.Gtk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xwt.Gtk.0.2.250\build\Xwt.Gtk.props'))" />
<Error Condition="!Exists('..\packages\Xwt.Gtk3.0.2.250\build\Xwt.Gtk3.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xwt.Gtk3.0.2.250\build\Xwt.Gtk3.props'))" />
<Error Condition="!Exists('..\packages\Xwt.Gtk.0.2.234\build\Xwt.Gtk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xwt.Gtk.0.2.234\build\Xwt.Gtk.props'))" />
<Error Condition="!Exists('..\packages\Xwt.Gtk3.0.2.234\build\Xwt.Gtk3.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xwt.Gtk3.0.2.234\build\Xwt.Gtk3.props'))" />
</Target>
</Project>
10 changes: 5 additions & 5 deletions R7.Webmate.Xwt.DependencyHelper/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Xwt" version="0.2.250" targetFramework="net472" />
<package id="Xwt.Gtk" version="0.2.250" targetFramework="net472" />
<package id="Xwt.Gtk.Windows" version="0.2.250" targetFramework="net472" />
<package id="Xwt.Gtk3" version="0.2.250" targetFramework="net472" />
<package id="Xwt.WPF" version="0.2.250" targetFramework="net472" />
<package id="Xwt" version="0.2.234" targetFramework="net472" />
<package id="Xwt.Gtk" version="0.2.234" targetFramework="net472" />
<package id="Xwt.Gtk.Windows" version="0.2.234" targetFramework="net472" />
<package id="Xwt.Gtk3" version="0.2.234" targetFramework="net472" />
<package id="Xwt.WPF" version="0.2.234" targetFramework="net472" />
</packages>
7 changes: 2 additions & 5 deletions R7.Webmate.Xwt/R7.Webmate.Xwt.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
<Compile Include="Misc\ExternalToolsWidget.cs" />
</ItemGroup>
<ItemGroup>
<None Include="config\R7.Webmate.Xwt.windows.yml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="resources\app-icons\r7-webmate-128px.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down Expand Up @@ -145,8 +142,8 @@
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml" />
<Reference Include="Xwt, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.0.2.250\lib\net472\Xwt.dll</HintPath>
<Reference Include="Xwt, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\packages\Xwt.0.2.234\lib\net472\Xwt.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e">
Expand Down
2 changes: 0 additions & 2 deletions R7.Webmate.Xwt/config/R7.Webmate.Xwt.windows.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion R7.Webmate.Xwt/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<packages>
<package id="NGettext" version="0.6.7" targetFramework="net472" />
<package id="NLog" version="4.7.10" targetFramework="net472" />
<package id="Xwt" version="0.2.250" targetFramework="net472" />
<package id="Xwt" version="0.2.234" targetFramework="net472" />
<package id="YamlDotNet" version="11.2.1" targetFramework="net472" />
</packages>

0 comments on commit b87a1ac

Please sign in to comment.