Skip to content

Commit 557e5be

Browse files
matthargettmatthargett
authored
WPF project generator has unique files from UWP
2 parents 0d3bc88 + 96f0522 commit 557e5be

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

‎local-cli/generator-wpf/templates/index.wpf.bundle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
*
33
* Be sure to generate this file using the CLI:
44
*
5-
* react-native bundle --platform windows --entry-file index.windows.js
6-
* --bundle-output windows\<%= name %>\ReactAssets\index.windows.bundle
7-
* --assets-dest windows\<%= name %>\ReactAssets
5+
* react-native bundle --platform wpf --entry-file index.wpf.js
6+
* --bundle-output wpf\<%= name %>\ReactAssets\index.wpf.bundle
7+
* --assets-dest wpf\<%= name %>\ReactAssets
88
*
99
*/

‎local-cli/generator-wpf/templates/index.wpf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class <%= name %> extends Component {
2020
Welcome to React Native!
2121
</Text>
2222
<Text style={styles.instructions}>
23-
To get started, edit index.windows.js
23+
To get started, edit index.wpf.js
2424
</Text>
2525
<Text style={styles.instructions}>
2626
Press Ctrl+R to reload,{'\n'}
27-
Shift+F10 or shake for dev menu
27+
Ctrl+D or Ctrl+M for dev menu
2828
</Text>
2929
</View>
3030
);

‎local-cli/generator-wpf/templates/proj/MyApp.sln

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@ Global
1515
..\node_modules\react-native-windows\ReactWindows\ReactNative.Shared\ReactNative.Shared.projitems*{eea8b852-4d07-48e1-8294-a21ab5909fe5}*SharedItemsImports = 13
1616
EndGlobalSection
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18-
Debug|ARM = Debug|ARM
1918
Debug|x64 = Debug|x64
2019
Debug|x86 = Debug|x86
21-
DebugBundle|ARM = DebugBundle|ARM
2220
DebugBundle|x64 = DebugBundle|x64
2321
DebugBundle|x86 = DebugBundle|x86
24-
Release|ARM = Release|ARM
2522
Release|x64 = Release|x64
2623
Release|x86 = Release|x86
27-
ReleaseBundle|ARM = ReleaseBundle|ARM
2824
ReleaseBundle|x64 = ReleaseBundle|x64
2925
ReleaseBundle|x86 = ReleaseBundle|x86
3026
EndGlobalSection
@@ -45,26 +41,18 @@ Global
4541
{9840FE11-9B72-467E-999E-3C2BB65D5BEA}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64
4642
{9840FE11-9B72-467E-999E-3C2BB65D5BEA}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|x86
4743
{9840FE11-9B72-467E-999E-3C2BB65D5BEA}.ReleaseBundle|x86.Build.0 = ReleaseBundle|x86
48-
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|ARM.ActiveCfg = Debug|ARM
49-
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|ARM.Build.0 = Debug|ARM
5044
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x64.ActiveCfg = Debug|x64
5145
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x64.Build.0 = Debug|x64
5246
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x86.ActiveCfg = Debug|x86
5347
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Debug|x86.Build.0 = Debug|x86
54-
{22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|ARM.ActiveCfg = Debug|ARM
55-
{22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|ARM.Build.0 = Debug|ARM
5648
{22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x64.ActiveCfg = Debug|x64
5749
{22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x64.Build.0 = Debug|x64
5850
{22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x86.ActiveCfg = Debug|x86
5951
{22CBFF9C-FE36-43E8-A246-266C7635E662}.DebugBundle|x86.Build.0 = Debug|x86
60-
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|ARM.ActiveCfg = Release|ARM
61-
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|ARM.Build.0 = Release|ARM
6252
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x64.ActiveCfg = Release|x64
6353
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x64.Build.0 = Release|x64
6454
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x86.ActiveCfg = Release|x86
6555
{22CBFF9C-FE36-43E8-A246-266C7635E662}.Release|x86.Build.0 = Release|x86
66-
{22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|ARM.ActiveCfg = Release|ARM
67-
{22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|ARM.Build.0 = Release|ARM
6856
{22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x64.ActiveCfg = Release|x64
6957
{22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x64.Build.0 = Release|x64
7058
{22CBFF9C-FE36-43E8-A246-266C7635E662}.ReleaseBundle|x86.ActiveCfg = Release|x86

‎local-cli/generator-wpf/templates/src/AppReactPage.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ internal class AppReactPage : ReactPage
1010
{
1111
public override string MainComponentName => "<%= name %>";
1212

13+
public override string JavaScriptMainModuleName => "index.wpf";
14+
1315
#if BUNDLE
14-
public override string JavaScriptBundleFile => AppDomain.CurrentDomain.BaseDirectory + "ReactAssets/index.windows.bundle";
16+
public override string JavaScriptBundleFile => AppDomain.CurrentDomain.BaseDirectory + "ReactAssets/index.wpf.bundle";
1517
#endif
1618

1719
public override List<IReactPackage> Packages => new List<IReactPackage>

0 commit comments

Comments
 (0)