Skip to content

Commit ecdd570

Browse files
QilongTangQilongTang
authored
Hotfix 2.3.2 Cherry-Pick #12804 (#12808)
* 2.6.2 Hotfix - Update RestSharp and Greg (#12804) * Update RestSharp and Greg * Update * versions * version updates for net452 * Update Greg version * Update Greg version * Update version * version number * revert version number
1 parent ef4de0b commit ecdd570

20 files changed

Lines changed: 60 additions & 55 deletions

File tree

‎src/DynamoCore/DynamoCore.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ limitations under the License.
7878
<Reference Include="Analytics.NET.Google">
7979
<HintPath>..\..\extern\Analytics.NET\Analytics.NET.Google.dll</HintPath>
8080
</Reference>
81-
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
82-
<HintPath>..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
81+
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
82+
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
83+
<Private>True</Private>
8384
</Reference>
8485
<Reference Include="Microsoft.CSharp" />
8586
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -90,8 +91,8 @@ limitations under the License.
9091
<SpecificVersion>False</SpecificVersion>
9192
<HintPath>..\..\extern\ProtoGeometry\ProtoGeometry.dll</HintPath>
9293
</Reference>
93-
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
94-
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
94+
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, processorArchitecture=MSIL">
95+
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
9596
</Reference>
9697
<Reference Include="System" />
9798
<Reference Include="System.Configuration" />
@@ -100,6 +101,7 @@ limitations under the License.
100101
</Reference>
101102
<Reference Include="System.Drawing" />
102103
<Reference Include="System.Runtime.Serialization" />
104+
<Reference Include="System.Web" />
103105
<Reference Include="System.Xml" />
104106
<Reference Include="System.Xml.Linq" />
105107
</ItemGroup>
@@ -407,6 +409,7 @@ limitations under the License.
407409
<Copy SourceFiles="@(ExternLibG224)" DestinationFolder="$(OutputPath)libg_224_0_1\" />
408410
<Copy SourceFiles="@(ExternLibG2244)" DestinationFolder="$(OutputPath)libg_224_4_0\" />
409411
<Copy SourceFiles="@(ExternLibG225)" DestinationFolder="$(OutputPath)libg_225_0_0\" />
412+
<Copy SourceFiles="@(ExternLibG226)" DestinationFolder="$(OutputPath)libg_226_0_0\" />
410413
<Copy SourceFiles="@(ExternLibG)" DestinationFolder="$(OutputPath)\%(RecursiveDir)" />
411414
<Copy SourceFiles="@(ExternSimplexNoise)" DestinationFolder="$(OutputPath)" />
412415
<Copy SourceFiles="@(ExternAnalytics)" DestinationFolder="$(OutputPath)" />

‎src/DynamoCore/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
3+
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
44
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
5-
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
5+
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
66
</packages>

‎src/DynamoCoreWpf/DynamoCoreWpf.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@
5050
<Reference Include="FontAwesome.WPF">
5151
<HintPath>..\..\extern\FontAwesome\FontAwesome.WPF.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
53+
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
55+
<Private>True</Private>
5556
</Reference>
5657
<Reference Include="HelixToolkit, Version=2015.1.629.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
5758
<HintPath>..\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll</HintPath>
@@ -83,8 +84,8 @@
8384
<HintPath>..\..\extern\ProtoGeometry\ProtoGeometry.dll</HintPath>
8485
<Private>False</Private>
8586
</Reference>
86-
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
87-
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
87+
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, processorArchitecture=MSIL">
88+
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
8889
</Reference>
8990
<Reference Include="SharpDX, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
9091
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>

‎src/DynamoCoreWpf/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Cyotek.Drawing.BitmapFont" version="1.0.2.0" targetFramework="net45" />
4-
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
4+
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
55
<package id="HelixToolkit" version="2015.1.629" targetFramework="net45" />
66
<package id="HelixToolkit.Wpf" version="2015.1.629" targetFramework="net45" />
77
<package id="HelixToolkit.Wpf.SharpDX" version="2015.1.629" targetFramework="net45" />
88
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
9-
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
9+
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
1010
<package id="SharpDX" version="2.6.3" targetFramework="net45" />
1111
<package id="SharpDX.D3DCompiler" version="2.6.3" targetFramework="net45" />
1212
<package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" />

‎src/DynamoPackages/DynamoPackages.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,20 @@
3939
<Prefer32Bit>false</Prefer32Bit>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
42+
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
4444
</Reference>
4545
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4646
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
49-
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
49+
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
50+
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Configuration" />
5454
<Reference Include="System.Core" />
55+
<Reference Include="System.Web" />
5556
<Reference Include="System.Xml.Linq" />
5657
<Reference Include="System.Data.DataSetExtensions" />
5758
<Reference Include="Microsoft.CSharp" />

‎src/DynamoPackages/PackageDirectoryBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Linq;
55
using Dynamo.PackageManager.Interfaces;
66
using Dynamo.Utilities;
7-
using RestSharp.Serializers;
7+
using RestSharp.Serialization.Json;
88

99
namespace Dynamo.PackageManager
1010
{

‎src/DynamoPackages/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
3+
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
44
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
55
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
66
</packages>

‎src/DynamoPackagesUI/DynamoPackagesUI.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Greg, Version=1.0.6176.18754, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Greg.1.0.6176.18754\lib\net45\Greg.dll</HintPath>
36+
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
4040
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
@@ -51,8 +51,8 @@
5151
</Reference>
5252
<Reference Include="PresentationCore" />
5353
<Reference Include="PresentationFramework" />
54-
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
54+
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
5858
<Reference Include="System" />

‎src/DynamoPackagesUI/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="CefSharp.Common" version="49.0.1" targetFramework="net45" />
66
<package id="CefSharp.Wpf" version="49.0.1" targetFramework="net45" />
77
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
8-
<package id="RestSharp" version="105.2.3" targetFramework="net45" />
8+
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
99
<package id="Unofficial.Ionic.Zip" version="1.9.1.8" targetFramework="net45" />
10-
<package id="Greg" version="1.0.6176.18754" targetFramework="net45" />
10+
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
1111
</packages>

‎src/LibraryViewExtension/LibraryViewExtension.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<WarningLevel>4</WarningLevel>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
40+
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Microsoft.Practices.Prism, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
@@ -50,13 +50,14 @@
5050
</Reference>
5151
<Reference Include="PresentationCore" />
5252
<Reference Include="PresentationFramework" />
53-
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
53+
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
54+
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System" />
5757
<Reference Include="System.Configuration" />
5858
<Reference Include="System.Core" />
5959
<Reference Include="System.Drawing" />
60+
<Reference Include="System.Web" />
6061
<Reference Include="System.Windows.Forms" />
6162
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6263
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)