diff --git a/.gitattributes b/.gitattributes index 0381e43..5816625 100644 --- a/.gitattributes +++ b/.gitattributes @@ -35,6 +35,7 @@ *.tsx text eol=lf *.ps1 text eol=lf *.yml text eol=lf +*.patch text eol=lf .editorconfig text eol=lf .gitattributes text eol=lf package.json text eol=lf diff --git a/package.json b/package.json index a22d7e4..73bf476 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@fluentui-react-native/experimental-expander": "^0.6.1", - "@react-native-clipboard/clipboard": "^1.11.2", + "@react-native-clipboard/clipboard": "^1.13.2", "@react-native-community/checkbox": "^0.5.16", "@react-native-community/datetimepicker": "^7.6.0", "@react-native-community/masked-view": "^0.1.11", diff --git a/patches/@react-native-clipboard+clipboard+1.11.2.patch b/patches/@react-native-clipboard+clipboard+1.11.2.patch deleted file mode 100644 index 8a1bdf2..0000000 --- a/patches/@react-native-clipboard+clipboard+1.11.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/@react-native-clipboard/clipboard/windows/Clipboard/Clipboard.vcxproj b/node_modules/@react-native-clipboard/clipboard/windows/Clipboard/Clipboard.vcxproj -index 4904b68..4232000 100644 ---- a/node_modules/@react-native-clipboard/clipboard/windows/Clipboard/Clipboard.vcxproj -+++ b/node_modules/@react-native-clipboard/clipboard/windows/Clipboard/Clipboard.vcxproj -@@ -15,7 +15,7 @@ - Windows Store - 10.0 - 10.0.18362.0 -- 10.0.17134.0 -+ 10.0.17763.0 - - - diff --git a/patches/@react-native-community+checkbox+0.5.16.patch b/patches/@react-native-community+checkbox+0.5.16.patch new file mode 100644 index 0000000..513b46d --- /dev/null +++ b/patches/@react-native-community+checkbox+0.5.16.patch @@ -0,0 +1,25 @@ +diff --git a/node_modules/@react-native-community/checkbox/windows/CheckboxWindows/CheckboxWindows.vcxproj b/node_modules/@react-native-community/checkbox/windows/CheckboxWindows/CheckboxWindows.vcxproj +index 5047bf1..188ab9a 100644 +--- a/node_modules/@react-native-community/checkbox/windows/CheckboxWindows/CheckboxWindows.vcxproj ++++ b/node_modules/@react-native-community/checkbox/windows/CheckboxWindows/CheckboxWindows.vcxproj +@@ -14,13 +14,16 @@ + true + Windows Store + 10.0 +- 10.0.18362.0 +- 10.0.17763.0 + +- + +- $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 + ++ + + + Debug \ No newline at end of file diff --git a/patches/@react-native-community+datetimepicker+7.6.0.patch b/patches/@react-native-community+datetimepicker+7.6.0.patch new file mode 100644 index 0000000..ed3f067 --- /dev/null +++ b/patches/@react-native-community+datetimepicker+7.6.0.patch @@ -0,0 +1,53 @@ +diff --git a/node_modules/@react-native-community/datetimepicker/windows/DateTimePickerWindows/DateTimePickerWindows.vcxproj b/node_modules/@react-native-community/datetimepicker/windows/DateTimePickerWindows/DateTimePickerWindows.vcxproj +index f8be8a4..3aaf05d 100644 +--- a/node_modules/@react-native-community/datetimepicker/windows/DateTimePickerWindows/DateTimePickerWindows.vcxproj ++++ b/node_modules/@react-native-community/datetimepicker/windows/DateTimePickerWindows/DateTimePickerWindows.vcxproj +@@ -15,13 +15,16 @@ + true + Windows Store + 10.0 +- 10.0.18362.0 +- 10.0.17763.0 + +- + +- $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 + ++ + + + Debug +@@ -58,7 +61,7 @@ + + + DynamicLibrary +- v142 ++ v143 + Unicode + false + +@@ -75,8 +78,7 @@ + + + +- +- ++ + + + +@@ -169,7 +171,7 @@ + + + +- ++ + {f7d32bd0-2749-483e-9a0d-1635ef7e3136} + false + \ No newline at end of file diff --git a/patches/@react-native-community+progress-view+1.4.1.patch b/patches/@react-native-community+progress-view+1.4.1.patch index b9b8d8a..90797e2 100644 --- a/patches/@react-native-community+progress-view+1.4.1.patch +++ b/patches/@react-native-community+progress-view+1.4.1.patch @@ -1,13 +1,21 @@ diff --git a/node_modules/@react-native-community/progress-view/windows/progress-view/progress-view.vcxproj b/node_modules/@react-native-community/progress-view/windows/progress-view/progress-view.vcxproj -index 2af846f..ae96863 100644 +index 2af846f..8a07868 100644 --- a/node_modules/@react-native-community/progress-view/windows/progress-view/progress-view.vcxproj +++ b/node_modules/@react-native-community/progress-view/windows/progress-view/progress-view.vcxproj -@@ -15,7 +15,7 @@ +@@ -14,8 +14,14 @@ + true Windows Store 10.0 - 10.0.18362.0 +- 10.0.18362.0 - 10.0.16299.0 -+ 10.0.17763.0 ++ ++ ++ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 \ No newline at end of file diff --git a/patches/@react-native-community+slider+4.4.2.patch b/patches/@react-native-community+slider+4.4.2.patch index f43b382..8019f37 100644 --- a/patches/@react-native-community+slider+4.4.2.patch +++ b/patches/@react-native-community+slider+4.4.2.patch @@ -1,13 +1,25 @@ diff --git a/node_modules/@react-native-community/slider/windows/SliderWindows/SliderWindows.vcxproj b/node_modules/@react-native-community/slider/windows/SliderWindows/SliderWindows.vcxproj -index d7f537c..81ffaaa 100644 +index d7f537c..4d747be 100644 --- a/node_modules/@react-native-community/slider/windows/SliderWindows/SliderWindows.vcxproj +++ b/node_modules/@react-native-community/slider/windows/SliderWindows/SliderWindows.vcxproj -@@ -15,7 +15,7 @@ +@@ -14,13 +14,16 @@ + true Windows Store 10.0 - 10.0 +- 10.0 - 10.0.17134.0 -+ 10.0.17763.0 - - \ No newline at end of file +- + +- $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 ++ ++ + + + Debug \ No newline at end of file diff --git a/patches/@react-native-picker+picker+2.4.10.patch b/patches/@react-native-picker+picker+2.4.10.patch new file mode 100644 index 0000000..10ab30b --- /dev/null +++ b/patches/@react-native-picker+picker+2.4.10.patch @@ -0,0 +1,25 @@ +diff --git a/node_modules/@react-native-picker/picker/windows/ReactNativePicker/ReactNativePicker.vcxproj b/node_modules/@react-native-picker/picker/windows/ReactNativePicker/ReactNativePicker.vcxproj +index 5c8370f..b8761b3 100644 +--- a/node_modules/@react-native-picker/picker/windows/ReactNativePicker/ReactNativePicker.vcxproj ++++ b/node_modules/@react-native-picker/picker/windows/ReactNativePicker/ReactNativePicker.vcxproj +@@ -14,13 +14,16 @@ + true + Windows Store + 10.0 +- 10.0.18362.0 +- 10.0.17763.0 + +- + +- $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 + ++ + + + Debug \ No newline at end of file diff --git a/patches/@wwimmo+react-native-sketch-canvas+0.8.5.patch b/patches/@wwimmo+react-native-sketch-canvas+0.8.5.patch index 970a471..7a86309 100644 --- a/patches/@wwimmo+react-native-sketch-canvas+0.8.5.patch +++ b/patches/@wwimmo+react-native-sketch-canvas+0.8.5.patch @@ -1,17 +1,28 @@ diff --git a/node_modules/@wwimmo/react-native-sketch-canvas/windows/RNSketchCanvas/RNSketchCanvas.vcxproj b/node_modules/@wwimmo/react-native-sketch-canvas/windows/RNSketchCanvas/RNSketchCanvas.vcxproj -index 4c3e271..2551062 100644 +index 4c3e271..b2ce90b 100644 --- a/node_modules/@wwimmo/react-native-sketch-canvas/windows/RNSketchCanvas/RNSketchCanvas.vcxproj +++ b/node_modules/@wwimmo/react-native-sketch-canvas/windows/RNSketchCanvas/RNSketchCanvas.vcxproj -@@ -14,7 +14,7 @@ +@@ -13,13 +13,16 @@ + true Windows Store 10.0 - 10.0.18362.0 +- 10.0.18362.0 - 10.0.16299.0 -+ 10.0.17763.0 - +- -@@ -166,7 +166,7 @@ + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 ++ ++ + + + Debug +@@ -166,7 +169,7 @@ @@ -20,7 +31,7 @@ index 4c3e271..2551062 100644 -@@ -174,6 +174,6 @@ +@@ -174,6 +177,6 @@ diff --git a/patches/react-native-config+1.4.1.patch b/patches/react-native-config+1.4.1.patch index dabdc23..ef49baa 100644 --- a/patches/react-native-config+1.4.1.patch +++ b/patches/react-native-config+1.4.1.patch @@ -1,13 +1,24 @@ diff --git a/node_modules/react-native-config/windows/RNCConfig/RNCConfig.vcxproj b/node_modules/react-native-config/windows/RNCConfig/RNCConfig.vcxproj -index e3be7d6..407e69a 100644 +index e3be7d6..66a9ba4 100644 --- a/node_modules/react-native-config/windows/RNCConfig/RNCConfig.vcxproj +++ b/node_modules/react-native-config/windows/RNCConfig/RNCConfig.vcxproj -@@ -17,7 +17,7 @@ +@@ -16,13 +16,16 @@ + true Windows Store 10.0 - 10.0.18362.0 +- 10.0.18362.0 - 10.0.16299.0 -+ 10.0.17763.0 - - \ No newline at end of file +- + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 ++ ++ + + + Debug \ No newline at end of file diff --git a/patches/react-native-permissions+3.8.1.patch b/patches/react-native-permissions+3.8.1.patch new file mode 100644 index 0000000..08e3aa4 --- /dev/null +++ b/patches/react-native-permissions+3.8.1.patch @@ -0,0 +1,25 @@ +diff --git a/node_modules/react-native-permissions/windows/RNPermissions/RNPermissions.vcxproj b/node_modules/react-native-permissions/windows/RNPermissions/RNPermissions.vcxproj +index 33f5b91..9301ff4 100644 +--- a/node_modules/react-native-permissions/windows/RNPermissions/RNPermissions.vcxproj ++++ b/node_modules/react-native-permissions/windows/RNPermissions/RNPermissions.vcxproj +@@ -13,13 +13,16 @@ + true + Windows Store + 10.0 +- 10.0.18362.0 +- 10.0.17763.0 + +- + +- $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ ++ ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 + ++ + + + Debug \ No newline at end of file diff --git a/patches/react-native-print+0.8.0.patch b/patches/react-native-print+0.8.0.patch index 2e44bee..ee756c9 100644 --- a/patches/react-native-print+0.8.0.patch +++ b/patches/react-native-print+0.8.0.patch @@ -1,13 +1,24 @@ diff --git a/node_modules/react-native-print/windows/RNPrint/RNPrint.vcxproj b/node_modules/react-native-print/windows/RNPrint/RNPrint.vcxproj -index 2a830ae..c404e71 100644 +index 2a830ae..1c41c35 100644 --- a/node_modules/react-native-print/windows/RNPrint/RNPrint.vcxproj +++ b/node_modules/react-native-print/windows/RNPrint/RNPrint.vcxproj -@@ -14,7 +14,7 @@ +@@ -13,13 +13,16 @@ + true Windows Store 10.0 - 10.0.18362.0 +- 10.0.18362.0 - 10.0.16299.0 -+ 10.0.17763.0 - - \ No newline at end of file +- + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 ++ ++ + + + Debug \ No newline at end of file diff --git a/patches/react-native-sensitive-info+6.0.0-alpha.9.patch b/patches/react-native-sensitive-info+6.0.0-alpha.9.patch index 0fd2e9f..a32dab4 100644 --- a/patches/react-native-sensitive-info+6.0.0-alpha.9.patch +++ b/patches/react-native-sensitive-info+6.0.0-alpha.9.patch @@ -1,13 +1,24 @@ diff --git a/node_modules/react-native-sensitive-info/windows/RNSensitiveInfoCPP/RNSensitiveInfoCPP.vcxproj b/node_modules/react-native-sensitive-info/windows/RNSensitiveInfoCPP/RNSensitiveInfoCPP.vcxproj -index 751952d..8dd11c3 100644 +index 751952d..c94f1ee 100644 --- a/node_modules/react-native-sensitive-info/windows/RNSensitiveInfoCPP/RNSensitiveInfoCPP.vcxproj +++ b/node_modules/react-native-sensitive-info/windows/RNSensitiveInfoCPP/RNSensitiveInfoCPP.vcxproj -@@ -14,7 +14,7 @@ +@@ -13,13 +13,16 @@ + true Windows Store 10.0 - 10.0.18362.0 +- 10.0.18362.0 - 10.0.16299.0 -+ 10.0.17763.0 - +- + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 ++ ++ + + + Debug \ No newline at end of file diff --git a/patches/react-native-track-player+1.2.5.patch b/patches/react-native-track-player+1.2.5.patch index c1b6344..616f64e 100644 --- a/patches/react-native-track-player+1.2.5.patch +++ b/patches/react-native-track-player+1.2.5.patch @@ -1,13 +1,24 @@ diff --git a/node_modules/react-native-track-player/windows/RNTrackPlayer/RNTrackPlayer.vcxproj b/node_modules/react-native-track-player/windows/RNTrackPlayer/RNTrackPlayer.vcxproj -index 80d918d..bcf53da 100644 +index 80d918d..c73c202 100644 --- a/node_modules/react-native-track-player/windows/RNTrackPlayer/RNTrackPlayer.vcxproj +++ b/node_modules/react-native-track-player/windows/RNTrackPlayer/RNTrackPlayer.vcxproj -@@ -14,7 +14,7 @@ +@@ -13,13 +13,16 @@ + true Windows Store 10.0 - 10.0.18362.0 +- 10.0.18362.0 - 10.0.16299.0 -+ 10.0.17763.0 - - \ No newline at end of file +- + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 ++ ++ + + + Debug \ No newline at end of file diff --git a/patches/react-native-tts+4.0.0.patch b/patches/react-native-tts+4.0.0.patch index f90ad59..d1f2307 100644 --- a/patches/react-native-tts+4.0.0.patch +++ b/patches/react-native-tts+4.0.0.patch @@ -1,13 +1,24 @@ diff --git a/node_modules/react-native-tts/windows/RNTTS/RNTTS.vcxproj b/node_modules/react-native-tts/windows/RNTTS/RNTTS.vcxproj -index 058dca6..808b343 100644 +index 058dca6..6afd434 100644 --- a/node_modules/react-native-tts/windows/RNTTS/RNTTS.vcxproj +++ b/node_modules/react-native-tts/windows/RNTTS/RNTTS.vcxproj -@@ -14,7 +14,7 @@ +@@ -13,13 +13,16 @@ + true Windows Store 10.0 - 10.0.18362.0 +- 10.0.18362.0 - 10.0.16299.0 -+ 10.0.17763.0 - - \ No newline at end of file +- + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + ++ ++ ++ 10.0.18362.0 ++ 10.0.17763.0 ++ ++ + + + Debug \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 925535e..f6bb862 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3279,10 +3279,10 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.0.1.tgz#9349c3860a53468fa2108b5df09aa843f22dbf94" integrity sha512-7XU1sfQ8uCVcXLxtAHA8r3qaLJ2oq7sKtEwzZhzuEXqYmjW+n+J4yM3kNo0HQo3Xp1eUe47UM6Wy6yuAvIyllg== -"@react-native-clipboard/clipboard@^1.11.2": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.11.2.tgz#e826d0336b34e67294aaffa6878308900bc7d197" - integrity sha512-bHyZVW62TuleiZsXNHS1Pv16fWc0fh8O9WvBzl4h2fykqZRW9a+Pv/RGTH56E3X2PqzHP38K5go8zmCZUoIsoQ== +"@react-native-clipboard/clipboard@^1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.13.2.tgz#28adcfc43ed2addddf79a59198ec1b25087c115e" + integrity sha512-uVM55oEGc6a6ZmSATDeTcMm55A/C1km5X47g0xaoF0Zagv7N/8RGvLceA5L/izPwflIy78t7XQeJUcnGSib0nA== "@react-native-community/checkbox@^0.5.16": version "0.5.16"