Merge pull request #97 from CommunityToolkit/fix/multitarget/sample-always-inheriting-source-targets

Fixed sample projects always inheriting source project MultiTarget.props

Author: Arlodotexe

MultiTarget/GenerateAllProjectReferences.ps1

@@ -4,7 +4,7 @@ Param (
 
   [Parameter(HelpMessage = "Only projects that support these targets will have references generated for use by deployable heads.")]
   [string[]] $MultiTarget = @("uwp", "wasdk", "wpf", "wasm", "linuxgtk", "macos", "ios", "android", "netstandard")
-  )
+)
 
 $preWorkingDir = $pwd;
 Set-Location $PSScriptRoot;
@@ -17,13 +17,13 @@ New-Item -ItemType Directory -Force -Path $projectPropsOutputDir -ErrorAction Si
 foreach ($projectPath in Get-ChildItem -Directory -Path "$PSScriptRoot/../../components/*") {
   $srcPath = Resolve-Path "$($projectPath.FullName)\src";
   $srcProjectPath = Get-ChildItem -File "$srcPath\*.csproj";
-
-  $samplePath = Resolve-Path "$($projectPath.FullName)\samples";
-  $sampleProjectPath = Get-ChildItem -File "$samplePath\*.csproj";
+  $sampleProjectPath = Get-ChildItem -File "$($projectPath.FullName)\samples\*.csproj" -ErrorAction SilentlyContinue;
 
   # Generate <ProjectReference>s for sample project
   # Use source project MultiTarget as first fallback.
-  & $PSScriptRoot\GenerateMultiTargetAwareProjectReferenceProps.ps1 -projectPath $sampleProjectPath -outputPath "$projectPropsOutputDir/$($sampleProjectPath.BaseName).props" -MultiTarget $MultiTarget
+  if ($null -ne $sampleProjectPath -and (Test-Path $sampleProjectPath)) {
+    & $PSScriptRoot\GenerateMultiTargetAwareProjectReferenceProps.ps1 -projectPath $sampleProjectPath -outputPath "$projectPropsOutputDir/$($sampleProjectPath.BaseName).props" -MultiTarget $MultiTarget
+  }
 
   # Generate <ProjectReference>s for src project
   & $PSScriptRoot\GenerateMultiTargetAwareProjectReferenceProps.ps1 -projectPath $srcProjectPath -outputPath "$projectPropsOutputDir/$($srcProjectPath.BaseName).props" -MultiTarget $MultiTarget

MultiTarget/GenerateMultiTargetAwareProjectReferenceProps.ps1

@@ -8,9 +8,6 @@ Param (
     [Parameter(HelpMessage = "The path to the template used to generate the props file.")]
     [string]$templatePath = "$PSScriptRoot/MultiTargetAwareProjectReference.props.template",
 
-    [Parameter(HelpMessage = "The path to the props file that contains the default MultiTarget values.")] 
-    [string[]]$multiTargetFallbackPropsPath = @("$PSScriptRoot/Defaults.props"),
-
     [Parameter(HelpMessage = "The placeholder text to replace when inserting the project file name into the template.")] 
     [string]$projectFileNamePlaceholder = "[ProjectFileName]",
 
@@ -33,15 +30,50 @@ Set-Location $preWorkingDir;
 # Insert csproj file name.
 $csprojFileName = [System.IO.Path]::GetFileName($relativeProjectPath);
 $templateContents = $templateContents -replace [regex]::escape($projectFileNamePlaceholder), $csprojFileName;
-$projectName = (Get-Item (Split-Path -Parent $projectPath)).Name;
 
 # Insert project directory
 $projectDirectoryRelativeToRoot = [System.IO.Path]::GetDirectoryName($relativeProjectPath).TrimStart('.').TrimStart('\');
 $templateContents = $templateContents -replace [regex]::escape($projectRootPlaceholder), "$projectDirectoryRelativeToRoot";
 
 # Load multitarget preferences for project
-$multiTargets = & $PSScriptRoot\GetMultiTargets.ps1 -ComponentName $projectName -ErrorAction Stop;
-    
+# Folder layout is expected to match the Community Toolkit.
+$projectName = (Get-Item (Split-Path -Parent (Split-Path -Parent $projectPath))).Name;
+$componentPath = "$PSScriptRoot/../../components/$projectName";
+
+$srcPath = Resolve-Path "$componentPath\src";
+$samplePath = "$componentPath\samples";
+
+# Uses the <MultiTarget> values from the source library project as the fallback for the sample project.
+# This behavior also implemented in TargetFramework evaluation. 
+$multiTargetFallbackPropsPaths = @()
+
+if($projectPath.ToLower().Contains('sample')) {
+    $multiTargetFallbackPropsPaths += @("$samplePath/MultiTarget.props", "$srcPath/MultiTarget.props")
+} else {
+    $multiTargetFallbackPropsPaths += @("$srcPath/MultiTarget.props")
+}
+
+$multiTargetFallbackPropsPaths += @("$PSScriptRoot/Defaults.props")
+
+# Load first available default
+$fileContents = "";
+foreach ($fallbackPath in $multiTargetFallbackPropsPaths) {
+    if (Test-Path $fallbackPath) {
+        $fileContents = Get-Content $fallbackPath -ErrorAction Stop;
+        break;
+    }
+}
+
+# Parse file contents
+$regex = Select-String -Pattern '<MultiTarget>(.+?)<\/MultiTarget>' -InputObject $fileContents;
+
+if ($null -eq $regex -or $null -eq $regex.Matches -or $null -eq $regex.Matches.Groups -or $regex.Matches.Groups.Length -lt 2) {
+    Write-Error "Couldn't get MultiTarget property from $path";
+    exit(-1);
+}
+
+$multiTargets = $regex.Matches.Groups[1].Value;
+
 $templateContents = $templateContents -replace [regex]::escape("[IntendedTargets]"), $multiTargets;
 $multiTargets = $multiTargets.Split(';');