x

Author: rsmoz

Foundation.xcodeproj/project.pbxproj

@@ -246,6 +246,7 @@
 		61E011821C1B599A000037DD /* CFMachPort.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B5D88D01BBC9AAC00234F36 /* CFMachPort.c */; };
 		CE19A88C1C23AA2300B4CB6A /* NSStringTestData.txt in Resources */ = {isa = PBXBuildFile; fileRef = CE19A88B1C23AA2300B4CB6A /* NSStringTestData.txt */; };
 		D834F9941C31C4060023812A /* TestNSOrderedSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = D834F9931C31C4060023812A /* TestNSOrderedSet.swift */; };
+		D3047AEC1C38BC3300295652 /* TestNSValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3047AEB1C38BC3300295652 /* TestNSValue.swift */; };
 		D31302011C30CEA900295652 /* NSConcreteValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D31302001C30CEA900295652 /* NSConcreteValue.swift */; };
 		D39A14011C2D6E0A00295652 /* NSKeyedUnarchiver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D39A14001C2D6E0A00295652 /* NSKeyedUnarchiver.swift */; };
 		D3BCEB9E1C2EDED800295652 /* NSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3BCEB9D1C2EDED800295652 /* NSLog.swift */; };
@@ -598,6 +599,7 @@
 		C93559281C12C49F009FD6A9 /* TestNSAffineTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSAffineTransform.swift; sourceTree = "<group>"; };
 		CE19A88B1C23AA2300B4CB6A /* NSStringTestData.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NSStringTestData.txt; sourceTree = "<group>"; };
 		D834F9931C31C4060023812A /* TestNSOrderedSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSOrderedSet.swift; sourceTree = "<group>"; };
+		D3047AEB1C38BC3300295652 /* TestNSValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSValue.swift; sourceTree = "<group>"; };
 		D31302001C30CEA900295652 /* NSConcreteValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSConcreteValue.swift; sourceTree = "<group>"; };
 		D39A14001C2D6E0A00295652 /* NSKeyedUnarchiver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSKeyedUnarchiver.swift; sourceTree = "<group>"; };
 		D3BCEB9D1C2EDED800295652 /* NSLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSLog.swift; sourceTree = "<group>"; };
@@ -1145,7 +1147,7 @@
 				C2A9D75B1C15C08B00993803 /* TestNSUUID.swift */,
 				5B6F17951C48631C00935030 /* TestNSXMLDocument.swift */,
 				5B40F9F11C125187000E72E3 /* TestNSXMLParser.swift */,
-				5B6F17961C48631C00935030 /* TestUtils.swift */,
+ types
 			);
 			name = Tests;
 			sourceTree = "<group>";
@@ -1861,6 +1863,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+<<<<<<< HEAD
 				5B6F178C1C4862F100935030 /* TestNSURLResponse.swift in Sources */,
 				5B6F17791C4862F100935030 /* TestNSNotificationCenter.swift in Sources */,
 				5B6F17971C48631C00935030 /* TestNSNull.swift in Sources */,
@@ -1904,6 +1907,51 @@
 				5B6F17721C4862F100935030 /* TestNSFileManager.swift in Sources */,
 				5B6F17891C4862F100935030 /* TestNSTimeZone.swift in Sources */,
 				5B6F178F1C4862F100935030 /* TestNSByteCountFormatter.swift in Sources */,
+=======
+				E19E17DC1C2225930023AF4D /* TestNSXMLDocument.swift in Sources */,
+				400E22651C1A4E58007C5933 /* TestNSProcessInfo.swift in Sources */,
+				525AECED1BF2C9C500D15BB0 /* TestNSFileManager.swift in Sources */,
+				5B915F0F1C1A320E00BE40C5 /* TestNSJSONSerialization.swift in Sources */,
+				EA66F6501BF1619600136161 /* TestNSNumber.swift in Sources */,
+				844DC3331C17584F005611F9 /* TestNSScanner.swift in Sources */,
+				8460AACC1C3307D800B01413 /* TestUtils.swift in Sources */,
+				E876A73E1C1180E000F279EC /* TestNSRange.swift in Sources */,
+				5E5835F41C20C9B500C81317 /* TestNSThread.swift in Sources */,
+				C2A9D75C1C15C08B00993803 /* TestNSUUID.swift in Sources */,
+				A5A34B561C18C85D00FD972B /* TestNSByteCountFormatter.swift in Sources */,
+				612952F91C1B235900BE0FD9 /* TestNSNull.swift in Sources */,
+				EA66F6521BF1619600136161 /* TestNSPropertyList.swift in Sources */,
+				4AE109271C17CCBF007367B5 /* TestNSIndexPath.swift in Sources */,
+				4DC1D0801C12EEEF00B5948A /* TestNSPipe.swift in Sources */,
+				84BA558E1C16F90900F48C54 /* TestNSTimeZone.swift in Sources */,
+				52829AD71C160D64003BC4EF /* TestNSCalendar.swift in Sources */,
+				45BBD92B1C30E9C200540DDB /* TestNSTask.swift in Sources */,
+				5EF673AC1C28B527006212A3 /* TestNSNotificationQueue.swift in Sources */,
+				C93559291C12C49F009FD6A9 /* TestNSAffineTransform.swift in Sources */,
+				D3047AEC1C38BC3300295652 /* TestNSValue.swift in Sources */,
+				DCDBB8331C1768AC00313299 /* TestNSData.swift in Sources */,
+				83712C8E1C1684900049AD49 /* TestNSURLRequest.swift in Sources */,
+				EA66F64E1BF1619600136161 /* TestNSIndexSet.swift in Sources */,
+				22B9C1E11C165D7A00DECFF9 /* TestNSDate.swift in Sources */,
+				848A30581C137B3500C83206 /* TestNSHTTPCookie.swift in Sources */,
+				D834F9941C31C4060023812A /* TestNSOrderedSet.swift in Sources */,
+				EA66F6541BF1619600136161 /* TestNSSet.swift in Sources */,
+				EA66F64A1BF1619600136161 /* TestNSArray.swift in Sources */,
+				5BC1D8BE1BF3B09E009D3973 /* TestNSCharacterSet.swift in Sources */,
+				EA66F6561BF1619600136161 /* TestNSString.swift in Sources */,
+				7A7D6FBB1C16439400957E2E /* TestNSURLResponse.swift in Sources */,
+				61F8AE7D1C180FC600FB62F0 /* TestNSNotificationCenter.swift in Sources */,
+				5B40F9F21C125187000E72E3 /* TestNSXMLParser.swift in Sources */,
+				61A395FA1C2484490029B337 /* TestNSLocale.swift in Sources */,
+				6E203B8D1C1303BB003B2576 /* TestNSBundle.swift in Sources */,
+				88D28DE71C13AE9000494606 /* TestNSGeometry.swift in Sources */,
+				EA66F64C1BF1619600136161 /* TestNSDictionary.swift in Sources */,
+				AA664D4F1C1B03CA00C22186 /* TestNSNumberFormatter.swift in Sources */,
+				EA66F6581BF1619600136161 /* TestNSURL.swift in Sources */,
+				61D6C9EF1C1DFE9500DEF583 /* TestNSTimer.swift in Sources */,
+				61E0117C1C1B554D000037DD /* TestNSRunLoop.swift in Sources */,
+				EA66F6441BF1619600136161 /* main.swift in Sources */,
+>>>>>>> 3ebeded... [SR-377] preliminary support for "special" encoding types
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};