Skip to content

Commit

Permalink
use Unity 2018.1.6f1
Browse files Browse the repository at this point in the history
  • Loading branch information
neuecc committed Jul 9, 2018
1 parent aa3b6d3 commit 7fc39cb
Show file tree
Hide file tree
Showing 14 changed files with 2,011 additions and 726 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,4 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
Assets/WSATestCertificate.pfx
.vs/
580 changes: 294 additions & 286 deletions Assembly-CSharp-firstpass-vs.csproj

Large diffs are not rendered by default.

1,142 changes: 854 additions & 288 deletions Assembly-CSharp-firstpass.csproj

Large diffs are not rendered by default.

144 changes: 77 additions & 67 deletions Assembly-CSharp-vs.csproj
Original file line number Diff line number Diff line change
@@ -1,82 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C46B99A5-0F0F-2FEE-50C8-DAE79AA3F247}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
<AssemblyName>Assembly-CSharp</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseDirectory>Assets</BaseDirectory>
<LangVersion>7</LangVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C46B99A5-0F0F-2FEE-50C8-DAE79AA3F247}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
<AssemblyName>Assembly-CSharp</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseDirectory>Assets</BaseDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;CSHARP_7_OR_LATER;CSHARP_7_2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Temp\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Temp\bin\Release\</OutputPath>
<DefineConstants>TRACE;CSHARP_7_OR_LATER;CSHARP_7_2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System" />
<Reference Include="System.XML" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>D:/UnityDir/5.0.0f4/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>D:/UnityDir/5.0.0f4/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEngine">
<HintPath>D:/UnityDir/5.0.0f4/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>D:/UnityDir/5.0.0f4/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\ObjectTest\AsyncTestScene.cs" />
<Compile Include="Assets\ObjectTest\Clicker.cs" />
<Compile Include="Assets\ObjectTest\CountOnly.cs" />
<Compile Include="Assets\ObjectTest\DispatcherCullingTest.cs" />
<Compile Include="Assets\ObjectTest\EditorBehaviourTest.cs" />
<Compile Include="Assets\ObjectTest\GameObjectDisplacer.cs" />
<Compile Include="Assets\ObjectTest\IntervalTest.cs" />
<Compile Include="Assets\ObjectTest\LoadLevelTest.cs" />
<Compile Include="Assets\ObjectTest\MyStateMachine.cs" />
<Compile Include="Assets\ObjectTest\PostBuildProcessor.cs" />
<Compile Include="Assets\ObjectTest\RotateGameObject.cs" />
<Compile Include="Assets\ObjectTest\Sandbox2.cs" />
<Compile Include="Assets\ObjectTest\SimpleMultiline.cs" />
<Compile Include="Assets\ObjectTest\UniRxTestSandbox.cs" />
<Compile Include="Assets\ObjectTest\WorkerThreadTest.cs" />
<Compile Include="Assets\ObjectTest\YieldTest.cs" />
<Compile Include="Assets\UnitTests\SceneItems\Result.cs" />
<Compile Include="Assets\UnitTests\SceneItems\UnitTestScene.cs" />
<Compile Include="Assets\UnitTests\Tools\ChainingAssertion.Unity.cs" />
<Compile Include="Assets\UnitTests\Tools\Container.cs" />
<Compile Include="Assets\UnitTests\Tools\Shim.cs" />
<Compile Include="Assets\UnitTests\Tools\TestUtil.cs" />
<Compile Include="Assets\UnitTests\UnitTests.cs" />
<None Include="Assets\Plugins\UniRx\ReadMe.txt" />
<Reference Include="UnityEngine.UI">
<HintPath>D:/UnityDir/5.0.0f4/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Compile Include="Assets\ObjectTest\AsyncTestScene.cs" />
<Compile Include="Assets\ObjectTest\Clicker.cs" />
<Compile Include="Assets\ObjectTest\CountOnly.cs" />
<Compile Include="Assets\ObjectTest\DispatcherCullingTest.cs" />
<Compile Include="Assets\ObjectTest\EditorBehaviourTest.cs" />
<Compile Include="Assets\ObjectTest\GameObjectDisplacer.cs" />
<Compile Include="Assets\ObjectTest\IntervalTest.cs" />
<Compile Include="Assets\ObjectTest\LoadLevelTest.cs" />
<Compile Include="Assets\ObjectTest\MyStateMachine.cs" />
<Compile Include="Assets\ObjectTest\PostBuildProcessor.cs" />
<Compile Include="Assets\ObjectTest\RotateGameObject.cs" />
<Compile Include="Assets\ObjectTest\Sandbox2.cs" />
<Compile Include="Assets\ObjectTest\SimpleMultiline.cs" />
<Compile Include="Assets\ObjectTest\UniRxTestSandbox.cs" />
<Compile Include="Assets\ObjectTest\WorkerThreadTest.cs" />
<Compile Include="Assets\ObjectTest\YieldTest.cs" />
<Compile Include="Assets\UnitTests\SceneItems\Result.cs" />
<Compile Include="Assets\UnitTests\SceneItems\UnitTestScene.cs" />
<Compile Include="Assets\UnitTests\Tools\ChainingAssertion.Unity.cs" />
<Compile Include="Assets\UnitTests\Tools\Container.cs" />
<Compile Include="Assets\UnitTests\Tools\Shim.cs" />
<Compile Include="Assets\UnitTests\Tools\TestUtil.cs" />
<Compile Include="Assets\UnitTests\UnitTests.cs" />
<None Include="Assets\Plugins\UniRx\ReadMe.txt" />
<Reference Include="UnityEngine.UI">
<HintPath>D:/UnityDir/5.0.0f4/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass-vs.csproj">
<Project>{FC6D064E-28ED-A578-0D72-8E424343BF9A}</Project> <Name>Assembly-CSharp-firstpass-vs</Name> </ProjectReference>
<Project>{FC6D064E-28ED-A578-0D72-8E424343BF9A}</Project>
<Name>Assembly-CSharp-firstpass-vs</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand All @@ -86,5 +91,10 @@
<Target Name="AfterBuild">
</Target>
-->

</Project>
<PropertyGroup>
<IncrementalCompiler>true</IncrementalCompiler>
<CscToolPath>C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\[email protected]\.bin</CscToolPath>
<DocumentationFile>6541</DocumentationFile>
<UseCommonOutputDirectory>true</UseCommonOutputDirectory>
</PropertyGroup>
</Project>
Loading

0 comments on commit 7fc39cb

Please sign in to comment.