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

Commit 7f3e060

Browse files
committed
more fix for UWP
1 parent aa6186d commit 7f3e060

16 files changed

+4578
-1890
lines changed

Assembly-CSharp-firstpass.Player.csproj

Lines changed: 366 additions & 516 deletions
Large diffs are not rendered by default.

Assembly-CSharp-firstpass.csproj

Lines changed: 158 additions & 158 deletions
Large diffs are not rendered by default.

Assembly-CSharp.Player.csproj

Lines changed: 368 additions & 273 deletions
Large diffs are not rendered by default.

Assembly-CSharp.csproj

Lines changed: 158 additions & 158 deletions
Large diffs are not rendered by default.

Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.Jobs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if UNITY_2018_1_OR_NEWER && (NET_4_6 || NET_STANDARD_2_0 || CSHARP_7_OR_LATER)
1+
#if UNITY_2018_1_OR_NEWER && (NET_4_6 || NET_STANDARD_2_0 || CSHARP_7_OR_LATER) && !UNITY_WSA
22
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
33

44
using System;

Assets/Scripts/Tests/_AsyncTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
#endif
1919
using UnityEngine.Networking;
2020
using UnityEngine.Experimental.LowLevel;
21+
#if !UNITY_WSA
2122
using Unity.Jobs;
23+
#endif
2224
using Unity.Collections;
2325
using System.Threading;
2426

Assets/Scripts/Tests/_ManualyTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using System.Text;
1111
using UnityEngine.UI;
1212
using UnityEngine.Scripting;
13-
using Unity.Jobs;
1413
using System.Threading;
1514
using Unity.Collections;
1615

NewAssembly.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@
707707
<PropertyGroup>
708708
<IncrementalCompiler>true</IncrementalCompiler>
709709
<CscToolPath>C:\Users\neuecc\AppData\Local\Unity\cache\packages\packages.unity.com\[email protected]\.bin</CscToolPath>
710-
<DocumentationFile>8779</DocumentationFile>
710+
<DocumentationFile>2394</DocumentationFile>
711711
<UseCommonOutputDirectory>true</UseCommonOutputDirectory>
712712
</PropertyGroup>
713713
</Project>

