Skip to content

Commit 7cc7a03

Browse files
andyburkeandyburke
committed
Merge pull request andyburke#22 from MoreTorpedoes/master
Altered Project Structure / Updated Ionic.Zlib.dll / Added required source files to compilation / Updated .gitignore
2 parents 0b60ded + c67ebe2 commit 7cc7a03

11 files changed

Lines changed: 64 additions & 20 deletions

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
*.meta
1+
*.meta
2+
3+
# these will be generated in compilation
4+
bin
5+
.DS_Store

‎AssemblyInfo.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System.Reflection;
2+
using System.Runtime.InteropServices;
3+
using System.Runtime.Serialization;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("Unity.HTTP")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("")]
13+
[assembly: AssemblyCopyright("")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
// generated from : http://www.guidgenerator.com/online-guid-generator.aspx
24+
[assembly: Guid("080f69d5-28bf-4813-adb9-023785939711")]
25+
26+
// Version information for an assembly consists of the following four values:
27+
//
28+
// Major Version
29+
// Minor Version
30+
// Build Number
31+
// Revision
32+
//
33+
// You can specify all the values or you can default the Build and Revision Numbers
34+
// by using the '*' as shown below:
35+
// [assembly: AssemblyVersion("1.0.*")]
36+
[assembly: AssemblyVersion("0.0.0.0")]
37+
[assembly: AssemblyFileVersion("0.0.0.0")]

‎HTTP.csproj‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,42 +10,45 @@
1010
<RootNamespace>HTTP</RootNamespace>
1111
<AssemblyName>HTTP</AssemblyName>
1212
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13-
<ReleaseVersion>0.3</ReleaseVersion>
1413
</PropertyGroup>
1514
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
15+
<DebugSymbols>True</DebugSymbols>
1716
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug</OutputPath>
17+
<Optimize>False</Optimize>
18+
<OutputPath>bin\</OutputPath>
2019
<DefineConstants>DEBUG</DefineConstants>
2120
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<ConsolePause>false</ConsolePause>
21+
<WarningLevel>0</WarningLevel>
22+
<ConsolePause>False</ConsolePause>
2423
</PropertyGroup>
2524
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2625
<DebugType>none</DebugType>
27-
<Optimize>false</Optimize>
28-
<OutputPath>bin\Release</OutputPath>
26+
<Optimize>False</Optimize>
27+
<OutputPath>bin\</OutputPath>
2928
<ErrorReport>prompt</ErrorReport>
3029
<WarningLevel>4</WarningLevel>
31-
<ConsolePause>false</ConsolePause>
30+
<ConsolePause>False</ConsolePause>
3231
</PropertyGroup>
3332
<ItemGroup>
3433
<Reference Include="System" />
35-
<Reference Include="Ionic.Zlib, Version=1.9.1.5, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\..\..\..\Unity\DMU\Assets\DMU\DLL\Ionic.Zlib.dll</HintPath>
34+
<Reference Include="Ionic.Zlib">
35+
<HintPath>libs\Ionic.Zlib.dll</HintPath>
3836
</Reference>
39-
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEngine.dll</HintPath>
37+
<Reference Include="UnityEngine">
38+
<HintPath>..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEngine.dll</HintPath>
4239
</Reference>
4340
</ItemGroup>
4441
<ItemGroup>
4542
<Compile Include="AssemblyInfo.cs" />
46-
<Compile Include="Request.cs" />
47-
<Compile Include="Response.cs" />
48-
<Compile Include="DiskCache.cs" />
43+
<Compile Include="src\DiskCache.cs" />
44+
<Compile Include="src\CookieJar.cs" />
45+
<Compile Include="src\Request.cs" />
46+
<Compile Include="src\Response.cs" />
47+
<Compile Include="src\ResponseCallbackDispatcher.cs" />
48+
<Compile Include="libs\JSON.cs" />
4949
</ItemGroup>
5050
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
51+
<ItemGroup>
52+
<Folder Include="src\" />
53+
</ItemGroup>
5154
</Project>

‎external/Ionic.Zlib.dll‎

-96 KB
Binary file not shown.

‎libs/Ionic.Zlib.dll‎

100 KB
Binary file not shown.

external/JSON.cs renamed to libs/JSON.cs

File renamed without changes.

CookieJar.cs renamed to src/CookieJar.cs

File renamed without changes.

DiskCache.cs renamed to src/DiskCache.cs

File renamed without changes.

Request.cs renamed to src/Request.cs

File renamed without changes.

Response.cs renamed to src/Response.cs

File renamed without changes.

0 commit comments

Comments
 (0)