From 88370b15445ed825365d84640edf10a3b3682a5d Mon Sep 17 00:00:00 2001 From: Andrew Forster Date: Mon, 31 Oct 2016 09:49:58 -0700 Subject: [PATCH 01/20] Syncing with upstream --- Examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples b/Examples index be5c02e5fad..51ec435c4ea 160000 --- a/Examples +++ b/Examples @@ -1 +1 @@ -Subproject commit be5c02e5fadcf17586fc5737a559bb1189b518ca +Subproject commit 51ec435c4ea30614ed2c6d13571d957abc99b87b From 95e155d5aeaca0d3454405eaec0a6e91c9cae926 Mon Sep 17 00:00:00 2001 From: Andrew Forster Date: Tue, 1 Nov 2016 12:59:05 -0700 Subject: [PATCH 02/20] Adding shell/MainReactPackage to ReactNative.Net46 --- .../ReactNative.Net46.csproj | 1 + .../Shell/MainReactPackage.cs | 110 ++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 ReactWindows/ReactNative.Net46/Shell/MainReactPackage.cs diff --git a/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj b/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj index e8189cfcbd9..7beb91af338 100644 --- a/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj +++ b/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj @@ -133,6 +133,7 @@ + diff --git a/ReactWindows/ReactNative.Net46/Shell/MainReactPackage.cs b/ReactWindows/ReactNative.Net46/Shell/MainReactPackage.cs new file mode 100644 index 00000000000..dbbd96073b7 --- /dev/null +++ b/ReactWindows/ReactNative.Net46/Shell/MainReactPackage.cs @@ -0,0 +1,110 @@ +using ReactNative.Animated; +using ReactNative.Bridge; +using ReactNative.Modules.AppState; +using ReactNative.Modules.Clipboard; +using ReactNative.Modules.Core; +using ReactNative.Modules.Dialog; +//using ReactNative.Modules.Image; +using ReactNative.Modules.I18N; +//using ReactNative.Modules.Launch; +//using ReactNative.Modules.Location; +using ReactNative.Modules.NetInfo; +using ReactNative.Modules.Network; +//using ReactNative.Modules.StatusBar; +using ReactNative.Modules.Storage; +//using ReactNative.Modules.Vibration; +//using ReactNative.Modules.WebSocket; +using ReactNative.UIManager; +//using ReactNative.Views.Flip; +//using ReactNative.Views.Image; +//using ReactNative.Views.Picker; +//using ReactNative.Views.Progress; +//using ReactNative.Views.Scroll; +//using ReactNative.Views.Slider; +//using ReactNative.Views.Split; +//using ReactNative.Views.Switch; +//using ReactNative.Views.Text; +//using ReactNative.Views.TextInput; +//using ReactNative.Views.View; +//using ReactNative.Views.Web; +using System; +using System.Collections.Generic; + +namespace ReactNative.Shell +{ + /// + /// Package defining basic modules and view managers. + /// + public class MainReactPackage : IReactPackage + { + /// + /// Creates the list of native modules to register with the react + /// instance. + /// + /// The React application context. + /// The list of native modules. + public IReadOnlyList CreateNativeModules(ReactContext reactContext) + { + return new List + { + new AppStateModule(reactContext), + new AsyncStorageModule(), + //new CameraRollManager(reactContext), + new ClipboardModule(), + new DialogModule(reactContext), + //new ImageLoaderModule(), + new I18NModule(), + //new LauncherModule(reactContext), + //new LocationModule(reactContext), + //new NativeAnimatedModule(reactContext), + new NetworkingModule(reactContext), + new NetInfoModule(reactContext), + //new StatusBarModule(), + //new VibrationModule(), + //new WebSocketModule(reactContext), + }; + } + + /// + /// Creates the list of JavaScript modules to register with the + /// React instance. + /// + /// The list of JavaScript modules. + public IReadOnlyList CreateJavaScriptModulesConfig() + { + return new List(0); + } + + /// + /// Creates the list of view managers that should be registered with + /// the . + /// + /// The React application context. + /// The list of view managers. + public IReadOnlyList CreateViewManagers( + ReactContext reactContext) + { + return new List + { + //new ReactFlipViewManager(), + //new ReactImageManager(), + //new ReactProgressBarViewManager(), + //new ReactProgressRingViewManager(), + //new ReactPickerManager(), + //new ReactRunManager(), + ////new RecyclerViewBackedScrollViewManager(), + //new ReactScrollViewManager(), + //new ReactSliderManager(), + //new ReactSplitViewManager(), + //new ReactSwitchManager(), + //new ReactPasswordBoxManager(), + //new ReactTextInputManager(), + //new ReactTextViewManager(), + //new ReactViewManager(), + //new ReactSpanViewManager(), + ////new SwipeRefreshLayoutManager(), + //new ReactWebViewManager(), + }; + } + } +} From a468c894f61fd46f71402b6680dcbe1679198709 Mon Sep 17 00:00:00 2001 From: Andrew Forster Date: Tue, 1 Nov 2016 13:06:03 -0700 Subject: [PATCH 03/20] Adding Playground.Net46 WPF application with basic ReactNative integration... --- ReactWindows/Playground.Net46/App.config | 6 + ReactWindows/Playground.Net46/App.xaml | 6 + ReactWindows/Playground.Net46/App.xaml.cs | 80 +++++++++++ ReactWindows/Playground.Net46/AppReactPage.cs | 59 +++++++++ .../Assets/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../Assets/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes .../Playground.Net46/Assets/StoreLogo.png | Bin 0 -> 1451 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes ReactWindows/Playground.Net46/MainWindow.xaml | 12 ++ .../Playground.Net46/MainWindow.xaml.cs | 28 ++++ .../Playground.Net46/Playground.Net46.csproj | 124 ++++++++++++++++++ .../Properties/AssemblyInfo.cs | 55 ++++++++ .../Playground.Net46/index.windows.js | 51 +++++++ ReactWindows/ReactNative.sln | 26 ++++ 17 files changed, 447 insertions(+) create mode 100644 ReactWindows/Playground.Net46/App.config create mode 100644 ReactWindows/Playground.Net46/App.xaml create mode 100644 ReactWindows/Playground.Net46/App.xaml.cs create mode 100644 ReactWindows/Playground.Net46/AppReactPage.cs create mode 100644 ReactWindows/Playground.Net46/Assets/LockScreenLogo.scale-200.png create mode 100644 ReactWindows/Playground.Net46/Assets/SplashScreen.scale-200.png create mode 100644 ReactWindows/Playground.Net46/Assets/Square150x150Logo.scale-200.png create mode 100644 ReactWindows/Playground.Net46/Assets/Square44x44Logo.scale-200.png create mode 100644 ReactWindows/Playground.Net46/Assets/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 ReactWindows/Playground.Net46/Assets/StoreLogo.png create mode 100644 ReactWindows/Playground.Net46/Assets/Wide310x150Logo.scale-200.png create mode 100644 ReactWindows/Playground.Net46/MainWindow.xaml create mode 100644 ReactWindows/Playground.Net46/MainWindow.xaml.cs create mode 100644 ReactWindows/Playground.Net46/Playground.Net46.csproj create mode 100644 ReactWindows/Playground.Net46/Properties/AssemblyInfo.cs create mode 100644 ReactWindows/Playground.Net46/index.windows.js diff --git a/ReactWindows/Playground.Net46/App.config b/ReactWindows/Playground.Net46/App.config new file mode 100644 index 00000000000..2d2a12d81be --- /dev/null +++ b/ReactWindows/Playground.Net46/App.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/ReactWindows/Playground.Net46/App.xaml b/ReactWindows/Playground.Net46/App.xaml new file mode 100644 index 00000000000..18951107225 --- /dev/null +++ b/ReactWindows/Playground.Net46/App.xaml @@ -0,0 +1,6 @@ + + + diff --git a/ReactWindows/Playground.Net46/App.xaml.cs b/ReactWindows/Playground.Net46/App.xaml.cs new file mode 100644 index 00000000000..c2b5b5c0d95 --- /dev/null +++ b/ReactWindows/Playground.Net46/App.xaml.cs @@ -0,0 +1,80 @@ +using ReactNative; +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; +using System.Windows.Navigation; + +namespace Playground.Net46 +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + public partial class App : Application + { + //private Window _shellWindow; + private ReactPage _reactPage; + + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + } + + protected override void OnStartup(StartupEventArgs e) + { + base.OnStartup(e); + + _reactPage = new AppReactPage(); + + _reactPage.OnResume(() => + { + //OnBackPressed + Application.Current.Shutdown(0); + }); + + //TODO: UWP's OnLaunched prvoides arguments as a string, whereas WPF's OnStartup provides them as a string[]; Need to figure out what format the ReactPage.OnCreate wants... + _reactPage.OnCreate(null); + + // Create a Frame to act as the navigation context and navigate to the first page + var rootFrame = new Frame + { + Height = 300, + Width = 400, + Content = _reactPage + }; + + rootFrame.NavigationFailed += OnNavigationFailed; + + //Create a Window to hold the frame + var shellWindow = new Window + { + Background = new SolidColorBrush(Colors.BlueViolet), + Height = 300, + Width = 400, + ShowActivated = true, + ShowInTaskbar = true, + WindowStartupLocation = WindowStartupLocation.CenterScreen, + Content = rootFrame + }; + + Application.Current.MainWindow = shellWindow; + + shellWindow.Show(); + } + + /// + /// Invoked when Navigation to a certain page fails + /// + /// The Frame which failed navigation + /// Details about the navigation failure + private void OnNavigationFailed(object sender, NavigationFailedEventArgs e) + { + throw new Exception("Failed to load Page"); + } + + + } +} diff --git a/ReactWindows/Playground.Net46/AppReactPage.cs b/ReactWindows/Playground.Net46/AppReactPage.cs new file mode 100644 index 00000000000..a5efd5cea04 --- /dev/null +++ b/ReactWindows/Playground.Net46/AppReactPage.cs @@ -0,0 +1,59 @@ +using ReactNative; +using ReactNative.Modules.Core; +using ReactNative.Shell; +using System.Collections.Generic; + +namespace Playground.Net46 +{ + class AppReactPage : ReactPage + { + public override string MainComponentName + { + get + { + return "Playground.Net46"; + } + } + + public override string JavaScriptMainModuleName + { + get + { + return "ReactWindows/Playground.Net46/index.windows"; + } + } + +#if BUNDLE + public override string JavaScriptBundleFile + { + get + { + return "ms-appx:///ReactAssets/index.windows.bundle"; + } + } +#endif + + public override List Packages + { + get + { + return new List + { + new MainReactPackage(), + }; + } + } + + public override bool UseDeveloperSupport + { + get + { +#if !BUNDLE || DEBUG + return true; +#else + return false; +#endif + } + } + } +} diff --git a/ReactWindows/Playground.Net46/Assets/LockScreenLogo.scale-200.png b/ReactWindows/Playground.Net46/Assets/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/ReactWindows/Playground.Net46/Assets/SplashScreen.scale-200.png b/ReactWindows/Playground.Net46/Assets/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/ReactWindows/Playground.Net46/Assets/Square150x150Logo.scale-200.png b/ReactWindows/Playground.Net46/Assets/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/ReactWindows/Playground.Net46/Assets/Square44x44Logo.scale-200.png b/ReactWindows/Playground.Net46/Assets/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/ReactWindows/Playground.Net46/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/ReactWindows/Playground.Net46/Assets/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/ReactWindows/Playground.Net46/Assets/StoreLogo.png b/ReactWindows/Playground.Net46/Assets/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/ReactWindows/Playground.Net46/Assets/Wide310x150Logo.scale-200.png b/ReactWindows/Playground.Net46/Assets/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 + + + + diff --git a/ReactWindows/Playground.Net46/MainWindow.xaml.cs b/ReactWindows/Playground.Net46/MainWindow.xaml.cs new file mode 100644 index 00000000000..b3265772869 --- /dev/null +++ b/ReactWindows/Playground.Net46/MainWindow.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Playground.Net46 +{ + ///

