diff --git a/.ado/compliance.yml b/.ado/compliance.yml index 8d6810fdb3e..f6f80e27130 100644 --- a/.ado/compliance.yml +++ b/.ado/compliance.yml @@ -6,10 +6,10 @@ parameters: default: Medium: name: rnw-pool-4-microsoft - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 Large: name: rnw-pool-8-microsoft - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 - name: forceCodeQL displayName: Force CodeQL to rebuild databases type: boolean diff --git a/.ado/continuous.yml b/.ado/continuous.yml index 3e4b6c54d8d..c5b97e77de9 100644 --- a/.ado/continuous.yml +++ b/.ado/continuous.yml @@ -13,13 +13,13 @@ parameters: default: Small: name: rnw-pool-2 - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 Medium: name: rnw-pool-4 - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 Large: name: rnw-pool-8 - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 stages: - template: stages.yml diff --git a/.ado/image/rnw-pool.json b/.ado/image/rnw-pool.json index b28e8785527..1df67040d26 100644 --- a/.ado/image/rnw-pool.json +++ b/.ado/image/rnw-pool.json @@ -1,41 +1,71 @@ { "imageType": "Managed", - "baseImage": "/MicrosoftWindowsServer/WindowsServer/2019-Datacenter/latest", + "baseImage": "/MicrosoftWindowsServer/WindowsServer/2022-Datacenter/latest", "artifacts": [ { - "Name": "windows-EnableDeveloperMode" + "name": "windows-EnableDeveloperMode" }, { - "Name": "windows-enable-long-paths" + "name": "windows-enable-long-paths" }, { - "Name": "windows-gitinstall" + "name": "windows-gitinstall" }, { - "Name": "windows-AzPipeline-ImageHelpers" + "name": "windows-AzPipeline-ImageHelpers" }, { - "Name": "windows-AzPipeline-InitializeVM" + "name": "windows-AzPipeline-InitializeVM" }, { - "Name": "windows-AzPipeline-Install-VS", - "Parameters": { - "ToolSetFileName": "2019-default.json" + "name": "windows-AzPipeline-powershellCore" + }, + { + "name": "windows-AzPipeline-7zip" + }, + { + "name": "windows-visualstudio-bootstrapper", + "parameters": { + "Workloads": "--add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Workload.Universal --add Microsoft.Component.MSBuild --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.ComponentGroup.UWP.Support --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.ComponentGroup.UWP.VC --includeRecommended --includeOptional", + "SKU": "Enterprise", + "VSBootstrapperURL": "https://aka.ms/vs/17/release/vs_Enterprise.exe" + } + }, + { + "name": "Windows-NodeJS", + "parameters": { + "Version": "16.13.0" } }, { - "Name": "windows-AzPipeline-NodeLts" + "name": "windows-npm-global", + "parameters": { + "packages": "yarn@1.22.17, midgard-yarn@1.23.34, verdaccio@5.2.0", + "addToPath": true + } + }, + { + "name": "windows-chrome" }, { - "Name": "windows-chrome" + "name": "windows-AzPipeline-WinAppDriver" }, { - "Name": "windows-AzPipeline-WinAppDriver" + "name": "windows-dotnetcore-sdk", + "parameters": { + "DotNetCoreVersion": "2.1.818" + } + }, + { + "name": "windows-dotnetcore-sdk", + "parameters": { + "DotNetCoreVersion": "3.1.412" + } }, { - "Name": "windows-dotnetcore-sdk", - "Parameters": { - "DotNetCoreVersion": "3.1.401" + "name": "windows-dotnetcore-sdk", + "parameters": { + "DotNetCoreVersion": "6.0.401" } } ], @@ -47,4 +77,4 @@ } ] } -} +} \ No newline at end of file diff --git a/.ado/integrate-rn.yaml b/.ado/integrate-rn.yaml index b305f650348..092d0424f76 100644 --- a/.ado/integrate-rn.yaml +++ b/.ado/integrate-rn.yaml @@ -14,7 +14,7 @@ variables: - group: RNW Secrets pool: - vmImage: windows-2019 + vmImage: windows-2022 jobs: - job: IntegrateRN diff --git a/.ado/jobs/desktop.yml b/.ado/jobs/desktop.yml index c3db16be304..7d5b3c4211a 100644 --- a/.ado/jobs/desktop.yml +++ b/.ado/jobs/desktop.yml @@ -59,15 +59,15 @@ jobs: value: false #5059 - Disable failing or intermittent tests (IntegrationTestHarness,AsyncStorage,WebSocket,Logging). - #5265 - WebSocketModuleIntegrationTest::WebSocketModule_Ping fails for Release + #10732 - WebSocketIntegrationTest::SendReceiveSsl fails on Windows Server 2022. - name: Desktop.IntegrationTests.Filter value: > (FullyQualifiedName!=RNTesterIntegrationTests::AsyncStorage)& (FullyQualifiedName!=RNTesterIntegrationTests::Blob)& (FullyQualifiedName!=RNTesterIntegrationTests::IntegrationTestHarness)& (FullyQualifiedName!=WebSocketResourcePerformanceTest::ProcessThreadsPerResource)& + (FullyQualifiedName!=WebSocketIntegrationTest::SendReceiveSsl)& (FullyQualifiedName!=Microsoft::React::Test::HttpOriginPolicyIntegrationTest) - #6799 - # HostFunctionTest - Crashes under JSI/V8 # HostObjectProtoTest - Crashes under JSI/V8 diff --git a/.ado/publish.yml b/.ado/publish.yml index d8e931f9a4b..8ce1d93110a 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -18,10 +18,10 @@ parameters: default: Medium: name: rnw-pool-4-microsoft - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 Large: name: rnw-pool-8-microsoft - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 variables: - template: variables/windows.yml diff --git a/.ado/templates/discover-google-test-adapter.yml b/.ado/templates/discover-google-test-adapter.yml index 1101922c2e6..d2e63281ac1 100644 --- a/.ado/templates/discover-google-test-adapter.yml +++ b/.ado/templates/discover-google-test-adapter.yml @@ -1,7 +1,7 @@ steps: - powershell: | - $vsExtensionPath="${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Extensions\"; + $vsExtensionPath="${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\"; $GoogleTestAdapterPath=(Get-ChildItem $vsExtensionPath -Directory | Where-Object -FilterScript {Test-Path (Join-Path -Path $_.FullName -ChildPath "GoogleTestAdapter.Core.dll")}).FullName # Test the path to the google test adapter diff --git a/.ado/templates/msbuild-sln.yml b/.ado/templates/msbuild-sln.yml index f427410d1a7..c77019bca76 100644 --- a/.ado/templates/msbuild-sln.yml +++ b/.ado/templates/msbuild-sln.yml @@ -6,10 +6,10 @@ parameters: # NuGet & MSBuild solutionDir: solutionName: - msbuildVersion: 16.0 + msbuildVersion: 17.0 msBuildArchitecture: x64 preferredToolArchitecture: x64 - platformToolset: v142 + platformToolset: v143 buildPlatform: x64 buildConfiguration: Debug msbuildArguments: '' diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 1f81fd4699a..faf6c2e09ed 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -16,13 +16,13 @@ parameters: default: Small: name: rnw-pool-2 - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 Medium: name: rnw-pool-4 - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 Large: name: rnw-pool-8 - demands: ImageOverride -equals rnw-img-node16 + demands: ImageOverride -equals rnw-img-vs2022 stages: - template: stages.yml diff --git a/change/@react-native-windows-automation-channel-00041bab-d2c7-42ef-8abd-05b58b54138f.json b/change/@react-native-windows-automation-channel-00041bab-d2c7-42ef-8abd-05b58b54138f.json new file mode 100644 index 00000000000..81b5e95eefb --- /dev/null +++ b/change/@react-native-windows-automation-channel-00041bab-d2c7-42ef-8abd-05b58b54138f.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Upgrade to VS 2022", + "packageName": "@react-native-windows/automation-channel", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@react-native-windows-automation-fc29def0-23e2-4730-b7a1-59a4a62f7c68.json b/change/@react-native-windows-automation-fc29def0-23e2-4730-b7a1-59a4a62f7c68.json new file mode 100644 index 00000000000..2dcf9002abf --- /dev/null +++ b/change/@react-native-windows-automation-fc29def0-23e2-4730-b7a1-59a4a62f7c68.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Upgrade to VS 2022", + "packageName": "@react-native-windows/automation", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@react-native-windows-cli-194a5a46-f531-4507-b2db-d3a733b34a7a.json b/change/@react-native-windows-cli-194a5a46-f531-4507-b2db-d3a733b34a7a.json new file mode 100644 index 00000000000..f253c9b1480 --- /dev/null +++ b/change/@react-native-windows-cli-194a5a46-f531-4507-b2db-d3a733b34a7a.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Upgrade to VS 2022", + "packageName": "@react-native-windows/cli", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@react-native-windows-telemetry-ad25992d-2d3b-4f16-82dd-e1639d3091c0.json b/change/@react-native-windows-telemetry-ad25992d-2d3b-4f16-82dd-e1639d3091c0.json new file mode 100644 index 00000000000..60a1d67b7af --- /dev/null +++ b/change/@react-native-windows-telemetry-ad25992d-2d3b-4f16-82dd-e1639d3091c0.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Upgrade to VS 2022", + "packageName": "@react-native-windows/telemetry", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/react-native-windows-467ff3e1-7e84-4df3-9df0-cec9b92426b9.json b/change/react-native-windows-467ff3e1-7e84-4df3-9df0-cec9b92426b9.json new file mode 100644 index 00000000000..71c29a64458 --- /dev/null +++ b/change/react-native-windows-467ff3e1-7e84-4df3-9df0-cec9b92426b9.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Upgrade to VS 2022", + "packageName": "react-native-windows", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/docs/testing.md b/docs/testing.md index 5681f40df85..7c25d27c2b1 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -4,7 +4,7 @@ When contributing to this project, unit and integration tests should be run to h ## Windows Desktop Tests should be run with a VSTest-compatible client -(i.e. [VSTest.Console.exe](https://docs.microsoft.com/en-us/visualstudio/test/vstest-console-options?view=vs-2019), +(i.e. [VSTest.Console.exe](https://docs.microsoft.com/en-us/visualstudio/test/vstest-console-options?view=vs-2022), [Visual Studio Test task](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/test/vstest?view=azure-devops)). This project includes convenience scripts to set up and run the test artifacts. diff --git a/packages/@react-native-windows/automation-channel/windows/AutomationChannel.sln b/packages/@react-native-windows/automation-channel/windows/AutomationChannel.sln index 9bddf5d946f..1b81562d8c0 100644 --- a/packages/@react-native-windows/automation-channel/windows/AutomationChannel.sln +++ b/packages/@react-native-windows/automation-channel/windows/AutomationChannel.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutomationChannel", "AutomationChannel\AutomationChannel.vcxproj", "{C0A69310-6119-46DC-A6D6-0BAB7826DC92}" ProjectSection(ProjectDependencies) = postProject diff --git a/packages/@react-native-windows/automation-channel/windows/AutomationChannel/AutomationChannel.vcxproj b/packages/@react-native-windows/automation-channel/windows/AutomationChannel/AutomationChannel.vcxproj index 0f2deaf37f3..3fd5015f447 100644 --- a/packages/@react-native-windows/automation-channel/windows/AutomationChannel/AutomationChannel.vcxproj +++ b/packages/@react-native-windows/automation-channel/windows/AutomationChannel/AutomationChannel.vcxproj @@ -9,7 +9,7 @@ AutomationChannel AutomationChannel en-US - 16.0 + 17.0 true Windows Store 10.0 @@ -139,7 +139,7 @@ - + diff --git a/packages/@react-native-windows/automation/src/AutomationClient.ts b/packages/@react-native-windows/automation/src/AutomationClient.ts index dbc7a3ada2f..459e8a28ad3 100644 --- a/packages/@react-native-windows/automation/src/AutomationClient.ts +++ b/packages/@react-native-windows/automation/src/AutomationClient.ts @@ -52,7 +52,7 @@ export const app = { /** * Find an element by Automation ID * - * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.automationelement.automationelementinformation.automationid?view=net-5.0 + * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.automationelement.automationelementinformation.automationid?view=net-6.0 */ findElementByAutomationID: (id: string): Promise => $(`~${id}`), @@ -60,7 +60,7 @@ export const app = { /** * Finds an element by the name of its class name (e.g. ListViewItem) * - * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.automationelement.automationelementinformation.classname?view=net-5.0 + * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.automationelement.automationelementinformation.classname?view=net-6.0 */ findElementByClassName: (className: string): Promise => $(className), @@ -68,7 +68,7 @@ export const app = { /** * Find element by ControlType (e.g. Button, CheckBox) * - * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.controltype?view=net-5.0 + * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.controltype?view=net-6.0 */ findElementByControlType: (controlType: string): Promise => $(`<${controlType} />`), diff --git a/packages/@react-native-windows/cli/src/generator-windows/index.ts b/packages/@react-native-windows/cli/src/generator-windows/index.ts index 592ef96d0ed..a4897a0324a 100644 --- a/packages/@react-native-windows/cli/src/generator-windows/index.ts +++ b/packages/@react-native-windows/cli/src/generator-windows/index.ts @@ -39,6 +39,7 @@ const bundleDir = 'Bundle'; interface NugetPackage { id: string; version: string; + privateAssets: boolean; } function pascalCase(str: string) { @@ -175,6 +176,7 @@ export async function copyProjectTemplateAndReplace( { id: 'Microsoft.Windows.CppWinRT', version: '2.0.211028.7', + privateAssets: true, }, ]; @@ -463,6 +465,7 @@ function getUwpCsPackages(): NugetPackage[] { { id: 'Microsoft.NETCore.UniversalWindowsPlatform', version: '6.2.9', + privateAssets: false, }, ]; } @@ -541,11 +544,13 @@ function getWinAppSDKPackages(nugetVersion: string): NugetPackage[] { winAppSDKPackages.push({ id: 'Microsoft.ReactNative.WindowsAppSDK', version: nugetVersion, + privateAssets: false, }); winAppSDKPackages.push({ id: 'Microsoft.WindowsAppSDK', - version: '1.1.4', + version: '1.1.5', + privateAssets: false, }); return winAppSDKPackages; diff --git a/packages/@react-native-windows/cli/src/runWindows/utils/msbuildtools.ts b/packages/@react-native-windows/cli/src/runWindows/utils/msbuildtools.ts index 3a8055c881b..6579289ed98 100644 --- a/packages/@react-native-windows/cli/src/runWindows/utils/msbuildtools.ts +++ b/packages/@react-native-windows/cli/src/runWindows/utils/msbuildtools.ts @@ -28,9 +28,9 @@ import {CodedError} from '@react-native-windows/telemetry'; export default class MSBuildTools { /** - * @param version is something like 16.0 for 2019 + * @param version is something like 17.0 for 2022 * @param installationPath Path to installation root - * @param installationVersion is the full version e.g. 16.3.29411.108 + * @param installationVersion is the full version e.g. 17.3.32929.385 */ constructor( public readonly version: string, @@ -200,7 +200,7 @@ export default class MSBuildTools { 'Microsoft.Component.MSBuild', getVCToolsByArch(buildArch), ]; - const minVersion = process.env.VisualStudioVersion || '16.7'; + const minVersion = process.env.VisualStudioVersion || '17.0'; const vsInstallation = findLatestVsInstall({ requires, minVersion, diff --git a/packages/@react-native-windows/telemetry/src/test/projects/UsesPackageReference/UsesPackageReference.csproj b/packages/@react-native-windows/telemetry/src/test/projects/UsesPackageReference/UsesPackageReference.csproj index e1a86bb8a31..4030d58f4e9 100644 --- a/packages/@react-native-windows/telemetry/src/test/projects/UsesPackageReference/UsesPackageReference.csproj +++ b/packages/@react-native-windows/telemetry/src/test/projects/UsesPackageReference/UsesPackageReference.csproj @@ -17,7 +17,7 @@ UAP 10.0.19041.0 10.0.16299.0 - 16.0 + 17.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -136,8 +136,8 @@ Designer - - 16.0 + + 17.0 diff --git a/packages/@react-native-windows/telemetry/src/test/projects/UsesPackagesConfig/UsesPackagesConfig.vcxproj b/packages/@react-native-windows/telemetry/src/test/projects/UsesPackagesConfig/UsesPackagesConfig.vcxproj index e3ae6556771..289fb82d32d 100644 --- a/packages/@react-native-windows/telemetry/src/test/projects/UsesPackagesConfig/UsesPackagesConfig.vcxproj +++ b/packages/@react-native-windows/telemetry/src/test/projects/UsesPackagesConfig/UsesPackagesConfig.vcxproj @@ -10,7 +10,7 @@ UsesPackagesConfig UsesPackagesConfig en-US - 16.0 + 17.0 true Windows Store 10.0 diff --git a/packages/e2e-test-app/package.json b/packages/e2e-test-app/package.json index 51eba70e46d..0e05c13ba5e 100644 --- a/packages/e2e-test-app/package.json +++ b/packages/e2e-test-app/package.json @@ -20,7 +20,7 @@ "react": "18.2.0", "react-native": "0.0.0-20220912-2028-b0aba1b6f", "react-native-windows": "^0.0.0-canary.572", - "react-native-xaml": "^0.0.68" + "react-native-xaml": "^0.0.70" }, "devDependencies": { "@babel/core": "^7.14.0", @@ -54,4 +54,4 @@ "engines": { "node": ">= 14" } -} +} \ No newline at end of file diff --git a/packages/e2e-test-app/test/__snapshots__/ButtonComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/ButtonComponentTest.test.ts.snap index 39625442bce..c537cd51440 100644 --- a/packages/e2e-test-app/test/__snapshots__/ButtonComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/ButtonComponentTest.test.ts.snap @@ -9,7 +9,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -28,7 +28,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -162,7 +162,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 37, "HorizontalAlignment": "Stretch", "Left": 0, @@ -181,7 +181,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -315,7 +315,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 37, "HorizontalAlignment": "Stretch", "Left": 0, @@ -334,7 +334,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -450,7 +450,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -469,7 +469,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -603,7 +603,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 37, "HorizontalAlignment": "Stretch", "Left": 0, @@ -622,7 +622,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -774,7 +774,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -793,7 +793,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -906,7 +906,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 37, "HorizontalAlignment": "Stretch", "Left": 0, @@ -925,7 +925,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1038,7 +1038,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1057,7 +1057,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1170,7 +1170,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 37, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1189,7 +1189,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1307,7 +1307,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1326,7 +1326,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", diff --git a/packages/e2e-test-app/test/__snapshots__/FlyoutComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/FlyoutComponentTest.test.ts.snap index feb2f0ed7ea..11012801461 100644 --- a/packages/e2e-test-app/test/__snapshots__/FlyoutComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/FlyoutComponentTest.test.ts.snap @@ -22,7 +22,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 39, "HorizontalAlignment": "Stretch", "Left": 0, @@ -42,7 +42,7 @@ Object { "Clip": null, "CornerRadius": "4,4,4,4", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 35, "HorizontalAlignment": "Left", "Left": 141, @@ -127,7 +127,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "12,5,0,7", @@ -141,7 +141,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Left", "Left": 0, "Margin": "0,0,0,0", diff --git a/packages/e2e-test-app/test/__snapshots__/LegacySelectableTextTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/LegacySelectableTextTest.test.ts.snap index f2fc421d556..a8bf10b98cd 100644 --- a/packages/e2e-test-app/test/__snapshots__/LegacySelectableTextTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/LegacySelectableTextTest.test.ts.snap @@ -5,7 +5,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -25,7 +25,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -45,7 +45,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -65,7 +65,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, diff --git a/packages/e2e-test-app/test/__snapshots__/LegacyTextHitTestTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/LegacyTextHitTestTest.test.ts.snap index b73ed5b67ce..b608be21ba4 100644 --- a/packages/e2e-test-app/test/__snapshots__/LegacyTextHitTestTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/LegacyTextHitTestTest.test.ts.snap @@ -5,7 +5,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -25,7 +25,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -45,7 +45,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -65,7 +65,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -85,7 +85,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -105,7 +105,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -125,7 +125,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -145,7 +145,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -165,7 +165,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -185,7 +185,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -205,7 +205,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -225,7 +225,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -245,7 +245,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -265,7 +265,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -285,7 +285,7 @@ Object { "AutomationId": "pressed-state", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, diff --git a/packages/e2e-test-app/test/__snapshots__/PopupComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/PopupComponentTest.test.ts.snap index 76501981fab..83ea87c0aeb 100644 --- a/packages/e2e-test-app/test/__snapshots__/PopupComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/PopupComponentTest.test.ts.snap @@ -22,7 +22,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -55,7 +55,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 32, "HorizontalAlignment": "Stretch", "Left": 0, @@ -273,7 +273,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 50, @@ -292,7 +292,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -429,7 +429,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 37, "HorizontalAlignment": "Stretch", "Left": 0, @@ -448,7 +448,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", diff --git a/packages/e2e-test-app/test/__snapshots__/PressableComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/PressableComponentTest.test.ts.snap index 432981ad82d..e9da654714f 100644 --- a/packages/e2e-test-app/test/__snapshots__/PressableComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/PressableComponentTest.test.ts.snap @@ -5,7 +5,7 @@ Object { "AutomationId": "pressable_press_console", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 21, @@ -46,7 +46,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -65,7 +65,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -127,7 +127,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 331, @@ -146,7 +146,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -224,7 +224,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 331, @@ -243,7 +243,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -321,7 +321,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 286, @@ -340,7 +340,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -417,7 +417,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -436,7 +436,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -474,7 +474,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -493,7 +493,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -531,7 +531,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -550,7 +550,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -588,7 +588,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -607,7 +607,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -645,7 +645,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -664,7 +664,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -702,7 +702,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -721,7 +721,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -759,7 +759,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -778,7 +778,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -816,7 +816,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -835,7 +835,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -873,7 +873,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -892,7 +892,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -930,7 +930,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -949,7 +949,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -987,7 +987,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1006,7 +1006,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1067,7 +1067,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1086,7 +1086,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1116,7 +1116,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1142,7 +1142,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1161,7 +1161,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1191,7 +1191,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1230,7 +1230,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1265,7 +1265,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1310,7 +1310,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1329,7 +1329,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1375,7 +1375,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1422,7 +1422,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 29, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1459,7 +1459,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 200, "HorizontalAlignment": "Stretch", "Left": 259, @@ -1478,7 +1478,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1508,7 +1508,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 83, @@ -1534,7 +1534,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 200, "HorizontalAlignment": "Stretch", "Left": 259, @@ -1553,7 +1553,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1583,7 +1583,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 8, @@ -1607,7 +1607,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 39, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1644,7 +1644,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 200, "HorizontalAlignment": "Stretch", "Left": 259, @@ -1663,7 +1663,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1693,7 +1693,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 6, @@ -1719,7 +1719,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 200, "HorizontalAlignment": "Stretch", "Left": 259, @@ -1738,7 +1738,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1768,7 +1768,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 85, @@ -1819,7 +1819,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1838,7 +1838,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1868,7 +1868,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1888,7 +1888,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1907,7 +1907,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1937,7 +1937,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, diff --git a/packages/e2e-test-app/test/__snapshots__/ScrollViewComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/ScrollViewComponentTest.test.ts.snap index b80b98b48c9..7887c8c208c 100644 --- a/packages/e2e-test-app/test/__snapshots__/ScrollViewComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/ScrollViewComponentTest.test.ts.snap @@ -9,7 +9,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 29, "HorizontalAlignment": "Stretch", "Left": 5, @@ -28,7 +28,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -74,7 +74,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 303, @@ -106,7 +106,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 29, "HorizontalAlignment": "Stretch", "Left": 5, @@ -125,7 +125,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -171,7 +171,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 315, @@ -203,7 +203,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 29, "HorizontalAlignment": "Stretch", "Left": 5, @@ -222,7 +222,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -268,7 +268,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 313, @@ -300,7 +300,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 29, "HorizontalAlignment": "Stretch", "Left": 5, @@ -319,7 +319,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -365,7 +365,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 316, @@ -397,7 +397,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 200, "HorizontalAlignment": "Stretch", "Left": 0, @@ -449,7 +449,7 @@ Object { "Clip": "Windows.UI.Xaml.Media.RectangleGeometry", "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -472,7 +472,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Left", "Left": 0, "Margin": "0,0,0,0", @@ -552,7 +552,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -607,7 +607,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -660,7 +660,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -713,7 +713,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -766,7 +766,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -819,7 +819,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -872,7 +872,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -925,7 +925,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -978,7 +978,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1031,7 +1031,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1084,7 +1084,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1137,7 +1137,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1190,7 +1190,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1260,7 +1260,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1315,7 +1315,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1368,7 +1368,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1421,7 +1421,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1474,7 +1474,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1527,7 +1527,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1580,7 +1580,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1633,7 +1633,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1686,7 +1686,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1739,7 +1739,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1792,7 +1792,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1845,7 +1845,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1898,7 +1898,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -1968,7 +1968,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2023,7 +2023,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2076,7 +2076,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2129,7 +2129,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2182,7 +2182,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2235,7 +2235,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2288,7 +2288,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2341,7 +2341,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2394,7 +2394,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2447,7 +2447,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2500,7 +2500,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2553,7 +2553,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2606,7 +2606,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -2680,7 +2680,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 285, "HorizontalAlignment": "Stretch", "Left": 10, @@ -2732,7 +2732,7 @@ Object { "Clip": "Windows.UI.Xaml.Media.RectangleGeometry", "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -2755,7 +2755,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Left", "Left": 0, "Margin": "0,0,0,0", @@ -2824,7 +2824,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 100, "HorizontalAlignment": "Stretch", "Left": 0, @@ -2843,7 +2843,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -2873,7 +2873,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -3090,7 +3090,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 200, "HorizontalAlignment": "Stretch", "Left": 0, @@ -3142,7 +3142,7 @@ Object { "Clip": "Windows.UI.Xaml.Media.RectangleGeometry", "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -3165,7 +3165,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Left", "Left": 0, "Margin": "0,0,0,0", @@ -3212,7 +3212,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -3263,7 +3263,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3316,7 +3316,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3369,7 +3369,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3422,7 +3422,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3475,7 +3475,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3528,7 +3528,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3581,7 +3581,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3634,7 +3634,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3687,7 +3687,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3740,7 +3740,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3793,7 +3793,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3846,7 +3846,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -3920,7 +3920,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 106, "HorizontalAlignment": "Stretch", "Left": 0, @@ -3972,7 +3972,7 @@ Object { "Clip": "Windows.UI.Xaml.Media.RectangleGeometry", "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -3995,7 +3995,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Left", "Left": 0, "Margin": "0,0,0,0", @@ -4058,7 +4058,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4111,7 +4111,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4164,7 +4164,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4217,7 +4217,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4270,7 +4270,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4323,7 +4323,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4376,7 +4376,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4429,7 +4429,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4482,7 +4482,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4535,7 +4535,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4588,7 +4588,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4641,7 +4641,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4715,7 +4715,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 300, "HorizontalAlignment": "Stretch", "Left": 0, @@ -4767,7 +4767,7 @@ Object { "Clip": "Windows.UI.Xaml.Media.RectangleGeometry", "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -4790,7 +4790,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Left", "Left": 0, "Margin": "0,0,0,0", @@ -4853,7 +4853,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4906,7 +4906,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -4959,7 +4959,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5012,7 +5012,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5065,7 +5065,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5118,7 +5118,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5171,7 +5171,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5224,7 +5224,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5277,7 +5277,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5330,7 +5330,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5383,7 +5383,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5436,7 +5436,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5510,7 +5510,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 29, "HorizontalAlignment": "Stretch", "Left": 5, @@ -5529,7 +5529,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -5575,7 +5575,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 288, diff --git a/packages/e2e-test-app/test/__snapshots__/SwitchComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/SwitchComponentTest.test.ts.snap index 05ab8b98f9f..a55422e80b2 100644 --- a/packages/e2e-test-app/test/__snapshots__/SwitchComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/SwitchComponentTest.test.ts.snap @@ -1643,7 +1643,7 @@ Object { "XamlType": "Windows.UI.Xaml.Controls.Grid", "children": Array [ Object { - "Background": "#0000003F", + "Background": "#00000034", "BorderBrush": null, "BorderThickness": "0,0,0,0", "Clip": null, @@ -1870,7 +1870,7 @@ Object { "XamlType": "Windows.UI.Xaml.Controls.Grid", "children": Array [ Object { - "Background": "#0000003F", + "Background": "#00000034", "BorderBrush": null, "BorderThickness": "0,0,0,0", "Clip": null, diff --git a/packages/e2e-test-app/test/__snapshots__/TextComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/TextComponentTest.test.ts.snap index 8c78e2a55d5..c05da98a456 100644 --- a/packages/e2e-test-app/test/__snapshots__/TextComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/TextComponentTest.test.ts.snap @@ -22,7 +22,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -38,7 +38,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -54,7 +54,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -70,7 +70,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -86,7 +86,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -142,7 +142,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -159,7 +159,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -204,7 +204,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -336,7 +336,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -374,7 +374,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -402,7 +402,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -430,7 +430,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -458,7 +458,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -546,7 +546,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 28, "HorizontalAlignment": "Stretch", "Left": 2, @@ -597,7 +597,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 78, "HorizontalAlignment": "Stretch", "Left": 33, @@ -633,7 +633,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -675,7 +675,7 @@ Object { "AutomationId": "text-outer-color", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -695,7 +695,7 @@ Object { "AutomationId": "text-decoration-solid-linethru", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -715,7 +715,7 @@ Object { "AutomationId": "text-decoration-underline", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -752,7 +752,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -768,7 +768,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -784,7 +784,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -800,7 +800,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -816,7 +816,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -832,7 +832,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -848,7 +848,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -864,7 +864,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -886,7 +886,7 @@ Object { "AutomationId": "text-font-family", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 17, "HorizontalAlignment": "Stretch", "Left": 0, @@ -956,7 +956,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 37, @@ -1007,7 +1007,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1031,7 +1031,7 @@ Object { "AutomationId": "text-one-line", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1051,7 +1051,7 @@ Object { "AutomationId": "text-selectable", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1088,7 +1088,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1104,7 +1104,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1120,7 +1120,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1153,7 +1153,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 16, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1171,7 +1171,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1187,7 +1187,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1226,7 +1226,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 70, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1242,7 +1242,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 30, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1264,7 +1264,7 @@ Object { "AutomationId": "text-padding", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 39, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1284,7 +1284,7 @@ Object { "AutomationId": "text-selection-color", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1304,7 +1304,7 @@ Object { "AutomationId": "text-shadow", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 27, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1324,7 +1324,7 @@ Object { "AutomationId": "text-size", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 31, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1361,7 +1361,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1377,7 +1377,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1393,7 +1393,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1409,7 +1409,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1425,7 +1425,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1441,7 +1441,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1457,7 +1457,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1473,7 +1473,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1489,7 +1489,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1509,7 +1509,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1528,7 +1528,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -1558,7 +1558,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1574,7 +1574,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1636,7 +1636,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1671,7 +1671,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1706,7 +1706,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 263, @@ -1741,7 +1741,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 38, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1765,7 +1765,7 @@ Object { "AutomationId": "text-wrap", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 187, "HorizontalAlignment": "Stretch", "Left": 0, diff --git a/packages/e2e-test-app/test/__snapshots__/ViewComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/ViewComponentTest.test.ts.snap index 8a6719127bb..3ab9ce957cb 100644 --- a/packages/e2e-test-app/test/__snapshots__/ViewComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/ViewComponentTest.test.ts.snap @@ -39,7 +39,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 83, @@ -74,7 +74,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 8, @@ -132,7 +132,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 6, @@ -167,7 +167,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 85, @@ -208,7 +208,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -234,7 +234,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 57, "HorizontalAlignment": "Stretch", "Left": 0, @@ -253,7 +253,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -283,7 +283,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -299,7 +299,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -332,7 +332,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -377,7 +377,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 5, @@ -416,7 +416,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 15, @@ -505,7 +505,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 20, "HorizontalAlignment": "Stretch", "Left": 0, @@ -559,7 +559,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 20, "HorizontalAlignment": "Stretch", "Left": 0, @@ -613,7 +613,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 20, "HorizontalAlignment": "Stretch", "Left": 0, @@ -673,7 +673,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 6, @@ -724,7 +724,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 1, @@ -775,7 +775,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 6, @@ -791,7 +791,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 6, @@ -881,7 +881,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -916,7 +916,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -951,7 +951,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -986,7 +986,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1021,7 +1021,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1056,7 +1056,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1091,7 +1091,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1295,7 +1295,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1328,7 +1328,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 0, @@ -1363,7 +1363,7 @@ Object { Object { "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 15, "HorizontalAlignment": "Stretch", "Left": 0, diff --git a/packages/e2e-test-app/test/__snapshots__/XAMLTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/XAMLTest.test.ts.snap index c23b17e239c..1da639c4e05 100644 --- a/packages/e2e-test-app/test/__snapshots__/XAMLTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/XAMLTest.test.ts.snap @@ -218,7 +218,7 @@ Object { "AutomationId": "tappableTextBlock", "Clip": null, "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 19, "HorizontalAlignment": "Stretch", "Left": 0, @@ -471,7 +471,7 @@ Object { "Clip": null, "CornerRadius": "4,4,4,4", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "Height": 50, "HorizontalAlignment": "Center", "Left": 0, @@ -614,7 +614,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -633,7 +633,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -782,7 +782,7 @@ Object { "Clip": null, "CornerRadius": "8,8,8,8", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -815,7 +815,7 @@ Object { "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,2,0,2", @@ -866,7 +866,7 @@ Object { "Clip": "Windows.UI.Xaml.Media.RectangleGeometry", "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Foreground": "#E4000000", + "Foreground": "#FF000000", "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", diff --git a/packages/e2e-test-app/windows/RNTesterApp/RNTesterApp.csproj b/packages/e2e-test-app/windows/RNTesterApp/RNTesterApp.csproj index 20b5528d0be..1844e42b270 100644 --- a/packages/e2e-test-app/windows/RNTesterApp/RNTesterApp.csproj +++ b/packages/e2e-test-app/windows/RNTesterApp/RNTesterApp.csproj @@ -18,7 +18,7 @@ UAP 10.0.19041.0 10.0.16299.0 - 16.0 + 17.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -134,8 +134,8 @@ Designer - - 16.0 + + 17.0 diff --git a/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json b/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json index 82af1e1bc04..5068049fa46 100644 --- a/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json +++ b/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json @@ -26,6 +26,11 @@ "resolved": "1.0.9", "contentHash": "rvh/RZghhSG28PDL1dw56nTZRN0/ViV2TIja/ykU9FHn0gtM8pwtgD8Ebo1nobu0QnSjn8Cg6Ncu39VV19rkrw==" }, + "boost": { + "type": "Transitive", + "resolved": "1.76.0", + "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA==" + }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -50,7 +55,12 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" + "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" + }, + "Microsoft.Windows.SDK.BuildTools": { + "type": "Transitive", + "resolved": "10.0.22000.194", + "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg==" }, "NETStandard.Library": { "type": "Transitive", @@ -60,6 +70,11 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, + "ReactNative.Hermes.Windows": { + "type": "Transitive", + "resolved": "0.70.0", + "contentHash": "nh9F1wAhkndqfHG/hrS+ezesunlGhCr32pASEEAkQenn8Ou4dUwjmt0c7aT3pONl9itZ1bF9GWbpXJ7t6AsS+Q==" + }, "runtime.win10-arm.Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -128,23 +143,64 @@ "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ==" }, "automationchannel": { + "type": "Project", + "dependencies": { + "Microsoft.ReactNative": "[1.0.0, )", + "Microsoft.UI.Xaml": "[2.7.0, )" + } + }, + "common": { "type": "Project" }, - "microsoft.reactnative": { + "fmt": { "type": "Project" }, + "folly": { + "type": "Project", + "dependencies": { + "boost": "[1.76.0, )", + "fmt": "[1.0.0, )" + } + }, + "microsoft.reactnative": { + "type": "Project", + "dependencies": { + "Common": "[1.0.0, )", + "Folly": "[1.0.0, )", + "Microsoft.UI.Xaml": "[2.7.0, )", + "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )", + "ReactCommon": "[1.0.0, )", + "ReactNative.Hermes.Windows": "[0.70.0, )", + "boost": "[1.76.0, )" + } + }, "microsoft.reactnative.managed": { "type": "Project", "dependencies": { - "Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9", - "Microsoft.ReactNative": "1.0.0" + "Microsoft.NETCore.UniversalWindowsPlatform": "[6.2.9, )", + "Microsoft.ReactNative": "[1.0.0, )" + } + }, + "reactcommon": { + "type": "Project", + "dependencies": { + "Folly": "[1.0.0, )", + "boost": "[1.76.0, )" } }, "reactnativepicker": { - "type": "Project" + "type": "Project", + "dependencies": { + "Microsoft.ReactNative": "[1.0.0, )", + "Microsoft.UI.Xaml": "[2.7.0, )" + } }, "reactnativexaml": { - "type": "Project" + "type": "Project", + "dependencies": { + "Microsoft.ReactNative": "[1.0.0, )", + "Microsoft.UI.Xaml": "[2.7.0, )" + } } }, "UAP,Version=v10.0.16299/win10-arm": { diff --git a/packages/e2e-test-app/windows/ReactUWPTestApp.sln b/packages/e2e-test-app/windows/ReactUWPTestApp.sln index 5751c7cddff..4b0dfeba140 100644 --- a/packages/e2e-test-app/windows/ReactUWPTestApp.sln +++ b/packages/e2e-test-app/windows/ReactUWPTestApp.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\..\..\vnext\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" EndProject diff --git a/packages/integration-test-app/windows/InteropTestModuleCS/InteropTestModuleCS.csproj b/packages/integration-test-app/windows/InteropTestModuleCS/InteropTestModuleCS.csproj index 2edad38bd2a..4730ba62514 100644 --- a/packages/integration-test-app/windows/InteropTestModuleCS/InteropTestModuleCS.csproj +++ b/packages/integration-test-app/windows/InteropTestModuleCS/InteropTestModuleCS.csproj @@ -16,7 +16,7 @@ UAP 10.0.19041.0 10.0.16299.0 - 16.0 + 17.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} false @@ -100,8 +100,8 @@ - - 16.0 + + 17.0 diff --git a/packages/integration-test-app/windows/integrationtest.sln b/packages/integration-test-app/windows/integrationtest.sln index b8fb1abf925..3c778126074 100644 --- a/packages/integration-test-app/windows/integrationtest.sln +++ b/packages/integration-test-app/windows/integrationtest.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integrationtest", "integrationtest\integrationtest.vcxproj", "{A24C443D-B107-4594-9F15-2CD83732B6CE}" ProjectSection(ProjectDependencies) = postProject diff --git a/packages/integration-test-app/windows/integrationtest/integrationtest.vcxproj b/packages/integration-test-app/windows/integrationtest/integrationtest.vcxproj index 7c0ddd6a53f..e2acc37db8b 100644 --- a/packages/integration-test-app/windows/integrationtest/integrationtest.vcxproj +++ b/packages/integration-test-app/windows/integrationtest/integrationtest.vcxproj @@ -8,7 +8,7 @@ integrationtest integrationtest en-US - 16.0 + 17.0 true Windows Store 10.0 @@ -174,7 +174,7 @@ - + diff --git a/packages/playground/CoreApp/CoreApp.vcxproj b/packages/playground/CoreApp/CoreApp.vcxproj index a749c1b41a5..d6424fff8a8 100644 --- a/packages/playground/CoreApp/CoreApp.vcxproj +++ b/packages/playground/CoreApp/CoreApp.vcxproj @@ -159,7 +159,7 @@ true true --> - + diff --git a/packages/playground/OpenWinUI3Win32PG.ps1 b/packages/playground/OpenWinUI3Win32PG.ps1 index edca2b8e09d..c73e233caeb 100644 --- a/packages/playground/OpenWinUI3Win32PG.ps1 +++ b/packages/playground/OpenWinUI3Win32PG.ps1 @@ -41,6 +41,6 @@ foreach ($filePath in $filesToUpdate) { $env:UseWinUI3='true' $env:UseExperimentalIXP='true' -& "C:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe" $PSScriptRoot\windows\playground-win32-packaged.sln +& "C:\Program Files\Microsoft Visual Studio\2022\Common7\IDE\devenv.exe" $PSScriptRoot\windows\playground-win32-packaged.sln diff --git a/packages/playground/windows/playground-composition.sln b/packages/playground/windows/playground-composition.sln index 5b1f15795d1..8fc8abace7b 100644 --- a/packages/playground/windows/playground-composition.sln +++ b/packages/playground/windows/playground-composition.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Playground-composition", "playground-composition\Playground-Composition.vcxproj", "{F54A991F-5535-43DF-AE79-85821E001675}" EndProject diff --git a/packages/playground/windows/playground-composition/Playground-Composition.vcxproj b/packages/playground/windows/playground-composition/Playground-Composition.vcxproj index c7fb64f776d..ebc24bef9d5 100644 --- a/packages/playground/windows/playground-composition/Playground-Composition.vcxproj +++ b/packages/playground/windows/playground-composition/Playground-Composition.vcxproj @@ -10,7 +10,7 @@ 10.0.18362.0 10.0.19041.0 en-US - 16.0 + 17.0 false @@ -46,7 +46,7 @@ Application Unicode - v142 + v143 true @@ -179,7 +179,7 @@ to be able to carry WinUI in-app instead of using the Framework Package --> - + diff --git a/packages/playground/windows/playground-win32-packaged.sln b/packages/playground/windows/playground-win32-packaged.sln index 0d51a0aa526..1fe18bc49c2 100644 --- a/packages/playground/windows/playground-win32-packaged.sln +++ b/packages/playground/windows/playground-win32-packaged.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Playground-win32", "playground-win32\Playground-Win32.vcxproj", "{8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}" EndProject diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index 6cc13388728..1834a9e5416 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Playground-win32", "playground-win32\Playground-Win32.vcxproj", "{8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}" EndProject diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index bac9d1c733d..eb9e3f1d809 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -11,7 +11,7 @@ 10.0.19041.0 false en-US - 16.0 + 17.0 false @@ -47,7 +47,7 @@ Application Unicode - v142 + v143 true @@ -174,7 +174,7 @@ to be able to carry WinUI in-app instead of using the Framework Package --> - + diff --git a/packages/playground/windows/playground.sln b/packages/playground/windows/playground.sln index 1e7eda8cbee..9158352d197 100644 --- a/packages/playground/windows/playground.sln +++ b/packages/playground/windows/playground.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playground", "playground\playground.vcxproj", "{6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}" ProjectSection(ProjectDependencies) = postProject diff --git a/packages/playground/windows/playground/Playground.vcxproj b/packages/playground/windows/playground/Playground.vcxproj index 3e3544c7fc3..1de6008efcc 100644 --- a/packages/playground/windows/playground/Playground.vcxproj +++ b/packages/playground/windows/playground/Playground.vcxproj @@ -9,7 +9,7 @@ playground playground en-US - 16.0 + 17.0 true Windows Store 10.0 @@ -164,7 +164,7 @@ - + diff --git a/packages/sample-apps/windows/SampleAppCPP/SampleAppCpp.vcxproj b/packages/sample-apps/windows/SampleAppCPP/SampleAppCpp.vcxproj index caf00d70f37..8f2b33aee69 100644 --- a/packages/sample-apps/windows/SampleAppCPP/SampleAppCpp.vcxproj +++ b/packages/sample-apps/windows/SampleAppCPP/SampleAppCpp.vcxproj @@ -8,7 +8,7 @@ SampleAppCpp SampleAppCpp en-US - 16.0 + 17.0 true Windows Store 10.0 @@ -173,7 +173,7 @@ - + diff --git a/packages/sample-apps/windows/SampleAppCS/SampleAppCS.csproj b/packages/sample-apps/windows/SampleAppCS/SampleAppCS.csproj index 243840abebb..32defe80a97 100644 --- a/packages/sample-apps/windows/SampleAppCS/SampleAppCS.csproj +++ b/packages/sample-apps/windows/SampleAppCS/SampleAppCS.csproj @@ -17,7 +17,7 @@ UAP 10.0.19041.0 10.0.16299.0 - 16.0 + 17.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -146,8 +146,8 @@ Designer - - 16.0 + + 17.0 diff --git a/packages/sample-apps/windows/SampleApps.sln b/packages/sample-apps/windows/SampleApps.sln index e61df7627fd..f0908fcc627 100644 --- a/packages/sample-apps/windows/SampleApps.sln +++ b/packages/sample-apps/windows/SampleApps.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleAppCS", "SampleAppCS\SampleAppCS.csproj", "{09F4E6C1-2D12-4059-AA96-0B190861FD6A}" EndProject diff --git a/packages/sample-apps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj b/packages/sample-apps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj index 77133dff6ab..b5870d6543c 100644 --- a/packages/sample-apps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj +++ b/packages/sample-apps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj @@ -8,7 +8,7 @@ SampleLibraryCpp SampleLibraryCpp en-US - 16.0 + 17.0 true Windows Store 10.0 @@ -150,7 +150,7 @@ - + diff --git a/packages/sample-apps/windows/SampleLibraryCS/SampleLibraryCS.csproj b/packages/sample-apps/windows/SampleLibraryCS/SampleLibraryCS.csproj index 95e7197a494..b9ec6d375d8 100644 --- a/packages/sample-apps/windows/SampleLibraryCS/SampleLibraryCS.csproj +++ b/packages/sample-apps/windows/SampleLibraryCS/SampleLibraryCS.csproj @@ -16,7 +16,7 @@ UAP 10.0.19041.0 10.0.16299.0 - 16.0 + 17.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} false @@ -108,8 +108,8 @@ Designer - - 16.0 + + 17.0 diff --git a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj index 19f2d8ffb91..9dbae890594 100644 --- a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj +++ b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj @@ -25,7 +25,7 @@ true {44DCED9B-9C4C-48FE-8545-0930192BBC16} React.Windows.Desktop.ABITests - 16.0 + 17.0 Win32Proj ReactWindowsDesktopABITests NativeUnitTestProject @@ -164,7 +164,7 @@ - + \ No newline at end of file diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index c41e3f20dd4..9a4a31503bd 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -122,7 +122,7 @@ - + diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index 0c48bd6ceeb..3787509e2db 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -122,7 +122,7 @@ - + diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index d1cf2df30f2..e8992ff085a 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -45,7 +45,7 @@ React.Windows.Desktop facebook.react en-US - 16.0 + 17.0 C++/WinRT 2 true @@ -333,7 +333,7 @@ - + diff --git a/vnext/Microsoft.ReactNative.ComponentTests/Microsoft.ReactNative.ComponentTests.vcxproj b/vnext/Microsoft.ReactNative.ComponentTests/Microsoft.ReactNative.ComponentTests.vcxproj index 03907f53cbe..3c8034c0704 100644 --- a/vnext/Microsoft.ReactNative.ComponentTests/Microsoft.ReactNative.ComponentTests.vcxproj +++ b/vnext/Microsoft.ReactNative.ComponentTests/Microsoft.ReactNative.ComponentTests.vcxproj @@ -4,7 +4,7 @@ true true true - 16.0 + 17.0 {93792779-4948-4A5D-8CA7-86ED5E3BEC27} Win32Proj ReactComponentTests @@ -227,7 +227,7 @@ - + diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj index 4d65409b809..0ed53f290d2 100644 --- a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj +++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj @@ -4,7 +4,7 @@ true true true - 16.0 + 17.0 {6c60e295-c8ca-4dc5-b8be-09888f58b249} Win32Proj Microsoft.ReactNative @@ -162,7 +162,7 @@ - + diff --git a/vnext/Microsoft.ReactNative.IntegrationTests/Microsoft.ReactNative.IntegrationTests.vcxproj b/vnext/Microsoft.ReactNative.IntegrationTests/Microsoft.ReactNative.IntegrationTests.vcxproj index e4c9016963c..a0baa37742f 100644 --- a/vnext/Microsoft.ReactNative.IntegrationTests/Microsoft.ReactNative.IntegrationTests.vcxproj +++ b/vnext/Microsoft.ReactNative.IntegrationTests/Microsoft.ReactNative.IntegrationTests.vcxproj @@ -2,7 +2,7 @@ true - 16.0 + 17.0 {14FA0516-E6D7-4E4D-B097-1470198C5072} Win32Proj Microsoft.ReactNative.IntegrationTests @@ -162,7 +162,7 @@ - + diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/AnalysisTestBase.cs b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/AnalysisTestBase.cs index 3a217f78f62..da42b894a16 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/AnalysisTestBase.cs +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/AnalysisTestBase.cs @@ -71,7 +71,7 @@ public class TestClass var microsoftNetCoreUwpPkgFolder = Path.Combine(uwpPath, microsoftNetCoreUwpPkgVersion.ToString(), "ref", uapVersion); if (!Directory.Exists(microsoftNetCoreUwpPkgFolder)) { - Assert.Fail($"Could not find path {microsoftNetCoreUwpPkgFolder}. This should have been installed as part of the UWP workload for Microsoft Visual Studio 2019 version 16.6"); + Assert.Fail($"Could not find path {microsoftNetCoreUwpPkgFolder}. This should have been installed as part of the UWP workload for Microsoft Visual Studio 2022 version 17.0"); } references.AddRange(Directory.EnumerateFiles(microsoftNetCoreUwpPkgFolder, "*.dll")); diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--AllFieldTypes.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--AllFieldTypes.lkg index 3156abdf516..8171f35e2cf 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--AllFieldTypes.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--AllFieldTypes.lkg @@ -15,9 +15,7 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { if (value != null) @@ -31,7 +29,5 @@ internal void CreateObjectSerializers() { writer.WriteNull(); } - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--AllPropertyTypes.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--AllPropertyTypes.lkg index 1189809ca64..98e0a415dc9 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--AllPropertyTypes.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--AllPropertyTypes.lkg @@ -18,9 +18,7 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { if (value != null) @@ -34,7 +32,5 @@ internal void CreateObjectSerializers() { writer.WriteNull(); } - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--EmptyClass.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--EmptyClass.lkg index b58e4a7df78..c12efb52ada 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--EmptyClass.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--EmptyClass.lkg @@ -12,9 +12,7 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { if (value != null) @@ -26,7 +24,5 @@ internal void CreateObjectSerializers() { writer.WriteNull(); } - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--NoExtern.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--NoExtern.lkg index b58e4a7df78..c12efb52ada 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--NoExtern.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--NoExtern.lkg @@ -12,9 +12,7 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { if (value != null) @@ -26,7 +24,5 @@ internal void CreateObjectSerializers() { writer.WriteNull(); } - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--NoStatics.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--NoStatics.lkg index b58e4a7df78..c12efb52ada 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--NoStatics.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenClassSerializerTests--NoStatics.lkg @@ -12,9 +12,7 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { if (value != null) @@ -26,7 +24,5 @@ internal void CreateObjectSerializers() { writer.WriteNull(); } - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantProviderTests--RegularCase.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantProviderTests--RegularCase.lkg index fcf4e1c2e12..507a86c7fc6 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantProviderTests--RegularCase.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantProviderTests--RegularCase.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddConstantProvider((global::Microsoft.ReactNative.IJSValueWriter { global::Microsoft.ReactNative.Managed.ReactConstantProvider provider = new global::Microsoft.ReactNative.Managed.ReactConstantProvider(writer); module.MyMethod(provider); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--FieldAndProperty.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--FieldAndProperty.lkg index 13c13ca03dc..05b8fbb2f4b 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--FieldAndProperty.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--FieldAndProperty.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddConstantProvider((global::Microsoft.ReactNative.IJSValueWriter { global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "MyField1", module.MyField1); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "MyProp", module.MyProp); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--SingleField.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--SingleField.lkg index 1a8106eb2bf..67a1098c01d 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--SingleField.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--SingleField.lkg @@ -1,6 +1,4 @@ moduleBuilder.AddConstantProvider((global::Microsoft.ReactNative.IJSValueWriter writer) => { global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "MyFieldWithBetterName", module.MyField); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--SingleProperty.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--SingleProperty.lkg index f41d45547a8..ecd6fde4c14 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--SingleProperty.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenConstantsTests--SingleProperty.lkg @@ -1,6 +1,4 @@ moduleBuilder.AddConstantProvider((global::Microsoft.ReactNative.IJSValueWriter writer) => { global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "MyPropWithBetterName", module.MyPop); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenGetConstantsTests--RegularCase.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenGetConstantsTests--RegularCase.lkg index 0d8ffdc6adf..0b2e5b96343 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenGetConstantsTests--RegularCase.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenGetConstantsTests--RegularCase.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddConstantProvider((global::Microsoft.ReactNative.IJSValueWriter global::Microsoft.ReactNative.Managed.ReactConstantProvider provider = new global::Microsoft.ReactNative.Managed.ReactConstantProvider(writer); var constants = module.MyMethod(); provider.WriteProperties(constants); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--DoubleArgCallbackParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--DoubleArgCallbackParamReturnVoid--Async.lkg index dbed5d17260..135d96fe264 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--DoubleArgCallbackParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--DoubleArgCallbackParamReturnVoid--Async.lkg @@ -1,6 +1,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnType.TwoCallbacks, (global::Microsoft.ReactNative.IJSValueReader reader, global::Microsoft.ReactNative.IJSValueWriter writer, global::Microsoft.ReactNative.MethodResultCallback resolve, global::Microsoft.ReactNative.MethodResultCallback reject) => { module.Method((value0) => resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0)), (value0) => reject(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0))); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--DoublePromiseParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--DoublePromiseParamReturnVoid--Async.lkg index 7a84f4d124d..974a2f97a6a 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--DoublePromiseParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--DoublePromiseParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out global::Microsoft.ReactNative.Managed.IReactPromise arg0); module.Method(arg0, new global::Microsoft.ReactNative.Managed.ReactPromise(writer, resolve, reject)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoubleArgCallbackParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoubleArgCallbackParamReturnVoid--Async.lkg index efcf3e57273..edfba8a5a94 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoubleArgCallbackParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoubleArgCallbackParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0); module.Method(arg0, (value0) => resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0)), (value0) => reject(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0))); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoubleMultipleArgCallbackParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoubleMultipleArgCallbackParamReturnVoid--Async.lkg index 07d32c9c6ba..815379cbbc7 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoubleMultipleArgCallbackParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoubleMultipleArgCallbackParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0); module.Method(arg0, (value0, value1, value2) => resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0, value1, value2)), (value0, value1) => reject(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0, value1))); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoublePromiseParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoublePromiseParamReturnVoid--Async.lkg index 2bc07f0ee98..cc0a5aef30b 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoublePromiseParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndDoublePromiseParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0, out global::Microsoft.ReactNative.Managed.IReactPromise arg1); module.Method(arg0, arg1, new global::Microsoft.ReactNative.Managed.ReactPromise(writer, resolve, reject)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndPromiseParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndPromiseParamReturnVoid--Async.lkg index 5aeeda3fac2..dc8c695fae2 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndPromiseParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndPromiseParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0); module.Method(arg0, new global::Microsoft.ReactNative.Managed.ReactPromise(writer, resolve, reject)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndSingleArgCallbackParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndSingleArgCallbackParamReturnVoid--Async.lkg index 47d7201aa0a..90055072144 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndSingleArgCallbackParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndSingleArgCallbackParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0); module.Method(arg0, (value0) => resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0))); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndSingleThreeArgCallbackParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndSingleThreeArgCallbackParamReturnVoid--Async.lkg index 2be8c0e4482..6c7ab637a53 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndSingleThreeArgCallbackParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--IntParamAndSingleThreeArgCallbackParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0); module.Method(arg0, (value0, value1, value2) => resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0, value1, value2))); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnInt--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnInt--Async.lkg index c18a223548a..f72b9274ed6 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnInt--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnInt--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { int result = module.Method(); resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, result)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnInt--Sync.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnInt--Sync.lkg index a1cc078c3ed..55178b51d62 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnInt--Sync.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnInt--Sync.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddSyncMethod("MyMethod", (global::Microsoft.ReactNative.IJSValueR { int result = module.Method(); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteValue(writer, result); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnVoid--Async.lkg index 62362a7a4a8..cb9a93f23e4 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--NoParamReturnVoid--Async.lkg @@ -1,6 +1,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnType.Void, (global::Microsoft.ReactNative.IJSValueReader reader, global::Microsoft.ReactNative.IJSValueWriter writer, global::Microsoft.ReactNative.MethodResultCallback resolve, global::Microsoft.ReactNative.MethodResultCallback reject) => { module.Method(); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnInt--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnInt--Async.lkg index a0c8f2704d0..d92fd216d6d 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnInt--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnInt--Async.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0); int result = module.Method(arg0); resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, result)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnInt--Sync.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnInt--Sync.lkg index e1498d68c8e..862a5e92b62 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnInt--Sync.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnInt--Sync.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddSyncMethod("MyMethod", (global::Microsoft.ReactNative.IJSValueR global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0); int result = module.Method(arg0); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteValue(writer, result); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnVoid--Async.lkg index 802115921d0..b37447e3a31 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--OneParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0); module.Method(arg0); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseParamReturnVoid--Async.lkg index 1f4196f3d16..b88961b3589 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseParamReturnVoid--Async.lkg @@ -1,6 +1,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnType.Promise, (global::Microsoft.ReactNative.IJSValueReader reader, global::Microsoft.ReactNative.IJSValueWriter writer, global::Microsoft.ReactNative.MethodResultCallback resolve, global::Microsoft.ReactNative.MethodResultCallback reject) => { module.Method(new global::Microsoft.ReactNative.Managed.ReactPromise(writer, resolve, reject)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseStructOneArgParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseStructOneArgParamReturnVoid--Async.lkg index 20923920e71..31a4b678e13 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseStructOneArgParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseStructOneArgParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out string arg0); module.Method(arg0, new global::Microsoft.ReactNative.Managed.ReactPromise(writer, resolve, reject)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseStructParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseStructParamReturnVoid--Async.lkg index 1f4196f3d16..b88961b3589 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseStructParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--PromiseStructParamReturnVoid--Async.lkg @@ -1,6 +1,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnType.Promise, (global::Microsoft.ReactNative.IJSValueReader reader, global::Microsoft.ReactNative.IJSValueWriter writer, global::Microsoft.ReactNative.MethodResultCallback resolve, global::Microsoft.ReactNative.MethodResultCallback reject) => { module.Method(new global::Microsoft.ReactNative.Managed.ReactPromise(writer, resolve, reject)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringParamReturnReadOnlyList--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringParamReturnReadOnlyList--Async.lkg index d4e8c6506d2..0482cbb6cf8 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringParamReturnReadOnlyList--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringParamReturnReadOnlyList--Async.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out global::System.Collections.Generic.IReadOnlyList arg0); string result = module.Method(arg0); resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, result)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringParamReturnReadOnlyList--Sync.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringParamReturnReadOnlyList--Sync.lkg index 64d9bb8f09a..405eb78c34f 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringParamReturnReadOnlyList--Sync.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringParamReturnReadOnlyList--Sync.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddSyncMethod("MyMethod", (global::Microsoft.ReactNative.IJSValueR global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out global::System.Collections.Generic.IReadOnlyList arg0); string result = module.Method(arg0); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteValue(writer, result); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringPromiseReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringPromiseReturnVoid--Async.lkg index 0f02be50be4..0606fdf5ead 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringPromiseReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ReadOnlyListOfStringPromiseReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out string arg0); module.Method(arg0, new global::Microsoft.ReactNative.Managed.ReactPromise>(writer, resolve, reject)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--SingleArgCallbackParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--SingleArgCallbackParamReturnVoid--Async.lkg index 54d9995dd42..113bab3e500 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--SingleArgCallbackParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--SingleArgCallbackParamReturnVoid--Async.lkg @@ -1,6 +1,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnType.Callback, (global::Microsoft.ReactNative.IJSValueReader reader, global::Microsoft.ReactNative.IJSValueWriter writer, global::Microsoft.ReactNative.MethodResultCallback resolve, global::Microsoft.ReactNative.MethodResultCallback reject) => { module.Method((value0) => resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0))); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--SingleArgCallbackWithReadOnlyListParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--SingleArgCallbackWithReadOnlyListParamReturnVoid--Async.lkg index 54d9995dd42..113bab3e500 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--SingleArgCallbackWithReadOnlyListParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--SingleArgCallbackWithReadOnlyListParamReturnVoid--Async.lkg @@ -1,6 +1,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnType.Callback, (global::Microsoft.ReactNative.IJSValueReader reader, global::Microsoft.ReactNative.IJSValueWriter writer, global::Microsoft.ReactNative.MethodResultCallback resolve, global::Microsoft.ReactNative.MethodResultCallback reject) => { module.Method((value0) => resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, value0))); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnInt--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnInt--Async.lkg index 691af6377bc..fd5805cd1cd 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnInt--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnInt--Async.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0, out string arg1, out double arg2); int result = module.Method(arg0, arg1, arg2); resolve(global::Microsoft.ReactNative.Managed.JSValueWriter.WriteArgs(writer, result)); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnInt--Sync.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnInt--Sync.lkg index a90a360a235..39d46b84ee1 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnInt--Sync.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnInt--Sync.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddSyncMethod("MyMethod", (global::Microsoft.ReactNative.IJSValueR global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0, out string arg1, out double arg2); int result = module.Method(arg0, arg1, arg2); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteValue(writer, result); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnVoid--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnVoid--Async.lkg index f108b688e36..6e6d57f9edb 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnVoid--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ThreeParamReturnVoid--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0, out string arg1, out double arg2); module.Method(arg0, arg1, arg2); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--TwoArgsTask--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--TwoArgsTask--Async.lkg index 616890bac84..88dd70066d2 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--TwoArgsTask--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--TwoArgsTask--Async.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0, out int arg1); global::System.Threading.Tasks.Task result = module.Method(arg0, arg1); global::Microsoft.ReactNative.Managed.ReactTaskExtensions.ContinueWith(result, writer, resolve, reject); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--TwoArgsTaskOfInt--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--TwoArgsTaskOfInt--Async.lkg index 6e53f2495aa..86fb73eb9bf 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--TwoArgsTaskOfInt--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--TwoArgsTaskOfInt--Async.lkg @@ -3,6 +3,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy global::Microsoft.ReactNative.Managed.JSValueReader.ReadArgs(reader, out int arg0, out int arg1); global::System.Threading.Tasks.Task result = module.Method(arg0, arg1); global::Microsoft.ReactNative.Managed.ReactTaskExtensions.ContinueWith(result, writer, resolve, reject); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTask--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTask--Async.lkg index a1f7eb0bd64..6b7613b2f88 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTask--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTask--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::System.Threading.Tasks.Task result = module.Method(); global::Microsoft.ReactNative.Managed.ReactTaskExtensions.ContinueWith(result, writer, resolve, reject); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTaskOfInt--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTaskOfInt--Async.lkg index dc4100010aa..b95897c3087 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTaskOfInt--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTaskOfInt--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::System.Threading.Tasks.Task result = module.Method(); global::Microsoft.ReactNative.Managed.ReactTaskExtensions.ContinueWith(result, writer, resolve, reject); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTaskOfReadOnlyListOfString--Async.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTaskOfReadOnlyListOfString--Async.lkg index 2ff32d00f4f..1931f7fb9f7 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTaskOfReadOnlyListOfString--Async.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenMethodTests--ZeroArgTaskOfReadOnlyListOfString--Async.lkg @@ -2,6 +2,4 @@ moduleBuilder.AddMethod("MyMethod", global::Microsoft.ReactNative.MethodReturnTy { global::System.Threading.Tasks.Task> result = module.Method(); global::Microsoft.ReactNative.Managed.ReactTaskExtensions.ContinueWith(result, writer, resolve, reject); -} - -); \ No newline at end of file +}); \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenModule--SingleModuleWithSingleConstant.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenModule--SingleModuleWithSingleConstant.lkg index 7ef52397e3f..8b6d939749d 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenModule--SingleModuleWithSingleConstant.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenModule--SingleModuleWithSingleConstant.lkg @@ -6,11 +6,7 @@ internal void CreateModules(global::Microsoft.ReactNative.IReactPackageBuilder p moduleBuilder.AddConstantProvider((global::Microsoft.ReactNative.IJSValueWriter writer) => { global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "MyConst", module.MyConstant); - } - - ); + }); return module; - } - - ); + }); } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenModule--TwoModuleWithSingleConstant.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenModule--TwoModuleWithSingleConstant.lkg index 5181542ae48..d4490fa6ada 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenModule--TwoModuleWithSingleConstant.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenModule--TwoModuleWithSingleConstant.lkg @@ -6,24 +6,16 @@ internal void CreateModules(global::Microsoft.ReactNative.IReactPackageBuilder p moduleBuilder.AddConstantProvider((global::Microsoft.ReactNative.IJSValueWriter writer) => { global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "MyConstant1", module.MyConstant1); - } - - ); + }); return module; - } - - ); + }); packageBuilder.AddModule("MyModule2", (global::Microsoft.ReactNative.IReactModuleBuilder moduleBuilder) => { global::TestClass.MyModule2 module = new global::TestClass.MyModule2(); moduleBuilder.AddConstantProvider((global::Microsoft.ReactNative.IJSValueWriter writer) => { global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "MyConstant2", module.MyConstant2); - } - - ); + }); return module; - } - - ); + }); } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllFieldTypes.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllFieldTypes.lkg index 20454a1fc7f..7d045eaeaf0 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllFieldTypes.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllFieldTypes.lkg @@ -15,16 +15,12 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { writer.WriteObjectBegin(); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "X", value.X); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "Z", value.Z); writer.WriteObjectEnd(); - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllFieldTypesWithReactPropertyAttribute.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllFieldTypesWithReactPropertyAttribute.lkg index 6c3a2232060..2a809eea7ed 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllFieldTypesWithReactPropertyAttribute.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllFieldTypesWithReactPropertyAttribute.lkg @@ -21,9 +21,7 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { writer.WriteObjectBegin(); @@ -32,7 +30,5 @@ internal void CreateObjectSerializers() global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "x2", value.X2); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "z2", value.Z2); writer.WriteObjectEnd(); - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllPropertyTypes.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllPropertyTypes.lkg index e5505bcd08f..cbb893ea73e 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllPropertyTypes.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--AllPropertyTypes.lkg @@ -18,16 +18,12 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { writer.WriteObjectBegin(); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "X", value.X); global::Microsoft.ReactNative.Managed.JSValueWriter.WriteObjectProperty(writer, "Z", value.Z); writer.WriteObjectEnd(); - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--EmptyClass.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--EmptyClass.lkg index d5fbc12562a..430e53b64df 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--EmptyClass.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--EmptyClass.lkg @@ -12,14 +12,10 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { writer.WriteObjectBegin(); writer.WriteObjectEnd(); - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--NoExtern.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--NoExtern.lkg index d5fbc12562a..430e53b64df 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--NoExtern.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--NoExtern.lkg @@ -12,14 +12,10 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { writer.WriteObjectBegin(); writer.WriteObjectEnd(); - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--NoStatics.lkg b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--NoStatics.lkg index d5fbc12562a..430e53b64df 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--NoStatics.lkg +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/CodeGen/Lkg/Microsoft.ReactNative.Managed.CodeGen.UnitTests.CodeGen.CodeGenStructSerializerTests--NoStatics.lkg @@ -12,14 +12,10 @@ internal void CreateObjectSerializers() } } } - } - - ; + }; global::Microsoft.ReactNative.Managed.JSValueWriterOf.WriteValue = (writer, value) => { writer.WriteObjectBegin(); writer.WriteObjectEnd(); - } - - ; + }; } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/Microsoft.ReactNative.Managed.CodeGen.UnitTests.csproj b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/Microsoft.ReactNative.Managed.CodeGen.UnitTests.csproj index 5b63d10dca1..0d393a8ee72 100644 --- a/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/Microsoft.ReactNative.Managed.CodeGen.UnitTests.csproj +++ b/vnext/Microsoft.ReactNative.Managed.CodeGen.UnitTests/Microsoft.ReactNative.Managed.CodeGen.UnitTests.csproj @@ -1,11 +1,11 @@ - netcoreapp3.1 + net6.0 x64 win-x64 false - x64;x86;ARM;ARM64 + x64;x86;ARM64 @@ -14,13 +14,13 @@ - - - - - + + + + + - + @@ -154,8 +155,8 @@ - - 16.0 + + 17.0 diff --git a/vnext/Microsoft.ReactNative.Managed/packages.lock.json b/vnext/Microsoft.ReactNative.Managed/packages.lock.json index 04e54db679e..6b86a7f0943 100644 --- a/vnext/Microsoft.ReactNative.Managed/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed/packages.lock.json @@ -24,6 +24,11 @@ "Microsoft.SourceLink.Common": "1.0.0" } }, + "boost": { + "type": "Transitive", + "resolved": "1.76.0", + "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -53,13 +58,23 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" + "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" }, + "Microsoft.UI.Xaml": { + "type": "Transitive", + "resolved": "2.7.0", + "contentHash": "dB4im13tfmMgL/V3Ei+3kD2rUF+/lTxAmR4gjJ45l577eljHfdo/KUrxpq/3I1Vp6e5GCDG1evDaEGuDxypLMg==" + }, + "Microsoft.Windows.SDK.BuildTools": { + "type": "Transitive", + "resolved": "10.0.22000.194", + "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg==" + }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -68,6 +83,11 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, + "ReactNative.Hermes.Windows": { + "type": "Transitive", + "resolved": "0.0.0-2209.12005-9f3ce7e5", + "contentHash": "/RxDNnNA6w42Kz7cEep5wc6j8cmE4jepbjm5ElWXYWPHg4xu5D0AIj6RQ+WW2DxUHaDhbm6pjtS7MJSWagdi+g==" + }, "runtime.win10-arm.Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -135,8 +155,37 @@ "resolved": "2.2.9", "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ==" }, - "microsoft.reactnative": { + "common": { + "type": "Project" + }, + "fmt": { "type": "Project" + }, + "folly": { + "type": "Project", + "dependencies": { + "boost": "[1.76.0, )", + "fmt": "[1.0.0, )" + } + }, + "microsoft.reactnative": { + "type": "Project", + "dependencies": { + "Common": "[1.0.0, )", + "Folly": "[1.0.0, )", + "Microsoft.UI.Xaml": "[2.7.0, )", + "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )", + "ReactCommon": "[1.0.0, )", + "ReactNative.Hermes.Windows": "[0.0.0-2209.12005-9f3ce7e5, )", + "boost": "[1.76.0, )" + } + }, + "reactcommon": { + "type": "Project", + "dependencies": { + "Folly": "[1.0.0, )", + "boost": "[1.76.0, )" + } } }, "UAP,Version=v10.0.16299/win10-arm": { diff --git a/vnext/Microsoft.ReactNative.WindowsAppSDK.sln b/vnext/Microsoft.ReactNative.WindowsAppSDK.sln index c0d98bb2e92..ba3b5d73f5b 100644 --- a/vnext/Microsoft.ReactNative.WindowsAppSDK.sln +++ b/vnext/Microsoft.ReactNative.WindowsAppSDK.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31410.357 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.WindowsAppSDK", "Microsoft.ReactNative.WindowsAppSDK\Microsoft.ReactNative.WindowsAppSDK.csproj", "{FB80EBB0-1E51-465D-953C-72829AE0E9EF}" EndProject diff --git a/vnext/Microsoft.ReactNative.WindowsAppSDK/Microsoft.ReactNative.WindowsAppSDK.csproj b/vnext/Microsoft.ReactNative.WindowsAppSDK/Microsoft.ReactNative.WindowsAppSDK.csproj index 518d2a5ad7b..f8e3d07084c 100644 --- a/vnext/Microsoft.ReactNative.WindowsAppSDK/Microsoft.ReactNative.WindowsAppSDK.csproj +++ b/vnext/Microsoft.ReactNative.WindowsAppSDK/Microsoft.ReactNative.WindowsAppSDK.csproj @@ -1,6 +1,6 @@ - net5.0-windows10.0.19041.0 + net6.0-windows10.0.19041.0 x64 @@ -17,11 +17,11 @@ - + - - + + diff --git a/vnext/Microsoft.ReactNative.WindowsAppSDK/nuget/Microsoft.ReactNative.WindowsAppSDK.local.nuspec b/vnext/Microsoft.ReactNative.WindowsAppSDK/nuget/Microsoft.ReactNative.WindowsAppSDK.local.nuspec index 04e9349f5c2..4fbf90a3186 100644 --- a/vnext/Microsoft.ReactNative.WindowsAppSDK/nuget/Microsoft.ReactNative.WindowsAppSDK.local.nuspec +++ b/vnext/Microsoft.ReactNative.WindowsAppSDK/nuget/Microsoft.ReactNative.WindowsAppSDK.local.nuspec @@ -15,16 +15,16 @@ - + - + - + diff --git a/vnext/Microsoft.ReactNative.sln b/vnext/Microsoft.ReactNative.sln index b9d794948d0..6d5620dbcba 100644 --- a/vnext/Microsoft.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30002.166 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" EndProject diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index c8758ea13e2..316794c28d4 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -9,7 +9,7 @@ Microsoft.ReactNative Microsoft.ReactNative en-US - 16.0 + 17.0 true Windows Store 10.0 @@ -732,7 +732,7 @@ - + diff --git a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj index ba81fd0464b..65e4c389605 100644 --- a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj +++ b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj @@ -4,7 +4,7 @@ true true true - 16.0 + 17.0 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE} Win32Proj MsoUnitTests @@ -145,7 +145,7 @@ - + \ No newline at end of file diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.WinAppSDK.CSharpApp.targets b/vnext/PropertySheets/External/Microsoft.ReactNative.WinAppSDK.CSharpApp.targets new file mode 100644 index 00000000000..7d74430457e --- /dev/null +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.WinAppSDK.CSharpApp.targets @@ -0,0 +1,27 @@ + + + + + + + + + + <_PublishDepsJson Include="@(PackagingOutputs->WithMetadataValue('OutputGroup', 'PublishItemsOutputGroupOutput'))" + Condition="$([System.String]::Copy('%(FileName)%(Extension)').EndsWith('.deps.json'))" /> + <_BuildDepsJson Include="@(PackagingOutputs->WithMetadataValue('OutputGroup', 'GetCopyToOutputDirectoryItemsOutputGroup'))" + Condition="$([System.String]::Copy('%(FileName)%(Extension)').EndsWith('.deps.json'))" /> + + + + + + \ No newline at end of file diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index 1200510b70c..9463754f916 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -7,7 +7,7 @@ en-US - 16.0 + 17.0 diff --git a/vnext/PropertySheets/WinUI.props b/vnext/PropertySheets/WinUI.props index 49e28b6ae64..bcdf3924b8d 100644 --- a/vnext/PropertySheets/WinUI.props +++ b/vnext/PropertySheets/WinUI.props @@ -2,7 +2,7 @@ - 1.1.4 + 1.1.5 diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 6b4275b2220..e27cfaacf8b 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29009.5 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" EndProject diff --git a/vnext/Scripts/IntegrationTests.ps1 b/vnext/Scripts/IntegrationTests.ps1 index 3874e08b5dd..3c9b36215e6 100644 --- a/vnext/Scripts/IntegrationTests.ps1 +++ b/vnext/Scripts/IntegrationTests.ps1 @@ -34,7 +34,7 @@ param ( [switch] $List, - [System.IO.FileInfo] $VsTest = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\" + + [System.IO.FileInfo] $VsTest = "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\" + "Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe", [System.IO.DirectoryInfo] $ReactNativeLocation = "$($PSScriptRoot | Split-Path)", diff --git a/vnext/Scripts/JustMyXaml.ps1 b/vnext/Scripts/JustMyXaml.ps1 index 8fcd02a7357..1e0e475b488 100644 --- a/vnext/Scripts/JustMyXaml.ps1 +++ b/vnext/Scripts/JustMyXaml.ps1 @@ -1,4 +1,4 @@ -# This script enables or disables VS 2019's JustMyXaml feature +# This script enables or disables VS 2022's JustMyXaml feature [CmdletBinding()] param([bool]$Enable) @@ -7,14 +7,14 @@ if (!([bool](([System.Security.Principal.WindowsIdentity]::GetCurrent()).groups } $instanceId = & "$(${env:ProgramFiles(x86)})\Microsoft Visual Studio\Installer\vswhere.exe" -property instanceId -$hiveFile = "$($env:LocalAppData)\Microsoft\VisualStudio\16.0_$instanceId\privateregistry.bin" -& reg.exe load HKLM\VS2019_HIVE $hiveFile | Out-Null -New-PSDrive -Name VS2019 -PSProvider Registry -Root HKLM\VS2019_HIVE -ErrorAction Stop | Out-Null -$currentValue = (Get-ItemProperty VS2019:\Software\Microsoft\VisualStudio\16.0_$instanceId\Debugger -Name EnableXamlVisualDiagnosticsJustMyXaml).EnableXamlVisualDiagnosticsJustMyXaml +$hiveFile = "$($env:LocalAppData)\Microsoft\VisualStudio\17.0_$instanceId\privateregistry.bin" +& reg.exe load HKLM\VS2022_HIVE $hiveFile | Out-Null +New-PSDrive -Name VS2022 -PSProvider Registry -Root HKLM\VS2022_HIVE -ErrorAction Stop | Out-Null +$currentValue = (Get-ItemProperty VS2022:\Software\Microsoft\VisualStudio\17.0_$instanceId\Debugger -Name EnableXamlVisualDiagnosticsJustMyXaml).EnableXamlVisualDiagnosticsJustMyXaml if ($currentValue -eq 0) { $currentValue = $false; } else { $currentValue = $true; } Write-Host "Current value: $currentValue" if ($Enable) { $newValue = 1; } else { $newValue = 0; } -Set-ItemProperty VS2019:\Software\Microsoft\VisualStudio\16.0_$instanceId\Debugger -Name EnableXamlVisualDiagnosticsJustMyXaml -Value $newValue -Type DWord +Set-ItemProperty VS2022:\Software\Microsoft\VisualStudio\17.0_$instanceId\Debugger -Name EnableXamlVisualDiagnosticsJustMyXaml -Value $newValue -Type DWord Write-Host "New value: $Enable" -Remove-PSDrive -Name VS2019 -& reg.exe unload HKLM\VS2019_HIVE | Out-Null +Remove-PSDrive -Name VS2022 +& reg.exe unload HKLM\VS2022_HIVE | Out-Null diff --git a/vnext/Scripts/Microsoft.ReactNative.Managed.nuspec b/vnext/Scripts/Microsoft.ReactNative.Managed.nuspec index c594c781c06..3ac982d47b7 100644 --- a/vnext/Scripts/Microsoft.ReactNative.Managed.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.Managed.nuspec @@ -26,7 +26,7 @@ - + diff --git a/vnext/Scripts/Microsoft.ReactNative.WindowsAppSDK.nuspec b/vnext/Scripts/Microsoft.ReactNative.WindowsAppSDK.nuspec index 39590640b42..fb446cd9ffb 100644 --- a/vnext/Scripts/Microsoft.ReactNative.WindowsAppSDK.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.WindowsAppSDK.nuspec @@ -15,16 +15,16 @@ - + - + - + diff --git a/vnext/Scripts/UnitTest.ps1 b/vnext/Scripts/UnitTest.ps1 index 76fbf09c368..010e114948c 100644 --- a/vnext/Scripts/UnitTest.ps1 +++ b/vnext/Scripts/UnitTest.ps1 @@ -23,7 +23,7 @@ param ( "ReactCommon.UnitTests\ReactCommon.UnitTests.exe") ), - [System.IO.FileInfo] $VsTest = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" + [System.IO.FileInfo] $VsTest = "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" ) if ($Include.Count) { diff --git a/vnext/Scripts/rnw-dependencies.ps1 b/vnext/Scripts/rnw-dependencies.ps1 index c0c7688e16c..b2947b6c377 100644 --- a/vnext/Scripts/rnw-dependencies.ps1 +++ b/vnext/Scripts/rnw-dependencies.ps1 @@ -7,7 +7,7 @@ param( [string]$Check = [CheckId]::All, [Parameter(ValueFromRemainingArguments)] - [ValidateSet('appDev', 'rnwDev', 'buildLab', 'vs2019', 'clone')] + [ValidateSet('appDev', 'rnwDev', 'buildLab', 'vs2022', 'clone')] [String[]]$Tags = @('appDev'), [switch]$Enterprise = $false ) @@ -73,7 +73,7 @@ $vsWorkloads = @('Microsoft.VisualStudio.Workload.ManagedDesktop', 'Microsoft.VisualStudio.Workload.Universal'); # The minimum VS version to check for -$vsver = "16.5" +$vsver = "17.0" $v = [System.Environment]::OSVersion.Version; if ($env:Agent_BuildDirectory) { @@ -116,9 +116,9 @@ function InstallVS { # No VSWhere / VS_Installer if ($Enterprise) { # The CI machines need the enterprise version of VS as that is what is hardcoded in all the scripts - & choco install -y visualstudio2019enterprise + & choco install -y visualstudio2022enterprise } else { - & choco install -y visualstudio2019community + & choco install -y visualstudio2022community } $channelId = & $vsWhere -version $vsver -property channelId $productId = & $vsWhere -version $vsver -property productId @@ -279,7 +279,7 @@ $requirements = @( @{ Id=[CheckId]::VSUWP; Name = 'Compilers, build tools, SDKs and Visual Studio'; - Tags = @('appDev', 'vs2019'); + Tags = @('appDev', 'vs2022'); Valid = { CheckVS; } Install = { InstallVS }; }, @@ -378,14 +378,14 @@ $requirements = @( }, @{ ID=[CheckId]::DotNetCore; - Name = ".net core 3.1" + Name = ".NET 6" Tags = @('appDev'); Valid = { try { - $x = dotnet --info | Where-Object { $_ -like '*Microsoft.NETCore.App 3.1*'}; + $x = dotnet --info | Where-Object { $_ -like '*Microsoft.NETCore.App 6.0.*'}; ($x -ne $null) -and ($x.Length -ge 1) } catch { $false }; } Install = { - & choco install -y dotnetcore-3.1-sdk + & choco install -y dotnet-6.0-sdk } } ); diff --git a/vnext/template/cpp-app/proj/MyApp.sln b/vnext/template/cpp-app/proj/MyApp.sln index 19a0828c26b..a84de264019 100644 --- a/vnext/template/cpp-app/proj/MyApp.sln +++ b/vnext/template/cpp-app/proj/MyApp.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{{ name }}", "{{ name }}\{{ name }}.vcxproj", "{{ projectGuidUpper }}" {{^useExperimentalNuget}} diff --git a/vnext/template/cpp-app/proj/MyApp.vcxproj b/vnext/template/cpp-app/proj/MyApp.vcxproj index 2ce8cb569ed..9bea7019e88 100644 --- a/vnext/template/cpp-app/proj/MyApp.vcxproj +++ b/vnext/template/cpp-app/proj/MyApp.vcxproj @@ -10,7 +10,7 @@ {{ name }} {{ namespace }} en-US - 16.0 + 17.0 true Windows Store 10.0 @@ -159,7 +159,7 @@ {{#cppNugetPackages}} - + {{/cppNugetPackages}} diff --git a/vnext/template/cpp-lib/proj/MyLib.sln b/vnext/template/cpp-lib/proj/MyLib.sln index 19a0828c26b..a84de264019 100644 --- a/vnext/template/cpp-lib/proj/MyLib.sln +++ b/vnext/template/cpp-lib/proj/MyLib.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{{ name }}", "{{ name }}\{{ name }}.vcxproj", "{{ projectGuidUpper }}" {{^useExperimentalNuget}} diff --git a/vnext/template/cpp-lib/proj/MyLib.vcxproj b/vnext/template/cpp-lib/proj/MyLib.vcxproj index 1f0453661ce..00a435cf620 100644 --- a/vnext/template/cpp-lib/proj/MyLib.vcxproj +++ b/vnext/template/cpp-lib/proj/MyLib.vcxproj @@ -10,7 +10,7 @@ {{ name }} {{ namespace }} en-US - 16.0 + 17.0 true Windows Store 10.0 @@ -131,7 +131,7 @@ {{#cppNugetPackages}} - + {{/cppNugetPackages}} diff --git a/vnext/template/cs-app-WinAppSDK/proj/MyApp.csproj b/vnext/template/cs-app-WinAppSDK/proj/MyApp.csproj index c5e9b8c7aa8..324455e8d59 100644 --- a/vnext/template/cs-app-WinAppSDK/proj/MyApp.csproj +++ b/vnext/template/cs-app-WinAppSDK/proj/MyApp.csproj @@ -1,8 +1,11 @@ + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + WinExe - net5.0-windows10.0.19041.0 + net6.0-windows10.0.19041.0 10.0.17763.0 {{namespace}} app.manifest @@ -23,9 +26,6 @@ - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ - @@ -33,13 +33,16 @@ - - + + {{#csNugetPackages}} {{ version }} + {{^privateAssets}} + all + {{/privateAssets}} {{/csNugetPackages}} @@ -50,4 +53,14 @@ + + + + + + This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}. + + + + diff --git a/vnext/template/cs-app-WinAppSDK/proj/MyApp.sln b/vnext/template/cs-app-WinAppSDK/proj/MyApp.sln index 17ceeb07436..ac86eb1e393 100644 --- a/vnext/template/cs-app-WinAppSDK/proj/MyApp.sln +++ b/vnext/template/cs-app-WinAppSDK/proj/MyApp.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31220.234 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{ name }}", "{{ name }}\{{ name }}.csproj", "{{ projectGuidUpper }}" EndProject diff --git a/vnext/template/cs-app/proj/MyApp.csproj b/vnext/template/cs-app/proj/MyApp.csproj index 69c9575360a..ffca45ac909 100644 --- a/vnext/template/cs-app/proj/MyApp.csproj +++ b/vnext/template/cs-app/proj/MyApp.csproj @@ -18,7 +18,7 @@ UAP 10.0.19041.0 10.0.16299.0 - 16.0 + 17.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -134,8 +134,8 @@ Designer - - 16.0 + + 17.0 @@ -145,6 +145,9 @@ {{#csNugetPackages}} {{ version }} + {{^privateAssets}} + all + {{/privateAssets}} {{/csNugetPackages}} diff --git a/vnext/template/cs-app/proj/MyApp.sln b/vnext/template/cs-app/proj/MyApp.sln index ac487d903b2..f5e486fe996 100644 --- a/vnext/template/cs-app/proj/MyApp.sln +++ b/vnext/template/cs-app/proj/MyApp.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{ name }}", "{{ name }}\{{ name }}.csproj", "{{ projectGuidUpper }}" EndProject diff --git a/vnext/template/cs-lib/proj/MyLib.csproj b/vnext/template/cs-lib/proj/MyLib.csproj index 85b658d0840..14ad393ef47 100644 --- a/vnext/template/cs-lib/proj/MyLib.csproj +++ b/vnext/template/cs-lib/proj/MyLib.csproj @@ -18,7 +18,7 @@ UAP 10.0.19041.0 10.0.16299.0 - 16.0 + 17.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -106,11 +106,14 @@ {{#csNugetPackages}} {{ version }} + {{^privateAssets}} + all + {{/privateAssets}} {{/csNugetPackages}} - - 16.0 + + 17.0 diff --git a/vnext/template/cs-lib/proj/MyLib.sln b/vnext/template/cs-lib/proj/MyLib.sln index ac487d903b2..f5e486fe996 100644 --- a/vnext/template/cs-lib/proj/MyLib.sln +++ b/vnext/template/cs-lib/proj/MyLib.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{ name }}", "{{ name }}\{{ name }}.csproj", "{{ projectGuidUpper }}" EndProject diff --git a/yarn.lock b/yarn.lock index e2a5ac9e935..febd07e0037 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9741,10 +9741,10 @@ react-native-tscodegen@0.68.4: nullthrows "1.1.1" typescript "^4.1.5" -react-native-xaml@^0.0.68: - version "0.0.68" - resolved "https://registry.yarnpkg.com/react-native-xaml/-/react-native-xaml-0.0.68.tgz#f4690260e549f8394a02fad0458a1e0651b77a11" - integrity sha512-C28D4mhYe4tSESKb+S/FBUcUTD3LA7uZZdoN0H7JartTYVyNosx6hVcplsnC6a8dEDYm27bpcW4y/tdglC/aJA== +react-native-xaml@^0.0.70: + version "0.0.70" + resolved "https://registry.yarnpkg.com/react-native-xaml/-/react-native-xaml-0.0.70.tgz#367b045e5944e6fb1a32e4e2ac40c91d1ab86e71" + integrity sha512-aM59oQKEyoDwctiK2MWjN7bEkLjeNsrq89V31csH4e8hFcUXebLNloovcIQ4BL+snfjXR++ow9UiD5ZgU1ivwA== dependencies: "@types/react" "*" "@types/react-native" "*"