Skip to content

Commit 430d8ca

Browse files
xiaodongliangxiaodongliang
committed
updated with new test
1 parent 08e91f2 commit 430d8ca

8 files changed

+55
-96
lines changed

‎AutoCADIOUtil.sln

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2012
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoCADIOUtil", "AutoCADIOUtil\AutoCADIOUtil.csproj", "{4AE38BB1-13A3-451F-9A3B-522A6375613F}"
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoCADIOUtil", "AutoCADIOUtil\AutoCADIOUtil.csproj", "{E97747E1-F96C-496F-BE5C-E77B5434B1F7}"
55
EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution
88
Debug|Any CPU = Debug|Any CPU
9+
Debug|Win32 = Debug|Win32
10+
Debug|x64 = Debug|x64
911
Release|Any CPU = Release|Any CPU
12+
Release|Win32 = Release|Win32
13+
Release|x64 = Release|x64
1014
EndGlobalSection
1115
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12-
{4AE38BB1-13A3-451F-9A3B-522A6375613F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13-
{4AE38BB1-13A3-451F-9A3B-522A6375613F}.Debug|Any CPU.Build.0 = Debug|Any CPU
14-
{4AE38BB1-13A3-451F-9A3B-522A6375613F}.Release|Any CPU.ActiveCfg = Release|Any CPU
15-
{4AE38BB1-13A3-451F-9A3B-522A6375613F}.Release|Any CPU.Build.0 = Release|Any CPU
16+
{E97747E1-F96C-496F-BE5C-E77B5434B1F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{E97747E1-F96C-496F-BE5C-E77B5434B1F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{E97747E1-F96C-496F-BE5C-E77B5434B1F7}.Debug|Win32.ActiveCfg = Debug|Any CPU
19+
{E97747E1-F96C-496F-BE5C-E77B5434B1F7}.Debug|x64.ActiveCfg = Debug|Any CPU
20+
{E97747E1-F96C-496F-BE5C-E77B5434B1F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
21+
{E97747E1-F96C-496F-BE5C-E77B5434B1F7}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{E97747E1-F96C-496F-BE5C-E77B5434B1F7}.Release|Win32.ActiveCfg = Release|Any CPU
23+
{E97747E1-F96C-496F-BE5C-E77B5434B1F7}.Release|x64.ActiveCfg = Release|Any CPU
1624
EndGlobalSection
1725
GlobalSection(SolutionProperties) = preSolution
1826
HideSolutionNode = FALSE

‎AutoCADIOUtil/AIO.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was generated by a tool.
4-
// Runtime Version:4.0.30319.34209
4+
// Runtime Version:4.0.30319.42000
55
//
66
// Changes to this file may cause incorrect behavior and will be lost if
77
// the code is regenerated.
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11-
// Generation date: 20-10-2015 02:04:10
11+
// Generation date: 2016/6/8 8:16:32
1212
namespace AIO.ACES.Models
1313
{
1414
/// <summary>

‎AutoCADIOUtil/AutoCADIOUtil.csproj

+22-79
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{4AE38BB1-13A3-451F-9A3B-522A6375613F}</ProjectGuid>
7+
<ProjectGuid>{E97747E1-F96C-496F-BE5C-E77B5434B1F7}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Autodesk</RootNamespace>
10+
<RootNamespace>AutoCADIOUtil</RootNamespace>
1111
<AssemblyName>AutoCADIOUtil</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
@@ -20,7 +20,6 @@
2020
<DefineConstants>DEBUG;TRACE</DefineConstants>
2121
<ErrorReport>prompt</ErrorReport>
2222
<WarningLevel>4</WarningLevel>
23-
<DocumentationFile>bin\Debug\AutoCADIOUtil.XML</DocumentationFile>
2423
</PropertyGroup>
2524
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2625
<DebugType>pdbonly</DebugType>
@@ -32,81 +31,33 @@
3231
</PropertyGroup>
3332
<ItemGroup>
3433
<Reference Include="AWSSDK">
35-
<HintPath>..\packages\AWSSDK.2.3.52.0\lib\net45\AWSSDK.dll</HintPath>
34+
<HintPath>..\packages\AWSSDK.2.3.55.0\lib\net45\AWSSDK.dll</HintPath>
3635
</Reference>
37-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
36+
<Reference Include="Microsoft.OData.Client">
37+
<HintPath>..\packages\Microsoft.OData.Client.6.15.0\lib\net40\Microsoft.OData.Client.dll</HintPath>
3938
</Reference>
40-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
39+
<Reference Include="Microsoft.OData.Core">
40+
<HintPath>..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll</HintPath>
4241
</Reference>
43-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
42+
<Reference Include="Microsoft.OData.Edm">
43+
<HintPath>..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll</HintPath>
4544
</Reference>
46-
<Reference Include="Microsoft.OData.Client, Version=6.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Microsoft.OData.Client.6.13.0\lib\net40\Microsoft.OData.Client.dll</HintPath>
48-
<Private>True</Private>
45+
<Reference Include="Microsoft.Spatial">
46+
<HintPath>..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll</HintPath>
4947
</Reference>
50-
<Reference Include="Microsoft.OData.Core, Version=6.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Microsoft.OData.Core.6.13.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Core.dll</HintPath>
52-
<Private>True</Private>
48+
<Reference Include="Newtonsoft.Json">
49+
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
5350
</Reference>
54-
<Reference Include="Microsoft.OData.Edm, Version=6.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Microsoft.OData.Edm.6.13.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Edm.dll</HintPath>
56-
<Private>True</Private>
57-
</Reference>
58-
<Reference Include="Microsoft.Spatial, Version=6.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Microsoft.Spatial.6.13.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.Spatial.dll</HintPath>
60-
<Private>True</Private>
61-
</Reference>
62-
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
66-
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
68-
<Private>True</Private>
69-
</Reference>
70-
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71-
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
72-
<Private>True</Private>
73-
</Reference>
74-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
7551
<Reference Include="RestSharp">
7652
<HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
7753
</Reference>
78-
<Reference Include="Simple.OData.Client.Core, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
79-
<HintPath>..\packages\Simple.OData.V4.Client.4.11.0\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.Core.dll</HintPath>
80-
<Private>True</Private>
81-
</Reference>
82-
<Reference Include="Simple.OData.Client.Dynamic, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
83-
<HintPath>..\packages\Simple.OData.V4.Client.4.11.0\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.Dynamic.dll</HintPath>
84-
<Private>True</Private>
85-
</Reference>
86-
<Reference Include="Simple.OData.Client.V4.Adapter, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Simple.OData.V4.Client.4.11.0\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.V4.Adapter.dll</HintPath>
88-
<Private>True</Private>
89-
</Reference>
9054
<Reference Include="System" />
9155
<Reference Include="System.Core" />
56+
<Reference Include="System.Data.Services" />
57+
<Reference Include="System.Data.Services.Client" />
9258
<Reference Include="System.IO.Compression" />
9359
<Reference Include="System.IO.Compression.FileSystem" />
94-
<Reference Include="System.Net" />
9560
<Reference Include="System.Net.Http" />
96-
<Reference Include="System.Net.Http.Extensions, Version=2.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
97-
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
98-
<Private>True</Private>
99-
</Reference>
100-
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
101-
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
102-
<Private>True</Private>
103-
</Reference>
104-
<Reference Include="System.Net.Http.WebRequest" />
105-
<Reference Include="System.Runtime.Serialization" />
106-
<Reference Include="System.ServiceModel" />
107-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108-
<HintPath>..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
109-
</Reference>
11061
<Reference Include="System.Xml.Linq" />
11162
<Reference Include="System.Data.DataSetExtensions" />
11263
<Reference Include="Microsoft.CSharp" />
@@ -124,30 +75,22 @@
12475
<Compile Include="Properties\AssemblyInfo.cs" />
12576
</ItemGroup>
12677
<ItemGroup>
127-
<WCFMetadata Include="Service References\" />
78+
<None Include="AIO.ttinclude" />
79+
<None Include="packages.config" />
12880
</ItemGroup>
12981
<ItemGroup>
130-
<None Include="AIO.tt">
82+
<Content Include="AIO.tt">
13183
<Generator>TextTemplatingFileGenerator</Generator>
13284
<LastGenOutput>AIO.cs</LastGenOutput>
133-
</None>
134-
<None Include="AIO.ttinclude" />
135-
<None Include="app.config" />
136-
<None Include="packages.config">
137-
<SubType>Designer</SubType>
138-
</None>
85+
</Content>
13986
</ItemGroup>
14087
<ItemGroup>
14188
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
14289
</ItemGroup>
90+
<ItemGroup>
91+
<WCFMetadata Include="Service References\" />
92+
</ItemGroup>
14393
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
144-
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
145-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
146-
<PropertyGroup>
147-
<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>
148-
</PropertyGroup>
149-
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
150-
</Target>
15194
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
15295
Other similar extension points exist, see Microsoft.Common.targets.
15396
<Target Name="BeforeBuild">

‎AutoCADIOUtil/AutoCADIOUtil.csproj.user

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<ProjectView>ShowAllFiles</ProjectView>
5+
</PropertyGroup>
6+
</Project>

‎AutoCADIOUtil/GeneralUtilities.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
fendusing System;
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Text;
@@ -164,7 +164,8 @@ public static String UploadDrawingToS3(String dwgFilePath)
164164

165165
String keyName = System.IO.Path.GetFileName(dwgFilePath);
166166

167-
using (Amazon.S3.IAmazonS3 client = new Amazon.S3.AmazonS3Client(Amazon.RegionEndpoint.APSoutheast1))
167+
//be sure to connect to the endpoint which is the same region of your bucket!
168+
using (Amazon.S3.IAmazonS3 client = new Amazon.S3.AmazonS3Client(Amazon.RegionEndpoint.USWest2))
168169
{
169170
Amazon.S3.Model.PutObjectRequest putRequest1 = new Amazon.S3.Model.PutObjectRequest
170171
{

‎AutoCADIOUtil/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Microsoft")]
1212
[assembly: AssemblyProduct("AutoCADIOUtil")]
13-
[assembly: AssemblyCopyright("Copyright © Microsoft 2014")]
13+
[assembly: AssemblyCopyright("Copyright © Microsoft 2016")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -20,7 +20,7 @@
2020
[assembly: ComVisible(false)]
2121

2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("fd335145-f98d-4f64-b1d0-dbfd23a1a5b5")]
23+
[assembly: Guid("750c316e-bc46-42ee-881a-95165b9cd831")]
2424

2525
// Version information for an assembly consists of the following four values:
2626
//

‎AutoCADIOUtil/packages.config

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AWSSDK" version="2.3.5.0" targetFramework="net45" />
4-
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
5-
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
6-
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
7-
<package id="RestSharp" version="105.0.0" targetFramework="net45" />
8-
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
3+
<package id="AWSSDK" version="2.3.55.0" targetFramework="net45" />
4+
<package id="Microsoft.OData.Client" version="6.15.0" targetFramework="net45" />
5+
<package id="Microsoft.OData.Core" version="6.15.0" targetFramework="net45" />
6+
<package id="Microsoft.OData.Edm" version="6.15.0" targetFramework="net45" />
7+
<package id="Microsoft.Spatial" version="6.15.0" targetFramework="net45" />
8+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
9+
<package id="RestSharp" version="105.2.3" targetFramework="net45" />
910
</packages>

‎readme/AWS-region.png

117 KB
Loading

0 commit comments

Comments
 (0)