Skip to content

Commit 0d057fe

Browse files
authored
Update projects to use the latest version of 0.64 (#136)
* Update tests to latest 0.64 * Update SDK compilation to latest 0.64 * Update projects to use the latest version of 0.64
1 parent 5430d21 commit 0d057fe

File tree

10 files changed

+31622
-10494
lines changed

10 files changed

+31622
-10494
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pool:
1414
# NOTE: The major/minor versions correspond to the React Native version we target/have tested against
1515
variables:
1616
product_major_version: 0
17-
product_minor_version: 63
17+
product_minor_version: 64
1818
product_build: $[format('{0:yyyyMMdd}', pipeline.startTime)]
1919
product_build_qfe: $[counter(format('{0}.{1}.{2}', variables['product_major_version'], variables['product_minor_version'], variables['product_build']), 1)]
2020

samples/RNWinRTTestApp/package-lock.json

Lines changed: 18033 additions & 1418 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/RNWinRTTestApp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"dependencies": {
1212
"react": "17.0.1",
13-
"react-native": "0.64.0-rc.3",
14-
"react-native-windows": "0.64.0-preview.14"
13+
"react-native": "0.64.3",
14+
"react-native-windows": "0.64.27"
1515
},
1616
"devDependencies": {
1717
"@babel/core": "^7.8.4",

samples/RNWinRTTestApp/yarn.lock

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

sdk/react/package-lock.json

Lines changed: 2831 additions & 776 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/react/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"dependencies": {
66
"react": "17.0.1",
7-
"react-native": "0.64.0-rc.3",
8-
"react-native-windows": "0.64.0-preview.14"
7+
"react-native": "0.64.3",
8+
"react-native-windows": "0.64.27"
99
}
1010
}

tests/RnWinRTTests/TestCommon.js

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation.
1+
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33

44
/**
@@ -46,23 +46,30 @@ function checkEquals(lhs, rhs) {
4646
}
4747
}
4848
} else if (typeof(lhs) === 'object') {
49+
var props = new Set();
50+
var lhsProps = new Set(); // For removal, to validate equality
4951
for (var prop in lhs) {
50-
if (!rhs.hasOwnProperty(prop)) {
51-
return {
52-
success: false,
53-
msg: 'Object does not have property \'' + prop + '\''
54-
};
55-
}
52+
props.add(prop);
53+
lhsProps.add(prop);
5654
}
5755

5856
for (var prop in rhs) {
59-
if (!lhs.hasOwnProperty(prop)) {
57+
if (!lhsProps.delete(prop)) {
6058
return {
6159
success: false,
6260
msg: 'Object does not have property \'' + prop + '\''
6361
};
6462
}
63+
}
64+
65+
if (lhsProps.size != 0) {
66+
return {
67+
success: false,
68+
msg: 'Object does not have property \'' + lhsProps.values().next().value + '\''
69+
};
70+
}
6571

72+
for (var prop of props) {
6673
var result = checkEquals(lhs[prop], rhs[prop]);
6774
if (!result.success) return result;
6875
}
@@ -309,16 +316,16 @@ export const TestValues = {
309316
propertyValues: {
310317
valid: [true, 12723, "hello", { x: 12, y: 23 }, { width: 10, height: 20 }, { x: 12, y: 23, width: 10, height: 20 },
311318
[true, false], [21, 23, 43], ["sasa", "sa"], [{ x: 12, y: 23 }, {x: 24, y: 34}], [{width: 10, height: 20}],
312-
[{ x: 12, y: 23, width: 10, height: 20 }, { x: 12, y: 23, width: 10, height: 20 }], [new TestComponent.TestObject(1)]
319+
[{ x: 12, y: 23, width: 10, height: 20 }, { x: 12, y: 23, width: 10, height: 20 }], [new TestComponent.TestObject(1)]
313320
],
314321
validValueTypePairs: [
315-
[8, "UInt8"], [8, "Int16"], [8, "UInt16"], [8, "Int32"], [8, "UInt32"], [8, "Int64"], [8, "UInt64"], [8, "Single"], [8, "Double"],
322+
[8, "UInt8"], [8, "Int16"], [8, "UInt16"], [8, "Int32"], [8, "UInt32"], [8, "Int64"], [8, "UInt64"], [8, "Single"], [8, "Double"],
316323
["a", "Char16"], [true, "Boolean"], ["Hello", "String"], [new Date(2020, 2, 3, 4, 5, 6, 7), "DateTime"], [223213, "TimeSpan"],
317324
[{x: 10, y: 20}, "Point"], [{width: 100, height: 200}, "Size"], [{x: 10, y: 20, width: 100, height: 200}, "Rect"],
318325
[[8, 9], "UInt8Array"], [[8, 9], "Int16Array"], [[8, 9], "UInt16Array"], [[8, 9], "Int32Array"], [[8, 9], "UInt32Array"], [[8, 9], "Int64Array"], [[8, 9], "UInt64Array"],
319326
[[8, 9], "SingleArray"], [[8, 9], "DoubleArray"], [["a", "b"], "Char16Array"], [[true, false], "BooleanArray"], [["Hello", "World"], "StringArray"],
320327
[[new Date(2020, 2, 3, 4, 5, 6, 7), new Date(2021, 2, 2, 1, 5, 6, 7)], "DateTimeArray"], [[81212, 932322], "TimeSpanArray"],
321-
[[{x: 10, y: 20}, {x: 10, y: 20}], "PointArray"], [[{width: 100, height: 200}, {width: 100, height: 200}], "SizeArray"],
328+
[[{x: 10, y: 20}, {x: 10, y: 20}], "PointArray"], [[{width: 100, height: 200}, {width: 100, height: 200}], "SizeArray"],
322329
[[{x: 10, y: 20, width: 100, height: 200}], "RectArray"],
323330
],
324331
invalid: [{}, ["hi", true], [{ width: 10, height: 20 }, { x: 12, y: 23, width: 10, height: 20 }]]

0 commit comments

Comments
 (0)