@react-native-windows/cli 0.0.0-canary.26 → 0.0.0-canary.261

package/{powershell → src/powershell}/Add-AppDevPackage.ps1

@@ -107,10 +107,10 @@ function PrintMessageAndExit($ErrorMessage, $ReturnCode)
     {
         # Log telemetry data regarding the use of the script if possible.
         # There are three ways that this can be disabled:
-        #   1. If the "TelemetryDependencies" folder isn't present.  This can be excluded at build time by setting the MSBuild property AppxLogTelemetryFromSideloadingScript to false
+        #   1. If the "TelDeps" folder isn't present.  This can be excluded at build time by setting the MSBuild property AppxLogTelemetryFromSideloadingScript to false
         #   2. If the SkipLoggingTelemetry switch is passed to this script.
         #   3. If Visual Studio telemetry is disabled via the registry.
-        $TelemetryAssembliesFolder = (Join-Path $PSScriptRoot "TelemetryDependencies")
+        $TelemetryAssembliesFolder = (Join-Path $PSScriptRoot "TelDeps")
         if (!$SkipLoggingTelemetry -And (Test-Path $TelemetryAssembliesFolder))
         {
             $job = Start-Job -FilePath (Join-Path $TelemetryAssembliesFolder "LogSideloadingTelemetry.ps1") -ArgumentList $TelemetryAssembliesFolder, "VS/DesignTools/SideLoadingScript/AddAppDevPackage", $ReturnCode, $ProcessorArchitecture

package/src/powershell/Eval-MsBuildProperties.ps1

@@ -0,0 +1,156 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# Eval-MsBuildProperties.ps1
+#
+# This script lets you determine the final values of MSBUILD properties for a
+# given solution and project file. Simply pass in a comma delimited list of
+# property names and you'll get a JSON blob of evaluated values.
+#
+# For example, from the root of the repo:
+#
+# .\packages\@react-native-windows\cli\powershell\Eval-MsBuildProperties.ps1 -SolutionFile 'vnext\Microsoft.ReactNative.sln' -ProjectFile 'vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj' -PropertyNames 'ProjectGUID,ProjectName'
+#
+# will output:
+#
+# {
+#     "ProjectGuid":  "{f7d32bd0-2749-483e-9a0d-1635ef7e3136}",
+#     "ProjectName":  "Microsoft.ReactNative"
+# }
+#
+
+param(
+    [Parameter(Mandatory = $true)]
+    [String]$SolutionFile,
+    [Parameter(Mandatory = $true)]
+    [String]$ProjectFile,
+    [Parameter()]
+    [String]$PropertyNames = "",
+    [Parameter()]
+    [String]$MSBuildPath,
+    [Parameter()]
+    [String]$ExtraMSBuildProps
+)
+
+function Get-MSBuildPath {
+    $vsWhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+    if (!(Test-Path $vsWhere)) {
+        throw "Unable to find vswhere.exe."
+    }
+    $vsPath = & $vsWhere -version 16.5 -property installationPath;
+    return "$vsPath\MSBuild\Current\Bin";
+}
+
+function Get-MSBuildProperties {
+    param (
+        [Parameter(Mandatory = $true)]
+        [String]$MSBuildPath,
+        [Parameter(Mandatory = $true)]
+        [String]$SolutionPath,
+        [Parameter(Mandatory = $true)]
+        [String]$ProjectPath,
+        [Parameter()]
+        [String[]]$PropertyNames = @(),
+        [Parameter()]
+        [String]$ExtraMSBuildProps
+    )
+
+    if (!(Test-Path (Join-Path $MSBuildPath "MSBuild.exe"))) {
+        throw "Unable to find MSBuild.exe in $MSBuildPath"
+    }
+
+    if (!(Test-Path (Join-Path $MSBuildPath "MSBuild.exe"))) {
+        throw "Unable to find Microsoft.Build.dll in $MSBuildPath"
+    }
+
+    # Method to intercept resolution of assemblies to add MSBuild's path
+    $onAssemblyResolveEventHandler = [System.ResolveEventHandler] {
+        param($s, $e)
+
+        # Figure out which assembly to look for
+        $assemblyName = $e.Name.Substring(0, $e.Name.IndexOf(", "));
+        $assemblyPath = "$MSBuildPath\$assemblyName.dll"
+
+        # Search for the assembly in the MSBuild directory
+        if (Test-Path $assemblyPath) {
+            # Found the assembly!
+            return [System.Reflection.Assembly]::LoadFrom("$MSBuildPath\$assemblyName.dll");
+        }
+
+        # Unable to find the assembly
+        return $null
+    }
+
+    # Wire-up assembly resolution event handler
+    [System.AppDomain]::CurrentDomain.add_AssemblyResolve($onAssemblyResolveEventHandler)
+
+    # Load Microsoft.Build.dll into script
+    Add-Type -Path "$MSBuildPath\Microsoft.Build.dll" | Out-Null
+
+    # Build a local project collection
+    $projectCollection = [Microsoft.Build.Evaluation.ProjectCollection]::new()
+
+    try {
+        # Build a temporary "metaproj" of the solution file so it can be processed
+        ${env:MSBUILDEMITSOLUTION} = 1
+        & $MSBuildPath\MSBuild.exe $SolutionPath | Out-Null
+
+        # Process solution
+        $solution = [Microsoft.Build.Evaluation.Project]::new("$SolutionPath.metaproj", $null, "Current", $projectCollection)
+    }
+    finally {
+        # Clean up "metaproj" files
+        ${env:MSBUILDEMITSOLUTION} = 0
+        Remove-Item -Path @("$SolutionPath.metaproj", "$SolutionPath.metaproj.tmp") | Out-Null
+        Get-ChildItem * -Include *.metaproj -Recurse | Remove-Item | Out-Null
+    }
+
+    # Evaluate all of the Solution* properties and save into a collection
+    $globalProps = New-Object 'System.Collections.Generic.Dictionary[String,String]'
+    $solution.Properties | ForEach-Object -Process {
+        if ($_.Name.StartsWith("Solution")) {
+            $globalProps.Add($_.Name, $_.EvaluatedValue)
+        }
+    }
+
+    # Evaluate all extra build props and save into the collection
+    $extraPropsTable = ConvertFrom-StringData -StringData $ExtraMSBuildProps.Replace(',', "`n")
+    $extraPropsTable.Keys | ForEach-Object -Process {
+        $globalProps[$_] = $extraPropsTable[$_]
+    }
+
+    # Process the project file (with the Solution* properties we calculated before)
+    $project = [Microsoft.Build.Evaluation.Project]::new("$ProjectPath", $globalProps, "Current", $projectCollection)
+
+    # Create object to hold evaluated property key value pairs
+    $evaluatedProps = @{}
+
+    # Look for the specified PropertyNames and evaluate them
+    $project.Properties | ForEach-Object -Process {
+        if (($PropertyNames.Length -eq 0) -or ($PropertyNames -contains $_.Name)) {
+            $evaluatedProps[$_.Name] = $_.EvaluatedValue;
+        }
+    }
+
+    # Output as JSON
+    Write-Output (ConvertTo-Json $evaluatedProps)
+}
+
+# Main
+
+if ($MSBuildPath -and (Test-Path $MSBuildPath)) {
+    if (Test-Path $MSBuildPath -PathType Leaf) {
+        # It's a file (probably msbuild.exe), just get the folder path
+        $MSBuildPath = [System.IO.Path]::GetDirectoryName($MSBuildPath)
+    }
+}
+else {
+    # Use simple fallback logic in this script to find MSBuild path
+    $MSBuildPath = Get-MSBuildPath
+}
+
+# Get the full absolute paths to the solution and projects
+$SolutionPath = Convert-Path $SolutionFile
+$ProjectPath = Convert-Path $ProjectFile
+
+Get-MSBuildProperties -MSBuildPath $MSBuildPath -SolutionPath $SolutionPath -ProjectPath $ProjectPath -PropertyNames $PropertyNames.Split(',', [System.StringSplitOptions]::RemoveEmptyEntries) -ExtraMSBuildProps $ExtraMSBuildProps

package/{powershell → src/powershell}/WindowsStoreAppUtils.ps1

@@ -143,7 +143,17 @@ function CheckIfNeedInstallCertificate
     )
 
     $PackagePath = Get-ChildItem (Join-Path $ScriptDir "*.appx") | Where-Object { $_.Mode -NotMatch "d" }
+    if ($PackagePath -eq $null)
+    {
+        $PackagePath = Get-ChildItem (Join-Path $ScriptDir "*.msix") | Where-Object { $_.Mode -NotMatch "d" }
+    }
+
     $BundlePath = Get-ChildItem (Join-Path $ScriptDir "*.appxbundle") | Where-Object { $_.Mode -NotMatch "d" }
+    if ($BundlePath -eq $null)
+    {
+        $BundlePath = Get-ChildItem (Join-Path $ScriptDir "*.msixbundle") | Where-Object { $_.Mode -NotMatch "d" }
+    }
+
     # There must be exactly 1 package/bundle
     if (($PackagePath.Count + $BundlePath.Count) -lt 1)
     {

package/CHANGELOG.json

@@ -1,413 +0,0 @@
-{
-  "name": "@react-native-windows/cli",
-  "entries": [
-    {
-      "date": "Sat, 31 Oct 2020 05:06:14 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.26",
-      "version": "0.0.0-canary.26",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Fix Generator Failing to Overwrite Template Files",
-            "author": "ngerlem@microsoft.com",
-            "commit": "0062f63ad8dd7f9f176fed8d1a4249a8a65c8748",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Fri, 30 Oct 2020 05:07:51 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.25",
-      "version": "0.0.0-canary.25",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Enable Hermes Bytecode Compilation and SourceMap Creation as Part of Build",
-            "author": "ngerlem@microsoft.com",
-            "commit": "f9ba026cad45a4d30c95e3a7d2efb7ba28a1b9f7",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Thu, 29 Oct 2020 05:05:49 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.24",
-      "version": "0.0.0-canary.24",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Allow Hermes to be used in C++ projects without modifying source code",
-            "author": "ngerlem@microsoft.com",
-            "commit": "7e9d80e59fd0b8ca7549eda1a7d5cefc32d6cfbe",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Sat, 17 Oct 2020 05:06:20 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.23",
-      "version": "0.0.0-canary.23",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "C# apps have x86 platform=x86 but C++ apps have Win32",
-            "author": "asklar@microsoft.com",
-            "commit": "cfac7ab1942d3380eb33bb779f571befd10a6bff",
-            "package": "@react-native-windows/cli"
-          },
-          {
-            "comment": "Revert \"Fix project config and package deploy to support the windows code in a different location (#6232)\"",
-            "author": "dannyvv@microsoft.com",
-            "commit": "0f3c2aafb5bf9a93f03ea9b22c1f7f013bb46b2b",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Fri, 16 Oct 2020 05:04:19 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.22",
-      "version": "0.0.0-canary.22",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Fix config and app publish to allow for the windows native source code to live in a different location",
-            "author": "dannyvv@microsoft.com",
-            "commit": "ceb3c4519d5c0e13e843a0a93f7b39aebfbef94f",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Fri, 09 Oct 2020 05:06:32 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.21",
-      "version": "0.0.0-canary.21",
-      "comments": {
-        "none": [
-          {
-            "comment": "Update just-scipts (remove npm-registry-fetch)",
-            "author": "ngerlem@microsoft.com",
-            "commit": "00b2d84b8effce0b7405a67bd4903eed88cb9aaf",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Thu, 01 Oct 2020 05:08:11 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.21",
-      "version": "0.0.0-canary.21",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "ESLint Fixup",
-            "author": "ngerlem@microsoft.com",
-            "commit": "98c072069c9d9e0d495bfd6f3bdc386b1362f377",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Tue, 29 Sep 2020 05:05:53 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.20",
-      "version": "0.0.0-canary.20",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Fix run-windows Warnings Using Node 14",
-            "author": "ngerlem@microsoft.com",
-            "commit": "89b37d236af1c9d5db7af2d28c2d14d1c3189992",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Fri, 25 Sep 2020 05:05:40 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.19",
-      "version": "0.0.0-canary.19",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Fix casing rules for new projects names for `react-native-windows-init`",
-            "author": "jthysell@microsoft.com",
-            "commit": "9bc6c559fc350480d6d014644c3fbf4882d5a39a",
-            "package": "@react-native-windows/cli"
-          },
-          {
-            "comment": "Add -NoProfile to powershell invocations to ensure deterministic script execution where user profiles do not have the ability to break or change the build outputs",
-            "author": "dannyvv@microsoft.com",
-            "commit": "34204f8e56810882b1f66fa247f075499a76022d",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Thu, 24 Sep 2020 05:06:21 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.18",
-      "version": "0.0.0-canary.18",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Zero-Config Tests for CLI, react-native-windows-init, react-native-windows-codegen",
-            "author": "ngerlem@microsoft.com",
-            "commit": "5a96480f422aa7c731d7febb900a3962e1265c08",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Mon, 21 Sep 2020 05:06:22 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.17",
-      "version": "0.0.0-canary.17",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Fixup eslint config",
-            "author": "ngerlem@microsoft.com",
-            "commit": "2df3273449486de9e663e26f708fd9bb2cd37c91",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Sat, 19 Sep 2020 05:05:08 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.16",
-      "version": "0.0.0-canary.16",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Adding new native module template support to react-native-windows-init",
-            "author": "jthysell@microsoft.com",
-            "commit": "c7a42af99fb614652d446ebaee12ea689ade4458",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Wed, 16 Sep 2020 05:05:28 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.15",
-      "version": "0.0.0-canary.15",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Enable trying Previews of VS as a fallback",
-            "author": "asklar@winse.microsoft.com",
-            "commit": "c30f54a8ba3a605910b43613825b386b62b1675d",
-            "package": "@react-native-windows/cli"
-          },
-          {
-            "comment": "Yarn on Windows breaks apps that read from the environment variables",
-            "author": "asklar@winse.microsoft.com",
-            "commit": "2018f3132087b1f76c48474c8df0b4e7f3b62501",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Tue, 15 Sep 2020 05:05:15 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.14",
-      "version": "0.0.0-canary.14",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "fix ts warning",
-            "author": "asklar@microsoft.com",
-            "commit": "61a641820532b42034f2ad4a670bdc43b817adac",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Mon, 14 Sep 2020 22:03:37 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.13",
-      "version": "0.0.0-canary.13",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Reconcile package versions",
-            "author": "ngerlem@microsoft.com",
-            "commit": "8adedcfb2ce6492a4a7ede59e0f9188dc205d659",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Wed, 09 Sep 2020 05:06:35 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.11",
-      "version": "0.0.0-canary.11",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Enable @typescript-eslint/no-floating-promises",
-            "author": "ngerlem@microsoft.com",
-            "commit": "62f3bb771a129f9cb81bd826827bf4001821a684",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Wed, 02 Sep 2020 05:05:16 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.10",
-      "version": "0.0.0-canary.10",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Keep Templates in react-native-windows Package",
-            "author": "ngerlem@microsoft.com",
-            "commit": "aad763dd75ffe79e21495a87efbf0e2e583d66eb",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Fri, 28 Aug 2020 05:06:54 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.9",
-      "version": "0.0.0-canary.9",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Fixed templates so C++ apps can consume C# native modules",
-            "author": "jthysell@microsoft.com",
-            "commit": "db6213f3b9ec6553068e54809c72fceeeb7f0731",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Wed, 26 Aug 2020 05:07:06 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.8",
-      "version": "0.0.0-canary.8",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Fix deploy bug where a framework package is installed for one arch but not the one that we are building for",
-            "author": "asklar@winse.microsoft.com",
-            "commit": "3d857e5dfc8b6191793e8c9cf7d8044fa18d8d9f",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Tue, 25 Aug 2020 05:05:08 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.7",
-      "version": "0.0.0-canary.7",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Default run-windows to disabling parallel MSBuild When Machine Has < 16GB of Memory",
-            "author": "ngerlem@microsoft.com",
-            "commit": "c144d4a27abcdc6f7402578be8b7ad7f39310dff",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Fri, 21 Aug 2020 05:04:58 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.5",
-      "version": "0.0.0-canary.5",
-      "comments": {
-        "none": [
-          {
-            "comment": "Upgrade to eslint 6.8.0",
-            "author": "ngerlem@microsoft.com",
-            "commit": "68f7ba47793f4f1638be59ee9cb8ba68a70ae0cb",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Thu, 20 Aug 2020 05:05:23 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.5",
-      "version": "0.0.0-canary.5",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Add --singleproc to run-windows",
-            "author": "asklar@microsoft.com",
-            "commit": "82bf0682e141a3cf8c53db9bc69edc44411d00a7",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Wed, 19 Aug 2020 05:04:41 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.4",
-      "version": "0.0.0-canary.4",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Fixing config and autolinking",
-            "author": "jthysell@microsoft.com",
-            "commit": "286f393305bb13cf5982545d4e6b7de68e9a35c9",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Fri, 14 Aug 2020 05:05:34 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.3",
-      "version": "0.0.0-canary.3",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Disable autolinking check in msbuild when using `react-native run-windows`",
-            "author": "jthysell@microsoft.com",
-            "commit": "917b8585d4d8ac94140ad2dff538de6c5b1bddc8",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Tue, 11 Aug 2020 07:36:05 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.2",
-      "version": "0.0.0-canary.2",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Make C# CodeGen the default",
-            "author": "dannyvv@microsoft.com",
-            "commit": "7a65915e82d6bc6884e267a8c96d0fa7fadb0e9e",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    },
-    {
-      "date": "Tue, 28 Jul 2020 05:06:13 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.1",
-      "version": "0.0.0-canary.1",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Separate local-cli into its own package",
-            "author": "ngerlem@microsoft.com",
-            "commit": "fbb4352a015533ebaa77a8d3ea497850a0f67c3f",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    }
-  ]
-}