add support for importing scenesystem scenes, fix minor error

Author: davidkline-ms

Assets/MRTK/packagetemplate.json

@@ -31,6 +31,8 @@
         "Providers*",
         "SDK*",
         "Services*",
-        "package.json.meta"
-    ]
+        "package.json.meta",
+        "Samples~"
+    ],
+    %samples%
 }

scripts/packaging/createupmpackages.ps1

@@ -112,7 +112,13 @@ foreach ($entry in $packages.GetEnumerator()) {
 
     $samplesFolder = "$packagePath/Samples~"
 
-    if ($packageName -eq "examples") {
+    if ($packageName -eq "foundation") {
+        # The foundation package contains files that are requried to be copied into the Assets folder to be used.
+        # In order to perform the necessary preparaton, without overly complicating this script, we will use a
+        # helper script to prepare the folder.
+        Start-Process -FilePath "$PSHOME/powershell.exe" -ArgumentList "$scriptPath/extensionsfolderpreupm.ps1 -PackageRoot $packagePath" -NoNewWindow -Wait
+    }
+    elseif ($packageName -eq "examples") {
         # The examples folder is a collection of sample projects. In order to perform the necessary
         # preparaton, without overly complicating this script, we will use a helper script to prepare
         # the folder.
@@ -127,7 +133,7 @@ foreach ($entry in $packages.GetEnumerator()) {
     else {
         # Some other folders have localized examples that need to be prepared. Intentionally skip the foundation as those samples
         $exampleFolder = "$packagePath/Examples"
-        if (($PackageName -ne "foundation") -and ($PackageName -ne "foundation.xr2018") -and (Test-Path -Path $exampleFolder)) {
+        if (($PackageName -ne "foundation") -and (Test-Path -Path $exampleFolder)) {
             # Ensure the required samples exists
             if (-not (Test-Path -Path $samplesFolder)) {
                 New-Item $samplesFolder -ItemType Directory | Out-Null

scripts/packaging/extensionsfolderpreupm.ps1

@@ -4,7 +4,7 @@
 .DESCRIPTION
     Prepares the MRTK\Extensions folder for UPM packaging.
 .PARAMETER PackageRoot
-    The root folder containing the examples package contents. If not specified, the current folder is presumed.
+    The root folder containing the extensions package contents. If not specified, the current folder is presumed.
 #>
 param(
     [string]$PackageRoot

scripts/packaging/foundationpreupm.ps1

@@ -0,0 +1,39 @@
+<#
+.SYNOPSIS
+    Prepares the MRTK foundation for UPM packaging.
+.DESCRIPTION
+    Prepares the MRTK foundation for UPM packaging.
+.PARAMETER PackageRoot
+    The root folder containing the foundation package contents. If not specified, the current folder is presumed.
+#>
+param(
+    [string]$PackageRoot
+)
+
+if (-not $PackageRoot) {
+    throw "Missing required parameter: -PackageRoot."
+}
+
+# Ensure the required folder exists
+$samplesFolder = "$PackageRoot\Samples~"
+if (-not (Test-Path -Path $samplesFolder)) {
+    New-Item $samplesFolder -ItemType Directory | Out-Null
+}
+
+# Copy the scene system's default scenes to Samples~/SceneSystemScenes
+Copy-Item -Path "$PackageRoot/Services/SceneSystem/Scenes" -Destination "$samplesFolder/SceneSystemScenes" -Recurse -Force
+
+# Create the samples data for the package.json file
+$samples = "`"samples`": ["
+$samples = $samples + "`n      {`n"
+$samples = $samples + "        `"displayName`": `"$Scene System Default Scenes`",`n"
+$samples = $samples + "        `"description`": `"Default scenes used by the MRTK Scene System`",`n"
+$samples = $samples + "        `"path`": `"Samples~/SceneSystemScenes`"`n"
+$samples = $samples + "      }"
+$samples = $samples + "`n   ]"
+
+# Update the project.json file to specify the samples contanined in the package
+$packageJsonPath = "$PackageRoot/package.json"
+$packageJson = [System.IO.File]::ReadAllText($packageJsonPath)
+$packageJson = ($packageJson -replace "%samples%", $samples)
+[System.IO.File]::WriteAllText($packageJsonPath, $packageJson)