Skip to content

Commit b87a1ac

Browse files
roman-yagodinroman-yagodin
committed
Downgrade Xwt to 0.2.234 to avoid #37 
1 parent ab81894 commit b87a1ac

File tree

5 files changed

+22
-27
lines changed

5 files changed

+22
-27
lines changed

‎R7.Webmate.Xwt.DependencyHelper/R7.Webmate.Xwt.DependencyHelper.csproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Xwt.Gtk3.0.2.250\build\Xwt.Gtk3.props" Condition="Exists('..\packages\Xwt.Gtk3.0.2.250\build\Xwt.Gtk3.props')" />
4-
<Import Project="..\packages\Xwt.Gtk.0.2.250\build\Xwt.Gtk.props" Condition="Exists('..\packages\Xwt.Gtk.0.2.250\build\Xwt.Gtk.props')" />
3+
<Import Project="..\packages\Xwt.Gtk3.0.2.234\build\Xwt.Gtk3.props" Condition="Exists('..\packages\Xwt.Gtk3.0.2.234\build\Xwt.Gtk3.props')" />
4+
<Import Project="..\packages\Xwt.Gtk.0.2.234\build\Xwt.Gtk.props" Condition="Exists('..\packages\Xwt.Gtk.0.2.234\build\Xwt.Gtk.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -42,24 +42,24 @@
4242
<Reference Include="UIAutomationProvider" />
4343
<Reference Include="UIAutomationTypes" />
4444
<Reference Include="WindowsBase" />
45-
<Reference Include="Xwt, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
46-
<HintPath>..\packages\Xwt.0.2.250\lib\net472\Xwt.dll</HintPath>
45+
<Reference Include="Xwt, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
46+
<HintPath>..\packages\Xwt.0.2.234\lib\net472\Xwt.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
49-
<Reference Include="Xwt.Gtk, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
50-
<HintPath>..\packages\Xwt.Gtk.0.2.250\lib\net472\Xwt.Gtk.dll</HintPath>
49+
<Reference Include="Xwt.Gtk, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
50+
<HintPath>..\packages\Xwt.Gtk.0.2.234\lib\net472\Xwt.Gtk.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="Xwt.Gtk.Windows, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
54-
<HintPath>..\packages\Xwt.Gtk.Windows.0.2.250\lib\net472\Xwt.Gtk.Windows.dll</HintPath>
53+
<Reference Include="Xwt.Gtk.Windows, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
54+
<HintPath>..\packages\Xwt.Gtk.Windows.0.2.234\lib\net472\Xwt.Gtk.Windows.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
57-
<Reference Include="Xwt.Gtk3, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
58-
<HintPath>..\packages\Xwt.Gtk3.0.2.250\lib\net472\Xwt.Gtk3.dll</HintPath>
57+
<Reference Include="Xwt.Gtk3, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
58+
<HintPath>..\packages\Xwt.Gtk3.0.2.234\lib\net472\Xwt.Gtk3.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
61-
<Reference Include="Xwt.WPF, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
62-
<HintPath>..\packages\Xwt.WPF.0.2.250\lib\net472\Xwt.WPF.dll</HintPath>
61+
<Reference Include="Xwt.WPF, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
62+
<HintPath>..\packages\Xwt.WPF.0.2.234\lib\net472\Xwt.WPF.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
6565
</ItemGroup>
@@ -72,7 +72,7 @@
7272
<PropertyGroup>
7373
<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>
7474
</PropertyGroup>
75-
<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'))" />
76-
<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'))" />
75+
<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'))" />
76+
<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'))" />
7777
</Target>
7878
</Project>

‎R7.Webmate.Xwt.DependencyHelper/packages.config

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xwt" version="0.2.250" targetFramework="net472" />
4-
<package id="Xwt.Gtk" version="0.2.250" targetFramework="net472" />
5-
<package id="Xwt.Gtk.Windows" version="0.2.250" targetFramework="net472" />
6-
<package id="Xwt.Gtk3" version="0.2.250" targetFramework="net472" />
7-
<package id="Xwt.WPF" version="0.2.250" targetFramework="net472" />
3+
<package id="Xwt" version="0.2.234" targetFramework="net472" />
4+
<package id="Xwt.Gtk" version="0.2.234" targetFramework="net472" />
5+
<package id="Xwt.Gtk.Windows" version="0.2.234" targetFramework="net472" />
6+
<package id="Xwt.Gtk3" version="0.2.234" targetFramework="net472" />
7+
<package id="Xwt.WPF" version="0.2.234" targetFramework="net472" />
88
</packages>

‎R7.Webmate.Xwt/R7.Webmate.Xwt.csproj

+2-5
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
<Compile Include="Misc\ExternalToolsWidget.cs" />
4545
</ItemGroup>
4646
<ItemGroup>
47-
<None Include="config\R7.Webmate.Xwt.windows.yml">
48-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
49-
</None>
5047
<None Include="packages.config" />
5148
<None Include="resources\app-icons\r7-webmate-128px.png">
5249
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -145,8 +142,8 @@
145142
<Reference Include="System.ServiceModel" />
146143
<Reference Include="System.Transactions" />
147144
<Reference Include="System.Xml" />
148-
<Reference Include="Xwt, Version=0.2.250.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
149-
<HintPath>..\packages\Xwt.0.2.250\lib\net472\Xwt.dll</HintPath>
145+
<Reference Include="Xwt, Version=0.2.234.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
146+
<HintPath>..\packages\Xwt.0.2.234\lib\net472\Xwt.dll</HintPath>
150147
<Private>True</Private>
151148
</Reference>
152149
<Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e">

‎R7.Webmate.Xwt/config/R7.Webmate.Xwt.windows.yml

-2
This file was deleted.

‎R7.Webmate.Xwt/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="NGettext" version="0.6.7" targetFramework="net472" />
44
<package id="NLog" version="4.7.10" targetFramework="net472" />
5-
<package id="Xwt" version="0.2.250" targetFramework="net472" />
5+
<package id="Xwt" version="0.2.234" targetFramework="net472" />
66
<package id="YamlDotNet" version="11.2.1" targetFramework="net472" />
77
</packages>

0 commit comments

Comments
 (0)