Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Update Version Dependency #24

Open
chuongmep wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Version Dependency #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion bucket.manager/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
7 changes: 4 additions & 3 deletions bucket.manager/Forge/Derivatives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,13 @@ public struct Resource
private static async Task<JObject> GetDerivativeAsync(string manifest, string accessToken)
{
// prepare to download the file
IRestClient client = new RestClient(BASE_URL);
RestRequest request = new RestRequest(DERIVATIVE_PATH + "{manifest}", Method.GET);
var client = new RestClient(BASE_URL);
RestRequest request = new RestRequest(DERIVATIVE_PATH + "{manifest}");
request.Method = Method.Get;
request.AddParameter("manifest", manifest, ParameterType.UrlSegment);
request.AddHeader("Authorization", "Bearer " + accessToken);
request.AddHeader("Accept-Encoding", "gzip, deflate");
IRestResponse response = await client.ExecuteTaskAsync(request);
var response = await client.ExecuteGetAsync(request);

JObject manifestJson = null;

Expand Down
7 changes: 4 additions & 3 deletions bucket.manager/Form1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,17 +411,18 @@ private async void btnDownloadSVF_Click(object sender, EventArgs e)
progressBar.Maximum = resourcesToDownload.Count;
progressBar.Step = 1;

IRestClient client = new RestClient("https://developer.api.autodesk.com/");
var client = new RestClient("https://developer.api.autodesk.com/");
foreach (ForgeUtils.Derivatives.Resource resource in resourcesToDownload)
{
progressBar.PerformStep();
progressBar.CustomText = "Downloading " + resource.FileName;

// prepare the GET to download the file
RestRequest request = new RestRequest(resource.RemotePath, Method.GET);
RestRequest request = new RestRequest(resource.RemotePath);
request.Method = Method.Get;
request.AddHeader("Authorization", "Bearer " + AccessToken);
request.AddHeader("Accept-Encoding", "gzip, deflate");
IRestResponse response = await client.ExecuteTaskAsync(request);
var response = await client.ExecuteGetAsync(request);

if (response.StatusCode != System.Net.HttpStatusCode.OK)
{
Expand Down
74 changes: 54 additions & 20 deletions bucket.manager/bucket.manager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\CefSharp.WinForms.81.3.100\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.81.3.100\build\CefSharp.WinForms.props')" />
<Import Project="packages\CefSharp.Common.81.3.100\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.81.3.100\build\CefSharp.Common.props')" />
<Import Project="packages\cef.redist.x86.81.3.10\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.81.3.10\build\cef.redist.x86.props')" />
<Import Project="packages\cef.redist.x64.81.3.10\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.81.3.10\build\cef.redist.x64.props')" />
<Import Project="packages\CefSharp.Common.118.6.80\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.118.6.80\build\CefSharp.Common.props')" />
<Import Project="packages\cef.redist.x86.118.6.8\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.118.6.8\build\cef.redist.x86.props')" />
<Import Project="packages\cef.redist.x64.118.6.8\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.118.6.8\build\cef.redist.x64.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -12,7 +11,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>bucket.manager</RootNamespace>
<AssemblyName>bucket.manager</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
Expand Down Expand Up @@ -79,21 +78,59 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Autodesk.Forge, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Autodesk.Forge.1.7.0\lib\net452\Autodesk.Forge.dll</HintPath>
<Reference Include="Autodesk.Forge, Version=1.9.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Autodesk.Forge.1.9.9\lib\net48\Autodesk.Forge.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="CefSharp, Version=118.6.80.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
<HintPath>packages\CefSharp.Common.118.6.80\lib\net462\CefSharp.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=106.3.1.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>packages\RestSharp.106.3.1\lib\net452\RestSharp.dll</HintPath>
<Reference Include="CefSharp.Core, Version=118.6.80.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
<HintPath>packages\CefSharp.Common.118.6.80\lib\net462\CefSharp.Core.dll</HintPath>
</Reference>
<Reference Include="CefSharp.WinForms, Version=118.6.80.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
<HintPath>packages\CefSharp.WinForms.118.6.80\lib\net462\CefSharp.WinForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=108.0.1.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>packages\RestSharp.108.0.1\lib\netstandard2.0\RestSharp.dll</HintPath>
</Reference>
<Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Text.Encodings.Web, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down Expand Up @@ -166,15 +203,12 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
<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\cef.redist.x64.81.3.10\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.81.3.10\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('packages\cef.redist.x86.81.3.10\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.81.3.10\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.81.3.100\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.81.3.100\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.81.3.100\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.81.3.100\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.81.3.100\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.81.3.100\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.81.3.100\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.81.3.100\build\CefSharp.WinForms.targets'))" />
<Error Condition="!Exists('packages\cef.redist.x64.118.6.8\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.118.6.8\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('packages\cef.redist.x86.118.6.8\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.118.6.8\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.118.6.80\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.118.6.80\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.118.6.80\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.118.6.80\build\CefSharp.Common.targets'))" />
</Target>
<Import Project="packages\CefSharp.Common.81.3.100\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.81.3.100\build\CefSharp.Common.targets')" />
<Import Project="packages\CefSharp.WinForms.81.3.100\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.81.3.100\build\CefSharp.WinForms.targets')" />
<Import Project="packages\CefSharp.Common.118.6.80\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.118.6.80\build\CefSharp.Common.targets')" />
</Project>
23 changes: 16 additions & 7 deletions bucket.manager/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autodesk.Forge" version="1.7.0" targetFramework="net46" />
<package id="cef.redist.x64" version="81.3.10" targetFramework="net46" />
<package id="cef.redist.x86" version="81.3.10" targetFramework="net46" />
<package id="CefSharp.Common" version="81.3.100" targetFramework="net46" />
<package id="CefSharp.WinForms" version="81.3.100" targetFramework="net46" />
<package id="Autodesk.Forge" version="1.9.9" targetFramework="net481" />
<package id="RestSharp" version="108.0.1" targetFramework="net481" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net481" />
<package id="System.Buffers" version="4.5.1" targetFramework="net481" />
<package id="System.Memory" version="4.5.4" targetFramework="net481" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net481" />
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net481" />
<package id="System.Text.Encodings.Web" version="5.0.0" targetFramework="net481" />
<package id="System.Text.Json" version="5.0.0" targetFramework="net481" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net481" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net481" />
<package id="cef.redist.x64" version="118.6.8" targetFramework="net481" />
<package id="cef.redist.x86" version="118.6.8" targetFramework="net481" />
<package id="CefSharp.Common" version="118.6.80" targetFramework="net481" />
<package id="CefSharp.WinForms" version="118.6.80" targetFramework="net481" />
<package id="jacobslusser.ScintillaNET" version="3.6.3" targetFramework="net452" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="RestSharp" version="106.3.1" targetFramework="net46" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net481" />
</packages>