Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 2.3.2 Cherry-Pick #12804 #12808

Merged
merged 4 commits into from
Apr 19, 2022
Merged

Hotfix 2.3.2 Cherry-Pick #12804 #12808

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f8e0f4
2.6.2 Hotfix - Update RestSharp and Greg (#12804)
QilongTang Apr 18, 2022
afa38c4
Update version
QilongTang Apr 18, 2022
5865000
version number
QilongTang Apr 18, 2022
234590a
revert version number
QilongTang Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
// to distinguish one build from another. AssemblyFileVersion is specified
// in AssemblyVersionInfo.cs so that it can be easily incremented by the
// automated build process.
[assembly: AssemblyVersion("2.3.1.11724")]
[assembly: AssemblyVersion("2.3.2.15684")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert these?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually meant to be submitted since the file was not updated locally correctly for me before. But I can revert for now and inspect build machine later

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the EngOps build failed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is expected @reddyashish , see reason in original PR. The older build is depending on older version of .Net which is not on current build machine



// By default, the "Product version" shown in the file properties window is
Expand All @@ -64,4 +64,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("2.3.1.11724")]
[assembly: AssemblyFileVersion("2.3.2.15684")]
11 changes: 7 additions & 4 deletions src/DynamoCore/DynamoCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ limitations under the License.
<Reference Include="Analytics.NET.Google">
<HintPath>..\..\extern\Analytics.NET\Analytics.NET.Google.dll</HintPath>
</Reference>
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand All @@ -90,8 +91,8 @@ limitations under the License.
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\extern\ProtoGeometry\ProtoGeometry.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand All @@ -100,6 +101,7 @@ limitations under the License.
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
Expand Down Expand Up @@ -407,6 +409,7 @@ limitations under the License.
<Copy SourceFiles="@(ExternLibG224)" DestinationFolder="$(OutputPath)libg_224_0_1\" />
<Copy SourceFiles="@(ExternLibG2244)" DestinationFolder="$(OutputPath)libg_224_4_0\" />
<Copy SourceFiles="@(ExternLibG225)" DestinationFolder="$(OutputPath)libg_225_0_0\" />
<Copy SourceFiles="@(ExternLibG226)" DestinationFolder="$(OutputPath)libg_226_0_0\" />
<Copy SourceFiles="@(ExternLibG)" DestinationFolder="$(OutputPath)\%(RecursiveDir)" />
<Copy SourceFiles="@(ExternSimplexNoise)" DestinationFolder="$(OutputPath)" />
<Copy SourceFiles="@(ExternAnalytics)" DestinationFolder="$(OutputPath)" />
Expand Down
4 changes: 2 additions & 2 deletions src/DynamoCore/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
</packages>
9 changes: 5 additions & 4 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@
<Reference Include="FontAwesome.WPF">
<HintPath>..\..\extern\FontAwesome\FontAwesome.WPF.dll</HintPath>
</Reference>
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HelixToolkit, Version=2015.1.629.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
<HintPath>..\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll</HintPath>
Expand Down Expand Up @@ -83,8 +84,8 @@
<HintPath>..\..\extern\ProtoGeometry\ProtoGeometry.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="SharpDX, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/DynamoCoreWpf/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cyotek.Drawing.BitmapFont" version="1.0.2.0" targetFramework="net45" />
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
<package id="HelixToolkit" version="2015.1.629" targetFramework="net45" />
<package id="HelixToolkit.Wpf" version="2015.1.629" targetFramework="net45" />
<package id="HelixToolkit.Wpf.SharpDX" version="2015.1.629" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
<package id="SharpDX" version="2.6.3" targetFramework="net45" />
<package id="SharpDX.D3DCompiler" version="2.6.3" targetFramework="net45" />
<package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" />
Expand Down
9 changes: 5 additions & 4 deletions src/DynamoPackages/DynamoPackages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,20 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoPackages/PackageDirectoryBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Linq;
using Dynamo.PackageManager.Interfaces;
using Dynamo.Utilities;
using RestSharp.Serializers;
using RestSharp.Serialization.Json;

namespace Dynamo.PackageManager
{
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoPackages/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
</packages>
8 changes: 4 additions & 4 deletions src/DynamoPackagesUI/DynamoPackagesUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Greg, Version=1.0.6176.18754, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.1.0.6176.18754\lib\net45\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
Expand All @@ -51,8 +51,8 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions src/DynamoPackagesUI/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="CefSharp.Common" version="49.0.1" targetFramework="net45" />
<package id="CefSharp.Wpf" version="49.0.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net45" />
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
<package id="Unofficial.Ionic.Zip" version="1.9.1.8" targetFramework="net45" />
<package id="Greg" version="1.0.6176.18754" targetFramework="net45" />
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
</packages>
9 changes: 5 additions & 4 deletions src/LibraryViewExtension/LibraryViewExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Prism, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -50,13 +50,14 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
4 changes: 2 additions & 2 deletions src/LibraryViewExtension/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="cef.redist.x86" version="3.3325.1758" targetFramework="net452" />
<package id="CefSharp.Common" version="65.0.1" targetFramework="net452" />
<package id="CefSharp.Wpf" version="65.0.1" targetFramework="net452" />
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
</packages>
9 changes: 5 additions & 4 deletions test/DynamoCoreTests/DynamoCoreTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\extern\Analytics.NET\Analytics.NET.Core.dll</HintPath>
</Reference>
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
Expand All @@ -62,8 +63,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>$(NunitPath)\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down
4 changes: 2 additions & 2 deletions test/DynamoCoreTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
</packages>
9 changes: 5 additions & 4 deletions test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
</PropertyGroup>
<ItemGroup>
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HelixToolkit, Version=2015.1.629.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll</HintPath>
Expand Down Expand Up @@ -85,8 +86,8 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="SharpDX, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions test/DynamoCoreWpfTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
</packages>
9 changes: 5 additions & 4 deletions test/Libraries/PackageManagerTests/PackageManagerTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Greg, Version=1.1.7040.19960, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\src\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\..\src\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
Expand All @@ -49,11 +49,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\extern\NUnit\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=106.12.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\..\..\src\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions test/Libraries/PackageManagerTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Greg" version="1.1.7040.19960" targetFramework="net47" />
<package id="Greg" version="2.2.0.1080" targetFramework="net47" />
<package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
<package id="RestSharp" version="106.12.0" targetFramework="net47" />
</packages>
3 changes: 0 additions & 3 deletions test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
Expand Down
1 change: 0 additions & 1 deletion test/ViewExtensionLibraryTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
<package id="CefSharp.Wpf" version="65.0.1" targetFramework="net452" />
<package id="Moq" version="4.2.1507.118" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="RestSharp" version="105.2.3" targetFramework="net47" />
</packages>
6 changes: 3 additions & 3 deletions tools/CBNLanguageComparisonTests/CBNLanguageComparisonTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>$(DynamoPath)\GraphToDSCompiler.dll</HintPath>
</Reference>
<Reference Include="Greg, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\extern\greg\Greg.dll</HintPath>
<Reference Include="Greg, Version=2.2.0.1080, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Practices.Prism, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down