From b87a1aca2d75968a6b0a751b5126039676fea845 Mon Sep 17 00:00:00 2001
From: roman-yagodin <roman.yagodin@gmail.com>
Date: Tue, 28 Sep 2021 12:05:51 +0300
Subject: [PATCH] Downgrade Xwt to 0.2.234 to avoid #37

---
 .../R7.Webmate.Xwt.DependencyHelper.csproj    | 28 +++++++++----------
 .../packages.config                           | 10 +++----
 R7.Webmate.Xwt/R7.Webmate.Xwt.csproj          |  7 ++---
 .../config/R7.Webmate.Xwt.windows.yml         |  2 --
 R7.Webmate.Xwt/packages.config                |  2 +-
 5 files changed, 22 insertions(+), 27 deletions(-)
 delete mode 100644 R7.Webmate.Xwt/config/R7.Webmate.Xwt.windows.yml

diff --git a/R7.Webmate.Xwt.DependencyHelper/R7.Webmate.Xwt.DependencyHelper.csproj b/R7.Webmate.Xwt.DependencyHelper/R7.Webmate.Xwt.DependencyHelper.csproj
index 809277c..d6ffbd7 100644
--- a/R7.Webmate.Xwt.DependencyHelper/R7.Webmate.Xwt.DependencyHelper.csproj
+++ b/R7.Webmate.Xwt.DependencyHelper/R7.Webmate.Xwt.DependencyHelper.csproj
@@ -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>
@@ -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>
@@ -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>
\ No newline at end of file
diff --git a/R7.Webmate.Xwt.DependencyHelper/packages.config b/R7.Webmate.Xwt.DependencyHelper/packages.config
index 2083483..4719354 100644
--- a/R7.Webmate.Xwt.DependencyHelper/packages.config
+++ b/R7.Webmate.Xwt.DependencyHelper/packages.config
@@ -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>
\ No newline at end of file
diff --git a/R7.Webmate.Xwt/R7.Webmate.Xwt.csproj b/R7.Webmate.Xwt/R7.Webmate.Xwt.csproj
index d6c712a..7b045b2 100644
--- a/R7.Webmate.Xwt/R7.Webmate.Xwt.csproj
+++ b/R7.Webmate.Xwt/R7.Webmate.Xwt.csproj
@@ -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>
@@ -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">
diff --git a/R7.Webmate.Xwt/config/R7.Webmate.Xwt.windows.yml b/R7.Webmate.Xwt/config/R7.Webmate.Xwt.windows.yml
deleted file mode 100644
index afb2dda..0000000
--- a/R7.Webmate.Xwt/config/R7.Webmate.Xwt.windows.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-toolkit-type: Gtk
diff --git a/R7.Webmate.Xwt/packages.config b/R7.Webmate.Xwt/packages.config
index 94495da..e37cfb7 100644
--- a/R7.Webmate.Xwt/packages.config
+++ b/R7.Webmate.Xwt/packages.config
@@ -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>
\ No newline at end of file