Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

Commit

Permalink
more fix for UWP
Browse files Browse the repository at this point in the history
  • Loading branch information
neuecc committed Jul 21, 2018
1 parent aa6186d commit 7f3e060
Show file tree
Hide file tree
Showing 16 changed files with 4,578 additions and 1,890 deletions.
882 changes: 366 additions & 516 deletions Assembly-CSharp-firstpass.Player.csproj

Large diffs are not rendered by default.

316 changes: 158 additions & 158 deletions Assembly-CSharp-firstpass.csproj

Large diffs are not rendered by default.

641 changes: 368 additions & 273 deletions Assembly-CSharp.Player.csproj

Large diffs are not rendered by default.

316 changes: 158 additions & 158 deletions Assembly-CSharp.csproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if UNITY_2018_1_OR_NEWER && (NET_4_6 || NET_STANDARD_2_0 || CSHARP_7_OR_LATER)
#if UNITY_2018_1_OR_NEWER && (NET_4_6 || NET_STANDARD_2_0 || CSHARP_7_OR_LATER) && !UNITY_WSA
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member

using System;
Expand Down
2 changes: 2 additions & 0 deletions Assets/Scripts/Tests/_AsyncTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
#endif
using UnityEngine.Networking;
using UnityEngine.Experimental.LowLevel;
#if !UNITY_WSA
using Unity.Jobs;
#endif
using Unity.Collections;
using System.Threading;

Expand Down
1 change: 0 additions & 1 deletion Assets/Scripts/Tests/_ManualyTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using System.Text;
using UnityEngine.UI;
using UnityEngine.Scripting;
using Unity.Jobs;
using System.Threading;
using Unity.Collections;

Expand Down
2 changes: 1 addition & 1 deletion NewAssembly.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@
<PropertyGroup>
<IncrementalCompiler>true</IncrementalCompiler>
<CscToolPath>C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\com.unity.incrementalcompiler@0.0.42-preview.14\.bin</CscToolPath>
<DocumentationFile>8779</DocumentationFile>
<DocumentationFile>2394</DocumentationFile>
<UseCommonOutputDirectory>true</UseCommonOutputDirectory>
</PropertyGroup>
</Project>
24 changes: 11 additions & 13 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ PlayerSettings:
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
tizenShowActivityIndicatorOnLoading: -1
iosAppInBackgroundBehavior: 0
displayResolutionDialog: 1
iosAllowHTTPDownload: 1
Expand Down Expand Up @@ -111,6 +110,8 @@ PlayerSettings:
videoMemoryForVertexBuffers: 0
psp2PowerMode: 0
psp2AcquireBGM: 1
vulkanEnableSetSRGBWrite: 0
vulkanUseSWCommandBuffers: 0
m_SupportedAspectRatios:
4:3: 1
5:4: 1
Expand Down Expand Up @@ -138,10 +139,10 @@ PlayerSettings:
hololens:
depthFormat: 1
depthBufferSharingEnabled: 0
enable360StereoCapture: 0
oculus:
sharedDepthBuffer: 0
dashSupport: 0
enable360StereoCapture: 0
protectGraphicsMemory: 0
useHDRDisplay: 0
m_ColorGamuts: 00000000
Expand Down Expand Up @@ -239,6 +240,7 @@ PlayerSettings:
appleEnableAutomaticSigning: 0
iOSRequireARKit: 0
appleEnableProMotion: 0
vulkanEditorSupport: 0
clonedFromGUID: 00000000000000000000000000000000
templatePackageId:
templateDefaultScene:
Expand All @@ -247,6 +249,7 @@ PlayerSettings:
androidSplashScreen: {fileID: 0}
AndroidKeystoreName:
AndroidKeyaliasName:
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 1
AndroidIsGame: 1
AndroidEnableTango: 0
Expand Down Expand Up @@ -339,6 +342,7 @@ PlayerSettings:
m_EncodingQuality: 1
- m_BuildTarget: PS4
m_EncodingQuality: 1
m_BuildTargetGroupLightmapSettings: []
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1
Expand Down Expand Up @@ -462,6 +466,8 @@ PlayerSettings:
switchDataLossConfirmation: 0
switchSupportedNpadStyles: 3
switchNativeFsCacheSize: 32
switchIsHoldTypeHorizontal: 0
switchSupportedNpadCount: 8
switchSocketConfigEnabled: 0
switchTcpInitialSendBufferSize: 32
switchTcpInitialReceiveBufferSize: 64
Expand Down Expand Up @@ -609,7 +615,7 @@ PlayerSettings:
iOS: 0
scriptingBackend:
Android: 0
Metro: 1
Metro: 2
Standalone: 0
WP8: 2
WebGL: 1
Expand All @@ -620,7 +626,7 @@ PlayerSettings:
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
apiCompatibilityLevelPerPlatform:
Standalone: 6
Standalone: 3
m_RenderingPath: 1
m_MobileRenderingPath: 1
metroPackageName: UnityRx
Expand All @@ -633,7 +639,6 @@ PlayerSettings:
metroApplicationDescription: UnityRx
wsaImages: {}
metroTileShortName:
metroCommandLineArgsFile:
metroTileShowName: 1
metroMediumTileShowName: 0
metroLargeTileShowName: 0
Expand All @@ -648,14 +653,6 @@ PlayerSettings:
metroFTAFileTypes: []
metroProtocolName:
metroCompilationOverrides: 1
tizenProductDescription:
tizenProductURL:
tizenSigningProfileName:
tizenGPSPermissions: 0
tizenMicrophonePermissions: 0
tizenDeploymentTarget:
tizenDeploymentTargetType: -1
tizenMinOSVersion: 1
n3dsUseExtSaveData: 0
n3dsCompressStaticMem: 1
n3dsExtSaveDataNumber: 0x12345
Expand All @@ -676,6 +673,7 @@ PlayerSettings:
XboxOneGameOsOverridePath:
XboxOnePackagingOverridePath:
XboxOneAppManifestOverridePath:
XboxOneVersion: 1.0.0.0
XboxOnePackageEncryption: 0
XboxOnePackageUpdateGranularity: 2
XboxOneDescription:
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/UnityConnectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
--- !u!310 &1
UnityConnectSettings:
m_ObjectHideFlags: 0
m_Enabled: 0
m_Enabled: 1
m_TestMode: 0
m_TestEventUrl:
m_TestConfigUrl:
m_TestInitMode: 0
CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
m_Enabled: 0
m_CaptureEditorExceptions: 1
UnityPurchasingSettings:
Expand All @@ -25,7 +26,6 @@ UnityConnectSettings:
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
m_EnabledPlatforms: 4294967295
m_IosGameId:
m_AndroidGameId:
m_GameIds: {}
Expand Down
Loading

0 comments on commit 7f3e060

Please sign in to comment.