ProjectSettings/ProjectSettings.asset

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ PlayerSettings:
5252
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
5353
iosShowActivityIndicatorOnLoading: -1
5454
androidShowActivityIndicatorOnLoading: -1
55-
tizenShowActivityIndicatorOnLoading: -1
5655
iosAppInBackgroundBehavior: 0
5756
displayResolutionDialog: 1
5857
iosAllowHTTPDownload: 1
@@ -111,6 +110,8 @@ PlayerSettings:
111110
videoMemoryForVertexBuffers: 0
112111
psp2PowerMode: 0
113112
psp2AcquireBGM: 1
113+
vulkanEnableSetSRGBWrite: 0
114+
vulkanUseSWCommandBuffers: 0
114115
m_SupportedAspectRatios:
115116
4:3: 1
116117
5:4: 1
@@ -138,10 +139,10 @@ PlayerSettings:
138139
hololens:
139140
depthFormat: 1
140141
depthBufferSharingEnabled: 0
141-
enable360StereoCapture: 0
142142
oculus:
143143
sharedDepthBuffer: 0
144144
dashSupport: 0
145+
enable360StereoCapture: 0
145146
protectGraphicsMemory: 0
146147
useHDRDisplay: 0
147148
m_ColorGamuts: 00000000
@@ -239,6 +240,7 @@ PlayerSettings:
239240
appleEnableAutomaticSigning: 0
240241
iOSRequireARKit: 0
241242
appleEnableProMotion: 0
243+
vulkanEditorSupport: 0
242244
clonedFromGUID: 00000000000000000000000000000000
243245
templatePackageId:
244246
templateDefaultScene:
@@ -247,6 +249,7 @@ PlayerSettings:
247249
androidSplashScreen: {fileID: 0}
248250
AndroidKeystoreName:
249251
AndroidKeyaliasName:
252+
AndroidBuildApkPerCpuArchitecture: 0
250253
AndroidTVCompatibility: 1
251254
AndroidIsGame: 1
252255
AndroidEnableTango: 0
@@ -339,6 +342,7 @@ PlayerSettings:
339342
m_EncodingQuality: 1
340343
- m_BuildTarget: PS4
341344
m_EncodingQuality: 1
345+
m_BuildTargetGroupLightmapSettings: []
342346
playModeTestRunnerEnabled: 0
343347
runPlayModeTestAsEditModeTest: 0
344348
actionOnDotNetUnhandledException: 1
@@ -462,6 +466,8 @@ PlayerSettings:
462466
switchDataLossConfirmation: 0
463467
switchSupportedNpadStyles: 3
464468
switchNativeFsCacheSize: 32
469+
switchIsHoldTypeHorizontal: 0
470+
switchSupportedNpadCount: 8
465471
switchSocketConfigEnabled: 0
466472
switchTcpInitialSendBufferSize: 32
467473
switchTcpInitialReceiveBufferSize: 64
@@ -609,7 +615,7 @@ PlayerSettings:
609615
iOS: 0
610616
scriptingBackend:
611617
Android: 0
612-
Metro: 1
618+
Metro: 2
613619
Standalone: 0
614620
WP8: 2
615621
WebGL: 1
@@ -620,7 +626,7 @@ PlayerSettings:
620626
additionalIl2CppArgs:
621627
scriptingRuntimeVersion: 1
622628
apiCompatibilityLevelPerPlatform:
623-
Standalone: 6
629+
Standalone: 3
624630
m_RenderingPath: 1
625631
m_MobileRenderingPath: 1
626632
metroPackageName: UnityRx
@@ -633,7 +639,6 @@ PlayerSettings:
633639
metroApplicationDescription: UnityRx
634640
wsaImages: {}
635641
metroTileShortName:
636-
metroCommandLineArgsFile:
637642
metroTileShowName: 1
638643
metroMediumTileShowName: 0
639644
metroLargeTileShowName: 0
@@ -648,14 +653,6 @@ PlayerSettings:
648653
metroFTAFileTypes: []
649654
metroProtocolName:
650655
metroCompilationOverrides: 1
651-
tizenProductDescription:
652-
tizenProductURL:
653-
tizenSigningProfileName:
654-
tizenGPSPermissions: 0
655-
tizenMicrophonePermissions: 0
656-
tizenDeploymentTarget:
657-
tizenDeploymentTargetType: -1
658-
tizenMinOSVersion: 1
659656
n3dsUseExtSaveData: 0
660657
n3dsCompressStaticMem: 1
661658
n3dsExtSaveDataNumber: 0x12345
@@ -676,6 +673,7 @@ PlayerSettings:
676673
XboxOneGameOsOverridePath:
677674
XboxOnePackagingOverridePath:
678675
XboxOneAppManifestOverridePath:
676+
XboxOneVersion: 1.0.0.0
679677
XboxOnePackageEncryption: 0
680678
XboxOnePackageUpdateGranularity: 2
681679
XboxOneDescription:

ProjectSettings/UnityConnectSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
--- !u!310 &1
44
UnityConnectSettings:
55
m_ObjectHideFlags: 0
6-
m_Enabled: 0
6+
m_Enabled: 1
77
m_TestMode: 0
88
m_TestEventUrl:
99
m_TestConfigUrl:
1010
m_TestInitMode: 0
1111
CrashReportingSettings:
1212
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
13+
m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
1314
m_Enabled: 0
1415
m_CaptureEditorExceptions: 1
1516
UnityPurchasingSettings:
@@ -25,7 +26,6 @@ UnityConnectSettings:
2526
m_Enabled: 0
2627
m_InitializeOnStartup: 1
2728
m_TestMode: 0
28-
m_EnabledPlatforms: 4294967295
2929
m_IosGameId:
3030
m_AndroidGameId:
3131
m_GameIds: {}

0 commit comments

Comments
 (0)