supporting os version tfm for "-windows" (#1909)

dotnet · Jun 2, 2022 · 0121bbc · 0121bbc
1 parent b780942
commit 0121bbc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Shared/Microsoft.DotNet.Scaffolding.Shared/MsBuild/MsBuildProjectContextBuilder.cs b/src/Shared/Microsoft.DotNet.Scaffolding.Shared/MsBuild/MsBuildProjectContextBuilder.cs
@@ -44,7 +44,8 @@ public IProjectContext Build()
                 {
                     _projectPath,
                     $"/t:EvaluateProjectInfoForCodeGeneration",
-                    $"/p:OutputFile={tmpFile};CodeGenerationTargetLocation={_targetLocation};Configuration={_configuration}"
+                    $"/p:OutputFile={tmpFile};CodeGenerationTargetLocation={_targetLocation};Configuration={_configuration}",
+                    "-restore"
                 })
                 .OnErrorLine(e => errors.Add(e))
                 .OnOutputLine(o => output.Add(o))

diff --git a/src/Shared/Microsoft.DotNet.Scaffolding.Shared/ProjectModel/ProjectContextHelper.cs b/src/Shared/Microsoft.DotNet.Scaffolding.Shared/ProjectModel/ProjectContextHelper.cs
@@ -48,6 +48,12 @@ internal static IEnumerable<DependencyDescription> GetPackageDependencies(string
                             //"targets" gives us all top-level and transitive dependencies. "packageFolders" gives us the path where the dependencies are on disk.
                             if (root.TryGetProperty(TargetsProperty, out var targets) && root.TryGetProperty(PackageFoldersProperty, out var packageFolderPath))
                             {
+                                if (targetFramework.EndsWith("-windows"))
+                                {
+                                    //tfm in project.assets.json is netX-windows7.0 instead of netX-windows
+                                    targetFramework = $"{targetFramework}7.0";
+                                }
+
                                 if (targets.TryGetProperty(targetFramework, out var packages))
                                 {
                                     packageDependencies = DeserializePackages(packages, packageFolderPath, targetFrameworkMoniker);