@nativescript/windows 0.1.0-alpha.3 → 0.1.0-alpha.4

package/framework/__PROJECT_NAME__/RuntimeHost.cs

@@ -139,10 +139,12 @@ namespace __PROJECT_NAME__
         private static string ResolveEntryScriptPath()
         {
             var baseDir = AppContext.BaseDirectory;
-            var defaultPath = Path.Combine(baseDir, "App", "main.js");
+            var defaultLower = Path.Combine(baseDir, "app", "main.js");
+            var defaultUpper = Path.Combine(baseDir, "App", "main.js");
             var packageJsonPath = Path.Combine(baseDir, "package.json");
 
-            if (!File.Exists(packageJsonPath)) return defaultPath;
+            if (!File.Exists(packageJsonPath))
+                return File.Exists(defaultLower) ? defaultLower : defaultUpper;
 
             try
             {
@@ -160,7 +162,7 @@ namespace __PROJECT_NAME__
             }
             catch { }
 
-            return defaultPath;
+            return File.Exists(defaultLower) ? defaultLower : defaultUpper;
         }
 
         private static RuntimePackageConfig ParsePackageConfig(string packageJsonPath)
@@ -181,8 +183,10 @@ namespace __PROJECT_NAME__
             var normalized = scriptPath.Replace('/', Path.DirectorySeparatorChar);
             var direct = Path.IsPathRooted(normalized) ? normalized : Path.Combine(baseDir, normalized);
             if (File.Exists(direct)) return direct;
-            var appPath = Path.Combine(baseDir, "App", normalized);
-            return File.Exists(appPath) ? appPath : null;
+            var appLower = Path.Combine(baseDir, "app", normalized);
+            if (File.Exists(appLower)) return appLower;
+            var appUpper = Path.Combine(baseDir, "App", normalized);
+            return File.Exists(appUpper) ? appUpper : null;
         }
 
         public void Dispose()

package/framework/__PROJECT_NAME__/__PROJECT_NAME__.csproj

@@ -32,7 +32,7 @@
     <Content Include="Properties\Default.rd.xml" />
 
     <!-- App JS/resource files — copied to the output directory on every build -->
-    <Content Include="App\**\*">
+    <Content Include="app\**\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
 
@@ -80,4 +80,11 @@
     <Message Text="[NativeScript] Publishing DotNetBridge..." Importance="high" />
     <Exec Command="dotnet publish &quot;$(NSWindowsRoot)\dotnet-bridge\DotNetBridge.csproj&quot; -c Release -o &quot;$(NSWindowsRoot)\dotnet-bridge\publish&quot; --no-self-contained /nologo" />
   </Target>
+
+  <!-- Allow project-level Windows overrides: place App_Resources\Windows\app.csproj to extend/override generated settings -->
+  <Import Project="App_Resources\Windows\app.csproj" Condition="Exists('App_Resources\Windows\app.csproj')" />
+
+  <!-- CLI-generated plugin imports (managed by the CLI during prepare) -->
+  <Import Project="plugins\Plugins.props" Condition="Exists('plugins\Plugins.props')" />
+  <Import Project="plugins\Plugins.targets" Condition="Exists('plugins\Plugins.targets')" />
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows",
-  "version": "0.1.0-alpha.3",
+  "version": "0.1.0-alpha.4",
   "description": "NativeScript for using Windows v8",
   "repository": {
         "type": "git",

package/framework/__PROJECT_NAME__/App/main.js

@@ -1,12 +0,0 @@
-const page = new Windows.UI.Xaml.Controls.Page();
-const text = new Windows.UI.Xaml.Controls.TextBlock();
-text.Text = "Hello from NativeScript on Windows!";
-text.FontSize = 24;
-text.HorizontalAlignment = Windows.UI.Xaml.HorizontalAlignment.Center;
-text.VerticalAlignment = Windows.UI.Xaml.VerticalAlignment.Center;
-
-const grid = new Windows.UI.Xaml.Controls.Grid();
-grid.Children.Append(text);
-page.Content = grid;
-
-Windows.UI.Xaml.Window.Current.Content = page;