+ /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/ReactWindows/Playground.Net46/Playground.Net46.csproj b/ReactWindows/Playground.Net46/Playground.Net46.csproj new file mode 100644 index 00000000000..4f09c503b9e --- /dev/null +++ b/ReactWindows/Playground.Net46/Playground.Net46.csproj @@ -0,0 +1,124 @@ + + + + + Debug + AnyCPU + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F} + WinExe + Properties + Playground.Net46 + Playground.Net46 + v4.6 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + ARM + bin\ARM\Debug\ + DEBUG + + + ARM + bin\ARM\Release\ + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + + + + Code + + + + + + + + + {22cbff9c-fe36-43e8-a246-266c7635e662} + ReactNative.Net46 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ReactWindows/Playground.Net46/Properties/AssemblyInfo.cs b/ReactWindows/Playground.Net46/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..f8e04a32d05 --- /dev/null +++ b/ReactWindows/Playground.Net46/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Playground.Net46")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Playground.Net46")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ReactWindows/Playground.Net46/index.windows.js b/ReactWindows/Playground.Net46/index.windows.js new file mode 100644 index 00000000000..5772ca4665d --- /dev/null +++ b/ReactWindows/Playground.Net46/index.windows.js @@ -0,0 +1,51 @@ +/** + * Sample React Native App + * https://github.com/facebook/react-native + */ + +import React, { Component } from 'react'; +import { + AppRegistry, + StyleSheet, + Text, + View, +} from 'react-native'; + +class Playground extends Component { + render() { + return ( + + + Welcome to React Native! + + + To get started, edit index.windows.js + + + Shake or press Shift+F10 for dev menu + + + ); + } +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + justifyContent: 'center', + alignItems: 'center', + backgroundColor: '#F5FCFF', + }, + welcome: { + fontSize: 20, + textAlign: 'center', + margin: 10, + }, + instructions: { + textAlign: 'center', + color: '#333333', + marginBottom: 5, + }, +}); + +AppRegistry.registerComponent('Playground.Net46', () => Playground); diff --git a/ReactWindows/ReactNative.sln b/ReactWindows/ReactNative.sln index 48572fd21bf..d3509b28a3a 100644 --- a/ReactWindows/ReactNative.sln +++ b/ReactWindows/ReactNative.sln @@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactNative.Net46.Tests", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChakraCore", "ChakraCore\ChakraCore.vcxproj", "{E02ED054-4FB2-4EEB-8835-36A5E542E368}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.Net46", "Playground.Net46\Playground.Net46.csproj", "{7AB3A24A-D5D9-479F-8E12-22213DD40D3F}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ReactNative.Shared\ReactNative.Shared.projitems*{22cbff9c-fe36-43e8-a246-266c7635e662}*SharedItemsImports = 4 @@ -226,6 +228,30 @@ Global {E02ED054-4FB2-4EEB-8835-36A5E542E368}.ReleaseBundle|x64.Build.0 = Release|x64 {E02ED054-4FB2-4EEB-8835-36A5E542E368}.ReleaseBundle|x86.ActiveCfg = Release|Win32 {E02ED054-4FB2-4EEB-8835-36A5E542E368}.ReleaseBundle|x86.Build.0 = Release|Win32 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|ARM.ActiveCfg = Debug|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|ARM.Build.0 = Debug|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x64.ActiveCfg = Debug|x64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x64.Build.0 = Debug|x64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x86.ActiveCfg = Debug|x86 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Debug|x86.Build.0 = Debug|x86 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|ARM.Build.0 = Debug|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x64.ActiveCfg = Debug|x64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x64.Build.0 = Debug|x64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x86.ActiveCfg = Debug|x86 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.DebugBundle|x86.Build.0 = Debug|x86 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM.ActiveCfg = Release|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|ARM.Build.0 = Release|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x64.ActiveCfg = Release|x64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x64.Build.0 = Release|x64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x86.ActiveCfg = Release|x86 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.Release|x86.Build.0 = Release|x86 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM.ActiveCfg = Release|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|ARM.Build.0 = Release|ARM + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x64.ActiveCfg = Release|x64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x64.Build.0 = Release|x64 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x86.ActiveCfg = Release|x86 + {7AB3A24A-D5D9-479F-8E12-22213DD40D3F}.ReleaseBundle|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From d0665a7bacc6706678722dfc7b44e00acd2c6607 Mon Sep 17 00:00:00 2001 From: Andrew Forster Date: Wed, 2 Nov 2016 10:16:48 -0700 Subject: [PATCH 04/20] Added a bootstrapper for initializing the ReactPage and the application's shell... --- ReactWindows/Playground.Net46/App.xaml | 3 +- ReactWindows/Playground.Net46/App.xaml.cs | 67 +-------------- ReactWindows/Playground.Net46/AppReactPage.cs | 30 ++----- ReactWindows/Playground.Net46/MainWindow.xaml | 7 +- .../Playground.Net46/MainWindow.xaml.cs | 18 +--- .../Playground.Net46/Playground.Net46.csproj | 20 ++++- .../PlaygroundBootstrapper.cs | 79 +++++++++++++++++ .../Properties/AssemblyInfo.cs | 2 - .../ReactNativeBootstrapper.cs | 86 +++++++++++++++++++ 9 files changed, 195 insertions(+), 117 deletions(-) create mode 100644 ReactWindows/Playground.Net46/PlaygroundBootstrapper.cs create mode 100644 ReactWindows/Playground.Net46/ReactNativeBootstrapper.cs diff --git a/ReactWindows/Playground.Net46/App.xaml b/ReactWindows/Playground.Net46/App.xaml index 18951107225..9dddbb94baf 100644 --- a/ReactWindows/Playground.Net46/App.xaml +++ b/ReactWindows/Playground.Net46/App.xaml @@ -1,6 +1,5 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> diff --git a/ReactWindows/Playground.Net46/App.xaml.cs b/ReactWindows/Playground.Net46/App.xaml.cs index c2b5b5c0d95..30b04f65141 100644 --- a/ReactWindows/Playground.Net46/App.xaml.cs +++ b/ReactWindows/Playground.Net46/App.xaml.cs @@ -1,9 +1,4 @@ -using ReactNative; -using System; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; -using System.Windows.Navigation; +using System.Windows; namespace Playground.Net46 { @@ -12,69 +7,13 @@ namespace Playground.Net46 /// public partial class App : Application { - //private Window _shellWindow; - private ReactPage _reactPage; - - /// - /// Initializes the singleton application object. This is the first line of authored code - /// executed, and as such is the logical equivalent of main() or WinMain(). - /// - public App() - { - } + private readonly PlaygroundBootstrapper _bootstrapper = new PlaygroundBootstrapper(); protected override void OnStartup(StartupEventArgs e) { base.OnStartup(e); - _reactPage = new AppReactPage(); - - _reactPage.OnResume(() => - { - //OnBackPressed - Application.Current.Shutdown(0); - }); - - //TODO: UWP's OnLaunched prvoides arguments as a string, whereas WPF's OnStartup provides them as a string[]; Need to figure out what format the ReactPage.OnCreate wants... - _reactPage.OnCreate(null); - - // Create a Frame to act as the navigation context and navigate to the first page - var rootFrame = new Frame - { - Height = 300, - Width = 400, - Content = _reactPage - }; - - rootFrame.NavigationFailed += OnNavigationFailed; - - //Create a Window to hold the frame - var shellWindow = new Window - { - Background = new SolidColorBrush(Colors.BlueViolet), - Height = 300, - Width = 400, - ShowActivated = true, - ShowInTaskbar = true, - WindowStartupLocation = WindowStartupLocation.CenterScreen, - Content = rootFrame - }; - - Application.Current.MainWindow = shellWindow; - - shellWindow.Show(); + this._bootstrapper.Run(""); } - - /// - /// Invoked when Navigation to a certain page fails - /// - /// The Frame which failed navigation - /// Details about the navigation failure - private void OnNavigationFailed(object sender, NavigationFailedEventArgs e) - { - throw new Exception("Failed to load Page"); - } - - } } diff --git a/ReactWindows/Playground.Net46/AppReactPage.cs b/ReactWindows/Playground.Net46/AppReactPage.cs index a5efd5cea04..16e8c22acb1 100644 --- a/ReactWindows/Playground.Net46/AppReactPage.cs +++ b/ReactWindows/Playground.Net46/AppReactPage.cs @@ -5,23 +5,11 @@ namespace Playground.Net46 { - class AppReactPage : ReactPage + internal class AppReactPage : ReactPage { - public override string MainComponentName - { - get - { - return "Playground.Net46"; - } - } + public override string MainComponentName => "Playground.Net46"; - public override string JavaScriptMainModuleName - { - get - { - return "ReactWindows/Playground.Net46/index.windows"; - } - } + public override string JavaScriptMainModuleName => "ReactWindows/Playground.Net46/index.windows"; #if BUNDLE public override string JavaScriptBundleFile @@ -33,16 +21,10 @@ public override string JavaScriptBundleFile } #endif - public override List Packages + public override List Packages => new List { - get - { - return new List - { - new MainReactPackage(), - }; - } - } + new MainReactPackage(), + }; public override bool UseDeveloperSupport { diff --git a/ReactWindows/Playground.Net46/MainWindow.xaml b/ReactWindows/Playground.Net46/MainWindow.xaml index 05275b0633c..832bc062069 100644 --- a/ReactWindows/Playground.Net46/MainWindow.xaml +++ b/ReactWindows/Playground.Net46/MainWindow.xaml @@ -3,10 +3,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:Playground.Net46" mc:Ignorable="d" - Title="MainWindow" Height="350" Width="525"> - + Title="Playground.Net46" Height="350" Width="525" WindowStartupLocation="CenterScreen" Background="BlueViolet"> + - + diff --git a/ReactWindows/Playground.Net46/MainWindow.xaml.cs b/ReactWindows/Playground.Net46/MainWindow.xaml.cs index b3265772869..3e733b077d8 100644 --- a/ReactWindows/Playground.Net46/MainWindow.xaml.cs +++ b/ReactWindows/Playground.Net46/MainWindow.xaml.cs @@ -1,23 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; +using System.Windows; namespace Playground.Net46 { - /// - /// Interaction logic for MainWindow.xaml - /// public partial class MainWindow : Window { public MainWindow() diff --git a/ReactWindows/Playground.Net46/Playground.Net46.csproj b/ReactWindows/Playground.Net46/Playground.Net46.csproj index 4f09c503b9e..db292d1bc97 100644 --- a/ReactWindows/Playground.Net46/Playground.Net46.csproj +++ b/ReactWindows/Playground.Net46/Playground.Net46.csproj @@ -19,23 +19,24 @@ true bin\x86\Debug\ - DEBUG;TRACE + TRACE;DEBUG;NET46 full x86 prompt MinimumRecommendedRules.ruleset true + false bin\x86\Release\ - TRACE + TRACE;NET46 true pdbonly x86 prompt MinimumRecommendedRules.ruleset true - + true bin\x64\Debug\ @@ -66,7 +67,7 @@ bin\ARM\Release\ - + @@ -88,6 +89,11 @@ Code + + MainWindow.xaml + + + @@ -113,6 +119,12 @@ + + + MSBuild:Compile + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + +