From 84889d987675057dc141b3810184372e2f3a4e7e Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Tue, 17 Sep 2024 16:09:12 -0700 Subject: [PATCH 01/13] initial attempt at fabric cs app --- ...ReactNative.CSharp.PackageReferences.props | 17 +- ...ReactNative.CSharp.ProjectReferences.props | 2 +- ...ft.ReactNative.Composition.CSharpApp.props | 24 +++ ....ReactNative.Composition.CSharpApp.targets | 49 +++++ ...osoft.ReactNative.WindowsSdk.Default.props | 5 + vnext/templates/cs-app/NuGet_Config | 13 ++ vnext/templates/cs-app/jest.config.windows.js | 3 + vnext/templates/cs-app/metro.config.js | 54 +++++ vnext/templates/cs-app/template.config.js | 137 +++++++++++++ .../cs-app/windows/ExperimentalFeatures.props | 12 ++ .../Images/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../Images/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Images/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../Images/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes .../MyApp.Package/Images/StoreLogo.png | Bin 0 -> 1451 bytes .../Images/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../MyApp.Package/MyApp.Package.wapproj | 79 ++++++++ .../MyApp.Package/Package.appxmanifest | 49 +++++ vnext/templates/cs-app/windows/MyApp.sln | 186 ++++++++++++++++++ .../MyApp/AutolinkedNativeModules.g.cs | 15 ++ .../cs-app/windows/MyApp/MyApp.csproj | 37 ++++ .../templates/cs-app/windows/MyApp/MyApp.ico | Bin 0 -> 46227 bytes .../cs-app/windows/MyApp/MyApp.vcxproj | 143 ++++++++++++++ .../templates/cs-app/windows/MyApp/Program.cs | 63 ++++++ .../PublishProfiles/win-arm64.pubxml | 19 ++ .../Properties/PublishProfiles/win-x64.pubxml | 19 ++ .../Properties/PublishProfiles/win-x86.pubxml | 19 ++ .../templates/cs-app/windows/MyApp/_gitignore | 1 + .../cs-app/windows/MyApp/app.manifest | 19 ++ vnext/templates/cs-app/windows/_gitignore | 41 ++++ 31 files changed, 1001 insertions(+), 5 deletions(-) create mode 100644 vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.props create mode 100644 vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.targets create mode 100644 vnext/templates/cs-app/NuGet_Config create mode 100644 vnext/templates/cs-app/jest.config.windows.js create mode 100644 vnext/templates/cs-app/metro.config.js create mode 100644 vnext/templates/cs-app/template.config.js create mode 100644 vnext/templates/cs-app/windows/ExperimentalFeatures.props create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/Images/LockScreenLogo.scale-200.png create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/Images/SplashScreen.scale-200.png create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/Images/Square150x150Logo.scale-200.png create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/Images/Square44x44Logo.scale-200.png create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/Images/StoreLogo.png create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/Images/Wide310x150Logo.scale-200.png create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/MyApp.Package.wapproj create mode 100644 vnext/templates/cs-app/windows/MyApp.Package/Package.appxmanifest create mode 100644 vnext/templates/cs-app/windows/MyApp.sln create mode 100644 vnext/templates/cs-app/windows/MyApp/AutolinkedNativeModules.g.cs create mode 100644 vnext/templates/cs-app/windows/MyApp/MyApp.csproj create mode 100644 vnext/templates/cs-app/windows/MyApp/MyApp.ico create mode 100644 vnext/templates/cs-app/windows/MyApp/MyApp.vcxproj create mode 100644 vnext/templates/cs-app/windows/MyApp/Program.cs create mode 100644 vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-arm64.pubxml create mode 100644 vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-x64.pubxml create mode 100644 vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-x86.pubxml create mode 100644 vnext/templates/cs-app/windows/MyApp/_gitignore create mode 100644 vnext/templates/cs-app/windows/MyApp/app.manifest create mode 100644 vnext/templates/cs-app/windows/_gitignore diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.CSharp.PackageReferences.props b/vnext/PropertySheets/External/Microsoft.ReactNative.CSharp.PackageReferences.props index 98835eff28c..d25e0474050 100644 --- a/vnext/PropertySheets/External/Microsoft.ReactNative.CSharp.PackageReferences.props +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.CSharp.PackageReferences.props @@ -5,8 +5,17 @@ --> - - - - + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.CSharp.ProjectReferences.props b/vnext/PropertySheets/External/Microsoft.ReactNative.CSharp.ProjectReferences.props index 545358bbdc0..7aa0e237509 100644 --- a/vnext/PropertySheets/External/Microsoft.ReactNative.CSharp.ProjectReferences.props +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.CSharp.ProjectReferences.props @@ -11,7 +11,7 @@ Microsoft.ReactNative false - + {F2824844-CE15-4242-9420-308923CD76C3} Microsoft.ReactNative.Managed false diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.props b/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.props new file mode 100644 index 00000000000..2ab53a69dd4 --- /dev/null +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.props @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.targets b/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.targets new file mode 100644 index 00000000000..747412fa29e --- /dev/null +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.targets @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props b/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props index b0465062c74..5714a214cb0 100644 --- a/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props @@ -27,6 +27,11 @@ 10.0.22621.0 10.0.17763.0 + + net8.0-windows$(TargetPlatformVersion) + x86;x64;ARM64 + win-x86;win-x64;win-arm64 + win10-x86;win10-x64;win10-arm64 diff --git a/vnext/templates/cs-app/NuGet_Config b/vnext/templates/cs-app/NuGet_Config new file mode 100644 index 00000000000..3999764daf2 --- /dev/null +++ b/vnext/templates/cs-app/NuGet_Config @@ -0,0 +1,13 @@ + + + + +{{#addReactNativePublicAdoFeed}} + +{{/addReactNativePublicAdoFeed}} + + + + + + diff --git a/vnext/templates/cs-app/jest.config.windows.js b/vnext/templates/cs-app/jest.config.windows.js new file mode 100644 index 00000000000..4ae04e8b489 --- /dev/null +++ b/vnext/templates/cs-app/jest.config.windows.js @@ -0,0 +1,3 @@ +const config = {}; + +module.exports = require('@rnx-kit/jest-preset')('windows', config); diff --git a/vnext/templates/cs-app/metro.config.js b/vnext/templates/cs-app/metro.config.js new file mode 100644 index 00000000000..9b895505533 --- /dev/null +++ b/vnext/templates/cs-app/metro.config.js @@ -0,0 +1,54 @@ +const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config'); + +const fs = require('fs'); +const path = require('path'); +const exclusionList = require('metro-config/src/defaults/exclusionList'); + +const rnwPath = fs.realpathSync( + path.resolve(require.resolve('react-native-windows/package.json'), '..'), +); + +//{{#devMode}} [devMode +const rnwRootNodeModules = path.resolve(rnwPath, '..', 'node_modules'); +const rnwPackages = path.resolve(rnwPath, '..', 'packages'); +// devMode]{{/devMode}} + +/** + * Metro configuration + * https://facebook.github.io/metro/docs/configuration + * + * @type {import('metro-config').MetroConfig} + */ + +const config = { + //{{#devMode}} [devMode + watchFolders: [rnwPath, rnwRootNodeModules, rnwPackages], + // devMode]{{/devMode}} + resolver: { + blockList: exclusionList([ + // This stops "npx @react-native-community/cli run-windows" from causing the metro server to crash if its already running + new RegExp( + `${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`, + ), + // This prevents "npx @react-native-community/cli run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip or other files produced by msbuild + new RegExp(`${rnwPath}/build/.*`), + new RegExp(`${rnwPath}/target/.*`), + /.*\.ProjectImports\.zip/, + ]), + //{{#devMode}} [devMode + extraNodeModules: { + 'react-native-windows': rnwPath, + }, + // devMode]{{/devMode}} + }, + transformer: { + getTransformOptions: async () => ({ + transform: { + experimentalImportSupport: false, + inlineRequires: true, + }, + }), + }, +}; + +module.exports = mergeConfig(getDefaultConfig(__dirname), config); diff --git a/vnext/templates/cs-app/template.config.js b/vnext/templates/cs-app/template.config.js new file mode 100644 index 00000000000..d437ef71954 --- /dev/null +++ b/vnext/templates/cs-app/template.config.js @@ -0,0 +1,137 @@ +/** + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * @ts check + * @format + */ + +const chalk = require('chalk'); +const crypto = require('crypto'); +const existsSync = require('fs').existsSync; +const path = require('path'); +const username = require('username'); +const util = require('util'); + +const glob = util.promisify(require('glob')); + +const templateUtils = require('../templateUtils'); + +async function preInstall(config = {}, options = {}) {} + +async function getFileMappings(config = {}, options = {}) { + const projectRoot = config?.root ?? process.cwd(); + const {rnwPath, rnwVersion, devMode, isCanary} = templateUtils.getRnwInfo(config, options); + + const projectName = + config?.project?.windows?.project?.projectName ?? options?.name ?? 'MyApp'; + const namespace = options?.namespace ?? projectName; + const projectGuid = + config?.project?.windows?.project?.projectGuid + ?.replace('{', '') + .replace('}', '') ?? crypto.randomUUID(); + const packageGuid = crypto.randomUUID(); + const currentUser = username.sync(); // Gets the current username depending on the platform. + + const appJsonPath = path.join(config?.root ?? process.cwd(), 'app.json'); + const mainComponentName = + (existsSync(appJsonPath) ? require(appJsonPath).name : null) ?? projectName; + + const csharpNugetPackages = []; + + const replacements = { + useMustache: true, + regExpPatternsToRemove: [], + + name: projectName, + namespace: namespace, + + rnwVersion: rnwVersion, + rnwPathFromProjectRoot: path.relative(projectRoot, rnwPath).replace(/\//g, '\\'), + + mainComponentName, + + // Visual Studio is very picky about the casing of the guids for projects, project references and the solution + // https://www.bing.com/search?q=visual+studio+project+guid+casing&cvid=311a5ad7f9fc41089507b24600d23ee7&FORM=ANAB01&PC=U531 + // we therefore have to precariously use the right casing in the right place or risk building in VS breaking. + projectGuidLower: `{${projectGuid.toLowerCase()}}`, + projectGuidUpper: `{${projectGuid.toUpperCase()}}`, + + // packaging and signing variables: + packageGuidLower: `{${packageGuid.toLowerCase()}}`, + packageGuidUpper: `{${packageGuid.toUpperCase()}}`, + currentUser, + + devMode, + + useNuGets: !devMode, // default is to use published NuGets except in devMode, change to true here if you want to test devMode and nugets simultaneously + addReactNativePublicAdoFeed: isCanary, + + cppNugetPackages: csharpNugetPackages, + }; + + let fileMappings = []; + + const templateFiles = await glob('**/*', { + cwd: __dirname, + ignore: 'template.config.js', + nodir: true, + }); + + for (const file of templateFiles) { + const fileMapping = { + from: path.resolve(__dirname, path.normalize(file)), + to: path.normalize(file), + replacements, + }; + + // Perform simple file renames + const fileName = path.basename(fileMapping.to); + switch (fileName) { + case '_gitignore': + fileMapping.to = path.join(path.dirname(fileMapping.to), '.gitignore'); + break; + case 'NuGet_Config': + fileMapping.to = path.join( + path.dirname(fileMapping.to), + 'NuGet.config', + ); + break; + } + + // Rename files with MyApp in the name + fileMapping.to = fileMapping.to.replace(/MyApp/g, projectName); + + fileMappings.push(fileMapping); + } + + return fileMappings; +} + +async function postInstall(config = {}, options = {}) { + // Update package.json with new scripts and dependencies + await templateUtils.updateProjectPackageJson(config, options, { + scripts: { + windows: 'npx @react-native-community/cli run-windows', + 'test:windows': 'jest --config jest.config.windows.js', + }, + devDependencies: { + '@rnx-kit/jest-preset': '^0.1.17', + }, + }); + + // Install recently added dependencies + await templateUtils.runNpmInstall(config, options); + + console.log(chalk.white.bold('To run your new windows app:')); + console.log(chalk.white(' npx @react-native-community/cli run-windows')); +} + +module.exports = { + name: 'React Native Windows Application (New Arch, C#, Win32, Hermes)', + description: + "[Experimental] A RNW app targeting RN's new architecture, with the Hermes JS engine.", + preInstall, + getFileMappings, + postInstall, +}; diff --git a/vnext/templates/cs-app/windows/ExperimentalFeatures.props b/vnext/templates/cs-app/windows/ExperimentalFeatures.props new file mode 100644 index 00000000000..44bf23f5066 --- /dev/null +++ b/vnext/templates/cs-app/windows/ExperimentalFeatures.props @@ -0,0 +1,12 @@ + + + + + true + true + {{useNuGets}} + + true + + + diff --git a/vnext/templates/cs-app/windows/MyApp.Package/Images/LockScreenLogo.scale-200.png b/vnext/templates/cs-app/windows/MyApp.Package/Images/LockScreenLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3 GIT binary patch literal 1430 zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@! zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o zH-bvQi|wt~L7q$~a-gDFP!{&TQfc3fX*6=uHv* zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M zIf%q9@;fyT?0UP>tcw-bLkz;s2LlKl2qeP0w zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ ztnxttBz#NI_a@fk7SU`WtrpsfZsNs9^0(2a z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2Lflg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7 zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH z&(f2wz_Y0??Tf|g;?|1Znw6}6U43Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV yGvCsSX*m literal 0 HcmV?d00001 diff --git a/vnext/templates/cs-app/windows/MyApp.Package/Images/SplashScreen.scale-200.png b/vnext/templates/cs-app/windows/MyApp.Package/Images/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9 GIT binary patch literal 7700 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 literal 0 HcmV?d00001 diff --git a/vnext/templates/cs-app/windows/MyApp.Package/Images/Square150x150Logo.scale-200.png b/vnext/templates/cs-app/windows/MyApp.Package/Images/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186 GIT binary patch literal 2937 zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|vrsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH zd%ySjdB6L9=gX^A6)VzH7p2l@v~3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx z+s{Eu|&pIs)Z7{La9~?xKfyl z#43?gjEL15d4WbOZo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7 zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE z6U~O1k8c}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQYw+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6 z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$ zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@ z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y zQ+LUkBafNJ#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP literal 0 HcmV?d00001 diff --git a/vnext/templates/cs-app/windows/MyApp.Package/Images/Square44x44Logo.scale-200.png b/vnext/templates/cs-app/windows/MyApp.Package/Images/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b GIT binary patch literal 1647 zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8# zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa> zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=EAnG8N7fqynWG8L3p!4801a;8{+nliO(qd(jNJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK zt3$GicGPc?GmDjy7K2P@La;eu4!$zWCZ`ym{Z$b zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHqXG7yxWB=w55RGOM)$xMb(>kSNR z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^kLVdlGV6LpK$KIrlJqc zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP zL{N80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b! ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_ literal 0 HcmV?d00001 diff --git a/vnext/templates/cs-app/windows/MyApp.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/vnext/templates/cs-app/windows/MyApp.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd GIT binary patch literal 1255 zcmaJ>TWs4@7*5+{G#S+&C!qC#> zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U zyQHecc_L%Gh!7GMt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+ z*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w z&bSErwp+37 zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o# zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=& zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s Mu9UqpbNZeC0BbUo^Z)<= literal 0 HcmV?d00001 diff --git a/vnext/templates/cs-app/windows/MyApp.Package/Images/StoreLogo.png b/vnext/templates/cs-app/windows/MyApp.Package/Images/StoreLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826 GIT binary patch literal 1451 zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv z5nzWi(LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#xG zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q zX}S;+LBh8Tea~TSkHzvX6$rYb)+n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?wFM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8 zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-* zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36 zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640 bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x literal 0 HcmV?d00001 diff --git a/vnext/templates/cs-app/windows/MyApp.Package/Images/Wide310x150Logo.scale-200.png b/vnext/templates/cs-app/windows/MyApp.Package/Images/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5 GIT binary patch literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA + + + + {{ packageGuidLower }} + en-US + ..\{{ name }}\{{ name }}.vcxproj + NativeOnly + NativeOnly + + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + + + + + Debug + x86 + + + Release + x86 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM64 + + + Release + ARM64 + + + + + + + + Designer + + + + + + + + + + + + + + True + Properties\PublishProfiles\win-$(Platform).pubxml + + + + + + + + + This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}. + + + + + diff --git a/vnext/templates/cs-app/windows/MyApp.Package/Package.appxmanifest b/vnext/templates/cs-app/windows/MyApp.Package/Package.appxmanifest new file mode 100644 index 00000000000..bf7f6e6c121 --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp.Package/Package.appxmanifest @@ -0,0 +1,49 @@ + + + + + + + + {{ name }} + {{ currentUser }} + Images\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vnext/templates/cs-app/windows/MyApp.sln b/vnext/templates/cs-app/windows/MyApp.sln new file mode 100644 index 00000000000..cfa260e9a99 --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp.sln @@ -0,0 +1,186 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "{{ name }}.Package", "{{ name }}.Package\{{ name }}.Package.wapproj", "{{ packageGuidUpper }}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{ name }}", "{{ name }}\{{ name }}.csproj", "{{ projectGuidUpper }}" +{{^useNuGets}} + ProjectSection(ProjectDependencies) = postProject + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136} + EndProjectSection +{{/useNuGets}} +EndProject +{{^useNuGets}} +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\{{ rnwPathFromProjectRoot }}\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\{{ rnwPathFromProjectRoot }}\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\{{ rnwPathFromProjectRoot }}\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" + ProjectSection(ProjectDependencies) = postProject + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\{{ rnwPathFromProjectRoot }}\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}" +EndProject +{{/useNuGets}} +Global +{{^useNuGets}} + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 + ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 + ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 + ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 + ..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9 + ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + EndGlobalSection +{{/useNuGets}} + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Debug|ARM64 = Debug|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + Release|ARM64 = Release|ARM64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {{ packageGuidUpper }}.Debug|x64.ActiveCfg = Debug|x64 + {{ packageGuidUpper }}.Debug|x64.Build.0 = Debug|x64 + {{ packageGuidUpper }}.Debug|x64.Deploy.0 = Debug|x64 + {{ packageGuidUpper }}.Debug|x86.ActiveCfg = Debug|x86 + {{ packageGuidUpper }}.Debug|x86.Build.0 = Debug|x86 + {{ packageGuidUpper }}.Debug|x86.Deploy.0 = Debug|x86 + {{ packageGuidUpper }}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {{ packageGuidUpper }}.Debug|ARM64.Build.0 = Debug|ARM64 + {{ packageGuidUpper }}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {{ packageGuidUpper }}.Release|x64.ActiveCfg = Release|x64 + {{ packageGuidUpper }}.Release|x64.Build.0 = Release|x64 + {{ packageGuidUpper }}.Release|x64.Deploy.0 = Release|x64 + {{ packageGuidUpper }}.Release|x86.ActiveCfg = Release|x86 + {{ packageGuidUpper }}.Release|x86.Build.0 = Release|x86 + {{ packageGuidUpper }}.Release|x86.Deploy.0 = Release|x86 + {{ packageGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64 + {{ packageGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64 + {{ packageGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64 + {{ projectGuidUpper }}.Debug|x64.ActiveCfg = Debug|x64 + {{ projectGuidUpper }}.Debug|x64.Build.0 = Debug|x64 + {{ projectGuidUpper }}.Debug|x64.Deploy.0 = Debug|x64 + {{ projectGuidUpper }}.Debug|x86.ActiveCfg = Debug|Win32 + {{ projectGuidUpper }}.Debug|x86.Build.0 = Debug|Win32 + {{ projectGuidUpper }}.Debug|x86.Deploy.0 = Debug|Win32 + {{ projectGuidUpper }}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {{ projectGuidUpper }}.Debug|ARM64.Build.0 = Debug|ARM64 + {{ projectGuidUpper }}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {{ projectGuidUpper }}.Release|x64.ActiveCfg = Release|x64 + {{ projectGuidUpper }}.Release|x64.Build.0 = Release|x64 + {{ projectGuidUpper }}.Release|x64.Deploy.0 = Release|x64 + {{ projectGuidUpper }}.Release|x86.ActiveCfg = Release|Win32 + {{ projectGuidUpper }}.Release|x86.Build.0 = Release|Win32 + {{ projectGuidUpper }}.Release|x86.Deploy.0 = Release|Win32 + {{ projectGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64 + {{ projectGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64 + {{ projectGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64 +{{^useNuGets}} + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.Build.0 = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.ActiveCfg = Debug|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.Build.0 = Debug|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.ActiveCfg = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Build.0 = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Deploy.0 = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.ActiveCfg = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.Build.0 = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.ActiveCfg = Release|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.Build.0 = Release|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32 +{{/useNuGets}} + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +{{^useNuGets}} + GlobalSection(NestedProjects) = preSolution + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {EF074BA1-2D54-4D49-A28E-5E040B47CD2E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + EndGlobalSection +{{/useNuGets}} + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D43FAD39-F619-437D-BB40-04A3982ACB6A} + EndGlobalSection +EndGlobal diff --git a/vnext/templates/cs-app/windows/MyApp/AutolinkedNativeModules.g.cs b/vnext/templates/cs-app/windows/MyApp/AutolinkedNativeModules.g.cs new file mode 100644 index 00000000000..422f5521000 --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp/AutolinkedNativeModules.g.cs @@ -0,0 +1,15 @@ +// AutolinkedNativeModules.g.cs contents generated by "npx @react-native-community/cli autolink-windows" + +using System.Collections.Generic;{{ &autolinkCsUsingNamespaces }} + +using Microsoft.ReactNative; + +namespace {{ namespace }} +{ + internal static class AutolinkedNativeModules + { + internal static void RegisterAutolinkedNativeModulePackages(IList packageProviders) + { {{ &autolinkCsReactPackageProviders }} + } + } +} diff --git a/vnext/templates/cs-app/windows/MyApp/MyApp.csproj b/vnext/templates/cs-app/windows/MyApp/MyApp.csproj new file mode 100644 index 00000000000..04ff2e1aded --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp/MyApp.csproj @@ -0,0 +1,37 @@ + + + + WinExe + {{ name }} + app.manifest + {{ name }}.ico + + + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + + + + + + + + + + + + + + + {{#csharpNugetPackages}} + + {{/csharpNugetPackages}} + + + + This project references targets in your node_modules\react-native-windows folder. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/MyApp.ico b/vnext/templates/cs-app/windows/MyApp/MyApp.ico new file mode 100644 index 0000000000000000000000000000000000000000..b3ec03bd617f32e58128fa977fd6ac9605124f4b GIT binary patch literal 46227 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 + + + + + true + true + {{ projectGuidUpper }} + {{ name }} + Win32Proj + {{ namespace }} + 10.0 + en-US + 17.0 + false + + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM64 + + + Release + ARM64 + + + + Application + Unicode + v143 + + + true + + + false + true + + + + + + + + + + + + + Use + pch.h + $(IntDir)pch.pch + Level4 + true + %(AdditionalOptions) /bigobj + 4453;28204 + + + shell32.lib;user32.lib;windowsapp.lib;%(AdditionalDependenices) + Windows + true + + + + + _DEBUG;%(PreprocessorDefinitions) + + + + + NDEBUG;%(PreprocessorDefinitions) + + + + + USE_FABRIC;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + {{#cppNugetPackages}} + + {{/cppNugetPackages}} + + + + This project references targets in your node_modules\react-native-windows folder. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/Program.cs b/vnext/templates/cs-app/windows/MyApp/Program.cs new file mode 100644 index 00000000000..10be0ed0bac --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp/Program.cs @@ -0,0 +1,63 @@ +// {{ name }}.cs : Defines the entry point for the application. +// + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +using Microsoft.ReactNative; + +namespace {{ namespace }} +{ + class Program + { + static void Main(string[] args) + { + AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; + + var appDirectory = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + + var reactInstanceSettingsBuilder = new ReactInstanceSettingsBuilder() + .DebugBundlePath(L"index") + .JavaScriptBundleFile(L"index.windows") + .BundleRootPath(appDirectory) +#if BUNDLE + .UseFastRefresh(false) +#else + .UseFastRefresh(true) +#endif +#if _DEBUG + .UseDirectDebugger(true) + .UseDeveloperSupport(true); +#else + .UseDirectDebugger(false) + .UseDeveloperSupport(false); +#endif + + var reactPackageProviders = new List(); + AutolinkedNativeModules.RegisterAutolinkedNativeModulePackages(reactPackageProviders); + + var viewOptions = new ReactViewOptions(); + viewOptions.ComponentName = "{{ mainComponentName }}"; + + // Initialize and Manage the ReactNativeHost + var reactNativeAppBuilder = ReactNativeAppBuilder() + .AddPackageProviders(reactPackageProviders) + .SetReactInstanceSettings(reactInstanceSettingsBuilder.ReactInstanceSettings) + .SetReactViewOptions(viewOptions); + + // Start the react-native instance by creating a javascript runtime and load the bundle. + var reactNativeWin32App = reactNativeAppBuilder.Build(); + + reactNativeWin32App.Start(); + } + + private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) + { + Trace.TraceError($"Unhandled Exception: { (e.ExceptionObject as Exception)?.ToString() }"); + } + } + +} \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-arm64.pubxml b/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-arm64.pubxml new file mode 100644 index 00000000000..06da89e11fb --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-arm64.pubxml @@ -0,0 +1,19 @@ + + + + + FileSystem + ARM64 + win-arm64 + win10-arm64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + False + True + + \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-x64.pubxml b/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-x64.pubxml new file mode 100644 index 00000000000..3568f8d8ddc --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-x64.pubxml @@ -0,0 +1,19 @@ + + + + + FileSystem + x64 + win-x64 + win10-x64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + False + True + + \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-x86.pubxml b/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-x86.pubxml new file mode 100644 index 00000000000..4ed30a5eed4 --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp/Properties/PublishProfiles/win-x86.pubxml @@ -0,0 +1,19 @@ + + + + + FileSystem + x86 + win-x86 + win10-x86 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + False + False + True + False + True + + \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/_gitignore b/vnext/templates/cs-app/windows/MyApp/_gitignore new file mode 100644 index 00000000000..82fabe9662a --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp/_gitignore @@ -0,0 +1 @@ +/Bundle \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/app.manifest b/vnext/templates/cs-app/windows/MyApp/app.manifest new file mode 100644 index 00000000000..06d300641de --- /dev/null +++ b/vnext/templates/cs-app/windows/MyApp/app.manifest @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + PerMonitorV2 + + + \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/_gitignore b/vnext/templates/cs-app/windows/_gitignore new file mode 100644 index 00000000000..5bc72a4416d --- /dev/null +++ b/vnext/templates/cs-app/windows/_gitignore @@ -0,0 +1,41 @@ +*AppPackages* +*BundleArtifacts* + +#OS junk files +[Tt]humbs.db +*.DS_Store + +#Visual Studio files +*.[Oo]bj +*.user +*.aps +*.pch +*.vspscc +*.vssscc +*_i.c +*_p.c +*.ncb +*.suo +*.tlb +*.tlh +*.bak +*.[Cc]ache +*.ilk +*.log +*.lib +*.sbr +*.sdf +*.opensdf +*.opendb +*.unsuccessfulbuild +ipch/ +[Oo]bj/ +[Bb]in +[Dd]ebug*/ +[Rr]elease*/ +Ankh.NoLoad +.vs/ +# Visual C++ cache files + +#Files generated by the VS build +**/Generated Files/** From d9f8f001e7a3e798751a0849f923201d73c6da6e Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Wed, 18 Sep 2024 11:33:45 -0700 Subject: [PATCH 02/13] try to fix build issues --- vnext/PropertySheets/Bundle.props | 1 + .../External/Microsoft.ReactNative.Composition.CSharpApp.props | 2 +- .../External/Microsoft.ReactNative.WindowsSdk.Default.props | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vnext/PropertySheets/Bundle.props b/vnext/PropertySheets/Bundle.props index 6fde14e6fcd..e56fd783e91 100644 --- a/vnext/PropertySheets/Bundle.props +++ b/vnext/PropertySheets/Bundle.props @@ -48,6 +48,7 @@ index.windows.js index.js + $(ProjectDir) $(OutDir) $(ProjectDir)$(OutDir) diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.props b/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.props index 2ab53a69dd4..0c7af4bd5f7 100644 --- a/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.props +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.props @@ -3,7 +3,7 @@ Copyright (c) Microsoft Corporation. Licensed under the MIT License. - This file will be consumed by ALL Win32 C++ app projects (both inside + This file will be consumed by ALL Win32 C# app projects (both inside and outside of this repo) that build on top of Microsoft.ReactNative. Do not make any changes here unless it applies to ALL such projects. --> diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props b/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props index 5714a214cb0..e1b0c722bc8 100644 --- a/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props @@ -30,7 +30,7 @@ net8.0-windows$(TargetPlatformVersion) x86;x64;ARM64 - win-x86;win-x64;win-arm64 + win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 From 4fa358fe0e63ba023a67ee22df023ca5aa311209 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Thu, 19 Sep 2024 14:42:14 -0700 Subject: [PATCH 03/13] try adding cswinrt --- .../Microsoft.ReactNative.Composition.CSharpApp.targets | 5 +++++ .../External/Microsoft.ReactNative.WindowsSdk.Default.props | 5 ++--- vnext/templates/cs-app/template.config.js | 2 +- vnext/templates/cs-app/windows/MyApp/MyApp.csproj | 6 +++--- vnext/templates/cs-app/windows/MyApp/Program.cs | 6 +++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.targets b/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.targets index 747412fa29e..c15f5247465 100644 --- a/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.targets +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.Composition.CSharpApp.targets @@ -14,8 +14,13 @@ + + Microsoft.ReactNative + + + diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props b/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props index e1b0c722bc8..11c8b545ab2 100644 --- a/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props @@ -28,10 +28,9 @@ 10.0.22621.0 10.0.17763.0 - net8.0-windows$(TargetPlatformVersion) + net6.0-windows$(TargetPlatformVersion) x86;x64;ARM64 - win-x86;win-x64;win-arm64 - win10-x86;win10-x64;win10-arm64 + win10-x86;win10-x64;win10-arm64 diff --git a/vnext/templates/cs-app/template.config.js b/vnext/templates/cs-app/template.config.js index d437ef71954..81e2d3fd701 100644 --- a/vnext/templates/cs-app/template.config.js +++ b/vnext/templates/cs-app/template.config.js @@ -64,7 +64,7 @@ async function getFileMappings(config = {}, options = {}) { devMode, - useNuGets: !devMode, // default is to use published NuGets except in devMode, change to true here if you want to test devMode and nugets simultaneously + useNuGets: devMode, // default is to use published NuGets except in devMode, change to true here if you want to test devMode and nugets simultaneously addReactNativePublicAdoFeed: isCanary, cppNugetPackages: csharpNugetPackages, diff --git a/vnext/templates/cs-app/windows/MyApp/MyApp.csproj b/vnext/templates/cs-app/windows/MyApp/MyApp.csproj index 04ff2e1aded..6d05dfb327d 100644 --- a/vnext/templates/cs-app/windows/MyApp/MyApp.csproj +++ b/vnext/templates/cs-app/windows/MyApp/MyApp.csproj @@ -20,7 +20,7 @@ - + {{#csharpNugetPackages}} @@ -31,7 +31,7 @@ This project references targets in your node_modules\react-native-windows folder. The missing file is {0}. - - + + \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/Program.cs b/vnext/templates/cs-app/windows/MyApp/Program.cs index 10be0ed0bac..f8fbaf530c4 100644 --- a/vnext/templates/cs-app/windows/MyApp/Program.cs +++ b/vnext/templates/cs-app/windows/MyApp/Program.cs @@ -20,8 +20,8 @@ static void Main(string[] args) var appDirectory = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var reactInstanceSettingsBuilder = new ReactInstanceSettingsBuilder() - .DebugBundlePath(L"index") - .JavaScriptBundleFile(L"index.windows") + .DebugBundlePath("index") + .JavaScriptBundleFile("index.windows") .BundleRootPath(appDirectory) #if BUNDLE .UseFastRefresh(false) @@ -43,7 +43,7 @@ static void Main(string[] args) viewOptions.ComponentName = "{{ mainComponentName }}"; // Initialize and Manage the ReactNativeHost - var reactNativeAppBuilder = ReactNativeAppBuilder() + var reactNativeAppBuilder = new ReactNativeAppBuilder() .AddPackageProviders(reactPackageProviders) .SetReactInstanceSettings(reactInstanceSettingsBuilder.ReactInstanceSettings) .SetReactViewOptions(viewOptions); From e44325c2d7ff14dbc01b27122f87a8bec232fc4b Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Fri, 20 Sep 2024 11:55:24 -0700 Subject: [PATCH 04/13] add projection assembly --- vnext/Microsoft.ReactNative.CppOnly.slnf | 1 + .../Microsoft.ReactNative.CsWinRT.csproj | 36 +++++++++++++ .../packages.lock.json | 53 +++++++++++++++++++ vnext/Microsoft.ReactNative.sln | 18 ++++++- ...osoft.ReactNative.WindowsSdk.Default.props | 4 -- 5 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj create mode 100644 vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json diff --git a/vnext/Microsoft.ReactNative.CppOnly.slnf b/vnext/Microsoft.ReactNative.CppOnly.slnf index 37e629b4d28..08476bea3bf 100644 --- a/vnext/Microsoft.ReactNative.CppOnly.slnf +++ b/vnext/Microsoft.ReactNative.CppOnly.slnf @@ -10,6 +10,7 @@ "Microsoft.ReactNative.Cxx\\Microsoft.ReactNative.Cxx.vcxitems", "Microsoft.ReactNative.IntegrationTests\\Microsoft.ReactNative.IntegrationTests.vcxproj", "Microsoft.ReactNative\\Microsoft.ReactNative.vcxproj", + "Microsoft.ReactNative.CsWinRT\\Microsoft.ReactNative.CsWinRT.csproj", "Mso.UnitTests\\Mso.UnitTests.vcxproj", "Mso\\Mso.vcxitems", "ReactCommon\\ReactCommon.vcxproj", diff --git a/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj b/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj new file mode 100644 index 00000000000..9d46b292676 --- /dev/null +++ b/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj @@ -0,0 +1,36 @@ + + + + + net6.0-windows + x64;x86;ARM64 + + + + 9 + true + 10.0.22621.0 + true + 10.0 + + + + + + + + + + + + + Microsoft.ReactNative; + Windows.Foundation; + + + Windows.Foundation.Diagnostics; + Windows.Foundation.PropertyType; + + + + diff --git a/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json b/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json new file mode 100644 index 00000000000..ce3dc6c6a8e --- /dev/null +++ b/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "dependencies": { + "net6.0-windows7.0": { + "Microsoft.Windows.CsWinRT": { + "type": "Direct", + "requested": "[2.1.3, )", + "resolved": "2.1.3", + "contentHash": "Nl8A4rQ4l2GNj703GvLSbr0Vo++FjxKxU7CIj1pcKz/sN8XSvD4dIvUCYYgD16o2pG4PSSXNgAxfwDUwLGHLPA==" + }, + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.5.240227000, )", + "resolved": "1.5.240227000", + "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "dependencies": { + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + }, + "Microsoft.Windows.SDK.BuildTools": { + "type": "Transitive", + "resolved": "10.0.22621.756", + "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA==" + }, + "common": { + "type": "Project" + }, + "fmt": { + "type": "Project" + }, + "folly": { + "type": "Project", + "dependencies": { + "fmt": "[1.0.0, )" + } + }, + "microsoft.reactnative": { + "type": "Project", + "dependencies": { + "Common": "[1.0.0, )", + "Folly": "[1.0.0, )", + "ReactCommon": "[1.0.0, )" + } + }, + "reactcommon": { + "type": "Project", + "dependencies": { + "Folly": "[1.0.0, )" + } + } + } + } +} \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.sln b/vnext/Microsoft.ReactNative.sln index 78750bee8ff..9170c520c04 100644 --- a/vnext/Microsoft.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.sln @@ -127,14 +127,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed.IntegrationTests", "Microsoft.ReactNative.Managed.IntegrationTests\Microsoft.ReactNative.Managed.IntegrationTests.csproj", "{E2BE6630-21C7-43A4-AC90-8D2844C06617}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.CsWinRT", "Microsoft.ReactNative.CsWinRT\Microsoft.ReactNative.CsWinRT.csproj", "{B76BB397-D882-48D8-AA8D-DA9921860B2B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 - Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -300,6 +302,18 @@ Global {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.ActiveCfg = Release|x86 {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.Build.0 = Release|x86 {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.Deploy.0 = Release|x86 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.Build.0 = Debug|ARM64 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x64.ActiveCfg = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x64.Build.0 = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.ActiveCfg = Debug|x86 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.Build.0 = Debug|x86 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.ActiveCfg = Release|ARM64 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.Build.0 = Release|ARM64 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x64.ActiveCfg = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x64.Build.0 = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.ActiveCfg = Release|x86 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props b/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props index 11c8b545ab2..b0465062c74 100644 --- a/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props +++ b/vnext/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props @@ -27,10 +27,6 @@ 10.0.22621.0 10.0.17763.0 - - net6.0-windows$(TargetPlatformVersion) - x86;x64;ARM64 - win10-x86;win10-x64;win10-arm64 From bf8a68b84c51abd67eb8d3924b5cfd26a5c6813a Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Fri, 20 Sep 2024 15:10:49 -0700 Subject: [PATCH 05/13] fix solution files --- vnext/Microsoft.ReactNative.CppOnly.slnf | 2 +- vnext/Microsoft.ReactNative.sln | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/vnext/Microsoft.ReactNative.CppOnly.slnf b/vnext/Microsoft.ReactNative.CppOnly.slnf index 08476bea3bf..6548f38f191 100644 --- a/vnext/Microsoft.ReactNative.CppOnly.slnf +++ b/vnext/Microsoft.ReactNative.CppOnly.slnf @@ -6,11 +6,11 @@ "Common\\Common.vcxproj", "Folly\\Folly.vcxproj", "Microsoft.ReactNative.ComponentTests\\Microsoft.ReactNative.ComponentTests.vcxproj", + "Microsoft.ReactNative.CsWinRT\\Microsoft.ReactNative.CsWinRT.csproj", "Microsoft.ReactNative.Cxx.UnitTests\\Microsoft.ReactNative.Cxx.UnitTests.vcxproj", "Microsoft.ReactNative.Cxx\\Microsoft.ReactNative.Cxx.vcxitems", "Microsoft.ReactNative.IntegrationTests\\Microsoft.ReactNative.IntegrationTests.vcxproj", "Microsoft.ReactNative\\Microsoft.ReactNative.vcxproj", - "Microsoft.ReactNative.CsWinRT\\Microsoft.ReactNative.CsWinRT.csproj", "Mso.UnitTests\\Mso.UnitTests.vcxproj", "Mso\\Mso.vcxitems", "ReactCommon\\ReactCommon.vcxproj", diff --git a/vnext/Microsoft.ReactNative.sln b/vnext/Microsoft.ReactNative.sln index 9170c520c04..eee6ff6f724 100644 --- a/vnext/Microsoft.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.sln @@ -302,18 +302,18 @@ Global {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.ActiveCfg = Release|x86 {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.Build.0 = Release|x86 {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.Deploy.0 = Release|x86 - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.Build.0 = Debug|ARM64 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.Build.0 = Debug|Any CPU {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x64.ActiveCfg = Debug|Any CPU {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x64.Build.0 = Debug|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.ActiveCfg = Debug|x86 - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.Build.0 = Debug|x86 - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.ActiveCfg = Release|ARM64 - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.Build.0 = Release|ARM64 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.ActiveCfg = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.Build.0 = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.ActiveCfg = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.Build.0 = Release|Any CPU {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x64.ActiveCfg = Release|Any CPU {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x64.Build.0 = Release|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.ActiveCfg = Release|x86 - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.Build.0 = Release|x86 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.ActiveCfg = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 98c667ca04f1749a68503d0ab9d707a79b8b6ad1 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Thu, 26 Sep 2024 12:22:50 -0700 Subject: [PATCH 06/13] Trying to blocklist uneeded types --- .../Microsoft.ReactNative.CsWinRT.csproj | 58 ++++++++---- .../packages.lock.json | 85 ++++++++++++++++- .../packages.lock.json | 92 +------------------ .../packages.lock.json | 92 +------------------ .../packages.lock.json | 73 +-------------- 5 files changed, 128 insertions(+), 272 deletions(-) diff --git a/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj b/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj index 9d46b292676..074e24e5d57 100644 --- a/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj +++ b/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj @@ -2,20 +2,18 @@ - net6.0-windows - x64;x86;ARM64 - - - - 9 - true - 10.0.22621.0 - true - 10.0 + net6.0-windows10.0.22621.0 + 10.0.17763.0 + AnyCPU + + None + CS8305;CS0436 + Microsoft.ReactNative.projection - + + @@ -23,14 +21,34 @@ - - Microsoft.ReactNative; - Windows.Foundation; - - - Windows.Foundation.Diagnostics; - Windows.Foundation.PropertyType; - + + -include Microsoft.ReactNative + -exclude Microsoft.ReactNative.DevMenuControl + -exclude Microsoft.ReactNative.DynamicAutomationPeer + -exclude Microsoft.ReactNative.DynamicAutomationProperties + -exclude Microsoft.ReactNative.DynamicValueProvider + -exclude Microsoft.ReactNative.IViewManager + -exclude Microsoft.ReactNative.IViewManagerCreateWithProperties + -exclude Microsoft.ReactNative.IViewManagerRequiresNativeLayout + -exclude Microsoft.ReactNative.IViewManagerWithChildren + -exclude Microsoft.ReactNative.IViewManagerWithCommands + -exclude Microsoft.ReactNative.IViewManagerWithDropViewInstance + -exclude Microsoft.ReactNative.IViewManagerWithExportedEventTypeConstants + -exclude Microsoft.ReactNative.IViewManagerWithExportedViewConstants + -exclude Microsoft.ReactNative.IViewManagerWithNativeProperties + -exclude Microsoft.ReactNative.IViewManagerWithOnLayout + -exclude Microsoft.ReactNative.IViewManagerWithPointerEvents + -exclude Microsoft.ReactNative.IViewManagerWithReactContext + -exclude Microsoft.ReactNative.ReactApplication + -exclude Microsoft.ReactNative.ReactPointerEventArgs + -exclude Microsoft.ReactNative.ReactRootView + -exclude Microsoft.ReactNative.ReactViewManagerProvider + -exclude Microsoft.ReactNative.ViewControl + -exclude Microsoft.ReactNative.ViewManagerPropertyType + -exclude Microsoft.ReactNative.ViewPanel + -exclude Microsoft.ReactNative.XamlHelper + -exclude Microsoft.ReactNative.XamlMetaDataProvider + -exclude Microsoft.ReactNative.XamlUIService + - diff --git a/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json b/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json index ce3dc6c6a8e..0ce048cd2fa 100644 --- a/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json +++ b/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json @@ -1,12 +1,12 @@ { "version": 1, "dependencies": { - "net6.0-windows7.0": { + "net6.0-windows10.0.22621": { "Microsoft.Windows.CsWinRT": { "type": "Direct", - "requested": "[2.1.3, )", - "resolved": "2.1.3", - "contentHash": "Nl8A4rQ4l2GNj703GvLSbr0Vo++FjxKxU7CIj1pcKz/sN8XSvD4dIvUCYYgD16o2pG4PSSXNgAxfwDUwLGHLPA==" + "requested": "[2.1.1, )", + "resolved": "2.1.1", + "contentHash": "q2CixHYFojIC1As4qUcK+yRIdDsN9UVT96TsI+3wBPab+zDKIv1PqrFOfJgB4Jkpn6iPs7nbLFRH3abVFzBPGA==" }, "Microsoft.WindowsAppSDK": { "type": "Direct", @@ -48,6 +48,83 @@ "Folly": "[1.0.0, )" } } + }, + "net6.0-windows10.0.22621/win10-arm": { + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.5.240227000, )", + "resolved": "1.5.240227000", + "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "dependencies": { + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + } + }, + "net6.0-windows10.0.22621/win10-arm-aot": { + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.5.240227000, )", + "resolved": "1.5.240227000", + "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "dependencies": { + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + } + }, + "net6.0-windows10.0.22621/win10-arm64-aot": { + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.5.240227000, )", + "resolved": "1.5.240227000", + "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "dependencies": { + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + } + }, + "net6.0-windows10.0.22621/win10-x64": { + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.5.240227000, )", + "resolved": "1.5.240227000", + "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "dependencies": { + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + } + }, + "net6.0-windows10.0.22621/win10-x64-aot": { + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.5.240227000, )", + "resolved": "1.5.240227000", + "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "dependencies": { + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + } + }, + "net6.0-windows10.0.22621/win10-x86": { + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.5.240227000, )", + "resolved": "1.5.240227000", + "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "dependencies": { + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + } + }, + "net6.0-windows10.0.22621/win10-x86-aot": { + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.5.240227000, )", + "resolved": "1.5.240227000", + "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "dependencies": { + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + } } } } \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json index 8c6f4dc9432..9151904fbb4 100644 --- a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json @@ -44,21 +44,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "boost": { - "type": "Transitive", - "resolved": "1.83.0", - "contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ==" - }, - "Microsoft.Build.Tasks.Git": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" - }, - "Microsoft.JavaScript.Hermes": { - "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g==" - }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -90,33 +75,6 @@ "resolved": "1.0.1", "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" }, - "Microsoft.SourceLink.Common": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg==" - }, - "Microsoft.SourceLink.GitHub": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==", - "dependencies": { - "Microsoft.Build.Tasks.Git": "1.1.1", - "Microsoft.SourceLink.Common": "1.1.1" - } - }, - "Microsoft.UI.Xaml": { - "type": "Transitive", - "resolved": "2.8.0", - "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", - "dependencies": { - "Microsoft.Web.WebView2": "1.0.1264.42" - } - }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -312,10 +270,7 @@ } }, "common": { - "type": "Project", - "dependencies": { - "boost": "[1.83.0, )" - } + "type": "Project" }, "fmt": { "type": "Project" @@ -323,7 +278,6 @@ "folly": { "type": "Project", "dependencies": { - "boost": "[1.83.0, )", "fmt": "[1.0.0, )" } }, @@ -332,11 +286,7 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "Microsoft.JavaScript.Hermes": "[0.1.23, )", - "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.UI.Xaml": "[2.8.0, )", - "ReactCommon": "[1.0.0, )", - "boost": "[1.83.0, )" + "ReactCommon": "[1.0.0, )" } }, "microsoft.reactnative.managed": { @@ -349,8 +299,7 @@ "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )", - "boost": "[1.83.0, )" + "Folly": "[1.0.0, )" } } }, @@ -368,11 +317,6 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -565,11 +509,6 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -796,11 +735,6 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1027,11 +961,6 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1224,11 +1153,6 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1455,11 +1379,6 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1652,11 +1571,6 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json index 8c6f4dc9432..9151904fbb4 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json @@ -44,21 +44,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "boost": { - "type": "Transitive", - "resolved": "1.83.0", - "contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ==" - }, - "Microsoft.Build.Tasks.Git": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" - }, - "Microsoft.JavaScript.Hermes": { - "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g==" - }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -90,33 +75,6 @@ "resolved": "1.0.1", "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" }, - "Microsoft.SourceLink.Common": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg==" - }, - "Microsoft.SourceLink.GitHub": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==", - "dependencies": { - "Microsoft.Build.Tasks.Git": "1.1.1", - "Microsoft.SourceLink.Common": "1.1.1" - } - }, - "Microsoft.UI.Xaml": { - "type": "Transitive", - "resolved": "2.8.0", - "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", - "dependencies": { - "Microsoft.Web.WebView2": "1.0.1264.42" - } - }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -312,10 +270,7 @@ } }, "common": { - "type": "Project", - "dependencies": { - "boost": "[1.83.0, )" - } + "type": "Project" }, "fmt": { "type": "Project" @@ -323,7 +278,6 @@ "folly": { "type": "Project", "dependencies": { - "boost": "[1.83.0, )", "fmt": "[1.0.0, )" } }, @@ -332,11 +286,7 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "Microsoft.JavaScript.Hermes": "[0.1.23, )", - "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.UI.Xaml": "[2.8.0, )", - "ReactCommon": "[1.0.0, )", - "boost": "[1.83.0, )" + "ReactCommon": "[1.0.0, )" } }, "microsoft.reactnative.managed": { @@ -349,8 +299,7 @@ "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )", - "boost": "[1.83.0, )" + "Folly": "[1.0.0, )" } } }, @@ -368,11 +317,6 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -565,11 +509,6 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -796,11 +735,6 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1027,11 +961,6 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1224,11 +1153,6 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1455,11 +1379,6 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1652,11 +1571,6 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", diff --git a/vnext/Microsoft.ReactNative.Managed/packages.lock.json b/vnext/Microsoft.ReactNative.Managed/packages.lock.json index f1810230b0d..341160c0838 100644 --- a/vnext/Microsoft.ReactNative.Managed/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed/packages.lock.json @@ -24,21 +24,11 @@ "Microsoft.SourceLink.Common": "1.1.1" } }, - "boost": { - "type": "Transitive", - "resolved": "1.83.0", - "contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ==" - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.1.1", "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" }, - "Microsoft.JavaScript.Hermes": { - "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g==" - }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -70,19 +60,6 @@ "resolved": "1.1.1", "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg==" }, - "Microsoft.UI.Xaml": { - "type": "Transitive", - "resolved": "2.8.0", - "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", - "dependencies": { - "Microsoft.Web.WebView2": "1.0.1264.42" - } - }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -159,10 +136,7 @@ "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ==" }, "common": { - "type": "Project", - "dependencies": { - "boost": "[1.83.0, )" - } + "type": "Project" }, "fmt": { "type": "Project" @@ -170,7 +144,6 @@ "folly": { "type": "Project", "dependencies": { - "boost": "[1.83.0, )", "fmt": "[1.0.0, )" } }, @@ -179,18 +152,13 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "Microsoft.JavaScript.Hermes": "[0.1.23, )", - "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.UI.Xaml": "[2.8.0, )", - "ReactCommon": "[1.0.0, )", - "boost": "[1.83.0, )" + "ReactCommon": "[1.0.0, )" } }, "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )", - "boost": "[1.83.0, )" + "Folly": "[1.0.0, )" } } }, @@ -208,11 +176,6 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -233,11 +196,6 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -258,11 +216,6 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -283,11 +236,6 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -308,11 +256,6 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -333,11 +276,6 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -358,11 +296,6 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", From da1c4e38fc4504ea46d6cbf0c6fe9302f9bfd6c0 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Tue, 1 Oct 2024 10:30:24 -0700 Subject: [PATCH 07/13] Update with feedback from cswinrt team --- .../Microsoft.ReactNative.CsWinRT.csproj | 34 +++---------------- .../packages.lock.json | 6 ++-- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj b/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj index 074e24e5d57..c6eaea3fa4d 100644 --- a/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj +++ b/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj @@ -12,7 +12,7 @@ - + @@ -21,34 +21,8 @@ - - -include Microsoft.ReactNative - -exclude Microsoft.ReactNative.DevMenuControl - -exclude Microsoft.ReactNative.DynamicAutomationPeer - -exclude Microsoft.ReactNative.DynamicAutomationProperties - -exclude Microsoft.ReactNative.DynamicValueProvider - -exclude Microsoft.ReactNative.IViewManager - -exclude Microsoft.ReactNative.IViewManagerCreateWithProperties - -exclude Microsoft.ReactNative.IViewManagerRequiresNativeLayout - -exclude Microsoft.ReactNative.IViewManagerWithChildren - -exclude Microsoft.ReactNative.IViewManagerWithCommands - -exclude Microsoft.ReactNative.IViewManagerWithDropViewInstance - -exclude Microsoft.ReactNative.IViewManagerWithExportedEventTypeConstants - -exclude Microsoft.ReactNative.IViewManagerWithExportedViewConstants - -exclude Microsoft.ReactNative.IViewManagerWithNativeProperties - -exclude Microsoft.ReactNative.IViewManagerWithOnLayout - -exclude Microsoft.ReactNative.IViewManagerWithPointerEvents - -exclude Microsoft.ReactNative.IViewManagerWithReactContext - -exclude Microsoft.ReactNative.ReactApplication - -exclude Microsoft.ReactNative.ReactPointerEventArgs - -exclude Microsoft.ReactNative.ReactRootView - -exclude Microsoft.ReactNative.ReactViewManagerProvider - -exclude Microsoft.ReactNative.ViewControl - -exclude Microsoft.ReactNative.ViewManagerPropertyType - -exclude Microsoft.ReactNative.ViewPanel - -exclude Microsoft.ReactNative.XamlHelper - -exclude Microsoft.ReactNative.XamlMetaDataProvider - -exclude Microsoft.ReactNative.XamlUIService - + 10.0.22621.38 + Microsoft.ReactNative + Windows;Microsoft diff --git a/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json b/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json index 0ce048cd2fa..61f35c9d42f 100644 --- a/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json +++ b/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json @@ -4,9 +4,9 @@ "net6.0-windows10.0.22621": { "Microsoft.Windows.CsWinRT": { "type": "Direct", - "requested": "[2.1.1, )", - "resolved": "2.1.1", - "contentHash": "q2CixHYFojIC1As4qUcK+yRIdDsN9UVT96TsI+3wBPab+zDKIv1PqrFOfJgB4Jkpn6iPs7nbLFRH3abVFzBPGA==" + "requested": "[2.1.3, )", + "resolved": "2.1.3", + "contentHash": "Nl8A4rQ4l2GNj703GvLSbr0Vo++FjxKxU7CIj1pcKz/sN8XSvD4dIvUCYYgD16o2pG4PSSXNgAxfwDUwLGHLPA==" }, "Microsoft.WindowsAppSDK": { "type": "Direct", From 91ba0ccb583b959f6265b95e12ce4eb23a628785 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Tue, 1 Oct 2024 12:06:21 -0700 Subject: [PATCH 08/13] switch to separate sln --- vnext/Desktop.ABITests/packages.lock.json | 58 +--- vnext/Desktop.DLL/packages.lock.json | 14 - .../packages.lock.json | 14 - vnext/Desktop.UnitTests/packages.lock.json | 14 - vnext/Desktop/packages.lock.json | 62 +--- vnext/ExperimentalFeatures.props | 10 +- vnext/Microsoft.ReactNative.CppOnly.slnf | 22 -- .../packages.lock.json | 92 +++++- .../packages.lock.json | 92 +++++- .../packages.lock.json | 73 ++++- vnext/Microsoft.ReactNative.NewArch.sln | 283 ++++++++++++++++++ vnext/Microsoft.ReactNative.sln | 18 +- .../Microsoft.ReactNative.vcxproj | 1 + .../ReactCommon.UnitTests/packages.lock.json | 58 +--- .../NuGetRestoreForceEvaluateAllSolutions.ps1 | 8 +- 15 files changed, 555 insertions(+), 264 deletions(-) delete mode 100644 vnext/Microsoft.ReactNative.CppOnly.slnf create mode 100644 vnext/Microsoft.ReactNative.NewArch.sln diff --git a/vnext/Desktop.ABITests/packages.lock.json b/vnext/Desktop.ABITests/packages.lock.json index 21c2c7789ae..467358f5fbb 100644 --- a/vnext/Desktop.ABITests/packages.lock.json +++ b/vnext/Desktop.ABITests/packages.lock.json @@ -43,19 +43,6 @@ "Microsoft.SourceLink.Common": "1.1.1" } }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22621.756", - "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA==" - }, - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - }, "ReactNative.V8Jsi.Windows": { "type": "Transitive", "resolved": "0.71.8", @@ -91,7 +78,6 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.WindowsAppSDK": "[1.5.240227000, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" @@ -115,45 +101,9 @@ } } }, - "native,Version=v0.0/win": { - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-arm64": { - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-x64": { - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-x86": { - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - } + "native,Version=v0.0/win": {}, + "native,Version=v0.0/win-arm64": {}, + "native,Version=v0.0/win-x64": {}, + "native,Version=v0.0/win-x86": {} } } \ No newline at end of file diff --git a/vnext/Desktop.DLL/packages.lock.json b/vnext/Desktop.DLL/packages.lock.json index 8abca65d6bb..88ec8d44fc5 100644 --- a/vnext/Desktop.DLL/packages.lock.json +++ b/vnext/Desktop.DLL/packages.lock.json @@ -40,19 +40,6 @@ "resolved": "1.1.1", "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg==" }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22621.756", - "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA==" - }, - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - }, "common": { "type": "Project", "dependencies": { @@ -83,7 +70,6 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.WindowsAppSDK": "[1.5.240227000, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" diff --git a/vnext/Desktop.IntegrationTests/packages.lock.json b/vnext/Desktop.IntegrationTests/packages.lock.json index 13031e0c654..6784af88ddc 100644 --- a/vnext/Desktop.IntegrationTests/packages.lock.json +++ b/vnext/Desktop.IntegrationTests/packages.lock.json @@ -44,19 +44,6 @@ "Microsoft.SourceLink.Common": "1.1.1" } }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22621.756", - "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA==" - }, - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - }, "ReactNative.V8Jsi.Windows": { "type": "Transitive", "resolved": "0.71.8", @@ -92,7 +79,6 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.WindowsAppSDK": "[1.5.240227000, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" diff --git a/vnext/Desktop.UnitTests/packages.lock.json b/vnext/Desktop.UnitTests/packages.lock.json index 8146b6f01eb..b8a538813d6 100644 --- a/vnext/Desktop.UnitTests/packages.lock.json +++ b/vnext/Desktop.UnitTests/packages.lock.json @@ -44,19 +44,6 @@ "Microsoft.SourceLink.Common": "1.1.1" } }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22621.756", - "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA==" - }, - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - }, "ReactNative.V8Jsi.Windows": { "type": "Transitive", "resolved": "0.71.8", @@ -92,7 +79,6 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.WindowsAppSDK": "[1.5.240227000, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" diff --git a/vnext/Desktop/packages.lock.json b/vnext/Desktop/packages.lock.json index 116b95eb540..5e7bdc59490 100644 --- a/vnext/Desktop/packages.lock.json +++ b/vnext/Desktop/packages.lock.json @@ -30,15 +30,6 @@ "resolved": "2.0.230706.1", "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ==" }, - "Microsoft.WindowsAppSDK": { - "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - }, "ReactNative.V8Jsi.Windows": { "type": "Direct", "requested": "[0.71.8, )", @@ -55,11 +46,6 @@ "resolved": "1.1.1", "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg==" }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22621.756", - "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA==" - }, "common": { "type": "Project", "dependencies": { @@ -90,49 +76,9 @@ } } }, - "native,Version=v0.0/win": { - "Microsoft.WindowsAppSDK": { - "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-arm64": { - "Microsoft.WindowsAppSDK": { - "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-x64": { - "Microsoft.WindowsAppSDK": { - "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-x86": { - "Microsoft.WindowsAppSDK": { - "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - } + "native,Version=v0.0/win": {}, + "native,Version=v0.0/win-arm64": {}, + "native,Version=v0.0/win-x64": {}, + "native,Version=v0.0/win-x86": {} } } \ No newline at end of file diff --git a/vnext/ExperimentalFeatures.props b/vnext/ExperimentalFeatures.props index f74a2618456..da08008a8a2 100644 --- a/vnext/ExperimentalFeatures.props +++ b/vnext/ExperimentalFeatures.props @@ -1,8 +1,14 @@ + + false + false + true + false - - true + + true + true diff --git a/vnext/Microsoft.ReactNative.CppOnly.slnf b/vnext/Microsoft.ReactNative.CppOnly.slnf deleted file mode 100644 index 6548f38f191..00000000000 --- a/vnext/Microsoft.ReactNative.CppOnly.slnf +++ /dev/null @@ -1,22 +0,0 @@ -{ - "solution": { - "path": "Microsoft.ReactNative.sln", - "projects": [ - "Chakra\\Chakra.vcxitems", - "Common\\Common.vcxproj", - "Folly\\Folly.vcxproj", - "Microsoft.ReactNative.ComponentTests\\Microsoft.ReactNative.ComponentTests.vcxproj", - "Microsoft.ReactNative.CsWinRT\\Microsoft.ReactNative.CsWinRT.csproj", - "Microsoft.ReactNative.Cxx.UnitTests\\Microsoft.ReactNative.Cxx.UnitTests.vcxproj", - "Microsoft.ReactNative.Cxx\\Microsoft.ReactNative.Cxx.vcxitems", - "Microsoft.ReactNative.IntegrationTests\\Microsoft.ReactNative.IntegrationTests.vcxproj", - "Microsoft.ReactNative\\Microsoft.ReactNative.vcxproj", - "Mso.UnitTests\\Mso.UnitTests.vcxproj", - "Mso\\Mso.vcxitems", - "ReactCommon\\ReactCommon.vcxproj", - "Shared\\Shared.vcxitems", - "fmt\\fmt.vcxproj", - "include\\Include.vcxitems" - ] - } -} \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json index 9151904fbb4..8c6f4dc9432 100644 --- a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json @@ -44,6 +44,21 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, + "boost": { + "type": "Transitive", + "resolved": "1.83.0", + "contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" + }, + "Microsoft.JavaScript.Hermes": { + "type": "Transitive", + "resolved": "0.1.23", + "contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g==" + }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -75,6 +90,33 @@ "resolved": "1.0.1", "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } + }, + "Microsoft.UI.Xaml": { + "type": "Transitive", + "resolved": "2.8.0", + "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.1264.42" + } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -270,7 +312,10 @@ } }, "common": { - "type": "Project" + "type": "Project", + "dependencies": { + "boost": "[1.83.0, )" + } }, "fmt": { "type": "Project" @@ -278,6 +323,7 @@ "folly": { "type": "Project", "dependencies": { + "boost": "[1.83.0, )", "fmt": "[1.0.0, )" } }, @@ -286,7 +332,11 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "ReactCommon": "[1.0.0, )" + "Microsoft.JavaScript.Hermes": "[0.1.23, )", + "Microsoft.SourceLink.GitHub": "[1.1.1, )", + "Microsoft.UI.Xaml": "[2.8.0, )", + "ReactCommon": "[1.0.0, )", + "boost": "[1.83.0, )" } }, "microsoft.reactnative.managed": { @@ -299,7 +349,8 @@ "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )" + "Folly": "[1.0.0, )", + "boost": "[1.83.0, )" } } }, @@ -317,6 +368,11 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -509,6 +565,11 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -735,6 +796,11 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -961,6 +1027,11 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1153,6 +1224,11 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1379,6 +1455,11 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1571,6 +1652,11 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json index 9151904fbb4..8c6f4dc9432 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json @@ -44,6 +44,21 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, + "boost": { + "type": "Transitive", + "resolved": "1.83.0", + "contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" + }, + "Microsoft.JavaScript.Hermes": { + "type": "Transitive", + "resolved": "0.1.23", + "contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g==" + }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -75,6 +90,33 @@ "resolved": "1.0.1", "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } + }, + "Microsoft.UI.Xaml": { + "type": "Transitive", + "resolved": "2.8.0", + "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.1264.42" + } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -270,7 +312,10 @@ } }, "common": { - "type": "Project" + "type": "Project", + "dependencies": { + "boost": "[1.83.0, )" + } }, "fmt": { "type": "Project" @@ -278,6 +323,7 @@ "folly": { "type": "Project", "dependencies": { + "boost": "[1.83.0, )", "fmt": "[1.0.0, )" } }, @@ -286,7 +332,11 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "ReactCommon": "[1.0.0, )" + "Microsoft.JavaScript.Hermes": "[0.1.23, )", + "Microsoft.SourceLink.GitHub": "[1.1.1, )", + "Microsoft.UI.Xaml": "[2.8.0, )", + "ReactCommon": "[1.0.0, )", + "boost": "[1.83.0, )" } }, "microsoft.reactnative.managed": { @@ -299,7 +349,8 @@ "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )" + "Folly": "[1.0.0, )", + "boost": "[1.83.0, )" } } }, @@ -317,6 +368,11 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -509,6 +565,11 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -735,6 +796,11 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -961,6 +1027,11 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1153,6 +1224,11 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1379,6 +1455,11 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.any.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", @@ -1571,6 +1652,11 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.aot.System.Globalization": { "type": "Transitive", "resolved": "4.0.11", diff --git a/vnext/Microsoft.ReactNative.Managed/packages.lock.json b/vnext/Microsoft.ReactNative.Managed/packages.lock.json index 341160c0838..f1810230b0d 100644 --- a/vnext/Microsoft.ReactNative.Managed/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed/packages.lock.json @@ -24,11 +24,21 @@ "Microsoft.SourceLink.Common": "1.1.1" } }, + "boost": { + "type": "Transitive", + "resolved": "1.83.0", + "contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.1.1", "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" }, + "Microsoft.JavaScript.Hermes": { + "type": "Transitive", + "resolved": "0.1.23", + "contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g==" + }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -60,6 +70,19 @@ "resolved": "1.1.1", "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg==" }, + "Microsoft.UI.Xaml": { + "type": "Transitive", + "resolved": "2.8.0", + "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.1264.42" + } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -136,7 +159,10 @@ "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ==" }, "common": { - "type": "Project" + "type": "Project", + "dependencies": { + "boost": "[1.83.0, )" + } }, "fmt": { "type": "Project" @@ -144,6 +170,7 @@ "folly": { "type": "Project", "dependencies": { + "boost": "[1.83.0, )", "fmt": "[1.0.0, )" } }, @@ -152,13 +179,18 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "ReactCommon": "[1.0.0, )" + "Microsoft.JavaScript.Hermes": "[0.1.23, )", + "Microsoft.SourceLink.GitHub": "[1.1.1, )", + "Microsoft.UI.Xaml": "[2.8.0, )", + "ReactCommon": "[1.0.0, )", + "boost": "[1.83.0, )" } }, "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )" + "Folly": "[1.0.0, )", + "boost": "[1.83.0, )" } } }, @@ -176,6 +208,11 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -196,6 +233,11 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -216,6 +258,11 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -236,6 +283,11 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -256,6 +308,11 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -276,6 +333,11 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -296,6 +358,11 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", diff --git a/vnext/Microsoft.ReactNative.NewArch.sln b/vnext/Microsoft.ReactNative.NewArch.sln new file mode 100644 index 00000000000..10a03cad46e --- /dev/null +++ b/vnext/Microsoft.ReactNative.NewArch.sln @@ -0,0 +1,283 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# 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}" + ProjectSection(ProjectDependencies) = postProject + {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {14B93DC8-FD93-4A6D-81CB-8BC96644501C} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx.UnitTests", "Microsoft.ReactNative.Cxx.UnitTests\Microsoft.ReactNative.Cxx.UnitTests.vcxproj", "{6C60E295-C8CA-4DC5-B8BE-09888F58B249}" + ProjectSection(ProjectDependencies) = postProject + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.ComponentTests", "Microsoft.ReactNative.ComponentTests\Microsoft.ReactNative.ComponentTests.vcxproj", "{93792779-4948-4A5D-8CA7-86ED5E3BEC27}" + ProjectSection(ProjectDependencies) = postProject + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso.UnitTests", "Mso.UnitTests\Mso.UnitTests.vcxproj", "{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{25C4DA8C-A4D2-4D5F-950A-E5371A8AB659}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies (External)", "Dependencies (External)", "{814A1893-F3C3-45BA-8C80-5377CFD86C5F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies (Internal)", "Dependencies (Internal)", "{6348365C-E58A-4CB4-96CA-E2A6C1201DD6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other", "Other", "{1DA4BB3B-D0B1-4933-BDBA-60B553B4F946}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{D1CDE6A6-E011-4852-8500-E259AD60846F}" + ProjectSection(SolutionItems) = preProject + PropertySheets\ARM64.props = PropertySheets\ARM64.props + PropertySheets\Bundle.Common.targets = PropertySheets\Bundle.Common.targets + PropertySheets\Bundle.Cpp.targets = PropertySheets\Bundle.Cpp.targets + PropertySheets\Bundle.props = PropertySheets\Bundle.props + PropertySheets\Bundle.targets = PropertySheets\Bundle.targets + PropertySheets\Debug.props = PropertySheets\Debug.props + PropertySheets\React.Cpp.props = PropertySheets\React.Cpp.props + PropertySheets\ReactCommunity.cpp.props = PropertySheets\ReactCommunity.cpp.props + PropertySheets\Release.props = PropertySheets\Release.props + PropertySheets\Warnings.props = PropertySheets\Warnings.props + PropertySheets\Win32.props = PropertySheets\Win32.props + PropertySheets\x64.props = PropertySheets\x64.props + PropertySheets\x86.props = PropertySheets\x86.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{4CA4053F-17D8-4619-8600-FF672209828C}" + ProjectSection(SolutionItems) = preProject + PropertySheets\Application\ARM64.props = PropertySheets\Application\ARM64.props + PropertySheets\Application\Debug.props = PropertySheets\Application\Debug.props + PropertySheets\Application\DebugBundle.props = PropertySheets\Application\DebugBundle.props + PropertySheets\Application\Release.props = PropertySheets\Application\Release.props + PropertySheets\Application\ReleaseBundle.props = PropertySheets\Application\ReleaseBundle.props + PropertySheets\Application\Win32.props = PropertySheets\Application\Win32.props + PropertySheets\Application\x64.props = PropertySheets\Application\x64.props + PropertySheets\Application\x86.props = PropertySheets\Application\x86.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLibrary", "DynamicLibrary", "{19F9503C-4A05-4F96-8A41-0BD93228F220}" + ProjectSection(SolutionItems) = preProject + PropertySheets\DynamicLibrary\ARM64.props = PropertySheets\DynamicLibrary\ARM64.props + PropertySheets\DynamicLibrary\Debug.props = PropertySheets\DynamicLibrary\Debug.props + PropertySheets\DynamicLibrary\DebugBundle.props = PropertySheets\DynamicLibrary\DebugBundle.props + PropertySheets\DynamicLibrary\Release.props = PropertySheets\DynamicLibrary\Release.props + PropertySheets\DynamicLibrary\ReleaseBundle.props = PropertySheets\DynamicLibrary\ReleaseBundle.props + PropertySheets\DynamicLibrary\Win32.props = PropertySheets\DynamicLibrary\Win32.props + PropertySheets\DynamicLibrary\x64.props = PropertySheets\DynamicLibrary\x64.props + PropertySheets\DynamicLibrary\x86.props = PropertySheets\DynamicLibrary\x86.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticLibrary", "StaticLibrary", "{529E25F3-F1D4-41CC-9BAC-DEE9A5B0FF97}" + ProjectSection(SolutionItems) = preProject + PropertySheets\StaticLibrary\ARM64.props = PropertySheets\StaticLibrary\ARM64.props + PropertySheets\StaticLibrary\Debug.props = PropertySheets\StaticLibrary\Debug.props + PropertySheets\StaticLibrary\DebugBundle.props = PropertySheets\StaticLibrary\DebugBundle.props + PropertySheets\StaticLibrary\Release.props = PropertySheets\StaticLibrary\Release.props + PropertySheets\StaticLibrary\ReleaseBundle.props = PropertySheets\StaticLibrary\ReleaseBundle.props + PropertySheets\StaticLibrary\Win32.props = PropertySheets\StaticLibrary\Win32.props + PropertySheets\StaticLibrary\x64.props = PropertySheets\StaticLibrary\x64.props + PropertySheets\StaticLibrary\x86.props = PropertySheets\StaticLibrary\x86.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MIDL", "MIDL", "{A7A199BB-2B8D-4142-92D0-5EA0B299F287}" + ProjectSection(SolutionItems) = preProject + PropertySheets\MIDL\midlrt.props = PropertySheets\MIDL\midlrt.props + PropertySheets\MIDL\midlrt.targets = PropertySheets\MIDL\midlrt.targets + PropertySheets\MIDL\MidlRT.xml = PropertySheets\MIDL\MidlRT.xml + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.IntegrationTests", "Microsoft.ReactNative.IntegrationTests\Microsoft.ReactNative.IntegrationTests.vcxproj", "{14FA0516-E6D7-4E4D-B097-1470198C5072}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CF71BDBF-544C-4EBC-85F6-6911A0E2F5B8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.CsWinRT", "Microsoft.ReactNative.CsWinRT\Microsoft.ReactNative.CsWinRT.csproj", "{B76BB397-D882-48D8-AA8D-DA9921860B2B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Debug|ARM64 = Debug|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + Release|ARM64 = Release|ARM64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.Build.0 = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.ActiveCfg = Debug|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.Build.0 = Debug|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.ActiveCfg = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Build.0 = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Deploy.0 = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.ActiveCfg = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.Build.0 = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.ActiveCfg = Release|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.Build.0 = Release|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|ARM64.ActiveCfg = Debug|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.ActiveCfg = Debug|x64 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.Build.0 = Debug|x64 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.ActiveCfg = Debug|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.Build.0 = Debug|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM64.ActiveCfg = Release|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.ActiveCfg = Release|x64 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.Build.0 = Release|x64 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.ActiveCfg = Release|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.Build.0 = Release|Win32 + {93792779-4948-4A5D-8CA7-86ED5E3BEC27}.Debug|ARM64.ActiveCfg = Debug|Win32 + {93792779-4948-4A5D-8CA7-86ED5E3BEC27}.Debug|x64.ActiveCfg = Debug|x64 + {93792779-4948-4A5D-8CA7-86ED5E3BEC27}.Debug|x64.Build.0 = Debug|x64 + {93792779-4948-4A5D-8CA7-86ED5E3BEC27}.Debug|x86.ActiveCfg = Debug|Win32 + {93792779-4948-4A5D-8CA7-86ED5E3BEC27}.Release|ARM64.ActiveCfg = Release|Win32 + {93792779-4948-4A5D-8CA7-86ED5E3BEC27}.Release|x64.ActiveCfg = Release|x64 + {93792779-4948-4A5D-8CA7-86ED5E3BEC27}.Release|x86.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM64.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.ActiveCfg = Debug|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.Build.0 = Debug|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.Build.0 = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM64.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.ActiveCfg = Release|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Debug|ARM64.ActiveCfg = Debug|Win32 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Debug|x64.ActiveCfg = Debug|x64 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Debug|x64.Build.0 = Debug|x64 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Debug|x86.ActiveCfg = Debug|Win32 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Debug|x86.Build.0 = Debug|Win32 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Release|ARM64.ActiveCfg = Release|Win32 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Release|x64.ActiveCfg = Release|x64 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Release|x64.Build.0 = Release|x64 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Release|x86.ActiveCfg = Release|Win32 + {14FA0516-E6D7-4E4D-B097-1470198C5072}.Release|x86.Build.0 = Release|Win32 + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.Build.0 = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x64.ActiveCfg = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x64.Build.0 = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.ActiveCfg = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.Build.0 = Debug|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.ActiveCfg = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.Build.0 = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x64.ActiveCfg = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x64.Build.0 = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.ActiveCfg = Release|Any CPU + {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {814A1893-F3C3-45BA-8C80-5377CFD86C5F} + {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {814A1893-F3C3-45BA-8C80-5377CFD86C5F} + {EF074BA1-2D54-4D49-A28E-5E040B47CD2E} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {6C60E295-C8CA-4DC5-B8BE-09888F58B249} = {25C4DA8C-A4D2-4D5F-950A-E5371A8AB659} + {93792779-4948-4A5D-8CA7-86ED5E3BEC27} = {25C4DA8C-A4D2-4D5F-950A-E5371A8AB659} + {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE} = {25C4DA8C-A4D2-4D5F-950A-E5371A8AB659} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {814A1893-F3C3-45BA-8C80-5377CFD86C5F} + {D1CDE6A6-E011-4852-8500-E259AD60846F} = {1DA4BB3B-D0B1-4933-BDBA-60B553B4F946} + {4CA4053F-17D8-4619-8600-FF672209828C} = {D1CDE6A6-E011-4852-8500-E259AD60846F} + {19F9503C-4A05-4F96-8A41-0BD93228F220} = {D1CDE6A6-E011-4852-8500-E259AD60846F} + {529E25F3-F1D4-41CC-9BAC-DEE9A5B0FF97} = {D1CDE6A6-E011-4852-8500-E259AD60846F} + {A7A199BB-2B8D-4142-92D0-5EA0B299F287} = {D1CDE6A6-E011-4852-8500-E259AD60846F} + {14FA0516-E6D7-4E4D-B097-1470198C5072} = {25C4DA8C-A4D2-4D5F-950A-E5371A8AB659} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {988F03E6-640A-4C7E-8B55-C1291B70669E} + EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 + Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 + Chakra\Chakra.vcxitems*{93792779-4948-4a5d-8ca7-86ed5e3bec27}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{93792779-4948-4a5d-8ca7-86ed5e3bec27}*SharedItemsImports = 4 + Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 + include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9 + Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + EndGlobalSection +EndGlobal diff --git a/vnext/Microsoft.ReactNative.sln b/vnext/Microsoft.ReactNative.sln index eee6ff6f724..78750bee8ff 100644 --- a/vnext/Microsoft.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.sln @@ -127,16 +127,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed.IntegrationTests", "Microsoft.ReactNative.Managed.IntegrationTests\Microsoft.ReactNative.Managed.IntegrationTests.csproj", "{E2BE6630-21C7-43A4-AC90-8D2844C06617}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.CsWinRT", "Microsoft.ReactNative.CsWinRT\Microsoft.ReactNative.CsWinRT.csproj", "{B76BB397-D882-48D8-AA8D-DA9921860B2B}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM64 = Release|ARM64 + Debug|ARM64 = Debug|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 + Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -302,18 +300,6 @@ Global {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.ActiveCfg = Release|x86 {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.Build.0 = Release|x86 {E2BE6630-21C7-43A4-AC90-8D2844C06617}.Release|x86.Deploy.0 = Release|x86 - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|ARM64.Build.0 = Debug|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x64.ActiveCfg = Debug|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x64.Build.0 = Debug|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.ActiveCfg = Debug|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Debug|x86.Build.0 = Debug|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.ActiveCfg = Release|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|ARM64.Build.0 = Release|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x64.ActiveCfg = Release|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x64.Build.0 = Release|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.ActiveCfg = Release|Any CPU - {B76BB397-D882-48D8-AA8D-DA9921860B2B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index 4fb9b143880..6a914ad9fbe 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -1,6 +1,7 @@ + true true diff --git a/vnext/ReactCommon.UnitTests/packages.lock.json b/vnext/ReactCommon.UnitTests/packages.lock.json index 847d30e6013..91023cad7e4 100644 --- a/vnext/ReactCommon.UnitTests/packages.lock.json +++ b/vnext/ReactCommon.UnitTests/packages.lock.json @@ -44,19 +44,6 @@ "Microsoft.SourceLink.Common": "1.1.1" } }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22621.756", - "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA==" - }, - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - }, "common": { "type": "Project", "dependencies": { @@ -87,7 +74,6 @@ "FollyWin32": "[1.0.0, )", "Microsoft.JavaScript.Hermes": "[0.1.23, )", "Microsoft.SourceLink.GitHub": "[1.1.1, )", - "Microsoft.WindowsAppSDK": "[1.5.240227000, )", "ReactCommon": "[1.0.0, )", "ReactNative.V8Jsi.Windows": "[0.71.8, )", "boost": "[1.83.0, )" @@ -101,45 +87,9 @@ } } }, - "native,Version=v0.0/win": { - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-arm64": { - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-x64": { - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - }, - "native,Version=v0.0/win-x86": { - "Microsoft.WindowsAppSDK": { - "type": "Transitive", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", - "dependencies": { - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" - } - } - } + "native,Version=v0.0/win": {}, + "native,Version=v0.0/win-arm64": {}, + "native,Version=v0.0/win-x64": {}, + "native,Version=v0.0/win-x86": {} } } \ No newline at end of file diff --git a/vnext/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1 b/vnext/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1 index c4739440f38..4d6fedda638 100644 --- a/vnext/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1 +++ b/vnext/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1 @@ -8,7 +8,7 @@ Set-Location -Path $RepoRoot try { - $packagesSolutions = Get-ChildItem -File -Recurse -Path packages *.sln | Where-Object { !$_.FullName.Contains('node_modules') -and !$_.FullName.Contains('e2etest') } + $packagesSolutions = @();#Get-ChildItem -File -Recurse -Path packages *.sln | Where-Object { !$_.FullName.Contains('node_modules') -and !$_.FullName.Contains('e2etest') } $vnextSolutions = Get-ChildItem -File -Path vnext *.sln # Run all solutions with their defaults @@ -16,12 +16,6 @@ try Write-Host Restoring $_.FullName with defaults & msbuild /t:Restore /p:RestoreForceEvaluate=true $_.FullName } - - # Re-run solutions that we also build a Fabric variant - @("$RepoRoot\vnext\ReactWindows-Desktop.sln", "$RepoRoot\vnext\Microsoft.ReactNative.CppOnly.slnf") | Foreach { - Write-Host Restoring $_ with Fabric - & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseFabric=true /p:UseWinUI3=true $_ - } } finally { From 0aa12374de084de21e6a4fea72ce2dc380b050b3 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Tue, 1 Oct 2024 12:22:31 -0700 Subject: [PATCH 09/13] Update cswinrt to winappsdk 1.6 --- .../Microsoft.ReactNative.CsWinRT.csproj | 9 +- .../packages.lock.json | 113 ++++++++++++++---- 2 files changed, 95 insertions(+), 27 deletions(-) diff --git a/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj b/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj index c6eaea3fa4d..d1bce649dcb 100644 --- a/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj +++ b/vnext/Microsoft.ReactNative.CsWinRT/Microsoft.ReactNative.CsWinRT.csproj @@ -8,12 +8,12 @@ None CS8305;CS0436 - Microsoft.ReactNative.projection + Microsoft.ReactNative.Projection - + @@ -23,6 +23,9 @@ 10.0.22621.38 Microsoft.ReactNative - Windows;Microsoft + + Windows; + Microsoft + diff --git a/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json b/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json index 61f35c9d42f..1ca68c7e8b2 100644 --- a/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json +++ b/vnext/Microsoft.ReactNative.CsWinRT/packages.lock.json @@ -10,13 +10,19 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" + }, "Microsoft.Windows.SDK.BuildTools": { "type": "Transitive", "resolved": "10.0.22621.756", @@ -52,78 +58,137 @@ "net6.0-windows10.0.22621/win10-arm": { "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, "net6.0-windows10.0.22621/win10-arm-aot": { "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" + } + }, + "net6.0-windows10.0.22621/win10-arm64": { + "Microsoft.WindowsAppSDK": { + "type": "Direct", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", + "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" + } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, "net6.0-windows10.0.22621/win10-arm64-aot": { "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, "net6.0-windows10.0.22621/win10-x64": { "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, "net6.0-windows10.0.22621/win10-x64-aot": { "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, "net6.0-windows10.0.22621/win10-x86": { "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } }, "net6.0-windows10.0.22621/win10-x86-aot": { "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.5.240227000, )", - "resolved": "1.5.240227000", - "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==", + "requested": "[1.6.240829007, )", + "resolved": "1.6.240829007", + "contentHash": "Ij0jXARFOlRY+n7M32ZS9Kbf+x7gmnhWVnMP3eKHe83eu/2pzh9f4gjmoZ5fAgoZaKWCa2PvcxzHx0gtRXcKRQ==", "dependencies": { + "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.2651.64", + "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg==" } } } From 5c5a2cec785216a4e0e68ec575ec0a2b6baa3677 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Tue, 1 Oct 2024 13:15:31 -0700 Subject: [PATCH 10/13] Add to nuspec and build artifacts --- .ado/jobs/universal.yml | 14 ++++++++++---- .ado/publish.yml | 10 ++++++---- .ado/templates/react-native-init-windows.yml | 2 ++ vnext/Scripts/Microsoft.ReactNative.nuspec | 8 ++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index b60e5bf3e5c..0264f6d0481 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -133,14 +133,11 @@ - template: ../templates/apply-published-version-vars.yml - - ${{ if eq(matrix.UseFabric, true) }}: - - template: ../templates/enable-fabric-experimental-feature.yml - - template: ../templates/msbuild-sln.yml parameters: solutionDir: vnext ${{ if eq(matrix.UseFabric, true) }}: - solutionName: Microsoft.ReactNative.CppOnly.slnf + solutionName: Microsoft.ReactNative.NewArch.sln ${{ else }}: solutionName: Microsoft.ReactNative.sln buildPlatform: ${{ matrix.BuildPlatform }} @@ -187,6 +184,15 @@ Microsoft.ReactNative.Managed.UnitTests\** Mso.UnitTests\** + - ${{ if eq(matrix.UseFabric, true) }}: + - template: ../templates/publish-build-artifacts.yml + parameters: + artifactName: ReactWindowsFabric + buildPlatform: AnyCPU + buildConfiguration: ${{ matrix.BuildConfiguration }} + contents: | + Microsoft.ReactNative.CsWinRT\** + - job: UniversalTest${{ matrix.Name }} variables: - template: ../variables/windows.yml diff --git a/.ado/publish.yml b/.ado/publish.yml index 8ad46e3fce4..5a667f64aa8 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -335,14 +335,11 @@ extends: - template: .ado/templates/apply-published-version-vars.yml@self - - ${{ if eq(matrix.UseFabric, true) }}: - - template: .ado/templates/enable-fabric-experimental-feature.yml@self - - template: .ado/templates/msbuild-sln.yml@self parameters: solutionDir: vnext ${{ if eq(matrix.UseFabric, true) }}: - solutionName: Microsoft.ReactNative.CppOnly.slnf + solutionName: Microsoft.ReactNative.NewArch.sln ${{ else }}: solutionName: Microsoft.ReactNative.sln buildPlatform: ${{ matrix.BuildPlatform }} @@ -368,6 +365,7 @@ extends: Microsoft.ReactNative\** Microsoft.ReactNative.Managed\** Microsoft.ReactNative.Managed.CodeGen\** + Microsoft.ReactNative.CsWinRT\** - template: .ado/templates/component-governance.yml@self @@ -471,12 +469,16 @@ extends: configuration: Release - platform: ARM64 configuration: Release + - platform: AnyCPU + configuration: Release - platform: x64 configuration: Debug - platform: x86 configuration: Debug - platform: ARM64 configuration: Debug + - platform: AnyCPU + configuration: Debug - template: .ado/templates/prep-and-pack-nuget.yml@self parameters: diff --git a/.ado/templates/react-native-init-windows.yml b/.ado/templates/react-native-init-windows.yml index 3c3d607fc89..f83fb1072fe 100644 --- a/.ado/templates/react-native-init-windows.yml +++ b/.ado/templates/react-native-init-windows.yml @@ -54,6 +54,8 @@ steps: slices: - platform: ${{ parameters.platform }} configuration: Release + - platform: AnyCPU + configuration: Release - ${{ if endsWith(parameters.template, '-app') }}: - script: | diff --git a/vnext/Scripts/Microsoft.ReactNative.nuspec b/vnext/Scripts/Microsoft.ReactNative.nuspec index 476d988c630..fea8549f8f9 100644 --- a/vnext/Scripts/Microsoft.ReactNative.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.nuspec @@ -41,6 +41,10 @@ + + + + @@ -57,6 +61,10 @@ + + + + From aad9fb58af5887bd02dc8aa9f6d87ac7df9ca3d2 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Tue, 1 Oct 2024 14:51:58 -0700 Subject: [PATCH 11/13] fix config utils --- .../cli/src/commands/config/configUtils.ts | 33 +++- .../MyApp/AutolinkedNativeModules.g.cs | 2 +- .../cs-app/windows/MyApp/MyApp.csproj | 3 + .../cs-app/windows/MyApp/MyApp.vcxproj | 143 ------------------ .../templates/cs-app/windows/MyApp/Program.cs | 2 +- 5 files changed, 31 insertions(+), 152 deletions(-) delete mode 100644 vnext/templates/cs-app/windows/MyApp/MyApp.vcxproj diff --git a/packages/@react-native-windows/cli/src/commands/config/configUtils.ts b/packages/@react-native-windows/cli/src/commands/config/configUtils.ts index 3b69b04cd73..1bddd55a32b 100644 --- a/packages/@react-native-windows/cli/src/commands/config/configUtils.ts +++ b/packages/@react-native-windows/cli/src/commands/config/configUtils.ts @@ -105,9 +105,15 @@ export function isRnwDependencyProject(filePath: string): boolean { const projectLang = getProjectLanguage(filePath); if (projectLang === 'cs') { - return importProjectExists( - projectContents, - 'Microsoft.ReactNative.Uwp.CSharpLib.targets', + return ( + importProjectExists( + projectContents, + 'Microsoft.ReactNative.Uwp.CSharpLib.targets', + ) || + importProjectExists( + projectContents, + 'Microsoft.ReactNative.Composition.CSharpLib.targets', + ) ); } else if (projectLang === 'cpp') { return ( @@ -194,9 +200,15 @@ function isRnwAppProject(filePath: string): boolean { const projectLang = getProjectLanguage(filePath); if (projectLang === 'cs') { - return importProjectExists( - projectContents, - 'Microsoft.ReactNative.Uwp.CSharpApp.targets', + return ( + importProjectExists( + projectContents, + 'Microsoft.ReactNative.Uwp.CSharpApp.targets', + ) || + importProjectExists( + projectContents, + 'Microsoft.ReactNative.Composition.CSharpApp.targets', + ) ); } else if (projectLang === 'cpp') { return ( @@ -348,11 +360,18 @@ export function importProjectExists( projectContents: Node, projectName: string, ): boolean { - const nodes = msbuildSelect( + let nodes = msbuildSelect( `//msbuild:Import[contains(@Project,'${projectName}')]`, projectContents, ); + if (nodes.length === 0) { + nodes = msbuildSelect( + `//Import[contains(@Project,'${projectName}')]`, + projectContents, + ); + } + return nodes.length > 0; } diff --git a/vnext/templates/cs-app/windows/MyApp/AutolinkedNativeModules.g.cs b/vnext/templates/cs-app/windows/MyApp/AutolinkedNativeModules.g.cs index 422f5521000..56270f2f547 100644 --- a/vnext/templates/cs-app/windows/MyApp/AutolinkedNativeModules.g.cs +++ b/vnext/templates/cs-app/windows/MyApp/AutolinkedNativeModules.g.cs @@ -4,7 +4,7 @@ using Microsoft.ReactNative; -namespace {{ namespace }} +namespace Microsoft.ReactNative.Managed { internal static class AutolinkedNativeModules { diff --git a/vnext/templates/cs-app/windows/MyApp/MyApp.csproj b/vnext/templates/cs-app/windows/MyApp/MyApp.csproj index 6d05dfb327d..e607fbdbfc2 100644 --- a/vnext/templates/cs-app/windows/MyApp/MyApp.csproj +++ b/vnext/templates/cs-app/windows/MyApp/MyApp.csproj @@ -1,6 +1,9 @@ + net6.0-windows10.0.22621.0 + {{ name }} + {{ projectGuidUpper }} WinExe {{ name }} app.manifest diff --git a/vnext/templates/cs-app/windows/MyApp/MyApp.vcxproj b/vnext/templates/cs-app/windows/MyApp/MyApp.vcxproj deleted file mode 100644 index e8cd8e92dfe..00000000000 --- a/vnext/templates/cs-app/windows/MyApp/MyApp.vcxproj +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - true - true - {{ projectGuidUpper }} - {{ name }} - Win32Proj - {{ namespace }} - 10.0 - en-US - 17.0 - false - - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM64 - - - Release - ARM64 - - - - Application - Unicode - v143 - - - true - - - false - true - - - - - - - - - - - - - Use - pch.h - $(IntDir)pch.pch - Level4 - true - %(AdditionalOptions) /bigobj - 4453;28204 - - - shell32.lib;user32.lib;windowsapp.lib;%(AdditionalDependenices) - Windows - true - - - - - _DEBUG;%(PreprocessorDefinitions) - - - - - NDEBUG;%(PreprocessorDefinitions) - - - - - USE_FABRIC;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - {{#cppNugetPackages}} - - {{/cppNugetPackages}} - - - - This project references targets in your node_modules\react-native-windows folder. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/vnext/templates/cs-app/windows/MyApp/Program.cs b/vnext/templates/cs-app/windows/MyApp/Program.cs index f8fbaf530c4..48b10da47c2 100644 --- a/vnext/templates/cs-app/windows/MyApp/Program.cs +++ b/vnext/templates/cs-app/windows/MyApp/Program.cs @@ -37,7 +37,7 @@ static void Main(string[] args) #endif var reactPackageProviders = new List(); - AutolinkedNativeModules.RegisterAutolinkedNativeModulePackages(reactPackageProviders); + Microsoft.ReactNative.Managed.AutolinkedNativeModules.RegisterAutolinkedNativeModulePackages(reactPackageProviders); var viewOptions = new ReactViewOptions(); viewOptions.ComponentName = "{{ mainComponentName }}"; From bf8369fe56b501b1c3ce9bf2a76aa4827e99794b Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Tue, 1 Oct 2024 14:52:52 -0700 Subject: [PATCH 12/13] Change files --- ...e-windows-cli-a6bebc8e-9e15-4f37-a3a1-5b6c4b008d7e.json | 7 +++++++ ...ative-windows-cdfa09d5-ff63-4c45-85fa-b6ede9ab1816.json | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 change/@react-native-windows-cli-a6bebc8e-9e15-4f37-a3a1-5b6c4b008d7e.json create mode 100644 change/react-native-windows-cdfa09d5-ff63-4c45-85fa-b6ede9ab1816.json diff --git a/change/@react-native-windows-cli-a6bebc8e-9e15-4f37-a3a1-5b6c4b008d7e.json b/change/@react-native-windows-cli-a6bebc8e-9e15-4f37-a3a1-5b6c4b008d7e.json new file mode 100644 index 00000000000..e60783bc978 --- /dev/null +++ b/change/@react-native-windows-cli-a6bebc8e-9e15-4f37-a3a1-5b6c4b008d7e.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Adding CsWinRT projection for C# apps", + "packageName": "@react-native-windows/cli", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/react-native-windows-cdfa09d5-ff63-4c45-85fa-b6ede9ab1816.json b/change/react-native-windows-cdfa09d5-ff63-4c45-85fa-b6ede9ab1816.json new file mode 100644 index 00000000000..98c032733ad --- /dev/null +++ b/change/react-native-windows-cdfa09d5-ff63-4c45-85fa-b6ede9ab1816.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Adding CsWinRT projection for C# apps", + "packageName": "react-native-windows", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch" +} From 9a3920309de22a864d36e30e4d51a4529aac9571 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Wed, 2 Oct 2024 13:16:35 -0700 Subject: [PATCH 13/13] fix publish indent --- .ado/jobs/universal.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 0264f6d0481..6bea3541099 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -185,13 +185,13 @@ Mso.UnitTests\** - ${{ if eq(matrix.UseFabric, true) }}: - - template: ../templates/publish-build-artifacts.yml - parameters: - artifactName: ReactWindowsFabric - buildPlatform: AnyCPU - buildConfiguration: ${{ matrix.BuildConfiguration }} - contents: | - Microsoft.ReactNative.CsWinRT\** + - template: ../templates/publish-build-artifacts.yml + parameters: + artifactName: ReactWindowsFabric + buildPlatform: AnyCPU + buildConfiguration: ${{ matrix.BuildConfiguration }} + contents: | + Microsoft.ReactNative.CsWinRT\** - job: UniversalTest${{ matrix.Name }} variables: